From 7e3ee1d7c6097b2290d8e7f93a031b82794bbd0a Mon Sep 17 00:00:00 2001
From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Sat, 4 Oct 2025 10:51:36 -0700
Subject: [PATCH 001/216] Explosives with timers now properly alert admins when
 detonating (#40471)

* Explosives with timers now properly alert admins when detonating

* add TODO comment

* Check if user is deleted before triggering
---
 Content.Shared/Trigger/Components/TimerTriggerComponent.cs | 1 +
 Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs      | 3 ++-
 Content.Shared/Trigger/Systems/TriggerSystem.cs            | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Trigger/Components/TimerTriggerComponent.cs b/Content.Shared/Trigger/Components/TimerTriggerComponent.cs
index 9cc58d3cda..f413ab5d4f 100644
--- a/Content.Shared/Trigger/Components/TimerTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/TimerTriggerComponent.cs
@@ -75,6 +75,7 @@ public sealed partial class TimerTriggerComponent : Component
 
     /// <summary>
     /// The entity that activated this trigger.
+    /// TODO: use WeakEntityReference once the engine PR is merged!
     /// </summary>
     [DataField, AutoNetworkedField]
     public EntityUid? User;
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs
index 58ac43e571..179b04af93 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs
@@ -168,7 +168,8 @@ public sealed partial class TriggerSystem
 
             if (timer.NextTrigger <= curTime)
             {
-                Trigger(uid, timer.User, timer.KeyOut);
+                var user = TerminatingOrDeleted(timer.User) ? null : timer.User;
+                Trigger(uid, user, timer.KeyOut);
                 // Remove after triggering to prevent it from starting the timer again
                 RemComp<ActiveTimerTriggerComponent>(uid);
                 if (TryComp<AppearanceComponent>(uid, out var appearance))
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.cs b/Content.Shared/Trigger/Systems/TriggerSystem.cs
index ca60901a79..25f8d51e11 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.cs
@@ -107,6 +107,7 @@ public sealed partial class TriggerSystem : EntitySystem
         ent.Comp.NextTrigger = curTime + ent.Comp.Delay;
         var delay = ent.Comp.InitialBeepDelay ?? ent.Comp.BeepInterval;
         ent.Comp.NextBeep = curTime + delay;
+        ent.Comp.User = user;
         Dirty(ent);
 
         var ev = new ActiveTimerTriggerEvent(user);

From 2dc0cef5d4f22952b59dedf89c03b11f07e4b48c Mon Sep 17 00:00:00 2001
From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com>
Date: Sat, 4 Oct 2025 13:16:27 -0700
Subject: [PATCH 002/216] made evac signs glow (#38545)

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
---
 .../Structures/Wallmounts/Signs/signs.yml         |  10 +++++++++-
 .../Wallmounts/signs.rsi/direction_evac_glow.png  | Bin 0 -> 261 bytes
 .../Structures/Wallmounts/signs.rsi/meta.json     |   6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac_glow.png

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
index b77fbc3547..a8e834ecce 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -104,7 +104,15 @@
   description: A direction sign, pointing out which way evac is.
   components:
   - type: Sprite
-    state: direction_evac
+    layers:
+    - state: direction_evac
+    - state: direction_evac_glow
+      shader: unshaded
+    - state: direction_evac_glow
+      shader: shaded
+      #This is a neat trick I found to sort of "hack" an emissive map into ss14. Basically, the direction_evac_glow texture has an alpha channel.
+      #Alpha doesn't work for unshaded, but for *shaded* it does, and by putting a shaded texture infront of the unshaded, we can dim the unshaded texture, effectively allowing brightness control.
+      #I am re-using this from my high-vis vest PR, where I go further into detail, https://github.com/space-wizards/space-station-14/pull/37869
 
 - type: entity
   parent: BaseSignDirectional
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac_glow.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac_glow.png
new file mode 100644
index 0000000000000000000000000000000000000000..d82d60abdd6f8b5555c5903baee0ebdebb546acb
GIT binary patch
literal 261
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_ItWGhE&XX
zd&`rn*+7Kh!jh8brF;H!R?S`aR!hJsX_ec`FSZjbKCrXjQBedNq}Y;Lx%cw4zRw%)
zoKHSgT)rmW_uttYr;Ahnep1|Kb8Xg*zbxz)QTE3wPaU6@uJ7o*e&?UJUy9}i{-1E`
zdGKxh^K-xQ@7QGrGztj*bO(O^y!~zVm0u0_w(8pUywlF~>tFuBHu&~dx9v|>-gW4*
zzZ8B}^ELCQ8@8{RljbZByQBJ=&F$>@{%@;m85tPvoMZoCxUKSQghd6&I8RqUmvv4F
FO#n{dbM62D

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
index 9da6753c35..d535ec1dc2 100644
--- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github), 'direction_atmos' made by SlamBamActionman, 'vox' based on sprites taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'direction_pods' derived by WarPigeon from existing directional signs., 'detective' derived by Soupkilove from existing security sign",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github), 'direction_atmos' made by SlamBamActionman, 'vox' based on sprites taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'direction_pods' derived by WarPigeon from existing directional signs., 'detective' derived by Soupkilove from existing security sign, direction_evac_glow made by moomoobeef based on existing direction_evac",
     "states": [
         {
             "name": "ai"
@@ -165,6 +165,10 @@
             "name": "direction_evac",
             "directions": 4
         },
+        {
+            "name": "direction_evac_glow",
+            "directions": 4
+        },
         {
             "name": "direction_supply",
             "directions": 4

From 24753a78db1720b70dd4195e29a0887dd61b6a3c Mon Sep 17 00:00:00 2001
From: Kowlin <10947836+Kowlin@users.noreply.github.com>
Date: Sun, 5 Oct 2025 09:29:28 +0200
Subject: [PATCH 003/216] Add high severity logging to stun prods (#40709)

---
 .../Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
index b5dbdf032a..a82a44b00a 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
@@ -5,6 +5,10 @@
     - node: start
       edges:
         - to: msstunprod
+          completed:
+          - !type:AdminLog
+            message: "Construction"
+            impact: High
           steps:
             - material: MetalRod
               amount: 1

From d9b296a64049343ff5bd493310bee381d5750588 Mon Sep 17 00:00:00 2001
From: NoreUhh <85219416+NoreUhh@users.noreply.github.com>
Date: Sun, 5 Oct 2025 00:55:17 -0700
Subject: [PATCH 004/216] Ian Suit gives accent! (#40694)

Ian suit has been made STRONGERgit add Resources/Prototypes/Entities/Clothing/OuterClothing/suits.ymlgit add Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

Co-authored-by: NoreUhh <noreuhh@gmail.com>
---
 Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 93a209c6be..068ed1a511 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -288,6 +288,8 @@
     tags:
     - CorgiWearable
     - WhitelistChameleon
+  - type: AddAccentClothing
+    accent: BarkAccent
 
 - type: entity
   parent: ClothingOuterBase

From b57be2413e4735a366dd42d30ce85bea4614e4b7 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sun, 5 Oct 2025 01:27:19 -0700
Subject: [PATCH 005/216] Incendiary rounds do pierce (#39204)

* Incendiary rounds do pierce

* Address review

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Weapons/Guns/Ammunition/Projectiles/light_rifle.yml       | 4 ++--
 .../Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml    | 4 ++--
 .../Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml    | 4 ++--
 .../Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml     | 4 ++--
 .../Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml   | 4 ++--
 .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 3 ++-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
index 43427c1dac..60640bdd2e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -29,8 +29,8 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 3
-        Heat: 16
+        Piercing: 14
+        Heat: 5
 
 - type: entity
   id: BulletLightRifleUranium
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
index b4017fd550..124fa4a93e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -29,8 +29,8 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 3
-        Heat: 32
+        Piercing: 26
+        Heat: 9
 
 - type: entity
   id: BulletMagnumAP
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
index 8d146939b7..53917035cb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -29,8 +29,8 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 2
-        Heat: 14
+        Piercing: 12
+        Heat: 4
 
 - type: entity
   id: BulletPistolUranium
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
index 497ca9e2a3..84506148b4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -29,8 +29,8 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 2
-        Heat: 15
+        Piercing: 12
+        Heat: 5
 
 - type: entity
   id: BulletRifleUranium
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index e5120a746f..ebea6dde5e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -68,8 +68,8 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 3
-        Heat: 7
+        Piercing: 7
+        Heat: 3
   - type: IgnitionSource
     ignited: true
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 6c39e112bd..2134ac0cbf 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -142,7 +142,8 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 14
+        Piercing: 10
+        Heat: 4
   - type: PointLight
     enabled: true
     color: "#ff4300"

From c9373c5397c19672aec5f20e4233d858669b4077 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:05:25 +0200
Subject: [PATCH 006/216] Update Credits (#40706)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
---
 Resources/Credits/GitHub.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index f3ea41018f..ca08fb2939 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, AzzyIsNotHere, azzyisnothere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, pgraycs, PGrayCS, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, sirwarock, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
+0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, pgraycs, PGrayCS, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, sirwarock, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex

From 7f69c44dd77fcad9410a6f9196257e6b32ad8ebb Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:44:29 +0200
Subject: [PATCH 007/216] Add Arrivals sign (#40227)

* Arrivals sign

* Waving!!!

* Attribution
---
 .../Structures/Wallmounts/Signs/signs.yml       |   9 +++++++++
 .../Wallmounts/signs.rsi/arrivals.png           | Bin 0 -> 18012 bytes
 .../Structures/Wallmounts/signs.rsi/meta.json   |   5 ++++-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/arrivals.png

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
index a8e834ecce..8798e920c7 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -296,6 +296,15 @@
   - type: Sprite
     state: armory
 
+- type: entity
+  parent: BaseSign
+  id: SignArrivals
+  name: arrivals sign
+  description: A sign indicating where the Arrivals shuttle will dock.
+  components:
+  - type: Sprite
+    state: arrivals
+
 - type: entity
   parent: BaseSign
   id: SignToolStorage
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/arrivals.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/arrivals.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a615548a7b07ec21c910c80036dbf6aa8445318
GIT binary patch
literal 18012
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
B?u7sV

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
index d535ec1dc2..4833c7b814 100644
--- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github), 'direction_atmos' made by SlamBamActionman, 'vox' based on sprites taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'direction_pods' derived by WarPigeon from existing directional signs., 'detective' derived by Soupkilove from existing security sign, direction_evac_glow made by moomoobeef based on existing direction_evac",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github), 'direction_atmos' made by SlamBamActionman, 'vox' based on sprites taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'direction_pods' derived by WarPigeon from existing directional signs., 'detective' derived by Soupkilove from existing security sign, direction_evac_glow made by moomoobeef based on existing direction_evac, 'arrivals' made by SlamBamActionman",
     "states": [
         {
             "name": "ai"
@@ -28,6 +28,9 @@
         {
             "name": "armory"
         },
+        {
+            "name": "arrivals"
+        },
         {
             "name": "barbershop"
         },

From 096f998c3fb54e8434d39b6c8d87e3d22500b67b Mon Sep 17 00:00:00 2001
From: Absotively <jen@jenpollock.ca>
Date: Sun, 5 Oct 2025 14:53:58 -0600
Subject: [PATCH 008/216] Fix species default skin tones (#40707)

fix so that all default Urist entities don't spawn with the same default human skin tone (cursed skin tone Urist McSlime)

(cherry picked from commit 8d9564c23856c342bc3a35834c462e659f5ebd5b)

Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
---
 Content.Shared/Preferences/HumanoidCharacterProfile.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 098f65ef18..5c0c316898 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -205,6 +205,7 @@ namespace Content.Shared.Preferences
             return new()
             {
                 Species = species,
+                Appearance = HumanoidCharacterAppearance.DefaultWithSpecies(species),
             };
         }
 

From f94faf8aebc32cc69e825fc618180d8a8fdbe2f7 Mon Sep 17 00:00:00 2001
From: mq <113324899+mqole@users.noreply.github.com>
Date: Mon, 6 Oct 2025 07:58:46 +1100
Subject: [PATCH 009/216] fix edge case typing indicator error (#40708)

* cleanup rsi error in typingindicatorvisualizersystem

* sprite fix
---
 .../TypingIndicatorVisualizerSystem.cs        |   3 +--
 .../Textures/Effects/speech.rsi/moth3.png     | Bin 2010 -> 1498 bytes
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs b/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
index e1197d4ac4..bb30ca1c55 100644
--- a/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
+++ b/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
@@ -37,8 +37,7 @@ public sealed class TypingIndicatorVisualizerSystem : VisualizerSystem<TypingInd
         if (!layerExists)
             layer = SpriteSystem.LayerMapReserve((uid, args.Sprite), TypingIndicatorLayers.Base);
 
-        SpriteSystem.LayerSetRsi((uid, args.Sprite), layer, proto.SpritePath);
-        SpriteSystem.LayerSetRsiState((uid, args.Sprite), layer, proto.TypingState);
+        SpriteSystem.LayerSetRsi((uid, args.Sprite), layer, proto.SpritePath, proto.TypingState);
         args.Sprite.LayerSetShader(layer, proto.Shader);
         SpriteSystem.LayerSetOffset((uid, args.Sprite), layer, proto.Offset);
 
diff --git a/Resources/Textures/Effects/speech.rsi/moth3.png b/Resources/Textures/Effects/speech.rsi/moth3.png
index 93b1d1be74e1b0a263d3e7fc3ca3cd411f95287e..8fd9b7a08dab73f2d948eb151a8ed17ab777051a 100644
GIT binary patch
delta 1480
zcmZXTYdF&j9LN7V!wz$8sVA2+6p>p}IARzgmn8Q~4HJdz$mKY0|3n#?OSv7<lFD*j
z^iU6TKknufoi%DE&B~>iY&Nsb&WrQnoIWpqFTT(7{rsNqtimk3=nx2rKj(x7nyG4^
z06?<jw1b^@a@E>fJLjO&YEtXQdtTkjbIoS^l5=Eg-gxP)>?x<Lw$@Rk@=$w|Bs-IT
z(cU{DV`wyEfR76zQ)bXE%6+xg$pPzR8N=6Jsh8I@(RtT1|NMGeW8x>qU0Q|8I66XS
zEv?5DpEqB@i(rgbd;^iBVt0!N+-OUa`4EwBs|UV1z!Rq!G>UqZh3ysz%a#wP?l{?|
z>NgWQM|9MR<FII{NJIf1gY-(dc?<()_)D#>As1$!tEOR-lT=F6<X>L(9Be6Eh(f`-
zQVSXP&Hy<CHRz_?QckP1ldOk3u-4Su$s?7>;Ga2Ww#$PW3HdIl9A}=SH|J+7%zSUJ
zaQy7RtKI0IHYZsf`Hku~+x^NsN7>if<&C>2%DT!BC2qzT=>1f}WIiSX4#-aQ$Tk_F
zq+A@mU2ZVl9G>8vgZ7qo;JPw%$vqM$_K8zq=9v`h>OPK_o^sd4I&X{Le1E_z$m_jO
z3hVw|2=3c9*WBo<(MU+#*vMfWPFR(b=&k*9Ag09t8@@)ap=mDNopdr=z;hzbg(C`z
zzML?PbsK3RZZS&uL=Y7oLg~w`4yZ{%Wb-37r)Ki!YArEE5yBnSM^9;c;3J5ZmtTfg
zSYkydM3orr#^wEBZbFm90dt-A*hNxTdKS3NzXe1%;5_O$cM7OQaoE6?Kj_&92OClu
z?#zbN2LcdE7&Ki5-?(t4)!U9P4mtE7hNcIwUr&az${|r<M<T41{sW!uDgq8|+Vl+x
zlIJ$*$X-qw7e=-s?m`TvB0*sM-_xbr!u}WXo!}1C%GyevbC7MUGKxuCKa^af&#&Tb
za|s+_Ouy1Db=W7R_%l3^L!i}-SLLfB-fx}vWVq#tb;M}zJYz+^^)K>axXEk?V%JkX
zj+A2+Pqu|E@3dThN}}R2!Go>aOzBg9$=gFWjqSy)AF#AiQY|U3dofx*#r(xu8xZ=1
z0Tt1EI>2o9ifSOImZhcjZa)BY#G)Lui3961**r$Dea1p?4v*K-p+z~KCH^lQ9$?5n
zJmL-usL&;@jFe3()<<5eQa=*UGPq-k>FU-Wq&AK`H_`M%m-0z;N!fx-8>uUE13{zR
zi1DJa`kCo)1oa8b)+vbs1@Fh>x|16GhDW~@&qjw15iaZHHd7QXmqG9Acj}E~86z8T
zGKr-0zNVAF<b45B@$oR);eW`52)ryN#B!I~Y=D3Ka)nQ%AL_6*6s&fj{$<3<DtkfS
zm4~P5iZ4`#g1`zV{nHKAq%D}UI~4-jdd;xwPSp`uP}`^km394+QXcH657B5;ApF`-
zP#AAs5CNv3D9pfya(r<zLwy$#wK9!+m-geOMvs;?1;92H1g3YD&WwAwQ}w143Iq(1
z61h8bn|byqoVYUuVZKCm>@tTK5Ez|p325lT3JVF?#0?Yip2Z6+1=$!wWwL;#{*{{`
zV9oyO@GSUvB{-U!+)(pghzNJAZ={yqMbw+yMXe|{xV9yJpf#Y|wZF}Tyf_fL#ns)+
z#ec`g_;3Lf|9G=00-N5o_6FH|b!!Le=FVi&;k8>Eovyr6+VGrFmAi!&$|4(l-sr(|
zEtbDWv85@@FVxi|85aV4&mqA;(dSp`!F+2;VYP21u2ZlJNjpCuY!-+FS+x0*rMc!<
z5CAN;*%;fnbU^^WQ?%+=jca4-klRs|m0=u(jw7K&V;|&j+~~0mA2^ldVUx`5zmzT%
z#~Sj@;EP^c8|B?*cK$?6-^F)Z8|}x=6Jsrj)DS^sv?cMoQg}Rxz6(2&&$n?iTwMml
NoOV3p(2Neb{x|kT^dkTO

literal 2010
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
GKKTz{7qG?v


From 0466b8a5d3edc351c081588ff367339a91e54b73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Sun, 5 Oct 2025 16:09:53 -0500
Subject: [PATCH 010/216] Document tags: C - F (#40711)

* one step forward

* the letter C

* some of D

* the letter D

* the letter E

* the letter F

* stay in scope don't stray

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Catalog/Fills/Boxes/emergency.yml         |   1 +
 .../Catalog/Fills/Boxes/general.yml           |   2 +-
 .../Catalog/Fills/Boxes/medical.yml           |   2 +-
 .../Entities/Mobs/Player/observer.yml         |   2 +-
 .../Consumable/Food/Containers/box.yml        |   6 +-
 .../Smokeables/Cigarettes/rolling_paper.yml   |   2 +-
 .../Syndicate_Gadgets/guardian_activators.yml |   3 +-
 .../Objects/Materials/Sheets/other.yml        |   2 +-
 .../Entities/Objects/Misc/folders.yml         |   2 +-
 .../Ammunition/Cartridges/antimateriel.yml    |   1 -
 .../Ammunition/Cartridges/caseless_rifle.yml  |   1 -
 .../Ammunition/Cartridges/heavy_rifle.yml     |   1 -
 .../Ammunition/Cartridges/light_rifle.yml     |   1 -
 .../Guns/Ammunition/Cartridges/magnum.yml     |   1 -
 .../Guns/Ammunition/Cartridges/pistol.yml     |   1 -
 .../Guns/Ammunition/Cartridges/rifle.yml      |   1 -
 .../Guns/Ammunition/Cartridges/shotgun.yml    |   5 -
 .../Guns/Ammunition/Cartridges/toy.yml        |   1 -
 .../Guns/Ammunition/Magazines/pistol.yml      |   2 +-
 .../Weapons/Guns/Launchers/launchers.yml      |   4 +-
 .../Weapons/Guns/Revolvers/revolvers.yml      |   2 +-
 Resources/Prototypes/tags.yml                 | 326 +++++++++---------
 22 files changed, 181 insertions(+), 188 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index 972eb5074b..b5b2fb90d8 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -183,6 +183,7 @@
     - id: DrinkWaterBottleFull
   - type: Tag
     tags:
+    - BoxCardboard
     - BoxHug
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 257dd2ea5e..6c789a8f59 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -408,7 +408,7 @@
   - type: Storage
     grid:
     - 0,0,5,3
-    whitelist:
+    whitelist: # TODO cardboard boxes shouldn't have whitelisting
       tags:
       - Candle
   - type: StorageFill
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
index 7f3a16c33a..53d8a00e1d 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -102,7 +102,7 @@
     layers:
       - state: box
       - state: bodybags
-  - type: Storage
+  - type: Storage # TODO cardboard boxes shouldn't have whitelisting
     whitelist:
       tags:
         - BodyBag
diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
index cb0cfdb693..08bdbe8ebb 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -76,7 +76,7 @@
   components:
   - type: Spectral
   - type: Tag
-    tags:
+    tags: # BAD: Intentional removal of inherited tag
     - AllowGhostShownByEvent
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index 5717a12462..0e8f0ce56d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -533,6 +533,7 @@
     tags:
     - Trash
     - HappyHonk
+    - BoxCardboard
   - type: StorageFill
     contents:
       - id: ToyMouse
@@ -704,7 +705,8 @@
   - type: Tag
     tags:
     - Trash
-    - CluwneHappyHonk
+    - CluwneHappyHonk # BAD: Intentional removal of parent tag
+    - BoxCardboard
   - type: Sprite
     sprite: Objects/Storage/Happyhonk/cluwne.rsi
     state: box
@@ -882,7 +884,7 @@
     grid:
     - 0,0,1,1
     maxItemSize: Normal
-    whitelist:
+    whitelist: # TODO BoxCardboard shouldn't have whitelisted storage
       tags:
       - ClothMade
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
index 44edce5e07..d28fd027e5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
@@ -27,7 +27,7 @@
   id: PackPaperRollingFilters
   description: A pack of filters and thin pieces of paper used to make fine smokeables.
   components:
-  - type: Storage
+  - type: Storage # Redundant
     whitelist:
       tags:
       - RollingPaper
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
index 259d36555e..254dcccde9 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
@@ -65,4 +65,5 @@
       - state: holo
   - type: Tag
     tags:
-      - BoxHug
+    - BoxCardboard
+    - BoxHug
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index 34aff04489..7634f8e3a7 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -108,7 +108,7 @@
         - ReagentId: Plasma
           Quantity: 10
         canReact: false
-  - type: Tag
+  - type: Tag # Redundant
     tags:
     - Sheet
     - ConstructionMaterial
diff --git a/Resources/Prototypes/Entities/Objects/Misc/folders.yml b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
index cee720b6ea..632a27324a 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/folders.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
@@ -263,7 +263,7 @@
   - type: Storage
     grid:
     - 0,0,5,3
-    whitelist:
+    whitelist: # Redundant
       tags:
       - Document
   - type: ItemMapper
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml
index e622952b3f..1fd04ae36f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml
@@ -5,7 +5,6 @@
   components:
   - type: Tag
     tags:
-    - Cartridge
     - CartridgeAntiMateriel
   - type: CartridgeAmmo
     proto: BulletAntiMateriel
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
index fd465b71d6..8d4e9b8ffc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
@@ -6,7 +6,6 @@
   components:
   - type: Tag
     tags:
-      - Cartridge
       - CartridgeCaselessRifle
   - type: CartridgeAmmo
     deleteOnSpawn: true
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
index 51bf0fea54..a953985e9a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
@@ -6,7 +6,6 @@
   components:
   - type: Tag
     tags:
-      - Cartridge
       - CartridgeHeavyRifle
   - type: CartridgeAmmo
     proto: BulletHeavyRifle
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
index bdd4758fd2..b4af723945 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
@@ -6,7 +6,6 @@
   components:
   - type: Tag
     tags:
-    - Cartridge
     - CartridgeLightRifle
   - type: CartridgeAmmo
     proto: BulletLightRifle
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
index c7adfb5b1e..58862b9984 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -6,7 +6,6 @@
   components:
   - type: Tag
     tags:
-      - Cartridge
       - CartridgeMagnum
   - type: CartridgeAmmo
     proto: BulletMagnum
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
index faa094f7f5..ba2b856778 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -6,7 +6,6 @@
   components:
   - type: Tag
     tags:
-      - Cartridge
       - CartridgePistol
   - type: CartridgeAmmo
     proto: BulletPistol
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
index 2559349c4a..d4304ef803 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
@@ -6,7 +6,6 @@
   components:
   - type: Tag
     tags:
-      - Cartridge
       - CartridgeRifle
   - type: CartridgeAmmo
     proto: BulletRifle
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index 72411fc134..3dfab5e84a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -6,7 +6,6 @@
   components:
   - type: Tag
     tags:
-    - Cartridge
     - ShellShotgun
   - type: CartridgeAmmo
     soundEject:
@@ -26,7 +25,6 @@
   components:
   - type: Tag
     tags:
-    - Cartridge
     - ShellShotgun
     - ShellShotgunLight
   - type: Sprite
@@ -59,7 +57,6 @@
   components:
   - type: Tag
     tags:
-    - Cartridge
     - ShellShotgun
     - ShellShotgunLight
   - type: Sprite
@@ -118,7 +115,6 @@
   components:
   - type: Tag
     tags:
-    - Cartridge
     - ShellShotgun
     - ShellShotgunLight
   - type: Sprite
@@ -147,7 +143,6 @@
   components:
   - type: Tag
     tags:
-    - Cartridge
     - ShellShotgun
     - ShellShotgunLight
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
index 6ec93e1778..510a8fef3e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
@@ -6,7 +6,6 @@
   components:
   - type: Tag
     tags:
-      - Cartridge
       - CartridgeCap
   - type: CartridgeAmmo
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index 6af54bb114..47c09282c6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -337,7 +337,7 @@
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistol
-    whitelist:
+    whitelist: # Redundant
       tags:
         - CartridgePistol
     soundInsert:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index de9cea7e52..7a2b44e615 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -425,7 +425,7 @@
   description: It fires large meteors.
   components:
   - type: BallisticAmmoProvider
-    whitelist:
+    whitelist: # Redundant
       tags:
         - CartridgeRocket
     proto: MeteorMedium
@@ -438,7 +438,7 @@
   description: It fires slow immovable rods.
   components:
   - type: BallisticAmmoProvider
-    whitelist:
+    whitelist: # Redundant
       tags:
         - CartridgeRocket
     proto: ImmovableRodSlow
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index 1f24828428..1ea835a2cd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -153,7 +153,7 @@
   suffix: armor-piercing
   components:
   - type: RevolverAmmoProvider
-    whitelist:
+    whitelist: # Redundant
       tags:
         - CartridgeMagnum
         - SpeedLoaderMagnum
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 92c71a9eaf..4f6c018f23 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -40,10 +40,10 @@
   id: Arrow # Storage whitelist: ClothingBeltQuiver
 
 - type: Tag
-  id: ArtifactFragment # Storage whitelist: OreBag, CargoBounty: BountyArtifactFragment, ConstructionGraph: Artifact
+  id: ArtifactFragment # Storage whitelist: OreBag. CargoBounty: BountyArtifactFragment. ConstructionGraph: Artifact
 
 - type: Tag
-  id: ATVKeys # Unused
+  id: ATVKeys # Unused x2
 
 ## B ##
 
@@ -57,7 +57,7 @@
   id: Banana # CargoBounty: BountyBanana
 
 - type: Tag
-  id: BananaPeel # SpecialDigestible by OrganAnimalRuminantStomach, and several BananaClown ConstructionGraphs
+  id: BananaPeel # SpecialDigestible by OrganAnimalRuminantStomach. Several BananaClown ConstructionGraphs
 
 - type: Tag
   id: Bandana # CargoBounty: BountyBandana
@@ -66,13 +66,13 @@
   id: BaseballBat # CargoBounty: BountyBaseballBat
 
 - type: Tag
-  id: BBQsauce # Storage whitelist: ClothingBeltChef and FoodCartHot, ItemMapper: ClothingBeltChef and FoodCartHot
+  id: BBQsauce # Storage whitelist: ClothingBeltChef and FoodCartHot. ItemMapper: ClothingBeltChef and FoodCartHot
 
 - type: Tag
   id: Bedsheet # CargoBounty: BountyBedsheet
 
 - type: Tag
-  id: Bee # Mode switch whitelisting for BuzzochloricBees (only damages non-bees)
+  id: Bee # Mode switching for BuzzochloricBees (only damages non-bees)
 
 - type: Tag
   id: Beer # CargoBounty: BountyBeer
@@ -87,7 +87,7 @@
   id: BlueprintAutolathe # Whitelist on BlueprintReceiverComponent on the autolate for linking this entity's BlueprintComponent
 
 - type: Tag
-  id: BodyBag # Storage whitelist: BoxBodyBag # TODO cardboard boxes shouldn't have whitelisting
+  id: BodyBag # Storage whitelist: BoxBodyBag
 
 - type: Tag
   id: Boll # MaterialStorage whitelist: Sheetifier
@@ -147,16 +147,16 @@
   id: BorgModuleSyndicateAssault # Cyborg module category for extra evil red robots (nukies)
 
 - type: Tag
-  id: Bot # Unused
+  id: Bot # Unused (Exists on MobRobotic, MobSupplyBot)
 
 - type: Tag
-  id: BotanyHatchet # Storage whitelist: ClothingBeltPlant, ItemMapper: ClothingBeltPlant
+  id: BotanyHatchet # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant
 
 - type: Tag
-  id: BotanyHoe # Storage whitelist: ClothingBeltPlant, ItemMapper: ClothingBeltPlant
+  id: BotanyHoe # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant
 
 - type: Tag
-  id: BotanyShovel # Storage whitelist: ClothingBeltPlant, ItemMapper: ClothingBeltPlant
+  id: BotanyShovel # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant
 
 - type: Tag # Used for specifically chemistry bottles
   id: Bottle # Storage whitelist: ChemMaster, ChemBag, SmartFridge, ClothingBeltJanitor, ClothingBeltMedical, ClothingBeltPlant
@@ -165,10 +165,10 @@
   id: BoxCardboard # CargoBounty: BountyCardboardBox
 
 - type: Tag
-  id: BoxHug # Unused
+  id: BoxHug # Unused (Exists on BoxHug, BoxHoloclown)
 
 - type: Tag
-  id: Brain # Storage whitelist: MMI. CargoBounty: BountyBrain. FoodSequenceElement: Brain
+  id: Brain # Storage whitelist: MMI. CargoBounty: BountyBrain
 
 - type: Tag
   id: BrassInstrument # MachineBoard construction: DawInstrumentMachineCircuitboard
@@ -177,7 +177,7 @@
   id: Bread # CargoBounty: BountyBread. Blacklisted in BountyFruit and BountyVegetable
 
 - type: Tag
-  id: Briefcase # Unused
+  id: Briefcase # Unused (exists on BriefcaseBase)
 
 - type: Tag
   id: BrimFlatcapBrown # ConstructionGraph: BladedFlatcapBrown
@@ -192,16 +192,16 @@
   id: Bucket # Storage whitelist: JanitorialTrolley. ItemMapper: JanitorialTrolley. ConstructionGraph: CleanBot, scraphelmet
 
 - type: Tag
-  id: Burger # Unused x2 (this is the only place burger tag exists)
+  id: Burger # Food sequence key
 
 - type: Tag
-  id: BulletFoam # BallisticAmmoProviderComponent whitelist for WeaponRifleFoam, FoamCrossbow, MagazineFoamBox, BoxDonkSoftBox
+  id: BulletFoam # Ammo: WeaponRifleFoam, FoamCrossbow, MagazineFoamBox, BoxDonkSoftBox
 
 - type: Tag
   id: Burnt # Storage whitelist: ashtray. Seemingly redundant
 
 - type: Tag
-  id: Bun # FoodSequenceElement: BunTopBurger, CottonBunTopBurger
+  id: Bun # Unused (Exists on FoodSequenceElements BunTopBurger and CottonBunTopBurger)
 
 - type: Tag
   id: BypassDropChecks # Entities with this tag don't care about drop distance or walls (Aghost)
@@ -212,414 +212,416 @@
 ## C ##
 
 - type: Tag
-  id: CableCoil
+  id: CableCoil # Storage whitelist: ClothingBeltUtility, BorgModuleCable
 
 - type: Tag
-  id: Candle
+  id: Candle # Storage whitelist: BoxCandle
 
 - type: Tag
-  id: Cake
+  id: Cake # CargoBounty blacklist: BountyFruit, BountyVegetable
 
 - type: Tag
-  id: CaneBlade
+  id: CaneBlade # Storage whitelist: CaneSheath. ItemMapper: CaneSheath
 
 - type: Tag
-  id: CannonBall
+  id: CannonBall # Ammo: WeaponLauncherPirateCannon, ShuttleGunPirateCannon
 
 - type: Tag
-  id: CannotSuicide
+  id: CannotSuicide # Used by SuicideSystem. Entities with this tag ghost when attempting to suicide
 
 - type: Tag
-  id: CanPilot
+  id: CanPilot # Used by ShuttleConsoleSystem to guard who's allowed to pilot ships
 
 - type: Tag
-  id: CaptainSabre
+  id: CaptainSabre # Storage whitelist: ClothingBeltSheath. ItemMapper: ClothingBeltSheath
 
 - type: Tag
-  id: Carpet
+  id: Carpet # Unused (exists on carpets (obviously))
 
 - type: Tag
-  id: Carrot
+  id: Carrot # CargoBounty: BountyCarrot
 
 - type: Tag
-  id: CarrotFries
+  id: CarrotFries # CargoBounty: BountyCarrotFries
 
 - type: Tag
-  id: Carp
+  id: Carp # CargoBounty: BountyCarp
+
+- type: Tag # NOT bullets. This is for the cart to load PDA programs
+  id: Cartridge # Storage whitelist: BasePDA, TrashBag
 
 - type: Tag
-  id: Cartridge
+  id: CartridgeAntiMateriel # Ammo: WeaponSniperHristov, Musket, BaseMagazineBoxAntiMateriel
 
 - type: Tag
-  id: CartridgeAntiMateriel
+  id: CartridgeCap # Ammo: RevolverCapGun, RevolverCapGunFake, BaseSpeedLoaderCap
 
 - type: Tag
-  id: CartridgeCap
+  id: CartridgeCaselessRifle # Ammo: WeaponPistolCobra, BaseMagazineCaselessRifle, BaseMagazineBoxCaselessRifle
 
 - type: Tag
-  id: CartridgeCaselessRifle
+  id: CartridgeCHIMP # Unused x2
 
 - type: Tag
-  id: CartridgeCHIMP
+  id: CartridgeHeavyRifle # Unused (exists on BaseCartridgeHeavyRifle)
 
 - type: Tag
-  id: CartridgeHeavyRifle
+  id: CartridgeLightRifle # Ammo: BaseWeaponLightMachineGun, BaseWeaponRifle, BaseWeaponSniper
+                          # SpeedLoaderLightRifle, BaseMagazineLightRifle, BaseMagazineBoxLightRifle
 
 - type: Tag
-  id: CartridgeLightRifle
+  id: CartridgeMagnum # Ammo: BaseWeaponRevolver, RevolverCapGunFake, WeaponPistolN1984, WeaponPistolFlintlock, XenoArtifactGun
+                      # BaseMagazineBoxMagnum, BaseMagazineMagnum, BaseSpeedLoaderMagnum
 
 - type: Tag
-  id: CartridgeMagnum
+  id: CartridgePistol # Ammo: BaseWeaponPistol, BasePistol, BaseWeaponSubMachineGun, WeaponPistolViper, WeaponSubMachineGunDrozd, WeaponSubMachineGunWt550
+                      # BaseMagazineBoxPistol, BaseMagazinePistol, BaseMagazinePistolHighCapacity, BaseMagazinePistolSubMachineGun, MagazinePistolSubMachineGunTopMounted, BaseSpeedLoaderPistol
 
 - type: Tag
-  id: CartridgePistol
+  id: CartridgeRifle # Ammo: BaseMagazineRifle, WeaponRifleLecter, WeaponRifleEstoc, WeaponRifleM90GrenadeLauncher, BaseMagazineBoxRifle
 
 - type: Tag
-  id: CartridgeRifle
+  id: CartridgeRocket # Ammo: WeaponLauncherRocket, WeaponLauncherMultipleRocket
 
 - type: Tag
-  id: CartridgeRocket
-
-# Allows you to walk over tile entities such as lava without steptrigger
-- type: Tag
-  id: Catwalk
+  id: Catwalk # Allows you to walk over tile entities such as lava without steptrigger
 
 - type: Tag
-  id: CentrifugeCompatible
+  id: CentrifugeCompatible # Storage whitelist: MachineCentrifuge
 
 - type: Tag
-  id: Chicken
+  id: Chicken # MetamorphRecipe: FoodBurgerChicken
 
 - type: Tag
-  id: Cheese
-
-# Allowed to control someone wearing a Chef's hat if inside their hat.
-- type: Tag
-  id: ChefPilot
+  id: Cheese # MetamorphRecipe: FoodBurgerCheese, FoodBurgerDuck
 
 - type: Tag
-  id: ChemDispensable # container that can go into the chem dispenser
+  id: ChefPilot # Allowed to control someone wearing a Chef's hat if inside their hat.
 
 - type: Tag
-  id: ChiliBowl
+  id: ChemDispensable # Storage whitelist: ChemDispenserEmpty, SmartFridge, BorgModuleAdvancedChemical
 
 - type: Tag
-  id: Cigarette
+  id: ChiliBowl # CargoBounty: BountyChili
 
 - type: Tag
-  id: CigFilter
+  id: Cigarette # Storage whitelist: Ashtray
 
 - type: Tag
-  id: CigPack
+  id: CigFilter # Storage whitelist: PackPaperRolling
 
 - type: Tag
-  id: Cleaver
+  id: CigPack # Storage whitelist: ClothingBeltUtility, ClothingBeltAssault, ClothingBeltChef, ClothingBeltMedical, ClothingBeltJanitor
 
 - type: Tag
-  id: ClockworkGlassShard
+  id: Cleaver # Storage whitelist: ClothingBeltChef. ItemMapper: ClothingBeltChef
 
 - type: Tag
-  id: ClothMade
+  id: ClockworkGlassShard # Unused (Exists on ShardGlassClockwork)
 
 - type: Tag
-  id: ClownMask
+  id: ClothMade # SpecialDigestible: OrganMothStomach. Storage whitelist: FoodBoxCloth
 
 - type: Tag
-  id: ClownRecorder
+  id: ClownMask # CargoBounty: BountyClownCostume. ConstructionGraph: Honker, BananaClownMask
 
 - type: Tag
-  id: ClownRubberStamp
+  id: ClownRecorder # ConstructionGraph: ClownHardsuit
 
 - type: Tag
-  id: ClownShoes
+  id: ClownRubberStamp # Unused: RubberStampClown
 
 - type: Tag
-  id: ClownSuit
+  id: ClownShoes # CargoBounty: BountyClownCostume. ConstructionGraph: Honker, BananaClownShoes
 
 - type: Tag
-  id: CluwneHappyHonk
+  id: ClownSuit # ConstructionGraph: BananaClownJumpsuit
 
 - type: Tag
-  id: CluwneHorn
+  id: CluwneHappyHonk # ConstructionGraph: JonkBot
 
 - type: Tag
-  id: Cola
+  id: CluwneHorn # ConstructionGraph: JonkBot
 
 - type: Tag
-  id: Coldsauce
+  id: Cola  # Storage whitelist: DrinkCanPack
 
 - type: Tag
-  id: CombatKnife
+  id: Coldsauce # Storage whitelist: ClothingBeltChef and FoodCartHot. ItemMapper: ClothingBeltChef and FoodCartHot
 
 - type: Tag
-  id: ComputerTelevisionCircuitboard
+  id: CombatKnife # Storage whitelist: ClothingBeltSecurity
 
 - type: Tag
-  id: ConstructionMaterial
+  id: ComputerTelevisionCircuitboard # ConstructionGraph: WallmountTelevision
 
 - type: Tag
-  id: ConveyorAssembly
+  id: ConstructionMaterial # Storage whitelist: BorgModuleConstruction
 
 - type: Tag
-  id: CoordinatesDisk
+  id: ConveyorAssembly # ConstructionGraph: ConveyorGraph
+
+- type: Tag
+  id: CoordinatesDisk # Storage whitelist: DiskCase
 
 - type: Tag # designed to let corgis wear things; at present only for SmartCorgi.  View PR 33737 on upstream for more dog wearables
   id: CorgiWearable
 
 - type: Tag #Ohioans die happy
-  id: Corn
+  id: Corn  # CargoBounty: BountyCorn
 
 - type: Tag
-  id: CottonBoll
+  id: CottonBoll # CargoBounty: BountyCottonBoll
 
 - type: Tag
-  id: CottonBurger
+  id: CottonBurger # Food sequence key
 
 - type: Tag
-  id: Cow
+  id: Cow # Reproduction key
 
 - type: Tag
-  id: Crab
+  id: Crab # MetamorphRecipe: FoodBurgerCrab
 
 - type: Tag
-  id: Crayon
+  id: Crayon # SpecialDigestible: OrganAnimalStomach. CargoBounty: BountyCrayon
 
 - type: Tag
-  id: CrayonBlack
+  id: CrayonBlack # ConstructionGraph: MimeHardsuit. ItemMapper: CrayonBox
 
 - type: Tag
-  id: CrayonBlue
+  id: CrayonBlue # ItemMapper: CrayonBox
 
 - type: Tag
-  id: CrayonGreen
+  id: CrayonGreen # ItemMapper: CrayonBox
 
 - type: Tag
-  id: CrayonOrange
+  id: CrayonOrange # ItemMapper: CrayonBox
 
 - type: Tag
-  id: CrayonPurple
+  id: CrayonPurple # ConstructionGraph: ClownHardsuit. ItemMapper: CrayonBox
 
 - type: Tag
-  id: CrayonRed
+  id: CrayonRed # ConstructionGraph: MimeHardsuit, ClownHardsuit. ItemMapper: CrayonBox
 
 - type: Tag
-  id: CrayonWhite
+  id: CrayonWhite # ItemMapper: CrayonBox
 
 - type: Tag
-  id: CrayonYellow
+  id: CrayonYellow # ConstructionGraph: ClownHardsuit. ItemMapper: CrayonBox
 
 - type: Tag
-  id: Creamsicle
+  id: Creamsicle # Blacklist on BountyFruit
 
 - type: Tag
-  id: Crowbar
+  id: Crowbar # Storage whitelist: ClothingBeltUtility, ClothingBeltChiefEngineer. ItemMapper: ClothingBeltUtility, ClothingBeltChiefEngineer
 
 - type: Tag
-  id: CrowbarRed
+  id: CrowbarRed # Storage whitelist: ClothingBeltUtility, ClothingBeltChiefEngineer. ItemMapper: ClothingBeltUtility, ClothingBeltChiefEngineer
 
 - type: Tag
-  id: Cryobeaker
+  id: Cryobeaker # Unused x2
 
 - type: Tag
-  id: CrystalBlack
+  id: CrystalBlack # ConstructionGraph: BlackLight, BlackLightBulb
 
 - type: Tag
-  id: CrystalBlue
+  id: CrystalBlue # ConstructionGraph: BlueLight, BlueLightBulb
 
 - type: Tag
-  id: CrystalCyan
+  id: CrystalCyan # ConstructionGraph: CyanLight, CyanLightBulb
 
 - type: Tag
-  id: CrystalGreen
+  id: CrystalGreen # ConstructionGraph: GreenLight, GreenLightBulb
 
 - type: Tag
-  id: CrystalOrange
+  id: CrystalOrange # ConstructionGraph: OrangeLight, OrangeLightBulb
 
 - type: Tag
-  id: CrystalPink
+  id: CrystalPink # ConstructionGraph: PinkLight, PinkLightBulb
 
 - type: Tag
-  id: CrystalRed
+  id: CrystalRed # ConstructionGraph: RedLight, RedLightBulb
 
 - type: Tag
-  id: CrystalYellow
+  id: CrystalYellow # ConstructionGraph: YellowLight, YellowLightBulb
 
 - type: Tag
-  id: CubanCarp
+  id: CubanCarp # CargoBounty: BountyCubanCarp
 
 ## D ##
 
 - type: Tag
-  id: DeathAcidifier
+  id: DeathAcidifier # Unused (Exists on DeathAcidifierImplant)
 
 - type: Tag
-  id: Debug
+  id: Debug # Exists on various debug / testing entities, but seemingly unused
+
+- type: Tag # Exists on diagonal walls and windows
+  id: Diagonal # Used by TileWallsCommand and FixRotationsCommand
 
 - type: Tag
-  id: Diagonal
+  id: Diamond # CargoBounty: BountySalvageDiamond
 
 - type: Tag
-  id: Diamond
+  id: Dice # Storage whitelist: BorgModuleService, DiceBag, BooksBag
 
 - type: Tag
-  id: Dice
+  id: DiscreteHealthAnalyzer # Storage whitelist: ClothingBeltMedical. ConstructionGraph: MediBot
 
 - type: Tag
-  id: DiscreteHealthAnalyzer #So construction recipes don't eat medical PDAs
+  id: DNASolutionScannable # Used by ForensicScannerSystem for scanning a solution container. Exists only on Puddle
 
 - type: Tag
-  id: DNASolutionScannable
+  id: DockArrivals # Used by ArrivalsSystem for finding a priority FTL destination
 
 - type: Tag
-  id: DockArrivals
+  id: DockCargo # Unused x2
 
 - type: Tag
-  id: DockCargo
+  id: DockEmergency # Used bv EmergencyShuttleSystem
 
 - type: Tag
-  id: DockEmergency
+  id: Document # A superset of Paper tag. Represents a paper-like entity with writing on it, but is not necessarily writeable itself.
 
 - type: Tag
-  id: Document
+  id: DonkPocket # Storage whitelist: FoodBoxDonkpocket
 
 - type: Tag
-  id: DonkPocket
+  id: Donut # Storage whitelist: FoodBoxDonut. CargoBounty: BountyDonut
 
 - type: Tag
-  id: Donut
+  id: DoorBumpOpener # Used by SharedDoorSystem to allow entities to open doors when they collide.
 
 - type: Tag
-  id: DoorBumpOpener
+  id: DoorElectronics  # ConstructionGraph: PinionAirlock, BlastDoor, Windoor
+                       # Used interchangeably with DoorElectronicsComponent, sometimes even in the same graph. TODO pick one
 
 - type: Tag
-  id: DoorElectronics
+  id: DoorElectronicsConfigurator # Used by ActivatableUIComponent on entity DoorElectronics to whitelist a tool to open the UI.
 
 - type: Tag
-  id: DoorElectronicsConfigurator
+  id: DrinkBottle # Storage whitelist: BoozeDispenserEmpty, SodaDispenserEmpty
 
 - type: Tag
-  id: DrinkBottle
+  id: DrinkCan # ConstructionGraph: FireBomb
 
 - type: Tag
-  id: DrinkCan
+  id: DrinkCup # Unused. Exists on DrinkBaseCup, DrinkWaterCup, DrinkGlass
 
 - type: Tag
-  id: DrinkCup
+  id: DrinkGlass # Unused. Exists on DrinkGlass, DrinkShotGlass, DrinkJarWhat, DrinkShakeBase
 
 - type: Tag
-  id: DrinkGlass
+  id: DrinkSpaceGlue # Unused. Exists on DrinkSpaceGlue, CrazyGlue
 
 - type: Tag
-  id: DrinkSpaceGlue
+  id: Dropper # Storage whitelist: ClothingBeltMedical, ClothingBeltPlant, ChemBag
 
 - type: Tag
-  id: Dropper
-
-- type: Tag
-  id: Duck
+  id: Duck # Reproduction key. MetamorphRecipe: FoodBurgerDuck
 
 ## E ##
 
 - type: Tag
-  id: Ectoplasm
+  id: Ectoplasm # ConstructionGraph: PlushieGhostRevenant
 
 - type: Tag
-  id: Egg
+  id: Egg # Storage whitelist: FoodContainerEgg
 
 - type: Tag
-  id: EmagImmune
+  id: EmagImmune # Default value in EmagComponent to prevent the emag
 
 - type: Tag
-  id: EmitterBolt
+  id: EmitterBolt # Default value in ContainmentFieldGeneratorComponent for collisions that power the generator
 
 - type: Tag
-  id: EncryptionCargo
+  id: EncryptionCargo # ItemMapper: TelecomServer
 
 - type: Tag
-  id: EncryptionCommand
+  id: EncryptionCommand # ItemMapper: TelecomServer
 
 - type: Tag
-  id: EncryptionCommon
+  id: EncryptionCommon # ItemMapper: TelecomServer
 
 - type: Tag
-  id: EncryptionElse
+  id: EncryptionElse # Unused x2
 
 - type: Tag
-  id: EncryptionEngineering
+  id: EncryptionEngineering # ItemMapper: TelecomServer
 
 - type: Tag
-  id: EncryptionMedical
+  id: EncryptionMedical # ItemMapper: TelecomServer
 
 - type: Tag
-  id: EncryptionScience
+  id: EncryptionScience # ItemMapper: TelecomServer
 
 - type: Tag
-  id: EncryptionSecurity
+  id: EncryptionSecurity # ItemMapper: TelecomServer
 
 - type: Tag
-  id: EncryptionService
+  id: EncryptionService # ItemMapper: TelecomServer
 
 - type: Tag
-  id: Enzyme
+  id: Enzyme # Storage whitelist: ClothingBeltChef. ItemMapper: ClothingBeltChef
 
 - type: Tag
-  id: ExCable
+  id: ExCable # Placement blacklist on CableDetStack. Placement whitelist on WiredDetonator
 
 - type: Tag
-  id: ExplosivePassable
+  id: ExplosivePassable # Unused x2
 
 ## F ##
 
 - type: Tag
-  id: FakeMindShieldImplant
+  id: FakeMindShieldImplant # Used by FakeMindShieldSystem to toggle the action when a chameleon outfit is selected
 
 - type: Tag
-  id: FakeNukeDisk
+  id: FakeNukeDisk # Exists so that the fake nuke disk can be blacklisted by storages that blacklist the real disk
 
 - type: Tag
-  id: Figurine
+  id: Figurine # Storage whitelist: BooksBag, BorgModuleService. CargoBounty: BountyFigurine
 
 - type: Tag
-  id: FireAlarm
+  id: FireAlarm # Used by AtmosAlarmableComponent for syncing devices
 
 - type: Tag
-  id: FireAlarmElectronics
+  id: FireAlarmElectronics # ConstructionGraph: FireAlarmAssembly
 
 - type: Tag
-  id: FireAxe
+  id: FireAxe # Storage whitelist: FireAxeCabinet
 
 - type: Tag
-  id: FirelockElectronics
+  id: FirelockElectronics # ConstructionGraph: Firelock
 
 - type: Tag
-  id: FireExtinguisher
+  id: FireExtinguisher # ConstructionGraph: FireBot
 
 - type: Tag
-  id: FireHelmet
+  id: FireHelmet # ConstructionGraph: FireBot
 
 - type: Tag
-  id: Flare
+  id: Flare # Storage whitelist: ClothingBeltUtility
 
 - type: Tag
-  id: Flashlight
+  id: Flashlight # Storage whitelist: ClothingBeltUtility, ClothingBeltJanitor
 
 - type: Tag
-  id: Flesh
+  id: Flesh # Used by FleshKudzu to ignore contacts with flesh creatures
 
 - type: Tag
-  id: Flower
+  id: Flower # CargoBounty: flowerwreath. CargoBounty: BountyFlower
 
 - type: Tag
-  id: Folder
+  id: Folder # Storage whitelist: Bookshelf, NoticeBoard
 
 - type: Tag
-  id: FoodSnack
+  id: FoodSnack # Storage whitelist: CandyBucket, CandyBowl. ItemMapper: CandyBowl
 
 - type: Tag
-  id: FootstepSound
+  id: FootstepSound # SharedMoverController checks for this before playing footstep sounds
 
 - type: Tag
-  id: ForceableFollow
+  id: ForceableFollow # Used by FollowerSystem to give entities an altverb to start orbiting the user
 
 - type: Tag
   id: ForceFixRotations # fixrotations command WILL target this
@@ -628,10 +630,10 @@
   id: ForceNoFixRotations # fixrotations command WON'T target this
 
 - type: Tag
-  id: FreezerElectronics
+  id: FreezerElectronics # ConstructionGraph: CrateFreezer, ClosetFreezer
 
 - type: Tag
-  id: Fruit
+  id: Fruit # SpecialDigestible: OrganReptilianStomach. CargoBounty: BountyFruit
 
 ## G ##
 
@@ -1070,7 +1072,7 @@
   id: ParadoxCloneObjectiveBlacklist # objective entities with this tag don't get copied to paradox clones
 
 - type: Tag
-  id: Paper
+  id: Paper # A writeable piece of paper. Subset of Document tag. SpecialDigestible: OrganMothStomach, OrganReptilianStomach
 
 - type: Tag
   id: Pancake
@@ -1323,7 +1325,7 @@
   id: SkeletonMotorcycleKeys
 
 - type: Tag
-  id: Skewer
+  id: Skewer # Food sequence key
 
 - type: Tag
   id: Slice # sliced fruit, vegetables, pizza etc.
@@ -1436,7 +1438,7 @@
   id: TabletopBoard
 
 - type: Tag
-  id: Taco
+  id: Taco # Food sequence key
 
 - type: Tag
   id: TabletopPiece

From 326eaad18dc784e66970d0cb04bcd360324f2e9f Mon Sep 17 00:00:00 2001
From: Centronias <charlie.t.santos@gmail.com>
Date: Sun, 5 Oct 2025 15:00:33 -0700
Subject: [PATCH 011/216] Prioritize spoon mixing over drinking (#40704)

* no, I can't use a spoon to drink a drink.

* Update Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
---
 .../Chemistry/EntitySystems/ReactionMixerSystem.cs           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs b/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
index 3913afbd07..ee99418970 100644
--- a/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
@@ -19,7 +19,7 @@ public sealed partial class ReactionMixerSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<ReactionMixerComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<ReactionMixerComponent, AfterInteractEvent>(OnAfterInteract, before: [typeof(IngestionSystem)]);
         SubscribeLocalEvent<ReactionMixerComponent, ShakeEvent>(OnShake);
         SubscribeLocalEvent<ReactionMixerComponent, ReactionMixDoAfterEvent>(OnDoAfter);
     }
@@ -29,12 +29,13 @@ public sealed partial class ReactionMixerSystem : EntitySystem
         if (!args.Target.HasValue || !args.CanReach || !entity.Comp.MixOnInteract)
             return;
 
-        if (!MixAttempt(entity, args.Target.Value, out var solution))
+        if (!MixAttempt(entity, args.Target.Value, out _))
             return;
 
         var doAfterArgs = new DoAfterArgs(EntityManager, args.User, entity.Comp.TimeToMix, new ReactionMixDoAfterEvent(), entity, args.Target.Value, entity);
 
         _doAfterSystem.TryStartDoAfter(doAfterArgs);
+        args.Handled = true;
     }
 
     private void OnDoAfter(Entity<ReactionMixerComponent> entity, ref ReactionMixDoAfterEvent args)

From 526ca2f800b191ff1276f4157c62f191ccc9e7ff Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 27 Sep 2025 20:53:00 +0000
Subject: [PATCH 012/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c30974ca1f..d89cb355b2 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: You can now patch holes in the floors of the evac shuttle and ATS.
-    type: Fix
-  id: 8501
-  time: '2025-05-17T01:54:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36989
 - author: Lanedon
   changes:
   - message: Multiple head gear now hides the hair !
@@ -3963,3 +3956,10 @@
   id: 9011
   time: '2025-09-27T17:01:14.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39914
+- author: SignalSender
+  changes:
+  - message: reworked salv instrument spawns to include more instruments
+    type: Tweak
+  id: 9012
+  time: '2025-09-27T20:51:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40572

From 56cf3f536d3f3296cfe9e21eb0611076095f953c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 27 Sep 2025 21:22:14 +0000
Subject: [PATCH 013/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index d89cb355b2..ae9e5dfdd7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Lanedon
-  changes:
-  - message: Multiple head gear now hides the hair !
-    type: Fix
-  id: 8502
-  time: '2025-05-17T05:05:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36818
 - author: ArtisticRoomba
   changes:
   - message: Metal foam grenades have been added to station engineer lockers.
@@ -3963,3 +3956,11 @@
   id: 9012
   time: '2025-09-27T20:51:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40572
+- author: keronshb
+  changes:
+  - message: 'EXPERIMENTAL: Tasers, a short-ranged gun capable of causing targets
+      to become prone, are now added into Warden, HoS, and Security locker fills.'
+    type: Add
+  id: 9013
+  time: '2025-09-27T21:21:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39087

From 7a6152217ee091802aef53dbefdb86f825245966 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 28 Sep 2025 03:26:49 +0000
Subject: [PATCH 014/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ae9e5dfdd7..b0f07193f9 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,18 +1,4 @@
 Entries:
-- author: ArtisticRoomba
-  changes:
-  - message: Metal foam grenades have been added to station engineer lockers.
-    type: Add
-  - message: Metal foam grenades have been tweaked to cover more area over a longer
-      period of time.
-    type: Tweak
-  - message: Metal foam grenades now have a 5 second timer.
-    type: Tweak
-  - message: Aluminum foam walls now take one hit to destroy.
-    type: Tweak
-  id: 8503
-  time: '2025-05-17T05:21:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37476
 - author: EmoGarbage404
   changes:
   - message: Fixed tetherguns not having a beam when dragging.
@@ -3964,3 +3950,10 @@
   id: 9013
   time: '2025-09-27T21:21:05.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39087
+- author: SurrealShibe
+  changes:
+  - message: Vulpkanin now audibly gasp.
+    type: Fix
+  id: 9014
+  time: '2025-09-28T03:25:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40579

From 424c057c9220744c83d05a38e34f79dcc19b6070 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 28 Sep 2025 03:44:11 +0000
Subject: [PATCH 015/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b0f07193f9..399c7a600c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: Fixed tetherguns not having a beam when dragging.
-    type: Fix
-  id: 8504
-  time: '2025-05-17T05:22:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37510
 - author: aada
   changes:
   - message: Id cards now have the same max length as character names.
@@ -3957,3 +3950,10 @@
   id: 9014
   time: '2025-09-28T03:25:39.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40579
+- author: keronshb
+  changes:
+  - message: Tasers can now be used by Pacifists.
+    type: Tweak
+  id: 9015
+  time: '2025-09-28T03:43:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40588

From bcdaae489e7b814ded24f8b2775af146da83121f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 28 Sep 2025 18:34:40 +0000
Subject: [PATCH 016/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 399c7a600c..78f8cf0e39 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: aada
-  changes:
-  - message: Id cards now have the same max length as character names.
-    type: Fix
-  id: 8505
-  time: '2025-05-17T05:27:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35407
 - author: ArtisticRoomba
   changes:
   - message: Radiation collector power output has been buffed. Remember engineers,
@@ -3957,3 +3950,10 @@
   id: 9015
   time: '2025-09-28T03:43:02.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40588
+- author: beck-thompson
+  changes:
+  - message: Labelers can no longer add markup tags to items
+    type: Fix
+  id: 9016
+  time: '2025-09-28T18:33:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40600

From 9d3fde24f42cf09ab36d080f2e02877afd913e43 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 29 Sep 2025 10:29:55 +0000
Subject: [PATCH 017/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 78f8cf0e39..3e525b0ccf 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: ArtisticRoomba
-  changes:
-  - message: Radiation collector power output has been buffed. Remember engineers,
-      the third level on the PA is safe for long term use!
-    type: Tweak
-  id: 8506
-  time: '2025-05-17T07:45:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37475
 - author: Ilya246
   changes:
   - message: Shuttles can now deal (weak) collision damage.
@@ -3957,3 +3949,10 @@
   id: 9016
   time: '2025-09-28T18:33:27.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40600
+- author: SirWarock
+  changes:
+  - message: Fixed Shotgun Ammo Count not properly updating when reloading!
+    type: Fix
+  id: 9017
+  time: '2025-09-29T10:28:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40568

From f2dcd27ecb820810e89569035388132fc2041dfc Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 30 Sep 2025 03:46:36 +0000
Subject: [PATCH 018/216] Automatic changelog update

---
 Resources/Changelog/Maps.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index eba4933919..227040557a 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -731,4 +731,11 @@
   id: 88
   time: '2025-09-25T21:36:16.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40546
+- author: Absotively
+  changes:
+  - message: Updated Elkridge's burn chambers for safer delta pressure handling
+    type: Tweak
+  id: 89
+  time: '2025-09-30T03:45:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40590
 Order: 1

From c031b95f42165b6947c0b1fa75ce94bc64bd823d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 30 Sep 2025 21:56:21 +0000
Subject: [PATCH 019/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 3e525b0ccf..a78c8e387f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Ilya246
-  changes:
-  - message: Shuttles can now deal (weak) collision damage.
-    type: Add
-  id: 8507
-  time: '2025-05-17T17:11:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37422
 - author: VlaDOS1408
   changes:
   - message: Fax UI Menu has been reworked and now behaves better on resizing
@@ -3956,3 +3949,11 @@
   id: 9017
   time: '2025-09-29T10:28:45.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40568
+- author: BoskiYourk, spanky_spanky
+  changes:
+  - message: Microwaves can now be picked up when unwrenched, and optionally, used
+      as a weapon.
+    type: Tweak
+  id: 9018
+  time: '2025-09-30T21:55:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40618

From f9d9db6cfa38671fd9d9381bddd84f17b153f1f0 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 1 Oct 2025 04:06:56 +0000
Subject: [PATCH 020/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a78c8e387f..0a6df6eb48 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: VlaDOS1408
-  changes:
-  - message: Fax UI Menu has been reworked and now behaves better on resizing
-    type: Tweak
-  id: 8508
-  time: '2025-05-17T17:20:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33825
 - author: YotaXP
   changes:
   - message: Favorites selected in the construction menu will now persist between
@@ -3957,3 +3950,10 @@
   id: 9018
   time: '2025-09-30T21:55:10.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40618
+- author: leahcat
+  changes:
+  - message: moved desoxyephedrine from ambrosia plants to glasstle.
+    type: Tweak
+  id: 9019
+  time: '2025-10-01T04:05:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40638

From a4b34c6a3c3f38dfd24065e22084af94063d0ba0 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 1 Oct 2025 11:47:45 +0000
Subject: [PATCH 021/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 0a6df6eb48..93202dfe94 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: YotaXP
-  changes:
-  - message: Favorites selected in the construction menu will now persist between
-      rounds.
-    type: Tweak
-  id: 8509
-  time: '2025-05-17T17:37:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35867
 - author: perryprog
   changes:
   - message: You can now link cutter machines to material silos.
@@ -3957,3 +3949,10 @@
   id: 9019
   time: '2025-10-01T04:05:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40638
+- author: SignalSender
+  changes:
+  - message: Musicians now have a Stage Name
+    type: Tweak
+  id: 9020
+  time: '2025-10-01T11:46:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40640

From 3218642e132d44f830e4fb1820a9f08c34c53d38 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 1 Oct 2025 20:24:48 +0000
Subject: [PATCH 022/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 93202dfe94..c417ac17b2 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,18 +1,4 @@
 Entries:
-- author: perryprog
-  changes:
-  - message: You can now link cutter machines to material silos.
-    type: Tweak
-  id: 8510
-  time: '2025-05-18T01:51:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37554
-- author: Spangs04
-  changes:
-  - message: Resprited Telecomms
-    type: Tweak
-  id: 8511
-  time: '2025-05-18T02:10:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35811
 - author: EmoGarbage404
   changes:
   - message: Added the salvage job board! This board allows salvagers to access and
@@ -3956,3 +3942,18 @@
   id: 9020
   time: '2025-10-01T11:46:34.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40640
+- author: Velcroboy
+  changes:
+  - message: Shutters, blast doors, and lights can now be linked using the "Link Defaults"
+      button.
+    type: Tweak
+  id: 9021
+  time: '2025-10-01T20:22:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37690
+- author: YoungThugSS14
+  changes:
+  - message: The Prisoner Eva Suit now has the same stats as an emergency eva suit.
+    type: Tweak
+  id: 9022
+  time: '2025-10-01T20:23:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36696

From 7a9cb78a849ad1acc7f399f04515b549debcaf75 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 1 Oct 2025 20:29:24 +0000
Subject: [PATCH 023/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c417ac17b2..90463a8a42 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: Added the salvage job board! This board allows salvagers to access and
-      complete a variety of jobs in order to rank up, earn spesos, and unlock new
-      cargo orders. Work hard and you too may become a Supreme Salvager.
-    type: Add
-  id: 8512
-  time: '2025-05-18T04:02:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37549
 - author: EmoGarbage404
   changes:
   - message: Lathes can no longer connect to research servers on separate grids
@@ -3957,3 +3948,10 @@
   id: 9022
   time: '2025-10-01T20:23:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/36696
+- author: K-Dynamic
+  changes:
+  - message: Puddles now spill over at 50u instead of 20u.
+    type: Add
+  id: 9023
+  time: '2025-10-01T20:28:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38044

From 6b8f660c8a229f09b2f30fe2098002fd79a1b6cb Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 1 Oct 2025 23:23:45 +0000
Subject: [PATCH 024/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 90463a8a42..5fb3aa1fa1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: Lathes can no longer connect to research servers on separate grids
-    type: Tweak
-  id: 8513
-  time: '2025-05-18T04:04:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36821
 - author: 0leshe
   changes:
   - message: Changed max and minimum amount of jigger transfer amount
@@ -3955,3 +3948,15 @@
   id: 9023
   time: '2025-10-01T20:28:13.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38044
+- author: Mixelz
+  changes:
+  - message: Circuit Totes, a new type of box to compactly carry conspicous chunks
+      of Circuits!
+    type: Add
+  - message: Head Lockers now compact all circuit boards & stamps into boxes for convenience.
+    type: Tweak
+  - message: The Surplus Circuit Crate is now a Tote!
+    type: Tweak
+  id: 9024
+  time: '2025-10-01T23:22:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39868

From 562097abfad4daf7133460f003434c3c70953bf4 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 2 Oct 2025 09:03:57 +0000
Subject: [PATCH 025/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 5fb3aa1fa1..89fd61b53a 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: 0leshe
-  changes:
-  - message: Changed max and minimum amount of jigger transfer amount
-    type: Tweak
-  id: 8514
-  time: '2025-05-18T04:14:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35962
 - author: ArtisticRoomba
   changes:
   - message: Air grenades have been added! These can fill up a spaced room of ~30
@@ -3960,3 +3953,10 @@
   id: 9024
   time: '2025-10-01T23:22:33.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39868
+- author: sudobeans
+  changes:
+  - message: utility knife, which can be made in the autolathe.
+    type: Add
+  id: 9025
+  time: '2025-10-02T09:02:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39567

From cd968bee527c762cc1d2159811e2d4f7ccc98b71 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 2 Oct 2025 20:12:38 +0000
Subject: [PATCH 026/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 89fd61b53a..66814d6822 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: ArtisticRoomba
-  changes:
-  - message: Air grenades have been added! These can fill up a spaced room of ~30
-      tiles with fresh air. They can be found in Atmospheric Technician's lockers.
-      Use them wisely!
-    type: Add
-  id: 8515
-  time: '2025-05-18T04:32:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37531
 - author: EmoGarbage404
   changes:
   - message: Various salvage equipment can now be unlocked through the job board and
@@ -3960,3 +3951,11 @@
   id: 9025
   time: '2025-10-02T09:02:36.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39567
+- author: kosticia
+  changes:
+  - message: Anomalies with inconsistent particles no longer shuffle right before
+      collision with particle.
+    type: Fix
+  id: 9026
+  time: '2025-10-02T20:11:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40624

From f5566eafe419d7c40aa64e3151af4ac3115fddb6 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 2 Oct 2025 22:48:25 +0000
Subject: [PATCH 027/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 66814d6822..913cf7e5bb 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: Various salvage equipment can now be unlocked through the job board and
-      purchased through cargo.
-    type: Add
-  - message: Space debris and the mining asteroid no longer generate salvage equipment
-    type: Tweak
-  id: 8516
-  time: '2025-05-18T06:40:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37561
 - author: mrjajkes
   changes:
   - message: Add Blatantly Nuclear as a Nuke Song.
@@ -3959,3 +3949,14 @@
   id: 9026
   time: '2025-10-02T20:11:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40624
+- author: archee1
+  changes:
+  - message: Material doors now have destruction sounds and will drop a portion of
+      their construction materials when destroyed.
+    type: Add
+  - message: Material doors now have reduced health, resistances, construction time,
+      and construction costs
+    type: Tweak
+  id: 9027
+  time: '2025-10-02T22:47:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36597

From c6c7b78e309e11a9894cfbd4870dfacf2465fa05 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 3 Oct 2025 09:54:59 +0000
Subject: [PATCH 028/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 913cf7e5bb..d7a5e2f44f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: mrjajkes
-  changes:
-  - message: Add Blatantly Nuclear as a Nuke Song.
-    type: Add
-  id: 8517
-  time: '2025-05-18T07:30:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35927
 - author: metalgearsloth
   changes:
   - message: Shuttles now are treated as rooved for daylight.
@@ -3960,3 +3953,10 @@
   id: 9027
   time: '2025-10-02T22:47:11.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/36597
+- author: PJB3005
+  changes:
+  - message: You can stuff the nuke disk in plushies now.
+    type: Tweak
+  id: 9028
+  time: '2025-10-03T09:53:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40674

From c703a0a980d3f7e6b15da53478709cf9f14742ff Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 3 Oct 2025 11:32:50 +0000
Subject: [PATCH 029/216] Automatic changelog update

---
 Resources/Changelog/Admin.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 3ac6c8e461..c7107c96ed 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1447,5 +1447,12 @@ Entries:
   id: 175
   time: '2025-09-25T21:43:53.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40246
+- author: Kowlin
+  changes:
+  - message: Adjusted meatspike admin log severities.
+    type: Tweak
+  id: 176
+  time: '2025-10-03T11:31:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40604
 Name: Admin
 Order: 2

From e41662866447e66d3b09a2407174f504a15e5c7b Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 3 Oct 2025 20:34:39 +0000
Subject: [PATCH 030/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index d7a5e2f44f..581e72d6aa 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: Shuttles now are treated as rooved for daylight.
-    type: Tweak
-  id: 8518
-  time: '2025-05-18T07:47:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36112
 - author: ScarKy0
   changes:
   - message: Deliveries can now very rarely spawn as bomb-type! They grant A LOT of
@@ -3960,3 +3953,10 @@
   id: 9028
   time: '2025-10-03T09:53:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40674
+- author: Crude Oil
+  changes:
+  - message: Returned PDA lights to original brightness
+    type: Fix
+  id: 9029
+  time: '2025-10-03T20:33:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40687

From 7e5eee302a83ef26b67850e67295a8e32863bce8 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 3 Oct 2025 23:36:14 +0000
Subject: [PATCH 031/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 581e72d6aa..39285bf101 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: ScarKy0
-  changes:
-  - message: Deliveries can now very rarely spawn as bomb-type! They grant A LOT of
-      spesos... at a price.
-    type: Add
-  id: 8519
-  time: '2025-05-18T08:57:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37069
 - author: ScarKy0
   changes:
   - message: Aloxadone has been tweaked. The recipe has been altered to be simplier
@@ -3960,3 +3952,10 @@
   id: 9029
   time: '2025-10-03T20:33:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40687
+- author: NoreUhh
+  changes:
+  - message: The Syndicate Cyborg Martyr Module can now be used multiple times.
+    type: Tweak
+  id: 9030
+  time: '2025-10-03T23:35:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40224

From f23287267c9907c3dfbdfa668660cfa07e7d00c3 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 4 Oct 2025 01:45:44 +0000
Subject: [PATCH 032/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 39285bf101..db2b728491 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: ScarKy0
-  changes:
-  - message: Aloxadone has been tweaked. The recipe has been altered to be simplier
-      to make and the healing values have been increased.
-    type: Tweak
-  id: 8523
-  time: '2025-05-18T09:16:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37239
 - author: Simyon
   changes:
   - message: The Syndicate and Wizard Communications Console now no longer show who
@@ -3959,3 +3951,12 @@
   id: 9030
   time: '2025-10-03T23:35:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40224
+- author: K-Dynamic
+  changes:
+  - message: Adds smart equip function to pocket 1, pocket 2, and suit storage slots.
+      Default binds are Shift+F and Shift+G for first and second pocket, Shift+H for
+      suit storage.
+    type: Add
+  id: 9031
+  time: '2025-10-04T01:44:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37975

From cf8d3f9cbc6643f81b840c75aadc25a019eae83d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 4 Oct 2025 16:52:16 +0000
Subject: [PATCH 033/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index db2b728491..62dcc523d1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Simyon
-  changes:
-  - message: The Syndicate and Wizard Communications Console now no longer show who
-      the message was sent by.
-    type: Tweak
-  id: 8524
-  time: '2025-05-18T09:18:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37567
 - author: SuperGDPWYL
   changes:
   - message: A Lone Operative detonating the nuke on-station will now end the round.
@@ -3960,3 +3952,10 @@
   id: 9031
   time: '2025-10-04T01:44:30.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/37975
+- author: AwareFoxy
+  changes:
+  - message: Added Pride-O-Mat to marathon!
+    type: Add
+  id: 9032
+  time: '2025-10-04T16:50:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40696

From e7bdec79806325b717733712e44867f044b0b5ce Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 4 Oct 2025 20:28:28 +0000
Subject: [PATCH 034/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 62dcc523d1..3763a8f76c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: SuperGDPWYL
-  changes:
-  - message: A Lone Operative detonating the nuke on-station will now end the round.
-    type: Add
-  - message: The endscreen will now properly show how successful Lone Operatives were.
-    type: Fix
-  id: 8525
-  time: '2025-05-18T11:34:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36498
 - author: metalgearsloth
   changes:
   - message: Fixes being able to grab items through walls.
@@ -3959,3 +3950,10 @@
   id: 9032
   time: '2025-10-04T16:50:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40696
+- author: Moomoobeef
+  changes:
+  - message: Evac directional signs now glow in the dark!
+    type: Tweak
+  id: 9033
+  time: '2025-10-04T20:27:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38545

From 174995bfd32fd9e323070619ab91542e43d527cd Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 5 Oct 2025 07:41:28 +0000
Subject: [PATCH 035/216] Automatic changelog update

---
 Resources/Changelog/Admin.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index c7107c96ed..b2ebdecbfd 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1454,5 +1454,12 @@ Entries:
   id: 176
   time: '2025-10-03T11:31:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40604
+- author: Kowlin
+  changes:
+  - message: Stun prods are now high severity when crafted.
+    type: Tweak
+  id: 177
+  time: '2025-10-05T07:40:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40709
 Name: Admin
 Order: 2

From d66609f9c2abeec4072e7aeaf5bf0f749658aca8 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 5 Oct 2025 08:07:19 +0000
Subject: [PATCH 036/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 3763a8f76c..a14f556fd5 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: Fixes being able to grab items through walls.
-    type: Fix
-  id: 8526
-  time: '2025-05-18T14:38:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37570
 - author: qwerltaz
   changes:
   - message: Water vapor is now dangerous to slime life-forms.
@@ -3957,3 +3950,10 @@
   id: 9033
   time: '2025-10-04T20:27:15.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38545
+- author: NoreUhh
+  changes:
+  - message: The Ian suit makes you bark now. Woof!
+    type: Tweak
+  id: 9034
+  time: '2025-10-05T08:06:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40694

From ebe74e5df2cedcd30239b4575febdf869c834659 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 5 Oct 2025 08:39:49 +0000
Subject: [PATCH 037/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a14f556fd5..d57040d3aa 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: qwerltaz
-  changes:
-  - message: Water vapor is now dangerous to slime life-forms.
-    type: Add
-  id: 8527
-  time: '2025-05-18T22:55:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32751
 - author: slarticodefast
   changes:
   - message: Added a new keybind for swapping hands in the other direction (if you
@@ -3957,3 +3950,11 @@
   id: 9034
   time: '2025-10-05T08:06:06.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40694
+- author: Princess-Cheeseballs
+  changes:
+  - message: Incendiary rounds now deal a mix of pierce damage and heat damage instead
+      of primarily heat damage.
+    type: Tweak
+  id: 9035
+  time: '2025-10-05T08:38:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39204

From 1b86ba6b506e6db9758c05e966f0e0a1c0597a38 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 5 Oct 2025 22:13:43 +0000
Subject: [PATCH 038/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index d57040d3aa..91de817d32 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: slarticodefast
-  changes:
-  - message: Added a new keybind for swapping hands in the other direction (if you
-      got more than two). Defaults to Shift+X. Useful for cycling through borg modules.
-    type: Add
-  id: 8528
-  time: '2025-05-19T01:17:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37588
 - author: keronshb
   changes:
   - message: Force Wall timers changed so it despawns faster than it can be cast.
@@ -3958,3 +3950,11 @@
   id: 9035
   time: '2025-10-05T08:38:36.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39204
+- author: Centronias
+  changes:
+  - message: Stirring is once again prioritized over drinking. No longer will your
+      bartender be very tempted to taste test your drink as they stir it.
+    type: Fix
+  id: 9036
+  time: '2025-10-05T22:12:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40704

From 8781a95b6c2cb733d8007b56b1e2bc2493e9168c Mon Sep 17 00:00:00 2001
From: Jessica M <jessica@jessicamaybe.com>
Date: Mon, 6 Oct 2025 17:48:40 -0700
Subject: [PATCH 039/216] Skeletons are now playable instruments (#40009)

* skeletons are now instruments

* switch to xylophone

* Fixes

---------

Co-authored-by: Jessica M <jessica@maybe.sh>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Entities/Mobs/Species/skeleton.yml         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index 229c2da027..5dc127878f 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -109,6 +109,24 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
+  - type: Instrument
+    program: 13 # Xylophone. Woodblock is 115 (another good option)
+  - type: ActivatableUI
+    blockSpectators: true # otherwise they can play client-side music
+    inHandsOnly: false
+    singleUser: true
+    requiresComplex: true
+    verbOnly: true
+    verbText: verb-instrument-openui
+    key: enum.InstrumentUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.InstrumentUiKey.Key:
+        type: InstrumentBoundUserInterface
+      enum.HumanoidMarkingModifierKey.Key:
+        type: HumanoidMarkingModifierBoundUserInterface
+      enum.StrippingUiKey.Key:
+        type: StrippableBoundUserInterface
 
 - type: entity
   parent: BaseSpeciesDummy

From 1ca03fe8b1ffb513936e168479e64e1c645d7cc6 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 01:00:31 +0000
Subject: [PATCH 040/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 91de817d32..afc2085f83 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
 Entries:
-- author: keronshb
-  changes:
-  - message: Force Wall timers changed so it despawns faster than it can be cast.
-    type: Tweak
-  - message: Force Wall users can now interact while inside of the wall, but also
-      can be attacked while inside of the wall.
-    type: Tweak
-  id: 8529
-  time: '2025-05-19T01:30:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37525
 - author: Samuka
   changes:
   - message: Holy water now evaporates.
@@ -3958,3 +3948,10 @@
   id: 9036
   time: '2025-10-05T22:12:24.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40704
+- author: jessicamaybe
+  changes:
+  - message: Skeletons are now playable instruments!
+    type: Add
+  id: 9037
+  time: '2025-10-07T00:59:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40009

From 561fd493bd81e93a9b8352b984f6983756a5dabf Mon Sep 17 00:00:00 2001
From: ToastEnjoyer <masondoesgamingyes@gmail.com>
Date: Mon, 6 Oct 2025 21:10:35 -0500
Subject: [PATCH 041/216] Marathon improvements Part 1. (#40725)

* Marathon improvements Part 1.

* Fixed power and added chairs to the phsych ward
---
 Resources/Maps/marathon.yml | 988 ++++++++++++++++++++++--------------
 1 file changed, 603 insertions(+), 385 deletions(-)

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index 42df78c970..82a4d668c3 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -4,8 +4,8 @@ meta:
   engineVersion: 267.2.0
   forkId: ""
   forkVersion: ""
-  time: 10/04/2025 14:51:31
-  entityCount: 23828
+  time: 10/07/2025 01:59:23
+  entityCount: 23873
 maps:
 - 5350
 grids:
@@ -213,11 +213,11 @@ entities:
           version: 7
         -1,-2:
           ind: -1,-2
-          tiles: HwAAAAACAH4AAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAAARAAAAAAAAXQAAAAAAABEAAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAQBdAAAAAAMAXQAAAAAAABEAAAAAAABdAAAAAAAAEQAAAAAAAF0AAAAAAgARAAAAAAAAXQAAAAADABEAAAAAAABdAAAAAAIAfgAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAADAF0AAAAAAgAfAAAAAAMAfgAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAACAF0AAAAAAABdAAAAAAMAXQAAAAADAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAACAF0AAAAAAQBdAAAAAAEAHwAAAAACAH4AAAAAAABdAAAAAAEAEQAAAAAAAF0AAAAAAQARAAAAAAAAXQAAAAADABEAAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAMAXQAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAADABEAAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAwARAAAAAAAAXQAAAAAAABEAAAAAAABdAAAAAAIAfgAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAQBsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAADAF0AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAQBdAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAACAF0AAAAAAQB+AAAAAAAAcAAAAAACAHAAAAAAAgBwAAAAAAMAcAAAAAAAAH4AAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAgBdAAAAAAIAfgAAAAAAAHAAAAAAAQBwAAAAAAAAcAAAAAAAAHAAAAAAAQB+AAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAMAXQAAAAAAAH4AAAAAAABwAAAAAAIAcAAAAAABAHAAAAAAAgBwAAAAAAEAfgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAQBdAAAAAAEAcAAAAAABAHAAAAAAAwBwAAAAAAMAcAAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAAAXQAAAAACAHAAAAAAAgBwAAAAAAIAcAAAAAAAAHAAAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAACAF0AAAAAAgB+AAAAAAAAfgAAAAAAAHAAAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAMAcAAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAA==
+          tiles: HwAAAAACAH4AAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAAARAAAAAAAAXQAAAAAAABEAAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAE0AAAAAAABdAAAAAAAAfgAAAAAAAB8AAAAAAQBdAAAAAAMAXQAAAAAAABEAAAAAAABdAAAAAAAAEQAAAAAAAF0AAAAAAgARAAAAAAAAXQAAAAADABEAAAAAAABdAAAAAAIAfgAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAADAF0AAAAAAgAfAAAAAAMAfgAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAACAF0AAAAAAABdAAAAAAMAXQAAAAADAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAACAF0AAAAAAQBdAAAAAAEAHwAAAAACAH4AAAAAAABdAAAAAAEAEQAAAAAAAF0AAAAAAQARAAAAAAAAXQAAAAADABEAAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAMAXQAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAADABEAAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAwARAAAAAAAAXQAAAAAAABEAAAAAAABdAAAAAAIAfgAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAQBsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAADAF0AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAQBdAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAACAF0AAAAAAQB+AAAAAAAAcAAAAAACAHAAAAAAAgBwAAAAAAMAcAAAAAAAAH4AAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAgBdAAAAAAIAfgAAAAAAAHAAAAAAAQBwAAAAAAAAcAAAAAAAAHAAAAAAAQB+AAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAMAXQAAAAAAAH4AAAAAAABwAAAAAAIAcAAAAAABAHAAAAAAAgBwAAAAAAEAfgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAQBdAAAAAAEAcAAAAAABAHAAAAAAAwBwAAAAAAMAcAAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAAAXQAAAAACAHAAAAAAAgBwAAAAAAIAcAAAAAAAAHAAAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAACAF0AAAAAAgB+AAAAAAAAfgAAAAAAAHAAAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAMAcAAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAA==
           version: 7
         -2,-2:
           ind: -2,-2
-          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAwB6AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAegAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAACAHoAAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAB8AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwAfAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAcAAAAAABAHAAAAAAAQBwAAAAAAEAfgAAAAAAAB8AAAAAAAAfAAAAAAMAHwAAAAABAH4AAAAAAABwAAAAAAEAcAAAAAABAHAAAAAAAQB+AAAAAAAAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAwBwAAAAAAIAcAAAAAAAAB8AAAAAAQAfAAAAAAAAHwAAAAACAB8AAAAAAQAfAAAAAAAAcAAAAAADAHAAAAAAAABwAAAAAAEADAAAAAABAHAAAAAAAwBwAAAAAAAAcAAAAAABAH4AAAAAAABwAAAAAAAAcAAAAAABAHAAAAAAAQB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAEAcAAAAAABAAwAAAAAAQBwAAAAAAAAcAAAAAADAHAAAAAAAgB+AAAAAAAAcAAAAAACAHAAAAAAAgBwAAAAAAEAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAABwAAAAAAMAcAAAAAAAAHAAAAAAAgBwAAAAAAIAcAAAAAADAHAAAAAAAQBwAAAAAAEAfgAAAAAAAHAAAAAAAABwAAAAAAIAcAAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAcAAAAAABAHAAAAAAAQBwAAAAAAAADAAAAAABAHAAAAAAAQBwAAAAAAAAcAAAAAADAH4AAAAAAABwAAAAAAMAcAAAAAABAHAAAAAAAAB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAHAAAAAAAwBwAAAAAAMAcAAAAAADAAwAAAAAAABwAAAAAAIAcAAAAAABAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAgBwAAAAAAIAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAABAHAAAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAwBwAAAAAAAAcAAAAAACAB8AAAAAAgAfAAAAAAMAHwAAAAAAAB8AAAAAAgAfAAAAAAIAcAAAAAACAHAAAAAAAwBwAAAAAAMAfgAAAAAAAHAAAAAAAgBwAAAAAAAAcAAAAAACAA==
+          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAwB6AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAegAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAACAHoAAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAB8AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwAfAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAcAAAAAABAHAAAAAAAQBwAAAAAAEAfgAAAAAAAB8AAAAAAAAfAAAAAAMAHwAAAAABAH4AAAAAAABwAAAAAAEAcAAAAAABAHAAAAAAAQB+AAAAAAAAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAwBwAAAAAAIAcAAAAAAAAB8AAAAAAQAfAAAAAAAAHwAAAAACAB8AAAAAAQAfAAAAAAAAcAAAAAADAHAAAAAAAABwAAAAAAEADAAAAAABAHAAAAAAAwBwAAAAAAAAcAAAAAABAH4AAAAAAABwAAAAAAAAcAAAAAABAHAAAAAAAQB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAEAcAAAAAABAAwAAAAAAQBwAAAAAAAAcAAAAAADAHAAAAAAAgB+AAAAAAAAcAAAAAACAHAAAAAAAgBwAAAAAAEAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAABwAAAAAAMAcAAAAAAAAHAAAAAAAgBwAAAAAAIAcAAAAAADAHAAAAAAAQBwAAAAAAEAfgAAAAAAAHAAAAAAAABwAAAAAAIAcAAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAcAAAAAABAHAAAAAAAQBwAAAAAAAADAAAAAABAHAAAAAAAQBwAAAAAAAAcAAAAAADAH4AAAAAAABwAAAAAAMAcAAAAAABAHAAAAAAAAB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAHAAAAAAAwBwAAAAAAMAcAAAAAADAAwAAAAAAABwAAAAAAIAcAAAAAABAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAgBwAAAAAAIAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAABAHAAAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAwBwAAAAAAAAcAAAAAACAB8AAAAAAgAfAAAAAAMAHwAAAAAAAB8AAAAAAgAfAAAAAAIAcAAAAAACAHAAAAAAAwBwAAAAAAMAfgAAAAAAAHAAAAAAAgBwAAAAAAAAcAAAAAACAA==
           version: 7
         -3,-2:
           ind: -3,-2
@@ -245,7 +245,7 @@ entities:
           version: 7
         -1,-3:
           ind: -1,-3
-          tiles: XQAAAAABAH4AAAAAAABdAAAAAAIAXQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAADAF0AAAAAAABdAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwB+AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAABAB8AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAgBdAAAAAAIAXQAAAAADAB8AAAAAAwB+AAAAAAAAHwAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwB+AAAAAAAAXQAAAAADAF0AAAAAAABdAAAAAAMAHwAAAAABAH4AAAAAAABdAAAAAAAAXQAAAAADAF0AAAAAAQBdAAAAAAIAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAwBdAAAAAAIAXQAAAAADAH4AAAAAAAAfAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAH4AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAAAXQAAAAABAF0AAAAAAgBdAAAAAAIAHwAAAAAAAB8AAAAAAgAfAAAAAAIAHwAAAAACAB8AAAAAAgAfAAAAAAEAHwAAAAACAB8AAAAAAQAfAAAAAAAAHwAAAAABAF0AAAAAAABdAAAAAAMAXQAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAwBdAAAAAAEAXQAAAAABAF0AAAAAAQBdAAAAAAEAXQAAAAADAF0AAAAAAQBdAAAAAAAAXQAAAAACAF0AAAAAAQB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAEAXQAAAAABAF0AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAABdAAAAAAEAXQAAAAAAAF0AAAAAAgBdAAAAAAEAfgAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAgAfAAAAAAIAHwAAAAADAB8AAAAAAQBdAAAAAAIAHwAAAAACAB8AAAAAAQAfAAAAAAIAXQAAAAABAF0AAAAAAQBdAAAAAAIAfgAAAAAAAE8AAAAAAAB+AAAAAAAAHwAAAAAAAF0AAAAAAwAfAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAQBdAAAAAAAAHwAAAAADAH4AAAAAAABPAAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAEAfgAAAAAAAH4AAAAAAAAfAAAAAAMAHwAAAAABAB8AAAAAAQAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAH4AAAAAAAB+AAAAAAAATwAAAAAAAH4AAAAAAAAfAAAAAAAAXQAAAAAAAB8AAAAAAQB+AAAAAAAAHwAAAAABAB8AAAAAAwAfAAAAAAEAHwAAAAADAB8AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAEAfgAAAAAAAE8AAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAAAfAAAAAAIAfgAAAAAAAB8AAAAAAQAfAAAAAAIAHwAAAAADAB8AAAAAAAAfAAAAAAMAfgAAAAAAAF0AAAAAAgBdAAAAAAMAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgAfAAAAAAAAHwAAAAADAH4AAAAAAAAfAAAAAAAAHwAAAAACAB8AAAAAAQAfAAAAAAEAHwAAAAACAH4AAAAAAABdAAAAAAIAXQAAAAACAF0AAAAAAwBdAAAAAAMAHwAAAAACAH4AAAAAAABdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAgBdAAAAAAAAfgAAAAAAAA==
+          tiles: XQAAAAABAH4AAAAAAABdAAAAAAIAXQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAADAF0AAAAAAABdAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwB+AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAABAB8AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAgBdAAAAAAIAXQAAAAADAB8AAAAAAwB+AAAAAAAAHwAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwB+AAAAAAAAXQAAAAADAF0AAAAAAABdAAAAAAMAHwAAAAABAH4AAAAAAABdAAAAAAAAXQAAAAADAF0AAAAAAQBdAAAAAAIAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAwBdAAAAAAIAXQAAAAADAH4AAAAAAAAfAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAH4AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAAAXQAAAAABAF0AAAAAAgBdAAAAAAIAHwAAAAAAAB8AAAAAAgAfAAAAAAIAHwAAAAACAB8AAAAAAgAfAAAAAAEAHwAAAAACAB8AAAAAAQAfAAAAAAAAHwAAAAABAF0AAAAAAABdAAAAAAMAXQAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAwBdAAAAAAEAXQAAAAABAF0AAAAAAQBdAAAAAAEAXQAAAAADAF0AAAAAAQBdAAAAAAAAXQAAAAACAF0AAAAAAQB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAEAXQAAAAABAF0AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAABdAAAAAAEAXQAAAAAAAF0AAAAAAgBdAAAAAAEAfgAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAgAfAAAAAAIAHwAAAAADAB8AAAAAAQBdAAAAAAIAHwAAAAACAB8AAAAAAQAfAAAAAAIAXQAAAAABAF0AAAAAAQBdAAAAAAIAfgAAAAAAAE8AAAAAAAB+AAAAAAAAHwAAAAAAAF0AAAAAAwAfAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAQBdAAAAAAAAHwAAAAADAH4AAAAAAABPAAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAEAfgAAAAAAAH4AAAAAAAAfAAAAAAMAHwAAAAABAB8AAAAAAQAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAATwAAAAAAAH4AAAAAAAAfAAAAAAAAXQAAAAAAAB8AAAAAAQB+AAAAAAAAHwAAAAABAB8AAAAAAwAfAAAAAAEAHwAAAAADAB8AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAE8AAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAAAfAAAAAAIAfgAAAAAAAB8AAAAAAQAfAAAAAAIAHwAAAAADAB8AAAAAAAAfAAAAAAMAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgAfAAAAAAAAHwAAAAADAH4AAAAAAAAfAAAAAAAAHwAAAAACAB8AAAAAAQAfAAAAAAEAHwAAAAACAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAMAHwAAAAACAH4AAAAAAABdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAA==
           version: 7
         -2,-3:
           ind: -2,-3
@@ -321,7 +321,7 @@ entities:
           version: 7
         -5,3:
           ind: -5,3
-          tiles: AAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAA==
           version: 7
         -6,2:
           ind: -6,2
@@ -1105,11 +1105,6 @@ entities:
             2601: -13,-19
             2629: -29,-16
             2674: -12,-9
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteCornerNe
-          decals:
-            2048: -2,-33
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNe
@@ -1142,11 +1137,6 @@ entities:
             2630: -31,-16
             2673: -16,-9
             3119: -23,-15
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteCornerNw
-          decals:
-            2049: -4,-33
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNw
@@ -1177,11 +1167,6 @@ entities:
             2599: -13,-23
             2638: -29,-24
             2676: -12,-13
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteCornerSe
-          decals:
-            2050: -2,-36
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerSe
@@ -1212,11 +1197,6 @@ entities:
             2600: -19,-23
             2637: -31,-24
             2675: -16,-13
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteCornerSw
-          decals:
-            2051: -4,-36
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerSw
@@ -1399,12 +1379,6 @@ entities:
           decals:
             2339: 12,21
             2340: 12,22
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteLineE
-          decals:
-            2054: -2,-35
-            2055: -2,-34
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineE
@@ -1413,8 +1387,6 @@ entities:
             1633: 7,-28
             1634: 7,-27
             1635: 7,-26
-            2058: -4,-35
-            2059: -4,-34
             2441: -40,18
             2912: -26,-40
             2918: -26,-44
@@ -1464,16 +1436,10 @@ entities:
             id: BrickTileWhiteLineN
           decals:
             2337: 13,20
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteLineN
-          decals:
-            2056: -3,-33
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineN
           decals:
-            2062: -3,-34
             2228: 8,-24
             2230: 7,-24
             2233: 10,-23
@@ -1535,16 +1501,10 @@ entities:
             id: BrickTileWhiteLineS
           decals:
             2338: 13,23
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteLineS
-          decals:
-            2057: -3,-36
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineS
           decals:
-            2063: -3,-35
             2229: 8,-25
             2438: -43,17
             2440: -42,17
@@ -1611,12 +1571,6 @@ entities:
           decals:
             2342: 14,21
             2343: 14,22
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteLineW
-          decals:
-            2052: -4,-35
-            2053: -4,-34
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineW
@@ -1627,8 +1581,6 @@ entities:
             1639: 5,-26
             1640: 5,-25
             1643: 9,-26
-            2060: -2,-35
-            2061: -2,-34
             2971: 3,-41
         - node:
             color: '#FFFFFFFF'
@@ -2477,8 +2429,6 @@ entities:
             481: -38,10
             636: -1,-34
             1003: -19,0
-            2046: -3,-37
-            2047: -3,-32
         - node:
             color: '#EFB34196'
             id: FullTileOverlayGreyscale
@@ -3998,8 +3948,6 @@ entities:
             602: -4,-28
             603: -4,-29
             604: -4,-30
-            605: -4,-31
-            617: -3,-31
             618: -2,-31
             619: -1,-31
             620: 0,-31
@@ -7646,6 +7594,17 @@ entities:
     - type: Transform
       pos: -0.39634466,12.638008
       parent: 30
+- proto: ActionToggleInternals
+  entities:
+  - uid: 9163
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 23311
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 23311
 - proto: AirAlarm
   entities:
   - uid: 682
@@ -7926,6 +7885,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,-35.5
       parent: 30
+    - type: AccessReader
+      accessListsOriginal:
+      - - Atmospherics
     - type: DeviceList
       devices:
       - 14529
@@ -9671,7 +9633,6 @@ entities:
     - type: DeviceList
       devices:
       - 22831
-      - 22830
       - 11282
     - type: Fixtures
       fixtures: {}
@@ -9980,6 +9941,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.5,-30.5
       parent: 30
+    - type: AccessReader
+      accessListsOriginal: []
   - uid: 10017
     components:
     - type: Transform
@@ -9998,6 +9961,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,-30.5
       parent: 30
+    - type: AccessReader
+      accessListsOriginal: []
 - proto: AirlockAtmosphericsLocked
   entities:
   - uid: 8604
@@ -10337,6 +10302,11 @@ entities:
     - type: Transform
       pos: -11.5,-46.5
       parent: 30
+  - uid: 8245
+    components:
+    - type: Transform
+      pos: -2.5,-36.5
+      parent: 30
   - uid: 9463
     components:
     - type: MetaData
@@ -10404,6 +10374,11 @@ entities:
     - type: Transform
       pos: -37.5,25.5
       parent: 30
+  - uid: 1720
+    components:
+    - type: Transform
+      pos: -0.5,-33.5
+      parent: 30
   - uid: 3198
     components:
     - type: Transform
@@ -11182,6 +11157,11 @@ entities:
     - type: Transform
       pos: -36.5,29.5
       parent: 30
+  - uid: 1567
+    components:
+    - type: Transform
+      pos: -32.5,-6.5
+      parent: 30
   - uid: 1603
     components:
     - type: Transform
@@ -11803,7 +11783,7 @@ entities:
       pos: 34.5,45.5
       parent: 30
     - type: Door
-      secondsUntilStateChange: -25686.977
+      secondsUntilStateChange: -47726.9
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -12027,11 +12007,6 @@ entities:
     - type: Transform
       pos: -13.5,-17.5
       parent: 30
-  - uid: 8071
-    components:
-    - type: Transform
-      pos: -32.5,-6.5
-      parent: 30
 - proto: AirlockMedicalLocked
   entities:
   - uid: 6780
@@ -12270,21 +12245,6 @@ entities:
     - type: Transform
       pos: -18.5,-3.5
       parent: 30
-  - uid: 9163
-    components:
-    - type: Transform
-      pos: -0.5,-33.5
-      parent: 30
-  - uid: 9283
-    components:
-    - type: Transform
-      pos: -2.5,-31.5
-      parent: 30
-  - uid: 9287
-    components:
-    - type: Transform
-      pos: -2.5,-36.5
-      parent: 30
   - uid: 10190
     components:
     - type: Transform
@@ -13480,6 +13440,14 @@ entities:
       parent: 30
     - type: Fixtures
       fixtures: {}
+  - uid: 9911
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,41.5
+      parent: 30
+    - type: Fixtures
+      fixtures: {}
   - uid: 9934
     components:
     - type: Transform
@@ -13694,6 +13662,14 @@ entities:
       parent: 30
     - type: Fixtures
       fixtures: {}
+  - uid: 23866
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -52.5,47.5
+      parent: 30
+    - type: Fixtures
+      fixtures: {}
 - proto: APCElectronics
   entities:
   - uid: 15969
@@ -17330,16 +17306,16 @@ entities:
     - type: Transform
       pos: 17.5,-11.5
       parent: 30
+  - uid: 11252
+    components:
+    - type: Transform
+      pos: 28.5,13.5
+      parent: 30
   - uid: 11628
     components:
     - type: Transform
       pos: 23.5,0.5
       parent: 30
-  - uid: 12777
-    components:
-    - type: Transform
-      pos: 25.5,13.5
-      parent: 30
   - uid: 15246
     components:
     - type: Transform
@@ -17493,10 +17469,11 @@ entities:
       parent: 30
 - proto: BedsheetRD
   entities:
-  - uid: 12731
+  - uid: 23833
     components:
     - type: Transform
-      pos: 25.5,13.5
+      rot: -1.5707963267948966 rad
+      pos: 28.5,13.5
       parent: 30
 - proto: BedsheetSpawner
   entities:
@@ -18237,11 +18214,6 @@ entities:
     - type: Transform
       pos: -7.4440956,34.21304
       parent: 30
-  - uid: 11253
-    components:
-    - type: Transform
-      pos: -3.4874916,-33.356754
-      parent: 30
   - uid: 11795
     components:
     - type: Transform
@@ -30568,12 +30540,12 @@ entities:
   - uid: 16832
     components:
     - type: Transform
-      pos: -52.5,45.5
+      pos: -53.5,45.5
       parent: 30
   - uid: 16833
     components:
     - type: Transform
-      pos: -52.5,44.5
+      pos: -53.5,44.5
       parent: 30
   - uid: 16834
     components:
@@ -34845,6 +34817,46 @@ entities:
     - type: Transform
       pos: -10.5,-66.5
       parent: 30
+  - uid: 23849
+    components:
+    - type: Transform
+      pos: -30.5,41.5
+      parent: 30
+  - uid: 23862
+    components:
+    - type: Transform
+      pos: -48.5,48.5
+      parent: 30
+  - uid: 23863
+    components:
+    - type: Transform
+      pos: -49.5,48.5
+      parent: 30
+  - uid: 23864
+    components:
+    - type: Transform
+      pos: -50.5,48.5
+      parent: 30
+  - uid: 23865
+    components:
+    - type: Transform
+      pos: -51.5,48.5
+      parent: 30
+  - uid: 23867
+    components:
+    - type: Transform
+      pos: -53.5,46.5
+      parent: 30
+  - uid: 23869
+    components:
+    - type: Transform
+      pos: -52.5,47.5
+      parent: 30
+  - uid: 23870
+    components:
+    - type: Transform
+      pos: -53.5,47.5
+      parent: 30
 - proto: CableApcStack
   entities:
   - uid: 1637
@@ -43683,6 +43695,16 @@ entities:
     - type: Transform
       pos: -35.5,-2.5
       parent: 30
+  - uid: 7870
+    components:
+    - type: Transform
+      pos: -31.5,44.5
+      parent: 30
+  - uid: 7881
+    components:
+    - type: Transform
+      pos: -31.5,43.5
+      parent: 30
   - uid: 7917
     components:
     - type: Transform
@@ -44168,6 +44190,11 @@ entities:
     - type: Transform
       pos: -0.5,-39.5
       parent: 30
+  - uid: 11253
+    components:
+    - type: Transform
+      pos: -30.5,43.5
+      parent: 30
   - uid: 11257
     components:
     - type: Transform
@@ -47088,6 +47115,21 @@ entities:
     - type: Transform
       pos: -24.5,-38.5
       parent: 30
+  - uid: 23847
+    components:
+    - type: Transform
+      pos: -30.5,42.5
+      parent: 30
+  - uid: 23848
+    components:
+    - type: Transform
+      pos: -30.5,41.5
+      parent: 30
+  - uid: 23868
+    components:
+    - type: Transform
+      pos: -52.5,47.5
+      parent: 30
 - proto: CableMVStack
   entities:
   - uid: 1638
@@ -53130,6 +53172,28 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,18.5
       parent: 30
+  - uid: 23858
+    components:
+    - type: Transform
+      pos: -31.5,-5.5
+      parent: 30
+  - uid: 23859
+    components:
+    - type: Transform
+      pos: -30.5,-5.5
+      parent: 30
+  - uid: 23860
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-7.5
+      parent: 30
+  - uid: 23861
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-7.5
+      parent: 30
 - proto: ChairGreyscale
   entities:
   - uid: 904
@@ -53368,12 +53432,6 @@ entities:
     - type: Transform
       pos: 13.5,22.5
       parent: 30
-  - uid: 8245
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-34.5
-      parent: 30
   - uid: 9060
     components:
     - type: Transform
@@ -53391,6 +53449,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-27.5
       parent: 30
+  - uid: 9287
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.4336228,-32.41538
+      parent: 30
   - uid: 9407
     components:
     - type: Transform
@@ -54075,6 +54139,13 @@ entities:
     - type: Transform
       pos: -5.5,-7.5
       parent: 30
+- proto: ChemistryBottleMannitol
+  entities:
+  - uid: 23852
+    components:
+    - type: Transform
+      pos: -21.209566,-52.691216
+      parent: 30
 - proto: ChemistryHotplate
   entities:
   - uid: 9180
@@ -55016,19 +55087,6 @@ entities:
     - type: Transform
       pos: -15.5,-46.5
       parent: 30
-  - uid: 11246
-    components:
-    - type: Transform
-      pos: -1.5,-35.5
-      parent: 30
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-          Oxygen: 3.4430928
-          Nitrogen: 12.952587
   - uid: 13346
     components:
     - type: Transform
@@ -55187,11 +55245,6 @@ entities:
       parent: 30
 - proto: ClothingEyesGlasses
   entities:
-  - uid: 7149
-    components:
-    - type: Transform
-      pos: -42.51494,-20.530993
-      parent: 30
   - uid: 8827
     components:
     - type: Transform
@@ -55212,39 +55265,13 @@ entities:
     - type: Transform
       pos: -23.555922,-31.355957
       parent: 30
-- proto: ClothingEyesGlassesGar
-  entities:
-  - uid: 7039
-    components:
-    - type: Transform
-      pos: -41.593063,-21.421618
-      parent: 30
 - proto: ClothingEyesGlassesGarGiga
   entities:
-  - uid: 6805
-    components:
-    - type: Transform
-      pos: -42.51494,-19.421618
-      parent: 30
   - uid: 15114
     components:
     - type: Transform
       pos: 36.506203,30.427496
       parent: 30
-- proto: ClothingEyesGlassesGarOrange
-  entities:
-  - uid: 7870
-    components:
-    - type: Transform
-      pos: -40.60869,-21.421618
-      parent: 30
-- proto: ClothingEyesGlassesJensen
-  entities:
-  - uid: 6989
-    components:
-    - type: Transform
-      pos: -42.530563,-21.468493
-      parent: 30
 - proto: ClothingEyesGlassesMeson
   entities:
   - uid: 9370
@@ -55257,6 +55284,11 @@ entities:
     - type: Transform
       pos: 5.538602,-23.326946
       parent: 30
+  - uid: 11245
+    components:
+    - type: Transform
+      pos: -3.4961228,-33.868504
+      parent: 30
   - uid: 22447
     components:
     - type: Transform
@@ -55355,11 +55387,33 @@ entities:
     - type: Transform
       pos: -29.37888,29.583
       parent: 30
+  - uid: 8024
+    components:
+    - type: Transform
+      pos: -3.4648728,-33.493504
+      parent: 30
+  - uid: 11426
+    components:
+    - type: Transform
+      pos: -3.4492478,-33.35288
+      parent: 30
   - uid: 19401
     components:
     - type: Transform
       pos: -24.731133,-50.435394
       parent: 30
+- proto: ClothingHandsGlovesCombat
+  entities:
+  - uid: 9158
+    components:
+    - type: Transform
+      pos: -8.883268,-35.423473
+      parent: 30
+  - uid: 9165
+    components:
+    - type: Transform
+      pos: 9.388684,-26.52471
+      parent: 30
 - proto: ClothingHandsGlovesFingerless
   entities:
   - uid: 15281
@@ -55583,13 +55637,6 @@ entities:
     - type: Transform
       pos: -25.477394,-32.340332
       parent: 30
-- proto: ClothingHeadHatVioletwizard
-  entities:
-  - uid: 19694
-    components:
-    - type: Transform
-      pos: -21.586058,-27.491894
-      parent: 30
 - proto: ClothingHeadHatWelding
   entities:
   - uid: 1632
@@ -55602,6 +55649,11 @@ entities:
     - type: Transform
       pos: -15.49031,-24.471869
       parent: 30
+  - uid: 11246
+    components:
+    - type: Transform
+      pos: -3.5195498,-35.314
+      parent: 30
   - uid: 21731
     components:
     - type: Transform
@@ -55765,13 +55817,6 @@ entities:
     - type: Transform
       pos: 9.401276,-13.386019
       parent: 30
-- proto: ClothingNeckScarfStripedRed
-  entities:
-  - uid: 11425
-    components:
-    - type: Transform
-      pos: -1.4874127,-32.38826
-      parent: 30
 - proto: ClothingNeckScarfStripedZebra
   entities:
   - uid: 664
@@ -56004,20 +56049,6 @@ entities:
     - type: Transform
       pos: -9.241632,-47.33087
       parent: 30
-- proto: ClothingOuterWinterSec
-  entities:
-  - uid: 11426
-    components:
-    - type: Transform
-      pos: -1.5342877,-32.48201
-      parent: 30
-- proto: ClothingOuterWizardViolet
-  entities:
-  - uid: 19693
-    components:
-    - type: Transform
-      pos: -21.523558,-28.023144
-      parent: 30
 - proto: ClothingShoesBootsJack
   entities:
   - uid: 15998
@@ -56083,11 +56114,6 @@ entities:
       parent: 30
 - proto: ClothingShoesWizard
   entities:
-  - uid: 19695
-    components:
-    - type: Transform
-      pos: -21.507933,-28.679394
-      parent: 30
   - uid: 21672
     components:
     - type: Transform
@@ -56120,6 +56146,11 @@ entities:
     - type: Transform
       pos: 24.447042,42.46136
       parent: 30
+  - uid: 23850
+    components:
+    - type: Transform
+      pos: -21.761425,-52.779373
+      parent: 30
 - proto: ClothingUniformColorRainbow
   entities:
   - uid: 19764
@@ -56920,6 +56951,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.5,-45.5
       parent: 30
+  - uid: 11425
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-32.5
+      parent: 30
   - uid: 20886
     components:
     - type: Transform
@@ -57104,12 +57141,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -16.5,-1.5
       parent: 30
-  - uid: 9166
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-34.5
-      parent: 30
 - proto: ComputerTechnologyDiskTerminal
   entities:
   - uid: 17885
@@ -64670,6 +64701,11 @@ entities:
     - type: Transform
       pos: -34.5,-19.5
       parent: 30
+  - uid: 11254
+    components:
+    - type: Transform
+      pos: -5.5,-12.5
+      parent: 30
   - uid: 19437
     components:
     - type: Transform
@@ -65026,10 +65062,10 @@ entities:
       tags: []
 - proto: DrinkTeacup
   entities:
-  - uid: 9911
+  - uid: 8071
     components:
     - type: Transform
-      pos: -9.146156,-20.479715
+      pos: -9.167248,-20.54054
       parent: 30
   - uid: 10006
     components:
@@ -67116,6 +67152,21 @@ entities:
       parent: 30
 - proto: Firelock
   entities:
+  - uid: 1721
+    components:
+    - type: Transform
+      pos: -47.5,38.5
+      parent: 30
+  - uid: 9156
+    components:
+    - type: Transform
+      pos: -48.5,45.5
+      parent: 30
+  - uid: 11247
+    components:
+    - type: Transform
+      pos: -46.5,45.5
+      parent: 30
   - uid: 22863
     components:
     - type: Transform
@@ -67733,6 +67784,12 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21888
+  - uid: 3702
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-31.5
+      parent: 30
   - uid: 4241
     components:
     - type: Transform
@@ -68288,8 +68345,11 @@ entities:
   - uid: 11282
     components:
     - type: Transform
+      anchored: False
       pos: -2.5,-36.5
       parent: 30
+    - type: Physics
+      bodyType: Dynamic
     - type: DeviceNetwork
       deviceLists:
       - 22839
@@ -68757,6 +68817,12 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 682
+  - uid: 23845
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-31.5
+      parent: 30
 - proto: Fireplace
   entities:
   - uid: 4984
@@ -94617,6 +94683,14 @@ entities:
       - 2333
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 4951
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-34.5
+      parent: 30
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 5029
     components:
     - type: Transform
@@ -95773,17 +95847,6 @@ entities:
       - 22840
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 22830
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-34.5
-      parent: 30
-    - type: DeviceNetwork
-      deviceLists:
-      - 22839
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 22842
     components:
     - type: Transform
@@ -97707,6 +97770,11 @@ entities:
     - type: Transform
       pos: -12.5,-13.5
       parent: 30
+  - uid: 7149
+    components:
+    - type: Transform
+      pos: -3.5,-31.5
+      parent: 30
   - uid: 7215
     components:
     - type: Transform
@@ -98262,16 +98330,6 @@ entities:
     - type: Transform
       pos: -53.5,35.5
       parent: 30
-  - uid: 9165
-    components:
-    - type: Transform
-      pos: -3.5,-31.5
-      parent: 30
-  - uid: 9167
-    components:
-    - type: Transform
-      pos: -1.5,-31.5
-      parent: 30
   - uid: 9185
     components:
     - type: Transform
@@ -102842,6 +102900,60 @@ entities:
     - type: Transform
       pos: -36.5,62.5
       parent: 30
+  - uid: 23834
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -74.5,63.5
+      parent: 30
+  - uid: 23835
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -73.5,63.5
+      parent: 30
+  - uid: 23836
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -72.5,63.5
+      parent: 30
+  - uid: 23837
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -71.5,63.5
+      parent: 30
+  - uid: 23839
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -69.5,63.5
+      parent: 30
+  - uid: 23840
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -68.5,63.5
+      parent: 30
+  - uid: 23841
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -67.5,63.5
+      parent: 30
+  - uid: 23842
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -66.5,63.5
+      parent: 30
+  - uid: 23843
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -65.5,63.5
+      parent: 30
 - proto: GrilleBroken
   entities:
   - uid: 695
@@ -103348,6 +103460,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -60.5,-71.5
       parent: 30
+  - uid: 23838
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -70.5,63.5
+      parent: 30
 - proto: GrilleSpawner
   entities:
   - uid: 10007
@@ -104474,11 +104592,6 @@ entities:
       gridUid: 30
 - proto: InflatableWallStack
   entities:
-  - uid: 9248
-    components:
-    - type: Transform
-      pos: 9.443903,-26.334238
-      parent: 30
   - uid: 21276
     components:
     - type: Transform
@@ -104640,6 +104753,14 @@ entities:
       parent: 30
     - type: Fixtures
       fixtures: {}
+  - uid: 20454
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-31.5
+      parent: 30
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomMedical
   entities:
   - uid: 7346
@@ -106461,6 +106582,13 @@ entities:
     - type: Transform
       pos: -57.51036,-43.24328
       parent: 30
+- proto: LargeBeaker
+  entities:
+  - uid: 23853
+    components:
+    - type: Transform
+      pos: -22.407312,13.26424
+      parent: 30
 - proto: LauncherCreamPie
   entities:
   - uid: 16145
@@ -107284,19 +107412,6 @@ entities:
         moles:
           Oxygen: 3.4430928
           Nitrogen: 12.952587
-  - uid: 11245
-    components:
-    - type: Transform
-      pos: -1.5,-34.5
-      parent: 30
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-          Oxygen: 3.4430928
-          Nitrogen: 12.952587
 - proto: LockerSecurityFilled
   entities:
   - uid: 1072
@@ -107724,6 +107839,16 @@ entities:
       parent: 30
 - proto: Matchbox
   entities:
+  - uid: 6766
+    components:
+    - type: Transform
+      pos: -42.446564,-20.600746
+      parent: 30
+  - uid: 6768
+    components:
+    - type: Transform
+      pos: -42.634064,-20.350746
+      parent: 30
   - uid: 17496
     components:
     - type: Transform
@@ -108297,8 +108422,16 @@ entities:
   - uid: 23311
     components:
     - type: Transform
-      pos: 4.278227,-46.40056
+      pos: 4.3357787,-46.395798
       parent: 30
+    - type: GasTank
+      toggleActionEntity: 9163
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 9163
 - proto: NitrousOxideCanister
   entities:
   - uid: 7289
@@ -108504,11 +108637,6 @@ entities:
     - type: Transform
       pos: -9.625428,-38.389084
       parent: 30
-  - uid: 9061
-    components:
-    - type: Transform
-      pos: 4.148211,-46.341225
-      parent: 30
   - uid: 9659
     components:
     - type: Transform
@@ -109024,16 +109152,6 @@ entities:
       parent: 30
 - proto: PartRodMetal1
   entities:
-  - uid: 7881
-    components:
-    - type: Transform
-      pos: -41.20244,-21.437243
-      parent: 30
-  - uid: 8024
-    components:
-    - type: Transform
-      pos: -41.20244,-21.437243
-      parent: 30
   - uid: 19677
     components:
     - type: Transform
@@ -109129,11 +109247,6 @@ entities:
     - type: Transform
       pos: -31.123026,-0.3196025
       parent: 30
-  - uid: 11254
-    components:
-    - type: Transform
-      pos: -3.3156166,-32.950504
-      parent: 30
   - uid: 11632
     components:
     - type: Transform
@@ -109422,6 +109535,24 @@ entities:
       parent: 30
     - type: DeltaPressure
       gridUid: 30
+- proto: PlasmaWindowDirectional
+  entities:
+  - uid: 7039
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,40.5
+      parent: 30
+    - type: DeltaPressure
+      gridUid: 30
+  - uid: 19695
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 48.5,41.5
+      parent: 30
+    - type: DeltaPressure
+      gridUid: 30
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 11228
@@ -109493,6 +109624,13 @@ entities:
     - type: Transform
       pos: -84.53038,-45.378
       parent: 30
+- proto: PlushieHampter
+  entities:
+  - uid: 23854
+    components:
+    - type: Transform
+      pos: 16.566488,-14.522018
+      parent: 30
 - proto: PlushieLizard
   entities:
   - uid: 15217
@@ -109545,6 +109683,13 @@ entities:
     - type: Transform
       pos: 40.559143,-53.538166
       parent: 30
+- proto: PlushieVox
+  entities:
+  - uid: 23851
+    components:
+    - type: Transform
+      pos: -21.51841,-52.3398
+      parent: 30
 - proto: PortableFlasher
   entities:
   - uid: 2719
@@ -109574,11 +109719,6 @@ entities:
     - type: Transform
       pos: 23.5,4.5
       parent: 30
-  - uid: 19442
-    components:
-    - type: Transform
-      pos: -23.5,-28.5
-      parent: 30
   - uid: 19476
     components:
     - type: Transform
@@ -109604,6 +109744,11 @@ entities:
     - type: Transform
       pos: -59.5,36.5
       parent: 30
+  - uid: 19694
+    components:
+    - type: Transform
+      pos: -21.5,-28.5
+      parent: 30
 - proto: PortableGeneratorPacman
   entities:
   - uid: 10534
@@ -110347,13 +110492,6 @@ entities:
     - type: Transform
       pos: -17.5,36.5
       parent: 30
-- proto: PottedPlant2
-  entities:
-  - uid: 8371
-    components:
-    - type: Transform
-      pos: 3.5092015,-30.805378
-      parent: 30
 - proto: PottedPlant21
   entities:
   - uid: 1566
@@ -110571,14 +110709,6 @@ entities:
     - type: ContainerContainer
       containers:
         stash: !type:ContainerSlot {}
-  - uid: 1722
-    components:
-    - type: Transform
-      pos: -30.5,42.5
-      parent: 30
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 2124
     components:
     - type: Transform
@@ -110645,14 +110775,6 @@ entities:
     - type: ContainerContainer
       containers:
         stash: !type:ContainerSlot {}
-  - uid: 9162
-    components:
-    - type: Transform
-      pos: -1.5,-30.5
-      parent: 30
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 11068
     components:
     - type: Transform
@@ -110884,6 +111006,11 @@ entities:
       parent: 30
     - type: Physics
       canCollide: False
+  - uid: 1722
+    components:
+    - type: Transform
+      pos: -1.5,-31.5
+      parent: 30
   - uid: 2004
     components:
     - type: Transform
@@ -111050,6 +111177,22 @@ entities:
       rot: 3.141592653589793 rad
       pos: 42.5,43.5
       parent: 30
+  - uid: 23871
+    components:
+    - type: Transform
+      pos: -51.5,45.5
+      parent: 30
+  - uid: 23872
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -57.5,46.5
+      parent: 30
+  - uid: 23873
+    components:
+    - type: Transform
+      pos: -56.5,41.5
+      parent: 30
 - proto: Poweredlight
   entities:
   - uid: 98
@@ -114822,11 +114965,6 @@ entities:
     - type: Transform
       pos: -9.5,-41.5
       parent: 30
-  - uid: 11255
-    components:
-    - type: Transform
-      pos: -3.5,-35.5
-      parent: 30
   - uid: 11421
     components:
     - type: Transform
@@ -116085,11 +116223,6 @@ entities:
     - type: Transform
       pos: 7.5,29.5
       parent: 30
-  - uid: 3702
-    components:
-    - type: Transform
-      pos: -3.5,-30.5
-      parent: 30
   - uid: 3704
     components:
     - type: Transform
@@ -118788,20 +118921,6 @@ entities:
       parent: 30
     - type: DeltaPressure
       gridUid: 30
-  - uid: 9156
-    components:
-    - type: Transform
-      pos: -1.5,-31.5
-      parent: 30
-    - type: DeltaPressure
-      gridUid: 30
-  - uid: 9158
-    components:
-    - type: Transform
-      pos: -3.5,-31.5
-      parent: 30
-    - type: DeltaPressure
-      gridUid: 30
   - uid: 9234
     components:
     - type: Transform
@@ -119222,6 +119341,13 @@ entities:
       parent: 30
     - type: DeltaPressure
       gridUid: 30
+  - uid: 11256
+    components:
+    - type: Transform
+      pos: -3.5,-31.5
+      parent: 30
+    - type: DeltaPressure
+      gridUid: 30
   - uid: 11270
     components:
     - type: Transform
@@ -121653,11 +121779,6 @@ entities:
     - type: Transform
       pos: -4.5072117,-10.071463
       parent: 30
-  - uid: 7217
-    components:
-    - type: Transform
-      pos: -42.32744,-20.937243
-      parent: 30
   - uid: 18172
     components:
     - type: Transform
@@ -121693,6 +121814,23 @@ entities:
     - type: Transform
       pos: -76.5,-51.5
       parent: 30
+- proto: ShardGlass
+  entities:
+  - uid: 6989
+    components:
+    - type: Transform
+      pos: -40.321564,-21.272621
+      parent: 30
+  - uid: 9166
+    components:
+    - type: Transform
+      pos: -40.80594,-21.319496
+      parent: 30
+  - uid: 11250
+    components:
+    - type: Transform
+      pos: -40.634064,-21.538246
+      parent: 30
 - proto: SheetGlass
   entities:
   - uid: 5635
@@ -121743,7 +121881,7 @@ entities:
   - uid: 22523
     components:
     - type: Transform
-      pos: 3.361289,-46.49021
+      pos: 3.1795287,-46.489548
       parent: 30
 - proto: SheetPlasma
   entities:
@@ -121908,6 +122046,11 @@ entities:
     - type: Transform
       pos: -38.50112,-3.4785028
       parent: 30
+  - uid: 6805
+    components:
+    - type: Transform
+      pos: -40.446564,-18.397621
+      parent: 30
   - uid: 9678
     components:
     - type: Transform
@@ -122015,6 +122158,13 @@ entities:
     - type: Transform
       pos: -15.342251,-37.568897
       parent: 30
+- proto: Shiv
+  entities:
+  - uid: 6767
+    components:
+    - type: Transform
+      pos: -41.290314,-21.444496
+      parent: 30
 - proto: Shovel
   entities:
   - uid: 12092
@@ -125369,6 +125519,13 @@ entities:
     - type: Transform
       pos: 3.5163379,42.700695
       parent: 30
+- proto: SmallLight
+  entities:
+  - uid: 10040
+    components:
+    - type: Transform
+      pos: -24.5,-30.5
+      parent: 30
 - proto: SmartFridge
   entities:
   - uid: 315
@@ -125509,7 +125666,7 @@ entities:
   - uid: 16235
     components:
     - type: Transform
-      pos: 48.50878,41.513634
+      pos: 48.418343,41.43319
       parent: 30
 - proto: SodaDispenser
   entities:
@@ -126898,10 +127055,27 @@ entities:
       parent: 30
 - proto: SpawnMobBandito
   entities:
-  - uid: 12828
+  - uid: 23832
     components:
     - type: Transform
-      pos: 26.5,13.5
+      pos: 29.5,15.5
+      parent: 30
+- proto: SpawnMobButterfly
+  entities:
+  - uid: 23855
+    components:
+    - type: Transform
+      pos: -11.5,23.5
+      parent: 30
+  - uid: 23856
+    components:
+    - type: Transform
+      pos: -6.5,23.5
+      parent: 30
+  - uid: 23857
+    components:
+    - type: Transform
+      pos: -8.5,23.5
       parent: 30
 - proto: SpawnMobCat
   entities:
@@ -127025,10 +127199,10 @@ entities:
       parent: 30
 - proto: SpawnMobWalter
   entities:
-  - uid: 6768
+  - uid: 11255
     components:
     - type: Transform
-      pos: -8.5,-9.5
+      pos: -5.5,-12.5
       parent: 30
 - proto: SpawnPointAtmos
   entities:
@@ -127128,15 +127302,15 @@ entities:
       parent: 30
 - proto: SpawnPointChemist
   entities:
-  - uid: 6766
+  - uid: 23844
     components:
     - type: Transform
-      pos: -7.5,-9.5
+      pos: -8.5,-6.5
       parent: 30
-  - uid: 6767
+  - uid: 23846
     components:
     - type: Transform
-      pos: -6.5,-9.5
+      pos: -6.5,-6.5
       parent: 30
 - proto: SpawnPointChiefEngineer
   entities:
@@ -127666,7 +127840,7 @@ entities:
   - uid: 9326
     components:
     - type: Transform
-      pos: 9.666185,-26.444672
+      pos: 9.748059,-26.43096
       parent: 30
   - uid: 23318
     components:
@@ -127727,6 +127901,14 @@ entities:
     - type: Transform
       pos: -16.5,-16.5
       parent: 30
+- proto: StationAiFixerComputer
+  entities:
+  - uid: 1733
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,13.5
+      parent: 30
 - proto: StationAiUploadComputer
   entities:
   - uid: 22212
@@ -131024,6 +131206,11 @@ entities:
     - type: Transform
       pos: -18.5,-18.5
       parent: 30
+  - uid: 9167
+    components:
+    - type: Transform
+      pos: -40.5,-18.5
+      parent: 30
   - uid: 9168
     components:
     - type: Transform
@@ -131099,21 +131286,6 @@ entities:
     - type: Transform
       pos: -8.5,-47.5
       parent: 30
-  - uid: 11247
-    components:
-    - type: Transform
-      pos: -1.5,-32.5
-      parent: 30
-  - uid: 11249
-    components:
-    - type: Transform
-      pos: -3.5,-32.5
-      parent: 30
-  - uid: 11250
-    components:
-    - type: Transform
-      pos: -3.5,-33.5
-      parent: 30
   - uid: 11336
     components:
     - type: Transform
@@ -132052,6 +132224,12 @@ entities:
     - type: Transform
       pos: -10.5,-8.5
       parent: 30
+  - uid: 4950
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-35.5
+      parent: 30
   - uid: 5353
     components:
     - type: Transform
@@ -132207,6 +132385,17 @@ entities:
     - type: Transform
       pos: 3.5,-46.5
       parent: 30
+  - uid: 9061
+    components:
+    - type: Transform
+      pos: -2.5,-31.5
+      parent: 30
+  - uid: 9248
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-34.5
+      parent: 30
   - uid: 9658
     components:
     - type: Transform
@@ -132277,6 +132466,11 @@ entities:
     - type: Transform
       pos: 4.5,-27.5
       parent: 30
+  - uid: 11249
+    components:
+    - type: Transform
+      pos: -1.5,-31.5
+      parent: 30
   - uid: 11821
     components:
     - type: Transform
@@ -132302,6 +132496,12 @@ entities:
     - type: Transform
       pos: -7.5,-35.5
       parent: 30
+  - uid: 22830
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-33.5
+      parent: 30
 - proto: TableReinforcedGlass
   entities:
   - uid: 2113
@@ -133435,6 +133635,11 @@ entities:
     - type: Transform
       pos: -32.56638,31.48925
       parent: 30
+  - uid: 12731
+    components:
+    - type: Transform
+      pos: -3.4804978,-34.337254
+      parent: 30
   - uid: 19180
     components:
     - type: Transform
@@ -133477,11 +133682,6 @@ entities:
     - type: Transform
       pos: -11.488707,-33.250866
       parent: 30
-  - uid: 11256
-    components:
-    - type: Transform
-      pos: -3.5175757,-35.433304
-      parent: 30
   - uid: 15271
     components:
     - type: Transform
@@ -133506,6 +133706,11 @@ entities:
     - type: Transform
       pos: -24.487177,31.504875
       parent: 30
+  - uid: 7217
+    components:
+    - type: Transform
+      pos: -3.4961228,-34.82291
+      parent: 30
   - uid: 11271
     components:
     - type: Transform
@@ -134341,6 +134546,11 @@ entities:
     - type: Transform
       pos: -21.5,-46.5
       parent: 30
+  - uid: 23831
+    components:
+    - type: Transform
+      pos: -1.5,-35.5
+      parent: 30
 - proto: VendingMachineEngivend
   entities:
   - uid: 9291
@@ -140369,6 +140579,12 @@ entities:
     - type: Transform
       pos: 30.5,17.5
       parent: 30
+  - uid: 12777
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,28.5
+      parent: 30
   - uid: 12781
     components:
     - type: Transform
@@ -140399,6 +140615,12 @@ entities:
     - type: Transform
       pos: -39.5,-35.5
       parent: 30
+  - uid: 12828
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.5,38.5
+      parent: 30
   - uid: 12846
     components:
     - type: Transform
@@ -142234,6 +142456,30 @@ entities:
     - type: Transform
       pos: 12.5,40.5
       parent: 30
+  - uid: 19442
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,40.5
+      parent: 30
+  - uid: 19683
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.5,40.5
+      parent: 30
+  - uid: 19684
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,40.5
+      parent: 30
+  - uid: 19693
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,40.5
+      parent: 30
   - uid: 19784
     components:
     - type: Transform
@@ -145061,11 +145307,6 @@ entities:
     - type: Transform
       pos: -58.5,32.5
       parent: 30
-  - uid: 1567
-    components:
-    - type: Transform
-      pos: -23.5,28.5
-      parent: 30
   - uid: 1579
     components:
     - type: Transform
@@ -145131,21 +145372,6 @@ entities:
     - type: Transform
       pos: -27.5,38.5
       parent: 30
-  - uid: 1720
-    components:
-    - type: Transform
-      pos: -25.5,38.5
-      parent: 30
-  - uid: 1721
-    components:
-    - type: Transform
-      pos: -25.5,40.5
-      parent: 30
-  - uid: 1733
-    components:
-    - type: Transform
-      pos: -26.5,40.5
-      parent: 30
   - uid: 1816
     components:
     - type: Transform
@@ -145271,16 +145497,6 @@ entities:
     - type: Transform
       pos: 1.5,-5.5
       parent: 30
-  - uid: 4950
-    components:
-    - type: Transform
-      pos: -27.5,40.5
-      parent: 30
-  - uid: 4951
-    components:
-    - type: Transform
-      pos: -28.5,40.5
-      parent: 30
   - uid: 4980
     components:
     - type: Transform
@@ -148656,16 +148872,6 @@ entities:
     - type: Transform
       pos: -20.5,-26.5
       parent: 30
-  - uid: 19683
-    components:
-    - type: Transform
-      pos: -22.5,-27.5
-      parent: 30
-  - uid: 19684
-    components:
-    - type: Transform
-      pos: -22.5,-28.5
-      parent: 30
   - uid: 19814
     components:
     - type: Transform
@@ -149347,6 +149553,11 @@ entities:
     - type: Transform
       pos: -28.5,48.5
       parent: 30
+  - uid: 8371
+    components:
+    - type: Transform
+      pos: 3.5,-30.5
+      parent: 30
   - uid: 11611
     components:
     - type: Transform
@@ -149367,11 +149578,6 @@ entities:
     - type: Transform
       pos: 7.5,32.5
       parent: 30
-  - uid: 20454
-    components:
-    - type: Transform
-      pos: -0.5,-30.5
-      parent: 30
   - uid: 20455
     components:
     - type: Transform
@@ -149404,6 +149610,11 @@ entities:
     - type: Transform
       pos: -50.5,69.5
       parent: 30
+  - uid: 9283
+    components:
+    - type: Transform
+      pos: -21.5,-27.5
+      parent: 30
   - uid: 14476
     components:
     - type: Transform
@@ -149516,13 +149727,6 @@ entities:
       parent: 30
     - type: Physics
       canCollide: False
-  - uid: 11252
-    components:
-    - type: Transform
-      pos: -3.5,-32.5
-      parent: 30
-    - type: Physics
-      canCollide: False
   - uid: 20998
     components:
     - type: Transform
@@ -150094,6 +150298,20 @@ entities:
       gridUid: 30
 - proto: WindoorSecureEngineeringLocked
   entities:
+  - uid: 6455
+    components:
+    - type: Transform
+      pos: -1.5,-31.5
+      parent: 30
+    - type: DeltaPressure
+      gridUid: 30
+  - uid: 9162
+    components:
+    - type: Transform
+      pos: -2.5,-31.5
+      parent: 30
+    - type: DeltaPressure
+      gridUid: 30
   - uid: 21294
     components:
     - type: Transform

From 78748d5c7d67c1787476856d44f107918a2d258e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 02:22:32 +0000
Subject: [PATCH 042/216] Automatic changelog update

---
 Resources/Changelog/Maps.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 227040557a..aa47fbf146 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -738,4 +738,15 @@
   id: 89
   time: '2025-09-30T03:45:17.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40590
+- author: ToastEnjoyer
+  changes:
+  - message: On Marathon, added various improvements to engineering, parts of maints,
+      and some service improvements.
+    type: Tweak
+  - message: On Marathon, the security front has been fixed so that power is there
+      roundstart.
+    type: Fix
+  id: 90
+  time: '2025-10-07T02:21:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40725
 Order: 1

From ee2b38d299c4ecc894f28883f68e57eaaae4b57f Mon Sep 17 00:00:00 2001
From: Huaqas <zacswebb@gmail.com>
Date: Tue, 7 Oct 2025 15:28:48 +0800
Subject: [PATCH 043/216] Create more Holy Books based off Spacestation 14
 Dieties (#39181)

* Add More Holy Books

* Remove reference of original fork in meta.json

* Removed "rich" reagent description for Blessed Bolognese, and replaced with "holy".

* Updated Holy Liquids to each have their own minor effects.

* Tuned down Nar'sie Blood

* Create playtime requirements, and relocate holy water to it's own category.

All holy waters created through a bible are now located under the "Sacred" section of the guidebook, as to help maintain clutter.

* Replace 'curse' mixing verb with 'bless'.

* Update and fix guidebook to have section for 'Sacred' liquids.

* Add back in Tanakh and Satanic Bibles so they can be removed in other PR.

* Forgot to re-add the prototypes.

* Add back the time requirements I mistakenly removed.

* Remove Italian Bible

* Fix errors.

* Remove Carps & Crypts

* Relocate .ftl designations to their own sacred.ftl

* Forgot to update single_reagent.yml. Updated it now.

* Ended the communist dream. (Removed Communist Manifesto option for Chaplain)

* Give lamp book a little more pizzazz.

* Single line indent applied

* test

* untest

* Update sacred.yml

* Remove Unused Bibles, rename druids, moth bibles.

* Remove custom reagents.

* Error fixes.

* Reorder Bibles to Save my OCD.

* Flip that pentagram.

Bro must of rolled a nat 20 in convincing people this should be flipped. I know its more "accurate", but the layman will probably look at this and say its wrong.
Just a personal thought that escaped my brain and will never be read.

* Rename Druid Tablet, Delete Lantern Path

* Delete icon.png

* Delete inhand-left.png

* Delete inhand-right.png

* Delete meta.json

* Update chaplain.yml

* Update loadout_groups.yml

* Reorder for OCD
---
 .../Objects/Specific/Chapel/bibles.yml        |  49 ++++++++++++---
 .../Loadouts/Jobs/Civilian/chaplain.yml       |  57 ++++++++++++++++++
 .../Prototypes/Loadouts/loadout_groups.yml    |   5 +-
 .../Chapel/codexnanotrasimus.rsi/icon.png     | Bin 3363 -> 891 bytes
 .../codexnanotrasimus.rsi/inhand-left.png     | Bin 2992 -> 955 bytes
 .../codexnanotrasimus.rsi/inhand-right.png    | Bin 2971 -> 1036 bytes
 .../Chapel/codexnanotrasimus.rsi/meta.json    |  39 ++++++------
 .../Chapel/communistmanifesto.rsi/icon.png    | Bin 3522 -> 948 bytes
 .../communistmanifesto.rsi/inhand-left.png    | Bin 3075 -> 857 bytes
 .../communistmanifesto.rsi/inhand-right.png   | Bin 3083 -> 942 bytes
 .../Chapel/communistmanifesto.rsi/meta.json   |  39 ++++++------
 .../Objects/Specific/Chapel/honk.rsi/icon.png | Bin 0 -> 1084 bytes
 .../Specific/Chapel/honk.rsi/inhand-left.png  | Bin 0 -> 957 bytes
 .../Specific/Chapel/honk.rsi/inhand-right.png | Bin 0 -> 1030 bytes
 .../Specific/Chapel/honk.rsi/meta.json        |  22 +++++++
 .../Chapel/mysteryofthedruids.rsi/icon.png    | Bin 824 -> 1589 bytes
 .../mysteryofthedruids.rsi/inhand-left.png    | Bin 3041 -> 958 bytes
 .../mysteryofthedruids.rsi/inhand-right.png   | Bin 3122 -> 956 bytes
 .../Chapel/mysteryofthedruids.rsi/meta.json   |  39 ++++++------
 .../Specific/Chapel/ratvartablet.rsi/icon.png | Bin 0 -> 826 bytes
 .../Chapel/ratvartablet.rsi/inhand-left.png   | Bin 0 -> 1169 bytes
 .../Chapel/ratvartablet.rsi/inhand-right.png  | Bin 0 -> 1247 bytes
 .../Chapel/ratvartablet.rsi/meta.json         |  22 +++++++
 .../Specific/Chapel/tomeofnarsie.rsi/icon.png | Bin 0 -> 738 bytes
 .../Chapel/tomeofnarsie.rsi/inhand-left.png   | Bin 0 -> 863 bytes
 .../Chapel/tomeofnarsie.rsi/inhand-right.png  | Bin 0 -> 869 bytes
 .../Chapel/tomeofnarsie.rsi/meta.json         |  22 +++++++
 27 files changed, 225 insertions(+), 69 deletions(-)
 create mode 100644 Resources/Textures/Objects/Specific/Chapel/honk.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Chapel/honk.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index 18995446b1..9016bce6cb 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -107,10 +107,10 @@
     sprite: Objects/Specific/Chapel/tanakh.rsi
 
 - type: entity
-  parent: Bible
-  name: druidic tablet
-  description: "It's the mystery of the druids!"
   id: BibleDruid
+  name: druidic tablet
+  parent: Bible
+  description: "It's the mystery of the druids!"
   components:
   - type: Sprite
     sprite: Objects/Specific/Chapel/mysteryofthedruids.rsi
@@ -118,10 +118,10 @@
     sprite: Objects/Specific/Chapel/mysteryofthedruids.rsi
 
 - type: entity
-  parent: Bible
-  name: communist manifesto
-  description: "Remove the mask of humanity from Capital."
   id: BibleCommunistManifesto
+  name: communist manifesto
+  parent: Bible
+  description: "Remove the mask of humanity from Capital."
   components:
   - type: Sprite
     sprite: Objects/Specific/Chapel/communistmanifesto.rsi
@@ -140,12 +140,45 @@
     sprite: Objects/Specific/Chapel/satanicbible.rsi
 
 - type: entity
+  id: BibleNarsie
+  name: tome of nar'sie
   parent: Bible
-  name: codex nanotrasimus
-  description: "A familiar book containing the Sacred Operating Procedures."
+  description: "What could possibly go wrong with a book covered in blood?"
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/tomeofnarsie.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/tomeofnarsie.rsi
+
+- type: entity
   id: BibleNanoTrasen
+  name: codex nanotrasimus
+  parent: Bible
+  description: "A familiar book containing the Sacred Operating Procedures."
   components:
   - type: Sprite
     sprite: Objects/Specific/Chapel/codexnanotrasimus.rsi
   - type: Item
     sprite: Objects/Specific/Chapel/codexnanotrasimus.rsi
+
+- type: entity
+  id: BibleHonk
+  name: mirth of the honkmother
+  parent: Bible
+  description: "Oh great and glorious Mother, Mistress of Mirth, Matron of Mask and Merriments, Blessed is she amongst us jesters."
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/honk.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/honk.rsi
+
+- type: entity
+  id: BibleRatvar
+  name: tablet of ratvar
+  parent: Bible
+  description: "A holy relic of the Clockwork Cult, blessed by the Clockwork Justice, Ratvar."
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/ratvartablet.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/ratvartablet.rsi
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
index eb252a0c43..4f501057b2 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
@@ -1,3 +1,33 @@
+# Playtime requirement for NanoTrasen Bible, Codex NanoTrasimus
+- type: loadoutEffectGroup
+  id: NanoTrasenBibleRequirement
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobCaptain
+      time: 7200 #2 hrs
+
+# Playtime requirement for Druid Bible, Druidic Tablet
+- type: loadoutEffectGroup
+  id: DruidBibleRequirement
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobBotanist
+      time: 18000 #5 hrs
+
+# Playtime requirement for Clown Bible, Mirth of the Honkmother
+- type: loadoutEffectGroup
+  id: ClownBibleRequirement
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobClown
+      time: 18000 #5 hrs
+
 # Head
 - type: loadout
   id: ChaplainHead
@@ -87,12 +117,18 @@
 
 - type: loadout
   id: BibleDruid
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: DruidBibleRequirement
   storage:
     back:
     - BibleDruid
 
 - type: loadout
   id: BibleNanoTrasen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NanoTrasenBibleRequirement
   storage:
     back:
     - BibleNanoTrasen
@@ -108,3 +144,24 @@
   storage:
     back:
     - BibleTanakh
+
+- type: loadout
+  id: BibleNarsie
+  storage:
+    back:
+    - BibleNarsie
+
+- type: loadout
+  id: BibleHonk
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ClownBibleRequirement
+  storage:
+    back:
+    - BibleHonk
+
+- type: loadout
+  id: BibleRatvar
+  storage:
+    back:
+    - BibleRatvar
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 7930b3ff1b..79266b70ec 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -381,10 +381,13 @@
   minLimit: 1
   loadouts:
   - Bible
-  - BibleDruid
   - BibleNanoTrasen
+  - BibleDruid
   - BibleSatanic
   - BibleTanakh
+  - BibleHonk
+  - BibleRatvar
+  - BibleNarsie
 
 - type: loadoutGroup
   id: JanitorHead
diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png
index 2f29dff1c7ca3cea1cd5346a4b64d9fab9fa3b77..8b98bf543671896a53ccb78fcd5cca72f2ca12fa 100644
GIT binary patch
delta 869
zcmV-r1DgD!8v6#2BYy#YX+uL$Nkc;*aB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^
zVhXiV5EZf1C<H+vM1@2xoW(4VnS_}Ho0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho
z31WQBKivQB<G=esK1%DR(=-C6m9rzEpc0L(DBf2jTIi;ec7IiOveV)4JPqsX9!Z>c
z!(vwBzCX)nY&bed3NWQ-?How!z{F-QD|inG=t<Q8=^Plcqp=l`9)+$|_)T!4%(9pn
zu$Lk;AO`>?QO8;x>q*-Lc^v3BOv?Z{T46(QL9m(5>(zIP4Ldfh<wc<beT0}}fiMah
zc~YdwF-!^z1%HPKA%YG3y=8xxJQ`_I=qSvR!9*?l5r6PITPHp?TA9=lgyt95{TKl6
z4wQ<n`+e-Xr4#Tx!<AL@XO3X<6FkM5)_(~8Ex5R@Y1%GaZbQ#gR<+f#<N@S(9Ny2s
z7lW=_Xj`r1R=wx+0hS6de*^mmFqi=UT7$h?>vQ|Jr+=E?5B-^Pc&kZOqW}N_xJg7o
zR9J=WmcL6QK@`V7(T%&Ha$s0ArEuL9VqtY22p94vxWU#RjfI>C5^Oy1;A-!xO?#)f
zwU9>q2W%DW(k?Qj6PYy|)<P2U!?^RrGfh6#?(CcSe&5XF&BBNgLnf0J@MU><xCWY9
zlVA9j#DC5B)gqtfZU*XDX_H&xKX(^#U6*`5k8RssF`3NZJc=d%#r0DS#LXCM+~UX4
zRa$5t)#LTlm{bETCTvF}{t#)SIAa3<wq=oZasV`Rz3aJ?C^oN`F^Pe!ljHBvR~oub
zQ1RO0-#6v~IQ3U0%gGG@L{UW6$)UC8-|qqdu7B&czey1tK||LG!w`Tl3@QJ*B&c|3
zt=nT##7Cf%qM_?3r2z1@0vzY5KwD!HQXA3C$IZkVx0tXUrlw~53hp_gIOZYJRFBsw
zmi!kRk!S}@#HEOfP(qR<!!=;Sn;U2~r=b{-iodCWL2db647^qxX(t2-DjwVAGxm2r
zGhRJuad+S3!?exb;RU6&CH#{b(cSI;GvI9n0PG%|_hs&%)Vg-T<Zcid=)GopGwpph
vxf_fPnEqgNqLe~i|H-Tr3gWpVM!Xx3sp6ytuNfnx00000NkvXXu0mjf)d-(d

literal 3363
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
VRUMNbJOzCSd@+Boe2;ZWzXG%BY@h%D

diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png
index 0d7d9cf676dfc449715c1d31444dd00700641df5..1dcacda0e37362eee68f5ec5e78a94385567919f 100644
GIT binary patch
delta 934
zcmV;X16lmA7rO_LBYy#YX+uL$Nkc;*aB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^
zVhXiV5EZf1C<H+vM1@2xoW(4VnS_}Ho0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho
z31WQBKivQB<G=esK1%DR(=-C6m9rzEpc0L(DBf2jTIi;ec7IiOveV)4JPqsX9!Z>c
z!(vwBzCX)nY&bed3NWQ-?How!z{F-QD|inG=t<Q8=^Plcqp=l`9)+$|_)T!4%(9pn
zu$Lk;AO`>?QO8;x>q*-Lc^v3BOv?Z{T46(QL9m(5>(zIP4Ldfh<wc<beT0}}fiMah
zc~YdwF-!^z1%HPKA%YG3y=8xxJQ`_I=qSvR!9*?l5r6PITPHp?TA9=lgyt95{TKl6
z4wQ<n`+e-Xr4#Tx!<AL@XO3X<6FkM5)_(~8Ex5R@Y1%GaZbQ#gR<+f#<N@S(9Ny2s
z7lW=_Xj`r1R=wx+0hS6de*^mmFqi=UT7$h?>vQ|Jr+=E?5B-^Pc&kZOqW}N__(?=T
zRCt{2+COVkQ5XjB=bV$+t+)uC6<Tm{((BMRib`~-_y<J%0G(9={S2btK%@w%HCE~1
z)Il)XsW>?4WaolY5%lKfp7(V~E#e>0<kiC^&u`4|<juny?tyy%A|fIpA|fIpqOszv
zf{q<u%zq~jPEI%<pc3JIKzHMgS^j);NmU{~?e6N^t^3|8w`LX8ml!TwJd4KsVZ7{q
z!1MJDliZW1Z|cJ3CQdbup!;eYD-WNTl?ni6O*$Vm%ce0=kI1qas8Oy0$g-Ke+-W!;
zjFJb;HUJ8=Zr?-H8oc&VuN^Rnm8fXlx(ji21b<h;tl2$g1vsaGD1s{xMIllG0On?A
z|2X6I=H^eIiIfl#girwD2H#`IZUX>!_4*}DO&!9{&PP0Zybk>4NBs?vh-){l?B{mc
zYewS^m=#duz5dE_M*#<@0M6$YxxLT1JbJL|;XR;=SoV$o1Vl8>Oixw+!ml2qqdr-_
zXMc7QtST0edVtheK<WWfV*#lLNR0)g9w0Rqka~dBSU~ClQXBgMh=_<PsL@=~xpS?N
z-x5{!9MCIzIKOaa<ebVD@a^8fn|JT^#n!eSJ+U~{HdwwL{;#a=4ODgm_U{d#07Qqr
zH&ERT_~G8bYWwL>Ih8HoOI~Vwx#Qp*03SsxW9pHJh^TVD0!s$1{U3FWqW}N^07*qo
IM6N<$g6~zlz5oCK

literal 2992
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

diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png
index 6e5e4cd27a298a533d6e7d06aff4d5a9ad3f61c0..20c3c84cb285acf216d7c5c81b04ea5cdf1988a9 100644
GIT binary patch
delta 1015
zcmV<T0|@+^7mNsyBYy#YX+uL$Nkc;*aB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^
zVhXiV5EZf1C<H+vM1@2xoW(4VnS_}Ho0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho
z31WQBKivQB<G=esK1%DR(=-C6m9rzEpc0L(DBf2jTIi;ec7IiOveV)4JPqsX9!Z>c
z!(vwBzCX)nY&bed3NWQ-?How!z{F-QD|inG=t<Q8=^Plcqp=l`9)+$|_)T!4%(9pn
zu$Lk;AO`>?QO8;x>q*-Lc^v3BOv?Z{T46(QL9m(5>(zIP4Ldfh<wc<beT0}}fiMah
zc~YdwF-!^z1%HPKA%YG3y=8xxJQ`_I=qSvR!9*?l5r6PITPHp?TA9=lgyt95{TKl6
z4wQ<n`+e-Xr4#Tx!<AL@XO3X<6FkM5)_(~8Ex5R@Y1%GaZbQ#gR<+f#<N@S(9Ny2s
z7lW=_Xj`r1R=wx+0hS6de*^mmFqi=UT7$h?>vQ|Jr+=E?5B-^Pc&kZOqW}N`Nl8RO
zRCt{2+P!NOK^O+`=bgPxs^kJOl1@l*f{ixjnu{l>7!^gZu@J1xA8-VO*xCpd{sVp#
zD!D?gNOgrD(Fmd<sAxclB7Sh5MGzBjZ#O%yg>Z#}vp2iBiRS%PSIi6#4==k1vw#pn
z2qA<JLVpM$gb<qwnHKEaJrxWN4fd1rz&eIf9_H&8jQe_R*Z3Jdkk1n-5BIysmoqJh
zbnG2Ewjbp^W4JfJgt=Nhb=dU~>6kh>kL=~SS{;w>UNRP;ObbYPTr3vQ@5d+>w}Uf_
zoGnrwY;qbW01Ql5E+Xa}6i4uLeW}B)3(K6w0)L1Y&<u}4#G0Y?TH;I-rBdRxHXbZ2
zbbj0BG*19PCr%#6=;#O<jjy;hTeAvitD6#SavBQ=gLZV|YLx*3SOcVj#EE(+{1NcY
zE3*V5Kx=@YlkD4Yue0C%Z342GFymX`e<uaF4&a&;;5vY7Qh@6Ku1Nu|1GpvyxDMc&
z6o244fNN5K>j17v0j>kMw&@EHLI@#Jm^d)a<%4H?erbGuW(MafmDJ~?{vR-TbRXJb
zJ9Ut5eQq}K?B%P}=U5f6V|<ElKYq(kUoWz&Zw54Z$PdM+Ufzb&rw*euS++VS$?fo;
zHo!Lnt<?})hgVS;TgH<YD|pke8)mCrop8H&gwR@d_02$5qVPN3e;UE_#VvUEVHmz2
zTb*M!0hV|1S!%Uf@O&S49u}a8K(XCLw^adQ5aRl^>aW{%W`I=B9|KDRU*LaS11<M~
lxQTDH((4F92qFG?KLNS7&5D$EG#UT^002ovPDHLkV1h61%t`<N

literal 2971
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

diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json
index c0dd9096bc..2240b862c6 100644
--- a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json
@@ -1,23 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Originally drawn by @Trosling (Discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.",
+    "size": {
+      "x": 32,
+      "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
 }
-
diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png
index a38632e4372c5da80daf33d44b787d73865c3ba9..ba164660735c37667a8aba8331bd65a9a27f012c 100644
GIT binary patch
delta 927
zcmV;Q17Q5Z8?*<IBYy#YX+uL$Nkc;*aB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^
zVhXiV5EZf1C<H+vM1@2xoW(4VnS_}Ho0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho
z31WQBKivQB<G=esK1%DR(=-C6m9rzEpc0L(DBf2jTIi;ec7IiOveV)4JPqsX9!Z>c
z!(vwBzCX)nY&bed3NWQ-?How!z{F-QD|inG=t<Q8=^Plcqp=l`9)+$|_)T!4%(9pn
zu$Lk;AO`>?QO8;x>q*-Lc^v3BOv?Z{T46(QL9m(5>(zIP4Ldfh<wc<beT0}}fiMah
zc~YdwF-!^z1%HPKA%YG3y=8xxJQ`_I=qSvR!9*?l5r6PITPHp?TA9=lgyt95{TKl6
z4wQ<n`+e-Xr4#Tx!<AL@XO3X<6FkM5)_(~8Ex5R@Y1%GaZbQ#gR<+f#<N@S(9Ny2s
z7lW=_Xj`r1R=wx+0hS6de*^mmFqi=UT7$h?>vQ|Jr+=E?5B-^Pc&kZOqW}N_@kvBM
zR9J=Wl|f4zK^(<@Yl4;>5~xb(DF>xqR%k-MLJnf-M-VKu6au9nNTA@MP!LL?1mdAN
z1Ok2m5j^x0v<EA)LbuSvp30(INLGS&6V`(}W2%Xni3Shm!NSZk``-J%|I93mFv5L@
zp|WV+dVfyN+zMO71`^q%-BTy7LLkJSzJI~=REkIGhfIuLd}<iI>)3c!yp~(ZK#Lf0
z+U%`WRF+G;+Wy#gjgkR@2T{k;gt#4JK+XkDqW8CI0Kok8l2kImbfZZsnE;^PXfm5j
zP;WE=uvXNQ(lU@H#9FBkkA+OO;Slh;?n|Y;t$%O8#gO8&mAA5Tq7;6ve$k=RHz33T
zzP<jeE!GWVI*WyPXYBc6mV7Zguz`VEAcQ?X!1Dt+2l%@FV|WHSaakx=Fr|^54|~cy
zS}o`XQTcA!0+5LSgkk@?;6?^=1ryH?uIzz@cTbc#1~!mcnv-MEj&3Oo&45$0@%(_@
zvVSG}FHgy^4G2M}W<ylDc&7_(141ZQF#oIEDOqIRoX>w(e<|~69mARB#}GyA)NC?K
zb5|<&{D3qejv}Xa0zw?%xN6JG$nyifmkv0t+A@jLf33cJS_xc4d;Yg`0ryheE(UJt
z0DwR4-@cq$37ilrKLCeEb@r`A^?&mSBN*HT&Hyeb%Kej{?_2-?002ovPDHLkV1gXV
BvzPz?

literal 3522
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
HJ2LSX-wx;%

diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png
index 35fc35abf1ee4f8fa9ceee67ebefef8676ca9b66..b65eae74efb5a12ef8cd1708017ddfa6a6c4c7b3 100644
GIT binary patch
delta 835
zcmV-J1HAl$7}*ApBYy#YX+uL$Nkc;*aB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^
zVhXiV5EZf1C<H+vM1@2xoW(4VnS_}Ho0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho
z31WQBKivQB<G=esK1%DR(=-C6m9rzEpc0L(DBf2jTIi;ec7IiOveV)4JPqsX9!Z>c
z!(vwBzCX)nY&bed3NWQ-?How!z{F-QD|inG=t<Q8=^Plcqp=l`9)+$|_)T!4%(9pn
zu$Lk;AO`>?QO8;x>q*-Lc^v3BOv?Z{T46(QL9m(5>(zIP4Ldfh<wc<beT0}}fiMah
zc~YdwF-!^z1%HPKA%YG3y=8xxJQ`_I=qSvR!9*?l5r6PITPHp?TA9=lgyt95{TKl6
z4wQ<n`+e-Xr4#Tx!<AL@XO3X<6FkM5)_(~8Ex5R@Y1%GaZbQ#gR<+f#<N@S(9Ny2s
z7lW=_Xj`r1R=wx+0hS6de*^mmFqi=UT7$h?>vQ|Jr+=E?5B-^Pc&kZOqW}N_mPtfG
zRCt{2+Pg{vK@`UEZ)Oc*A;uel#2e8%t#6S+f~AdJD)m9^v=p?`!n}Y!hIVSRK?$gV
zEo5&q$08cURK`Ov`28N>zi@V#W)46^L_|bHL_|dNuNbY+?p!gRE*2+^u@G^vHo)QC
zgIa%oy?-hq9#Is@$@8n#>P~2dGVg;@eIB!=33NL-!d6G6+gw?a<*ib``*PY<8!9vh
zV62t<^AJJc;eCKYp`ew<!$lj`Iyh%xtlG~90O-}kKmcs+EJ7e~PE@ka2?X-d?R`g+
z+5n6Z)EZ^1%}k-TU4i&qr7J#1ZM)LzHp(zYXMeDtG|!W{X@v-*H{4#f;k;LgI`46N
z*+v+>;ieU;G{4fj1d}-Pt{~S(j{rQZNTShAlh`K-?A7rT3<P<e=^g<hA|fIpA|fIp
zA|fLC;|?~evR7UG^(&F?Tk{CTX^K*P;nyAAx8@OQt}IEGW&OQ@G|zDM{PX3Bu{{9;
zdprYvxPLje0~pvFu)|#kV>^I>y@4UGL$&>YQA^WrdjpPp14KmhQ}2rFv11e83p)S+
N002ovPDHLkV1kQ;g!BLa

literal 3075
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
LtaHEX_I2uS27bQT

diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png
index 7e0df50bb580efa9dd04e13aad01e21262625356..bb02dc20cd136dec62189471723c6dfd5a3a6532 100644
GIT binary patch
delta 921
zcmV;K17`e-7_JA9BYy#YX+uL$Nkc;*aB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^
zVhXiV5EZf1C<H+vM1@2xoW(4VnS_}Ho0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho
z31WQBKivQB<G=esK1%DR(=-C6m9rzEpc0L(DBf2jTIi;ec7IiOveV)4JPqsX9!Z>c
z!(vwBzCX)nY&bed3NWQ-?How!z{F-QD|inG=t<Q8=^Plcqp=l`9)+$|_)T!4%(9pn
zu$Lk;AO`>?QO8;x>q*-Lc^v3BOv?Z{T46(QL9m(5>(zIP4Ldfh<wc<beT0}}fiMah
zc~YdwF-!^z1%HPKA%YG3y=8xxJQ`_I=qSvR!9*?l5r6PITPHp?TA9=lgyt95{TKl6
z4wQ<n`+e-Xr4#Tx!<AL@XO3X<6FkM5)_(~8Ex5R@Y1%GaZbQ#gR<+f#<N@S(9Ny2s
z7lW=_Xj`r1R=wx+0hS6de*^mmFqi=UT7$h?>vQ|Jr+=E?5B-^Pc&kZOqW}N_>q$gG
zRCt{2+OcaCK^O(__s!e}EH?4HTMx8|9Fj&z>wl3-EK?-^fLs|{!A`q$_NMSk5d=lh
zRuBy~xrpwm>>(U#&dcrX%vcB(B2F^9xg_|0_3ZHYn4K-&0z^baL_|bHL`44;@hw<O
z&bj$`9)BVV&KW4Bac5`O``oOpCk+?JF+>#Z_70w}=36i=3|cD<)LS(SvjS;1D;@SI
z<VEp2=k2WS(r$*$4}I?-yaN!W(7T^PYYS^NqA02?bd^GLD&GPP1qa~jY61rbV_X$^
ztLG#rr*{Ar7R%Qz;L^ewEMLC}XNxN0R!+nP<$v@J007=}Q>5R1VEaKI#@e!3k4#8T
z?;Vg&_F+wg$D5x4v5*t`22An^tf~FV2@A-H`%n=P5fKp)5fKp)5fPnoH`<G?bGbe9
zzUbD*25xpbrS~~dH~25Dl_vJ{ymXMm`ZO5e<?HRz`*^#-zgcb8-CQk#))u>4{bTuO
zz<-Ly!dZi@dy9DZ^a^@kMtJ_{*`fCdI{`MVi?7mnl;eD3gr)WnNn;PD2rEN_1|TY|
zi?7l&|Bm+`6TEuc#JjYCC^A9&gq;9){QnG$$75)%@Z`l3lnBIxoq(V_U^4xqi&wMn
v;(Kw1s9!*aa}YPcSJ|6+1|lLl?S2B$O%llU#<9#p00000NkvXXu0mjfA0)7{

literal 3083
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
P)!8KyF7Yh(Sex`8W6G^)

diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json
index c0dd9096bc..2240b862c6 100644
--- a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json
@@ -1,23 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Originally drawn by @Trosling (Discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.",
+    "size": {
+      "x": 32,
+      "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
 }
-
diff --git a/Resources/Textures/Objects/Specific/Chapel/honk.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..caa8572835007acde512fb1549122f9402afff03
GIT binary patch
literal 1084
zcmV-C1jGA@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004gX+uL$Nkc;*
zaB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^VhXiV5EZf1C<H+vM1@2xoW(4VnS_}H
zo0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho31WQBKivQB<G=esK1%DR(=-C6m9rzE
zpc0L(DBf2jTIi;ec2#$>)8X(u4eRS3Nt}1XVpik6Kg(xqI66oQFr{bh97yZH#AYrl
zcn=8ZN!0-992l~ru@#UWg|1cjO>m;jvX~jLmm)JD2LL5e$66ihN!tW@9OySp%K$lA
zVMB01u$j*5)pv>wJ2tH4MWF+IgqUN2FbW!ZQl!Z-ObQDHhX^5p4g9@jf0#TPX;SDY
z%#y)GE&CCF@H<;4J~mpJ)DeW{7uWq50PhZzimv;8?7F2B@I1qnRr6<#VDb|@#hTWC
z2>va&xUOm1E?jOy&r?>l)w1LP<aiw3&%hUhu3KnZt>jj{=kx)V3NU{I`v)+X0RLKp
zy<6*Z`?sf>-w*wna(JsrRigj^0(nV9K~z|U?Uv7L6G0rsKU>l?#$;=31F@x0JZ!zG
z2Yawy6lw`pq<0Us_2Q}6tI$KCe?XDq#b1bb4~n1>Do9ZpJa|x=6oSyQEwss`*`$q0
z>3Z07P3&%W6LT{UmSJYT`+aZTcXoE5g%<vINLGV|l?~RTkM*tMW>d+oY%Cn%^H>EQ
zlAr$&#1j~xBiL6nFNIFkO}^Cg%yQgPz*cdSurGo-3b0;z8i$gK+Rj-DFkeheRP_$s
z)9WHn4m>?}zRf9t9P0)o<X9I|?L9CaMjPvZ@h~7Uz1qvY<zA*&dkv9G*Q#1)I10$;
zgxSuQRkWQP!B-`;og4sr0v-*j><Pe|A)n71@s;+U1pvsgE?3DYoi@ndT_P|NZ;pU~
z93nTICLo6Z2zJV7V_t%tvi&<Faag+QO2Dz35Fj_4u4#F`O%RY$?dZVGmDez6l))qi
z7+Q3-VO^B~fbE`|u6}j{0Ii_$_QhAncsn>cV4_>K9R9wXLKHHn>2>bjzx7vqGaayj
zC}aTm_IZ`t*B@BM=px%Z0aNXNtev@I95Ny+5Lx4MwG&|n_a&%czO0($qL4vk1ux&v
z)tkn>04a6G+;AT+M>)}En05nr=)Z7;ygJ?u97|B0tgL$p4Gj|ToCL63c|GJfIq;@$
zhESW2urGp=m;^xm^aa3l!V1ZOCu|ir5eG#Se}CfwM%QL*?kxHJT>>7z(K#s9275E+
zQLH2;Q2@{#|AvkZDE@x)elV7Z*#}q14_6=dMM&=cMDh3YOIvG9fZ+g@)!^!2Q4$ko
zyi&Oj?B^4W32?H{Eq=t)TwI)$IJeN0d@Z!lRQv`u-QMLm%LPpU0000<MNUMnLSTZ+
CvG2?P

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..95b5790e893b146a379e4ff37e9cca78b2222922
GIT binary patch
literal 957
zcmV;u148_XP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004gX+uL$Nkc;*
zaB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^VhXiV5EZf1C<H+vM1@2xoW(4VnS_}H
zo0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho31WQBKivQB<G=esK1%DR(=-C6m9rzE
zpc0L(DBf2jTIi;ec2#$>)8X(u4eRS3Nt}1XVpik6Kg(xqI66oQFr{bh97yZH#AYrl
zcn=8ZN!0-992l~ru@#UWg|1cjO>m;jvX~jLmm)JD2LL5e$66ihN!tW@9OySp%K$lA
zVMB01u$j*5)pv>wJ2tH4MWF+IgqUN2FbW!ZQl!Z-ObQDHhX^5p4g9@jf0#TPX;SDY
z%#y)GE&CCF@H<;4J~mpJ)DeW{7uWq50PhZzimv;8?7F2B@I1qnRr6<#VDb|@#hTWC
z2>va&xUOm1E?jOy&r?>l)w1LP<aiw3&%hUhu3KnZt>jj{=kx)V3NU{I`v)+X0RLKp
zy<6*Z`?sf>-w*wna(JsrRigj^0s2WqK~#90?b<O*8*v=Q@#n7z1~H?xL!q0Yq@nK4
zLfYyJ&@3(rE<(H2K^#K!28wSWLtPxSIQtIjplNU@0U<}Lw!!4e;a%>Y4nev&oXL+a
zKA#uxz2kSsfBF9a5fKp)5fKp)kw?W@M4F`<0e~c&b0CQ*3i0ZE$E1JvjJrMnyg2<}
z)*jheu}U5n_^ttRC1n2SmS1PLY0*BJ-DdvimRt!3{o?}9idB;~0A#E}zV9Q*0==6q
z{B9r4jhS?v8-w5Npm&o&&>1|(lF3^#0qU(yOzm%=kz0i~e*qYMBNFiDFVM)XVrqW_
z_0}es*tB6b03=viT)^@~4(*nQ_U<0wY$o6w(caxdyX9edB8R2L1rT-<uo(b}B#AM-
zR>9Nf&oHxIvB(bE0A|()-RZRok|YLcb_Cd*0j|&J_v<fN0+@7jxGEojk<C|1`Z2D`
z2bjbhuFHo2i44Xglemb8h=_=Yh=_=Yh=@E;b!+RtKCfA-v019|+slt5-;tSIjd_=s
z7MaxIBu4R59q*r<1I5u=CYPg$8@I?ji0}IdIzadBHQnbQJSpr9^*5LdAovqnWKz3t
zA7R)FW0L_yVb3Cy+I{;7ZpeKEn?E23EHbHC?jx8Sg5UE$Ei$ROKBHf64zr;9w~r7T
f?#+mZ$RqI=^J(LuwTi+;00000NkvXXu0mjf9k{vk

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1a5163cbc7503ff95791fcb03fcf01bcbc3331c
GIT binary patch
literal 1030
zcmV+h1o``kP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004gX+uL$Nkc;*
zaB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^VhXiV5EZf1C<H+vM1@2xoW(4VnS_}H
zo0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho31WQBKivQB<G=esK1%DR(=-C6m9rzE
zpc0L(DBf2jTIi;ec2#$>)8X(u4eRS3Nt}1XVpik6Kg(xqI66oQFr{bh97yZH#AYrl
zcn=8ZN!0-992l~ru@#UWg|1cjO>m;jvX~jLmm)JD2LL5e$66ihN!tW@9OySp%K$lA
zVMB01u$j*5)pv>wJ2tH4MWF+IgqUN2FbW!ZQl!Z-ObQDHhX^5p4g9@jf0#TPX;SDY
z%#y)GE&CCF@H<;4J~mpJ)DeW{7uWq50PhZzimv;8?7F2B@I1qnRr6<#VDb|@#hTWC
z2>va&xUOm1E?jOy&r?>l)w1LP<aiw3&%hUhu3KnZt>jj{=kx)V3NU{I`v)+X0RLKp
zy<6*Z`?sf>-w*wna(JsrRigj^0z*keK~#90?b@+x6JZzz@aIi(Z72;2HP%5WI3!9H
zx>s;21a1F-HiBJR=u&VrL+KE8>)_Bu1fhfN(4mE{c5-bgZR{k$YJ#SfkmSm>N$y^U
zfFOu>UXCQ-^P9i#yN8$WZn*~_A|fIpA|fIp`mc!Ff`jC;8b%*P1gZ*=)|NYm&s_I*
z%JIFI3gB11K(p;7mNd3=sX9~Fr#YzZCiQ4EtARZr07s)))!k$(-%MR&JD0kjSn`xH
z;<i8}1hZO3trCG%229foBy`YB(}ZOJwMrFcwF!}sr+x0L6ey0LAQzp*;N}9>@{3R>
zfW!e(2UyE5VsLW-x#%p4<0nv$chr3VqA0AcqmVCRx<87k$q6WWYXS-fQ<D>z?vJ97
zFQTxz4iRq?@N`dx=hL_`aue~nG#tl<dL3_vs45)CMtrW7b9g=tuL)hh0Z!e<X=)1t
z7{gg=8v-D#p+@_$gCk9C{77vZ5W#?q;WV`cwR`K95)ly*5fKp)5fKp)bzR&4(LdgO
zq21^VWHT997Z-TGveMQ$-u@x~#p{g>Zohg9+p*g{>Yo%#CF~vM+CInE0QQs1D(}8&
z_0gGjt25w87+0>^*myI7CyyWEe(Hg*b9@azd!RF5o!4=F=p2b#WyFU}*iC<LpRWN(
z4|E0^^%_1G;y5_IhWwWy7>2)B(Dyf>+noW+vJei3@cu&rArXk}?*_Q`1OCKm{@xjY
zC?Za{qn&|IvF|XxHX-Fch?Y>1-s~<B5m7Ju3CtPyu$uV~nE(I)07*qoM6N<$g0wu+
AkN^Mx

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chapel/honk.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/meta.json
new file mode 100644
index 0000000000..2240b862c6
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png
index 4e24e24ad288ea8c6d0e53a98872e46a2b7d3a56..85d3b716a39e32247770819250d9088d43a8adeb 100644
GIT binary patch
delta 1573
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
Xm;?WgFior*00000NkvXXu0mjfYR&aH

delta 802
zcmV+-1Ks?!47di6BYyw^b5ch_0olnce*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFT
zCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^
z000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2k8e04Kf;%!G9`E0007fNkl<ZSi|j>
zKS&#K6vsbz%|WdVWO3+r33ibdTrDkb3Jxw28tJ77B8Ac|2X%;34q73u1u0HBG=;hf
zx=FFwicoN==x=gy354>iBwV`q`*G)=dNo(N<U8H{-uvBq@B988^wGzEhH;xq<JFNa
z!27X}kAMTfTz_mVbO3hU10!(<LIzoEEC4V+^j6E)PM0s;iR*}YlfuO0R98K}oSW0<
z70;vMc>tWOwmDgCQ+oJLzc=>wy5YOmA@w(OEtShU;-zvKAp}AQR;txYdOr>iv9r0}
z83-dBb;a|j`91(8*QMmTG@DH=JIDQh!hjG09FS5XrGKR8I9KZ(A0?ZDisxx#D*D+%
z0VyS)H#fCjrkVl3&gOpJROmN4U}tkY9eU2%>9RI1rDV2H&^nf7F_X_TFfb6gD~^wP
zuYvGKYQB$@63enMO_Pm!osD`O(=@Rx3n?Wv->2ldu~|*UY}Eju=s0vb9RPwL&@2Q&
zpqVH-4u7Mgqcoe%WV*o4=0;R+*L<IidL2MVuMmD$48%!+5oZv+dHo82{r!E-fN4g3
zS1hDbDQw#Yz+eBw&i0m(SQn^B0cP@f0A2km9jZH2EB0Iib~dL6OxRGn-Hte-P;?y4
zKq9+9<xx$(;o)H&dARp4)`W6Ck!|>3da%2k|9^lG0^7F9WHMS7W=BoQPz~JO+1@(q
zDFqXgQ{C_EM)C`=Qmsb%eW_dy?*LT;7I4-R0}rML^*mplU%xi;s}QFPOm2ZV#*>_c
z06ab$=f(Lh7<=+8B5Qp8a^-m<zhpz>_qqVTzTKhKY8e3ObULzTTdkInPNxkuvM<W|
gzZ>3t^zkSB23G(St~uaB#sB~S07*qoM6N<$g7=GDvH$=8

diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png
index 4be96c20708ae8c27935918c37a6dd1f9e314b89..f27ffd7038ef853dc3024beaac17f91b4ce9d3ff 100644
GIT binary patch
delta 937
zcmV;a16KUu7rqCOBYy#YX+uL$Nkc;*aB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^
zVhXiV5EZf1C<H+vM1@2xoW(4VnS_}Ho0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho
z31WQBKivQB<G=esK1%DR(=-C6m9rzEpc0L(DBf2jTIi;ec7IiOveV)4JPqsX9!Z>c
z!(vwBzCX)nY&bed3NWQ-?How!z{F-QD|inG=t<Q8=^Plcqp=l`9)+$|_)T!4%(9pn
zu$Lk;AO`>?QO8;x>q*-Lc^v3BOv?Z{T46(QL9m(5>(zIP4Ldfh<wc<beT0}}fiMah
zc~YdwF-!^z1%HPKA%YG3y=8xxJQ`_I=qSvR!9*?l5r6PITPHp?TA9=lgyt95{TKl6
z4wQ<n`+e-Xr4#Tx!<AL@XO3X<6FkM5)_(~8Ex5R@Y1%GaZbQ#gR<+f#<N@S(9Ny2s
z7lW=_Xj`r1R=wx+0hS6de*^mmFqi=UT7$h?>vQ|Jr+=E?5B-^Pc&kZOqW}N_`$<GW
zRCt{2+OcaBQ5*;G@5^28Voe(gm$McJCmmcIiy1Py2zIDb=8Qt<>OT>1bk3$j!C9!1
z;LycIh#(as#KeS?J2>vVJfB0GAX0=TKcWZU&vwg~cRzUV4etvO5fKp)5fKp)UD`o&
z&;0HCe}866gt%8NJblnGUvFJQKkA{LdT?7c(`k2=L_W@kdVBL8c0P>o_+>{dS7ZR4
zc2}iMZ4iA#G){2rPY|6Z64AK-@UGePONhn^`sks5T_kp)AQ5uV+%xsmgAOVH06i^Z
z7Hp%@s;#sY8m*d{1>4Zm@>y<BK|S>(mb@S`fPd%D-l~&X6*{)D;p{*sF7~%}vFaA+
zw7Y75YZp3k&vIiMC$p-=k{3h<005aYgt9E?(4bgya1;(ia*x6RiX{g+G*Fg>%o&R0
z&WQ~`7gM-?3|KY_O2G)-1I7Rar2xx@>&MW=R3`YG$RP*-pL*jT)jL<5$q)uVGsIDp
zNq^*yzYI(qg~})!UKyCYPjYj`5)ly*5fKp)5fKp)txU3iAoeu2PV+v(lf%Q62O;(}
zwobqI5mqJEv{<KkAK_J;A<jnFuslq^WqAGO_|pHA%PnwGAK_8u#!^|i8~`rpBfJPd
zFO`$q0sPrVSavt(@(=`o(|3XKZ`x`+Dk4Cc8KUU>zg`j%5#`P=LfpKBoR77;00000
LNkvXXu0mjf3XrSx

literal 3041
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

diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png
index bdf1c5e363c1997dd91da08825b8a5d7e66a6b3a..d345671051727aeccf2beee4c01df701c0bdffe6 100644
GIT binary patch
delta 935
zcmV;Y16cgB7`z9NBYy#YX+uL$Nkc;*aB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^
zVhXiV5EZf1C<H+vM1@2xoW(4VnS_}Ho0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho
z31WQBKivQB<G=esK1%DR(=-C6m9rzEpc0L(DBf2jTIi;ec7IiOveV)4JPqsX9!Z>c
z!(vwBzCX)nY&bed3NWQ-?How!z{F-QD|inG=t<Q8=^Plcqp=l`9)+$|_)T!4%(9pn
zu$Lk;AO`>?QO8;x>q*-Lc^v3BOv?Z{T46(QL9m(5>(zIP4Ldfh<wc<beT0}}fiMah
zc~YdwF-!^z1%HPKA%YG3y=8xxJQ`_I=qSvR!9*?l5r6PITPHp?TA9=lgyt95{TKl6
z4wQ<n`+e-Xr4#Tx!<AL@XO3X<6FkM5)_(~8Ex5R@Y1%GaZbQ#gR<+f#<N@S(9Ny2s
z7lW=_Xj`r1R=wx+0hS6de*^mmFqi=UT7$h?>vQ|Jr+=E?5B-^Pc&kZOqW}N_`AI}U
zRCt{2+P!bnKo|z_=i;v@B#j~xw;)(yVPK4iAQB4;5=d>Q%-y4|{1cHFnY$ICj*JYc
zI&@$pEEHNP)Jh17Q`c^DJqFZ;O7S%@kps_fvwSB%dUbam-UEn;h=_=Yh=_=;Slg(o
zNzaSSjDH)@Xx3EqM+w-ds{4gUSowU6y&DJfNp}sepEuO^d&}tfyV!oSCv@k<4t)0F
zp(?mp_+E&Dn+1StePCWLSLJ0+-wW}6=VNTn%%qo%W=%!CB_;cL0Dv46QIE>0+yeEe
z3^^zQ0AxRp@t}l8vlg3kVga^VZLwOqD`e;(XMe9i1}65$l~k^P{c!~{Fn{L^9lTt+
zjjdLDwiN&X?|yz&R@R0bDhR{Cx!p}Hbdt{PE`(t~4i&7djh*44*1XsP00J2y0K<gi
z29Q=Xd)mK1S`i#K01OiuA)qujY3yIXJ35r7Bi~TML^%)9|8y26kT-E(+Q-U$kQ2Qw
zpnv2U!jqHKol`_aL_|bHL_|bHMD&kHW5ZNOY-cFWtIbW7);j|_W-dU--$myZu-!^u
z$5_Wyp`SditD6-If$Sk?E#qm<!Uw09%C>nNjqdPO>%}`*ggXN|rYgYO;WsS8odF$F
zo&kT{8OX?_bIr|E1@O8@I310kgb6o)0U+;SypX>@A|m?V{Q^;ivnMS8Qn>&C002ov
JPDHLkV1mtZt^)u7

literal 3122
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

diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json
index c0dd9096bc..2240b862c6 100644
--- a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json
@@ -1,23 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Originally drawn by @Trosling (Discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.",
+    "size": {
+      "x": 32,
+      "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
 }
-
diff --git a/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e294639fa9e12afe627b5fc9f04df6a768d78b4
GIT binary patch
literal 826
zcmV-A1I7G_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%^hrcPR9J=WmOp3{Q5?rVms~H2Nj(LP^l~+72n77s$#P4<#i0(;p<5NH&?Vp|
zNa>&;F1pxBglf@l9i$)~G8oA0&?<$>VKp`l*ajtf*EVgF=g?kg71Nh4F8OZv-tYb1
z_x--V`@RP)w9vwThH}t_Q;(8j_xH6s_JMM#vVo&RhKMJ__096OOEy;q;N~skFH*9E
zqzM3wj}_}=vbi$n62bcT)T5;E<~>3(@HIoA<Ww+qm5(1+iN`ejeg#$Y5sztP-mGBi
zDkZ1VOiKA4=u3sg<sO~o!Uh2E7Y#xI1w~O<U9WMWbNlpBQzM%z^LpNu$}JV-X*)hv
z<m{Oc&PEjkgfxZC8f<O}6a^xhpSgv#x&$(PASFTGb{QWlV(Ka#SML+i{QPvPEUa`=
z_<oXKPL+t}r{n5<OkJ(_iVXH8VB5A}M}L6%m%{+GM}j0y6gVASq&*VcGv~#6Ya5~A
zUtrs|$Ye4A^!G-YoL=TwB!G+H-t$eCU#$TUy&mG;U>iTmRZ32U{@y5g+oh1nVB5Ax
zCX)yAn}LCWJtr6)GDKf0EC#y|i+6Vs=SPHCTovNoUBqDbVbPZgi_sxNG|JIb1uV+~
z5SI?UC7uj3K31gUR5+?1;?oQi{CRpG#(A+5UvesBbLF~eP0n^>Sr!u$6aU<!VGpF!
zX=R55kDq+T)K$7-+isZXf~VC}yx3BRUJn7#6$@kPDwEU8<ZTzrvPh@X4a+a3jaOEC
z)+Kf0A#;-t2(+#5iK%P`Iom(N{L5jI7q>~?epcK!zZ8MKR9FCbM&xW%S^9nwWmo+S
z{VS1xzivc;lo?5Pr|18suHuXM2x>ljy9lhV*Qhx)3gs<s-ZG>wqo(hInI)G*BE($Y
zVBwp|mz7RFd^SiVLd-0=l$;8A+m+7Q)NR<`8wDVnD|4j>R+cKXX$nV<Z<pPhZwAr?
zJYCt*_HvIdj>iIf#(;gD?@t`~MdUT+9|T%xp@pXL8)$<zFuFst8UO$Q07*qoM6N<$
Eg6nI5g#Z8m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..71ed63d9330a06e3ad42db25de16be00496bb14e
GIT binary patch
literal 1169
zcmV;C1aA9@P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004gX+uL$Nkc;*
zaB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^VhXiV5EZf1C<H+vM1@2xoW(4VnS_}H
zo0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho31WQBKivQB<G=esK1%DR(=-C6m9rzE
zpc0L(DBf2jTIi;ec2#$>)8X(u4eRS3Nt}1XVpik6Kg(xqI66oQFr{bh97yZH#AYrl
zcn=8ZN!0-992l~ru@#UWg|1cjO>m;jvX~jLmm)JD2LL5e$66ihN!tW@9OySp%K$lA
zVMB01u$j*5)pv>wJ2tH4MWF+IgqUN2FbW!ZQl!Z-ObQDHhX^5p4g9@jf0#TPX;SDY
z%#y)GE&CCF@H<;4J~mpJ)DeW{7uWq50PhZzimv;8?7F2B@I1qnRr6<#VDb|@#hTWC
z2>va&xUOm1E?jOy&r?>l)w1LP<aiw3&%hUhu3KnZt>jj{=kx)V3NU{I`v)+X0RLKp
zy<6*Z`?sf>-w*wna(JsrRigj^0?tW9K~#90?b^XhlW`o!@z1l(shdm4V~ht2OHi=3
zrLMV^P!~a@OV@S@!m&dKAH-YGLFO?BJH?J2^DppVG@F~Qp{0z72dPL8&e`L$o^8*s
zLk#RT_k4+p@9PhE@5h(lp6Bp<0mc|(j4{R-V~jDz&TVCBK&&hch=1|792AkGLj#3v
z7gBMr$YkpXjyjMnn0T@FS)%9zz@vyP{39k-R~@)Md`guC*#XmvEV9K;7}YAe-ER1Y
zP7zJ0miuW%7O%5FcTX3z$|)k_Hj-|WjUtjvCPh^@p;eCYaPj~r<s(#e6Uk)K(p7DC
zbxp&An<^T0gQR;F$pGAH0$cB$@cBKMt?3Ai_2TU&VBcM|)V1#}Vr|_(Fx-dPnhu}e
zgY~=#x0;|hHb6B1O;!-}*OA-Mu<URlo2lS-$cDz?yrphqa31$2yO7OPu<URlx1r(A
zgaewaP#hbed<LZAUXk0j!PDD`?-c|7p#~m5-?!XP#l0fGV@J;gCr*xkATVr_bel+S
zKw6PSt_Vy|IZ-Ja2n7T(`8v{yZ0Wz6R%DUMHxLR4RLTaXr<};XlPq`7A{jtcH!(40
z!^~Vs3Xcjz6RH&Sle}RO^xF|ls8V=TU}ml)MaCsmb(5sc7-Nhv#u#IaF~%5UjIqBT
z<&FT!hmmIs3ly1_9UU6jEc782_gWqT$pF3_98hFh7EP#9|D~@embxvsNCsd^c8W~P
zntKBsPJy+jUE<08Ya$i*igxw}NCu#521TZ2ZZ(0u{foFP3(VGZT<Hh$A3EFGM<5wM
z%{ZaRv`mu~j9e|F^r-{O4j1-Hc7%Mjw)PQdZh)>+WLg%B#iXikLXv=21urD&*B9zo
zEOzd_0g?fH^n9bpv@EU2Vq?dKyOBC7WdpuJ4R5v@ZS4(^450WjN0Dh+RW}h1;J1B*
jTQ~mfgP1YK{tG_=DjO!uBeOJs00000NkvXXu0mjffE^X(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcfac241cd5c5d6cc79d08718b788a3c47c34ec1
GIT binary patch
literal 1247
zcmV<51R(o~P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004gX+uL$Nkc;*
zaB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^VhXiV5EZf1C<H+vM1@2xoW(4VnS_}H
zo0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho31WQBKivQB<G=esK1%DR(=-C6m9rzE
zpc0L(DBf2jTIi;ec2#$>)8X(u4eRS3Nt}1XVpik6Kg(xqI66oQFr{bh97yZH#AYrl
zcn=8ZN!0-992l~ru@#UWg|1cjO>m;jvX~jLmm)JD2LL5e$66ihN!tW@9OySp%K$lA
zVMB01u$j*5)pv>wJ2tH4MWF+IgqUN2FbW!ZQl!Z-ObQDHhX^5p4g9@jf0#TPX;SDY
z%#y)GE&CCF@H<;4J~mpJ)DeW{7uWq50PhZzimv;8?7F2B@I1qnRr6<#VDb|@#hTWC
z2>va&xUOm1E?jOy&r?>l)w1LP<aiw3&%hUhu3KnZt>jj{=kx)V3NU{I`v)+X0RLKp
zy<6*Z`?sf>-w*wna(JsrRigj^0~|?2K~#90?b^?4(_k0}@bBBS-Rztb>%2$_Dw_j`
z$~vp1`{6)A1|nWO2@X%P(u0Cw=t=M}x}yseMCjF<`v)9sXy?}Mhd7-S*}~N6Ca&ui
z)1^&b4>AxBO}o}^%JVseB=4JV9^Sl{JOCkt5JCtcgb+dqA$biAH1MH;2ENldepgB+
zyVVUh+YfW!X&YkWIrx2c3=i9Jy7|Ypg8nV5D>|m%xDW|>cw)we$0G_Wbgbo#QAy;9
zSr;@_g|oUEzLT5i2^ao=N{LD$9~m=Iv(E)>BZD>{3d(8AcTtvQp3zLKr&e*JYZ+>K
z4H?aZEX%v<6WGdW<aAs+qd-&Df^+6AfH2pOSCc^N**f%QHMDqZG4<Ao8YNuT7bsPY
z62@4<M2oi;y;%+Zb~i@HbO>|(mSgi4z-a12XTXN>SQ>+N7vd8t{N5Z?Q7UKtlBuGE
z^KEv-CsYjDT^Nt0aj~l!MpK{VSj%rD67ulGtbo1yoLFDmL~FB&TaOlZ-5wALd3gMd
z4YhSu*huT}o-hi^nRf+5C6UJxIRsic(kUI6yPb%?W{67SuG#~llE}wr7%q1^kxuCd
zv~t7}MnO6A761VJUORfi3TyXqT)CTMZD$!Wnpw8+<&e=#bev<jayQA^eH=Yuh55b0
zPRAmI5JCtcgb+dqA%qY@{!6>DXP{7)KSr!XLLNRj?Z)bgUY<k+dU)?1?%%mn@;sIe
z5>{R(_rP~@sp35YpO=?0uPl~4PthwtmSr9ZdHC(C$NA`kYVL6I9qAb`nSi?e2A)0<
zapQV7+Aei&Yo4MDAk6h6@vaKTjsU$`4M#<e_lpNA-ZP-7Iu5y2G#*_=y?X;jZhH%`
z=mHo`eF(H<@jfYF(C$KV-hoq%sfzauWc76@pXxF5?jYtD-EcUJZOv130fNCG%V;JT
z1D;KLz}T<9v%z4nqI-a*X%GY(p1){>jWIBzLMtFDiTvf1ftDr}>6DHO9XU+Q+A7{N
z@S*lAly3`o`|&##Ru-_d`K2-sj!Ghrggkuf_|J2M5JLVTKLK;~M~78b8f*Xn002ov
JPDHLkV1mp|IL`n8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/meta.json
new file mode 100644
index 0000000000..2240b862c6
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..92a2b5e1388a6e3dc5ee006983f624c868a518b3
GIT binary patch
literal 738
zcmV<80v-K{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%oJmAMR9J=WmcMJ%U>L_g$)!o&<nGX_phHn77yke!9Yp9R(xHRc4no1@T#DBY
zo^Vp6A{{MsscXS5+ND#))lETgb`!evek6G>KOAyN?<~E%Cj|%ZyW}PBljr+=zE7UK
zfe9w~$IyxbK7M$^+S0ouj3VWvyITpa&~Zfxap&7ejzR&qF5gVTDB|GLeT?!Atjf%A
zg7fE2efDsFfs3=>M{*cN0>UW5D3!Q(cMsSb8N0I?=9SyGx9NCsQTk#58EjJ&#w<Qf
zukW`y*udOUp~30`0F0?pVNBSI=y)*~6m#mT<Ywdppam@~{|GH;A!3P;ZLFX*6g&S!
zy)NZQJ&v$qNh3=7cM|A}0%*!Mo>^8V9$P?(n1=7uv~4`y9NH7HO!o{)i{ds7La7BV
z5zl++y5akXSe_uy_RIlS&P>3IUcib|0btds<{~okRi~QoZG=hw+?8vU!rWs`fvf3=
zShDI=dDT72NkuGiwX~LY6oO%JxW7O*Fbgt{F$DlMQ9iW=HIcr6YuBq>nsJzaX0r2I
zj>z^G0<uao+p~6L&Lpl+H;`<<Y!k*YvyYO(oJs<!x`mVUX!t&L%gn`OPSh=vhVSFF
zbiz1hZrR}A^M+DUO7DQ9g*3bbrgYW=Ne5UDQu1uw=}*CQN9W-fzAA+-=oSD?+s=Dk
zx6Is)nkdt>Z2%tI#b?GKl&4_Dsqi-Ns9UL!%z?UXBVx&VAgMW3=&AoVj3t16rLVe2
zxSEdD_ijCqbdoqF{{y>Q30EJSp#b`GZv`y^>-Zxx)$@j8b~ZzT)=ykf+~KhVgnfJU
zM9<d%A?A?vuFwhFKX66yxu7h-m&aB50FiehX7G>b>z6}*O)qM&tV%J#1pg_11E;(S
UVd}PAEdT%j07*qoM6N<$f}@yVFaQ7m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cc27ac3c5cdd5f5dfca92bab6d7f762cfd275fc
GIT binary patch
literal 863
zcmV-l1EBngP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004gX+uL$Nkc;*
zaB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^VhXiV5EZf1C<H+vM1@2xoW(4VnS_}H
zo0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho31WQBKivQB<G=esK1%DR(=-C6m9rzE
zpc0L(DBf2jTIi;ec2#$>)8X(u4eRS3Nt}1XVpik6Kg(xqI66oQFr{bh97yZH#AYrl
zcn=8ZN!0-992l~ru@#UWg|1cjO>m;jvX~jLmm)JD2LL5e$66ihN!tW@9OySp%K$lA
zVMB01u$j*5)pv>wJ2tH4MWF+IgqUN2FbW!ZQl!Z-ObQDHhX^5p4g9@jf0#TPX;SDY
z%#y)GE&CCF@H<;4J~mpJ)DeW{7uWq50PhZzimv;8?7F2B@I1qnRr6<#VDb|@#hTWC
z2>va&xUOm1E?jOy&r?>l)w1LP<aiw3&%hUhu3KnZt>jj{=kx)V3NU{I`v)+X0RLKp
zy<6*Z`?sf>-w*wna(JsrRigj^0h~!hK~#90?b@+Q!%!H-@pF?<1(g<@bkM=2tAfzM
z!9@pMbny*DoE$_tb}q%)>PvLgv4gH6PA(2E3W8`&a%0ovUIz)-Zq|=V@cbU&Px6s1
z2OuIMA|fIpA|m=%lvL=URklaR3s8;&YYpBzZ@9R<66<eNDt6MFM&s}v^V@e~T~8`>
zP@jX=?{GaAFcxtVi*(l(m#s?2VPhBmM}Yl$Nu--`<WdT*=b~DC1RMqB6hx|~SLo|b
zn=z4YM(hA-YOrfxF*VV{p6UQb<}01`#{0T&R_3r7u>%;B;0z^n`~psG5z4V5-KQk#
z>l&vk(#^;nAWfl^Lc^bdQVKG!4_KhTt5Tuz7qJ60YtQ)50dy2141IKUDAMg}jYx-x
zv_^^$C)F2`E)fwC5fKp)5fKp)5#_~0t88~xHh=vGPHbo}YFm|ct91m|b8&v%9{N4R
z1`?z9ZI7_DY9o`NeRKKaLkJEeMr&}7;F#e$xjn$(9>ET|N67C12KETU4ia*EfM)F(
pIt~!_G=exlH_?CnNJK=GJD)@grku=?*h&BZ002ovPDHLkV1oG*enS8N

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..98151112f46bc1bd7fc21723f213efb2cceca9a9
GIT binary patch
literal 869
zcmV-r1DgDaP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004gX+uL$Nkc;*
zaB^>EX>4Tx04R}tkvT{MQ4~ebOw@=Pf*3@^VhXiV5EZf1C<H+vM1@2xoW(4VnS_}H
zo0NiWz`~_*D{QQ_wXhWg!3D(9%1Y5j!pKho31WQBKivQB<G=esK1%DR(=-C6m9rzE
zpc0L(DBf2jTIi;ec2#$>)8X(u4eRS3Nt}1XVpik6Kg(xqI66oQFr{bh97yZH#AYrl
zcn=8ZN!0-992l~ru@#UWg|1cjO>m;jvX~jLmm)JD2LL5e$66ihN!tW@9OySp%K$lA
zVMB01u$j*5)pv>wJ2tH4MWF+IgqUN2FbW!ZQl!Z-ObQDHhX^5p4g9@jf0#TPX;SDY
z%#y)GE&CCF@H<;4J~mpJ)DeW{7uWq50PhZzimv;8?7F2B@I1qnRr6<#VDb|@#hTWC
z2>va&xUOm1E?jOy&r?>l)w1LP<aiw3&%hUhu3KnZt>jj{=kx)V3NU{I`v)+X0RLKp
zy<6*Z`?sf>-w*wna(JsrRigj^0isDnK~#90?b^Fa13?%C;4_=BF%eC`$}|=>!9qk3
z0;UL7UMd^kKzsm^l-3fgy}U%MEc68e7PdAPX(9+gLv}Z}-TCdrAh<&=y210+bKvkZ
zQ_T+$5fKp)5fKp){VOW$!1n5<%%?L@%7SQ(^6@j4_Mbv?zpYlu$;tUL9KV6vYSp-3
z=)tX(4N2H3z)}eO0I5_GH`Tky4PZB)7wIHEdrGW>`^SgSo>tfav24InD5dL&#bYKj
z`x6T~G0;=@ZKGW104%L=q?(wU?c-415CnQ0eaG%y?17%y_>57`;06e;B#mav#x*j~
z+8;;XvC~#}py!L<Hp+z#005LyD7O}&l!6X|QM*ors9>O{80JC;&~sh5ZVO)9MaOe+
zdHOnf+X=WRH4wl>+w<VL4ti~~8$d)vL_|bHL_|bHL`0?z3VTwk<V=5}B4?z(?w$3b
zM0sbxM0}V~ajhUpD~?jSj<aSqvO5DNjDCl|g*2vOXTZcz1DKYb0TV+#0m#>#0Yr9Z
vz{F5DpzC{ZdJf#a2d@|1odF^uqMv;LKis6Q6KP-400000NkvXXu0mjfLDhyQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/meta.json
new file mode 100644
index 0000000000..2240b862c6
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
+}

From 2212b690e0bda304eaa869574a6e04c1fab5ceeb Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 07:40:45 +0000
Subject: [PATCH 044/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index afc2085f83..74e3a22e24 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Samuka
-  changes:
-  - message: Holy water now evaporates.
-    type: Fix
-  id: 8530
-  time: '2025-05-19T16:14:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37611
 - author: aada
   changes:
   - message: Pepper makes you cough.
@@ -3955,3 +3948,10 @@
   id: 9037
   time: '2025-10-07T00:59:20.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40009
+- author: Huaqas, Davyei
+  changes:
+  - message: 3 new Holy Books have been added to the Chaplain's loadout.
+    type: Add
+  id: 9038
+  time: '2025-10-07T07:39:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39181

From b9f2fd4e6738a63d5af624f967246e75fddc5966 Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Tue, 7 Oct 2025 10:43:54 +0200
Subject: [PATCH 045/216] Replace all time requirements with bats (#40751)

time requirement format update
---
 .../Loadouts/Jobs/Cargo/quartermaster.yml     |  4 +--
 .../Loadouts/Jobs/Civilian/janitor.yml        |  2 +-
 .../Loadouts/Jobs/Civilian/passenger.yml      |  4 +--
 .../Loadouts/Jobs/Command/captain.yml         |  2 +-
 .../Jobs/Command/head_of_personnel.yml        |  4 +--
 .../Jobs/Engineering/chief_engineer.yml       |  2 +-
 .../Jobs/Engineering/station_engineer.yml     |  6 ++--
 .../Jobs/Medical/chief_medical_officer.yml    |  2 +-
 .../Loadouts/Jobs/Medical/medical_doctor.yml  |  8 ++---
 .../Jobs/Science/research_director.yml        |  2 +-
 .../Loadouts/Jobs/Science/scientist.yml       |  2 +-
 .../Jobs/Security/head_of_security.yml        |  2 +-
 .../Jobs/Security/security_officer.yml        |  8 ++---
 .../Loadouts/Miscellaneous/glasses.yml        |  6 ++--
 .../Loadouts/Miscellaneous/trinkets.yml       | 34 +++++++++----------
 Resources/Prototypes/Roles/Antags/nukeops.yml | 10 +++---
 .../Prototypes/Roles/Antags/revolutionary.yml |  2 +-
 Resources/Prototypes/Roles/Antags/thief.yml   |  2 +-
 Resources/Prototypes/Roles/Antags/traitor.yml |  4 +--
 Resources/Prototypes/Roles/Antags/wizard.yml  |  2 +-
 Resources/Prototypes/Roles/Antags/zombie.yml  |  2 +-
 .../Roles/Jobs/Cargo/quartermaster.yml        |  6 ++--
 .../Roles/Jobs/Cargo/salvage_specialist.yml   |  2 +-
 .../Roles/Jobs/Civilian/bartender.yml         |  2 +-
 .../Prototypes/Roles/Jobs/Civilian/chef.yml   |  2 +-
 .../Prototypes/Roles/Jobs/Civilian/lawyer.yml |  2 +-
 .../Prototypes/Roles/Jobs/Civilian/mime.yml   |  2 +-
 .../Roles/Jobs/Civilian/service_worker.yml    |  2 +-
 .../Prototypes/Roles/Jobs/Command/captain.yml | 10 +++---
 .../Roles/Jobs/Command/head_of_personnel.yml  | 10 +++---
 .../Engineering/atmospheric_technician.yml    |  2 +-
 .../Roles/Jobs/Engineering/chief_engineer.yml |  6 ++--
 .../Jobs/Engineering/station_engineer.yml     |  2 +-
 .../Jobs/Engineering/technical_assistant.yml  |  4 +--
 .../Prototypes/Roles/Jobs/Medical/chemist.yml |  2 +-
 .../Jobs/Medical/chief_medical_officer.yml    |  6 ++--
 .../Roles/Jobs/Medical/medical_doctor.yml     |  2 +-
 .../Roles/Jobs/Medical/medical_intern.yml     |  2 +-
 .../Roles/Jobs/Medical/paramedic.yml          |  2 +-
 .../Prototypes/Roles/Jobs/Science/borg.yml    |  4 +--
 .../Roles/Jobs/Science/research_assistant.yml |  2 +-
 .../Roles/Jobs/Science/research_director.yml  |  4 +--
 .../Roles/Jobs/Science/scientist.yml          |  2 +-
 .../Roles/Jobs/Security/detective.yml         |  2 +-
 .../Roles/Jobs/Security/head_of_security.yml  |  8 ++---
 .../Roles/Jobs/Security/security_cadet.yml    |  4 +--
 .../Roles/Jobs/Security/security_officer.yml  |  2 +-
 .../Prototypes/Roles/Jobs/Security/warden.yml |  4 +--
 .../Roles/requirement_overrides.yml           |  8 ++---
 49 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
index 60fc1834fb..602b2d36fd 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
@@ -6,7 +6,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobQuartermaster
-      time: 72000 #20 hrs
+      time: 20h
 
 # Jumpsuit
 - type: loadout
@@ -53,7 +53,7 @@
 
 - type: loadout
   id: QuartermasterMantle
-  equipment: 
+  equipment:
     neck: ClothingNeckMantleQM
   effects:
   - !type:GroupLoadoutEffect
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
index d9c4faed8c..d902481f9c 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
@@ -5,7 +5,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobJanitor
-      time: 187200 #52 hrs (1 hour per week for 1 year)
+      time: 52h # 1 hour per week for 1 year
 
 # Head
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
index edb9c8d1fc..1ed5e8aca0 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
@@ -6,7 +6,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobPassenger
-      time: 36000 #10 hrs, silly reward for people who play passenger a lot
+      time: 10h # silly reward for people who play passenger a lot
 
 # Head of Greytide (for grey mantle)
 - type: loadoutEffectGroup
@@ -16,7 +16,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobPassenger
-      time: 72000 #20 hrs, fun mantle for the most experienced greytiders
+      time: 20h # fun mantle for the most experienced greytiders
 
 # Face
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
index 9043354a31..2951678968 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
@@ -6,7 +6,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobCaptain
-      time: 72000 #20 hrs
+      time: 20h
 
 # Jumpsuit
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
index 45223bea14..17a84b7386 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -6,7 +6,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobHeadOfPersonnel
-      time: 72000 #20 hrs
+      time: 20h
 
 # Professional HoP Time
 - type: loadoutEffectGroup
@@ -16,7 +16,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobHeadOfPersonnel
-      time: 54000 #15 hrs, special reward for HoP mains
+      time: 15h # special reward for HoP mains
 
 # Jumpsuit
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
index 13b72e0af4..55f184a168 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
@@ -6,7 +6,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobChiefEngineer
-      time: 72000 #20 hrs
+      time: 20h
 
 # Jumpsuit
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
index 82955fccfb..64bfe79a4d 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
@@ -6,17 +6,17 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobAtmosphericTechnician
-      time: 21600 #6 hrs
+      time: 6h
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:RoleTimeRequirement
       role: JobStationEngineer
-      time: 21600 #6 hrs
+      time: 6h
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:DepartmentTimeRequirement
       department: Engineering
-      time: 216000 # 60 hrs
+      time: 60h
 
 # Head
 - type: startingGear
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
index 43bbc42f46..1444247083 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
@@ -6,7 +6,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobChiefMedicalOfficer
-      time: 72000 #20 hrs
+      time: 20h
 
 # Jumpsuit
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
index 3b43df4d4b..b5e5cc10e8 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
@@ -6,17 +6,17 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobChemist
-      time: 21600 #6 hrs
+      time: 6h
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:RoleTimeRequirement
       role: JobMedicalDoctor
-      time: 21600 #6 hrs
+      time: 6h
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:DepartmentTimeRequirement
       department: Medical
-      time: 216000 # 60 hrs
+      time: 60h
 
 # Other Timers
 
@@ -27,7 +27,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobMedicalDoctor
-      time: 108000 #30 hrs
+      time: 30h
 
 # Head
 
diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
index 2e607aca69..3717c1c67c 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
@@ -6,7 +6,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobResearchDirector
-      time: 72000 #20 hrs
+      time: 20h
 
 # Head
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
index e89802e9c1..080015f0da 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
@@ -6,7 +6,7 @@
     requirement:
       !type:DepartmentTimeRequirement
       department: Science
-      time: 216000 #60 hrs
+      time: 60h
 
 # Head
 - type: startingGear
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
index 1f40d5e044..e85e1c8ccb 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
@@ -6,7 +6,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobHeadOfSecurity
-      time: 72000 #20 hrs
+      time: 20h
 
 # Jumpsuit
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
index 6cc0dedf72..482e3ab896 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -6,12 +6,12 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobWarden
-      time: 21600 #6 hrs
+      time: 6h
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:DepartmentTimeRequirement
       department: Security
-      time: 216000 # 60 hrs
+      time: 60h
 
 #Security Star
 - type: loadoutEffectGroup
@@ -21,7 +21,7 @@
       requirement:
         !type:DepartmentTimeRequirement
         department: Security
-        time: 360000 #100 hrs
+        time: 100h
 
 # Head
 - type: loadout
@@ -67,7 +67,7 @@
 
 - type: loadout
   id: TrooperUniform
-  equipment: 
+  equipment:
     jumpsuit: ClothingUniformSecurityTrooper
 
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
index 1ff3f1533e..8a474d359a 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
@@ -6,7 +6,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobLibrarian
-      time: 3600 # 1 hour of being the biggest nerd on the station
+      time: 1h # for being the biggest nerd on the station
 
 - type: loadoutEffectGroup
   id: JensenTimer
@@ -15,7 +15,7 @@
     requirement:
       !type:DepartmentTimeRequirement
       department: Cargo
-      time: 36000 #10 hours of being a space trucker
+      time: 10h # 10 hours of being a space trucker
 
 # Basic options
 # Glasses
@@ -41,4 +41,4 @@
   - !type:GroupLoadoutEffect
     proto: JensenTimer
   equipment:
-    eyes: ClothingEyesGlassesJensen
\ No newline at end of file
+    eyes: ClothingEyesGlassesJensen
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index ccaf3abe42..ad58f9c58d 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -6,7 +6,7 @@
     requirement:
       !type:DepartmentTimeRequirement
       department: Command
-      time: 3600 # 1 hour
+      time: 1h
 
 # Flowers
 - type: loadout
@@ -308,7 +308,7 @@
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:OverallPlaytimeRequirement
-      time: 36000 # 10hr
+      time: 10h
   storage:
     back:
     - TowelColorWhite
@@ -320,7 +320,7 @@
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:OverallPlaytimeRequirement
-      time: 1800000 # 500hr
+      time: 500h
   storage:
     back:
     - TowelColorSilver
@@ -332,7 +332,7 @@
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:OverallPlaytimeRequirement
-      time: 3600000 # 1000hr
+      time: 1000h
   storage:
     back:
     - TowelColorGold
@@ -345,7 +345,7 @@
     requirement:
       !type:DepartmentTimeRequirement
       department: Cargo
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorLightBrown
@@ -358,7 +358,7 @@
     requirement:
       !type:DepartmentTimeRequirement
       department: Civilian
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorGreen
@@ -371,7 +371,7 @@
     requirement:
       !type:DepartmentTimeRequirement
       department: Command
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorDarkBlue
@@ -384,7 +384,7 @@
     requirement:
       !type:DepartmentTimeRequirement
       department: Engineering
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorOrange
@@ -397,7 +397,7 @@
     requirement:
       !type:DepartmentTimeRequirement
       department: Medical
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorLightBlue
@@ -410,7 +410,7 @@
     requirement:
       !type:DepartmentTimeRequirement
       department: Science
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorPurple
@@ -423,7 +423,7 @@
     requirement:
       !type:DepartmentTimeRequirement
       department: Security
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorRed
@@ -436,7 +436,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobPassenger
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorGray
@@ -449,7 +449,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobChaplain
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorBlack
@@ -462,7 +462,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobLibrarian
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorDarkGreen
@@ -475,7 +475,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobLawyer
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorMaroon
@@ -488,7 +488,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobClown
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorYellow
@@ -501,7 +501,7 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobMime
-      time: 360000 # 100hr
+      time: 100h
   storage:
     back:
     - TowelColorMime
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
index 5e464c1116..e2018b91a6 100644
--- a/Resources/Prototypes/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -6,7 +6,7 @@
   objective: roles-antag-nuclear-operative-objective
   requirements:
   - !type:OverallPlaytimeRequirement
-    time: 18000 # 5h
+    time: 5h
   guides: [ NuclearOperatives ]
 
 - type: antag
@@ -17,10 +17,10 @@
   objective: roles-antag-nuclear-operative-agent-objective
   requirements:
   - !type:OverallPlaytimeRequirement
-    time: 18000 # 5h
+    time: 5h
   - !type:RoleTimeRequirement
     role: JobChemist
-    time: 10800 # 3h
+    time: 3h
   guides: [ NuclearOperatives ]
 
 - type: antag
@@ -31,10 +31,10 @@
   objective: roles-antag-nuclear-operative-commander-objective
   requirements:
   - !type:OverallPlaytimeRequirement
-    time: 18000 # 5h
+    time: 5h
   - !type:DepartmentTimeRequirement
     department: Security
-    time: 18000 # 5h
+    time: 5h
   # should be changed to nukie playtime when thats tracked (wyci)
   guides: [ NuclearOperatives ]
 
diff --git a/Resources/Prototypes/Roles/Antags/revolutionary.yml b/Resources/Prototypes/Roles/Antags/revolutionary.yml
index eeef73b2d5..172876040a 100644
--- a/Resources/Prototypes/Roles/Antags/revolutionary.yml
+++ b/Resources/Prototypes/Roles/Antags/revolutionary.yml
@@ -7,7 +7,7 @@
   guides: [ Revolutionaries ]
   requirements:
   - !type:OverallPlaytimeRequirement
-    time: 3600 # 1h
+    time: 1h
 
 - type: antag
   id: Rev
diff --git a/Resources/Prototypes/Roles/Antags/thief.yml b/Resources/Prototypes/Roles/Antags/thief.yml
index 4b333ac495..740a7e217f 100644
--- a/Resources/Prototypes/Roles/Antags/thief.yml
+++ b/Resources/Prototypes/Roles/Antags/thief.yml
@@ -7,7 +7,7 @@
   guides: [ Thieves ]
   requirements:
   - !type:OverallPlaytimeRequirement
-    time: 3600 # 1h
+    time: 1h
 
 - type: startingGear
   id: ThiefGear
diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml
index 572adea1e4..edc130ef8b 100644
--- a/Resources/Prototypes/Roles/Antags/traitor.yml
+++ b/Resources/Prototypes/Roles/Antags/traitor.yml
@@ -7,7 +7,7 @@
   guides: [ Traitors ]
   requirements:
   - !type:OverallPlaytimeRequirement
-    time: 3600 # 1h
+    time: 1h
 
 - type: antag
   id: TraitorSleeper
@@ -18,7 +18,7 @@
   guides: [ Traitors ]
   requirements:
   - !type:OverallPlaytimeRequirement
-    time: 3600 # 1h
+    time: 1h
 
 # Syndicate Operative Outfit - Monkey
 - type: startingGear
diff --git a/Resources/Prototypes/Roles/Antags/wizard.yml b/Resources/Prototypes/Roles/Antags/wizard.yml
index 0ddf90ef2b..8ef9bda367 100644
--- a/Resources/Prototypes/Roles/Antags/wizard.yml
+++ b/Resources/Prototypes/Roles/Antags/wizard.yml
@@ -13,7 +13,7 @@
   objective: roles-antag-wizard-objective # TODO: maybe give random objs and stationary ones from AntagObjectives and AntagRandomObjectives
   requirements: # I hate time locked roles but this should be enough time for someone to be acclimated
   - !type:OverallPlaytimeRequirement
-    time: 18000 # 5h
+    time: 5h
   guides: [ Wizard ]
 
 # See wizard_startinggear for wiz start gear options
diff --git a/Resources/Prototypes/Roles/Antags/zombie.yml b/Resources/Prototypes/Roles/Antags/zombie.yml
index 4629e6b509..fa6561aa5e 100644
--- a/Resources/Prototypes/Roles/Antags/zombie.yml
+++ b/Resources/Prototypes/Roles/Antags/zombie.yml
@@ -7,7 +7,7 @@
   guides: [ Zombies ]
   requirements:
   - !type:OverallPlaytimeRequirement
-    time: 3600 # 1h
+    time: 1h
 
 - type: antag
   id: Zombie
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
index 5a62c1dc8e..92b9b93671 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -6,13 +6,13 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobCargoTechnician
-      time: 18000 #5 hrs
+      time: 5h
     - !type:RoleTimeRequirement
       role: JobSalvageSpecialist
-      time: 9000 #2.5 hrs
+      time: 2.5h
     - !type:DepartmentTimeRequirement
       department: Cargo
-      time: 36000 #10 hours
+      time: 10h
   weight: 10
   startingGear: QuartermasterGear
   icon: "JobIconQuarterMaster"
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
index 9bab10529b..7756f8dde9 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Cargo
-      time: 9000 # 2.5 hrs
+      time: 2.5h
   icon: "JobIconShaftMiner"
   startingGear: SalvageSpecialistGear
   supervisors: job-supervisors-qm
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
index 8881fb0d41..2d32b87f68 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Civilian
-      time: 1800 #0.5 hr
+      time: 0.5h
   startingGear: BartenderGear
   icon: "JobIconBartender"
   supervisors: job-supervisors-hop
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
index fd3941d4e0..734f22597c 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Civilian
-      time: 1800 #0.5 hr
+      time: 0.5h
   startingGear: ChefGear
   icon: "JobIconChef"
   supervisors: job-supervisors-hop
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index 81c8b71050..11f07252a3 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobLawyer
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 9000 # 2.5 hrs
+      time: 2.5h
   startingGear: LawyerGear
   icon: "JobIconLawyer"
   supervisors: job-supervisors-hop
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
index 293df524e9..8ff045173d 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobMime
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 14400 #4 hrs
+      time: 4h
   startingGear: MimeGear
   icon: "JobIconMime"
   supervisors: job-supervisors-hop
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
index f98dac80ed..0c83971827 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
@@ -6,7 +6,7 @@
   requirements:
   - !type:DepartmentTimeRequirement
     department: Civilian
-    time: 1800 #0.5 hr
+    time: 0.5h
   startingGear: ServiceWorkerGear
   icon: "JobIconServiceWorker"
   supervisors: job-supervisors-service
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index fa02e160a8..54251b263b 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -6,19 +6,19 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 14400 # 4 hours
+      time: 4h
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 14400 # 4 hours
+      time: 4h
     - !type:DepartmentTimeRequirement
       department: Science
-      time: 14400 # 4 hours
+      time: 4h
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 14400 # 4 hours
+      time: 4h
     - !type:DepartmentTimeRequirement
       department: Command
-      time: 14400 # 4 hours
+      time: 4h
   weight: 20
   startingGear: CaptainGear
   icon: "JobIconCaptain"
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index ac052e5cdf..4dfafb97d1 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -6,19 +6,19 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 9000 # 2.5 hours
+      time: 2.5h
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 9000 # 2.5 hours
+      time: 2.5h
     - !type:DepartmentTimeRequirement
       department: Science
-      time: 9000 # 2.5 hrs
+      time: 2.5h
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 9000 # 2.5 hrs
+      time: 2.5h
     - !type:DepartmentTimeRequirement
       department: Command
-      time: 9000 # 2.5 hours
+      time: 2.5h
   weight: 20
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
index 5dda67f25d..20a6dc7ace 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -6,7 +6,7 @@
   requirements:
   - !type:DepartmentTimeRequirement
     department: Engineering
-    time: 9000 #2.5 hrs
+    time: 2.5h
   startingGear: AtmosphericTechnicianGear
   icon: "JobIconAtmosphericTechnician"
   supervisors: job-supervisors-ce
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index 264e31a3ae..561d026020 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -6,13 +6,13 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobAtmosphericTechnician
-      time: 9000 #2.5 hrs
+      time: 2.5h
     - !type:RoleTimeRequirement
       role: JobStationEngineer
-      time: 18000 #5 hrs
+      time: 5h
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 36000 #10 hrs
+      time: 10h
   weight: 10
   startingGear: ChiefEngineerGear
   icon: "JobIconChiefEngineer"
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
index c67e3067cb..c99140b095 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 9000 #2.5 hrs
+      time: 2.5h
   startingGear: StationEngineerGear
   icon: "JobIconStationEngineer"
   supervisors: job-supervisors-ce
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
index 24cef50e1a..afc0182c0f 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -5,10 +5,10 @@
   playTimeTracker: JobTechnicalAssistant
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 3600 #1 hr
+      time: 1h
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 18000 #5 hrs
+      time: 5h
       inverted: true # stop playing intern if you're good at engineering!
   startingGear: TechnicalAssistantGear
   icon: "JobIconTechnicalAssistant"
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index e14fbd5b84..784ba81403 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 18000 #5 hrs
+      time: 5h
   startingGear: ChemistGear
   icon: "JobIconChemist"
   supervisors: job-supervisors-cmo
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index b6698091df..f67041a713 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -8,13 +8,13 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobChemist
-      time: 9000 #2.5 hrs
+      time: 2.5h
     - !type:RoleTimeRequirement
       role: JobMedicalDoctor
-      time: 18000 #5 hrs
+      time: 5h
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 36000 #10 hrs
+      time: 10h
   weight: 10
   startingGear: CMOGear
   icon: "JobIconChiefMedicalOfficer"
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
index 4b43df2004..a41e95d400 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 9000 #2.5 hrs
+      time: 2.5h
   startingGear: DoctorGear
   icon: "JobIconMedicalDoctor"
   supervisors: job-supervisors-cmo
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
index d313d12d9b..0517d318e1 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 18000 # 5 hrs
+      time: 5h
       inverted: true # stop playing intern if you're good at med!
   startingGear: MedicalInternGear
   icon: "JobIconMedicalIntern"
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index 5526e63f24..da71ac0367 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -6,7 +6,7 @@
   requirements:
   - !type:DepartmentTimeRequirement
     department: Medical
-    time: 9000 #2.5 hrs
+    time: 2.5h
   startingGear: ParamedicGear
   icon: "JobIconParamedic"
   supervisors: job-supervisors-cmo
diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml
index 84ded8ed48..da84441e31 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml
@@ -8,7 +8,7 @@
   requirements:
   - !type:RoleTimeRequirement
     role: JobBorg
-    time: 18000  # 5 hrs
+    time: 5h
   canBeAntag: false
   icon: JobIconStationAi
   supervisors: job-supervisors-rd
@@ -23,7 +23,7 @@
   playTimeTracker: JobBorg
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 36000 # 10 hrs
+      time: 10h
   canBeAntag: false
   icon: JobIconBorg
   supervisors: job-supervisors-rd
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
index e824368cb7..96b95c3d58 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Science
-      time: 18000 #5 hrs
+      time: 5h
       inverted: true # stop playing intern if you're good at science!
   startingGear: ResearchAssistantGear
   icon: "JobIconResearchAssistant"
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index da41d9f3e0..a7b057dc1b 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -6,10 +6,10 @@
   requirements:
   - !type:RoleTimeRequirement
     role: JobScientist
-    time: 18000 #5 hrs
+    time: 5h
   - !type:DepartmentTimeRequirement
     department: Science
-    time: 36000 #10 hrs
+    time: 10h
   weight: 10
   startingGear: ResearchDirectorGear
   icon: "JobIconResearchDirector"
diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
index e2e31f8dcf..5e8e1b6e14 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Science
-      time: 9000 #2.5 hrs
+      time: 2.5h
   startingGear: ScientistGear
   icon: "JobIconScientist"
   supervisors: job-supervisors-rd
diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
index e5c9fdf2dc..f59e1bf836 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -6,7 +6,7 @@
   requirements:
   - !type:RoleTimeRequirement
     role: JobSecurityOfficer
-    time: 18000 #5 hrs
+    time: 5h
   startingGear: DetectiveGear
   icon: "JobIconDetective"
   supervisors: job-supervisors-hos
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index 7db7429263..1f73f48988 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -6,16 +6,16 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobWarden
-      time: 3600 #1 hr
+      time: 1h
     - !type:RoleTimeRequirement
       role: JobDetective
-      time: 3600 #1 hr, knowing how to use the tools is important
+      time: 1h # knowing how to use the tools is important
     - !type:RoleTimeRequirement
       role: JobSecurityOfficer
-      time: 18000 #5 hrs
+      time: 5h
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 36000 # 10 hrs
+      time: 10h
   weight: 10
   startingGear: HoSGear
   icon: "JobIconHeadOfSecurity"
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
index cac79f4822..8dc5815fcf 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -5,10 +5,10 @@
   playTimeTracker: JobSecurityCadet
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 36000 #10 hrs
+      time: 10h
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 18000 #5 hrs
+      time: 5h
       inverted: true # stop playing intern if you're good at security!
   startingGear: SecurityCadetGear
   icon: "JobIconSecurityCadet"
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index 432c6b0d3c..141801e4ff 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 9000 #2.5 hrs
+      time: 2.5h
   startingGear: SecurityOfficerGear
   icon: "JobIconSecurityOfficer"
   supervisors: job-supervisors-hos
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
index 42964ee134..566b0da6d1 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -6,10 +6,10 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobSecurityOfficer
-      time: 18000 #5 hrs
+      time: 5h
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 36000 #10 hrs
+      time: 10h
   weight: 5
   startingGear: WardenGear
   icon: "JobIconWarden"
diff --git a/Resources/Prototypes/Roles/requirement_overrides.yml b/Resources/Prototypes/Roles/requirement_overrides.yml
index 62041f42d7..752249e90b 100644
--- a/Resources/Prototypes/Roles/requirement_overrides.yml
+++ b/Resources/Prototypes/Roles/requirement_overrides.yml
@@ -4,13 +4,13 @@
     Captain:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 3600 # 1 hours
+      time: 1h
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 3600 # 1 hours
+      time: 1h
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 3600 # 1 hours
+      time: 1h
     - !type:DepartmentTimeRequirement
       department: Command
-      time: 3600 # 1 hour
+      time: 1h

From 0bb1ede5ee112dcdd00afde8c1a0432378a83e6d Mon Sep 17 00:00:00 2001
From: Huaqas <zacswebb@gmail.com>
Date: Tue, 7 Oct 2025 17:04:05 +0800
Subject: [PATCH 046/216] Remove the Tanakh and Satanic Bible from the game.
 (#39698)

* Remove the Tanakh and Satanic Bible from the game.

* Update migration.yml

* Renamed to Space Bible

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../Objects/Specific/Chapel/bibles.yml        |  24 +-----------------
 .../Loadouts/Jobs/Civilian/chaplain.yml       |  14 +---------
 .../Prototypes/Loadouts/loadout_groups.yml    |   2 --
 .../Specific/Chapel/satanicbible.rsi/icon.png | Bin 366 -> 0 bytes
 .../Chapel/satanicbible.rsi/inhand-left.png   | Bin 314 -> 0 bytes
 .../Chapel/satanicbible.rsi/inhand-right.png  | Bin 2806 -> 0 bytes
 .../Chapel/satanicbible.rsi/meta.json         |  23 -----------------
 .../Specific/Chapel/tanakh.rsi/icon.png       | Bin 3027 -> 0 bytes
 .../Chapel/tanakh.rsi/inhand-left.png         | Bin 2967 -> 0 bytes
 .../Chapel/tanakh.rsi/inhand-right.png        | Bin 2951 -> 0 bytes
 .../Specific/Chapel/tanakh.rsi/meta.json      |  23 -----------------
 Resources/migration.yml                       |   4 +++
 12 files changed, 6 insertions(+), 84 deletions(-)
 delete mode 100644 Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-left.png
 delete mode 100644 Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-right.png
 delete mode 100644 Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-left.png
 delete mode 100644 Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-right.png
 delete mode 100644 Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index 9016bce6cb..1545594b11 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -1,5 +1,5 @@
 - type: entity
-  name: bible
+  name: space bible
   description: New Interstellar Version 2340.
   parent: BaseStorageItem
   id: Bible
@@ -95,17 +95,6 @@
   - type: InstantAction
     event: !type:SummonActionEvent
 
-- type: entity
-  parent: Bible
-  name: tanakh
-  description: "For God's chosen crewmembers"
-  id: BibleTanakh
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Chapel/tanakh.rsi
-  - type: Item
-    sprite: Objects/Specific/Chapel/tanakh.rsi
-
 - type: entity
   id: BibleDruid
   name: druidic tablet
@@ -128,17 +117,6 @@
   - type: Item
     sprite: Objects/Specific/Chapel/communistmanifesto.rsi
 
-- type: entity
-  parent: Bible
-  name: satanic bible
-  description: "What could possibly go wrong?"
-  id: BibleSatanic
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Chapel/satanicbible.rsi
-  - type: Item
-    sprite: Objects/Specific/Chapel/satanicbible.rsi
-
 - type: entity
   id: BibleNarsie
   name: tome of nar'sie
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
index 4f501057b2..0bfc99d41f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
@@ -132,19 +132,7 @@
   storage:
     back:
     - BibleNanoTrasen
-
-- type: loadout
-  id: BibleSatanic
-  storage:
-    back:
-    - BibleSatanic
-
-- type: loadout
-  id: BibleTanakh
-  storage:
-    back:
-    - BibleTanakh
-
+    
 - type: loadout
   id: BibleNarsie
   storage:
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 79266b70ec..085fcb5bbf 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -383,8 +383,6 @@
   - Bible
   - BibleNanoTrasen
   - BibleDruid
-  - BibleSatanic
-  - BibleTanakh
   - BibleHonk
   - BibleRatvar
   - BibleNarsie
diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/icon.png
deleted file mode 100644
index 2c0a574d58afd9436bff22363673eae4dd32694d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 366
zcmV-!0g?WRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003sNkl<ZScUDC
zF;2rk5JmqYq)4Pg{_axb1THv34nx5KXlXb?id-a8&OqUkih|B-(WRjos)2PBCo^k@
zG=7pLOFP>C_j_gyOiWyvV62l%Y1~@GNn*Qs0st%*G%MdfJf5vNn*hnI)4y+D)WF~b
z(8TBxFKJK7WWckbm+S=8)Ty=644m3<XgVeXDSiErYs6)si4m)!Kpnb`U5TKHG0Vh_
zM;rilZHr3&CbJU3u5CLtqZ`nZ1Hh^%eod&ju9c+Qgu4e)6Z$>`^Czf7=m@8zDR{|B
zAQe1j$b&h7L*bOZWJZCc2;h21%GcXkVEB!j643cB$<8#S?`e$(a}Vf<sflz7>JYLo
zB3Bb0n{zetFIVvpp*~zw;Njyl;(0!wUCqF9!MoS}{`*q<PfU!)4>CcGjpVY*4FCWD
M07*qoM6N<$f;>*4Bme*a

diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-left.png
deleted file mode 100644
index 1e6043fb41e806d0b1812a3d25d621fa8f56c9bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}W@kaSW-L^Y)gZ*AWMiV;|4E
z26y^?Iw_QM#Epg3KjE>W&Nr@mN6sCpvTZ9D;Lg73HtlG`)KG!>SG)AgcB}O@|Bs(8
z`Rwstc12e=CZMT6P?xe_M}1rJ`c?0CpRv|CJzMWnRl4=O{Pl;*{v6%o+HB`ke25`P
ze1a773(fBfAMZKd_ZgxONPc*~W~p96WcPQLvU6tUDtkR|P5M$)ZdvIYbR&PGtYYii
z4YKOu?9Hz~{>a!@U$bxbyiNP=)yg?|7_NG4v38Zj)vw2Y8CBl=FE@Yd+BVmPk+;{C
z*!^ZaGh1HlsMqt&b@AJBZGD%=&znB=Z}<ai-^(f2#TgV@%eQklXFSTA84GfSr>mdK
II;Vst07EH;lmGw#

diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-right.png
deleted file mode 100644
index 60aba34bbbb01803a70b22334bb4849b4d7db692..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2806
zcmeHJdsvKF7=ORHPnWH!sm5#?rIgz;Ny)OKG}UOu%x0)va@i>CCZQA!En!4k%IM-r
z*(hzSOGerZQVFZoQYuNPuxwPCnwjR?^SSK$W1qFRXaDk^=XcI~-t(UK{eJKHZrf)1
z`xqN=4FJGc<m)9t;}il68tM;)Mcf8pdWXyrEf$GJ00Y?o-a}x59w>kzjR0UTbz*|O
zp_4E&kkRr61TxYIUm`B;4c+3EPWWM@mvIu1PI{%EeVG*HCK`SdzXPVzyhYw95s@5q
zcoR$o28~9iQ5kePoylYv7_p6w3=NG2nVFlg2XlEggSpn$L+n3r9AY<WsI|3|+wf6i
z`7SOlJV*D*6Pzb~FwVu92!b)0Od~@hj<GSv+1A?D`ELt;7FZ18n#h<PkXRU*h2a-~
zhpv-~y%5Cfg<vEyg-W9{m<EQ(q1Y5qrN|@-nM$QlkoS7D4ipyE%$Dy#GZ!zQ+eNUQ
zHzwyWhI$@7XCb-v)PCH;mGMjiODoPGuEQ`#r{N=9#=E*raGyBUOX%(6E1LF6z%1$P
zIe|foJ`Y*EBs6Sk<f_$cqN3Nve6?wF!j`Su<SDyS({?NNq-W&r|0eIi!Tf?l$Bv&U
zKB+uaa{7Gvg^J3mi`AEEf4Y97uKs32W9!{}_uJY#9z1;XtgE}{d9S*!UqkRBc)pfD
z<i$d~NE8a0LMM1(q$mV3i$b;K)66`?^aT;-cFr3aY|rGJqvx1I$4Q=AEL?fbz|!8O
z)!`XI?FF;HMlAjxG5d|!@4Onph>W4bBeOsN{d&36KGHj&8uZK{N58K(7btPKQ1w{$
zc^3|CThdi=oxKTs<@3Xq>OKKC&Av(AY+RAIvWP7X7?LY@g14f~{OoNS4x4J8;P8yE
z<uy!F^)F}-Zz&zfN&I49+2%66NoAhM^{#SiMA&DALiQ|%Q?49dLoL{->bAi_DH|x5
zH#%0w+YvkCY)gNVtVyN6e#Da4{M|uapiVV3a2=~ZEi_kt>*DLZe>VQxxWBA3erBaN
zts#n4_#}H7QLKBH8;(b59o?HXv#nfiuW3<m)cN@ZVo}NHo3}Eh22Q#89zym^>@A>2
z-U;8TdYZ6arFRHkt_@b;Fve!y51Fb4_p6<?r%DcVpVXbIDiaE)$){I;S$V(lJF(Eh
z6Gh+f4*y{dMi!uZ)=i&{Lzf8-AwD`=RSyn0d@a+CsQQ_$O^=OPe>F&6+&e}SrV+pB
zrImR>|Ku1Ne;hyNap#G+jw{`+I9T!%wXt=hgO2G1=MRV_(uJu3Y3T)#tw)Zd2gt9v
zRM1t!t1HcHv6h7`$6;HPqOC*!X@`52_M;n{3w>189h~NYk!}Mr?F8MjovF=1e%YVm
zklwTQ%-n=L`Cg9aHEC_<vGo^=2Y>k3Cb)Cm5B+-UMI5!d@Qf`Eits+Gp8XdDT__bv
zpBlYIKUZ}pxHdPd&0UhJRPWR+=I-Y1{%D6q=#h|+zULD(PPt{~_u~KV>$50O#%rAw
zy6?Rt|Lbw*+T(t{(vozylAj$OQ;GxAWMCo=_h;yfBYLFf<&vzDZ;B^><{Fh$E(r*|
zenNWba{Zz4OMCa{52!8=)GLk)DzZ9kZr`{n4mu^Q7X7l58=Z0Dp?_j<>4$TpP8Mp=
zBR7jfWs9f$AK>8)p$>lN0}oiF#K#kBs2(Ll6Uq{g=^g+_lMHnWsAxW9k*{PrK+G`o
z<FpAtgG?J90IVJh@Mu23#6193E3!_DC!qz}LO&lbbl;)2uk7G1WMQuG4U7aZG$(*T
zMivJd>8nK3h4hDXrkNc#s-n~dnI4F|JOZK{pEUB9mQP`CYE2#+OPXQ&sP=R>^VWUN
z>G<%J#=}oW+!@(tP$C>_7atHdijnE<DqX^K8;J)iw{BK@2hGb#LxGTNuxWa~=~^#8
zIVQ=ZsD6#E|CV<XKN)B@G6h;If1pf(D0ln1`rZA;Fa6PuGs_<&v}wjG*!FuJLV|fJ
znX)GHK=rUpY5n*1VX7vJLbb52xpJ#`TDw_AsKUGOSYmkh+HWs)HAWx85;c?ODU0N$
z0m?7B#;gtiMf-Ns6qEU`tID?*b^cVKjLR6lqGnKb4;$d)D}tu5sjOY+3sQ*GBB8(6
JVbA&TzXBkk5`zE$

diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json
deleted file mode 100644
index 9a00632eed..0000000000
--- a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Originally drawn by @Trosling (Discord), modified by @SurrealShibe (Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
-
diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/icon.png
deleted file mode 100644
index c04412d52b0620c5c45f6ecd2508249d4fdc14ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3027
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
ZJtf~%9Pft7qwHbTfJo@?Rqhd*@*B_Ohb#a9

diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-left.png
deleted file mode 100644
index 94fdcc0f20eb819202eebf2a2d6e90da98005eaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2967
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
De%@k-

diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-right.png
deleted file mode 100644
index 56c5a517f138a0ceb86f46adeea71489d4388919..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2951
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

diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json
deleted file mode 100644
index c0dd9096bc..0000000000
--- a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Originally drawn by @Trosling (Discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
-
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 299fcfeefc..ea991259ed 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -721,3 +721,7 @@ ClothingUniformJumpsuitParamedicNT: ClothingUniformJumpsuitParamedic
 
 # 2025-08-29
 PrefilledSyringe: Syringe
+
+# 2025-10-6
+BibleTanakh: null
+BibleSatanic: null

From c2c9d7c784986c54fad988e614a1bf56df49a110 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 09:15:57 +0000
Subject: [PATCH 047/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 74e3a22e24..1fa73c9c67 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: aada
-  changes:
-  - message: Pepper makes you cough.
-    type: Add
-  id: 8531
-  time: '2025-05-19T18:23:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36358
 - author: Entvari
   changes:
   - message: Hyper Capacity Powercells are now available as Tier 3 Industrial Research.
@@ -3955,3 +3948,10 @@
   id: 9038
   time: '2025-10-07T07:39:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39181
+- author: Huaqas
+  changes:
+  - message: The Tanakh and Satanic bibles have been removed.
+    type: Remove
+  id: 9039
+  time: '2025-10-07T09:14:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39698

From f1e5d1eb07d0cf943f8addfff21371c13a056d7c Mon Sep 17 00:00:00 2001
From: Jessica M <jessica@jessicamaybe.com>
Date: Tue, 7 Oct 2025 02:21:08 -0700
Subject: [PATCH 048/216] Let gorillas pull things (#40700)

gorilla pull
gorilla bring
gorilla

Co-authored-by: Jessica M <jessica@maybe.sh>
---
 Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index e6b761d515..5aedad4596 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1215,6 +1215,8 @@
         true
       NavSmash: !type:Bool
         true
+  - type: Puller
+    needsHands: false
   - type: Prying
     pryPowered: true
     force: true

From 46aa3bbc41fd583f3baee222cbfbd35bc6e55ff9 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 09:32:54 +0000
Subject: [PATCH 049/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1fa73c9c67..c1cabeb390 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
 Entries:
-- author: Entvari
-  changes:
-  - message: Hyper Capacity Powercells are now available as Tier 3 Industrial Research.
-    type: Add
-  - message: The Tier 3 Industrial Research 'Portable Fission' has been renamed to
-      Optimized Microgalvanism to better reflect this.
-    type: Tweak
-  id: 8532
-  time: '2025-05-19T22:35:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37619
 - author: RedBookcase
   changes:
   - message: The Salvage section of the guidebook has been updated.
@@ -3955,3 +3945,10 @@
   id: 9039
   time: '2025-10-07T09:14:49.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39698
+- author: jessicamaybe
+  changes:
+  - message: Gorillas can now pull objects.
+    type: Tweak
+  id: 9040
+  time: '2025-10-07T09:31:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40700

From e1c03249fa0d73f528f8b988f00bb64530278002 Mon Sep 17 00:00:00 2001
From: Prole <172158352+Prole0@users.noreply.github.com>
Date: Tue, 7 Oct 2025 02:39:51 -0700
Subject: [PATCH 050/216] Golden Plunger General Fixes & Tweaks (#40619)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Plung Plunges

* C# solution replaced with yaml solution, made sprite in-line with normal plunger, & alt click works now

* Update Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json

Co-authored-by: āda <ss.adasts@gmail.com>

* Chameleon Tag Added

* a TODO

---------

Co-authored-by: āda <ss.adasts@gmail.com>
---
 .../Objects/Specific/Janitorial/janitor.yml     |   4 +++-
 .../Structures/Specific/Janitor/janicart.yml    |   6 +-----
 .../janitorial_cart.rsi/cart_goldenplunger.png  | Bin 650 -> 638 bytes
 .../Janitorial/janitorial_cart.rsi/meta.json    |   2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index fb740f1cd6..0117ec1255 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -278,9 +278,11 @@
   parent: Plunger
   description: A plunger with a plastic suction cup coated in a thin layer of gold given as a token of appreciation for years of service. Still used to unclog drains.
   components:
-  - type: Tag
+  - type: Tag # TODO change Plunger into a tool so we dont got to layer Tags like below.
     tags:
     - GoldenPlunger
+    - Plunger
+    - WhitelistChameleon
   - type: Sprite
     sprite: Objects/Specific/Janitorial/golden_plunger.rsi
     state: plunger
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
index a24a03da3e..90893cd432 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
@@ -190,11 +190,7 @@
           whitelist:
             tags:
               - Plunger
-        goldenplunger_slot:
-          name: janitorial-trolley-slot-component-slot-name-goldenplunger
-          whitelist:
-            tags:
-            - GoldenPlunger
+              - GoldenPlunger
           priority: 8
         wetfloorsign_slot4:
           name: janitorial-trolley-slot-component-slot-name-sign
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png
index 13988bf1c404e5e08a76bacfcf7898b7266d582a..4829eb6c7b68a41596b505f462f9f4d6bc56f639 100644
GIT binary patch
delta 613
zcmV-r0-F7b1^xt(B!7BoLqkw=Qb$4{Nkv08F*!CiEix`K001bFb&$;~1aTP0KQlw*
zZ572qnuOD?7PWD4*v(tvuvXdSGCMo7tM+A@8A-0nb&C=gZwLMYuF6>{A|+SO#D#4%
zyIU*S=kojXeSY7k=lOydNvj#F#t)gSZH6a<@?tb5*S#RoLVpJ%bStW5%+60ls9K-*
z2=069b7xim_ir^OG)o1c9vD*%(*|J*m|3$8mv?}6HKim#I0L-qVl)QAovX)7{OWSD
z#NRHPk#GpaRzObv;`lFCQ)UK4KhT>=ud3yJ+)J9Y?7}?I19V{#W|AN>(~J`$z#yXp
z2;gIg0S2Lp-+y29&yhn$C5OQ}CMzUKVdF(+6$=d+9TN?WH0y5ue{;3;;i1y>rXbWl
zJI;F_)NMl{?>Jvaj#D@W=?N~g6@Ts!Mm|8wSG3*(@NB~QRYi;M!o?PJJ{pRt6eS4|
zbsgSLp*ad|H_)(D%B<Yy<N+cZFmnxi`_Qk0XZZ)KY=3A4n`tAc0002LNkl<Zc%1Fp
zu?@m76og?1iPjw*6+<vc_Fw_}P$OKkj8|X<&p>+=C{-jR#}O}f{;!Ob=<dl$^Wq!;
z0002sODSmRy@uY)I!mdshf>Jvq7<Z9{{R$!m*4$2PGz!>%?h>90RR91000000BlrC
zd&}8c*<M?&LYI4kqSx&{y?%WRt~*|`pJ#1W;K}hj)mh%L9xpKdc(Cd9^Xqx8zI@Ru
zaCq;ROJZd6-v9<+9l#m`unu620aynB003q_Y<x!U$!iS`00000NkvXXu0mjfb*&Jh

delta 625
zcmV-%0*?Lu1d0WaB!7WvLqkw=Qb$4{Nkv08F*!CiEix`K001bFb&<PE13?gnKNCgq
z4GLO_1c_EEF+zxqMS?~_Es_Ynn&k2l@;L4iB-jeJ0R_><SD}A_wt}@FD2gDqS}WS9
zoO6kgAZC`?`S!Ov!|p6tf=MN%*E%4T&T4+2$F{JzWUGJ1N`EU|xakckx;h(}3{urT
z?x->2&5&8E`ni9tDH7EcsA&)$S5z%4JS9A{mQ_vO7VcCMp@{IQ@Sr9a6uvd}aEV_`
zj+gk$WG(3Tf~8&97O&uN1uF?HB`hz;o=WDF-}{&^X^y7n0}}hhd(iRY!-I`!Ch+27
zgfW?24B=#0R)18<cNFvI$Vjdtvq~O~RpKPbGAL?Jsz)WpM32fyk~jPRx379^)LE+D
z?18!`!+7h5`Yre_7{=$JVSFEf^${-8<^0S6xZg!Dlr{T4v~9rIWmyaF!1*S0Kd2!s
zRFtgZmRJm4PoQNHI<BE{xzw}YeU9%TxGrCH1-pANAb;oER(=4hY-j~;9)kJ+006{E
zL_t(|obB4N4Z<)Gh2aYltvfm@hG3BF!2<NAMsdwDUV#-n1MN|uAR!v!*g2W}Uuo%*
zyJw}khyVZp007GKy;I*i)fDvC8cjjRx|+Q$LgTdI-*qXd#`*zlYQJFha&EswEdT%j
z000000BS%Lf3?fYwbU*Tg>}{qOr_E3<@$Yo9=vq>)8u)Y3qa%*!pFfOZ+H>b<Lw%M
zyjb-L{eC;n9=_>MVE5S0en!&)lt2L14Ok-p>jtb5fOP`^0Km)>XQD>#r2%&h00000
LNkvXXu0mjfQR*VH

diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
index 7e5a11d313..eda0e5aa7b 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, cart_goldenplunger modified from cart_plunger by TiniestShark (github)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, cart_goldenplunger modified from cart_plunger by TiniestShark (github) and tweaked by Prole0 (github)",
     "states": [
         {
             "name": "cart",

From ce7558f3d294ab80f503ef531999ab209da5cb52 Mon Sep 17 00:00:00 2001
From: GeneralGaws <122978178+GeneralGaws@users.noreply.github.com>
Date: Tue, 7 Oct 2025 12:49:21 +0300
Subject: [PATCH 051/216] Change Discord round restart text (#40584)

* discord-notif

* grammar
---
 Resources/Locale/en-US/discord/round-notifications.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/discord/round-notifications.ftl b/Resources/Locale/en-US/discord/round-notifications.ftl
index a9a3d5fb50..ce5045452b 100644
--- a/Resources/Locale/en-US/discord/round-notifications.ftl
+++ b/Resources/Locale/en-US/discord/round-notifications.ftl
@@ -1,5 +1,5 @@
 discord-round-notifications-new = A new round is starting!
 discord-round-notifications-started = Round #{$id} on map "{$map}" started.
 discord-round-notifications-end = Round #{$id} has ended. It lasted for {$hours} hours, {$minutes} minutes, and {$seconds} seconds.
-discord-round-notifications-end-ping = <@&{$roleId}>, the server will reboot shortly!
+discord-round-notifications-end-ping = <@&{$roleId}>, a new round will start soon!
 discord-round-notifications-unknown-map = Unknown

From 84f994f296e7a88bcbf10dbce46669e61cd2ffc4 Mon Sep 17 00:00:00 2001
From: SurrealShibe <77357653+SurrealShibe@users.noreply.github.com>
Date: Tue, 7 Oct 2025 03:08:00 -0700
Subject: [PATCH 052/216] Give mimes their french bread back (#40601)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add the nutri-batard

* i missed this file smh

* add the proper accenting to "bâtard"
---
 .../Catalog/Fills/Boxes/emergency.yml         |   6 +-
 .../Objects/Consumable/Food/Baked/bread.yml   |  58 ++-
 .../bread.rsi/batard-cotton-inhand-left.png   | Bin 0 -> 338 bytes
 .../bread.rsi/batard-cotton-inhand-right.png  | Bin 0 -> 329 bytes
 .../Food/Baked/bread.rsi/batard-cotton.png    | Bin 0 -> 409 bytes
 .../Baked/bread.rsi/batard-inhand-left.png    | Bin 0 -> 336 bytes
 .../Baked/bread.rsi/batard-inhand-right.png   | Bin 0 -> 319 bytes
 .../Food/Baked/bread.rsi/batard.png           | Bin 0 -> 238 bytes
 .../Consumable/Food/Baked/bread.rsi/meta.json | 332 ++++++++++--------
 9 files changed, 236 insertions(+), 160 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard.png

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index b5b2fb90d8..29f561c1b8 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -213,7 +213,7 @@
     - id: EmergencyOxygenTankFilled
     - id: EmergencyMedipen
     - id: Flare
-    - id: FoodSnackNutribrick
+    - id: FoodBreadNutriBatard
     - id: DrinkWaterBottleFull
 
 - type: entity
@@ -227,7 +227,7 @@
     - id: EmergencyNitrogenTankFilled
     - id: EmergencyMedipen
     - id: Flare
-    - id: FoodSnackNutribrick
+    - id: FoodBreadNutriBatard
     - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
@@ -247,7 +247,7 @@
     - id: EmergencyOxygenTankFilled
     - id: EmergencyMedipen
     - id: Flare
-    - id: FoodSnackNutribrick
+    - id: FoodBreadCottonNutriBatard
     - id: DrinkWaterBottleFull
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index bce7ace58a..6edff6e98a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -731,7 +731,7 @@
   name: crostini
   parent: FoodBreadSliceBase
   id: FoodBreadBaguetteSlice
-  description: Bon ap-petite!
+  description: Bon ap-pétite!
   components:
   - type: Sprite
     state: crostini
@@ -753,7 +753,7 @@
   parent: FoodBreadBaguetteSlice
   id: FoodBreadBaguetteCottonSlice
   name: cotton crostini
-  description: Bon az-zetite!
+  description: Bon az-zétite!
   components:
   - type: Sprite
     state: crostini-cotton
@@ -1001,3 +1001,57 @@
     damage:
       groups:
         Brute: 1
+
+- type: entity
+  parent: FoodBreadBase
+  id: FoodBreadNutriBatard
+  name: nutri-bâtard
+  description: bon 'pétite!
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/Baked/bread.rsi
+    state: batard
+  - type: Item
+    size: Small
+    storedOffset: -1,0
+    heldPrefix: batard
+  - type: Tag
+    tags:
+    - ReptilianFood
+  - type: FlavorProfile
+    flavors:
+    - nutribrick
+    - peppery
+    - salty
+    - bread
+
+- type: entity
+  parent: FoodBreadNutriBatard
+  id: FoodBreadCottonNutriBatard
+  name: cotton nutri-bâtard
+  description: bon 'pétite!
+  components:
+  - type: Edible
+    requiresSpecialDigestion: true
+  - type: Sprite
+    sprite: Objects/Consumable/Food/Baked/bread.rsi
+    state: batard-cotton
+  - type: FlavorProfile
+    flavors:
+    - peppery
+    - salty
+    - bread
+  - type: Tag
+    tags:
+    - ClothMade
+  - type: Item
+    size: Small
+    storedOffset: -1,0
+    heldPrefix: batard-cotton
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 45
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 40
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0ffbf40198b1391debeaefcbb05798b84fe08a8
GIT binary patch
literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zc|2VlLn`LH
zy``9U*g>H6;q+CLd~3Sy96EF1LeNqfm8W4l9M4bS7IAY--Ra7`_>h;H*{!B)flQb8
zb&CA_&u0*KeqGy{$v{IH7-r0ET^$fT-E&fx&E?OpXRpoM!k)fS>HL;B-K(adMb~;$
zvJa${M|?TFqW`@9*TXNgs*B8hb6*?XJ)5}L=d(lG?C!i}rEETCyPHcn_U*T6HC0@~
zIC-1i<@)E2_C2@W^=~s~1X}|n&V-$i+n>GavfGKhYLhLy6XJVIeWzYqy|l}wc>2Bv
zr<86;7t9mv*ik!kGe`fn;J;d*d~W|WeDhr0{_AOxzn9jP&Ewti^?RE9nIGQFPM;aK
hKRKZUG&I3)ALF#O8GNP-vx-3$dAj<!taD0e0sx8Ql2-r#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce48ffe182f1ff5e1d05ac99f00e1881bc2f653d
GIT binary patch
literal 329
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%znLS+`Ln`LH
zy=BPP<RH-cu-&k+Ex3T&+RIx=n19jUh08zi#2uIvakG+Jw|6NgZ%Bm3#Thf!G#*v`
z7r)o~z!|2aJuE;Y84le4=p&xy86%#m>gn~l`J>(SULUbk&lvq@6AvBOUhi&e?Bx&`
zW)-_m>(r^AuhKnZqB(cX^4rD#X47>azK;)m{hKaoKlrt=zC7l95BE1iM%PH*O`j%h
zxjFahpN$~%!QjJ%T~AZ1^A^1HYi(TrwCsLm&Ek6x)N9Z3wluCkYP0Fmue_-ZcF))@
z{durAZh7`&v)P9aTu&?CcF%U-@%dN$d{+D^$~(}Rw{@!E6!~Ajqz#_zWCR-f;3eB4
V&TKx{2q$NdC7!N+F6*2UngChnj3xj8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2b3f0162f567f52db3ad4101d62ed56dd49d7ce
GIT binary patch
literal 409
zcmV;K0cQS*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Q%OWYR9J=Wls`*CQ5c6GHIVKQ8V%A7AqQ~~8Vb4yQHxTvHQaBYw6rwnX0-MN
z?hrIYeuV-X0|%q6L4yPZ=?qdAjNlG(8bqrhxaZo|dA4&7ywC5v=MQK!8qI$v^jC!(
z+md1!2H^Cj;k)k40UX<s0GYH&aw$af;f2;f`VJ8|z(ky{R9RfLh}X+>giCKA5nbUs
z#9UB$CT+5ljnlcipznE5I3rar11_TLzg9SiJYT7@c6<&%DiOnI)`-{33^$AP22!b>
z(h)eeB@Yj>06Zr5F*Dn|U6!Wns_h4esL0ogC5){j=AUnQZ{PD8U0``*mydQMkQ~1q
zaBNE!ax0_~v0r!Idg>#FVI?^#mvDTxE{3Sl2aInmcfC;{xl#bp6+mJ<xW1as%_2wT
z5<0deW6=n%H~I<{;O7e*0N`XV_v4MtBGza$8qI`HM;)J}{4~2y00000NkvXXu0mjf
DRYj?o

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..42794c2ef296f649fdc2a8617fa3d3aa9b4446a9
GIT binary patch
literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zxjbDQLn`LH
zy|pp-uz^79Lv`ieL`JWJ=RUCAYpC8CvM|UxMJAg`H1n=7Bg+NTSPQNgwL`H??*GjX
zbXo~rzcU$V9s@(f+*7MA?BsQwG|TE`#irG-bCV<2tepJq<AROh8`r!(xrTA0_th!Q
zarf;_o+gBTJAK*Y>z%ewChcF1&NEBinNx1;n|?s2>|_bYwC!`Fh2!>cz5cA~6FKS9
zBdK6MsZA=ey#659gTV$Tz3M+3!)KZwxt47tnJ##yyg7OOrhazQub)b9lt-iro{|1A
zL-50nT9BOdg)5$iQ(u4ky!pn`tQ|Rb<8SrbrZLz3u3pWbrjyy=?eIwd&Ss8pH&uW}
a{|Pr|F-ltII&EzO$RbZyKbLh*2~7YiIg394

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..664a6cda2b912c0efef6a23b1c2bc00f881af5f8
GIT binary patch
literal 319
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|etNn%hE&XX
zd&`io$v~p*A-}m2C*R#3^ABu$r!Qt!F8^Rr#Kac<?O02Ttaxur%M!M3)qUq<ynfzp
zd-z`ksGou1pWh?v4SH9%&z-1p^H8O|`0n2G3wDL<-_HJYCinhDt(Bq+-u9Gj-+k+x
z%l_Y`EA37!xxV@5zaxgyVMV?2@2iFOtaEsCyl&0@oW15bn;3G_!*+h26k@tEu3iUh
zI*712n^)O-j(5+l;L2wuHfQ7C&j`;iI2E+B(Wdy;ZRZKszOP}@nJB%X)w}Ke&ux*c
zCybY`@@y{e&wV&)mFHuR6@QG(1zfjVd9XZfx7){*eU2AoW<LL3yQH(r{pR$8c%H6)
JF6*2UngFd8hFbst

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard.png
new file mode 100644
index 0000000000000000000000000000000000000000..12ccfa8ca6a3b7c501ec34b165b0ec9936d5966d
GIT binary patch
literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|R04cLT!D0}
zE@y)S!^#BJ-PN`Wf+XJ^Pxy9c!j<{HCwd(JeB0+N#vyQK_9mb@o{}KHV21w)z<DG<
z4Je-A>Eak-(ff9Sq0kWn4rbjY4IBUezkfz$>zz9>({sZOnhfp!u_^UQU143VylGj6
z@WHUKZncJ(tFt_XJKn{q?qpqYHRu*w!1?k!q6@yrY&grh!$a=RXUBwU`(yXq|9+G<
YKhVW^zrgeScc5Jip00i_>zopr09JHg)&Kwi

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json
index d9142f7cf1..6a74ec1684 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json
@@ -1,158 +1,180 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Cotton baguette and crostini variants by JuneSzalkowska",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "alpha"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Cotton baguette and crostini variants by JuneSzalkowska. Batard by SurrealShibe (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "alpha2"
-    },
-    {
-      "name": "alpha-filling"
-    },
-    {
-      "name": "alpha-filling2"
-    },
-    {
-      "name": "alpha-slice"
-    },
-    {
-      "name": "alpha-slice2"
-    },
-    {
-      "name": "alpha-slice-filling"
-    },
-    {
-      "name": "alpha-slice2-filling"
-    },
-    {
-      "name": "baguette"
-    },
-    {
-      "name": "baguette-equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "baguette-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "baguette-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "baguette-cotton"
-    },
-    {
-      "name": "baguette-cotton-equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "baguette-cotton-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "baguette-cotton-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "banana"
-    },
-    {
-      "name": "banana-slice"
-    },
-    {
-      "name": "buttered-toast"
-    },
-    {
-      "name": "cornbread"
-    },
-    {
-      "name": "cornbread-slice"
-    },
-    {
-      "name": "creamcheese"
-    },
-    {
-      "name": "creamcheese-slice"
-    },
-    {
-      "name": "crostini"
-    },
-    {
-      "name": "crostini-cotton"
-    },
-    {
-      "name": "cotton"
-    },
-    {
-      "name": "cotton-slice"
-    },
-    {
-      "name": "french-toast"
-    },
-    {
-      "name": "garlic-slice"
-    },
-    {
-      "name": "jelly-toast"
-    },
-    {
-      "name": "meat"
-    },
-    {
-      "name": "meat-slice"
-    },
-    {
-      "name": "mimana"
-    },
-    {
-      "name": "mimana-slice"
-    },
-    {
-      "name": "moldy-slice"
-    },
-    {
-      "name": "plain"
-    },
-    {
-      "name": "plain-slice"
-    },
-    {
-      "name": "plate"
-    },
-    {
-      "name": "sausage"
-    },
-    {
-      "name": "sausage-slice"
-    },
-    {
-      "name": "spidermeat"
-    },
-    {
-      "name": "spidermeat-slice"
-    },
-    {
-      "name": "tofu"
-    },
-    {
-      "name": "tofu-slice"
-    },
-    {
-      "name": "two-slice"
-    },
-    {
-      "name": "xenomeat"
-    },
-    {
-      "name": "xenomeat-slice"
-    }
-  ]
+    "states": [
+        {
+            "name": "alpha"
+        },
+        {
+            "name": "alpha2"
+        },
+        {
+            "name": "alpha-filling"
+        },
+        {
+            "name": "alpha-filling2"
+        },
+        {
+            "name": "alpha-slice"
+        },
+        {
+            "name": "alpha-slice2"
+        },
+        {
+            "name": "alpha-slice-filling"
+        },
+        {
+            "name": "alpha-slice2-filling"
+        },
+        {
+            "name": "baguette"
+        },
+        {
+            "name": "baguette-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "baguette-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "baguette-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "baguette-cotton"
+        },
+        {
+            "name": "baguette-cotton-equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "baguette-cotton-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "baguette-cotton-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "banana"
+        },
+        {
+            "name": "banana-slice"
+        },
+        {
+            "name": "buttered-toast"
+        },
+        {
+            "name": "cornbread"
+        },
+        {
+            "name": "cornbread-slice"
+        },
+        {
+            "name": "creamcheese"
+        },
+        {
+            "name": "creamcheese-slice"
+        },
+        {
+            "name": "crostini"
+        },
+        {
+            "name": "crostini-cotton"
+        },
+        {
+            "name": "cotton"
+        },
+        {
+            "name": "cotton-slice"
+        },
+        {
+            "name": "french-toast"
+        },
+        {
+            "name": "garlic-slice"
+        },
+        {
+            "name": "jelly-toast"
+        },
+        {
+            "name": "meat"
+        },
+        {
+            "name": "meat-slice"
+        },
+        {
+            "name": "mimana"
+        },
+        {
+            "name": "mimana-slice"
+        },
+        {
+            "name": "moldy-slice"
+        },
+        {
+            "name": "plain"
+        },
+        {
+            "name": "plain-slice"
+        },
+        {
+            "name": "plate"
+        },
+        {
+            "name": "sausage"
+        },
+        {
+            "name": "sausage-slice"
+        },
+        {
+            "name": "spidermeat"
+        },
+        {
+            "name": "spidermeat-slice"
+        },
+        {
+            "name": "tofu"
+        },
+        {
+            "name": "tofu-slice"
+        },
+        {
+            "name": "two-slice"
+        },
+        {
+            "name": "xenomeat"
+        },
+        {
+            "name": "xenomeat-slice"
+        },
+        {
+            "name": "batard"
+        },
+        {
+            "name": "batard-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "batard-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "batard-cotton"
+        },
+        {
+            "name": "batard-cotton-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "batard-cotton-inhand-right",
+            "directions": 4
+        }
+    ]
 }

From b78eecfb936900bfe8fd36ccbcde3bad803ce634 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 10:19:57 +0000
Subject: [PATCH 053/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c1cabeb390..798b4f3465 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: RedBookcase
-  changes:
-  - message: The Salvage section of the guidebook has been updated.
-    type: Fix
-  id: 8533
-  time: '2025-05-19T22:39:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37593
 - author: SpeltIncorrectyl
   changes:
   - message: Kammerer now has a tighter spread to compensate for its lower rate of
@@ -3952,3 +3945,10 @@
   id: 9040
   time: '2025-10-07T09:31:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40700
+- author: SurrealShibe
+  changes:
+  - message: Added the nutri-batard to mime survival boxes in place of the nutri-brick.
+    type: Add
+  id: 9041
+  time: '2025-10-07T10:18:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40601

From 101b9ffb257b451a2220baee5531f565ead3833e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Tue, 7 Oct 2025 06:15:11 -0500
Subject: [PATCH 054/216] Cleanup material_doors.yml (#40666)

cleanup

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Doors/MaterialDoors/material_doors.yml    | 156 +++++-------------
 1 file changed, 41 insertions(+), 115 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index 26db89ed32..e9faaece39 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BaseMaterialDoor
-  parent: BaseStructure
-  name: door
   abstract: true
+  parent: BaseStructure
+  id: BaseMaterialDoor
+  name: door
   description: A door, where will it lead?
   components:
   - type: Anchorable
@@ -63,31 +63,31 @@
   - type: BlockWeather
 
 - type: entity
+  abstract: true
   parent: BaseMaterialDoor
   id: BaseMaterialDoorNavMap
-  abstract: true
   components:
   - type: NavMapDoor
 
 ### Metal doors ###
 
 - type: entity
+  parent: BaseMaterialDoorNavMap
   id: MetalDoor
   name: metal door
-  parent: BaseMaterialDoorNavMap
   components:
   - type: Construction
     graph: DoorGraph
     node: metalDoor
   - type: Destructible
     thresholds:
-    - trigger:
+    - trigger: &DamageTrigger200 # Overkill threshold
         !type:DamageTrigger
         damage: 200
-      behaviors:
+      behaviors: &OverkillBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    - trigger:
+    - trigger: &DamageTrigger150
         !type:DamageTrigger
         damage: 150
       behaviors:
@@ -103,30 +103,20 @@
             max: 5
 
 - type: entity
+  parent: BaseMaterialDoorNavMap
   id: PlasmaDoor
   name: plasma door
-  parent: BaseMaterialDoorNavMap
-  description: A door, where will it lead?
   components:
   - type: Sprite
     sprite: Structures/Doors/MineralDoors/plasma_door.rsi
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
   - type: Construction
     graph: DoorGraph
     node: plasmaDoor
   - type: Destructible
     thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
+    - trigger: *DamageTrigger200
+      behaviors: *OverkillBehavior
+    - trigger: *DamageTrigger150
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
@@ -140,30 +130,20 @@
             max: 5
 
 - type: entity
+  parent: BaseMaterialDoorNavMap
   id: GoldDoor
   name: gold door
-  parent: BaseMaterialDoorNavMap
-  description: A door, where will it lead?
   components:
   - type: Sprite
     sprite: Structures/Doors/MineralDoors/gold_door.rsi
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
   - type: Construction
     graph: DoorGraph
     node: goldDoor
   - type: Destructible
     thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
+    - trigger: *DamageTrigger200
+      behaviors: *OverkillBehavior
+    - trigger: *DamageTrigger150
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
@@ -177,30 +157,20 @@
             max: 5
 
 - type: entity
+  parent: BaseMaterialDoorNavMap
   id: SilverDoor
   name: silver door
-  parent: BaseMaterialDoorNavMap
-  description: A door, where will it lead?
   components:
   - type: Sprite
     sprite: Structures/Doors/MineralDoors/silver_door.rsi
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
   - type: Construction
     graph: DoorGraph
     node: silverDoor
   - type: Destructible
     thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
+    - trigger: *DamageTrigger200
+      behaviors: *OverkillBehavior
+    - trigger: *DamageTrigger150
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
@@ -214,35 +184,26 @@
             max: 5
 
 - type: entity
+  parent: BaseMaterialDoorNavMap
   id: BananiumDoor
   name: bananium door
-  parent: BaseMaterialDoorNavMap
-  description: A door, where will it lead?
   components:
   - type: Sprite
     sprite: Structures/Doors/MineralDoors/bananium_door.rsi
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
   - type: Door
-    openSound:
-      path: /Audio/Items/bikehorn.ogg
-    closeSound:
-      path: /Audio/Items/bikehorn.ogg
+    openSound: &BikeHornSound
+      collection: BikeHorn
+      params:
+        variation: 0.125
+    closeSound: *BikeHornSound
   - type: Construction
     graph: DoorGraph
     node: bananiumDoor
   - type: Destructible
     thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
+    - trigger: *DamageTrigger200
+      behaviors: *OverkillBehavior
+    - trigger: *DamageTrigger150
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
@@ -258,9 +219,9 @@
 ### Other doors ###
 
 - type: entity
+  parent: BaseMaterialDoorNavMap
   id: WoodDoor
   name: wooden door
-  parent: BaseMaterialDoorNavMap
   components:
   - type: Sprite
     sprite: Structures/Doors/MineralDoors/wood_door.rsi
@@ -273,16 +234,11 @@
     graph: DoorGraph
     node: woodDoor
   - type: Damageable
-    damageContainer: StructuralInorganic
     damageModifierSet: Wood
   - type: Destructible
     thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
+    - trigger: *DamageTrigger150
+      behaviors: *OverkillBehavior
     - trigger:
         !type:DamageTrigger
         damage: 75
@@ -299,16 +255,12 @@
             max: 5
 
 - type: entity
+  parent: BaseMaterialDoorNavMap
   id: PaperDoor
   name: paper door
-  parent: BaseMaterialDoorNavMap
-  description: A door, where will it lead?
   components:
   - type: Sprite
     sprite: Structures/Doors/MineralDoors/paper_door.rsi
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
   - type: Door
     openSound:
       path: /Audio/Effects/paperdoor_openclose.ogg
@@ -318,16 +270,11 @@
     graph: DoorGraph
     node: paperDoor
   - type: Damageable
-    damageContainer: StructuralInorganic
     damageModifierSet: Wood
   - type: Destructible
     thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
+    - trigger: *DamageTrigger150
+      behaviors: *OverkillBehavior
     - trigger:
         !type:DamageTrigger
         damage: 50
@@ -344,16 +291,13 @@
             max: 5
 
 - type: entity
+  parent: BaseMaterialDoorNavMap
   id: WebDoor
   name: web door
-  parent: BaseMaterialDoorNavMap
   description: A door, leading to the lands of the spiders... or a spaced room.
   components:
   - type: Sprite
     sprite: Structures/Doors/web_door.rsi
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
   - type: Door
     closeSound:
       path: /Audio/Effects/rustle1.ogg
@@ -366,21 +310,8 @@
     damageModifierSet: Web
   - type: Destructible
     thresholds:
-    - trigger: # Excess damage, don't spawn entities
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: WoodDestroy
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
+    - trigger: *DamageTrigger150
+      behaviors: *OverkillBehavior
     - trigger:
         !type:DamageTrigger
         damage: 50
@@ -397,8 +328,8 @@
             max: 2
 
 - type: entity
-  id: CardDoor
   parent: BaseMaterialDoorNavMap
+  id: CardDoor
   name: cardboard door
   components:
   - type: Sprite
@@ -417,16 +348,11 @@
         path:
           "/Audio/Weapons/pierce.ogg"
   - type: Damageable
-    damageContainer: StructuralInorganic
     damageModifierSet: Card
   - type: Destructible
     thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 60 #excess damage (nuke?). avoid computational cost of spawning entities.
-      behaviors:
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
+    - trigger: *DamageTrigger150
+      behaviors: *OverkillBehavior
     - trigger:
         !type:DamageTrigger
         damage: 30

From 691ca31b9535e074007bc85e345655948c6bf143 Mon Sep 17 00:00:00 2001
From: David <david.owen.dev@gmail.com>
Date: Tue, 7 Oct 2025 05:45:01 -0600
Subject: [PATCH 055/216] (Cleanup) Fix logger obsolete warnings (#40553)

* Switched obsolete logger usages to use Sawmill

Fix the majority of obsolete logger usages outside the engine code.

* Fix injection in ChatManager and revert BuildMech changes

* Removed extra manual injection

* Reduced extra static injection and reverted changes to CommandButton as it needs engine changes.

* Removed two more cases of double injection and an extra using

* Reverted changes for Inventory Display

* Moved sawmill setup outside constructor in Table to resolve test failure
---
 .../Administration/UI/Notes/AdminNotesLine.xaml.cs   |  7 ++++++-
 .../Construction/UI/ConstructionMenuPresenter.cs     |  8 ++++++--
 Content.Client/Guidebook/DocumentParsingManager.cs   |  9 ++++-----
 Content.Client/Guidebook/Richtext/Table.cs           |  7 ++++++-
 Content.Client/Guidebook/Richtext/TextLinkTag.cs     |  9 +++++++--
 Content.Client/Launcher/LauncherConnecting.cs        |  8 ++++++--
 .../Systems/Alerts/Widgets/AlertsUI.xaml.cs          | 12 +++++++++---
 Content.Replay/Menu/ReplayMainMenu.cs                |  6 +++++-
 Content.Server/Chat/Managers/ChatManager.cs          | 12 ++++++++----
 .../GameTicking/Commands/JoinGameCommand.cs          |  7 ++++++-
 10 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs
index 97ddc15000..24e5cfdfab 100644
--- a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs
+++ b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs
@@ -14,6 +14,9 @@ namespace Content.Client.Administration.UI.Notes;
 [GenerateTypedNameReferences]
 public sealed partial class AdminNotesLine : BoxContainer
 {
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private readonly ISawmill _sawmill = default!;
     private readonly SpriteSystem _sprites;
 
     private const string AdminNotesTextureBase = "/Textures/Interface/AdminNotes/";
@@ -33,6 +36,8 @@ public sealed partial class AdminNotesLine : BoxContainer
     public AdminNotesLine(SpriteSystem sprites, SharedAdminNote note)
     {
         RobustXamlLoader.Load(this);
+
+        _sawmill = _logManager.GetSawmill("admin.notes");
         _sprites = sprites;
 
         Note = note;
@@ -61,7 +66,7 @@ public sealed partial class AdminNotesLine : BoxContainer
         if (iconPath is null)
         {
             SeverityRect.Visible = false;
-            Logger.WarningS("admin.notes", $"Could not find an icon for note ID {Note.Id}");
+            _sawmill.Warning($"Could not find an icon for note ID {Note.Id}");
         }
         else
         {
diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index d5fee2bdda..d640de7b68 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -30,8 +30,10 @@ namespace Content.Client.Construction.UI
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
-        private readonly SpriteSystem _spriteSystem;
+        [Dependency] private readonly ILogManager _logManager = default!;
 
+        private readonly ISawmill _sawmill = default!;
+        private readonly SpriteSystem _spriteSystem;
         private readonly IConstructionMenuView _constructionView;
         private readonly EntityWhitelistSystem _whitelistSystem;
 
@@ -87,6 +89,8 @@ namespace Content.Client.Construction.UI
         {
             // This is a lot easier than a factory
             IoCManager.InjectDependencies(this);
+            _sawmill = _logManager.GetSawmill("construction.menu");
+
             _constructionView = new ConstructionMenu();
             _whitelistSystem = _entManager.System<EntityWhitelistSystem>();
             _spriteSystem = _entManager.System<SpriteSystem>();
@@ -284,7 +288,7 @@ namespace Content.Client.Construction.UI
 
                 if (!_constructionSystem!.TryGetRecipePrototype(recipe.ID, out var targetProtoId))
                 {
-                    Logger.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.",
+                    _sawmill.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.",
                         recipe.ID,
                         nameof(ConstructionPrototype));
                     continue;
diff --git a/Content.Client/Guidebook/DocumentParsingManager.cs b/Content.Client/Guidebook/DocumentParsingManager.cs
index 8bc1a834fc..4c9f5fabe0 100644
--- a/Content.Client/Guidebook/DocumentParsingManager.cs
+++ b/Content.Client/Guidebook/DocumentParsingManager.cs
@@ -7,7 +7,6 @@ using Robust.Client.UserInterface;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Reflection;
-using Robust.Shared.Sandboxing;
 using Robust.Shared.Utility;
 using static Pidgin.Parser;
 
@@ -21,7 +20,7 @@ public sealed partial class DocumentParsingManager
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IReflectionManager _reflectionManager = default!;
     [Dependency] private readonly IResourceManager _resourceManager = default!;
-    [Dependency] private readonly ISandboxHelper _sandboxHelper = default!;
+    [Dependency] private readonly IDynamicTypeFactory _dynamicTypeFactory = default!;
 
     private readonly Dictionary<string, Parser<char, Control>> _tagControlParsers = new();
     private Parser<char, Control> _controlParser = default!;
@@ -43,7 +42,7 @@ public sealed partial class DocumentParsingManager
 
         foreach (var typ in _reflectionManager.GetAllChildren<IDocumentTag>())
         {
-            _tagControlParsers.Add(typ.Name, CreateTagControlParser(typ.Name, typ, _sandboxHelper));
+            _tagControlParsers.Add(typ.Name, CreateTagControlParser(typ.Name, typ, _dynamicTypeFactory));
         }
 
         ControlParser = whitespaceAndCommentParser.Then(_controlParser.Many());
@@ -87,14 +86,14 @@ public sealed partial class DocumentParsingManager
         return true;
     }
 
-    private Parser<char, Control> CreateTagControlParser(string tagId, Type tagType, ISandboxHelper sandbox)
+    private Parser<char, Control> CreateTagControlParser(string tagId, Type tagType, IDynamicTypeFactory typeFactory)
     {
         return Map(
                 (args, controls) =>
                 {
                     try
                     {
-                        var tag = (IDocumentTag) sandbox.CreateInstance(tagType);
+                        var tag = (IDocumentTag) typeFactory.CreateInstance(tagType);
                         if (!tag.TryParseTag(args, out var control))
                         {
                             _sawmill.Error($"Failed to parse {tagId} args");
diff --git a/Content.Client/Guidebook/Richtext/Table.cs b/Content.Client/Guidebook/Richtext/Table.cs
index b6923c3698..82b884aa96 100644
--- a/Content.Client/Guidebook/Richtext/Table.cs
+++ b/Content.Client/Guidebook/Richtext/Table.cs
@@ -8,6 +8,11 @@ namespace Content.Client.Guidebook.Richtext;
 [UsedImplicitly]
 public sealed class Table : TableContainer, IDocumentTag
 {
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private ISawmill Sawmill => _sawmill ??= _logManager.GetSawmill("table");
+    private ISawmill? _sawmill;
+
     public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
     {
         HorizontalExpand = true;
@@ -15,7 +20,7 @@ public sealed class Table : TableContainer, IDocumentTag
 
         if (!args.TryGetValue("Columns", out var columns) || !int.TryParse(columns, out var columnsCount))
         {
-            Logger.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\"");
+            Sawmill.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\"");
             control = null;
             return false;
         }
diff --git a/Content.Client/Guidebook/Richtext/TextLinkTag.cs b/Content.Client/Guidebook/Richtext/TextLinkTag.cs
index a551b18473..5c0098d5b5 100644
--- a/Content.Client/Guidebook/Richtext/TextLinkTag.cs
+++ b/Content.Client/Guidebook/Richtext/TextLinkTag.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -12,6 +12,11 @@ namespace Content.Client.Guidebook.RichText;
 [UsedImplicitly]
 public sealed class TextLinkTag : IMarkupTagHandler
 {
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private ISawmill Sawmill => _sawmill ??= _logManager.GetSawmill(Name);
+    private ISawmill? _sawmill;
+
     public static Color LinkColor => Color.CornflowerBlue;
 
     public string Name => "textlink";
@@ -53,7 +58,7 @@ public sealed class TextLinkTag : IMarkupTagHandler
         if (control.TryGetParentHandler<ILinkClickHandler>(out var handler))
             handler.HandleClick(link);
         else
-            Logger.Warning("Warning! No valid ILinkClickHandler found.");
+            Sawmill.Warning("Warning! No valid ILinkClickHandler found.");
     }
 }
 
diff --git a/Content.Client/Launcher/LauncherConnecting.cs b/Content.Client/Launcher/LauncherConnecting.cs
index 33d31cc52d..3496c92aba 100644
--- a/Content.Client/Launcher/LauncherConnecting.cs
+++ b/Content.Client/Launcher/LauncherConnecting.cs
@@ -20,7 +20,9 @@ namespace Content.Client.Launcher
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IClipboardManager _clipboard = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
 
+        private ISawmill _sawmill = default!;
         private LauncherConnectingGui? _control;
 
         private Page _currentPage;
@@ -59,6 +61,8 @@ namespace Content.Client.Launcher
 
         protected override void Startup()
         {
+            _sawmill = _logManager.GetSawmill("launcher-ui");
+
             _control = new LauncherConnectingGui(this, _random, _prototypeManager, _cfg, _clipboard);
 
             _userInterfaceManager.StateRoot.AddChild(_control);
@@ -115,12 +119,12 @@ namespace Content.Client.Launcher
                 }
                 else
                 {
-                    Logger.InfoS("launcher-ui", $"Redial not possible, no Ss14Address");
+                    _sawmill.Info($"Redial not possible, no Ss14Address");
                 }
             }
             catch (Exception ex)
             {
-                Logger.ErrorS("launcher-ui", $"Redial exception: {ex}");
+                _sawmill.Error($"Redial exception: {ex}");
             }
             return false;
         }
diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
index d6a79a81c4..9d62f0c9be 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
@@ -14,12 +14,18 @@ namespace Content.Client.UserInterface.Systems.Alerts.Widgets;
 [GenerateTypedNameReferences]
 public sealed partial class AlertsUI : UIWidget
 {
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private readonly ISawmill _sawmill = default!;
+
     // also known as Control.Children?
     private readonly Dictionary<AlertKey, AlertControl> _alertControls = new();
 
     public AlertsUI()
     {
         RobustXamlLoader.Load(this);
+
+        _sawmill = _logManager.GetSawmill("alertsui");
     }
 
     public void SyncControls(AlertsSystem alertsSystem,
@@ -78,15 +84,15 @@ public sealed partial class AlertsUI : UIWidget
         {
             if (!alertKey.AlertType.HasValue)
             {
-                Logger.WarningS("alert", "found alertkey without alerttype," +
-                                         " alert keys should never be stored without an alerttype set: {0}", alertKey);
+                _sawmill.Warning("found alertkey without alerttype," +
+                                 " alert keys should never be stored without an alerttype set: {0}", alertKey);
                 continue;
             }
 
             var alertType = alertKey.AlertType.Value;
             if (!alertsSystem.TryGet(alertType, out var newAlert))
             {
-                Logger.ErrorS("alert", "Unrecognized alertType {0}", alertType);
+                _sawmill.Error("Unrecognized alertType {0}", alertType);
                 continue;
             }
 
diff --git a/Content.Replay/Menu/ReplayMainMenu.cs b/Content.Replay/Menu/ReplayMainMenu.cs
index 85c39c59da..5adb769942 100644
--- a/Content.Replay/Menu/ReplayMainMenu.cs
+++ b/Content.Replay/Menu/ReplayMainMenu.cs
@@ -33,7 +33,9 @@ public sealed class ReplayMainScreen : State
     [Dependency] private readonly IClientRobustSerializer _serializer = default!;
     [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
     [Dependency] private readonly ContentReplayPlaybackManager _replayMan = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
 
+    private ISawmill _sawmill = default!;
     private ReplayMainMenuControl _mainMenuControl = default!;
     private SelectReplayWindow? _selectWindow;
     private ResPath _directory;
@@ -42,6 +44,8 @@ public sealed class ReplayMainScreen : State
 
     protected override void Startup()
     {
+        _sawmill = _logManager.GetSawmill("replay.screen");
+
         _mainMenuControl = new(_resourceCache);
         _userInterfaceManager.StateRoot.AddChild(_mainMenuControl);
 
@@ -263,7 +267,7 @@ public sealed class ReplayMainScreen : State
         }
         catch (Exception ex)
         {
-            Logger.Error($"Failed to load replay info. Exception: {ex}");
+            _sawmill.Error($"Failed to load replay info. Exception: {ex}");
             SelectReplay(null);
             return;
         }
diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index c62a10ada3..a37c05336f 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -1,6 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Runtime.InteropServices;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Administration.Systems;
@@ -18,6 +15,9 @@ using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Replays;
 using Robust.Shared.Utility;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.InteropServices;
 
 namespace Content.Server.Chat.Managers;
 
@@ -45,6 +45,7 @@ internal sealed partial class ChatManager : IChatManager
     [Dependency] private readonly PlayerRateLimitManager _rateLimitManager = default!;
     [Dependency] private readonly ISharedPlayerManager _player = default!;
     [Dependency] private readonly DiscordChatLink _discordLink = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
 
     /// <summary>
     /// The maximum length a player-sent message can be sent
@@ -54,6 +55,7 @@ internal sealed partial class ChatManager : IChatManager
     private bool _oocEnabled = true;
     private bool _adminOocEnabled = true;
 
+    private ISawmill _sawmill = default!;
     private readonly Dictionary<NetUserId, ChatUser> _players = new();
 
     public void Initialize()
@@ -64,6 +66,8 @@ internal sealed partial class ChatManager : IChatManager
         _configurationManager.OnValueChanged(CCVars.OocEnabled, OnOocEnabledChanged, true);
         _configurationManager.OnValueChanged(CCVars.AdminOocEnabled, OnAdminOocEnabledChanged, true);
 
+        _sawmill = _logManager.GetSawmill("SERVER");
+
         RegisterRateLimits();
     }
 
@@ -111,7 +115,7 @@ internal sealed partial class ChatManager : IChatManager
     {
         var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", FormattedMessage.EscapeText(message)));
         ChatMessageToAll(ChatChannel.Server, message, wrappedMessage, EntityUid.Invalid, hideChat: false, recordReplay: true, colorOverride: colorOverride);
-        Logger.InfoS("SERVER", message);
+        _sawmill.Info(message);
 
         _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Server announcement: {message}");
     }
diff --git a/Content.Server/GameTicking/Commands/JoinGameCommand.cs b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
index a32a2f9495..bfb3d91464 100644
--- a/Content.Server/GameTicking/Commands/JoinGameCommand.cs
+++ b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
@@ -13,11 +13,14 @@ namespace Content.Server.GameTicking.Commands
     [AnyCommand]
     sealed class JoinGameCommand : IConsoleCommand
     {
+        [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
 
+        private readonly ISawmill _sawmill = default!;
+
         public string Command => "joingame";
         public string Description => "";
         public string Help => "";
@@ -25,6 +28,8 @@ namespace Content.Server.GameTicking.Commands
         public JoinGameCommand()
         {
             IoCManager.InjectDependencies(this);
+
+            _sawmill = _logManager.GetSawmill("security");
         }
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
@@ -46,7 +51,7 @@ namespace Content.Server.GameTicking.Commands
 
             if (ticker.PlayerGameStatuses.TryGetValue(player.UserId, out var status) && status == PlayerGameStatus.JoinedGame)
             {
-                Logger.InfoS("security", $"{player.Name} ({player.UserId}) attempted to latejoin while in-game.");
+                _sawmill.Info($"{player.Name} ({player.UserId}) attempted to latejoin while in-game.");
                 shell.WriteError($"{player.Name} is not in the lobby.   This incident will be reported.");
                 return;
             }

From 80c66c02bedf47da0b96d4aec0594d3a286c1b74 Mon Sep 17 00:00:00 2001
From: Lordbrandon12 <107556696+Lordbrandon12@users.noreply.github.com>
Date: Tue, 7 Oct 2025 09:42:43 -0300
Subject: [PATCH 056/216] =?UTF-8?q?changes=20the=20min=20and=20max=20varia?=
 =?UTF-8?q?bles=20in=20the=20TargetTemperature=20clamp=20to=20t=E2=80=A6?=
 =?UTF-8?q?=20(#40453)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

changes the min and max variables in the TargetTemperature clamp to the space heater min and max temperatures
---
 Content.Server/Atmos/Portable/SpaceHeaterSystem.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
index 1c05307c15..0d55ed12bd 100644
--- a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
+++ b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
@@ -112,7 +112,9 @@ public sealed class SpaceHeaterSystem : EntitySystem
         if (!TryComp<GasThermoMachineComponent>(uid, out var thermoMachine))
             return;
 
-        thermoMachine.TargetTemperature = float.Clamp(thermoMachine.TargetTemperature + args.Temperature, thermoMachine.MinTemperature, thermoMachine.MaxTemperature);
+        thermoMachine.TargetTemperature = float.Clamp(thermoMachine.TargetTemperature + args.Temperature,
+                                                      spaceHeater.MinTemperature,
+                                                      spaceHeater.MaxTemperature);
 
         UpdateAppearance(uid);
         DirtyUI(uid, spaceHeater);

From 984d28232b815c99c23f01950650e219cb814199 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 12:55:07 +0000
Subject: [PATCH 057/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 798b4f3465..2e7357a3ac 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: SpeltIncorrectyl
-  changes:
-  - message: Kammerer now has a tighter spread to compensate for its lower rate of
-      fire.
-    type: Tweak
-  id: 8534
-  time: '2025-05-19T22:45:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37616
 - author: Pronana
   changes:
   - message: Galoshes now slow on puddles again
@@ -3952,3 +3944,11 @@
   id: 9041
   time: '2025-10-07T10:18:50.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40601
+- author: Lordbrandon12
+  changes:
+  - message: Fixed issue allowing space heater temperature to be set above the allowed
+      limit.
+    type: Fix
+  id: 9042
+  time: '2025-10-07T12:53:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40453

From 1d827754c9776080f9fa9060cd9724e10226bd8c Mon Sep 17 00:00:00 2001
From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>
Date: Tue, 7 Oct 2025 09:10:21 -0400
Subject: [PATCH 058/216] Move BrainSystem and necessary components to Shared
 (#40499)

* yowza

* Update Content.Shared/Body/Systems/BrainSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Ghost/GhostOnMoveComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update BrainSystem.cs

* Update Content.Shared/Body/Systems/BrainSystem.cs

* Update Content.Shared/Body/Systems/BrainSystem.cs

* Update Content.Shared/Body/Systems/BrainSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Content.Server/Body/Components/BrainComponent.cs    |  9 ---------
 .../Ghost/Components/GhostOnMoveComponent.cs        | 11 -----------
 Content.Shared/Body/Components/BrainComponent.cs    |  6 ++++++
 .../Body/Systems/BrainSystem.cs                     |  7 +++----
 Content.Shared/Ghost/GhostOnMoveComponent.cs        | 13 +++++++++++++
 5 files changed, 22 insertions(+), 24 deletions(-)
 delete mode 100644 Content.Server/Body/Components/BrainComponent.cs
 delete mode 100644 Content.Server/Ghost/Components/GhostOnMoveComponent.cs
 create mode 100644 Content.Shared/Body/Components/BrainComponent.cs
 rename {Content.Server => Content.Shared}/Body/Systems/BrainSystem.cs (92%)
 create mode 100644 Content.Shared/Ghost/GhostOnMoveComponent.cs

diff --git a/Content.Server/Body/Components/BrainComponent.cs b/Content.Server/Body/Components/BrainComponent.cs
deleted file mode 100644
index 004ff24eaf..0000000000
--- a/Content.Server/Body/Components/BrainComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Server.Body.Systems;
-
-namespace Content.Server.Body.Components
-{
-    [RegisterComponent, Access(typeof(BrainSystem))]
-    public sealed partial class BrainComponent : Component
-    {
-    }
-}
diff --git a/Content.Server/Ghost/Components/GhostOnMoveComponent.cs b/Content.Server/Ghost/Components/GhostOnMoveComponent.cs
deleted file mode 100644
index e3abc97688..0000000000
--- a/Content.Server/Ghost/Components/GhostOnMoveComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Server.Ghost.Components
-{
-    [RegisterComponent]
-    public sealed partial class GhostOnMoveComponent : Component
-    {
-        [DataField("canReturn")] public bool CanReturn { get; set; } = true;
-
-        [DataField("mustBeDead")]
-        public bool MustBeDead = false;
-    }
-}
diff --git a/Content.Shared/Body/Components/BrainComponent.cs b/Content.Shared/Body/Components/BrainComponent.cs
new file mode 100644
index 0000000000..be3c3ecbe5
--- /dev/null
+++ b/Content.Shared/Body/Components/BrainComponent.cs
@@ -0,0 +1,6 @@
+using Content.Shared.Body.Systems;
+
+namespace Content.Shared.Body.Components;
+
+[RegisterComponent, Access(typeof(BrainSystem))]
+public sealed partial class BrainComponent : Component;
diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Shared/Body/Systems/BrainSystem.cs
similarity index 92%
rename from Content.Server/Body/Systems/BrainSystem.cs
rename to Content.Shared/Body/Systems/BrainSystem.cs
index e916849a81..55abcbb868 100644
--- a/Content.Server/Body/Systems/BrainSystem.cs
+++ b/Content.Shared/Body/Systems/BrainSystem.cs
@@ -1,12 +1,12 @@
-using Content.Server.Body.Components;
-using Content.Server.Ghost.Components;
+using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
+using Content.Shared.Ghost;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Pointing;
 
-namespace Content.Server.Body.Systems;
+namespace Content.Shared.Body.Systems;
 
 public sealed class BrainSystem : EntitySystem
 {
@@ -43,4 +43,3 @@ public sealed class BrainSystem : EntitySystem
         args.Cancel();
     }
 }
-
diff --git a/Content.Shared/Ghost/GhostOnMoveComponent.cs b/Content.Shared/Ghost/GhostOnMoveComponent.cs
new file mode 100644
index 0000000000..44cb3d0168
--- /dev/null
+++ b/Content.Shared/Ghost/GhostOnMoveComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Ghost;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class GhostOnMoveComponent : Component
+{
+    [DataField]
+    public bool CanReturn = true;
+
+    [DataField]
+    public bool MustBeDead;
+}

From e32253451b7e4b9a8f629228f529f19ff8466a31 Mon Sep 17 00:00:00 2001
From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Date: Tue, 7 Oct 2025 10:01:47 -0400
Subject: [PATCH 059/216] Vox burn into fried chicken (#40115)

* Sir, this is a KFC.

* the curse of multi-parenting

* 11 herbs and spices of intrigue
---
 .../Prototypes/Entities/Mobs/Species/vox.yml  | 38 +++++++++++++++++++
 .../Entities/Objects/Consumable/Food/meat.yml | 17 +++++++++
 2 files changed, 55 insertions(+)

diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index b49d0fb409..44687ac544 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -30,6 +30,44 @@
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Vox
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 400
+      behaviors:
+      - !type:GibBehavior { }
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Heat
+        damage: 1500
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawnInContainer: true
+        spawn:
+          FoodMeatChickenFriedVox:
+            min: 3
+            max: 5
+      - !type:BurnBodyBehavior { }
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MeatLaserImpact
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Radiation
+        damage: 15
+      behaviors:
+      - !type:PopupBehavior
+        popup: mouth-taste-metal
+        popupType: LargeCaution
+        targetOnly: true
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Radiation
+        damage: 40
+      behaviors:
+      - !type:VomitBehavior
   - type: PassiveDamage
     # Augment normal health regen to be able to tank some Poison damage
     # This allows Vox to take their mask off temporarily to eat something without needing a trip to medbay afterwards.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 642a068069..1d7380bb9d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -1242,6 +1242,23 @@
       - state: plain-cooked-inhand-right
         color: "#F7E3A3"
 
+- type: entity
+  parent: FoodMeatChickenFried
+  id: FoodMeatChickenFriedVox
+  name: mystery fried chicken
+  description: “Eleven secret herbs and… oh no. That’s not chicken."
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Protein
+          Quantity: 5
+        - ReagentId: Ammonia
+          Quantity: 3
+
 - type: entity
   parent: FoodMeatBase
   id: FoodMeatDuckCooked

From 6b480673cd6bff9c3282fbf4df25fb3f7f438512 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 14:13:33 +0000
Subject: [PATCH 060/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2e7357a3ac..004a1ea082 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Pronana
-  changes:
-  - message: Galoshes now slow on puddles again
-    type: Fix
-  id: 8535
-  time: '2025-05-20T02:47:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37628
 - author: slarticodefast
   changes:
   - message: Added a reduced motion version of the seeing rainbows overlay.
@@ -3952,3 +3945,11 @@
   id: 9042
   time: '2025-10-07T12:53:59.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40453
+- author: IProduceWidgets
+  changes:
+  - message: Vox that take excessive amounts of fire damage will now burn into fried
+      chicken.
+    type: Tweak
+  id: 9043
+  time: '2025-10-07T14:12:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40115

From 4b51b2953d780fba56fd9721b4a91f44d3f8fbfa Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Wed, 8 Oct 2025 03:03:45 +1300
Subject: [PATCH 061/216] Fix post-mapinit NPC exception (#40244)

Ensure `NPCBlackboard.Owner` is set during startup
---
 Content.Server/NPC/Components/NPCComponent.cs | 1 +
 Content.Server/NPC/HTN/HTNComponent.cs        | 1 +
 Content.Server/NPC/HTN/HTNSystem.cs           | 1 +
 Content.Server/NPC/Systems/NPCSystem.cs       | 6 +++++-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Content.Server/NPC/Components/NPCComponent.cs b/Content.Server/NPC/Components/NPCComponent.cs
index b1d5bfcf5f..3b396f034e 100644
--- a/Content.Server/NPC/Components/NPCComponent.cs
+++ b/Content.Server/NPC/Components/NPCComponent.cs
@@ -9,4 +9,5 @@ public abstract partial class NPCComponent : SharedNPCComponent
     /// </summary>
     [DataField("blackboard", customTypeSerializer: typeof(NPCBlackboardSerializer))]
     public NPCBlackboard Blackboard = new();
+    // TODO FULL GAME SAVE Serialize this
 }
diff --git a/Content.Server/NPC/HTN/HTNComponent.cs b/Content.Server/NPC/HTN/HTNComponent.cs
index 43b8a70785..d9b392ab14 100644
--- a/Content.Server/NPC/HTN/HTNComponent.cs
+++ b/Content.Server/NPC/HTN/HTNComponent.cs
@@ -24,6 +24,7 @@ public sealed partial class HTNComponent : NPCComponent
     /// </summary>
     [ViewVariables]
     public HTNPlan? Plan;
+    // TODO FULL GAME SAVE serialize this?
 
     /// <summary>
     /// How long to wait after having planned to try planning again.
diff --git a/Content.Server/NPC/HTN/HTNSystem.cs b/Content.Server/NPC/HTN/HTNSystem.cs
index 4d9e321dd9..7bfe432998 100644
--- a/Content.Server/NPC/HTN/HTNSystem.cs
+++ b/Content.Server/NPC/HTN/HTNSystem.cs
@@ -33,6 +33,7 @@ public sealed class HTNSystem : EntitySystem
         base.Initialize();
         SubscribeLocalEvent<HTNComponent, MobStateChangedEvent>(_npc.OnMobStateChange);
         SubscribeLocalEvent<HTNComponent, MapInitEvent>(_npc.OnNPCMapInit);
+        SubscribeLocalEvent<HTNComponent, ComponentStartup>(_npc.OnNPCStartup);
         SubscribeLocalEvent<HTNComponent, PlayerAttachedEvent>(_npc.OnPlayerNPCAttach);
         SubscribeLocalEvent<HTNComponent, PlayerDetachedEvent>(_npc.OnPlayerNPCDetach);
         SubscribeLocalEvent<HTNComponent, ComponentShutdown>(OnHTNShutdown);
diff --git a/Content.Server/NPC/Systems/NPCSystem.cs b/Content.Server/NPC/Systems/NPCSystem.cs
index 27b2a1691d..7aea766930 100644
--- a/Content.Server/NPC/Systems/NPCSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSystem.cs
@@ -63,9 +63,13 @@ namespace Content.Server.NPC.Systems
             WakeNPC(uid, component);
         }
 
-        public void OnNPCMapInit(EntityUid uid, HTNComponent component, MapInitEvent args)
+        public void OnNPCStartup(EntityUid uid, HTNComponent component, ComponentStartup args)
         {
             component.Blackboard.SetValue(NPCBlackboard.Owner, uid);
+        }
+
+        public void OnNPCMapInit(EntityUid uid, HTNComponent component, MapInitEvent args)
+        {
             WakeNPC(uid, component);
         }
 

From ff01e13d247d916b58bd9638be79a012c130e166 Mon Sep 17 00:00:00 2001
From: Spanky <180730777+spanky-spanky@users.noreply.github.com>
Date: Tue, 7 Oct 2025 11:53:55 -0400
Subject: [PATCH 062/216] Head of Security's Energy Magnum (and Warden's Energy
 Shotgun) (#40615)

* Energy magnum and projectile protos, locker fills, and traitor objective updates.

* Fix objective

* Objective and .rsi tweaks

* Rewrite item description.

* Remove energy shotgun self charging and decrease magnum disabler cost.

* Bring magnum disabler fire cost in line with regular disabler.

* Bunch of sprite improvements including charge status visuals.

* whoops

* Minor sprite edit for clarity

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
---
 .../conditions/steal-target-groups.ftl        |   2 +-
 .../Catalog/Fills/Lockers/heads.yml           |   2 +-
 .../Catalog/Fills/Lockers/security.yml        |   1 +
 .../Weapons/Guns/Battery/battery_guns.yml     |  53 +++++++++++++++---
 .../Weapons/Guns/Projectiles/projectiles.yml  |  49 ++++++++++++++++
 .../Prototypes/Objectives/objectiveGroups.yml |   2 +-
 .../Objectives/stealTargetGroups.yml          |   8 +--
 Resources/Prototypes/Objectives/traitor.yml   |   4 +-
 .../Guidebook/Antagonist/Traitors.xml         |   4 +-
 .../Guns/Battery/energy_magnum.rsi/base.png   | Bin 0 -> 966 bytes
 .../energy_magnum.rsi/equipped-BELT.png       | Bin 0 -> 224 bytes
 .../equipped-SUITSTORAGE.png                  | Bin 0 -> 224 bytes
 .../Guns/Battery/energy_magnum.rsi/icon.png   | Bin 0 -> 987 bytes
 .../Battery/energy_magnum.rsi/inhand-left.png | Bin 0 -> 897 bytes
 .../energy_magnum.rsi/inhand-right.png        | Bin 0 -> 898 bytes
 .../energy_magnum.rsi/mag-unshaded-0.png      | Bin 0 -> 15137 bytes
 .../energy_magnum.rsi/mag-unshaded-1.png      | Bin 0 -> 490 bytes
 .../energy_magnum.rsi/mag-unshaded-2.png      | Bin 0 -> 493 bytes
 .../energy_magnum.rsi/mag-unshaded-3.png      | Bin 0 -> 537 bytes
 .../Guns/Battery/energy_magnum.rsi/meta.json  |  53 ++++++++++++++++++
 .../projectiles_magnum.rsi/magnum.png         | Bin 0 -> 741 bytes
 .../magnum_piercing.png                       | Bin 0 -> 733 bytes
 .../projectiles_magnum.rsi/meta.json          |  17 ++++++
 23 files changed, 176 insertions(+), 19 deletions(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-BELT.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-1.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-2.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json

diff --git a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl
index f800aa2c8d..83e2e0c1ac 100644
--- a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl
+++ b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl
@@ -11,7 +11,7 @@ steal-target-groups-captain-id-card = captain ID card
 steal-target-groups-jetpack-captain-filled = captain's jetpack
 steal-target-groups-weapon-antique-laser = antique laser pistol
 steal-target-groups-nuke-disk = nuclear authentication disk
-steal-target-groups-weapon-energy-shot-gun = energy shotgun
+steal-target-groups-weapon-energy-magnum = energy magnum
 
 # Thief Collection
 steal-target-groups-figurines = figurine
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index cf5297220c..2b4c5c9b36 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -308,7 +308,7 @@
   id: LockerFillHeadOfSecurityNoHardsuit
   table: !type:AllSelector
     children:
-    - id: WeaponEnergyShotgun
+    - id: WeaponEnergyMagnum
     - id: BookSpaceLaw
     - id: BoxEncryptionKeySecurity
     - id: CigarGoldCase
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index a6add7f4b7..48bed23bc9 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -46,6 +46,7 @@
       amount: 2
     - id: NetworkConfigurator
     - id: Binoculars
+    - id: WeaponEnergyShotgun
 
 - type: entityTable
   id: FillLockerWardenHarduit
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 30967200d7..008c177aa5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -815,7 +815,7 @@
 
 - type: entity
   name: energy shotgun
-  parent: [BaseWeaponBattery, BaseGunWieldable, BaseGrandTheftContraband]
+  parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband]
   id: WeaponEnergyShotgun
   description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
   components:
@@ -853,20 +853,57 @@
     size: Large
     sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
     heldPrefix: energy
-  - type: Tag
-    tags:
-    - HighRiskItem
-  - type: StealTarget
-    stealGroup: WeaponEnergyShotgun
   - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Battery
     maxCharge: 1200
     startingCharge: 1200
+
+- type: entity
+  name: energy magnum
+  parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband]
+  id: WeaponEnergyMagnum
+  description: A high powered self-charging energy pistol designed for elite security personnel. It has has three firing modes allowing for either high damage, window piercing, or non-lethal disabling.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi
+    layers:
+    - state: base
+      map: [ "enum.GunVisualLayers.Base" ]
+    - state: mag-unshaded-1
+      visible: false
+      map: [ "enum.GunVisualLayers.MagUnshaded" ]
+      shader: unshaded
+  - type: MagazineVisuals
+    magState: mag
+    steps: 4
+    zeroVisible: true
+  - type: Appearance
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi
+  - type: Tag
+    tags:
+    - HighRiskItem
+  - type: StealTarget
+    stealGroup: WeaponEnergyMagnum
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletLaserMagnum
+    fireCost: 150
+  - type: BatteryWeaponFireModes
+    fireModes:
+    - proto: BulletLaserMagnum
+      fireCost: 150
+    - proto: BulletLaserWindowPiercingMagnum
+      fireCost: 150
+    - proto: BulletDisabler
+      fireCost: 62.5
   - type: BatterySelfRecharger
     autoRecharge: true
-    autoRechargeRate: 24
+    autoRechargeRate: 48
     autoRechargePause: true
-    autoRechargePauseTime: 30
+    autoRechargePauseTime: 10
 
 - type: entity
   name: temperature gun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 2134ac0cbf..080f73bdb7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1325,3 +1325,52 @@
     proto: BulletDisablerSmg
     count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though
     spread: 9
+
+- type: entity
+  name: magnum laser bolt
+  id: BulletLaserMagnum
+  categories: [ HideSpawnMenu ]
+  parent: BulletLaser
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi
+    layers:
+    - state: magnum
+      shader: unshaded
+  - type: PointLight
+    enabled: true
+    color: "#ff4300"
+  - type: Projectile
+    impactEffect: BulletImpactEffectOrangeDisabler
+    damage:
+      types:
+        Heat: 30
+
+- type: entity
+  name: magnum window-piercing bolt
+  id: BulletLaserWindowPiercingMagnum
+  categories: [ HideSpawnMenu ]
+  parent: BulletLaser
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi
+    layers:
+    - state: magnum_piercing
+      shader: unshaded
+  - type: PointLight
+    enabled: true
+    color: "#ff4300"
+  - type: Projectile
+    impactEffect: BulletImpactEffectOrangeDisabler
+    damage:
+      types:
+        Heat: 20
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.1,0.1,0.1"
+        hard: false
+        mask:
+        - Opaque
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index 7cfbd2761e..a24e0f5dd3 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -22,7 +22,7 @@
     CaptainGunStealObjective: 0.5
     CaptainJetpackStealObjective: 0.5
     HandTeleporterStealObjective: 0.5
-    EnergyShotgunStealObjective: 0.5
+    EnergyMagnumStealObjective: 0.5
 
 - type: weightedRandom
   id: TraitorObjectiveGroupKill
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index d25908d154..0a223bd97c 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -85,11 +85,11 @@
     state: icon
 
 - type: stealTargetGroup
-  id: WeaponEnergyShotgun
-  name: steal-target-groups-weapon-energy-shot-gun
+  id: WeaponEnergyMagnum
+  name: steal-target-groups-weapon-energy-magnum
   sprite:
-    sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
-    state: base
+    sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi
+    state: icon
 
 # Thief Collection
 
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index 5f3b22c30d..26a4db42a0 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -243,7 +243,7 @@
 
 - type: entity
   parent: BaseTraitorStealObjective
-  id: EnergyShotgunStealObjective
+  id: EnergyMagnumStealObjective
   components:
   - type: Objective
     # HoS will have this on them a lot of the time so..
@@ -251,7 +251,7 @@
   - type: NotJobRequirement
     job: HeadOfSecurity
   - type: StealCondition
-    stealGroup: WeaponEnergyShotgun
+    stealGroup: WeaponEnergyMagnum
     owner: job-name-hos
 
 ## ce
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
index 5dc1310be3..c7a2c9e983 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
@@ -91,9 +91,9 @@
     <GuideEntityEmbed Entity="ClothingOuterHardsuitRd" Caption=""/>
     <GuideEntityEmbed Entity="HandTeleporter" Caption=""/>
   </Box>
-  - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy shotgun[/bold].
+  - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy magnum[/bold].
   <Box>
-    <GuideEntityEmbed Entity="WeaponEnergyShotgun" Caption=""/>
+    <GuideEntityEmbed Entity="WeaponEnergyMagnum" Caption=""/>
   </Box>
   - Stealing the [color=#f39f27]Chief Engineer[/color]'s [bold]advanced magboots[/bold].
   <Box>
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..56ff3c1509d1f0341bd0d01981b9c734cb5f63e5
GIT binary patch
literal 966
zcmV;%13CPOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004HX+uL$X=7sm
z04R}lkiSa;VI0Okr%6$ULk$rPH&_%XNJ2D*K`z#y25K#O-l^b^<L)G+HE3xN8lsl0
zhW>+EgVur|D1wOA)_yG^7q1FR<ac>LJn#EFeBTEgk)l#E2LezkTShb-k`u|4JottS
zH%@}gr4>_OjjhD#JKqmT;=K2Ztp4x*osq0+Dj*F33yN-7AT0rrElU@?2aGHEbQYur
z;4>1*6i7Eh&$RhfaIVdtf{l1|85|;0&h>Dnhn2ih0>>=iEfuRuXCLtsw_0A00h7QK
zCQ-tKkjYS`KoJW+1<KIJ7ijs`s34<IL8pd6fgE`(e8^NWQIXLwP*EvT6TScK)6|0V
z?R0ktTral$F%5(J(5&0`&xvg}Pr>;NSLLq1(tyP;aMrt;_ZU1oaB<z$G6!(E3lmRz
z+DNw~C*aUDct3~HB#hm`@J73<&OK+35Z{K#EgT-fj0T>~Um_N08bp|k!T<mQ97#k$
zR9J=WRl#c8KoEUSLW$RQS3X5rQ@giX=;*tzhC)9eN1uD|NAwFyKcq)dOb;U9qmbKE
z?1SWh8#DoJT-;=PaJ7+RqsY`P6!bu7ceJx_cINE}C{d!s|AGtCRLV5fq4razsV+=Y
zRf;+c1_QNNEFh&s5Cnz&c40UiDgcP02v2U55(9vga_c)|Y%g-oxgHY{PVyGpwylH^
z5JJH7Jajr8j7B5$`+dB7@dE(x_RAcWWfcyf*=#-?fDl4)&S6;=rqijm*J?HWerY}=
zZ#J714uFU@=0}egoY$)=j$^D=D-e-(AR;750su&o1efzAF6T=CK)c;W7>4@En+HJv
z&N-qe!gxHcY-!-UURAG}2Ht-s7={7Hn09EjTJU`zj^p4>{T2Z5;p_F@I!Ga<+!SF-
z9^c$(+sBoH5CTyYZ3qYe;y4BXIF3`8w9#nj@nkZ|7hx8bW$6Go=O7||a^Lq02attf
z7!Mi9p8o3Y9%sjEd3;L}e168XLpFdk1Ga5zyXSe3QWowLJ2P;0e1xmJ`}L-$RT$3=
zbh}-+u3G_sFbsj;w}mkVBGR^f$np3VWNV*hfR<~qxvpF3^?JG$3n5e-$6DP|%F4dv
z0M;eQOaG^z>otrqg-jX3F#Mx-oMNj4+4N_To^Dq=K1cvN(|=H^oB(Kf3!GN}0o^uq
o9bcbd>tCPNzeI@=CH^LU0aPIYM<BiMfB*mh07*qoM6N<$f_Dd~=l}o!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f83ef42ebfc9d181f5d1efe912ac8a5f5c3730a
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_h|ehE&XX
zdut=_AqN4L1FRDhE}l64j$zdTr&SwWQp}rNek@t?fc;C-vWCl<r8je#fO;76HJ4rq
z^7{K#ZvCybvITZ;vM0q%K684K@8qpkCVk0kJ<G*6<XXNdvDqf`UGyx|jAbwL*UN+S
zF);j?6IR=@?Eb_2S<_W3U#ag|eVbuYibPvX-uKY>mwC(?S6yG2HM~$^U|92+!RnfH
T;FSA;>L7idu6{1-oD!M<-Vs>X

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f83ef42ebfc9d181f5d1efe912ac8a5f5c3730a
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_h|ehE&XX
zdut=_AqN4L1FRDhE}l64j$zdTr&SwWQp}rNek@t?fc;C-vWCl<r8je#fO;76HJ4rq
z^7{K#ZvCybvITZ;vM0q%K684K@8qpkCVk0kJ<G*6<XXNdvDqf`UGyx|jAbwL*UN+S
zF);j?6IR=@?Eb_2S<_W3U#ag|eVbuYibPvX-uKY>mwC(?S6yG2HM~$^U|92+!RnfH
T;FSA;>L7idu6{1-oD!M<-Vs>X

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5c9f8a1f745d4d75129e71576079fb954486054
GIT binary patch
literal 987
zcmV<110?*3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004HX+uL$X=7sm
z04R}lkiSa;VI0Okr%6$ULk$rPH&_%XNJ2D*K`z#y25K#O-l^b^<L)G+HE3xN8lsl0
zhW>+EgVur|D1wOA)_yG^7q1FR<ac>LJn#EFeBTEgk)l#E2LezkTShb-k`u|4JottS
zH%@}gr4>_OjjhD#JKqmT;=K2Ztp4x*osq0+Dj*F33yN-7AT0rrElU@?2aGHEbQYur
z;4>1*6i7Eh&$RhfaIVdtf{l1|85|;0&h>Dnhn2ih0>>=iEfuRuXCLtsw_0A00h7QK
zCQ-tKkjYS`KoJW+1<KIJ7ijs`s34<IL8pd6fgE`(e8^NWQIXLwP*EvT6TScK)6|0V
z?R0ktTral$F%5(J(5&0`&xvg}Pr>;NSLLq1(tyP;aMrt;_ZU1oaB<z$G6!(E3lmRz
z+DNw~C*aUDct3~HB#hm`@J73<&OK+35Z{K#EgT-fj0T>~Um_N08bp|k!T<mQF-b&0
zR9J=Wl|fGvK^TUg0x@)G-EBOuJ49-{NW+o%7c83i1BfTi-u)5&0^{AkfW$-N!9#=g
zNLr-_=wTNUG&`6bYATF}y2C=7vW;kBvhQVgzMXI0ci!)tS;&zi$Nz#I&ojpJ%uTIl
zJkRWSo+)HasMqV}`1lyDHSKmgbKW>?Zf+WYFbuhNp@bMfYd!K^2r(78<2d$RDaG8R
z$+cR|NGXw0(rh-VR;#?--sbW8Ixp`20O0wDLww)QETB@UTrWUMX&lGF_k9iy4s3j3
zVF4ZupZB~A^Lo8rW&uj6OXHcV6E;dk6Gah&!2qR{O;Ab^$1%KvIF8vr?6ZH^2Vi-5
znXT>|d)+R3_q!9vpYF799EUIrX|-B~ksjD670rW+%ge6{*L4v>*o38}CEk4e&a;PQ
zo|aAlc=h?))P0aZYkj#16Y}Wf#Kv9^3{pzMFuc@208tbHu)4aMnY3Ik+xJeVGr0-V
z@O|G3a2yAvl->F6?rvrQX}GR?;Xr!#M`!0O&JNq-OC0n5maqwF0f_^(TFu6r%_dsw
z%=g4t2Nq{%I66BYE;?Vtz3sBHvO=TLC;$XO0KZR*5CWx?jZH(&)l-nJed2)X51Xyg
zXcX4g*6dX*r8H3#5d;B25TLa#OiK<7OEAg)t)Ig=LI^{u3_%e5(RG|)qy%aE(@1tV
z?mE5^0b}jIQK|_7RR0v_i~oRb6t<2}<{0_cC-u*fBS((EiC@XW`}~dKF!%rf002ov
JPDHLkV1hJH$e92D

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..9384a6a8615ace1af6d274517ec2d08268cadf5f
GIT binary patch
literal 897
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Y-ueVd6
z#IgFUpeYvvoL!omT^k!!T#_Z8B=KfVxVq^2dWW|~>xC{!Z872C4fKw8{_nWfG22l<
z#L*=?JKp=mTU#xSh0lxL{eEouywdWyWdi@xEqiW0ZLV3E(bCNL-7Dwn-M@Xp;(UL6
zj+q9>_vpC1w5XHYxbm05(yG#X*UP@B1}|gVCihU%*Szac@u7ul7p<%Cukbj1Z1N%X
zLvhZ08a1oGxXisTlK$$?(i<IZ&kwGv+GVUeCnHfe`$?;Mi|x-C&+IwwcaKcf(s5tX
zcS7c<iq8awJfSH!6x=6ju4FyAX7Bm%&$=5m<$V8HrScS}oanl)o#nY}*^*_h{wJp|
zUQ_gc{_>gM{IBoc&GevV>zeb1FYdKx9o<ytue-X6txtT1p2^?YlP<s6{$lE~XO?Y^
zvOD%<W_2>}xYhbF-8Sz?_9W+JwsYJ1xnJ}jd|>-!-PO%mYl{D|T+FRpWNl&7RCv>V
z!#{Q<u?#8WpR0I);m=v%5n0T@pr;JNj1^1m%Yd=5%hSa%q$2L^EJMG;4g#*~9a_D+
zHB^N%gBEZsUDDa(Vj;5qfzcB#k98|1F8IWINAI7bTbalP+ik+iw%&T1tUsqeTl@If
z{T^;6fd&Q^1qMbA2L?Fvi%){p+_vjKZMIAd-Sg?zlOCfmXC1NbYlka7+X(2{c=8sh
zJ)QBiDD(E)Z5KPW{5~$<)yA|z{+ropozw3%y53ZNkK}edtnK&lRPera)|(gn4hgWj
z8o1bh^G*NFufImAOFgpS`<ZlM!ovr17u^5-wI;r>D?ILE$CrP+4UdkT644fr+ow3?
z`}f1oUmtI?Uv~Xv%ek3rCSR>x)4u=Pxtqn$Z%J=nc+YrlwKKxONNz`BmMA^=$XvnI
zcg-0@Gfc5%3BPXsPXBmw&9<z^>>qgQUnu^lsGlsq@R4W6s@v8LW_1nAe5XC;vt_B=
zn^f>U_`%D^*XO9!G58;};%_vum20{;zd^-Q?dSi?mrS<)w%9g(!{*~xPZ<}hx=US}
zv}{YL^VTkf^B?BUUM2kE_w4%nRi%IX>*|xsEPttG3P8iQ@uJWVrpS$31A7+MTmeQc
NgQu&X%Q~loCIB*Qm{<S+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2172122ea58b5c5eaacb478cd972dc9f08d71eb
GIT binary patch
literal 898
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Y-ueVd6
z#IgFUpeYvvoL!omT^k!!T#_Z8B=KfVxVq^2dWW|~>xC{!Z872C4fKw8{_nWfG22l<
z#L*=?JKp=mTU#xSh0lxL{eEouywdWyWdi@xEqiW0ZLV3E(bCNL-7Dwn-M@Xp;(UL6
zj+q9>_vpC1w5XHYxbm05(yG#X*UP@B1}|gVCihU%*Szac@u7ul7p<%Cukbj1Z1N%X
zLvhZ08a1oGxXisTlK$$?(i<IZ&kwGv+GVUeCnHfe`$?;Mi|x-C&+IwwcaKcf(s5tX
zcS7c<iq8awJfSH!6x=6ju4FyAX7Bm%&$=5m<$V8HrScS}oanl)o#nY}*^*_h{wJp|
zUQ_gc{_>gM{IBoc&GevV>zeb1FYdKx9o<ytue-X6txtT1p2^?YlP<s6{$lE~XO?Y^
zvOD%<W_2>}xYhbF-8Sz?_9W+JwsYJ1xnJ}jd|>-!-PO%mYl{D|T+FRpWNl&7RCv>V
z!#{Q<u?#8WpR0I);m=v%5n0T@pr;JNj1^1m%Yd=5+tbA{q$2L^EyKKK0}-|d?o&Hk
zbx%pG)ZqyYF)Zs`5mL3{-lFN5>jFAg7B4M(#I|N#y-0vJ?+un$OMWRE9<8hUuRiH%
zWQ#mkKm(J=0tQwM2SzxvK&0YsPKZR?t4od(7$fHtCnU=p7w=7&{P2{@<mWrRCN23L
z`e03kn)C$LnLcm-FdaDb{P1#@K$XzYlWXhx<iB4(!F*tD$D!uM7p;vHxQ)IlUdh$^
zYkiPuZ*Xd4o4Lc%%v)`BQR{CXk}Hao@BHv$>&*t96HPuR!qQFts$Yq>nQ?e=#Nw>G
zoyS}6#?>pl=-HdkwB$p@o7#(u_ddDZE%84?-1pQYbSERZ9>h%GY&`k7{CL{Acl!=~
z`?YMJ^@s3sj#-;!?z&C)myKqXf1m%hwsGOl-x=&;+*R+iBi_iw8;LHETkz^;b%JfZ
z{QILj7FEY5Ce8f0jkj-J`?L3bx;=Np3v{mUuDK-rL3W`=m&1R%r8?d_&l^<+vRB@D
z>-Ub|G=SSQP&)m=n#tVykqPg9{=V~d+L?Dtzs03IeVQQW1r6N;`vrb5WwUP$w7;3S
Q1sJysp00i_>zopr041uKQvd(}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1e5161e0afaa3fe0515b9fa544a168c829b2bcb
GIT binary patch
literal 15137
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f2e879b02f9a404aca2ebff56294f931dc04076
GIT binary patch
literal 490
zcmV<G0Tup<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004HX+uL$X=7sm
z04R}lkiSa;VI0Okr%6$ULk$rPH&_%XNJ2D*K`z#y25K#O-l^b^<L)G+HE3xN8lsl0
zhW>+EgVur|D1wOA)_yG^7q1FR<ac>LJn#EFeBTEgk)l#E2LezkTShb-k`u|4JottS
zH%@}gr4>_OjjhD#JKqmT;=K2Ztp4x*osq0+Dj*F33yN-7AT0rrElU@?2aGHEbQYur
z;4>1*6i7Eh&$RhfaIVdtf{l1|85|;0&h>Dnhn2ih0>>=iEfuRuXCLtsw_0A00h7QK
zCQ-tKkjYS`KoJW+1<KIJ7ijs`s34<IL8pd6fgE`(e8^NWQIXLwP*EvT6TScK)6|0V
z?R0ktTral$F%5(J(5&0`&xvg}Pr>;NSLLq1(tyP;aMrt;_ZU1oaB<z$G6!(E3lmRz
z+DNw~C*aUDct3~HB#hm`@J73<&OK+35Z{K#EgT-fj0T>~Um_N08bp|k!T<mOKuJVF
zR9J=W(6J2wAPfURi)ol7``0XE76?U9sQBxXmn;DQiY&SF-zZ;1Xa2%zfu(6ncJwZk
ghMooh006$T0bHjHiH$F-8~^|S07*qoM6N<$g8l!@HUIzs

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b863defb72915c894af2359f5b30000ba9256e5
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004HX+uL$X=7sm
z04R}lkiSa;VI0Okr%6$ULk$rPH&_%XNJ2D*K`z#y25K#O-l^b^<L)G+HE3xN8lsl0
zhW>+EgVur|D1wOA)_yG^7q1FR<ac>LJn#EFeBTEgk)l#E2LezkTShb-k`u|4JottS
zH%@}gr4>_OjjhD#JKqmT;=K2Ztp4x*osq0+Dj*F33yN-7AT0rrElU@?2aGHEbQYur
z;4>1*6i7Eh&$RhfaIVdtf{l1|85|;0&h>Dnhn2ih0>>=iEfuRuXCLtsw_0A00h7QK
zCQ-tKkjYS`KoJW+1<KIJ7ijs`s34<IL8pd6fgE`(e8^NWQIXLwP*EvT6TScK)6|0V
z?R0ktTral$F%5(J(5&0`&xvg}Pr>;NSLLq1(tyP;aMrt;_ZU1oaB<z$G6!(E3lmRz
z+DNw~C*aUDct3~HB#hm`@J73<&OK+35Z{K#EgT-fj0T>~Um_N08bp|k!T<mOLrFwI
zR9J=W&@l=CFbG4@(9`rJ-hcKo>Cmmv!Q$5cHjzY70ss_Qa%bNtC!+KGgWCsE)0XVm
j`*UuSn!SYp007@xDuxow1cL+l00000NkvXXu0mjfpzYIL

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..7976821be11a5adbdc4ebf1291d4f35ca7125913
GIT binary patch
literal 537
zcmV+!0_OdRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004PX+uL$X=7sm
z04R}lk-bYoQ5eR5YEqQZP(wt6gGGUXBt&Bv<YEnKkkz8suR!f`uM*N4v@{3}QA=M#
z|3R%mYe5hcK}2h7UrWgCJt`=n=W_1*<2mPfIp;ZG59PGH+2w<Lp=gAI0ryI5)!qG$
z6BiErOvW`+UyLk7={SBKv8nnnrFwPV*LL(JQ>F&C9^n~HH;Te@!lA9Au6R#)NXy2P
z!Y9IBLk=i>tMo*j-xO!+{H554hUdYqdb%?$oM>S!YvhF|ggyCONo$-(-NcnDEJvh{
z$Q;EaOppL>5|r2=N0BM11<9<v&sXy;u_+!+{yJq0ab(Df*DGpCx~8P2MNi3>qpWiO
zpQoAjPuIJ<0^oeLtj{s%-iK<%vVKo3t9k~G7q~7o{hN~0?6>HZrsg?@fgQNKX=;fB
zxY~u`XFYDjYm!5zJ)MS+3+Ru*;63!N)w61>bN&R;ZF!<QI6Q)J**~!U2O<_|8Z-H-
z3;+NC32;bRa{vGf5&!@T5&_cPe*6Fc08&XrK~z{r?a)CA03ZlN(V^3H67Rq6GM2P0
zLTUNMjmU^Ri9!GY1Q19HxU~9Twe%@VC;kR*0z=(n=eC7jbNQ<{Tn-aN009ILKmY**
b5I6`-lqMMuCtKkk00000NkvXXu0mjfM2qOK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json
new file mode 100644
index 0000000000..293dcbdcbd
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Created by BoskiYourk (GitHub), edited by spanky-spanky (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-0",
+            "delays": [
+                [
+                    0.35,
+                    0.35,
+                    0.35,
+                    0.35
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f9199b2bcdf9ce89f0ac20e1c71ccc8f5dce5af
GIT binary patch
literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004QX+uL$X=7sm
z04R}lkvmHRK@^2Q6GicXg@Pg$38+{^2nu2;5lj;;k_f(<?7B&W?7Hl35U~|(ECdVD
z##iA#&{nWj5ClaKv9<Nph^%*9AtG^>+52&3&SmBdgi<BlbZg^aTAq_mCL+@_vyu8I
zLe$YglxR+O?TO5ImVd|l4K=D>52#-M@2fhR77SO1ng-!v-F7_TQQ_3GXDi+iZr6*s
z1>t?+m?H-izEHXr@T1~Fz^{s(Y<dhrs%NC|i?v^@7adc$U%1CCmGz(VsGBq!)>KAn
zm&|Tl(j-X`L8HtfB|HYCT9R3HU;NuQ$&z?<`P;1Eh@(JJyfIPB($$cf7u}Gr#EQ!O
zZ=P;`XfWvBoPfFq-+$?a`Yrg}^!<+m-~T*>@I9Pa75|dtH1a0;W<~4SgVr@TIj?Bi
zHk__Q=bfE%a^F%|W+<PB=VNG@fwn7XoC~u0S?A~$va9k$m$0)7eX_rG{tN$MXbPb#
zuMq$M010qNS#tmYE+YT{E+YYWr9XB600A9IL_t(oN9|X^4Z<)CY!D0Zgf$og@ni!e
zR$v5HsMHO3qK?5D@MMG%r=)^lD*GHMJQ}H$TE)5R-8F8j$}qa^Vr3`~r89Ja7x>aj
z0wNH>J^8giOeE9<67bqe!XXwUB(8pqySqGY$XXBq0?I`~Z2<#rvH>EHNPY0vunlSg
zOb8L{hZ-mY3<+3;910LPJk$gjBnlxsR2F<mzuEV|Z9`|sh8zmOPj6~QCe*j$xpW~;
z{%&^+<-y0cp)3R&{M<^qHBS~4S3vX{j`<%m<jyDPbu6yHM4-3=q7YKhMmHibfPb+S
zixv2#g0&l}2(TpjjR0!JLm!bgq&P3h1Kox{O4SN5B<L3WW1@ZdkNKp8_2<+?AV={N
X-d1>MxEMTo00000NkvXXu0mjf_f|yI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png
new file mode 100644
index 0000000000000000000000000000000000000000..d35cd0a8521d8c4a43be98f1a3448c1166ba5ad6
GIT binary patch
literal 733
zcmV<30wVp1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004QX+uL$X=7sm
z04R}lkvmHRK@^3*#3w$mP(j3E3l$3kq9B$M!8Fk#M)1{SH`zqktjq2O3ATcbg<v7t
z_$vGd+6uM`f}jW@wzj?+k@b!VB#6#3dq2+1xy+n_aNIKTUhNR%ZQo7AqT1a2g4Xa%
z9j$ayPbg)0&eY6gl7Gj?Eg@BJBC6N_`~Dow>5OMUs8M*-a9m$_TsXe!JBl}jJB(Z^
zEqow6=*j_wFO{yB_(^fL#BYk-WMTrss;8E%V!euuoSPRO5bn)e1*3c(b(5BiJv$?{
zTV@X)31URi&?&Htg-=APEt&o88~X80vmzct{tiW4ab(GfcTm)Vbj?ULMbF4*QB=AA
z&eJnThD+UBqEPo31h0M2unk{ZLGXDP1Ybu`^8n{|#lIpsjlGM$RndC)p=}*bFDjb8
z17{o1b?>Cy)Q?mnGi;jhassXM(0&a~i>0i}>m1)fa!sD-3U>FPU-q{xeFKweXV@c@
z1<U{d010qNS#tmYE+YT{E+YYWr9XB6009+AL_t(oM`K{10Q~nAl%ha8SSu5`20$&B
zq|^~)IRIuk(DBAVOpzl<b^w~?GbwchBRNrk#S!U1bIt<sbH>f@pOIoFH9~+C`!Lj!
z>;Q^v!=jla2VexfcM8SsA;|$)ZG$+1?8Hd911JoGQ3tRP8-myp;Q!DHuy$}^vULt9
z9e~RNpjrlE%Y)G<81N7vsxH76|FAT~xVi(B4nSOz>V*Lhfl&txcnA=c2tg?eZ$U(6
z0;H%>N^A*ANZrth0$kAm_8}Sh9~Lqsg#fgIc@C;@zy%J(Vv-9V<Y*zu0fgd{9C?x*
zfF~5lv7h{|8CkYr(L{7PfUXy<Tp+7c0y2|q2cYE&l6yqd3PD&2Nw#?a=ip_05sGS>
P00000NkvXXu0mjfNlrJp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json
new file mode 100644
index 0000000000..73f61cbb15
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Created by BoskiYourk (GitHub)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "magnum"
+    },
+    {
+      "name": "magnum_piercing"
+    }
+  ]
+}

From 7b7f49cd3939ce73eb7c8046f8bcc8169d66cb97 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 16:06:15 +0000
Subject: [PATCH 063/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 004a1ea082..e75a5363c6 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: slarticodefast
-  changes:
-  - message: Added a reduced motion version of the seeing rainbows overlay.
-    type: Add
-  id: 8536
-  time: '2025-05-20T12:36:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37584
 - author: B-Kirill
   changes:
   - message: Added new fun meteors variations (Cosmic cow, Honksteroid, Space potato)
@@ -3953,3 +3946,13 @@
   id: 9043
   time: '2025-10-07T14:12:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40115
+- author: BoskiYourk, spanky_spanky
+  changes:
+  - message: The Head of Security now has an energy magnum, a self-charging multi-mode
+      laser revolver, in their locker instead of the energy shotgun.
+    type: Add
+  - message: The Warden now has the energy shotgun in their locker round-start.
+    type: Tweak
+  id: 9044
+  time: '2025-10-07T16:05:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40615

From 70543885e75598c2aad64113cc824a33acf9efcb Mon Sep 17 00:00:00 2001
From: dffdff2423 <dffdff2423@gmail.com>
Date: Tue, 7 Oct 2025 11:59:59 -0400
Subject: [PATCH 064/216] Add log statement for missing guidebook proto
 (#40380)

* Add log statement for missing guidebook proto

Also removed an unused parameter.

* Update Content.Client/Guidebook/DocumentParsingManager.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Content.Client/Guidebook/DocumentParsingManager.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Content.Client/Guidebook/DocumentParsingManager.cs b/Content.Client/Guidebook/DocumentParsingManager.cs
index 4c9f5fabe0..37ec1ac2de 100644
--- a/Content.Client/Guidebook/DocumentParsingManager.cs
+++ b/Content.Client/Guidebook/DocumentParsingManager.cs
@@ -50,22 +50,22 @@ public sealed partial class DocumentParsingManager
         _sawmill = Logger.GetSawmill("Guidebook");
     }
 
-    public bool TryAddMarkup(Control control, ProtoId<GuideEntryPrototype> entryId, bool log = true)
+    public bool TryAddMarkup(Control control, ProtoId<GuideEntryPrototype> entryId)
     {
         if (!_prototype.Resolve(entryId, out var entry))
             return false;
 
         using var file = _resourceManager.ContentFileReadText(entry.Text);
-        return TryAddMarkup(control, file.ReadToEnd(), log);
+        return TryAddMarkup(control, file.ReadToEnd());
     }
 
-    public bool TryAddMarkup(Control control, GuideEntry entry, bool log = true)
+    public bool TryAddMarkup(Control control, GuideEntry entry)
     {
         using var file = _resourceManager.ContentFileReadText(entry.Text);
-        return TryAddMarkup(control, file.ReadToEnd(), log);
+        return TryAddMarkup(control, file.ReadToEnd());
     }
 
-    public bool TryAddMarkup(Control control, string text, bool log = true)
+    public bool TryAddMarkup(Control control, string text)
     {
         try
         {

From ceedfb6d39ebb8331473550fb2d4a8f0202da082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Tue, 7 Oct 2025 11:05:30 -0500
Subject: [PATCH 065/216] Standardize state names in drinks yml (#40316)

* drinks_base

* drinks_special

* drinks_fun

* drinks_cans - the holy minus diff

* bottles_glass and metamorphic

* mugs

* Solar's Best Hot Drinks

* misc drinks_cups

* slight addition to base

* lint fix

* metamorphic glass

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Objects/Consumable/Drinks/drinks_base.yml |  16 +-
 .../Drinks/drinks_bottles_glass.yml           |   4 +-
 .../Objects/Consumable/Drinks/drinks_cans.yml | 156 +++---------------
 .../Objects/Consumable/Drinks/drinks_cups.yml |  75 +++------
 .../Objects/Consumable/Drinks/drinks_fun.yml  |  13 +-
 .../Consumable/Drinks/drinks_metamorphic.yml  |  22 +--
 .../Consumable/Drinks/drinks_special.yml      |  14 --
 .../Reagents/Consumable/Drink/drinks.yml      |   2 +-
 .../Drinks/cafe_latte.rsi/icon-vend.png       | Bin 0 -> 299 bytes
 .../Consumable/Drinks/cafe_latte.rsi/icon.png | Bin 299 -> 293 bytes
 .../Drinks/cafe_latte.rsi/icon_empty.png      | Bin 293 -> 0 bytes
 .../Drinks/cafe_latte.rsi/meta.json           |   6 +-
 .../glass_clear.rsi/{fill1.png => fill-1.png} | Bin
 .../glass_clear.rsi/{fill2.png => fill-2.png} | Bin
 .../glass_clear.rsi/{fill3.png => fill-3.png} | Bin
 .../glass_clear.rsi/{fill4.png => fill-4.png} | Bin
 .../glass_clear.rsi/{fill5.png => fill-5.png} | Bin
 .../glass_clear.rsi/{fill6.png => fill-6.png} | Bin
 .../glass_clear.rsi/{fill7.png => fill-7.png} | Bin
 .../glass_clear.rsi/{fill8.png => fill-8.png} | Bin
 .../glass_clear.rsi/{fill9.png => fill-9.png} | Bin
 .../Drinks/glass_clear.rsi/meta.json          |  18 +-
 .../{fill1.png => fill-1.png}                 | Bin
 .../{fill2.png => fill-2.png}                 | Bin
 .../{fill3.png => fill-3.png}                 | Bin
 .../{fill4.png => fill-4.png}                 | Bin
 .../{fill5.png => fill-5.png}                 | Bin
 .../Drinks/glass_coupe_shape.rsi/meta.json    |  10 +-
 .../glue-tube.rsi/{fill1.png => fill-1.png}   | Bin
 .../glue-tube.rsi/{fill2.png => fill-2.png}   | Bin
 .../glue-tube.rsi/{fill3.png => fill-3.png}   | Bin
 .../glue-tube.rsi/{fill4.png => fill-4.png}   | Bin
 .../glue-tube.rsi/{fill5.png => fill-5.png}   | Bin
 .../glue-tube.rsi/{fill6.png => fill-6.png}   | Bin
 .../{icon.png => icon_empty.png}              | Bin
 .../Consumable/Drinks/glue-tube.rsi/meta.json |  14 +-
 .../Consumable/Drinks/hot_coco.rsi/icon-0.png | Bin 318 -> 0 bytes
 .../Consumable/Drinks/hot_coco.rsi/icon-1.png | Bin 149 -> 0 bytes
 .../Consumable/Drinks/hot_coco.rsi/icon-2.png | Bin 158 -> 0 bytes
 .../Consumable/Drinks/hot_coco.rsi/icon-3.png | Bin 160 -> 0 bytes
 .../Consumable/Drinks/hot_coco.rsi/icon-4.png | Bin 164 -> 0 bytes
 .../Consumable/Drinks/hot_coco.rsi/meta.json  |  28 ----
 .../Drinks/hot_coffee.rsi/icon-0.png          | Bin 318 -> 0 bytes
 .../Drinks/hot_coffee.rsi/icon-1.png          | Bin 149 -> 0 bytes
 .../Drinks/hot_coffee.rsi/icon-2.png          | Bin 158 -> 0 bytes
 .../Drinks/hot_coffee.rsi/icon-3.png          | Bin 160 -> 0 bytes
 .../Drinks/hot_coffee.rsi/icon-4.png          | Bin 164 -> 0 bytes
 .../Drinks/hot_coffee.rsi/icon-vend.png       | Bin 295 -> 0 bytes
 .../Drinks/hot_coffee.rsi/meta.json           |  28 ----
 .../Drinks/jar.rsi/{fill1.png => fill-1.png}  | Bin
 .../Drinks/jar.rsi/{fill2.png => fill-2.png}  | Bin
 .../Drinks/jar.rsi/{fill3.png => fill-3.png}  | Bin
 .../Drinks/jar.rsi/{fill4.png => fill-4.png}  | Bin
 .../Drinks/jar.rsi/{fill5.png => fill-5.png}  | Bin
 .../Drinks/jar.rsi/{fill6.png => fill-6.png}  | Bin
 .../Drinks/jar.rsi/{fill7.png => fill-7.png}  | Bin
 .../Drinks/jar.rsi/{fill8.png => fill-8.png}  | Bin
 .../Drinks/jar.rsi/{fill9.png => fill-9.png}  | Bin
 .../Consumable/Drinks/jar.rsi/meta.json       |  18 +-
 .../lube-tube.rsi/{fill1.png => fill-1.png}   | Bin
 .../lube-tube.rsi/{fill2.png => fill-2.png}   | Bin
 .../lube-tube.rsi/{fill3.png => fill-3.png}   | Bin
 .../lube-tube.rsi/{fill4.png => fill-4.png}   | Bin
 .../lube-tube.rsi/{fill5.png => fill-5.png}   | Bin
 .../lube-tube.rsi/{fill6.png => fill-6.png}   | Bin
 .../{icon.png => icon_empty.png}              | Bin
 .../Consumable/Drinks/lube-tube.rsi/meta.json |  14 +-
 .../Drinks/mug.rsi/{icon-1.png => fill-1.png} | Bin
 .../Drinks/mug.rsi/{icon-2.png => fill-2.png} | Bin
 .../Drinks/mug.rsi/{icon-3.png => fill-3.png} | Bin
 .../icon-vend-brown.png}                      | Bin
 .../Drinks/mug.rsi/{icon-0.png => icon.png}   | Bin
 .../Consumable/Drinks/mug.rsi/meta.json       |  11 +-
 .../mug_black.rsi/{icon-1.png => fill-1.png}  | Bin
 .../mug_black.rsi/{icon-2.png => fill-2.png}  | Bin
 .../mug_black.rsi/{icon-3.png => fill-3.png}  | Bin
 .../mug_black.rsi/{icon-0.png => icon.png}    | Bin
 .../Consumable/Drinks/mug_black.rsi/meta.json |   8 +-
 .../mug_blue.rsi/{icon-1.png => fill-1.png}   | Bin
 .../mug_blue.rsi/{icon-2.png => fill-2.png}   | Bin
 .../mug_blue.rsi/{icon-3.png => fill-3.png}   | Bin
 .../mug_blue.rsi/{icon-0.png => icon.png}     | Bin
 .../Consumable/Drinks/mug_blue.rsi/meta.json  |   8 +-
 .../mug_dog.rsi/{icon-1.png => fill-1.png}    | Bin
 .../mug_dog.rsi/{icon-2.png => fill-2.png}    | Bin
 .../mug_dog.rsi/{icon-3.png => fill-3.png}    | Bin
 .../mug_dog.rsi/{icon-0.png => icon.png}      | Bin
 .../Consumable/Drinks/mug_dog.rsi/meta.json   |   8 +-
 .../mug_green.rsi/{icon-1.png => fill-1.png}  | Bin
 .../mug_green.rsi/{icon-2.png => fill-2.png}  | Bin
 .../mug_green.rsi/{icon-3.png => fill-3.png}  | Bin
 .../mug_green.rsi/{icon-0.png => icon.png}    | Bin
 .../Consumable/Drinks/mug_green.rsi/meta.json |   8 +-
 .../mug_heart.rsi/{icon-1.png => fill-1.png}  | Bin
 .../mug_heart.rsi/{icon-2.png => fill-2.png}  | Bin
 .../mug_heart.rsi/{icon-3.png => fill-3.png}  | Bin
 .../mug_heart.rsi/{icon-0.png => icon.png}    | Bin
 .../Consumable/Drinks/mug_heart.rsi/meta.json |   8 +-
 .../mug_metal.rsi/{icon-1.png => fill-1.png}  | Bin
 .../mug_metal.rsi/{icon-2.png => fill-2.png}  | Bin
 .../mug_metal.rsi/{icon-3.png => fill-3.png}  | Bin
 .../mug_metal.rsi/{icon-0.png => icon.png}    | Bin
 .../Consumable/Drinks/mug_metal.rsi/meta.json |   8 +-
 .../{icon-1.png => fill-1.png}                | Bin
 .../{icon-2.png => fill-2.png}                | Bin
 .../{icon-3.png => fill-3.png}                | Bin
 .../mug_moebius.rsi/{icon-0.png => icon.png}  | Bin
 .../Drinks/mug_moebius.rsi/meta.json          |   8 +-
 .../mug_one.rsi/{icon-1.png => fill-1.png}    | Bin
 .../mug_one.rsi/{icon-2.png => fill-2.png}    | Bin
 .../mug_one.rsi/{icon-3.png => fill-3.png}    | Bin
 .../mug_one.rsi/{icon-0.png => icon.png}      | Bin
 .../Consumable/Drinks/mug_one.rsi/meta.json   |   8 +-
 .../{icon-1.png => fill-1.png}                | Bin
 .../{icon-2.png => fill-2.png}                | Bin
 .../{icon-3.png => fill-3.png}                | Bin
 .../mug_rainbow.rsi/{icon-0.png => icon.png}  | Bin
 .../Drinks/mug_rainbow.rsi/meta.json          |   8 +-
 .../mug_red.rsi/{icon-1.png => fill-1.png}    | Bin
 .../mug_red.rsi/{icon-2.png => fill-2.png}    | Bin
 .../mug_red.rsi/{icon-3.png => fill-3.png}    | Bin
 .../mug_red.rsi/{icon-0.png => icon.png}      | Bin
 .../Consumable/Drinks/mug_red.rsi/meta.json   |   8 +-
 .../shotglass.rsi/{fill1.png => fill-1.png}   | Bin
 .../shotglass.rsi/{fill2.png => fill-2.png}   | Bin
 .../Consumable/Drinks/shotglass.rsi/meta.json |   4 +-
 .../teacup.rsi/{icon-1.png => fill-1.png}     | Bin
 .../teacup.rsi/{icon-2.png => fill-2.png}     | Bin
 .../teacup.rsi/{icon-3.png => fill-3.png}     | Bin
 .../teacup.rsi/{icon-4.png => fill-4.png}     | Bin
 .../teacup.rsi/{icon-0.png => icon.png}       | Bin
 .../Consumable/Drinks/teacup.rsi/meta.json    |  10 +-
 .../water_cup.rsi/{icon-1.png => fill-1.png}  | Bin
 .../water_cup.rsi/{icon-0.png => icon.png}    | Bin
 .../Consumable/Drinks/water_cup.rsi/meta.json |   4 +-
 135 files changed, 155 insertions(+), 392 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon-vend.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill5.png => fill-5.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill6.png => fill-6.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill7.png => fill-7.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill8.png => fill-8.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill9.png => fill-9.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/{fill1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/{fill2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/{fill3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/{fill4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/{fill5.png => fill-5.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{fill1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{fill2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{fill3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{fill4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{fill5.png => fill-5.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{fill6.png => fill-6.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{icon.png => icon_empty.png} (100%)
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill5.png => fill-5.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill6.png => fill-6.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill7.png => fill-7.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill8.png => fill-8.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill9.png => fill-9.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{fill1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{fill2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{fill3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{fill4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{fill5.png => fill-5.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{fill6.png => fill-6.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{icon.png => icon_empty.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/{hot_coco.rsi/icon-vend.png => mug.rsi/icon-vend-brown.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/{fill1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/{fill2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/{icon-4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/{icon-0.png => icon.png} (100%)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
index c4e8b020e7..14e4b741c5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
@@ -91,7 +91,7 @@
 #      map: ["enum.OpenableVisuals.Layer"]
 
 ## Bases for visuals
-# TODO standardize state names for fill levels and openable visuals
+# New drinks should mirror these state names to reduce clutter when creating new prototypes
 
 # Basic visualizer for an openable entity. Requires DrinkBaseOpenable
 - type: entity
@@ -103,13 +103,14 @@
     visuals:
       enum.OpenableVisuals.Opened:
         enum.OpenableVisuals.Layer:
-          True: {state: "icon_open"}
-          False: {state: "icon"}
+          True: {state: "icon_open"} # lid off
+          False: {state: "icon"} # lid on
   - type: Sprite
     layers:
     - state: icon
       map: ["enum.OpenableVisuals.Layer"]
   - type: ExaminableSolution
+    solution: *sol
     examinableWhileClosed: false # If you can't see the fill levels on the sprite, we can assume it's opaque
     heldOnly: true # If it's opaque, you probably can't see through the open lid from a distance
 
@@ -121,11 +122,12 @@
   - type: Appearance
   - type: Sprite
     layers:
-    - state: icon_empty
+    - state: icon
     - state: fill-1
       map: ["enum.SolutionContainerLayers.Fill"]
       visible: false
   - type: SolutionContainerVisuals
+    solutionName: *sol
     maxFillLevels: 5
     fillBaseName: fill-
     inHandsMaxFillLevels: 3
@@ -139,7 +141,7 @@
   components:
   - type: Sprite
     layers:
-    - state: icon_empty
+    - state: icon
       map: [ "enum.SolutionContainerLayers.Base" ]
     - state: fill-1
       map: [ "enum.SolutionContainerLayers.Fill" ]
@@ -169,8 +171,8 @@
     visuals:
       enum.OpenableVisuals.Opened:
         enum.OpenableVisuals.Layer:
-          True: {state: "icon_open"}
-          False: {state: "icon_empty"}
+          True: {state: "icon_open"} # lid off
+          False: {state: "icon_empty"} # lid on
   - type: Sprite
     layers:
     - state: icon_empty
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
index ec6bdf8002..3aa1e1d547 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
@@ -106,7 +106,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alco-bottle.rsi
     layers:
-      - state: icon_blue # todo add "icon_empty" state
+      - state: icon_empty
         map: ["enum.OpenableVisuals.Layer"]
       - state: fill-6
         map: ["enum.SolutionContainerLayers.Fill"]
@@ -260,7 +260,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alco-bottle.rsi
     layers:
-      - state: icon_green # todo icon_empty
+      - state: icon_empty
         map: ["enum.OpenableVisuals.Layer"]
       - state: fill-6
         map: ["enum.SolutionContainerLayers.Fill"]
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index 3102ffc522..bb3eb76c29 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -9,7 +9,7 @@
     solutions:
       drink:
         maxVol: 30
-      grindable:
+      grindable: &grindable
         reagents: # 5u -> 1/2 steel sheet (10u)
         - ReagentId: Aluminium # Fun fact: soda can makeup is approx. 75% aluminium and 25% tin/iron.
           Quantity: 4
@@ -51,12 +51,7 @@
         reagents:
         - ReagentId: Cola
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Tag
     tags:
     - Cola
@@ -76,12 +71,7 @@
     solutions:
       drink:
         maxVol: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Tag
     tags:
     - Cola
@@ -101,12 +91,7 @@
         reagents:
         - ReagentId: IcedTea
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
   - type: Item
@@ -125,12 +110,7 @@
         reagents:
         - ReagentId: LemonLime
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemon-lime.rsi
   - type: Item
@@ -149,12 +129,7 @@
         reagents:
         - ReagentId: LemonLimeCranberry
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemon-lime-cranberry.rsi
   - type: Item
@@ -206,12 +181,7 @@
         reagents:
         - ReagentId: GrapeSoda
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/purple_can.rsi
   - type: Item
@@ -230,12 +200,7 @@
         reagents:
         - ReagentId: RootBeer
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rootbeer.rsi
   - type: Item
@@ -258,12 +223,7 @@
         reagents:
         - ReagentId: SodaWater
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/sodawater.rsi
   - type: Item
@@ -282,12 +242,7 @@
         reagents:
         - ReagentId: SpaceMountainWind
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi
   - type: Item
@@ -306,12 +261,7 @@
         reagents:
         - ReagentId: SpaceUp
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space-up.rsi
   - type: Item
@@ -330,12 +280,7 @@
         reagents:
         - ReagentId: SolDry
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/sol_dry.rsi
   - type: Item
@@ -354,12 +299,7 @@
         reagents:
         - ReagentId: Starkist
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/starkist.rsi
   - type: Item
@@ -378,12 +318,7 @@
         reagents:
         - ReagentId: TonicWater
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tonic.rsi
   - type: Item
@@ -402,12 +337,7 @@
         reagents:
         - ReagentId: FourteenLoko
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/fourteen_loko.rsi
   - type: Item
@@ -426,12 +356,7 @@
         reagents:
         - ReagentId: ChangelingSting
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/changelingsting.rsi
   - type: Item
@@ -450,12 +375,7 @@
         reagents:
         - ReagentId: DrGibb
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/dr_gibb.rsi
   - type: Item
@@ -478,12 +398,7 @@
           Quantity: 20
         - ReagentId: Ice
           Quantity: 5
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/robustnukie.rsi
   - type: Item
@@ -502,12 +417,7 @@
         reagents:
         - ReagentId: EnergyDrink
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/energy_drink.rsi
   - type: Item
@@ -526,12 +436,7 @@
         reagents:
         - ReagentId: ShamblersJuice
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shamblersjuice.rsi
   - type: Item
@@ -550,12 +455,7 @@
         reagents:
         - ReagentId: PwrGame
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pwrgame.rsi
   - type: Item
@@ -574,12 +474,7 @@
         reagents:
         - ReagentId: Beer
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beer_can.rsi
   - type: Item
@@ -602,12 +497,7 @@
         reagents:
         - ReagentId: Wine
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/wine_can.rsi
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index e1fe78c433..7b1320ba49 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -22,22 +22,16 @@
 # A mug is a type of cup.[2]
 - type: entity
   abstract: true
-  parent: [ DrinkBaseMaterialPorcelain, DrinkBaseCup ] # todo Should use DrinkVisualsFill, but inheritors have no in-hand and state names are wrong
+  parent: [ DrinkBaseMaterialPorcelain, DrinkBaseCup, DrinkVisualsFill ]
   id: DrinkBaseMug
   name: mug
   description: A mug.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug.rsi
-    layers:
-      - state: icon-0
-      - state: icon-3
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
-  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 3
-    fillBaseName: icon-
+    inHandsFillBaseName: null
 
 ## Misc Cups
 
@@ -53,18 +47,13 @@
     price: 125
 
 - type: entity
-  parent: DrinkBaseMug
+  parent: DrinkBaseMug # a teacup is basically a mug
   id: DrinkTeacupEmpty
   name: teacup
   description: A plain white porcelain teacup.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/teacup.rsi
-    layers:
-    - state: icon-0
-    - state: icon-4
-      map: ["enum.SolutionContainerLayers.Fill"]
-      visible: false
   - type: SolutionContainerVisuals
     maxFillLevels: 4
 
@@ -76,20 +65,11 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_coupe_shape.rsi
-    layers:
-    - state: icon # todo add "icon_empty" state to match DrinkVisualsFillOverlay
-      map: [ "enum.SolutionContainerLayers.Base" ]
-    - state: fill1
-      map: [ "enum.SolutionContainerLayers.Fill" ]
-      visible: false
-    - state: icon-front
-      map: [ "enum.SolutionContainerLayers.Overlay" ]
   - type: SolutionContainerVisuals
-    fillBaseName: fill # todo rename to "fill-" to match DrinkVisualsFillOverlay
     inHandsMaxFillLevels: 1
 
 - type: entity
-  parent: [DrinkBaseMaterialCardboard, DrinkBaseCup] # TODO should use DrinkVisualsFill but state names are wrong and no inhand
+  parent: [DrinkBaseMaterialCardboard, DrinkBaseCup, DrinkBaseEmptyTrash, DrinkVisualsFill]
   id: DrinkWaterCup
   name: water cup
   description: A paper water cup.
@@ -102,22 +82,14 @@
     size: Tiny
   - type: Sprite
     sprite: Objects/Consumable/Drinks/water_cup.rsi
-    layers:
-    - state: icon-0
-    - state: icon-1
-      map: ["enum.SolutionContainerLayers.Fill"]
-      visible: false
   - type: SolutionContainerVisuals
     maxFillLevels: 1
-    fillBaseName: icon-
+    inHandsFillBaseName: null
   - type: Tag
     tags:
     - Trash
     - DrinkCup
     - WhitelistChameleon
-  - type: Appearance
-  - type: TrashOnSolutionEmpty
-    solution: drink
   - type: Clothing
     slots:
     - HEAD
@@ -240,16 +212,13 @@
         - ReagentId: HotCocoa
           Quantity: 20
   - type: Icon
-    sprite: Objects/Consumable/Drinks/hot_coco.rsi
-    state: icon-vend
+    sprite: Objects/Consumable/Drinks/mug.rsi
+    state: icon-vend-brown
   - type: Sprite
-    sprite: Objects/Consumable/Drinks/hot_coco.rsi
     layers:
-      - state: icon-0
-      - map: ["enum.SolutionContainerLayers.Fill"]
-        state: icon-4
-  - type: SolutionContainerVisuals
-    maxFillLevels: 4
+    - state: icon
+    - state: fill-3
+      map: ["enum.SolutionContainerLayers.Fill"]
   - type: TrashOnSolutionEmpty
     solution: drink
 
@@ -267,16 +236,13 @@
         - ReagentId: Coffee
           Quantity: 20
   - type: Icon
-    sprite: Objects/Consumable/Drinks/hot_coffee.rsi
-    state: icon-vend
+    sprite: Objects/Consumable/Drinks/mug.rsi
+    state: icon-vend-brown
   - type: Sprite
-    sprite: Objects/Consumable/Drinks/hot_coffee.rsi
     layers:
-      - state: icon-0
-      - map: ["enum.SolutionContainerLayers.Fill"]
-        state: icon-4
-  - type: SolutionContainerVisuals
-    maxFillLevels: 4
+    - state: icon
+    - state: fill-3
+      map: ["enum.SolutionContainerLayers.Fill"]
   - type: TrashOnSolutionEmpty
     solution: drink
 
@@ -293,16 +259,17 @@
         reagents:
         - ReagentId: CafeLatte
           Quantity: 20
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/cafe_latte.rsi
+    state: icon-vend
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cafe_latte.rsi
     layers:
-      - state: icon_empty
-      - state: fill-1
-        map: ["enum.SolutionContainerLayers.Fill"]
-  - type: Appearance
+    - state: icon
+    - state: fill-1
+      map: ["enum.SolutionContainerLayers.Fill"]
   - type: SolutionContainerVisuals
     maxFillLevels: 1
-    fillBaseName: fill-
     changeColor: false
   - type: TrashOnSolutionEmpty
     solution: drink
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
index 1197356553..f7c984171d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -8,9 +8,9 @@
       collection: packetOpenSounds
   - type: Sprite
     layers:
-    - state: icon
+    - state: icon_empty
       map: ["enum.OpenableVisuals.Layer"]
-    - state: fill6
+    - state: fill-6
       map: [ "enum.SolutionContainerLayers.Fill" ] # already has liquid, so no visible: false
     - state: icon-front
       map: [ "enum.SolutionContainerLayers.Overlay" ]
@@ -20,13 +20,6 @@
         maxVol: 30
   - type: SolutionContainerVisuals
     maxFillLevels: 6
-    fillBaseName: fill # TODO rename to "fill-"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "icon_open"}
-          False: {state: "icon"}
   - type: TrashOnSolutionEmpty
     solution: drink
 
@@ -97,8 +90,6 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/jar_what.rsi
-  - type: ExaminableSolution
-    solution: drink
   - type: FitsInDispenser
     solution: drink
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
index d4fe5da5b6..10a2b76657 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
@@ -4,35 +4,23 @@
 
 # Transformable container - normal glass
 - type: entity
-  parent: [DrinkBaseMaterialGlass, DrinkBaseCup] # todo parent to DrinkVisualsFillOverlay after in-hands are added
+  parent: [DrinkBaseMaterialGlass, DrinkBaseCup, DrinkVisualsFillOverlay]
   id: DrinkGlass
   name: metamorphic glass
   description: A metamorphic glass that automagically turns into a glass appropriate for the drink within. There's a sanded off patent number on the bottom.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_clear.rsi
-    layers:
-      - state: icon # TODO add "icon_empty" state to match "DrinkVisualsFillOverlay"
-        map: [ "enum.SolutionContainerLayers.Base" ]
-      - state: fill1
-        map: [ "enum.SolutionContainerLayers.Fill" ]
-        visible: false
-      - state: icon-front
-        map: [ "enum.SolutionContainerLayers.Overlay" ]
-  - type: Appearance
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
   - type: SolutionContainerVisuals
     maxFillLevels: 9
-    fillBaseName: fill # todo rename to "fill-", add in-hands, then add parent "DrinkVisualsFillOverlay"
     metamorphic: true
     metamorphicDefaultSprite:
       sprite: Objects/Consumable/Drinks/glass_clear.rsi
       state: icon
-    inHandsMaxFillLevels: 3
-    inHandsFillBaseName: -fill-
   - type: Tag
     tags:
     - DrinkCup # Do these tags
@@ -47,14 +35,6 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/jar.rsi
-    layers:
-    - state: icon
-      map: [ "enum.SolutionContainerLayers.Base" ]
-    - state: fill1
-      map: [ "enum.SolutionContainerLayers.Fill" ]
-      visible: false
-    - state: icon-front
-      map: [ "enum.SolutionContainerLayers.Overlay" ]
   - type: SolutionContainerManager
     solutions:
       drink:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index adc99f46ad..b9929b6704 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -12,17 +12,8 @@
     size: Tiny
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shotglass.rsi
-    layers:
-    - state: icon # TODO add "icon_empty" state to match "DrinkVisualsFillOverlay"
-      map: [ "enum.SolutionContainerLayers.Base" ]
-    - state: fill1
-      map: [ "enum.SolutionContainerLayers.Fill" ]
-      visible: false
-    - state: icon-front
-      map: [ "enum.SolutionContainerLayers.Overlay" ]
   - type: SolutionContainerVisuals
     maxFillLevels: 2
-    fillBaseName: fill # TODO rename to "fill-" to match "DrinkVisualsFillOverlay"
     inHandsMaxFillLevels: 1
   - type: FitsInDispenser
     solution: drink
@@ -184,11 +175,6 @@
         maxVol: 60
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pitcher.rsi
-    layers:
-    - state: icon # TODO add "icon_empty" state to match "DrinkVisualsFill"
-    - state: fill-1
-      map: ["enum.SolutionContainerLayers.Fill"]
-      visible: false
   - type: SolutionContainerVisuals
     maxFillLevels: 6
     inHandsMaxFillLevels: 2
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 68448bc0c9..f49e9f9671 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -96,7 +96,7 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/cafe_latte.rsi
-    state: icon_empty
+    state: icon
   metamorphicMaxFillLevels: 1
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon-vend.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5d52da5d391119b79ff0649f89e2c94d16ab9d1
GIT binary patch
literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJPo6H0Ar*6yZ3-SR9Clz@#<;ci
z3gcoviP8frnB8O#0D)82qte&c{vKDC7ZEw)Va)C`-|la{=6^4?y}#Hap6Z)w8I<_f
z|FkzYo~+_NL4?Wt?Q|oZS8on$rRVLR(wKNzEvQHNE@S@veW?cK=EpVN`4nz4J~<J1
zmhsS`Lp(s764}CSAaq%2mR+rt&DZGY=;YAiFE0WuW>0DHD6wQP77^omF(afqv0;fu
zLV|+*I?XZ$9jSkRejZlP(>n)p--l06z1L)|c*hWNL1<HhUf_WP4KItm7y@@PNIu|V
qEvoUK#=L@;ZI6{4$V+T@7#Z@-{CBK<RFMGmJ%gvKpUXO@geCy*;&%Z6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon.png
index c5d52da5d391119b79ff0649f89e2c94d16ab9d1..a5564b59761db2dce9b631c3c1705a178c9b86fb 100644
GIT binary patch
delta 266
zcmV+l0rmc?0;K|wB!2;OQb$4nuFf3k0002rNkl<ZScUD9y$ysg3`Rdrw?PVzLP5g}
zG|Z5RJVP1^CZJ&fwxGxcNVzKLg!pj+#YyKUMMCl?{Nfl;6h%?~ok9{Ch5-Q3bzL~i
zHBD0hKwZ~jfwwfs%z=n7P1A0jh``LjS}VF#vH$>-WqDfb`+q*=cj*G&`$GxueRA_G
zft=c70>&5^W3n0@AzGNWZP)Fus%kegj^q06oD(nNOB#&Z9jCB8-<cGWo&d;y>)Qg%
z8~|Wh77!5tV4mmQ%;N%av{wyc&N=t2z?SXJ?~o*5tu2nGkh6e_qWlCOAFW8k1qX^K
Q00000NkvXXt^-0~f;DP%p8x;=

delta 272
zcmV+r0q_2$0;>X$B!BWrL_t(|oMSw2-~huw0;U1AebfP?4j6U7r~^hFz`(%3LW<&b
z>(>3pCm$3P#7Hv-OrJjee<}Y;2EF<RSmiG@Dll|UfB8Q%Gm|7okQ4$p?Uynv>g>ZR
zXKufgfnn1oQj8<r0dL>FWiU54$0<h+AlU)r$WhG!!otD~!hgcTWLbm@FcQ-unm&Cx
zJoQ^!TVqvo^ypDIo0Nn|bU6Ss6c!5Tm{f~lfTSp3U?4xPDRuxX8vgwG!yqm$&cMLH
z!0__rORQ?B?f_WO60(3UQNX}}>2pc|QMmva;0gtDd{34Gs0{|ZIv#bvr~?Mv0RV3{
WPq?k(cwhhk00{s|MNUMnLSTY&dvuBb

diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png
deleted file mode 100644
index a5564b59761db2dce9b631c3c1705a178c9b86fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 293
zcmV+=0owkFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#-$_J4R9J=WlD!RtFbqaNPPah{k3vDi3^dG;i9ACZ3MQao0k)vX21vOo=!E!j
z0>w$^Cq+W?C;Z|VP!vT`{+&V+8ioM?&~;rn%Qa0?06<;WVu80b$jpI=Fiq2Loru89
z!CEW2RI&g7lx2BZ>-#?Ccj*G&`$GxueRA_Gft=c70>&5^W3n0@AzGNWZP)Fus%keg
zj^q06oD(nNOB#&Z9jCB8-<cGWo&d;y>)Qg%8~|Wh77!5tV4mmQ%;N%av{wyc&N=t2
rz?SXJ?~o*5tu2nGkh6e_qWlCOAFW8k1qX^K00000NkvXXu0mjfrEYf|

diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json
index c3942590a6..737fc565b1 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json
@@ -12,9 +12,6 @@
         {
             "name": "icon"
         },
-        {
-            "name": "icon_empty"
-        },
         {
             "name": "fill-1"
         },
@@ -25,6 +22,9 @@
         {
             "name": "inhand-left",
             "directions": 4
+        },
+		{
+            "name": "icon-vend"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-5.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-6.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-6.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-7.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-7.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-8.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-8.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-9.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-9.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json
index 16bcd31794..4f1b5d9173 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json
@@ -14,31 +14,31 @@
             "name": "icon-front"
         },
         {
-            "name": "fill1"
+            "name": "fill-1"
         },
         {
-            "name": "fill2"
+            "name": "fill-2"
         },
         {
-            "name": "fill3"
+            "name": "fill-3"
         },
         {
-            "name": "fill4"
+            "name": "fill-4"
         },
         {
-            "name": "fill5"
+            "name": "fill-5"
         },
         {
-            "name": "fill6"
+            "name": "fill-6"
         },
         {
-            "name": "fill7"
+            "name": "fill-7"
         },
         {
-            "name": "fill8"
+            "name": "fill-8"
         },
         {
-            "name": "fill9"
+            "name": "fill-9"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-5.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json
index 6b42e9b9f7..ddffe3572d 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json
@@ -14,19 +14,19 @@
             "name": "icon-front"
         },
         {
-            "name": "fill1"
+            "name": "fill-1"
         },
         {
-            "name": "fill2"
+            "name": "fill-2"
         },
         {
-            "name": "fill3"
+            "name": "fill-3"
         },
         {
-            "name": "fill4"
+            "name": "fill-4"
         },
         {
-            "name": "fill5"
+            "name": "fill-5"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill1.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill2.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill3.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill4.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill5.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-5.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-6.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill6.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-6.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon_empty.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon_empty.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json
index afc42a380e..a60196b83b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json
@@ -8,7 +8,7 @@
     "copyright": "Created by discord: brainfood#7460 / github: brainfood1183. Inhands by Tiniest Shark (Github)",
     "states": [
         {
-            "name": "icon"
+            "name": "icon_empty"
         },
         {
             "name": "icon_open"
@@ -17,22 +17,22 @@
             "name": "icon-front"
         },
         {
-            "name": "fill1"
+            "name": "fill-1"
         },
         {
-            "name": "fill2"
+            "name": "fill-2"
         },
         {
-            "name": "fill3"
+            "name": "fill-3"
         },
         {
-            "name": "fill4"
+            "name": "fill-4"
         },
         {
-            "name": "fill5"
+            "name": "fill-5"
         },
         {
-            "name": "fill6"
+            "name": "fill-6"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png
deleted file mode 100644
index d2a5ef967aa5a6572b56ac10e7db2ca8e7afe73c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;AKx2$B+p3WC_;A2_ijBg8UK-O*|jGTe<Cj
zfSQEH?9hp+d>j+j2&U{@&|twVJ)djF|JRpg+rG=kO?u0rrr|5X5P9zGAJH63>Fqi!
z%r_MbzXT|XO?bi}@L*yYb2JaLf|&;oi$kBnRYeu+2TvC-4iIBHaKzyv!=d+iXH{<r
zs#r6K{O@1C-r=BvVG*MzC%Yx%p+yg`UqAk#MME#0SM2e`4eGaICOI?6Ger7yJymcB
zWuL(8QN*Cp*w`c`8xX`dVJWBW>WSGuHK6WyWRQ?x$ZYd||7+v1>p<@@c)I$ztaD0e
F0s!wKYpehO

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png
deleted file mode 100644
index c97ead8da8530a03451da7a9f4928c5ca14f244b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pq8hLV@QPi+hZGf85DR}Hm3YvsOYqxLG@7H
pJ1&NO*I!OG-Q?b{!*C#bm08Ds7N(o54!S^H44$rjF6*2UngDw2Dlq^6

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png
deleted file mode 100644
index 18ff175dadad15aa8176531790f36105fe7fa7c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV@QPi+p~&%3<^BV2j2egZ|h`r6j1Pd
z=QDd28$(U{ly#>wcTb(`|Lw3&EF(jmup#5Oh1|dXJ+rd|YG?3t^>bP0l+XkK7|t%k

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png
deleted file mode 100644
index a60b6edb6dbf9af1e7887fdadd418099f0f307d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!psA;eV@QPi+jELS3<^BV8$SMbKYWBo<3NLl
zPj*>0!-4FzMbZAD>bjw}MWtK%cGU7Qd}!=o6wBdYE=qbV4K#qk)78&qol`;+092VR
AYXATM

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png
deleted file mode 100644
index 52a03df50852262789b681a9fc36bd6d54defc2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!prxmaV@QPi+Y5?(3<ey|7mNNo=ch0lUza@c
z&-jXo01Ly9xGP)MgnaA>xtJ#Y{^{GV9Uu9D+IS|L&FJJ|*=?K=3FI+&y85}Sb4q9e
E0B=w+d;kCd

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json
deleted file mode 100644
index b22da85aa9..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"version": 1,
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"license": "CC-BY-SA-3.0",
-	"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-	"states": [{
-            "name": "icon-0"
-        },
-        {
-            "name": "icon-1"
-        },
-		{
-            "name": "icon-2"
-        },
-		{
-            "name": "icon-3"
-        },
-		{
-            "name": "icon-4"
-        },
-		{
-            "name": "icon-vend"
-        }
-	]
-}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png
deleted file mode 100644
index d2a5ef967aa5a6572b56ac10e7db2ca8e7afe73c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;AKx2$B+p3WC_;A2_ijBg8UK-O*|jGTe<Cj
zfSQEH?9hp+d>j+j2&U{@&|twVJ)djF|JRpg+rG=kO?u0rrr|5X5P9zGAJH63>Fqi!
z%r_MbzXT|XO?bi}@L*yYb2JaLf|&;oi$kBnRYeu+2TvC-4iIBHaKzyv!=d+iXH{<r
zs#r6K{O@1C-r=BvVG*MzC%Yx%p+yg`UqAk#MME#0SM2e`4eGaICOI?6Ger7yJymcB
zWuL(8QN*Cp*w`c`8xX`dVJWBW>WSGuHK6WyWRQ?x$ZYd||7+v1>p<@@c)I$ztaD0e
F0s!wKYpehO

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png
deleted file mode 100644
index c97ead8da8530a03451da7a9f4928c5ca14f244b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pq8hLV@QPi+hZGf85DR}Hm3YvsOYqxLG@7H
pJ1&NO*I!OG-Q?b{!*C#bm08Ds7N(o54!S^H44$rjF6*2UngDw2Dlq^6

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png
deleted file mode 100644
index 18ff175dadad15aa8176531790f36105fe7fa7c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV@QPi+p~&%3<^BV2j2egZ|h`r6j1Pd
z=QDd28$(U{ly#>wcTb(`|Lw3&EF(jmup#5Oh1|dXJ+rd|YG?3t^>bP0l+XkK7|t%k

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png
deleted file mode 100644
index a60b6edb6dbf9af1e7887fdadd418099f0f307d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!psA;eV@QPi+jELS3<^BV8$SMbKYWBo<3NLl
zPj*>0!-4FzMbZAD>bjw}MWtK%cGU7Qd}!=o6wBdYE=qbV4K#qk)78&qol`;+092VR
AYXATM

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png
deleted file mode 100644
index 52a03df50852262789b681a9fc36bd6d54defc2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!prxmaV@QPi+Y5?(3<ey|7mNNo=ch0lUza@c
z&-jXo01Ly9xGP)MgnaA>xtJ#Y{^{GV9Uu9D+IS|L&FJJ|*=?K=3FI+&y85}Sb4q9e
E0B=w+d;kCd

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png
deleted file mode 100644
index 765112be764715026b84a09ea1947aa20a14b84f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 295
zcmV+?0oeYDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#;Ymb6R9J=WlsyW<KoCa1sHBNVQpHA_c!o3<-b!%=3&Duq!Nb_*2$EDbrZFLy
zCLn7S(fok3h!)PPc4v2I9?UWT!!XRhqp3U!eNR5`9akvjQ4$D!Pg<r8y*B~?<Y|C7
ziIgQsk3!#*MmxiDx_*hTb_--TLrH=xu$_zAv)RUbtSKTbia@zgIp(-Rb6lZaj(b_T
z)If(SV3~GB!ZK~dNkmPhCIA5Ta17lT008prgggxZ0N3+D0zkJvdAkKl0!>f~7m)wJ
try&VAuF&dw{k1tz@X1NYFbu=|oI4v3LA<DpZo2>g002ovPDHLkV1gcBbJ+j@

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
deleted file mode 100644
index b22da85aa9..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"version": 1,
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"license": "CC-BY-SA-3.0",
-	"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-	"states": [{
-            "name": "icon-0"
-        },
-        {
-            "name": "icon-1"
-        },
-		{
-            "name": "icon-2"
-        },
-		{
-            "name": "icon-3"
-        },
-		{
-            "name": "icon-4"
-        },
-		{
-            "name": "icon-vend"
-        }
-	]
-}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill1.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill2.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill3.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill4.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill5.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-5.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-6.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill6.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-6.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill7.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-7.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill7.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-7.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill8.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-8.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill8.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-8.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill9.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-9.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill9.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-9.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
index f7db09b523..59e2295761 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
@@ -14,31 +14,31 @@
             "name": "icon-front"
         },
         {
-            "name": "fill1"
+            "name": "fill-1"
         },
         {
-            "name": "fill2"
+            "name": "fill-2"
         },
         {
-            "name": "fill3"
+            "name": "fill-3"
         },
         {
-            "name": "fill4"
+            "name": "fill-4"
         },
         {
-            "name": "fill5"
+            "name": "fill-5"
         },
         {
-            "name": "fill6"
+            "name": "fill-6"
         },
         {
-            "name": "fill7"
+            "name": "fill-7"
         },
         {
-            "name": "fill8"
+            "name": "fill-8"
         },
         {
-            "name": "fill9"
+            "name": "fill-9"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill1.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill2.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill3.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill4.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill5.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-5.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-6.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill6.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-6.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon_empty.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon_empty.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json
index afc42a380e..a60196b83b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json
@@ -8,7 +8,7 @@
     "copyright": "Created by discord: brainfood#7460 / github: brainfood1183. Inhands by Tiniest Shark (Github)",
     "states": [
         {
-            "name": "icon"
+            "name": "icon_empty"
         },
         {
             "name": "icon_open"
@@ -17,22 +17,22 @@
             "name": "icon-front"
         },
         {
-            "name": "fill1"
+            "name": "fill-1"
         },
         {
-            "name": "fill2"
+            "name": "fill-2"
         },
         {
-            "name": "fill3"
+            "name": "fill-3"
         },
         {
-            "name": "fill4"
+            "name": "fill-4"
         },
         {
-            "name": "fill5"
+            "name": "fill-5"
         },
         {
-            "name": "fill6"
+            "name": "fill-6"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-vend-brown.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-vend-brown.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json
index 052ebf11aa..3e7bc06ad1 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
@@ -26,6 +26,9 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+		{
+            "name": "icon-vend-brown"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json
index d7e6f34541..8b87125a21 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/unitystation/unitystation/blob/221bbcc50edf4e63dc71ac6fd5152664a6b6745a/UnityProject/Assets/Textures/items/drinks/mug_gromit.png | Created By https://github.com/ksivte, inhands and modification by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png
rename to Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png
rename to Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json
index cf438684de..c7d6205b6f 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json
@@ -14,10 +14,10 @@
             "name": "icon-front"
         },
         {
-            "name": "fill1"
+            "name": "fill-1"
         },
         {
-            "name": "fill2"
+            "name": "fill-2"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png
rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
index 8f340a2eab..060a643bef 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
@@ -8,19 +8,19 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
 		{
-            "name": "icon-2"
+            "name": "fill-2"
         },
 		{
-            "name": "icon-3"
+            "name": "fill-3"
         },
 		{
-            "name": "icon-4"
+            "name": "fill-4"
         },
 		{
             "name": "icon-vend-tea"
diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json
index 6301d09d7d..61406ac3b6 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json
@@ -8,10 +8,10 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
             "name": "inhand-right",

From 745c6d0edc2a1271431a4e797134de21fc331e52 Mon Sep 17 00:00:00 2001
From: kosticia <kosticia46@gmail.com>
Date: Tue, 7 Oct 2025 19:09:20 +0300
Subject: [PATCH 066/216] Unpredict MagnetPickupSystem.cs (#39988)

* unpredict

* predict
---
 Content.Shared/Storage/Components/MagnetPickupComponent.cs | 6 +++++-
 Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Storage/Components/MagnetPickupComponent.cs b/Content.Shared/Storage/Components/MagnetPickupComponent.cs
index 90b7e83d63..72a9c81077 100644
--- a/Content.Shared/Storage/Components/MagnetPickupComponent.cs
+++ b/Content.Shared/Storage/Components/MagnetPickupComponent.cs
@@ -1,15 +1,19 @@
 using Content.Shared.Inventory;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Storage.Components;
 
 /// <summary>
 /// Applies an ongoing pickup area around the attached entity.
 /// </summary>
-[RegisterComponent, AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
+[AutoGenerateComponentPause]
 public sealed partial class MagnetPickupComponent : Component
 {
     [ViewVariables(VVAccess.ReadWrite), DataField("nextScan")]
     [AutoPausedField]
+    [AutoNetworkedField]
     public TimeSpan NextScan = TimeSpan.Zero;
 
     /// <summary>
diff --git a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
index 9a0b48e65b..27a15c87a6 100644
--- a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
@@ -47,6 +47,7 @@ public sealed class MagnetPickupSystem : EntitySystem
                 continue;
 
             comp.NextScan += ScanDelay;
+            Dirty(uid, comp);
 
             if (!_inventory.TryGetContainingSlot((uid, xform, meta), out var slotDef))
                 continue;

From 4bd1cb3ac44a924e45ae374fc0edcc8f46511dde Mon Sep 17 00:00:00 2001
From: FungiFellow <151778459+FungiFellow@users.noreply.github.com>
Date: Tue, 7 Oct 2025 12:20:40 -0400
Subject: [PATCH 067/216] Cancer Mice Ghostrole Info (#40102)

* Adjusted Cancer Mouse Ghost Info

* Updated Smite Snail

* Added ghostrole info

* Remove snail info

* Update space.yml

* Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl

* Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl | 3 +++
 Resources/Prototypes/Entities/Mobs/NPCs/animals.yml         | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
index a578adf82b..6c4ca0c4f4 100644
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -32,6 +32,9 @@ ghost-role-information-silicon-rules = You are a [color={role-type-silicon-color
 ghost-role-information-mouse-name = Mouse
 ghost-role-information-mouse-description = A hungry and mischievous mouse.
 
+ghost-role-information-cancer-mouse-name = Cancer Mouse
+ghost-role-information-cancer-mouse-description = An irradiated mouse, spread your affliction and seek food.
+
 ghost-role-information-mothroach-name = Mothroach
 ghost-role-information-mothroach-description = A cute but mischievous mothroach.
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 5aedad4596..c812140812 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1980,6 +1980,12 @@
   parent: MobMouse
   id: MobMouseCancer
   components:
+  - type: GhostRole
+    name: ghost-role-information-cancer-mouse-name
+    description: ghost-role-information-cancer-mouse-description
+    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
   - type: Sprite
     color: LightGreen
   - type: PointLight

From 6dc131b76c87b2c6b87cd7f4c2a029be66a058ba Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 16:34:50 +0000
Subject: [PATCH 068/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index e75a5363c6..d2e8d1f870 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: B-Kirill
-  changes:
-  - message: Added new fun meteors variations (Cosmic cow, Honksteroid, Space potato)
-      that drop unique loot upon destruction. Urist McMeteor now shatters into meat
-      when explodes.
-    type: Add
-  id: 8537
-  time: '2025-05-20T13:04:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37327
 - author: Kittygyat
   changes:
   - message: Added a new, faster way for slimepeople to access their own special inventory,
@@ -3956,3 +3947,10 @@
   id: 9044
   time: '2025-10-07T16:05:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40615
+- author: FungiFellow
+  changes:
+  - message: Cancer Mice now have unique ghost role entries.
+    type: Tweak
+  id: 9045
+  time: '2025-10-07T16:33:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40102

From 167f3f2b92424f358b29265b3d0157e298a96480 Mon Sep 17 00:00:00 2001
From: FungiFellow <151778459+FungiFellow@users.noreply.github.com>
Date: Tue, 7 Oct 2025 14:10:43 -0400
Subject: [PATCH 069/216] Biosuit Suit Slots (#39888)

* Added Gastank Storage to Biosuits, Weapon/Gas to Sec Biosuit

* Fixed Error

* Sec Suit no longer Child to General Biosuit

* Update cargo_security.yml
---
 Resources/Prototypes/Catalog/Cargo/cargo_security.yml  |  2 +-
 .../Prototypes/Entities/Clothing/OuterClothing/bio.yml | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
index 9ff3488a43..9b5c0ddad6 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
@@ -54,7 +54,7 @@
     sprite: Clothing/Head/Hoods/Bio/security.rsi
     state: icon
   product: CrateSecurityBiosuit
-  cost: 800
+  cost: 1600
   category: cargoproduct-category-name-security
   group: market
 
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
index 4da176e2ed..eb5827e013 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothingGasTanks]
   id: ClothingOuterBioGeneral
   name: bio suit
   suffix: Generic
@@ -64,7 +64,7 @@
     sprite: Clothing/OuterClothing/Bio/scientist.rsi
 
 - type: entity
-  parent: [ClothingOuterBioGeneral, BaseSecurityContraband]
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSecurityContraband]
   id: ClothingOuterBioSecurity
   name: bio suit
   suffix: Security
@@ -82,7 +82,11 @@
         Piercing: 0.8
   - type: ZombificationResistance
     zombificationResistanceCoefficient: 0.4
-
+  - type: GroupExamine
+  - type: ClothingSpeedModifier
+    walkModifier: 0.95
+    sprintModifier: 0.95
+    
 - type: entity
   parent: ClothingOuterBioGeneral
   id: ClothingOuterBioVirology

From 1deef4bb7e66d423fc722406cfa932799fe9da49 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 18:23:15 +0000
Subject: [PATCH 070/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index d2e8d1f870..552aeaff27 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Kittygyat
-  changes:
-  - message: Added a new, faster way for slimepeople to access their own special inventory,
-      with LMB.
-    type: Add
-  id: 8538
-  time: '2025-05-20T16:55:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37592
 - author: FrostWinters
   changes:
   - message: Histamines no longer cause radiation.
@@ -3954,3 +3946,13 @@
   id: 9045
   time: '2025-10-07T16:33:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40102
+- author: FungiFellow
+  changes:
+  - message: Biosuits can now fit Gastanks in Suit Storage, the Security Biosuit can
+      fit both Gastanks and Weapons
+    type: Add
+  - message: Security Biosuits Cost has been increased 800->1600
+    type: Tweak
+  id: 9046
+  time: '2025-10-07T18:22:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39888

From d463aba5875861226000167f991420223a5fa181 Mon Sep 17 00:00:00 2001
From: Deserty0 <86846189+Deserty0@users.noreply.github.com>
Date: Wed, 8 Oct 2025 04:53:25 +1000
Subject: [PATCH 071/216] New HTN precondition: has status effect (#39781)

* Create HasStatusEffectPrecondition.cs

* Update HasStatusEffectPrecondition.cs

* ok now it works

* Update HasStatusEffectPrecondition.cs
---
 .../HasStatusEffectPrecondition.cs            | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 Content.Server/NPC/HTN/Preconditions/HasStatusEffectPrecondition.cs

diff --git a/Content.Server/NPC/HTN/Preconditions/HasStatusEffectPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/HasStatusEffectPrecondition.cs
new file mode 100644
index 0000000000..d11a99e2b5
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/HasStatusEffectPrecondition.cs
@@ -0,0 +1,28 @@
+using Content.Shared.StatusEffectNew;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.NPC.HTN.Preconditions;
+
+/// <summary>
+/// Returns true if entity have specified status effect
+/// </summary>
+public sealed partial class HasStatusEffectPrecondition : HTNPrecondition
+{
+    private StatusEffectsSystem _statusEffects = default!;
+
+    [DataField(required: true)]
+    public EntProtoId StatusEffect;
+
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+        _statusEffects =  sysManager.GetEntitySystem<StatusEffectsSystem>();
+    }
+
+    public override bool IsMet(NPCBlackboard blackboard)
+    {
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+
+        return _statusEffects.HasStatusEffect(owner, StatusEffect);
+    }
+}

From afe11dc9595dc4a976ced6a156bd331101a672a4 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Tue, 7 Oct 2025 15:25:19 -0400
Subject: [PATCH 072/216] =?UTF-8?q?MRE=20wrappers=20/=20cotton=20nutri-b?=
 =?UTF-8?q?=C3=A2tards=20are=20no=20longer=20twice=20as=20nutritious=20as?=
 =?UTF-8?q?=20nutribricks=20(#40761)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Objects/Consumable/Food/Baked/bread.yml          | 4 ++--
 .../Prototypes/Entities/Objects/Consumable/Food/snacks.yml    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index 6edff6e98a..d9475c9ebe 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -1051,7 +1051,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 45
+        maxVol: 26
         reagents:
         - ReagentId: Fiber
-          Quantity: 40
+          Quantity: 20
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index e53e99e9db..27cc06023c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -864,10 +864,10 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 45
+        maxVol: 25
         reagents:
         - ReagentId: Fiber
-          Quantity: 40
+          Quantity: 20
   - type: Tag
     tags:
     - ClothMade

From 0734cdd18abfb71e90c3710e9fb778c8ef170e10 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 19:37:39 +0000
Subject: [PATCH 073/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 552aeaff27..ecfa489faa 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: FrostWinters
-  changes:
-  - message: Histamines no longer cause radiation.
-    type: Tweak
-  - message: Epinephrine treats Histamines above OD threshold.
-    type: Tweak
-  id: 8544
-  time: '2025-05-21T01:12:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37460
 - author: Minty642
   changes:
   - message: Added fungal soil, maintenance version of hydroponics.
@@ -3956,3 +3947,10 @@
   id: 9046
   time: '2025-10-07T18:22:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39888
+- author: Hitlinemoss
+  changes:
+  - message: MRE wrappers are no longer twice as nutritious as the actual food within.
+    type: Fix
+  id: 9047
+  time: '2025-10-07T19:36:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40761

From 5be5e280be9955a206ca485c9c42d4604470e77a Mon Sep 17 00:00:00 2001
From: Mora <46364955+TrixxedHeart@users.noreply.github.com>
Date: Tue, 7 Oct 2025 18:03:21 -0500
Subject: [PATCH 074/216] Added Vox Beak Types, New Markings, and Sprite
 Layering Fixes (#40569)

* Added more Vox customizations

* Adds Vox Head Markings

* Update meta.json

* stray comma, woe be upon ye

* added tiny pixel to visage left and right

* Added eyeliner ftl

* Removed duplicate FTL

how the fuck did this happen

* Added cheek marking

* Made tip marking look a bit better

* Fix eyeliner ID

* ok whatever shut up build test. mean to me

* changed underbelly to have more flat transparency

* didnt like how it looked so i adjusted it

* Adjusted base eyeliner color

* Fixed inconsistency with nightling head tattoo

* Updated V tattoo

* Delete chest_v.png

* fix yml

ITS EVEN FUNNIER THE SECOND TIME

* minor sprite fix

* Update head.png

* Re added stray pixel, added square cere beak

* Added hooked beak

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
---
 Resources/Locale/en-US/markings/vox.ftl       |  56 +++++-
 .../Mobs/Customization/Markings/vox_parts.yml |  46 +++++
 .../Customization/Markings/vox_tattoos.yml    | 168 +++++++++++++++++-
 Resources/Prototypes/Species/vox.yml          |   3 +
 .../Mobs/Customization/vox_parts.rsi/beak.png | Bin 396 -> 399 bytes
 .../vox_parts.rsi/beak_hooked.png             | Bin 0 -> 387 bytes
 .../vox_parts.rsi/beak_shaved.png             | Bin 0 -> 384 bytes
 .../vox_parts.rsi/beak_squarecere.png         | Bin 0 -> 392 bytes
 .../Customization/vox_parts.rsi/meta.json     |  14 +-
 .../vox_tattoos.rsi/beakcover_stripe.png      | Bin 0 -> 296 bytes
 .../vox_tattoos.rsi/beakcover_tip.png         | Bin 0 -> 332 bytes
 .../vox_tattoos.rsi/cheekblush.png            | Bin 0 -> 3042 bytes
 .../vox_tattoos.rsi/chest_v_1.png             | Bin 0 -> 3124 bytes
 .../vox_tattoos.rsi/chest_v_2.png             | Bin 0 -> 3101 bytes
 .../vox_tattoos.rsi/eyeliner.png              | Bin 0 -> 2981 bytes
 .../Customization/vox_tattoos.rsi/meta.json   |  54 +++++-
 .../vox_tattoos.rsi/nightbelt.png             | Bin 0 -> 3123 bytes
 .../vox_tattoos.rsi/tattoo_arrow_head.png     | Bin 0 -> 3035 bytes
 .../vox_tattoos.rsi/tattoo_nightling_head.png | Bin 0 -> 3126 bytes
 .../vox_tattoos.rsi/underbelly.png            | Bin 0 -> 3131 bytes
 .../Customization/vox_tattoos.rsi/visage.png  | Bin 0 -> 3111 bytes
 .../vox_tattoos.rsi/visage_l.png              | Bin 0 -> 3045 bytes
 .../vox_tattoos.rsi/visage_r.png              | Bin 0 -> 3053 bytes
 .../Mobs/Species/Vox/parts.rsi/head.png       | Bin 429 -> 3351 bytes
 .../Mobs/Species/Vox/parts.rsi/l_leg.png      | Bin 544 -> 601 bytes
 .../Mobs/Species/Vox/parts.rsi/r_leg.png      | Bin 549 -> 597 bytes
 .../Mobs/Species/Vox/parts.rsi/torso.png      | Bin 816 -> 3527 bytes
 27 files changed, 334 insertions(+), 7 deletions(-)
 create mode 100644 Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_hooked.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_shaved.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_squarecere.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_stripe.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_tip.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/cheekblush.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_1.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_2.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeliner.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightbelt.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_arrow_head.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_nightling_head.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/underbelly.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_l.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_r.png

diff --git a/Resources/Locale/en-US/markings/vox.ftl b/Resources/Locale/en-US/markings/vox.ftl
index 3cb14df2aa..83f073e444 100644
--- a/Resources/Locale/en-US/markings/vox.ftl
+++ b/Resources/Locale/en-US/markings/vox.ftl
@@ -1,14 +1,62 @@
+marking-TattooVoxNightlingHead-tattoo_nightling_head = Vox Head Tattoo (Nightling)
+marking-TattooVoxNightlingHead = Vox Head Tattoo (Nightling)
+
+marking-TattooVoxArrowHead-tattoo_arrow_head = Vox Head Tattoo (Arrow)
+marking-TattooVoxArrowHead = Vox Head Tattoo (Arrow)
+
+marking-VoxTattooEyeliner-eyeliner = Eyeliner
+marking-VoxTattooEyeliner = Eyeliner
+
+marking-VoxVisage-visage = Visage (Full)
+marking-VoxVisage = Visage (Full)
+
+marking-VoxVisageL-visage_l = Visage (Left)
+marking-VoxVisageL = Visage (Left)
+
+marking-VoxVisageR-visage_r = Visage (Right)
+marking-VoxVisageR = Visage (Right)
+
+marking-VoxCheek-cheekblush = Cheeks
+marking-VoxCheek = Cheeks
+
+marking-VoxBeak-beak = Beak (Pointed)
+marking-VoxBeak = Beak (Pointed)
+
+marking-VoxBeakSquareCere-beak_squarecere = Beak (Square Cere)
+marking-VoxBeakSquareCere = Beak (Square Cere)
+
+marking-VoxBeakHooked-beak_hooked = Beak (Hooked)
+marking-VoxBeakHooked = Beak (Hooked)
+
+marking-VoxBeakShaved-beak_shaved = Beak (Shaved)
+marking-VoxBeakShaved = Beak (Shaved)
+
+marking-VoxBeakCoverTip-beakcover_tip = Beak Tip
+marking-VoxBeakCoverTip = Beak Tip
+
+marking-VoxBeakCoverStripe-beakcover_stripe = Beak Stripe
+marking-VoxBeakCoverStripe = Beak Stripe
+
 marking-TattooVoxHeartLeftArm-heart_l_arm = Vox Left Arm Tattoo (Heart)
 marking-TattooVoxHeartLeftArm = Vox Left Arm Tattoo (Heart)
 
 marking-TattooVoxHeartRightArm-heart_r_arm = Vox Right Arm Tattoo (Heart)
 marking-TattooVoxHeartRightArm = Vox Right Arm Tattoo (Heart)
 
-marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (hive)
-marking-TattooVoxHiveChest = Vox Chest Tattoo (hive)
+marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (Hive)
+marking-TattooVoxHiveChest = Vox Chest Tattoo (Hive)
 
-marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (nightling)
-marking-TattooVoxNightlingChest = Vox Chest Tattoo (nightling)
+marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (Nightling)
+marking-TattooVoxNightlingChest = Vox Chest Tattoo (Nightling)
+
+marking-TattooVoxNightbelt-nightbelt = Vox Stomach Tattoo (Nightling)
+marking-TattooVoxNightbelt = Vox Stomach Tattoo (Nightling)
+
+marking-TattooVoxChestV-night_v = Vox Chest Tattoo (V Shape)
+marking-TattooVoxChestV = Vox Chest Tattoo (V Shape)
+
+marking-TattooVoxUnderbelly-underbelly = Underbelly
+marking-TattooVoxUnderbelly = Underbelly
 
 marking-VoxScarEyeRight-vox_scar_eye_right = Right Eye Scar
 marking-VoxScarEyeRight = Eye Scar (Right)
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
index 0643c5cbd4..ccf1a687b8 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
@@ -13,6 +13,52 @@
         !type:SimpleColoring
         color: "#937e3d"
 
+- type: marking
+  # The cere is the base of the top part of the beak, the cere on this beak, is a square.
+  id: VoxBeakSquareCere
+  bodyPart: Snout
+  markingCategory: Snout
+  forcedColoring: true
+  speciesRestriction: [Vox]
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: beak_squarecere
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#937e3d"
+
+- type: marking
+  id: VoxBeakShaved
+  bodyPart: Snout
+  markingCategory: Snout
+  forcedColoring: true
+  speciesRestriction: [Vox]
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: beak_shaved
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#937e3d"
+
+- type: marking
+  id: VoxBeakHooked
+  bodyPart: Snout
+  markingCategory: Snout
+  forcedColoring: true
+  speciesRestriction: [Vox]
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: beak_hooked
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#937e3d"
+
 - type: marking
   id: VoxLArmScales
   bodyPart: LArm
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
index cf350da60d..75d2503528 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
@@ -54,6 +54,50 @@
   - sprite: Mobs/Customization/vox_tattoos.rsi
     state: nightling_s
 
+- type: marking
+  id: TattooVoxNightbelt
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: nightbelt
+
+- type: marking
+  id: TattooVoxChestV
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: chest_v_1
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: chest_v_2
+
+- type: marking
+  id: TattooVoxUnderbelly
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: underbelly
+
 - type: marking
   id: TattooVoxTailRing
   # TODO // Looks off on some tails (i.e docked/amputated), if conditionals for markings ever get implemented this needs to be updated to account for those.
@@ -130,4 +174,126 @@
   forcedColoring: true
   sprites:
   - sprite: Mobs/Customization/vox_tattoos.rsi
-    state: eyeshadow_large
\ No newline at end of file
+    state: eyeshadow_large
+    
+- type: marking
+  id: VoxTattooEyeliner
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: eyeliner
+
+- type: marking
+  id: VoxBeakCoverStripe
+  bodyPart: Snout
+  markingCategory: SnoutCover
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  speciesRestriction: [Vox]
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: beakcover_stripe
+
+- type: marking
+  id: VoxBeakCoverTip
+  bodyPart: Snout
+  markingCategory: SnoutCover
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  speciesRestriction: [Vox]
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: beakcover_tip
+
+- type: marking
+  id: TattooVoxArrowHead
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: tattoo_arrow_head
+
+- type: marking
+  id: TattooVoxNightlingHead
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: tattoo_nightling_head
+
+- type: marking
+  id: VoxVisage
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: visage
+
+- type: marking
+  id: VoxVisageL
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: visage_l
+
+- type: marking
+  id: VoxVisageR
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: visage_r
+
+- type: marking
+  id: VoxCheek
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: cheekblush
+
diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml
index 1b49ebc776..d01db69e0d 100644
--- a/Resources/Prototypes/Species/vox.yml
+++ b/Resources/Prototypes/Species/vox.yml
@@ -52,6 +52,9 @@
       points: 1
       required: true
       defaultMarkings: [ VoxBeak ]
+    SnoutCover:
+      points: 1
+      required: false
     Arms:
       points: 4
       required: true
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak.png
index 23744679b68c11f339c8c5fb7ab958ab64374cf4..384717ce24a7a1ac49e4ef7dad36abec9bba9ee7 100644
GIT binary patch
delta 352
zcmeBS?q{B0QO_V<;u=vBoS#-wo>-L1;GCLMTv@CTTvD2nnXeF%pPzGZ`NJ9p21Y4Q
z7srr_Id5;C?rkv;XnCk4D9kf)hKH4ql~B{c&M$E@?pnT^^>vFteXIa`z|YB*9=5J6
z^X70eFfg2WH$jSF9mAGui>4U;O`hMsTzbLQZ?zBS3hFUV397#mRV{ZQ`(ys|?XEAF
z3cjz{x^MpKYrkX|Ua~(t*F9aYj@7T_wqD#Ld!Ru;(C~(DB_oIdHWaHsqPh8Ii~iWh
zn^#}|ujb4cmt11}`?Jy+oijN<Uero7>^{CpXVQ|~+q)R9l}=T88~NKVhsm~teMhy&
zr9zolhR-(Mmo9w#?H<?kyzE^iOI!cFpIjjOZpsERgXjr&6-_}jia>nEO1TNb@ls1b
N5}vMpF6*2UngG6zjivwq

delta 349
zcmeBY?qQx_QO{`S>Eakt5%>01E}x5mKtrNgH6PzIadF2-GINe3?&t`;DfoNh3dge5
z`ICEZlx+Fz<GQG+p^brwL!qI;Yr*SXj-o%@9T%4AoqqDzA}rqB`d?t-c3bhTMH&7(
zc5htv>-4ivYZpW@=HA{H^8W9gyO;82RK{MvtYmPUH}U$bSEZlouWPB^RA>O3hn<k)
zklDB1K2Q8yj%%Qg`r|@5b)L8FXFk_->7Tx2_u{&%F~g_Hxh0c3{-j&)Pd`)e?b`0F
z>N{$k%QBa}`dXWR`ERy-r){zDw{`RGdL_(SwooDC_=NX-n{<jli%m#fzc-9^OTiIE
zp#4f4zWuO$Yxu&8a}RsL(ttC<j4T2U3_#+CfW&<X*2mnF9s2GGhK8D|=L_t~X_}zY
gIsNBk6DDgGxk9tWjSOK%stiEj>FVdQ&MBb@0GcJ1wEzGB

diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_hooked.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_hooked.png
new file mode 100644
index 0000000000000000000000000000000000000000..879ceb7bdec66cfd4460ec9a4a9e8ff74573f15b
GIT binary patch
literal 387
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0prCY#
zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I1082LP1978JRyuEdBZL@(u
z%fp3&!8}uEc*Sr=a~^%*X13hr{g)*Ua{`apmoI*Jxb3h}>aurpIDy6&ly6{b&}P{C
zU1zC}{F~2T=diulyI<^|(IM4_psuR--&rPnDS!BvK}jilZ5PMYsQ2s&dj;ygJyW%7
z25JU^9o7-dAo{_(1YQu`u)En5L^HhOy9TC#3XDY-Y@N1ttM}%^{xOgD_uONwOs)De
z$07T{k6H-_mnWNaCN0Um{pDS7&f2HD)=gScd%wN+LHoOg4i8VOzQ-a5Y|c+I`SQPc
t{T`O{a~@wz|1Y_Z31~7li(oD}%PbPjJ%Q`@<((iWc)I$ztaD0e0s!$hm9GE*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_shaved.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_shaved.png
new file mode 100644
index 0000000000000000000000000000000000000000..749be9cfb9e210d1acb78cec9c356e580b5e2474
GIT binary patch
literal 384
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0prCY#
zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I107`Z)N978JRyuEp_x7k3X
z<>5lXV4kTnyy8@M2z4Fot<d*0JKoz_-tyylQ;mUCz0;2m%dX9OH-{5wK|%Qjpc||h
zv(~Qf)m-{AyZ4{va)uzURa@`zKdAh%{cEb=E(R}6-RFPyg`N9p$8bsi&{Tf?xqDdU
zIHud~IbzBIG=hPlVRy4BnDLJ98kpW;9l;D@Jb0JD3!)EfnC|XUZL|AWdiwYOs?Ln_
zlD~BP_#q&8Q7P%ii&_Z>&851hl{{~4Tg#mg8}4~&-}}RA7o7Ju1bIzf^4MY*!?Vh1
nOBOyZuWJGth0m_DZyD<t&fF53kjd#F4YJqM)z4*}Q$iB}_4$n)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_squarecere.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_squarecere.png
new file mode 100644
index 0000000000000000000000000000000000000000..53a2430cfb906fc2026aa253686f182ebd5bf15b
GIT binary patch
literal 392
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0prCY#
zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I107==Au978JRyuG=xu*E>6
z<>6AnK%S``UU8}`gt{DiPjIHkXK=qRllbQ=!8GHlITLGs*4mdRX9CS<C}+=RU|1l$
z;M%Xh30|4Mw!6unQ*D?sDQoR{<_g_^Z~txMh-FwhWm<9F{_t}@Eg3HHADSz!A8W(v
z*K%7g?vVrw$P9)9cMnQ|8DP_ZtUI!67(oIB<r_dgWJtJiT6xjj>+3$=y!yO;@<N97
zhE*<qDg^~EDkc4RQ7hq~xm5SGlIN{$Yq=9*!#ywUdw*E%f^#`g*z;1MOf17^8}CaO
vKK^#EYkFSx?k7uI|2<1qkg>R|1G;CHeqOEAgzbR>ogjstu6{1-oD!M<NX(49

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json
index 143710ad9f..b00bec9bf0 100644
--- a/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant and Flareguy. tail_big tail_short and tail_docked modified from tail by Flareguy, tail_spiked modified from tail by TrixxedHeart",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant, Flareguy, and TrixxedHeart. tail_big tail_short and tail_docked modified from tail by Flareguy, beak_shaved/squarecere/hooked modified from beak and tail_spiked modified from tail by TrixxedHeart",
   "size": {
     "x": 32,
     "y": 32
@@ -11,6 +11,18 @@
       "name": "beak",
       "directions": 4
     },
+    {
+      "name": "beak_squarecere",
+      "directions": 4
+    },
+    {
+      "name": "beak_shaved",
+      "directions": 4
+    },
+    {
+      "name": "beak_hooked",
+      "directions": 4
+    },
     {
       "name": "l_arm",
       "directions": 4
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_stripe.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..875018784b521dd84f01eae0d501d7fd9649588d
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0prCY#
zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{LzRHha1_hE&XXdut=_VFLjc
z$ITPhf6Y!+E=g(U(+LvKFbh<9XuzOcxMpjde;!b|!d^uw28Md3GnV`H!>-=g_Trfy
zW60GXHs<el>AC~u8D8>U1W^!m3=B)mU6_H~hA(XyAmIu31b9L8CFw=7tS{bOy*s^b
z?)x9d*7q^J*<oGq>tCZXP!fw`Mxd}mm9q&0gB;%nwzbD^HyRuhSqw7C)78&qol`;+
E0RK&1;Q#;t

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_tip.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_tip.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff394df8f861a5417a80c5a97d0d7f511a827f54
GIT binary patch
literal 332
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0prCY#
zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{LzRu6w#ThE&XXd-EXgVFdw~
zi%SKAr9+%lb8;`7cqaB#O2%l@kN<rpb(3~ZP&(wN#|YH%iuV$bWMFtVhu_%S{+7~9
zz5~w>9#_&~-cdaz=*-=<Q;OsoZc0DgD4%~!l>@A@p{m&g%=pTd38rC2T#;S^GLd10
zxyNsAhiu)b?D)Nk>*hpeS|6BWT=jk%Q$Y6C*SoeU<**lgmq^xOd@^Ud{oc>q1)NL_
e_{@~$|G;#|^i$*C6AZo}<2_ydT-G@yGywp$X>IKQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/cheekblush.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/cheekblush.png
new file mode 100644
index 0000000000000000000000000000000000000000..5db759fe24ac6686e751f41ee56f012d52078bcf
GIT binary patch
literal 3042
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_1.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9214818db4693c0762ae5db8506df0ca073b807
GIT binary patch
literal 3124
zcmV-449oM0P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004XF*Lt006O%
z3;baP000U%X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJg{rR8!d&htIt?y-<=6ij>f6
zXi@@54ZTQ_E-Enz5K6$103tR-RB%L5k){YTDBysjLy@r}iiH7DvFijGMAUI`6dRUF
zWUU$Bym{}<o8KSzerun-&)sM5eb%}Fko<!M!c15RfDEBn6yfK^h>eS9U<UyV@BjmB
z0N`-5vqBd5Mgo}veAtX^nG^UIy}Aw{`THu<Ka9Zu|DTk(St2n2P?(J8^7z?Y85hYo
zJy)D1w@=BKwlq!7FiOrMS%NZFlXLPcTYUDJWe+*?GK4%C%X7}+W$@(OC*zGd626R)
zU>O(Z2>7`&z9wUXbV-Il#&6`Y8GKGQ04S2&F6MJnWNa;Ck|;8QE#r9r;7G||@X{|>
z%+C|c55>;RS}qbKr-&IQTvLXPlM{>K&(BTgi^a?^4mXV>;xX8n8Ce|RasXz}{8<!v
zZ5gs6JJ>imI52H3ZN4bfe_i~WlJ|C&UW9+{8AKoW!}eExnGFE2re(F+`iE_46#!l9
z0Z_aBhs|Iw0E)7{bq;-T9=d#9QpDmcXDh4R++0fmpKB>E=<oWU4u3;me9uz8-S6dL
zc=MAul5{acUN>%LdZt9g$j;($`3&Zthxi`{{&gM}5&R^+h%b~yM9Zd3AWW9ETgVfL
z1(`yIK=_}U_z%PWq}jQaiQ4!P(3V&Nr6C$XejWfQDiI(Fdt@un?|lo#M+5oIi_w{w
zo%_#%{(V=tO#a9gB!7-$M?^BX5>d|Vn*3S<G#~&)Km+PP8|VWQzy!9y5x4*k-~$3d
zD2N1cU@_o=6p#T#AQu#XwV)W3f~{aDs0MYQ5j2A~a2RxfW8gG62QGojU<BL&QZNpl
zfGO|_%s>!?g~$*UQipUPL&zMmg;<aq<O2mm5l|eI2qi;8NCFi=>!4Do9IA%up=Rh?
z=qPj=x&RGBx1dpI68aT-2O}^EromdU5o`ssU{5#*j)WJ%$?!5bA1;Eoz?E<Vd=T!0
zPs5ks5m*X8fu|9G5D_|}i!c!u!bU=ocq9oCA*+xQqylL`+K?WkAGwN1k*CO86b3~_
zF;GmD3(6lAh2o-?p;n<bqpDE{P@Skg)K%0dY6|rcO-5^?&C$;20CX%m8J&wRMpvMl
z&>iTr=n?cd`V|I)p<|3Oju?MT93~aB0<#&j8`F+Cg&D?-VWzQItUA^l>xvD<a<F1-
zF}4bO5PK4P1v`#?gCpW}aJD#KTs%&QE5udcT5u<DS8x-!8N3qS5bul+#q;pX@n!f%
zd=GvIKaQUvC=-kcu7pTJDq$_5lF&vtOSnsTK_n9Oh)%?CqJX%DSV=rYJWm`Yz9mse
zW+XN#fg~YqA?+ufBHbdrAd|^PWDjyYSxnwSZYG~0-zUFOpek4@1Ss$nRx8vfbShj?
zc&3O~G*t9dT&$R{SfO}CaY*s05?;wjiLJy@TBTH@bX4hv(zG&F*+w~3IYW7~a*Of>
z<wq1O#faiV;Zcex`zU89V^oByPi0fN)OFNG>RIYI4MQ`g1<+DyrL=EogS06Xii({|
zv`U^zjmmKqDIK93(F5q|^fLNk`gQs{RV`IdRle#b)i%{Ds;|}NsClUI)k@Ub)kf6b
zsWa4l)YH_rsduU0(?DsMX@qO!YV6TCtMPOWZH~(v?wpc2hv(eZgf-1HBQ#fN?$aF5
zoYvCT^3%%Fs?s{6^;Da#?V+8jy+iwi_M{F~$4y6|vqR^k&SQoO!;_KDsATjprgSxR
z{dFa}^}2()GkV5)QF?`X?Rxk03HmJkB>f%wz4}uIItC#I1qQ7Kw+-=zEW;GTU55RJ
zuZ@h2VvIHzbs0S}Rx=JT&Npr~zH34@aW`3J(qMAU6l2OVO*7qXdf5y%vo}jIt1%lg
zhs_<#1?IcWhb_<+P8LFo28$a^64R5J!)#@aTGB0pEekEXET35!SjAgyv+B3{Xl-wu
zZrx~o$A)4PXj5p@WAm%6nJw40#`fA=@?77!tLJvleQsxN$G6*KchjC~A7a13zSsVP
zgQJ7Uq0M2^(ZDg$vDWbhi^d9LZDyT!LOXdmt#&%*^w!zIS?qk+`4<<aOPWiI%cFV5
z^Z4@`=Z(4QxpG|VU8Qaew?wzSZc=w$caD35`vVVs51vPp$AqV;XR7Bx&u3oNULvm!
zuh(p6_Dc3CZ^YZryTp6YhvF0EQ|)u#SI;-ux7Byb&)#o^-zk5ze~|w+{~G~X0o;J*
zfT=*oz?Ff0L8PDsLDfMIg3W?O!95{xNMOkJkh}8@=L_d|g@Vw4(Cwl3!i>X~g?%56
z2@eae34a)26HyS+zks@6$%2*zuOhu7%OdYYnM6sVdZQJi6QY}=U&naIl*dS8tzuWk
zUW(I*6U24LW8<Uao8qSz`YhbJa6G|2p*Z3CBI8AQi!LnISe(B2_!7k>oFzvR(TOpM
zEs5_rp_~TJ^wNN(wM(bCZ0;`Z6P^ce2XB(^$}i_nB)KM)Cp}7bP2Qe7nc|*Ok@8f)
z7E}wKr~0SXrM^xJP1~RLDLp2=Jp-4Km~m7{5vB?IGPN`FGKaIwvx>8%%bb_(Ts9>N
z5;bK**^9Ef#WdN^)PTf9vR*Qp<CasC^CmYs_eh>{o-l7<x!Lkf%O~=E^S@q!TESh>
zTcBI8wqSIn=gRt3(5j`YdRObOE?Pal#&6AmwS={4Ykw%TE-Wv6xh`g1Pmxy9nxe7w
ze(PI{6^cd0H#WFzsN0CzDA+i-Y3`<~O&?2mB^OJrODjs>Z{}{k_?699m0x|@lC)*8
z%%N=0R?Jr6*6Z8cw;d=~F3&F?+a9vLa|dHb$&Qyhm+ZVyVOLSNi?B<wOIjIR*<EE&
zwYBPfbxQR}jaN;3t!C|}+Sj{zyRYo=*wa?0RaaW~Zm(eP&3eE3&IY4~ihY=UIr|<q
zMmP3<&HB2zNu#N>>BD~Ee(8aT1AWbo&CM;EEoH56tE6@EV8X%6-*|u1-NtOIZ>P7H
z9s-9XhaP{M`0e$>L5F*fu#U8SXZT%h2eqT56Y5;vIn|ZYCGC#u9zGg)w718lr{jCe
z@An_mJyvsE<#^c%!il02pHAkVoIaIx>gnm^(__6$dheWxJ#(!uyl?Pq(Ao3ne9xWf
z_v}A;-u3*k3(gmgUSwVDy5w-FbHIL};|Kd6ItCpEJBJ*Hx-UCj?irppeBz4xmD5+f
zub#UWaP88_{E^}7QP*$YNVp-r$-DXJR{E{yw{vdK+*xxMeYfPE(!GlNn)e%iH2tw%
z>L5Kn>ODH}V8MesW8ASPKV|>)e!S=*`C-L`&P4Mg+egPHeJ3wJUif(YN!F8@r^P=j
z|6Kdb<k@$>c>FRj6+1QlT=e|YubW?}zu5oM?q%<E*!2BZ8Lwtum%LGbbKouOZU4KN
zcM~(Y@3HSIKbU^#`55%^?x&1TpMC@Pg!B8y(K~nm001CkNK#Dz0D2|>0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01FZT01FZU(%pXi0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R1600BTrL_t(|obB1Mk%KT41khC*
zDuYm6P>1SK9dtpc8i-T_*}vdy4`biWouv;OcsH_{0j(Y&0tGX}CnpF%00Lllphf@!
z5P$&K9jFn20Nw<swc0dI;lIbd(^|6_<I6a|9ses`003~DY^~MyeMd^^bN~QY*VT?=
zJ^z0vy{~|^)(~S1H+cZKWb(lG-QKnhDW!1y-E*yxHQ;#SWs|?>K5+m;Pu|cX*!$jj
z#bbPZ1q2`f0kAtzBLD#iKmhCx)CfQT0uTVZ12qB=fB*!*?m&$I1RwwbuscxG4X`ZB
z<HUKMDZ4`+9fqHPpLUC{h}XC-uK;0(_^~@ZdLg$p;6enq$pik2pp{aPb3O&3lwvt&
zz!BN~D{w1$CV=a;^%)d^00hA9K#c$dAOHcdJ5VD40SG_<><-j?Jir&qw>XeND+Fr*
O0000<MNUMnLSTYY7s_w|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_2.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f8dc43399313ad11a5f639768861c2e9f9c843d
GIT binary patch
literal 3101
zcmZ{mX*kpk!^Qu|2wBI{M7As=#xlt++hCA=8H7d?a)+51SqIto$5JADb{<KVu|#Cg
zGWMFXb0e~gX(*4rzSs4BIOkl~IUjysPrSLQ0SnVLCIA3f43P-Si`4q7%b*Ld@^~_T
z5trPxO|$`^?mx_DF7yDvq~xKiYwl}lpd)0cr>iKhqNoUi%g6%&GCnWU-`a}I6H97W
zYBx`3Pk27|_>m<olBFG)CUaAsk=>{>6%bKGSmO{DX=Rt;(8cg#-LyK9glHOzx~)qP
z#MBcU7hk5~!y3rK`@r3ioCU#?(8mSsq&fFp!b~fWdKO9l@va?X_?03%uBG+fxa354
zGy~0*J%G*=Sj5%W>+n$YX|riVz9e~OgDJf2t*k=7PH#?XCUpVl1<zaTMdShVtfch=
z3fU3DJE*LI$`vD;4Q4edn2gF9jf&Vuz-=>p52Wvf9A~?-sT{(i)FDH@qsy*)tFsa-
z$ts*3Noi;Z@A_p*3%o-d6NxvB(dxsl)<Hr{6#;1atjwCP)k9AhCLIcofUN`qi^#$I
zdlRyD!zAz!Tkq(wgAAu=c^pLC(JCf61Dv=-BAKiw_72OjDka}omj99svFBg%0o+Ju
z_FREpkar?#UzAmp<-A~C9nh&Tr?Z^&lc$-^QDHj}gdnB+7!{h$0=zAAZ6s4;y*#)9
zr!5-uw%@TMXjvfPU56hl;fX+Nh_hwSvb4KY_3W&pF-^f^N!g8EY5{AQ?)?ywWyjp^
zzb*lX8OrH+d0l5EZ?~W_M9;wJGVa%vwSriRAj2O&0UnMs(T+IT=X!{tvb#ceGaK&>
zfaB=1bz-zA1+OS<-G55REt&CODI8;&cC@9!*R(<f0O(B)A;#c`Qe(RW<~{?uUn7a*
z*;#p~q=-KRRP)_G13aQ(DHsC;yqVKt^vA0+2U-OoKu?QqQ;Tnd4%~UEsgt7_U|Xc4
z)rQ7hdV-c;jNnS8K?w13g*O&neI8MRmZ$*v6>=y<D&nr<pJ5gilo@264WTd1(pbu|
z=7&q}F%4_6M@0{?b6dvZg>(n_-$mP{@~zU*>vEX$Kff%dtAnKF*4iqxtl+PT*(`F~
zxVHhtUuy+ebcux)k2tB^K@2zK7|XgG-g0=-*Q3ppFQ-KDb`9>ql?7!Yh@CHRbRq0J
zQD)sQ7dh;hG@q4ogtK#~zD|_m;Q6SplNKP#$RS*v%2`6|q4hOYphU1G0hv}laE}Y5
zrzdZI_c`+?LGI|~*O^7OMT*5$77XTj6?dj=rl9{Y{p2vwfBbr6d~^fAORGZi5@qyJ
zg*ju_H|jSyj+Cj~pvWRjl6=b5u)F-?-1W5ekb1t!6qRU5Uy@5%o!x&`XZW`gSbBZl
zKJb)pVhUyt<_xA+OCdzwSjOX;l<zyLo5o4?*ep8WBycDkxEb=EbDn)SiLLi=Z)o3@
zq94K*dRa52Ko|;6Vtf;Y)Vb*bD@q^JS2k`o4$v0m{26E3gL@s`9Ajswj!-w_7wZtS
zK)Q)4N<I@6_7dKf$P<|pX&1^E)PKn4qi%n9UdLO!KzKpogGJ#@yPKDwdtA0sQ&9X(
zM~i^6IFy3*k+tK0vuf>%0uWD-`<0x|gUI-r9t($3>tek1_n3(WxD8of#acx-u-+%}
zfc{?tF6rL5W!)u<1n4Q$9g4Azsxou6YMJtz(%-b-RA$k=RYpH%=~3E%eH7Us$(@jp
zXVhSnZ<PG$3Ag0+BEE6DjqgWrsteVRs%8VTF|+B|6rWa{ma3|qUaJVK*q=6<`Z}#Y
zHD7saiZC@fMXdC%T$t4I$nuDKy!y|NapmfLJgZmA5dThYx=QT&>`c_{5rrEHs7E`K
z{A0N@6Eg>spC+m%REvLF=e*f2%ByPEJ&igpVYTTuF(|CpT`w8M#4vSdq>WZQJd!WN
z-}d|MC)WD2HL~?qP+yQmP;}6C(8&=aRr<H+@9Wfdsuf5TBn+Yl)qsdB`!UkpT-{DF
zzhi2Xlae1KDPHx1Xuxf6vC54qdEf4MtfTlu$=+=O?K8rK`2;t)HRlyXzM@#KWGr7T
z&j*hkxjsz4);1Cg8{;wM(Mbd)^4;Z}%*gKcbWL%XfJMTXVQta{_7J<?dtUXMMCv0i
zY@YYrBSL@71MnlON0XSt>Y8lW=cc~nuZ{<f3oX^_Pe}xCckh1UH;n&e{y%~bK6G__
z{u3El963-l;xaMbDL-B}vkyw_W5Rg3<@xKV1*+6MRb4xpA$QsT2>J4hm$%ILm2u)w
zabVve<?z~ia?56mkK>k8srMBkg4phD>F?y95*&F-$3|ewH^}IZDz9{}TGuAIJI^?a
z)Uwuo_H;isI+n!td?U5>1dqioga5VK_FX`cl*q(s|4*cOZ1jR;SVLIqx#Bq=jRVbW
z_*!_SR)6P<X9Vq%LVE3KZMKM!2)!;1VH^@YaGct9$g<A7?jId77CyFJbn-E&J2RRf
zn8L`$T+0}C)dg(9KK>!R6+IY{Nnb0{E;1yti^xV8z78tpE(X8ODZbwy(Eq$2iK%&j
z>T^z*j05-h^<!3wS8|rid8yK~EjabAJ4MP%RFM_Ez(g788N1vL3Wc**ELY5cb39%?
z9u~i=Qj`lCJ(>tFZ8R=#_S})#0p~Md8L;WQpJdm~L|epPNN5;6HJQ&>&tA^AOgpgd
z<gsSXFQ=Bzly;ahn|v!cmede$*Pwfumi5FM$x+653U9o12#>8Fu1}~h8OnXR?Wicm
z#Ch9Qmz?;ntyh6enhNhhymN-XTFJD^I22b>JwfLC<jY~vE#w1}A&CRR;Roku4qZ;;
z_X_X5Z9?Nq*FRBh#;QuIgHT(wG7cIYeb|v_jZuvrkHer1GSadkEi!ISW@)zLuU^;v
z4Bfhy$ep0qtEAZMS@A9IEA)$Uv&T+Zm5HEnfEcfFjj@!`0(Q;2gYseo_2NF^YkGt0
z+u<TllI^hV(#+PkS>kmlN`@pW_)XwlyDtOAU@+yS+RGpB&0SCy#KgD8?~ENFj$|iS
z^Tx(af}hb(WHQPmxW;X}?Ca;Yz_!{S`(Gw)%WY5&C*HN_-I1UV)KO4zOadW`pmHjp
zsIPP!HbQM}F)XfZ_}(456#D&H935dKWn={Q3g%jat1j_7K!5BSS_lZ6oa^(f#+DOb
z3ed)i#tMYxP_}<|YsUuv=WR*@!JXpd#n4z>0^W3-SDAh>A-0{eC2;3jKm)PAw0tFa
zX!k^LQp48Q@!tS4<Hz{d-~!XNg4{bV{5HRTU!BCX8wc&?#%uW2$iBz!d5)0}*F#8o
z-%oyM2G0LHt79JJO>utc^rLkZSLxdsTDZb+DyRy&4pNKdk8PDzbJ~IAD}^j4oW7Vu
zwb$mi@!+;62F}u!wk$ql=aJ3A?SpN<Hf*Ui>qK8~(yYBNFM+t4Khd6W`s#!)RN;4>
z)25KdolOnZJ#<&38fLamLeus9DD?e?@GqC%s8Ph>jc*41;sgm<O=n8Lnc+-Ec6qO+
z)Vbs7@G9B=L%<naj$7^aAIGD!$=aOz6(7EwPwcqv;=dgIMnP)boL|1T2=iTpZF!xy
zW%+||wd~gIN@-?=Zv47>w7*lHWL6MLcM^4Y+CQ!qaB(SxFi1-i00<HXfbb{)pk7qr
z8vx)Z2LPLB08q^W0A5^ftA+Z-z=%WI`vL$n=U>rG%!Qs^lzezSJG>Rv4e#&b;|l1y
zdin<X3R&U(9(rJftg%?nuJWZ20HBdHL}*(F<ZgfMVu_Ty675n?zx+|avx|SYo1Yw^
z(Ja)2WAn1Hp%><SiK;wT<6%@QK>FaM{E1<v7e^PU2u}Tbg8{9%NCg1E(F&EW5*AP`
zq%iq%pv>do&DK-ifFpI06=ka26~Wubp_-q*!`>1Hq<GHba>xdGuJ-ReUhUF(au30r
zQ<b99spQzj`U>>E+c9<7Xp47_wyIYXT({i}qPbxBu}%C%{U7E<u_;jUcL&T*giLs}
zj0V3oHMYJnQGvkQ%*to{8UyoT?h5zM=%M`>j>h7q&b0yR5Mw1I5abxoZYxD)e@`pi
kpihCNo}##?+gko#l+qtQSZb3Y&+%WBp`Iz?jSf2Ee@SA!D*ylh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeliner.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeliner.png
new file mode 100644
index 0000000000000000000000000000000000000000..0130ae02b290be65f87b7662af2420c58360c419
GIT binary patch
literal 2981
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
bJRIN+U>DzkwC;S000000NkvXXu0mjfu(yO`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
index 92dbbff751..5e6df07fe2 100644
--- a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy. eyeshadow & tail_ring states by Flareguy, tail_talisman by TrixxedHeart",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy. eyeshadow & tail_ring states by Flareguy. beakcover_stripe, beakcover_tip, cheekblush, chest_v, nightbelt, tail_talisman, tattoo_arrow_head, tattoo_nightling_head (modified from nightling_s), underbelly, visage, visage_l and visage_r by TrixxedHeart",
   "size": {
     "x": 32,
     "y": 32
@@ -23,6 +23,22 @@
       "name": "nightling_s",
       "directions": 4
     },
+    {
+      "name": "nightbelt",
+      "directions": 4
+    },
+    {
+      "name": "chest_v_1",
+      "directions": 4
+    },
+    {
+      "name": "chest_v_2",
+      "directions": 4
+    },
+    {
+      "name": "underbelly",
+      "directions": 4
+    },
     {
       "name": "tail_talisman",
       "directions": 4
@@ -47,9 +63,45 @@
       "name": "eyeshadow_large",
       "directions": 4
     },
+    {
+      "name": "eyeliner",
+      "directions": 4
+    },
+    {
+      "name": "cheekblush",
+      "directions": 4
+    },
     {
       "name": "tail_ring",
       "directions": 4
+    },
+    {
+      "name": "beakcover_tip",
+      "directions": 4
+    },
+    {
+      "name": "beakcover_stripe",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_arrow_head",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_nightling_head",
+      "directions": 4
+    },
+    {
+      "name": "visage",
+      "directions": 4
+    },
+    {
+      "name": "visage_l",
+      "directions": 4
+    },
+    {
+      "name": "visage_r",
+      "directions": 4
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightbelt.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightbelt.png
new file mode 100644
index 0000000000000000000000000000000000000000..7df63a0bc4f16d1464d3947dcf2916dab402ada0
GIT binary patch
literal 3123
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_arrow_head.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_arrow_head.png
new file mode 100644
index 0000000000000000000000000000000000000000..63b097e940ed3760a471808fab37a78b2bb4fe75
GIT binary patch
literal 3035
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_nightling_head.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_nightling_head.png
new file mode 100644
index 0000000000000000000000000000000000000000..d48f4346a2e48966d15514778770b93b4bfd03a4
GIT binary patch
literal 3126
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
Q9smFU07*qoM6N<$g6!<b*8l(j

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/underbelly.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/underbelly.png
new file mode 100644
index 0000000000000000000000000000000000000000..19232451de2dacb87aeda655c57a57985b45ab44
GIT binary patch
literal 3131
zcmV-B48-$^P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004XF*Lt006O%
z3;baP000U%X+uL$b5ch_AW20-HZeIiHZ3wPF#rHaiJg{rR8!d&htIt?y-<=6ij>f6
zXi@@54ZTQ_E-Enz5K6$103tR-RB%L5k){YTDBysjLy@r}iiH7DvFijGMAUI`6dRUF
zWUU$Bym{}<o8KSzerun-&)sM5eb%}Fko<!M!c15RfDEBn6yfK^h>eS9U<UyV@BjmB
z0N`-5vqBd5Mgo}veAtX^nG^UIy}Aw{`THu<Ka9Zu|DTk(St2n2P?(J8^7z?Y85hYo
zJy)D1w@=BKwlq!7FiOrMS%NZFlXLPcTYUDJWe+*?GK4%C%X7}+W$@(OC*zGd626R)
zU>O(Z2>7`&z9wUXbV-Il#&6`Y8GKGQ04S2&F6MJnWNa;Ck|;8QE#r9r;7G||@X{|>
z%+C|c55>;RS}qbKr-&IQTvLXPlM{>K&(BTgi^a?^4mXV>;xX8n8Ce|RasXz}{8<!v
zZ5gs6JJ>imI52H3ZN4bfe_i~WlJ|C&UW9+{8AKoW!}eExnGFE2re(F+`iE_46#!l9
z0Z_aBhs|Iw0E)7{bq;-T9=d#9QpDmcXDh4R++0fmpKB>E=<oWU4u3;me9uz8-S6dL
zc=MAul5{acUN>%LdZt9g$j;($`3&Zthxi`{{&gM}5&R^+h%b~yM9Zd3AWW9ETgVfL
z1(`yIK=_}U_z%PWq}jQaiQ4!P(3V&Nr6C$XejWfQDiI(Fdt@un?|lo#M+5oIi_w{w
zo%_#%{(V=tO#a9gB!7-$M?^BX5>d|Vn*3S<G#~&)Km+PP8|VWQzy!9y5x4*k-~$3d
zD2N1cU@_o=6p#T#AQu#XwV)W3f~{aDs0MYQ5j2A~a2RxfW8gG62QGojU<BL&QZNpl
zfGO|_%s>!?g~$*UQipUPL&zMmg;<aq<O2mm5l|eI2qi;8NCFi=>!4Do9IA%up=Rh?
z=qPj=x&RGBx1dpI68aT-2O}^EromdU5o`ssU{5#*j)WJ%$?!5bA1;Eoz?E<Vd=T!0
zPs5ks5m*X8fu|9G5D_|}i!c!u!bU=ocq9oCA*+xQqylL`+K?WkAGwN1k*CO86b3~_
zF;GmD3(6lAh2o-?p;n<bqpDE{P@Skg)K%0dY6|rcO-5^?&C$;20CX%m8J&wRMpvMl
z&>iTr=n?cd`V|I)p<|3Oju?MT93~aB0<#&j8`F+Cg&D?-VWzQItUA^l>xvD<a<F1-
zF}4bO5PK4P1v`#?gCpW}aJD#KTs%&QE5udcT5u<DS8x-!8N3qS5bul+#q;pX@n!f%
zd=GvIKaQUvC=-kcu7pTJDq$_5lF&vtOSnsTK_n9Oh)%?CqJX%DSV=rYJWm`Yz9mse
zW+XN#fg~YqA?+ufBHbdrAd|^PWDjyYSxnwSZYG~0-zUFOpek4@1Ss$nRx8vfbShj?
zc&3O~G*t9dT&$R{SfO}CaY*s05?;wjiLJy@TBTH@bX4hv(zG&F*+w~3IYW7~a*Of>
z<wq1O#faiV;Zcex`zU89V^oByPi0fN)OFNG>RIYI4MQ`g1<+DyrL=EogS06Xii({|
zv`U^zjmmKqDIK93(F5q|^fLNk`gQs{RV`IdRle#b)i%{Ds;|}NsClUI)k@Ub)kf6b
zsWa4l)YH_rsduU0(?DsMX@qO!YV6TCtMPOWZH~(v?wpc2hv(eZgf-1HBQ#fN?$aF5
zoYvCT^3%%Fs?s{6^;Da#?V+8jy+iwi_M{F~$4y6|vqR^k&SQoO!;_KDsATjprgSxR
z{dFa}^}2()GkV5)QF?`X?Rxk03HmJkB>f%wz4}uIItC#I1qQ7Kw+-=zEW;GTU55RJ
zuZ@h2VvIHzbs0S}Rx=JT&Npr~zH34@aW`3J(qMAU6l2OVO*7qXdf5y%vo}jIt1%lg
zhs_<#1?IcWhb_<+P8LFo28$a^64R5J!)#@aTGB0pEekEXET35!SjAgyv+B3{Xl-wu
zZrx~o$A)4PXj5p@WAm%6nJw40#`fA=@?77!tLJvleQsxN$G6*KchjC~A7a13zSsVP
zgQJ7Uq0M2^(ZDg$vDWbhi^d9LZDyT!LOXdmt#&%*^w!zIS?qk+`4<<aOPWiI%cFV5
z^Z4@`=Z(4QxpG|VU8Qaew?wzSZc=w$caD35`vVVs51vPp$AqV;XR7Bx&u3oNULvm!
zuh(p6_Dc3CZ^YZryTp6YhvF0EQ|)u#SI;-ux7Byb&)#o^-zk5ze~|w+{~G~X0o;J*
zfT=*oz?Ff0L8PDsLDfMIg3W?O!95{xNMOkJkh}8@=L_d|g@Vw4(Cwl3!i>X~g?%56
z2@eae34a)26HyS+zks@6$%2*zuOhu7%OdYYnM6sVdZQJi6QY}=U&naIl*dS8tzuWk
zUW(I*6U24LW8<Uao8qSz`YhbJa6G|2p*Z3CBI8AQi!LnISe(B2_!7k>oFzvR(TOpM
zEs5_rp_~TJ^wNN(wM(bCZ0;`Z6P^ce2XB(^$}i_nB)KM)Cp}7bP2Qe7nc|*Ok@8f)
z7E}wKr~0SXrM^xJP1~RLDLp2=Jp-4Km~m7{5vB?IGPN`FGKaIwvx>8%%bb_(Ts9>N
z5;bK**^9Ef#WdN^)PTf9vR*Qp<CasC^CmYs_eh>{o-l7<x!Lkf%O~=E^S@q!TESh>
zTcBI8wqSIn=gRt3(5j`YdRObOE?Pal#&6AmwS={4Ykw%TE-Wv6xh`g1Pmxy9nxe7w
ze(PI{6^cd0H#WFzsN0CzDA+i-Y3`<~O&?2mB^OJrODjs>Z{}{k_?699m0x|@lC)*8
z%%N=0R?Jr6*6Z8cw;d=~F3&F?+a9vLa|dHb$&Qyhm+ZVyVOLSNi?B<wOIjIR*<EE&
zwYBPfbxQR}jaN;3t!C|}+Sj{zyRYo=*wa?0RaaW~Zm(eP&3eE3&IY4~ihY=UIr|<q
zMmP3<&HB2zNu#N>>BD~Ee(8aT1AWbo&CM;EEoH56tE6@EV8X%6-*|u1-NtOIZ>P7H
z9s-9XhaP{M`0e$>L5F*fu#U8SXZT%h2eqT56Y5;vIn|ZYCGC#u9zGg)w718lr{jCe
z@An_mJyvsE<#^c%!il02pHAkVoIaIx>gnm^(__6$dheWxJ#(!uyl?Pq(Ao3ne9xWf
z_v}A;-u3*k3(gmgUSwVDy5w-FbHIL};|Kd6ItCpEJBJ*Hx-UCj?irppeBz4xmD5+f
zub#UWaP88_{E^}7QP*$YNVp-r$-DXJR{E{yw{vdK+*xxMeYfPE(!GlNn)e%iH2tw%
z>L5Kn>ODH}V8MesW8ASPKV|>)e!S=*`C-L`&P4Mg+egPHeJ3wJUif(YN!F8@r^P=j
z|6Kdb<k@$>c>FRj6+1QlT=e|YubW?}zu5oM?q%<E*!2BZ8Lwtum%LGbbKouOZU4KN
zcM~(Y@3HSIKbU^#`55%^?x&1TpMC@Pg!B8y(K~nm001CkNK#Dz0D2|>0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01FZT01FZU(%pXi0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R1600BoyL_t(|obB4N4TLZZ1<-#}
zAf;lCY?0a{WS)$0b+(Aa7F3p)f-4Tt)yUvO`M-e_2=f#yMDkkK6+P!g00I!ey9U<~
zfB*y_fOie9ApijgK!8&hs;cbgA%wSCMK|XZfT~Ie;dlI4gtIe1RP`8a82tdW)?^&V
zV?56@VvPL&0G;=MEwa7)z(c1$z!`A92gDfBTEoxrkqD;%YOOL1!!cf#1u3O|0Dv#T
ze*V;l2ly#W00Izz00i)^!8HUR009W#U4v@~KmY;|z`F+55P$##Ab@ubuCWG?QVMd;
zm;5F#rAW>hFkFf=1K9Tr+yP*@AHi}42!LAvw)_`BtyNU@vWMSON|6wP*=m$&52&@u
z)yrho_aJ~Jz}5&a1+cz{X%9##0T=HUQB|3y=|6kG6GH$35P$&QHMoWV1Ry})03Z62
VLXZt&dmR7(002ovPDHLkV1m~r&IAAe

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8190e56f2a985e87b110b954b907bf394106354
GIT binary patch
literal 3111
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
B$fE!N

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_l.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_l.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd1dc779158970e64bb6b14ddc111eb181d080b6
GIT binary patch
literal 3045
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_r.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_r.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d13dbea6365dc0120220dc6b9661e0b74ee41a
GIT binary patch
literal 3053
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/head.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/head.png
index 955e6c7b2aaea783dc3135ee59dbe48a8c493142..59379e7d5582e89c2e9f0ae43f46a903e36abc58 100644
GIT binary patch
literal 3351
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

delta 414
zcmV;P0b%}^8m$A68Gi!+005o0f$RVP00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000<JOjJd#uCC3^&Hw-Z<>lr3`}?r4u#S$70001FEo-j;000PdQchF<|NsC0|Nj8q
zgS}Y*000SaNLh0L01FWS01FWTe`H^g0003BNkl<ZSV!%a-G2_lAP7bUfBOD!ybr>b
z32L@1OSXjLMJvit+Y2n$hy0qL2==~WF+Oz*G1}fxsG_+w?I}n;9Sq2?T%BPS=oa?^
zMn2kJ!0=a|Cp=Lw2I^iwm{JcrATgYdpewX_g(pNWZ7aA+hoJBBF^(;q{(>3~`C<tF
z$ajzVE8d+SNPj^JgcPJeNWnJ*D6T~I?!Z92J@^0$tdzfng0wP*%Io^5;0gx=-A8<e
zJq;D;Ex`g0H28u*(g_<K!y?8QI2=9!#w}v_l}c3yH=Yaw0nHAzKlDk`xwke8T0`lF
zBHTWFU%_d6p9Q@yzKgI7Dzm_zk-gwWQjh{61t}2zUKem(H~1fF5-l}or~m)}07*qo
IM6N<$f>+b4p#T5?

diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/l_leg.png
index 918b343f98cbd48568efa1ffcf7065f5ca337965..b7039d11d5360177e78439cbb1958dd77bdaaaba 100644
GIT binary patch
delta 556
zcmZ3$a+76(MLmObiEBhjaDG}zd16s2gL7(5ab>YWa7k%OX1+p5etyou<qvBZ7#N>;
zx;TbZ%z1ljWA7mY3DyV4MLaTtHZbx|a`$LiBy#4#q16|beGr+}ZNSu_CauuuAQt>U
zTVeT&RgX8EfB0^1m)8H!$NO8J`0V-q<NQp41_l<7yNa0{4h;270t%(=OB5LxIUE|U
z$WCfwU{PRT3@Z1SwVlb}*pFT7)D`D@HXLBMC((RCwej~u@ov_><H{`p2j|JNB<#Lh
zrN}a;_{RJ17a3mdYAe>$ICPrfn1uaYKSl;8jw5#(Y|d|tT3cWt({#2{a=~k>daJn?
z>a91LCz#Dn+#9ESzWB`Z`p;h&7!;O%iOObZ*eVtp%F4ds+OM-|%xg`TOt}!%|5%;j
z4rA9MhtN>R)3tLKZf)Bt#@|uM_+@^wOr6DYjjoT3dy0X+z~u=kCWKdko-kauA^Dju
zBb)J_V!p^}e=Fhw80w$T=`XdkI`d(b&1oYB33djheF}y?{0t1|EMwM(zbUiUSUPXs
zZ*{W;uXhzPJP<d3@UiZ|bGA9>(_{3+HI}ON&wi3$%E6Yf_UrcBy1yR&mPoc?(3$SN
zCAWK%&c$tSFPk6NXO76WWtfu6x%O-SwGUHGd>=2JGM~e1<$cx(LBEz|s!o#G=imR~
j%|ph2!YT*$v;SbQO*=MW;f&2P3_#%N>gTe~DWM4fWg_pz

delta 498
zcmcb~vVdiRMLpvsPZ!6KinzD8&i6J22(W#)m?L`3CHuf^PTq<w92qCLMIO%QUdZTU
zk-;vbxRH&2jr>i|p4YDTY)UrY_vV>&;>;d-=IMbg-Ap127+5tN7`Xx(P?-nXxpKDO
zzP4-2#?k}zvg`Ni%9nGl=!m{v8ZFYADPBLLgrVzD)~sXM%sy(uGtWOy>U_Ynp!`pT
z4Hws!o#&o!Zb{TQ{dCi7j_#Oq44ZHI=uP(ypYooMqiMnI&w1O0pKOgd$IyK=Y0C4;
zaBiyvn=-ziCGj27$2W$As-9@yBhR?NRfezqUG}t8vC_X?jXOLibv)bX^(j@9gZ0tm
zWh+n4t*>13T0L)f)Y>&(X)+jYNAl5u)l4%u@5O(v_?NY3Vf}lXV+Ut&1xM@16#kn&
z&6vTgd!od%rhV;;`!{sGW6EP%F#Ef$%+=l`qcx8!!b^l3%1axb+0ONQo3{C-sh&Bb
z#4hG7!a8!+=?&Rmt8BGS7kwya_@}c_mSMun60KXTfg)dDwcUF!WHb5q-+Q<JH_sDo
zoAV=P{dK+Va_skQCS^0$&Odzb({}EOpXCw@7*t#s-{07CNb}Hx+2uQn_e^7&ulRv?
X-iP0to1|)L7=Xaj)z4*}Q$iB}DBRvK

diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/r_leg.png
index 45b1ae82e787cc52d3cb25c2919698f025a287a7..ed2fe24fc548e54608caa32857ba44810f0ed622 100644
GIT binary patch
delta 552
zcmZ3=a+PI*MLmObiEBhjaDG}zd16s2gL7(5ab>YWa7k%OX1+p5etyou<qvBZ7#JUT
zx;TbZ%z1muvFnh52-}1GaZa3FP3AA$zHpQU7Io?D`l=QAL}a1I-Ufk!%hEeuEPJ47
zB&~c{Crz#N*7b|u*H7K^{p-Tk=|`&j%l!^9@El;cVmhIXQKG(qQKDfN+a&`AW*`c<
z?jXgMzyL(Aq&z+cF<gt%U+R;z?=ZuD)(zKwy)5avn<rj+AfWKv&#PIjr=K=Sv}iP(
zO=DJMnNz&DiQ_D{V#3<D{0?56&t(`Ml<jtvy%O#e`}(WY^UswtI5%8N+8Lwd8(h?|
zYhCSS6AKx>9dYab*84g{PP02-%+L_Tbxh*ZGv_Hm_avB?ihTQR`^n~ibwhzi<TQ)9
zev6rRn9KbwSoDu=YEVCazu<z?&6O*^H|QmT+{(6KU84!mM{rMJ@l!)R%Z1dxe}m^S
zW!%2Tt;nG8a`BG!lCli-4EML?F5g-*y(a3yznhkG8Ma)j+kH35Z1zJt#%4wjO~wQn
zhRj)ya@8K}ll242+09Sh7-6HfU|qI}@8@5_0^2r3PFuK2D<!h+@kb7Z=DT7Wul+ii
zB2>!$V7Ci%##;Ha(#ZiLM;Bxlt=$^#1ysmTA*J-oTtOkgL|#asYf**buX%^|R|&pS
d=K1iBLEe4U(g}yBuoyD{fv2mV%Q~loCIFcj?*0G(

delta 503
zcmcc0vXo_lMLpwnPZ!6KinzBo4f~oLMA#lgZd$IOR>f{5r1wzqi<3ze$Ax1Bj2;?K
z*rv@YVB@|s|ILQ9<d1SZC(`Prl8ubt&(CMmoo861;lRih(7+_JfPoc_`6sYZ#ZxM`
z#NYbi{l50RdC#*Rt~@Z|ZPi}0ThR-4)ibWXddejJ{2he}>^E!fhgYv=2w0%ewXGv8
zYOaq3qvat3lR%M~x8JJG`D*OL+Q6g{c71E4-t<>V$vzH!Ccd|qy6<J2_q>#Kla8^Y
zKuym^#kaFgG}=r*eKco#bn~29?l!+lthT<E>vuo<YjUsay1RMlIewWB{a+sVTh}i<
z|Ly*IhHs71ALa({((PM};dCSqoe5>AJ^4Im|NieMb@O_@MBe!-v*o}A#$(O?w}qsG
z(ghlLja3@T^nTU92>kYvdEY8ijstB6JAJO|Zkzr7GG`f^!12OjyZO@7)fM-0Zr;Oq
z>4V;}y>Hoa%nD|I6PH-NKSJl$-Wvv?p*wHP&fu+PKDEi@_1CIfVzvT&?asyf@9*~C
z^E-I&e*q`mlo^}S%8eK*?%Cuuzqld8=j1z^QGjpyG~HCedmAffUr@SnJ!smT#TpKc
b;!OMp=6^Y6^`gv}0SG)@{an^LB{Ts5#Uk71

diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png
index 01259ea03da9b6e767b51424deb45aa4403df789..9896f1e17f14fd35cb06bad87c093a976dce4c6e 100644
GIT binary patch
delta 3525
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

delta 793
zcmV+!1Lpk48?XkDB!2;OQb$4nuFf3k0008&Nkl<Zc%1E;!Hw%65QhIey&i(_!EV91
zAf*e^Mz$Q+;ZzYzJ~%bl2Q26yH}(<`j^5LT$=ceL=93~T#9@ZvXN)`m48t%C!!QiP
zyuvUHKBxV=Y1{UncK+A?6}w#HWm!T9fubnle~mHTT8n9#aDO_Tvii)$7~{ur1OQZ3
z1ppYw5mi+!e0r6?IXCb3djNp7HV#?{0c$Pp_j~+(O)i%U>bgc%RS1Cy?G*mx-0Ymg
z{eH*cZ~y=ZApjtLcg~TVc$KDU{P}#2gRiP8sz7UvrfIU5L6!pMdB%Rf$2`xFQZCxl
z>)Hg{=~77j$$ud$0I37%V5O7`Ij+q-&rtzL0<sBB)A;N4>Wwk+bG=?YMSfKK-uq}b
z_(HXxl>_jI_VZeI&TTdebzLtM5aeIiHL1Vs004keDh^mm38fUtIECZ!2q|Sugkk9&
zk4I8}SpjI<)+?njj^iTnjpGQV6nQg}L)Udc^6U?JAb+&ylC6Lc@sRkQGxFLv=g@Us
zl)jV_UDuHx!Pz?}V~p?nezECs&Os?f+KEwU+txqZr|v+>4ySTod;9wn?K2F+Fbu;m
z48t%C!!W;<Z+RuAltSP4o4uL}Z>Rgdk8M=jq`E*TlPjfAmL;sUly2U_T8q?&Endk3
zkHHVa;D3!V@oJ3m-uq3;V`*tD^<fwWPYD7^0eH-S5CVPQ$71REd?uBsUnP{sLv_0E
z`*=QqN_GHFr_*klriJ0>a{1b%)#)%1)YB<%DPWo=lw}EQcs3xlRhA{DY1&o+0U-p!
zc_C}<<_ZWiAAF!fIv|0^nH;TkRKhe(nCBTEAAcXKJqjOv`!v`>2wW}~@&u3+5E32|
zC1|ZTQGt{aTI<Ekhr~#Mtblo*<JuEK;C8!FyUONvyS<(L1LOdNHHai3YOUXP=qt3=
z@km^1pUPWF&{~V4D0bnP+-|p9eJdPn91aH*MX^gKVpBHTdcMF<@`Yg-hG7`y*YF8+
XG!oke)WJuA00000NkvXXu0mjf)$n`k


From e841cb9fc6e470b791db5bd43e2ffd3a054766da Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 23:15:18 +0000
Subject: [PATCH 075/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ecfa489faa..dfc6676b72 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Minty642
-  changes:
-  - message: Added fungal soil, maintenance version of hydroponics.
-    type: Add
-  id: 8545
-  time: '2025-05-21T04:59:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36245
 - author: metalgearsloth
   changes:
   - message: Picking up items with area pickups (e.g. trash bags) no longer lags the
@@ -3954,3 +3947,14 @@
   id: 9047
   time: '2025-10-07T19:36:32.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40761
+- author: TrixxedHeart
+  changes:
+  - message: 'Added new markings for Vox: 3 new beak types, 2 beak markings, 1 overlay
+      6 head, and 3 chest markings.'
+    type: Add
+  - message: Fixed sprite layering issue where a Vox's back leg would appear on top
+      of their front leg in side sprites.
+    type: Fix
+  id: 9048
+  time: '2025-10-07T23:14:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40569

From 63c17b151d46953de6f57347ccaad749e1354c95 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Tue, 7 Oct 2025 19:26:56 -0400
Subject: [PATCH 076/216] Added the golden shaker (playtime reward for
 Bartenders) (#40762)

* Added a golden shaker (playtime reward for Bartenders)

* Removed redundant icon line
---
 .../en-US/preferences/loadout-groups.ftl      |   1 +
 .../Consumable/Drinks/drinks_special.yml      |  15 ++++++++++++
 .../Loadouts/Jobs/Civilian/bartender.yml      |  19 +++++++++++++++
 .../Prototypes/Loadouts/loadout_groups.yml    |   7 ++++++
 .../Prototypes/Loadouts/role_loadouts.yml     |   1 +
 .../Drinks/shaker_gold.rsi/icon.png           | Bin 0 -> 715 bytes
 .../Drinks/shaker_gold.rsi/inhand-left.png    | Bin 0 -> 525 bytes
 .../Drinks/shaker_gold.rsi/inhand-right.png   | Bin 0 -> 534 bytes
 .../Drinks/shaker_gold.rsi/meta.json          |  22 ++++++++++++++++++
 9 files changed, 65 insertions(+)
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/meta.json

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index 077462e73b..452b726ee2 100644
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -43,6 +43,7 @@ loadout-group-passenger-neck = Passenger neck
 loadout-group-bartender-head = Bartender head
 loadout-group-bartender-jumpsuit = Bartender jumpsuit
 loadout-group-bartender-outerclothing = Bartender outer clothing
+loadout-group-bartender-shaker = Bartender shaker
 
 loadout-group-chef-head = Chef head
 loadout-group-chef-mask = Chef mask
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index b9929b6704..931620b665 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -137,6 +137,21 @@
     reactionTypes:
     - Shake
 
+- type: entity
+  parent: DrinkShaker
+  id: DrinkShakerGold
+  name: golden shaker
+  description: A gold-plated shaker given as a token of appreciation for years of service. It doesn't make the drinks taste any different.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/shaker_gold.rsi
+  - type: Item
+    sprite: Objects/Consumable/Drinks/shaker_gold.rsi
+  - type: PhysicalComposition
+    materialComposition:
+      Gold: 10 # Gold plated, not solid gold
+      Steel: 40
+
 - type: entity
   parent: [DrinkBaseMaterialMetal, DrinkBase]
   id: DrinkJigger
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
index c8c80c7895..b8a8744915 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
@@ -1,3 +1,12 @@
+- type: loadoutEffectGroup
+  id: SeniorBar
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobBartender
+      time: 52h # 1 hour per week for 1 year
+
 # Head
 - type: loadout
   id: BartenderHead
@@ -40,3 +49,13 @@
   id: BartenderWintercoat
   equipment:
     outerClothing: ClothingOuterWinterBar
+
+# Misc
+- type: loadout
+  id: BartenderGoldenShaker
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorBar
+  storage:
+    back:
+    - DrinkShakerGold
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 085fcb5bbf..59e57739ce 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -270,6 +270,13 @@
   - BartenderApron
   - BartenderWintercoat
 
+- type: loadoutGroup
+  id: BartenderGoldenShaker
+  name: loadout-group-bartender-shaker
+  minLimit: 0
+  loadouts:
+  - BartenderGoldenShaker
+
 - type: loadoutGroup
   id: ChefHead
   name: loadout-group-chef-head
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index f0a782361c..30b1cb17d2 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -61,6 +61,7 @@
   - BartenderJumpsuit
   - CommonBackpack
   - BartenderOuterClothing
+  - BartenderGoldenShaker
   - Glasses
   - Survival
   - Trinkets
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff1cc87098887a2c9b490f0ae0782b7e8ae8258d
GIT binary patch
literal 715
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUN
zo@GwnEjyr^ZK)BSX`Y^13>-iXD}xjxD+42t<pspjP&UXl8jQ?faV8+!kdcW&07ypx
zab`OUSUd~J27v@12I+^<XqGZCGcZhGXJ7%UFfcMUU|aw(6{Lf80mP&!KsE?40nK3o
zs|>QV0J5OE3=IrGvOebzc&PSYUjVeN%G1R$B*Oje)Qwq(93&d{Us0895)eG7n{v^S
z>Doq*xCNVKe=)S$xy3K)zp(D@s{)JLO~Jc5W_x>zvB!4FUJ|Jm-TQyb)F$~m1>fa&
zzW;aU?{kf%7Aoq$4#YoxGl?-@KtKHV=5<A3zttkr4@e(5t<$X2{86Iq@O&q=2+oS;
zikmrMA8S9<ayY*zSr9YLJA#v8PMFq~{HiVIrA=msW^J8hca&qJ!^Uda``-)iPO{)m
zVzevw7de=5#K!mQ29Ajig&(#}Of}eTe!9s67~c#2|M2?%&5?hi%6lKRpEAKNr3-%i
zzx+~~Ve-lEKVBX3WV-kC+b)H33=TK41meDOG}T;Ov~%4bpi4wr*0O!A`nvk2g3yf8
zsgqSIf0-xFs$0Ue|6t$&uY`Ha45S=Io`x2(uVJ}1apsg0rX8$icUz7=iY;N@Ab7+4
zzrRA?<85}!l8u%-e397r>ErV3d0!<C9F<LH@LDNuyNz!n1Dmx;tW0!ct&$z{?`IkX
cA{ILius?fW((D#xSr3X4Pgg&ebxsLQ0NJ|kE&u=k

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7d28288a51555190a133344d82d53d158ec62a5
GIT binary patch
literal 525
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`212l#}zo^4|Izfa@aYSGOZKp_SNyT2AdinS!jFZe$YF#O)e7Yr2OEbxdd
zW?<ku48n}Z^H-z*1tm&cBT9nv(@M${i&7Z^5;OBk^!!{y6ioFD^(=GpZrK6VY)g&s
zO!M^AV&DK7%OJ(b%D@O@c>%FBlnrvZ1|u_AoC(M_WMpCx0Mb!FoY~F-7S95*K_CH$
zLHc1dnxzatzfWLiU;(NyFfuk^TmUf@q=R(<#H1-eHV7~Q&0zwo46?KUvY@&Q4GciC
zKIad3sP<o90Ax<^ba4!caDRL4AXkF{5A%g}um9I?zB1dlEi6!A((FW=V|vFPC9V;>
z%ONm9a05fn)-6vOc#q$zNjS+kJ8ko{iK>=9jPmcc@|2gYR}I)LV&$;*TMS#09z)HH
z?F}>DXy}SNs57youyCB<_@Nq*?j+vu_5w?RbqV7QKJ$i4GWO@2ZZG6~u>OBBLz<KH
d3PA;h&5Tc!?8RT0hs^=G)6><@Wt~$(69B`3hL`{V

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a03626d8b0e29b33222feaa551966010c56fdc63
GIT binary patch
literal 534
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`212l#}zo^4|Iwp#T6K8?*8Kp}>8<*)UC6l+P4U+{k*VEDa_FBmAmS>O>_
z%)r2R7=#&*=dVZs3QCl?MwA5Sr<If^7Ns%-BxdH7==r&ZD46OQ>RIOG-LeC!*_ImN
znda%K#lQhFmO+Y<m4Ok+@&aOMC>!K*4Mt|LI1`X<$jHPX0HmXUIJ2DvES?2qgFpfh
zgY?5_G)ozPexJb3zyefZU}S8-xBy}*NC)czh)Gj`Y!F}qn!^NE8DwbzWI=Tq8W@0N
zea;{7Q0>3I0LYx_>Eaj?;r@1-BVU672g~$p|M%aVu*IP|Lm}%?;&YZX>syn%Un|~_
z4_Vm2)Y_!sa8GoxnN!rY2DOKKi(fdLms}8d|Cxf&UUdcEBj&Tcnl}855IA!7_%m_q
z%l1NF-uyJ3wfh?*mqvib0*8eU+MAp_CDyQWsU~iE_F45{#N(fn5^_EsZz}OL_*U^t
n-o7$AK!daSFZZbchsGl2UC#C*F%hEuAP0N8`njxgN@xNAiN=v_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/meta.json
new file mode 100644
index 0000000000..3a5c625df4
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "icon taken from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi ; inhand sprites made by Failed (Discord: greetings_). Color adjustments by Hitlinemoss.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

From 86b1be88dd93ccd59872328ffbad4528ed8c72fa Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 7 Oct 2025 23:38:51 +0000
Subject: [PATCH 077/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index dfc6676b72..c5e5f417f9 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: Picking up items with area pickups (e.g. trash bags) no longer lags the
-      game.
-    type: Fix
-  id: 8546
-  time: '2025-05-21T06:16:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37638
 - author: Errant
   changes:
   - message: High-energy shuttle impacts now deal much less damage.
@@ -3958,3 +3950,11 @@
   id: 9048
   time: '2025-10-07T23:14:11.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40569
+- author: Hitlinemoss
+  changes:
+  - message: Bartenders with a significant amount of playtime can now select a golden
+      shaker in the loadout menu.
+    type: Add
+  id: 9049
+  time: '2025-10-07T23:37:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40762

From 33cd3df45ae1ca64defbbd39cb541e22a7cdbc4c Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Wed, 8 Oct 2025 04:40:44 +0200
Subject: [PATCH 078/216] Change Energy Shotgun to fit as a Warden weapon
 (#40757)

* Initial commit

* Fix toggle mode name and also miscalculated charge times oops
---
 .../Objects/Weapons/Guns/Battery/battery_guns.yml  | 14 ++++++--------
 .../Weapons/Guns/Projectiles/projectiles.yml       |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 008c177aa5..2f2ebfa5fd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -839,24 +839,22 @@
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
   - type: ProjectileBatteryAmmoProvider
-    proto: BulletLaserSpread
-    fireCost: 150
+    proto: BulletLaserSpreadNarrow
+    fireCost: 80
   - type: BatteryWeaponFireModes
     fireModes:
-    - proto: BulletLaserSpread
-      fireCost: 150
     - proto: BulletLaserSpreadNarrow
-      fireCost: 200
+      fireCost: 80
     - proto: BulletDisablerSmgSpread
-      fireCost: 120
+      fireCost: 48
   - type: Item
     size: Large
     sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
     heldPrefix: energy
   - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Battery
-    maxCharge: 1200
-    startingCharge: 1200
+    maxCharge: 480
+    startingCharge: 480
 
 - type: entity
   name: energy magnum
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 080f73bdb7..d3e07c2e1b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1305,7 +1305,7 @@
     spread: 30
 
 - type: entity
-  name: narrow laser barrage
+  name: lethal laser barrage
   id: BulletLaserSpreadNarrow
   categories: [ HideSpawnMenu ]
   parent: BulletLaser

From 694fd0628ff7ea23cb2f86611a69f89085a9ee29 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 Oct 2025 02:52:31 +0000
Subject: [PATCH 079/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c5e5f417f9..b308b05667 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Errant
-  changes:
-  - message: High-energy shuttle impacts now deal much less damage.
-    type: Tweak
-  id: 8547
-  time: '2025-05-21T10:37:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37578
 - author: metalgearsloth
   changes:
   - message: Shuttle impact force is now proportional to direction of impact.
@@ -3958,3 +3951,11 @@
   id: 9049
   time: '2025-10-07T23:37:43.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40762
+- author: SlamBamActionman
+  changes:
+  - message: The Energy Shotgun no longer has a self-recharge or wide fire mode, but
+      charges faster in rechargers.
+    type: Tweak
+  id: 9050
+  time: '2025-10-08T02:51:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40757

From 3f115fa1d48e3da132119fb5f96ed8a776559a1a Mon Sep 17 00:00:00 2001
From: Archee <archee3@hotmail.co.uk>
Date: Wed, 8 Oct 2025 12:19:17 +0100
Subject: [PATCH 080/216] Fix- Cobras killing adders (#37424)

* fixed

* adds SimpleHostile to SpaceAdder (the stealth snake)

* whoops i branched this off a branch not master

This reverts commit fe1562581f91a113950cfedd284a1790e51a48e6.
---
 Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 58c4e9c22b..ba8ee70b1a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -393,6 +393,7 @@
   - type: NpcFactionMember
     factions:
     - Xeno
+    - SimpleHostile
   - type: MeleeWeapon
     angle: 0
     animation: WeaponArcBite

From 44563dafdcef0294f4f4e82359223603571c5353 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 Oct 2025 11:31:38 +0000
Subject: [PATCH 081/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b308b05667..50f5f2e149 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: Shuttle impact force is now proportional to direction of impact.
-    type: Tweak
-  id: 8548
-  time: '2025-05-21T13:32:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37667
 - author: muburu
   changes:
   - message: Singularity beacons and powersinks now require two free hands to hold.
@@ -3959,3 +3952,10 @@
   id: 9050
   time: '2025-10-08T02:51:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40757
+- author: archee1
+  changes:
+  - message: Space Cobras no longer attack Space Adders automatically.
+    type: Fix
+  id: 9051
+  time: '2025-10-08T11:30:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37424

From 0c9d33d5d6e4a355188185ae0fa4fdcf287857e5 Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Wed, 8 Oct 2025 22:43:59 +1000
Subject: [PATCH 082/216] Cleanup warnings: CS0414, CS8524 (#40776)

* Cleanup

* CS8524
---
 .../GameTicking/Commands/SetGamePresetCommand.cs       |  2 --
 Content.Server/Holopad/HolopadSystem.cs                |  2 --
 .../Systems/SurveillanceCameraSystem.cs                |  2 --
 Content.Shared/Humanoid/HumanoidCharacterAppearance.cs | 10 ++++++----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
index 6114a4ca0d..10ec2a5e9b 100644
--- a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
@@ -4,7 +4,6 @@ using Content.Server.GameTicking.Presets;
 using Content.Shared.Administration;
 using Linguini.Shared.Util;
 using Robust.Shared.Console;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.GameTicking.Commands
 {
@@ -12,7 +11,6 @@ namespace Content.Server.GameTicking.Commands
     public sealed class SetGamePresetCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entity = default!;
-        [Dependency] private readonly IPrototypeManager _prototype = default!;
 
         public string Command => "setgamepreset";
         public string Description => Loc.GetString("set-game-preset-command-description", ("command", Command));
diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index 0cba4824db..5a4f4d93ce 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -9,7 +9,6 @@ using Content.Shared.Holopad;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Labels.Components;
 using Content.Shared.Mobs;
-using Content.Shared.Mobs.Systems;
 using Content.Shared.Power;
 using Content.Shared.Silicons.StationAi;
 using Content.Shared.Speech;
@@ -40,7 +39,6 @@ public sealed class HolopadSystem : SharedHolopadSystem
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly PvsOverrideSystem _pvs = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
 
     private float _updateTimer = 1.0f;
     private const float UpdateTime = 1.0f;
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
index 7e275c78ce..70d9c8ae93 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Administration.Logs;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Shared.ActionBlocker;
 using Content.Shared.Database;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
@@ -17,7 +16,6 @@ namespace Content.Server.SurveillanceCamera;
 public sealed class SurveillanceCameraSystem : SharedSurveillanceCameraSystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
     [Dependency] private readonly ViewSubscriberSystem _viewSubscriberSystem = default!;
     [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
     [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
diff --git a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
index 583341c815..a9dd6d8755 100644
--- a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
+++ b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
@@ -100,6 +100,7 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
         {
             SkinColorationStrategyInput.Unary => skinColoration.FromUnary(speciesPrototype.DefaultHumanSkinTone),
             SkinColorationStrategyInput.Color => skinColoration.ClosestSkinColor(speciesPrototype.DefaultSkinTone),
+            _ => skinColoration.ClosestSkinColor(speciesPrototype.DefaultSkinTone),
         };
 
         return new(
@@ -109,11 +110,11 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
             Color.Black,
             Color.Black,
             skinColor,
-            new ()
+            new()
         );
     }
 
-    private static IReadOnlyList<Color> RealisticEyeColors = new List<Color>
+    private static IReadOnlyList<Color> _realisticEyeColors = new List<Color>
     {
         Color.Brown,
         Color.Gray,
@@ -145,7 +146,7 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
 
         // TODO: Add random markings
 
-        var newEyeColor = random.Pick(RealisticEyeColors);
+        var newEyeColor = random.Pick(_realisticEyeColors);
 
         var protoMan = IoCManager.Resolve<IPrototypeManager>();
         var skinType = protoMan.Index<SpeciesPrototype>(species).SkinColoration;
@@ -155,9 +156,10 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
         {
             SkinColorationStrategyInput.Unary => strategy.FromUnary(random.NextFloat(0f, 100f)),
             SkinColorationStrategyInput.Color => strategy.ClosestSkinColor(new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1)),
+            _ => strategy.ClosestSkinColor(new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1)),
         };
 
-        return new HumanoidCharacterAppearance(newHairStyle, newHairColor, newFacialHairStyle, newHairColor, newEyeColor, newSkinColor, new ());
+        return new HumanoidCharacterAppearance(newHairStyle, newHairColor, newFacialHairStyle, newHairColor, newEyeColor, newSkinColor, new());
 
         float RandomizeColor(float channel)
         {

From 68b3c7a5206d63c3590f3c2be36d6df909cd161e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Wed, 8 Oct 2025 08:48:00 -0500
Subject: [PATCH 083/216] Clean up bucket.yml (#40772)

SMASH that bucket

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Drinks/drinks_base_materials.yml          | 28 +++++++++++
 .../Entities/Objects/Tools/bucket.yml         | 46 ++-----------------
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
index 7db03edbf5..43df992b2a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
@@ -117,6 +117,34 @@
     materialComposition:
       Plastic: 25
 
+# Strong plastic
+- type: entity
+  abstract: true
+  parent: DrinkBaseMaterialPlastic
+  id: DrinkBaseMaterialStrongPlastic
+  components:
+  - type: Destructible
+    thresholds:
+    - trigger: # Overkill threshold
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 20 # can take a few more hits than basic plastic
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalCrunch # TODO a plastic break collection
+      - !type:SpillBehavior { }
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 100
+
 # Fragile cardboard
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
index c62b178366..3c95afe69e 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -1,22 +1,13 @@
 - type: entity
-  parent: DrinkBase
+  parent: [ DrinkBaseMaterialStrongPlastic, DrinkBase, DrinkVisualsFill ]
   id: Bucket
   name: bucket
   description: It's a boring old bucket.
   components:
-  - type: Clickable
   - type: Edible
-    edible: Drink
-    solution: bucket
-    destroyOnEmpty: false
     utensil: Spoon
   - type: Sprite
     sprite: Objects/Tools/bucket.rsi
-    layers:
-    - state: icon
-    - map: ["enum.SolutionContainerLayers.Fill"]
-      state: fill-1
-      visible: false
   - type: Item
     size: Normal
   - type: Clothing
@@ -26,50 +17,23 @@
     quickEquip: false
   - type: SolutionContainerManager
     solutions:
-      bucket:
+      drink:
         maxVol: 250
-  - type: MixableSolution
-    solution: bucket
   - type: SolutionTransfer
     transferAmount: 100
     maxTransferAmount: 100
     minTransferAmount: 10
-    canChangeTransferAmount: true
-  - type: UserInterface
-    interfaces:
-      enum.TransferAmountUiKey.Key:
-        type: TransferAmountBoundUserInterface
-  - type: MeleeWeapon
-    soundNoDamage:
-      path: "/Audio/Effects/Fluids/splat.ogg"
-    damage:
-      types:
-        Blunt: 0
-  - type: Spillable
-    solution: bucket
   - type: SpillWhenWorn
-    solution: bucket
-  - type: DrawableSolution
-    solution: bucket
-  - type: RefillableSolution
-    solution: bucket
-  - type: DrainableSolution
-    solution: bucket
-  - type: SolutionItemStatus
-    solution: bucket
-  - type: Appearance
+    solution: drink
   - type: SolutionContainerVisuals
     maxFillLevels: 3
-    fillBaseName: fill-
-  - type: ExaminableSolution
-    solution: bucket
+    inHandsFillBaseName: null
   - type: Tag
     tags:
       - Bucket
   - type: PhysicalComposition
     materialComposition:
       Plastic: 50
-  - type: DnaSubstanceTrace
 
 - type: entity
   parent: Bucket
@@ -79,5 +43,5 @@
   components:
   - type: SolutionContainerManager
     solutions:
-      bucket:
+      drink:
         maxVol: 500

From 532564e05fab1e85d3e00b20f87b0cd6e86c5cc6 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 Oct 2025 13:59:45 +0000
Subject: [PATCH 084/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 50f5f2e149..4011609fb1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: muburu
-  changes:
-  - message: Singularity beacons and powersinks now require two free hands to hold.
-    type: Tweak
-  id: 8549
-  time: '2025-05-21T17:11:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37683
 - author: ElectroJr
   changes:
   - message: Microwaving the nuke disk will now slightly randomize the nuke countdown
@@ -3959,3 +3952,10 @@
   id: 9051
   time: '2025-10-08T11:30:29.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/37424
+- author: aada
+  changes:
+  - message: Buckets are now destructible.
+    type: Tweak
+  id: 9052
+  time: '2025-10-08T13:58:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40772

From 91aa169784a59ff446cb4487cd134e6f95171342 Mon Sep 17 00:00:00 2001
From: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com>
Date: Wed, 8 Oct 2025 14:57:55 +0100
Subject: [PATCH 085/216] Slightly re-nerf zombification speed (#37445)

Initial Commit
---
 Content.Shared/Zombies/PendingZombieComponent.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Zombies/PendingZombieComponent.cs b/Content.Shared/Zombies/PendingZombieComponent.cs
index b199edeb00..310f731e07 100644
--- a/Content.Shared/Zombies/PendingZombieComponent.cs
+++ b/Content.Shared/Zombies/PendingZombieComponent.cs
@@ -17,7 +17,7 @@ public sealed partial class PendingZombieComponent : Component
     {
         DamageDict = new ()
         {
-            { "Poison", 0.4 },
+            { "Poison", 0.3 },
         }
     };
 
@@ -34,7 +34,7 @@ public sealed partial class PendingZombieComponent : Component
     /// The amount of time left before the infected begins to take damage.
     /// </summary>
     [DataField("gracePeriod"), ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan GracePeriod = TimeSpan.Zero;
+    public TimeSpan GracePeriod = TimeSpan.FromMinutes(2);
 
     /// <summary>
     /// The minimum amount of time initial infected have before they start taking infection damage.

From 4f93089e4240c2ec72684357ba95392fc49196a4 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 Oct 2025 14:12:08 +0000
Subject: [PATCH 086/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 4011609fb1..2343c65dfd 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: ElectroJr
-  changes:
-  - message: Microwaving the nuke disk will now slightly randomize the nuke countdown
-      timer.
-    type: Add
-  id: 8550
-  time: '2025-05-21T18:06:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36114
 - author: AsnDen
   changes:
   - message: Cyborgs now can scream. 9 new screaming sound were added.
@@ -3959,3 +3951,11 @@
   id: 9052
   time: '2025-10-08T13:58:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40772
+- author: UpAndLeaves
+  changes:
+  - message: Zombie infections now take approximately three minutes longer to bring
+      a fully healed person to critical condition.
+    type: Tweak
+  id: 9053
+  time: '2025-10-08T14:11:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37445

From 41c7229b9dda4ebbf426288d15fd199645cda482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Wed, 8 Oct 2025 09:14:49 -0500
Subject: [PATCH 087/216] cleanup and reorganize belts.yml (#40773)

commit discipline? Never heard of it

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Entities/Clothing/Belt/belts.yml          | 642 ++----------------
 .../Prototypes/Entities/Clothing/Belt/job.yml | 422 ++++++++++++
 .../Entities/Clothing/Belt/quiver.yml         |  28 -
 .../Entities/Clothing/Belt/simple.yml         |  44 ++
 Resources/migration.yml                       |   3 +
 5 files changed, 522 insertions(+), 617 deletions(-)
 create mode 100644 Resources/Prototypes/Entities/Clothing/Belt/job.yml
 delete mode 100644 Resources/Prototypes/Entities/Clothing/Belt/quiver.yml
 create mode 100644 Resources/Prototypes/Entities/Clothing/Belt/simple.yml

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 5273fa1453..d114136a04 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -1,529 +1,4 @@
-# Belts that need/have visualizers
-
-- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltUtility
-  name: utility belt
-  description: Can hold various things.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/utility.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/utility.rsi
-  - type: Storage
-    maxItemSize: Normal
-    # Don't add more than absolutely needed to this whitelist!
-    # Utility belts shouldn't just be free extra storage.
-    # This is only intended for basic engineering equipment.
-    whitelist:
-      tags:
-        - Powerdrill
-        - Wirecutter
-        - Crowbar
-        - Screwdriver
-        - Flashlight
-        - Wrench
-        - GeigerCounter
-        - Flare
-        - CableCoil
-        - CigPack
-        - Radio
-        - HolofanProjector
-        - Multitool
-        - AppraisalTool
-        - JawsOfLife
-        - GPS
-        - WeldingMask
-        - RemoteSignaller
-        - UtilityKnife
-      components:
-        - StationMap
-        - SprayPainter
-        - SprayPainterAmmo
-        - NetworkConfigurator
-        - RCD
-        - RCDAmmo
-        - Welder
-        - PowerCell
-        - Geiger
-        - TrayScanner
-        - GasAnalyzer
-        - HandLabeler
-  - type: ItemMapper
-    mapLayers:
-      drill:
-        whitelist:
-          tags:
-          - Powerdrill
-      cutters_red:
-        whitelist:
-          tags:
-          - Wirecutter
-      crowbar:
-        whitelist:
-          tags:
-          - Crowbar
-      crowbar_red:
-        whitelist:
-          tags:
-          - CrowbarRed
-      jaws:
-        whitelist:
-          tags:
-          - JawsOfLife
-      screwdriver_nuke:
-        whitelist:
-          tags:
-          - Screwdriver
-      wrench:
-        whitelist:
-          tags:
-          - Wrench
-      multitool:
-        whitelist:
-          tags:
-            - Multitool
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-  - type: Tag
-    tags:
-    - UtilityBelt
-    - WhitelistChameleon
-
-- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltChiefEngineer
-  name: chief engineer's toolbelt
-  description: Holds tools, looks snazzy.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/ce.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/ce.rsi
-  - type: Storage
-    grid:
-    - 0,0,9,1
-    # TODO: Fill this out more.
-    whitelist:
-      tags:
-        - Wirecutter
-        - Crowbar
-        - Screwdriver
-        - Flashlight
-        - Wrench
-        - GeigerCounter
-        - Flare
-        - CableCoil
-        - Powerdrill
-        - JawsOfLife
-        - CigPack
-        - Radio
-        - HolofanProjector
-        - Multitool
-        - AppraisalTool
-        - UtilityKnife
-      components:
-        - StationMap
-        - SprayPainter
-        - SprayPainterAmmo
-        - NetworkConfigurator
-        - RCD
-        - RCDAmmo
-        - Welder
-        - Flash
-        - Handcuff
-        - PowerCell
-        - Geiger
-        - TrayScanner
-        - GasAnalyzer
-  - type: ItemMapper
-    mapLayers:
-      drill:
-        whitelist:
-          tags:
-          - Powerdrill
-      cutters_red:
-        whitelist:
-          tags:
-          - Wirecutter
-      crowbar:
-        whitelist:
-          tags:
-          - Crowbar
-      crowbar_red:
-        whitelist:
-          tags:
-          - CrowbarRed
-      jaws:
-        whitelist:
-          tags:
-          - JawsOfLife
-      screwdriver_nuke:
-        whitelist:
-          tags:
-          - Screwdriver
-      multitool:
-        whitelist:
-          tags:
-            - Multitool
-      wrench:
-        whitelist:
-          tags:
-          - Wrench
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-  - type: StealTarget
-    stealGroup: ChiefEngineerToolBelt
-
-- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltAssault
-  name: assault belt
-  description: A tactical assault belt.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/assault.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/assault.rsi
-  - type: Storage
-    whitelist:
-      tags:
-        - CigPack
-        - Taser
-      components:
-        - Stunbaton
-        - FlashOnTrigger
-        - SmokeOnTrigger
-        - Flash
-        - Handcuff
-        - BallisticAmmoProvider
-        - Ammo
-  - type: ItemMapper
-    mapLayers:
-      flashbang:
-        whitelist:
-          components:
-          - FlashOnTrigger
-      stunbaton:
-        whitelist:
-          components:
-          - Stunbaton
-      tear_gas_grenade:
-        whitelist:
-          components:
-          - SmokeOnTrigger
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-
-- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltJanitor
-  name: janibelt
-  description: A belt used to hold most janitorial supplies.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/janitor.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/janitor.rsi
-  - type: Storage
-    whitelist:
-      tags:
-        - Wrench
-        - Bottle
-        - Spray
-        - Soap
-        - Flashlight
-        - CigPack
-        - TrashBag
-        - WetFloorSign
-        - HolosignProjector
-        - Plunger
-        - GoldenPlunger
-        - WireBrush
-      components:
-        - LightReplacer
-        - SmokeOnTrigger
-    maxItemSize: Large
-  - type: ItemMapper
-    mapLayers:
-      bottle:
-        whitelist:
-          tags:
-          - Bottle
-      bottle_spray:
-        whitelist:
-          tags:
-          - Spray
-      wrench:
-        whitelist:
-          tags:
-          - Wrench
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-
-- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltMedical
-  name: medical belt
-  description: Can hold various medical equipment.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/medical.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/medical.rsi
-  - type: Storage
-    whitelist:
-      tags:
-        - Wrench
-        - Bottle
-        - Spray
-        - Brutepack
-        - Bloodpack
-        - Gauze
-        - Ointment
-        - CigPack
-        - PillCanister
-        - Radio
-        - DiscreteHealthAnalyzer
-        - SurgeryTool
-        - Dropper
-      components:
-        - Hypospray
-        - Injector
-        - Pill
-        - HandLabeler
-  - type: ItemMapper
-    mapLayers:
-      bottle:
-        whitelist:
-          tags:
-          - Bottle
-      hypo:
-        whitelist:
-          components:
-          - Hypospray
-      pill:
-        whitelist:
-          components:
-          - Pill
-          tags:
-          - PillCanister
-      bottle_spray:
-        whitelist:
-          tags:
-          - Spray
-      # spray_med:
-      #   whitelist:
-      #     tags:
-      #     - SprayMedical
-      # wrench_medical:
-      #   whitelist:
-      #     tags:
-      #     - WrenchMedical
-      wrench:
-        whitelist:
-          tags:
-          - Wrench
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-
-- type: entity
-  parent: ClothingBeltMedical
-  id: ClothingBeltMedicalEMT
-  name: EMT belt
-  description: Perfect for holding various equipment for medical emergencies.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/emt.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/emt.rsi
-
-- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltPlant
-  name: botanical belt
-  description: A belt used to hold most hydroponics supplies. Suprisingly, not green.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/plant.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/plant.rsi
-  - type: Storage
-    whitelist:
-      tags:
-        # - PlantAnalyzer
-        - PlantSampleTaker
-        - BotanyShovel
-        - BotanyHoe
-        - BotanyHatchet
-        - PlantSampleTaker
-        - PlantBGone
-        - Bottle
-        - Syringe
-        - CigPack
-        - Dropper
-      components:
-        - Seed
-        - Smokable
-        - HandLabeler
-  - type: ItemMapper
-    mapLayers:
-      hatchet:
-        whitelist:
-          tags:
-          - BotanyHatchet
-      # hydro:
-      #   whitelist:
-      #     tags:
-      #     - PlantAnalyzer # Dunno what to put here, should be aight.
-      hoe:
-        whitelist:
-          tags:
-          - BotanyHoe
-      secateurs: # We don't have secateurs and this looks similar enough.
-        whitelist:
-          tags:
-          - BotanyShovel
-      plantbgone:
-        whitelist:
-          tags:
-          - PlantBGone
-      bottle:
-        whitelist:
-          tags:
-          - Bottle
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-
-- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltChef
-  name: chef belt
-  description: A belt used to hold kitchen knives and condiments for quick access.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/chef.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/chef.rsi
-  - type: Storage
-    whitelist:
-      tags:
-        - KitchenKnife
-        - Cleaver
-        - RollingPin
-        - Coldsauce
-        - Enzyme
-        - Hotsauce
-        - Ketchup
-        - BBQsauce
-        - SaltShaker
-        - PepperShaker
-        - CigPack
-        - Packet
-        - Skewer
-        - MonkeyCube
-        - Mayo
-      components:
-        - Mousetrap
-        - Smokable
-        - Utensil
-  - type: ItemMapper
-    mapLayers:
-      kitchenknife:
-        whitelist:
-          tags:
-          - KitchenKnife
-      cleaver:
-        whitelist:
-          tags:
-          - Cleaver
-      rollingpin:
-        whitelist:
-          tags:
-          - RollingPin
-      coldsauce:
-        whitelist:
-          tags:
-          - Coldsauce
-      enzyme:
-        whitelist:
-          tags:
-          - Enzyme
-      hotsauce:
-        whitelist:
-          tags:
-          - Hotsauce
-      ketchup:
-        whitelist:
-          tags:
-          - Ketchup
-      bbqsauce:
-        whitelist:
-          tags:
-          - BBQsauce
-      saltshaker:
-        whitelist:
-          tags:
-          - SaltShaker
-      peppershaker:
-        whitelist:
-          tags:
-          - PepperShaker
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-
-- type: entity
-  parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseSecurityContraband]
-  id: ClothingBeltSecurity
-  name: security belt
-  description: Can hold security gear like handcuffs and flashes.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/security.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/security.rsi
-  - type: ExplosionResistance
-    damageCoefficient: 0.9
-  - type: Storage
-    whitelist:
-      tags:
-        - CigPack
-        - Taser
-        - SecBeltEquip
-        - Radio
-        - Sidearm
-        - MagazinePistol
-        - MagazineMagnum
-        - CombatKnife
-        - Truncheon
-        - HandGrenade
-      components:
-        - Stunbaton
-        - FlashOnTrigger
-        - SmokeOnTrigger
-        - Flash
-        - Handcuff
-        - BallisticAmmoProvider
-        - CartridgeAmmo
-        - DoorRemote
-        - Whistle
-        - BalloonPopper
-  - type: ItemMapper
-    mapLayers:
-      flashbang:
-        whitelist:
-          components:
-          - FlashOnTrigger
-      stunbaton:
-        whitelist:
-          components:
-          - Stunbaton
-      tear_gas_grenade:
-        whitelist:
-          components:
-          - SmokeOnTrigger
-    sprite: Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
+## Belts that need/have visualizers
 
 - type: entity
   parent: [ClothingBeltBase, ClothingSlotBase, BaseCommandContraband]
@@ -557,7 +32,36 @@
           - CaptainSabre
   - type: Appearance
 
-# Belts without visualizers
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltQuiver
+  name: quiver
+  description: Can hold up to 15 arrows, and fits snug around your waist.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/quiver.rsi
+    layers:
+    - state: icon
+    - map: [ "enum.StorageContainerVisualLayers.Fill" ]
+      visible: false
+  - type: Clothing
+  - type: Storage
+    grid:
+    - 0,0,7,3
+    maxItemSize: Small
+    whitelist:
+      tags:
+      - Arrow
+      - Plunger
+  - type: Appearance
+  - type: StorageContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: fill-
+  - type: Construction
+    graph: Quiver
+    node: Quiver
+
+## Belts without visualizers
 
 - type: entity
   parent: [ClothingBeltAmmoProviderBase, BaseSecurityBartenderContraband]
@@ -578,19 +82,24 @@
     capacity: 14
 
 - type: entity
-  parent: ClothingBeltBase
-  id: ClothingBeltChampion
-  name: championship belt
-  description: Proves to the world that you are the strongest!
+  parent: [ ClothingBeltStorageBase, BaseMagicalContraband ]
+  id: ClothingBeltWand
+  name: wand belt
+  description: A belt designed to hold various rods of power. A veritable fanny pack of exotic magic.
   components:
   - type: Sprite
-    sprite: Clothing/Belt/champion.rsi
+    sprite: Clothing/Belt/wand.rsi
   - type: Clothing
-    sprite: Clothing/Belt/champion.rsi
-    quickEquip: true
-  - type: Tag
-    tags:
-    - Kangaroo
+    sprite: Clothing/Belt/wand.rsi
+  - type: Storage
+    grid:
+    - 0,0,15,1
+    whitelist:
+      tags:
+      - WizardWand
+      - WhitelistChameleon
+
+## Holsters
 
 - type: entity
   parent: ClothingBeltStorageBase
@@ -616,20 +125,22 @@
     sprite: Clothing/Belt/syndieholster.rsi
   - type: Clothing
     sprite: Clothing/Belt/syndieholster.rsi
-  - type: Item
-    size: Ginormous
   - type: Storage
     maxItemSize: Huge
     grid:
     - 0,0,3,3
     whitelist:
       components:
-        - Gun
-        - BallisticAmmoProvider
-        - CartridgeAmmo
+      - Gun
+      - BallisticAmmoProvider
+      - CartridgeAmmo
   - type: StaticPrice
     price: 500
 
+## Webbing
+
+# Weirdly the only webbing with a storage whitelist and item mapper.
+# Might be worth making less common (armory only?) and removing the whitelist to eliminate the inconsistency.
 - type: entity
   parent: ClothingBeltSecurity
   id: ClothingBeltSecurityWebbing
@@ -688,50 +199,3 @@
     sprite: Clothing/Belt/militarywebbingmed.rsi
   - type: Clothing
     sprite: Clothing/Belt/militarywebbingmed.rsi
-  - type: Item
-    size: Huge
-  - type: ExplosionResistance
-    damageCoefficient: 0.1
-
-- type: entity
-  parent: ClothingBeltBase
-  id: ClothingBeltSuspendersRed
-  name: red suspenders
-  description: For holding your pants up.
-  components:
-  - type: Tag
-    tags:
-    - MimeBelt
-  - type: Sprite
-    sprite: Clothing/Belt/suspenders_red.rsi
-    state: icon
-  - type: Clothing
-    sprite: Clothing/Belt/suspenders_red.rsi
-    quickEquip: true
-
-- type: entity
-  parent: ClothingBeltSuspendersRed
-  id: ClothingBeltSuspendersBlack
-  name: black suspenders
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/suspenders_black.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/suspenders_black.rsi
-
-- type: entity
-  parent: [ ClothingBeltStorageBase, BaseMagicalContraband ]
-  id: ClothingBeltWand
-  name: wand belt
-  description: A belt designed to hold various rods of power. A veritable fanny pack of exotic magic.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/wand.rsi
-  - type: Clothing
-    sprite: Clothing/Belt/wand.rsi
-  - type: Storage
-    grid:
-    - 0,0,15,1
-    whitelist:
-      tags:
-      - WizardWand
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/job.yml b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
new file mode 100644
index 0000000000..9f170017f5
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
@@ -0,0 +1,422 @@
+# Belts meant to be used by a specific job to hold their tools
+
+- type: entity
+  abstract: true
+  parent: ClothingBeltStorageBase
+  id: BaseClothingBeltEngineering
+  components:
+  - type: Storage
+    # Don't add more than absolutely needed to this whitelist!
+    # Utility belts shouldn't just be free extra storage.
+    # This is only intended for basic engineering equipment.
+    whitelist:
+      tags:
+      - Powerdrill
+      - Wirecutter
+      - Crowbar
+      - Screwdriver
+      - Flashlight
+      - Wrench
+      - GeigerCounter
+      - Flare
+      - CableCoil
+      - CigPack
+      - Radio
+      - HolofanProjector
+      - Multitool
+      - AppraisalTool
+      - JawsOfLife
+      - GPS
+      - WeldingMask
+      - RemoteSignaller
+      - UtilityKnife
+      components:
+      - StationMap
+      - SprayPainter
+      - SprayPainterAmmo
+      - NetworkConfigurator
+      - RCD
+      - RCDAmmo
+      - Welder
+      - PowerCell
+      - Geiger
+      - TrayScanner
+      - GasAnalyzer
+      - HandLabeler
+  - type: ItemMapper
+    sprite: &BeltOverlay Clothing/Belt/belt_overlay.rsi
+    mapLayers:
+      drill:
+        whitelist:
+          tags:
+          - Powerdrill
+      cutters_red:
+        whitelist:
+          tags:
+          - Wirecutter
+      crowbar:
+        whitelist:
+          tags:
+          - Crowbar
+      crowbar_red:
+        whitelist:
+          tags:
+          - CrowbarRed
+      jaws:
+        whitelist:
+          tags:
+          - JawsOfLife
+      screwdriver_nuke:
+        whitelist:
+          tags:
+          - Screwdriver
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
+      multitool:
+        whitelist:
+          tags:
+          - Multitool
+  - type: Appearance
+
+- type: entity
+  parent: BaseClothingBeltEngineering
+  id: ClothingBeltUtility
+  name: utility belt
+  description: Can hold various things.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/utility.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/utility.rsi
+  - type: Tag
+    tags:
+    - UtilityBelt
+    - WhitelistChameleon
+
+- type: entity
+  parent: BaseClothingBeltEngineering
+  id: ClothingBeltChiefEngineer
+  name: chief engineer's toolbelt
+  description: Holds tools, looks snazzy.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/ce.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/ce.rsi
+  - type: Storage
+    grid:
+    - 0,0,9,1
+  - type: StealTarget
+    stealGroup: ChiefEngineerToolBelt
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltJanitor
+  name: janibelt
+  description: A belt used to hold most janitorial supplies.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/janitor.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/janitor.rsi
+  - type: Storage
+    maxItemSize: Large
+    whitelist:
+      tags:
+      - Wrench
+      - Bottle
+      - Spray
+      - Soap
+      - Flashlight
+      - CigPack
+      - TrashBag
+      - WetFloorSign
+      - HolosignProjector
+      - Plunger
+      - GoldenPlunger
+      - WireBrush
+      components:
+      - LightReplacer
+      - SmokeOnTrigger
+  - type: ItemMapper
+    sprite: *BeltOverlay
+    mapLayers:
+      bottle:
+        whitelist:
+          tags:
+          - Bottle
+      bottle_spray:
+        whitelist:
+          tags:
+          - Spray
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
+  - type: Appearance
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltMedical
+  name: medical belt
+  description: Can hold various medical equipment.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/medical.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/medical.rsi
+  - type: Storage
+    whitelist:
+      tags:
+      - Wrench
+      - Bottle
+      - Spray
+      - Brutepack
+      - Bloodpack
+      - Gauze
+      - Ointment
+      - CigPack
+      - PillCanister
+      - Radio
+      - DiscreteHealthAnalyzer
+      - SurgeryTool
+      - Dropper
+      components:
+      - Hypospray
+      - Injector
+      - Pill
+      - HandLabeler
+  - type: ItemMapper
+    sprite: *BeltOverlay
+    mapLayers:
+      bottle:
+        whitelist:
+          tags:
+          - Bottle
+      hypo:
+        whitelist:
+          components:
+          - Hypospray
+      pill:
+        whitelist:
+          components:
+          - Pill
+          tags:
+          - PillCanister
+      bottle_spray:
+        whitelist:
+          tags:
+          - Spray
+      # spray_med:
+      #   whitelist:
+      #     tags:
+      #     - SprayMedical
+      # wrench_medical:
+      #   whitelist:
+      #     tags:
+      #     - WrenchMedical
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
+  - type: Appearance
+
+- type: entity
+  parent: ClothingBeltMedical
+  id: ClothingBeltMedicalEMT
+  name: EMT belt
+  description: Perfect for holding various equipment for medical emergencies.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/emt.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/emt.rsi
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltPlant
+  name: botanical belt
+  description: A belt used to hold most hydroponics supplies. Suprisingly, not green.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/plant.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/plant.rsi
+  - type: Storage
+    whitelist:
+      tags:
+      # - PlantAnalyzer
+      - PlantSampleTaker
+      - BotanyShovel
+      - BotanyHoe
+      - BotanyHatchet
+      - PlantSampleTaker
+      - PlantBGone
+      - Bottle
+      - Syringe
+      - CigPack
+      - Dropper
+      components:
+      - Seed
+      - Smokable
+      - HandLabeler
+  - type: ItemMapper
+    sprite: *BeltOverlay
+    mapLayers:
+      hatchet:
+        whitelist:
+          tags:
+          - BotanyHatchet
+      # hydro:
+      #   whitelist:
+      #     tags:
+      #     - PlantAnalyzer # Dunno what to put here, should be aight.
+      hoe:
+        whitelist:
+          tags:
+          - BotanyHoe
+      secateurs: # We don't have secateurs and this looks similar enough.
+        whitelist:
+          tags:
+          - BotanyShovel
+      plantbgone:
+        whitelist:
+          tags:
+          - PlantBGone
+      bottle:
+        whitelist:
+          tags:
+          - Bottle
+  - type: Appearance
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltChef
+  name: chef belt
+  description: A belt used to hold kitchen knives and condiments for quick access.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/chef.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/chef.rsi
+  - type: Storage
+    whitelist:
+      tags:
+      - KitchenKnife
+      - Cleaver
+      - RollingPin
+      - Coldsauce
+      - Enzyme
+      - Hotsauce
+      - Ketchup
+      - BBQsauce
+      - SaltShaker
+      - PepperShaker
+      - CigPack
+      - Packet
+      - Skewer
+      - MonkeyCube
+      - Mayo
+      components:
+      - Mousetrap
+      - Smokable
+      - Utensil
+  - type: ItemMapper
+    sprite: *BeltOverlay
+    mapLayers:
+      kitchenknife:
+        whitelist:
+          tags:
+          - KitchenKnife
+      cleaver:
+        whitelist:
+          tags:
+          - Cleaver
+      rollingpin:
+        whitelist:
+          tags:
+          - RollingPin
+      coldsauce:
+        whitelist:
+          tags:
+          - Coldsauce
+      enzyme:
+        whitelist:
+          tags:
+          - Enzyme
+      hotsauce:
+        whitelist:
+          tags:
+          - Hotsauce
+      ketchup:
+        whitelist:
+          tags:
+          - Ketchup
+      bbqsauce:
+        whitelist:
+          tags:
+          - BBQsauce
+      saltshaker:
+        whitelist:
+          tags:
+          - SaltShaker
+      peppershaker:
+        whitelist:
+          tags:
+          - PepperShaker
+  - type: Appearance
+
+- type: entity
+  parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseSecurityContraband]
+  id: ClothingBeltSecurity
+  name: security belt
+  description: Can hold security gear like handcuffs and flashes.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/security.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/security.rsi
+  - type: ExplosionResistance
+    damageCoefficient: 0.9
+  - type: Storage
+    whitelist:
+      tags:
+      - CigPack
+      - Taser
+      - SecBeltEquip
+      - Radio
+      - Sidearm
+      - MagazinePistol
+      - MagazineMagnum
+      - CombatKnife
+      - Truncheon
+      - HandGrenade
+      components:
+      - Stunbaton
+      - FlashOnTrigger
+      - SmokeOnTrigger
+      - Flash
+      - Handcuff
+      - BallisticAmmoProvider
+      - CartridgeAmmo
+      - DoorRemote
+      - Whistle
+      - BalloonPopper
+  - type: ItemMapper
+    sprite: *BeltOverlay
+    mapLayers:
+      flashbang:
+        whitelist:
+          components:
+          - FlashOnTrigger
+      stunbaton:
+        whitelist:
+          components:
+          - Stunbaton
+      tear_gas_grenade:
+        whitelist:
+          components:
+          - SmokeOnTrigger
+  - type: Appearance
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/quiver.yml b/Resources/Prototypes/Entities/Clothing/Belt/quiver.yml
deleted file mode 100644
index bb4e395c4f..0000000000
--- a/Resources/Prototypes/Entities/Clothing/Belt/quiver.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltQuiver
-  name: quiver
-  description: Can hold up to 15 arrows, and fits snug around your waist.
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/quiver.rsi
-    layers:
-    - state: icon
-    - map: [ "enum.StorageContainerVisualLayers.Fill" ]
-      visible: false
-  - type: Clothing
-  - type: Storage
-    grid:
-    - 0,0,7,3
-    maxItemSize: Small
-    whitelist:
-      tags:
-      - Arrow
-      - Plunger
-  - type: Appearance
-  - type: StorageContainerVisuals
-    maxFillLevels: 3
-    fillBaseName: fill-
-  - type: Construction
-    graph: Quiver
-    node: Quiver
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/simple.yml b/Resources/Prototypes/Entities/Clothing/Belt/simple.yml
new file mode 100644
index 0000000000..c1c9861f9f
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Belt/simple.yml
@@ -0,0 +1,44 @@
+# For cosmetic belts parenting off ClothingBeltBase
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltChampion
+  name: championship belt
+  description: Proves to the world that you are the strongest!
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/champion.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/champion.rsi
+    quickEquip: true
+  - type: Tag
+    tags:
+    - Kangaroo # Kangaroo wearable. Dare to challenge the champ?
+    - WhitelistChameleon
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltSuspendersRed
+  name: red suspenders
+  description: For holding your pants up.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/suspenders_red.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Belt/suspenders_red.rsi
+    quickEquip: true
+  - type: Tag
+    tags:
+    - MimeBelt
+    - WhitelistChameleon
+
+- type: entity
+  parent: ClothingBeltSuspendersRed
+  id: ClothingBeltSuspendersBlack
+  name: black suspenders
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/suspenders_black.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/suspenders_black.rsi
diff --git a/Resources/migration.yml b/Resources/migration.yml
index ea991259ed..d05795def4 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -725,3 +725,6 @@ PrefilledSyringe: Syringe
 # 2025-10-6
 BibleTanakh: null
 BibleSatanic: null
+
+# 2025-10-8
+ClothingBeltAssault: ClothingBeltMilitaryWebbing

From 7cdd8cb2a9755cfb0e6ddaf133578c2ea0b679df Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Wed, 8 Oct 2025 16:50:23 +0200
Subject: [PATCH 088/216] Add disclaimer about AI generated content to
 Readme.md (#39334)

* Add disclaimer about AI generated content to Readme.md

* Update README.md

* rephrase
---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 400c25c6f9..2e88d9f547 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,15 @@ Just make sure your changes and pull requests are in accordance with the [contri
 
 We are not currently accepting translations of the game on our main repository. If you would like to translate the game into another language, consider creating a fork or contributing to a fork.
 
+## AI-generated contributions disclaimer
+This project does not accept low-effort or wholesale AI-generated contributions. Examples include, but are not limited to:
+
+- Any code (including yaml) generated by tools like GitHub Copilot, ChatGPT, or similar.
+- AI-created artwork, sound files, or other assets.
+- Auto-generated documentation, issue reports or pull request descriptions.
+
+Exceptions to this are simple tools like Rider's single-line completion feature.
+
 ## Building
 
 1. Clone this repo:

From 92082f80914856cc608817d0449afb7430af99ab Mon Sep 17 00:00:00 2001
From: YoungThug <ramialanbagy@gmail.com>
Date: Wed, 8 Oct 2025 07:59:36 -0700
Subject: [PATCH 089/216] Fix the temperature gun not reflecting and going
 through windows  (#37581)

* Fix Temp Gun

* Fix mask, muzzle flash

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
---
 .../Weapons/Guns/Projectiles/projectiles.yml      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index d3e07c2e1b..a853282d0b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -398,7 +398,7 @@
     - state: omnilaser
       shader: unshaded
   - type: Ammo
-    muzzleFlash: null
+    muzzleFlash: MuzzleFlashEffectOmnilaser
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -408,7 +408,8 @@
           bounds: "-0.2,-0.2,0.2,0.2"
         hard: false
         mask:
-        - Opaque
+        - Impassable
+        - BulletImpassable
       fly-by: *flybyfixture
   - type: Projectile
     #   soundHit:  Waiting on serv3
@@ -427,6 +428,9 @@
   parent: WatcherBolt
   categories: [ HideSpawnMenu ]
   components:
+  - type: Reflective
+    reflective:
+    - Energy
   - type: Projectile
     #   soundHit:  Waiting on serv3
     impactEffect: BulletImpactEffectDisabler
@@ -441,7 +445,7 @@
 - type: entity
   name: magmawing watcher bolt
   id: WatcherBoltMagmawing
-  parent: BaseBullet
+  parent: WatcherBolt
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
@@ -450,6 +454,8 @@
     - state: omnilaser_greyscale
       shader: unshaded
       color: orangered
+  - type: Ammo
+    muzzleFlash: MuzzleFlashEffectHeavyLaser
   - type: Projectile
     #   soundHit:  Waiting on serv3
     impactEffect: BulletImpactEffectOrangeDisabler
@@ -465,6 +471,9 @@
   parent: WatcherBoltMagmawing
   categories: [ HideSpawnMenu ]
   components:
+  - type: Reflective
+    reflective:
+    - Energy
   - type: Projectile
     #   soundHit:  Waiting on serv3
     impactEffect: BulletImpactEffectOrangeDisabler

From 2a5a72d5bd556c3edfb76c6b49e24e20009e5ff6 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 Oct 2025 15:11:27 +0000
Subject: [PATCH 090/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2343c65dfd..f9527fc182 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: AsnDen
-  changes:
-  - message: Cyborgs now can scream. 9 new screaming sound were added.
-    type: Tweak
-  id: 8551
-  time: '2025-05-21T19:49:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32329
 - author: ScarKy0
   changes:
   - message: The "Help another traitor" objective now requires you help them complete
@@ -3959,3 +3952,15 @@
   id: 9053
   time: '2025-10-08T14:11:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/37445
+- author: YoungThugSS14
+  changes:
+  - message: The temperature gun bolts now count as energy projectiles for the sake
+      of reflection.
+    type: Tweak
+  - message: The temperature gun's cold projectile can no longer pass through windows.
+    type: Fix
+  - message: The temperature gun now has color-appropriate muzzle flashes.
+    type: Fix
+  id: 9054
+  time: '2025-10-08T15:10:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37581

From 1b62863e52f129dcc88386b508afbb41c741966b Mon Sep 17 00:00:00 2001
From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Thu, 9 Oct 2025 04:03:12 +1300
Subject: [PATCH 091/216] Fix: Allow energy shotgun lethal projectiles to hit
 holos (#37920)

BulletLaser opaque mask
---
 .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index a853282d0b..49b9989730 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1292,6 +1292,7 @@
           bounds: "-0.15,-0.3,0.15,0.3"
         hard: false
         mask:
+        - Opaque
         - Impassable
         - BulletImpassable
       fly-by: *flybyfixture

From e7f1d67df0f1e463e60dbe5b76f428a44ae0cb2b Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 Oct 2025 15:24:10 +0000
Subject: [PATCH 092/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f9527fc182..f4e96d076d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,15 +1,4 @@
 Entries:
-- author: ScarKy0
-  changes:
-  - message: The "Help another traitor" objective now requires you help them complete
-      all of their objectives.
-    type: Tweak
-  - message: The "Help another traitor" objective now updates it's progress according
-      to the progress of who you're supposed to help, allowing for partial completion.
-    type: Tweak
-  id: 8552
-  time: '2025-05-21T20:45:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37679
 - author: PJB3005
   changes:
   - message: Significantly reduced video memory usage of the parallax system.
@@ -3964,3 +3953,10 @@
   id: 9054
   time: '2025-10-08T15:10:19.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/37581
+- author: K-Dynamic
+  changes:
+  - message: Energy shotgun lethal projectiles can now hit holo mobs.
+    type: Fix
+  id: 9055
+  time: '2025-10-08T15:23:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37920

From f80f3223571bfd6cacbb2b22b63902508c4184cb Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Wed, 8 Oct 2025 11:37:34 -0400
Subject: [PATCH 093/216] Added folders and clipboards to trinkets tab (#39920)

* Added folders to trinkets tab

* Fixed loadout grouping

* Added plastic clipboards to trinkets

* Whoops, forgot to create BoxFolderPlasticClipboardThreePapers prototype

* Added regular clipboards as trinkets (1 hour of command required)

* Reduced folder bloat
---
 .../Entities/Objects/Misc/folders.yml         | 52 ++++++++++++++++++-
 .../Loadouts/Miscellaneous/trinkets.yml       | 25 +++++++++
 .../Prototypes/Loadouts/loadout_groups.yml    |  3 ++
 3 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/folders.yml b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
index 632a27324a..9991709bcf 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/folders.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
@@ -83,7 +83,7 @@
 
 - type: entity
   abstract: true
-  id: BoxFolderFillThreePapers # Like BoxFolderFill, but always has exactly three sheets of standard paper; use for roles' startingGear
+  id: BoxFolderFillThreePapers # Like BoxFolderFill, but always has exactly three sheets of standard paper; use for things that should always be consistent, e.g roundstart items
   suffix: 3 papers
   components:
   - type: StorageFill
@@ -95,6 +95,10 @@
   parent: [BoxFolderBaseEmpty, BoxFolderFill]
   id: BoxFolderBase
 
+- type: entity
+  parent: [BoxFolderBaseEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderBaseThreePapers
+
 - type: entity
   parent: BoxFolderBaseEmpty
   id: BoxFolderRedEmpty
@@ -111,6 +115,11 @@
   id: BoxFolderRed
   suffix: Red, Filled
 
+- type: entity
+  parent: [BoxFolderRedEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderRedThreePapers
+  suffix: Red, 3 papers
+
 - type: entity
   parent: BoxFolderBaseEmpty
   id: BoxFolderBlueEmpty
@@ -127,6 +136,11 @@
   id: BoxFolderBlue
   suffix: Blue, Filled
 
+- type: entity
+  parent: [BoxFolderBlueEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderBlueThreePapers
+  suffix: Blue, 3 papers
+
 - type: entity
   parent: BoxFolderBaseEmpty
   id: BoxFolderYellowEmpty
@@ -143,6 +157,11 @@
   id: BoxFolderYellow
   suffix: Yellow, Filled
 
+- type: entity
+  parent: [BoxFolderYellowEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderYellowThreePapers
+  suffix: Yellow, 3 papers
+
 - type: entity
   parent: BoxFolderBaseEmpty
   id: BoxFolderGreyEmpty
@@ -159,6 +178,11 @@
   id: BoxFolderGrey
   suffix: Grey, Filled
 
+- type: entity
+  parent: [BoxFolderGreyEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderGreyThreePapers
+  suffix: Grey, 3 papers
+
 - type: entity
   parent: BoxFolderBaseEmpty
   id: BoxFolderBlackEmpty
@@ -175,6 +199,11 @@
   id: BoxFolderBlack
   suffix: Black, Filled
 
+- type: entity
+  parent: [BoxFolderBlackEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderBlackThreePapers
+  suffix: Black, 3 papers
+
 - type: entity
   parent: BoxFolderBaseEmpty
   id: BoxFolderGreenEmpty
@@ -191,6 +220,11 @@
   id: BoxFolderGreen
   suffix: Green, Filled
 
+- type: entity
+  parent: [BoxFolderGreenEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderGreenThreePapers
+  suffix: Green, 3 papers
+
 - type: entity
   parent: BoxFolderBaseEmpty
   id: BoxFolderWhiteEmpty
@@ -206,6 +240,11 @@
   id: BoxFolderWhite
   suffix: White, Filled
 
+- type: entity
+  parent: [BoxFolderWhiteEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderWhiteThreePapers
+  suffix: White, 3 papers
+
 - type: entity
   parent: BoxFolderBaseEmpty
   id: BoxFolderCentComEmpty
@@ -221,7 +260,12 @@
 - type: entity
   parent: [BoxFolderCentComEmpty, BoxFolderFill]
   id: BoxFolderCentCom
-  suffix: DO NOT MAP, Filled
+  suffix: DO NOT MAP; Filled
+
+- type: entity
+  parent: [BoxFolderCentComEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderCentComThreePapers
+  suffix: DO NOT MAP; 3 papers
 
 - type: entity
   parent: BoxFolderBaseEmpty
@@ -316,6 +360,10 @@
   parent: [BoxFolderPlasticClipboardEmpty, BoxFolderFill]
   id: BoxFolderPlasticClipboard
 
+- type: entity
+  parent: [BoxFolderPlasticClipboardEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderPlasticClipboardThreePapers
+
 - type: entity
   parent: BoxFolderClipboardEmpty
   id: BoxFolderCentComClipboardEmpty
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index ad58f9c58d..9b502bd7d1 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -106,6 +106,31 @@
     - CigarGold
   groupBy: "smokeables"
 
+# Folders
+- type: loadout
+  id: BoxFolderBaseThreePapers
+  storage:
+    back:
+    - BoxFolderBaseThreePapers
+  groupBy: "folders"
+
+- type: loadout
+  id: BoxFolderPlasticClipboardThreePapers
+  storage:
+    back:
+    - BoxFolderPlasticClipboardThreePapers
+  groupBy: "folders"
+
+- type: loadout
+  id: BoxFolderClipboardThreePapers
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: Command
+  storage:
+    back:
+    - BoxFolderClipboardThreePapers
+  groupBy: "folders"
+
 # Pins
 - type: loadout
   id: ClothingNeckLGBTPin
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 59e57739ce..6cd5b60fba 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -18,6 +18,9 @@
   - CigPackBlack
   - CigarCase
   - CigarGold
+  - BoxFolderBaseThreePapers
+  - BoxFolderPlasticClipboardThreePapers
+  - BoxFolderClipboardThreePapers
   - ClothingNeckLGBTPin
   - ClothingNeckAllyPin
   - ClothingNeckAromanticPin

From c566b17da77d5cffd7b69cd28827d8ca2fa0e280 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 Oct 2025 15:50:29 +0000
Subject: [PATCH 094/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f4e96d076d..93f0799741 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: PJB3005
-  changes:
-  - message: Significantly reduced video memory usage of the parallax system.
-    type: Tweak
-  id: 8553
-  time: '2025-05-22T01:22:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37180
 - author: ArtisticRoomba
   changes:
   - message: Tesla coils can now hold a max capacity of 5 MJ, and receive 5 MJ of
@@ -3960,3 +3953,10 @@
   id: 9055
   time: '2025-10-08T15:23:02.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/37920
+- author: Hitlinemoss
+  changes:
+  - message: Folders and clipboards are now available in the Trinkets loadout tab.
+    type: Add
+  id: 9056
+  time: '2025-10-08T15:49:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39920

From 0805943c9879352aced2b73e2414a4b0ec8ee06f Mon Sep 17 00:00:00 2001
From: opl- <opl-@users.noreply.github.com>
Date: Wed, 8 Oct 2025 18:45:28 +0200
Subject: [PATCH 095/216] Fix wizard can teleport into the ATS wall (#40755)

Co-authored-by: opl <4833621+opl@users.noreply.github.com>
---
 Resources/Maps/Shuttles/trading_outpost.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml
index 37a01b7c42..42b906eaa1 100644
--- a/Resources/Maps/Shuttles/trading_outpost.yml
+++ b/Resources/Maps/Shuttles/trading_outpost.yml
@@ -7011,7 +7011,7 @@ entities:
   - uid: 955
     components:
     - type: Transform
-      pos: 5.5,-4.5
+      pos: 7.5,-4.5
       parent: 2
     - type: WarpPoint
       location: Automated Trade Station

From 3f2a58a1575c14969aac17fdd6d2edaec2363336 Mon Sep 17 00:00:00 2001
From: Vortebo <64214314+Vortebo@users.noreply.github.com>
Date: Wed, 8 Oct 2025 09:48:07 -0700
Subject: [PATCH 096/216] Relic fixes and tweaks (#40537)

* Various adjustments

* More accurate floors

* Changes

* This should be good

* Logic
---
 Resources/Maps/Shuttles/arrivals_relic.yml  |    5 +-
 Resources/Maps/Shuttles/cargo_relic.yml     |  139 +-
 Resources/Maps/Shuttles/emergency_relic.yml |  164 +-
 Resources/Maps/relic.yml                    | 4215 ++++++++++++-------
 Resources/Prototypes/Maps/relic.yml         |    2 +-
 Resources/Prototypes/Parallaxes/relic.yml   |    2 +-
 Resources/Textures/Parallaxes/oldspace.png  |  Bin 790 -> 927 bytes
 7 files changed, 2983 insertions(+), 1544 deletions(-)

diff --git a/Resources/Maps/Shuttles/arrivals_relic.yml b/Resources/Maps/Shuttles/arrivals_relic.yml
index 4d586843fe..e169432419 100644
--- a/Resources/Maps/Shuttles/arrivals_relic.yml
+++ b/Resources/Maps/Shuttles/arrivals_relic.yml
@@ -66,7 +66,10 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
-      dampingModifier: 0.25
+    - type: DeviceNetwork
+      configurators: []
+      deviceLists: []
+      transmitFrequencyId: ArrivalsShuttleTimer
     - type: GridPathfinding
     - type: Gravity
       gravityShakeSound: !type:SoundPathSpecifier
diff --git a/Resources/Maps/Shuttles/cargo_relic.yml b/Resources/Maps/Shuttles/cargo_relic.yml
index 7b3e935ea0..b85f71b0c5 100644
--- a/Resources/Maps/Shuttles/cargo_relic.yml
+++ b/Resources/Maps/Shuttles/cargo_relic.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Grid
-  engineVersion: 264.0.0
+  engineVersion: 267.1.0
   forkId: ""
   forkVersion: ""
-  time: 08/06/2025 14:30:26
-  entityCount: 176
+  time: 09/27/2025 19:19:05
+  entityCount: 180
 maps: []
 grids:
 - 1
@@ -93,34 +93,12 @@ entities:
         uniqueMixes:
         - volume: 2500
           immutable: True
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+          moles: {}
         - volume: 2500
           temperature: 293.15
           moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -155,6 +133,21 @@ entities:
     - type: Transform
       pos: 6.5,1.5
       parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: AtmosDeviceFanDirectional
+  entities:
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,1.5
+      parent: 1
 - proto: CableApcExtension
   entities:
   - uid: 111
@@ -464,6 +457,9 @@ entities:
   entities:
   - uid: 9
     components:
+    - type: MetaData
+      desc: Used to pilot the prison shuttle.
+      name: prison shuttle console
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 13.5,-1.5
@@ -726,13 +722,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,0.5
       parent: 1
-- proto: PrefilledSyringe
-  entities:
-  - uid: 6
-    components:
-    - type: Transform
-      pos: 13.5,-0.5
-      parent: 1
 - proto: RadioHandheld
   entities:
   - uid: 94
@@ -747,41 +736,57 @@ entities:
     - type: Transform
       pos: 5.5,-4.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 53
     components:
     - type: Transform
       pos: 9.5,-4.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 54
     components:
     - type: Transform
       pos: 12.5,1.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 55
     components:
     - type: Transform
       pos: 12.5,-4.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 56
     components:
     - type: Transform
       pos: 14.5,-0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 57
     components:
     - type: Transform
       pos: 14.5,-1.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 58
     components:
     - type: Transform
       pos: 14.5,-2.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 89
     components:
     - type: Transform
       pos: 5.5,1.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 - proto: SMESBasic
   entities:
   - uid: 100
@@ -806,6 +811,13 @@ entities:
     - type: Transform
       pos: 3.5,0.5
       parent: 1
+- proto: Syringe
+  entities:
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 13.5,-0.5
+      parent: 1
 - proto: Table
   entities:
   - uid: 76
@@ -1027,12 +1039,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,-0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 74
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,-2.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 - proto: WindoorSecureSecurityLocked
   entities:
   - uid: 11
@@ -1040,16 +1056,37 @@ entities:
     - type: Transform
       pos: 1.5,-2.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 75
     components:
     - type: Transform
       pos: 1.5,-0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 90
     components:
     - type: Transform
       pos: 1.5,-1.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
+  - uid: 180
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-4.5
+      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 - proto: WindowDirectional
   entities:
   - uid: 36
@@ -1057,89 +1094,121 @@ entities:
     - type: Transform
       pos: 5.5,-3.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 50
     components:
     - type: Transform
       pos: 3.5,-0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 61
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 13.5,-0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 62
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 13.5,-1.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 63
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 13.5,-2.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 64
     components:
     - type: Transform
       pos: 12.5,-3.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 65
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 66
     components:
     - type: Transform
       pos: 9.5,-3.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 67
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,-3.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 68
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,-1.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 69
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 70
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 71
     components:
     - type: Transform
       pos: 2.5,-0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 87
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 170
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,-0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 171
     components:
     - type: Transform
       pos: 4.5,-0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 ...
diff --git a/Resources/Maps/Shuttles/emergency_relic.yml b/Resources/Maps/Shuttles/emergency_relic.yml
index b5c48b5786..6329599cbb 100644
--- a/Resources/Maps/Shuttles/emergency_relic.yml
+++ b/Resources/Maps/Shuttles/emergency_relic.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Grid
-  engineVersion: 264.0.0
+  engineVersion: 267.1.0
   forkId: ""
   forkVersion: ""
-  time: 07/25/2025 18:00:45
-  entityCount: 176
+  time: 09/27/2025 19:18:41
+  entityCount: 180
 maps: []
 grids:
 - 1
@@ -66,7 +66,7 @@ entities:
           0,-1:
             0: 61166
           1,-1:
-            0: 65262
+            0: 65278
           1,0:
             0: 14
           2,0:
@@ -83,18 +83,8 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -114,31 +104,20 @@ entities:
       parent: 1
     - type: Physics
       bodyType: Static
-- proto: AirlockFreezerLocked
+- proto: AirlockEngineeringLocked
   entities:
   - uid: 10
     components:
     - type: Transform
       pos: 4.5,-0.5
       parent: 1
-    - type: AccessReader
-      access:
-      - - Atmospherics
-      - - Captain
-      - - CentralCommand
-      - - Chemistry
-      - - ChiefEngineer
-      - - ChiefMedicalOfficer
-      - - Command
-      - - Cryogenics
-      - - Engineering
-      - - Medical
-    - type: Door
-      secondsUntilStateChange: -613.913
-      state: Opening
-    - type: DeviceLinkSource
-      lastSignals:
-        DoorStatus: True
+- proto: AirlockMedicalLocked
+  entities:
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
 - proto: AirlockShuttle
   entities:
   - uid: 59
@@ -160,6 +139,21 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,0.5
       parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: AtmosDeviceFanDirectional
+  entities:
+  - uid: 91
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,1.5
+      parent: 1
 - proto: CableApcExtension
   entities:
   - uid: 110
@@ -325,7 +319,7 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 5.5,-2.5
+      pos: 5.5,-3.5
       parent: 1
   - uid: 52
     components:
@@ -630,11 +624,6 @@ entities:
     - type: Transform
       pos: 4.5,-3.5
       parent: 1
-  - uid: 85
-    components:
-    - type: Transform
-      pos: 4.5,-2.5
-      parent: 1
 - proto: LockerWallMedicalFilled
   entities:
   - uid: 8
@@ -643,6 +632,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-4.5
       parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: MedkitBruteFilled
   entities:
   - uid: 6
@@ -753,13 +744,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,0.5
       parent: 1
-- proto: PrefilledSyringe
-  entities:
-  - uid: 175
-    components:
-    - type: Transform
-      pos: 13.5,-0.5
-      parent: 1
 - proto: Rack
   entities:
   - uid: 88
@@ -788,16 +772,15 @@ entities:
     - type: Transform
       pos: 4.5,-1.5
       parent: 1
-  - uid: 91
-    components:
-    - type: Transform
-      pos: 4.5,-2.5
-      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 92
     components:
     - type: Transform
       pos: 4.5,-3.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 - proto: ShuttleWindow
   entities:
   - uid: 32
@@ -805,41 +788,57 @@ entities:
     - type: Transform
       pos: 5.5,-4.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 53
     components:
     - type: Transform
       pos: 9.5,-4.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 54
     components:
     - type: Transform
       pos: 12.5,1.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 55
     components:
     - type: Transform
       pos: 12.5,-4.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 56
     components:
     - type: Transform
       pos: 14.5,-0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 57
     components:
     - type: Transform
       pos: 14.5,-1.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 58
     components:
     - type: Transform
       pos: 14.5,-2.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 89
     components:
     - type: Transform
       pos: 5.5,1.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 - proto: SMESBasic
   entities:
   - uid: 100
@@ -876,6 +875,13 @@ entities:
     - type: Transform
       pos: 3.5,0.5
       parent: 1
+- proto: Syringe
+  entities:
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 13.5,-0.5
+      parent: 1
 - proto: Table
   entities:
   - uid: 76
@@ -1079,12 +1085,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,-0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 74
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,-2.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 - proto: WindowDirectional
   entities:
   - uid: 36
@@ -1092,68 +1102,116 @@ entities:
     - type: Transform
       pos: 5.5,-3.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 61
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 13.5,-0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 62
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 13.5,-1.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 63
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 13.5,-2.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 64
     components:
     - type: Transform
       pos: 12.5,-3.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 65
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 66
     components:
     - type: Transform
       pos: 9.5,-3.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 67
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,-3.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 68
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,-1.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 69
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 70
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
   - uid: 87
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,0.5
       parent: 1
+    - type: DeltaPressure
+      gridUid: 1
+  - uid: 178
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-1.5
+      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
+  - uid: 179
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-1.5
+      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
+  - uid: 180
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-1.5
+      parent: 1
+    - type: DeltaPressure
+      gridUid: 1
 ...
diff --git a/Resources/Maps/relic.yml b/Resources/Maps/relic.yml
index 250c80a59a..d35ce8904a 100644
--- a/Resources/Maps/relic.yml
+++ b/Resources/Maps/relic.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 264.0.0
+  engineVersion: 267.1.0
   forkId: ""
   forkVersion: ""
-  time: 08/24/2025 21:13:10
-  entityCount: 11566
+  time: 09/27/2025 20:04:57
+  entityCount: 11501
 maps:
 - 1
 grids:
@@ -27,6 +27,8 @@ tilemap:
   18: FloorHullReinforced
   1: FloorHydro
   64: FloorKitchen
+  21: FloorShowroom
+  22: FloorShuttleBlue
   98: FloorSteel
   13: FloorSteelCheckerDark
   12: FloorSteelCheckerLight
@@ -60,93 +62,93 @@ entities:
     - type: MetaData
       name: oldstation
     - type: Transform
-      pos: -2.6405587,0.6332514
+      pos: -3,0
       parent: 1
     - type: MapGrid
       chunks:
         0,0:
           ind: 0,0
-          tiles: YgAAAAADAGIAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAQAHAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAACAAcAAAAAAABiAAAAAAMAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAIABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAABAAcAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAgAHAAAAAAAAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAwAKAAAAAAAAYgAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAgAHAAAAAAAAYgAAAAACAGIAAAAAAwAKAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAAABwAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAgAAAAABAAIAAAAAAgACAAAAAAEAAgAAAAADAAIAAAAAAwACAAAAAAIABwAAAAAAAAMAAAAAAwADAAAAAAAAAwAAAAABAAMAAAAAAwADAAAAAAAAAwAAAAADAAMAAAAAAAADAAAAAAMAAwAAAAAAAAIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAADAAAAAAMAAwAAAAAAAAMAAAAAAQADAAAAAAMAAwAAAAADAAMAAAAAAQADAAAAAAAAAwAAAAABAAMAAAAAAAACAAAAAAEABwAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAAAHAAAAAAAAAwAAAAAAAAMAAAAAAQADAAAAAAMAAwAAAAACAAMAAAAAAQADAAAAAAIAAwAAAAACAAMAAAAAAAADAAAAAAAAAgAAAAADAAcAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAIAAwAAAAAAAAMAAAAAAAADAAAAAAMAAwAAAAABAAMAAAAAAAADAAAAAAEAAwAAAAABAAMAAAAAAwADAAAAAAAAAwAAAAADAAIAAAAAAwAHAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAACAAcAAAAAAAADAAAAAAIAAwAAAAADAAMAAAAAAQADAAAAAAIAAwAAAAACAAMAAAAAAQADAAAAAAEAAwAAAAABAAMAAAAAAQACAAAAAAIABwAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAgADAAAAAAAAAwAAAAADAAMAAAAAAAADAAAAAAMAAwAAAAAAAAMAAAAAAwADAAAAAAIAAwAAAAABAAMAAAAAAwADAAAAAAAAAgAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAMABwAAAAAAAAMAAAAAAAADAAAAAAMAAwAAAAACAAMAAAAAAAADAAAAAAEAAwAAAAAAAAMAAAAAAQADAAAAAAEAAwAAAAAAAA==
+          tiles: YgAAAAAAAGIAAAAAAQBiAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAEAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAGIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAIABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAACAAcAAAAAAABiAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAIABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAADAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAwAKAAAAAAAAYgAAAAADAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAQAKAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAFQAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAEABwAAAAAAAAMAAAAAAAADAAAAAAIAAwAAAAAAAAMAAAAAAwADAAAAAAEAAwAAAAACAAMAAAAAAwADAAAAAAIAAwAAAAABABUAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAADAAAAAAIAAwAAAAADAAMAAAAAAwADAAAAAAMAAwAAAAADAAMAAAAAAQADAAAAAAAAAwAAAAABAAMAAAAAAQAVAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAwAHAAAAAAAAAwAAAAACAAMAAAAAAAADAAAAAAIAAwAAAAACAAMAAAAAAgADAAAAAAEAAwAAAAAAAAMAAAAAAgADAAAAAAAAFQAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAIAAwAAAAACAAMAAAAAAAADAAAAAAAAAwAAAAADAAMAAAAAAAADAAAAAAEAAwAAAAAAAAMAAAAAAQADAAAAAAIAAwAAAAAAABUAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAAAAAcAAAAAAAADAAAAAAEAAwAAAAADAAMAAAAAAAADAAAAAAAAAwAAAAABAAMAAAAAAQADAAAAAAAAAwAAAAABAAMAAAAAAwAVAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAgADAAAAAAAAAwAAAAACAAMAAAAAAgADAAAAAAMAAwAAAAAAAAMAAAAAAAADAAAAAAIAAwAAAAACAAMAAAAAAgADAAAAAAIAFQAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAEABwAAAAAAAAMAAAAAAgADAAAAAAEAAwAAAAADAAMAAAAAAgADAAAAAAAAAwAAAAACAAMAAAAAAAADAAAAAAMAAwAAAAAAAA==
           version: 7
         0,-1:
           ind: 0,-1
-          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAIABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAABAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAEABwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAADAGIAAAAAAQAHAAAAAAAABwAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAIABwAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAMABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAgAHAAAAAAAAYgAAAAADAA==
+          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAABAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAIABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAADAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAwAHAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAADAAcAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAwAHAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAEABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAEABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAACAAcAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAQAHAAAAAAAAYgAAAAADAA==
           version: 7
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAwAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAEAYgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAABiAAAAAAIACgAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAMAAgAAAAAAAAIAAAAAAgACAAAAAAEAAgAAAAACAAIAAAAAAAACAAAAAAMAAgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAAAAAIAAAAAAgACAAAAAAIAAgAAAAADAAIAAAAAAwACAAAAAAEAAgAAAAAAAAIAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAGIAAAAAAwACAAAAAAIAAgAAAAADAAIAAAAAAAACAAAAAAIAAgAAAAACAAIAAAAAAAACAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAgACAAAAAAEAAgAAAAAAAAIAAAAAAQACAAAAAAEAAgAAAAABAAIAAAAAAgACAAAAAAAAAgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAYgAAAAAAAAIAAAAAAwACAAAAAAEAAgAAAAAAAAIAAAAAAwACAAAAAAIAAgAAAAACAAIAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAAACAAAAAAEAAgAAAAACAAIAAAAAAAACAAAAAAAAAgAAAAABAAIAAAAAAQACAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAAAAgAAAAADAAIAAAAAAwACAAAAAAIAAgAAAAACAAIAAAAAAwACAAAAAAAAAgAAAAABAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAgAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAABiAAAAAAIACgAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAACABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAGIAAAAAAQAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAYgAAAAADABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAQAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAIAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAAA==
           version: 7
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAADAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAACAA==
           version: 7
         1,-1:
           ind: 1,-1
-          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAAABAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAIAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAADAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIABwAAAAAAAA==
+          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAGIAAAAAAAABAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAA==
           version: 7
         1,0:
           ind: 1,0
-          tiles: YgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAACAGIAAAAAAgALAAAAAAAACwAAAAABAAsAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAQAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAADAGIAAAAAAQBiAAAAAAIABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAAAwAAAAABAAMAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAIABwAAAAAAAAMAAAAAAQADAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAABAAMAAAAAAwADAAAAAAEAAwAAAAACAAMAAAAAAAADAAAAAAIABwAAAAAAAGIAAAAAAgAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAwADAAAAAAEAAwAAAAABAAMAAAAAAQADAAAAAAAAAwAAAAAAAAMAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAgBiAAAAAAAAAwAAAAADAAMAAAAAAQADAAAAAAEAAwAAAAAAAAMAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAAAAAMAAAAAAgADAAAAAAAAAwAAAAACAAMAAAAAAAADAAAAAAIAAwAAAAACAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAgADAAAAAAIAAwAAAAAAAAMAAAAAAwADAAAAAAIAAwAAAAABAAMAAAAAAgBiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAAAAwAAAAACAAMAAAAAAAADAAAAAAAAAwAAAAACAAMAAAAAAAADAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAADAA==
+          tiles: YgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAADAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAADAGIAAAAAAQBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAEAYgAAAAABAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAgAHAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAgALAAAAAAAACwAAAAACAAsAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAACAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAMABwAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgAHAAAAAAAAAwAAAAADAAMAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAAABwAAAAAAAAMAAAAAAAADAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAABAAMAAAAAAgADAAAAAAAAAwAAAAACAAMAAAAAAwADAAAAAAMABwAAAAAAAGIAAAAAAQAHAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAgADAAAAAAIAAwAAAAAAAAMAAAAAAgADAAAAAAEAAwAAAAADAAMAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAEAAwAAAAAAAAMAAAAAAgADAAAAAAIAAwAAAAADAAMAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAACAAMAAAAAAwADAAAAAAAAAwAAAAADAAMAAAAAAwADAAAAAAIAAwAAAAACAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAACAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAQADAAAAAAMAAwAAAAADAAMAAAAAAgADAAAAAAAAAwAAAAADAAMAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAIAAwAAAAACAAMAAAAAAwADAAAAAAMAAwAAAAABAAMAAAAAAQADAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAADAA==
           version: 7
         -1,1:
           ind: -1,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAACAAAAAAMAAgAAAAACAAIAAAAAAwACAAAAAAMAAgAAAAADAAIAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAAgAAAAABAAIAAAAAAwACAAAAAAEAAgAAAAAAAAIAAAAAAQACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAAAAGIAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         0,1:
           ind: 0,1
-          tiles: AgAAAAABAAcAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAMABwAAAAAAAAMAAAAAAwADAAAAAAEAAwAAAAABAAMAAAAAAgADAAAAAAAAAwAAAAAAAAMAAAAAAgADAAAAAAEAAwAAAAACAAIAAAAAAQAHAAAAAAAABwAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAACAAAAAAMAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABlAAAAAAIAYgAAAAADAGIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGIAAAAAAwBlAAAAAAEAYgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAZQAAAAACAGUAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAYgAAAAADAGIAAAAAAwAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGUAAAAAAwBiAAAAAAAAYgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAwAHAAAAAAAAYgAAAAAAAGUAAAAAAwBiAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGUAAAAABABiAAAAAAMAZQAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGUAAAAAAQBiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAGUAAAAAAABiAAAAAAAAYgAAAAAAAGUAAAAAAABlAAAAAAAAYgAAAAABAA==
+          tiles: YgAAAAACAAcAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAAABwAAAAAAAAMAAAAAAwADAAAAAAAAAwAAAAAAAAMAAAAAAQADAAAAAAEAAwAAAAADAAMAAAAAAgADAAAAAAAAAwAAAAADAGIAAAAAAgAHAAAAAAAABwAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABlAAAAAAIAYgAAAAAAAGIAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGIAAAAAAgBlAAAAAAIAYgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAZQAAAAACAGUAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAYgAAAAADAGIAAAAAAgAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGUAAAAAAQBiAAAAAAIAYgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAwAHAAAAAAAAYgAAAAADAGUAAAAAAABiAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGUAAAAAAgBiAAAAAAMAZQAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAABAAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAABAAcAAAAAAAAHAAAAAAAAEAAAAAABAGUAAAAAAQBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAGUAAAAABABiAAAAAAAAYgAAAAABAGUAAAAAAgBlAAAAAAIAYgAAAAACAA==
           version: 7
         1,1:
           ind: 1,1
-          tiles: AwAAAAAAAAMAAAAAAgADAAAAAAEAAwAAAAAAAAMAAAAAAgAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAABAAcAAAAAAAAHAAAAAAAADAAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAAAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAEgAAAAAAABIAAAAAAAAHAAAAAAAABwAAAAAAABIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAAAZQAAAAACAA==
+          tiles: AwAAAAADAAMAAAAAAAADAAAAAAMAAwAAAAABAAMAAAAAAgAHAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAACAAcAAAAAAABiAAAAAAEADAAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAgBiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAwBiAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAADAGIAAAAAAwAHAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAABAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAEgAAAAAAABIAAAAAAAAHAAAAAAAABwAAAAAAABIAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAACAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAwBiAAAAAAMAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAEAZQAAAAAAAA==
           version: 7
         2,0:
           ind: 2,0
-          tiles: BwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAADAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAADAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAgAHAAAAAAAAYgAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAEAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAwAHAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAEABwAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAACAAcAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAQAHAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAwAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAMABwAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAQALAAAAAAEABwAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAgAHAAAAAAAACwAAAAACAGIAAAAAAQBiAAAAAAAACwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAEABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAABAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAACAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAADAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAMABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAgAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAQAHAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAEABwAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAQAHAAAAAAAACwAAAAACAAsAAAAAAgALAAAAAAIACwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAA==
+          tiles: BwAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAgBiAAAAAAMAYgAAAAADAAcAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAIAYgAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAgAHAAAAAAAAYgAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAIAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAABAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAMAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAwAHAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAgAHAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAEABwAAAAAAAGIAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAEABwAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAgAHAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAEABwAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAEABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAABAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAwALAAAAAAMABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAgAHAAAAAAAACwAAAAAAAGIAAAAAAgBiAAAAAAEACwAAAAADAAcAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAABiAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAADAGIAAAAAAQBiAAAAAAIABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAADAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAIABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAwAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAIABwAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAwAHAAAAAAAACwAAAAADAAsAAAAAAgALAAAAAAMACwAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAA==
           version: 7
         2,1:
           ind: 2,1
-          tiles: YgAAAAACAGIAAAAAAwBiAAAAAAMABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAgALAAAAAAMACwAAAAABAAsAAAAAAwALAAAAAAAACwAAAAAAAAsAAAAAAQALAAAAAAEACwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAIABwAAAAAAAAsAAAAAAgALAAAAAAIACwAAAAACAAsAAAAAAQAHAAAAAAAACwAAAAACAAsAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAACAGIAAAAAAgAHAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAEABwAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAEAYgAAAAACAGIAAAAAAwBiAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAQAHAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAEABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAABAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAADAAcAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAEABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAgBiAAAAAAMABwAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAACAAcAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAQAHAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAADAAcAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAAAAA==
+          tiles: YgAAAAACAGIAAAAAAgBiAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAAALAAAAAAMACwAAAAABAAsAAAAAAgALAAAAAAEACwAAAAADAAsAAAAAAQALAAAAAAMACwAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAEABwAAAAAAAAsAAAAAAQALAAAAAAEACwAAAAACAAsAAAAAAwAHAAAAAAAACwAAAAAAAAsAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAQAHAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAABAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAADAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAwAHAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAMABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAACAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAMAYgAAAAADAGIAAAAAAQBiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAADAAcAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAIABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAADAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAQAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAwAHAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAADAAcAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAAAAA==
           version: 7
         0,2:
           ind: 0,2
-          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAABAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAA==
+          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAADAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAA==
           version: 7
         1,2:
           ind: 1,2
-          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAABAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAEABwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAIABwAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAADAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAEAYgAAAAADAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAQAHAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAA==
+          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAABAGIAAAAAAgBiAAAAAAMAYgAAAAABAGIAAAAAAgBiAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAAcAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAwAHAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAEABwAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAMABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAACAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAwBiAAAAAAIAYgAAAAABAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAAAAGIAAAAAAwAHAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAA==
           version: 7
         2,2:
           ind: 2,2
-          tiles: YgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAABAAcAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAQAHAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQAKAAAAAAAAYgAAAAADAAoAAAAAAABiAAAAAAEACgAAAAAAAA==
+          tiles: YgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAQBiAAAAAAIABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAEAYgAAAAACAGIAAAAAAgBiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAMAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAACAGIAAAAAAwBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAQAHAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAAAKAAAAAAAAYgAAAAAAAAoAAAAAAABiAAAAAAEACgAAAAAAAA==
           version: 7
         3,1:
           ind: 3,1
-          tiles: CwAAAAABAAsAAAAAAwALAAAAAAMACwAAAAACAAsAAAAAAgALAAAAAAEACwAAAAAAAAsAAAAAAQAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAABwAAAAAAAAsAAAAAAQALAAAAAAMACwAAAAADAAsAAAAAAAALAAAAAAEACwAAAAACAAsAAAAAAAAHAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAAAgAAAAACAAIAAAAAAgACAAAAAAAAAgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAIAAAAAAwACAAAAAAMAAgAAAAACAAIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAACAAAAAAMAAgAAAAAAAAIAAAAAAwACAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAABAAsAAAAAAwALAAAAAAAACwAAAAAAAAcAAAAAAAAHAAAAAAAAAgAAAAAAAAIAAAAAAwACAAAAAAAAAgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAQALAAAAAAMACwAAAAADAAsAAAAAAgAHAAAAAAAABwAAAAAAAAIAAAAAAQACAAAAAAMAAgAAAAAAAAIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAIAYgAAAAABAAsAAAAAAAALAAAAAAEABwAAAAAAAAcAAAAAAAACAAAAAAIAAgAAAAADAAIAAAAAAQACAAAAAAEAAgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAgALAAAAAAAACwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAIAAAAAAwAHAAAAAAAAAgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAACAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACAAcAAAAAAABiAAAAAAMAYgAAAAAAAAIAAAAAAAACAAAAAAEAAgAAAAADAAIAAAAAAQACAAAAAAMAAgAAAAADAAIAAAAAAgACAAAAAAMAAgAAAAADAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAAAAGIAAAAAAgACAAAAAAIAAgAAAAADAAIAAAAAAwACAAAAAAAAAgAAAAAAAAIAAAAAAgACAAAAAAAAAgAAAAACAAIAAAAAAgAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAEAAgAAAAADAAIAAAAAAQACAAAAAAMAAgAAAAABAAIAAAAAAgACAAAAAAAAAgAAAAADAAIAAAAAAgACAAAAAAEABwAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAAAAAIAAAAAAQACAAAAAAIAAgAAAAACAAIAAAAAAgACAAAAAAEAAgAAAAAAAAIAAAAAAwACAAAAAAAAAgAAAAADAA==
+          tiles: CwAAAAABAAsAAAAAAQALAAAAAAIACwAAAAADAAsAAAAAAQALAAAAAAIACwAAAAACAAsAAAAAAgALAAAAAAIACwAAAAABAAsAAAAAAQALAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAIABwAAAAAAAAsAAAAAAgALAAAAAAEACwAAAAABAAsAAAAAAAALAAAAAAEACwAAAAABAAsAAAAAAgAHAAAAAAAAYgAAAAABAGIAAAAAAQALAAAAAAIACwAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAEACwAAAAACAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAQAHAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAgAHAAAAAAAAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAIAYgAAAAADAAcAAAAAAABiAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAACAAcAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAwAHAAAAAAAAYgAAAAABAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAMABwAAAAAAAGIAAAAAAwBiAAAAAAEABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAABAAsAAAAAAQALAAAAAAEACwAAAAACAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAACAAcAAAAAAABiAAAAAAEAYgAAAAACAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAwALAAAAAAEACwAAAAADAAsAAAAAAQAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAACAGIAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgAHAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAADAAsAAAAAAgALAAAAAAEABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAAALAAAAAAEACwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAADAAcAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAADAAcAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAgAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAADAA==
           version: 7
         3,2:
           ind: 3,2
-          tiles: BwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAABAAIAAAAAAQACAAAAAAAAAgAAAAACAAIAAAAAAAACAAAAAAIAAgAAAAABAAIAAAAAAgACAAAAAAMAAgAAAAACAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAwACAAAAAAIAAgAAAAADAAIAAAAAAQACAAAAAAEAAgAAAAAAAAIAAAAAAgACAAAAAAEAAgAAAAADAAIAAAAAAwAHAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAACAGIAAAAAAABiAAAAAAEAAgAAAAACAAIAAAAAAQACAAAAAAMAAgAAAAAAAAIAAAAAAQACAAAAAAEAAgAAAAABAAIAAAAAAwACAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAMACwAAAAAAAGIAAAAAAABiAAAAAAAABwAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAEACwAAAAAAAAsAAAAAAgALAAAAAAEACwAAAAACAAsAAAAAAQBiAAAAAAAAYgAAAAABAAcAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAAALAAAAAAAACwAAAAABAAsAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAAAHAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAQAHAAAAAAAACwAAAAACAAsAAAAAAQALAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAAABwAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAAABwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAADAAcAAAAAAABiAAAAAAMAYgAAAAAAAAcAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAQAHAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAAABwAAAAAAAAgAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAAAAAcAAAAAAAAIAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAAAHAAAAAAAACAAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAIABwAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAAAAAcAAAAAAAAIAAAAAAAAYgAAAAACAAoAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAwAHAAAAAAAABwAAAAAAAA==
+          tiles: BwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAAAAGIAAAAAAgAHAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAMACwAAAAABAGIAAAAAAwBiAAAAAAIABwAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAwBiAAAAAAAACwAAAAADAAsAAAAAAwALAAAAAAMACwAAAAABAAsAAAAAAwBiAAAAAAEAYgAAAAAAAAcAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAALAAAAAAAACwAAAAABAAsAAAAAAgAHAAAAAAAAYgAAAAACAGIAAAAAAwAHAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAACAGIAAAAAAwAHAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAMABwAAAAAAAGIAAAAAAwBiAAAAAAAABwAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAEABwAAAAAAAAsAAAAAAQALAAAAAAAACwAAAAACAAcAAAAAAABiAAAAAAEAYgAAAAAAAAcAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAwAHAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIABwAAAAAAAAgAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAAAAAcAAAAAAAAIAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAwAHAAAAAAAACAAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAIABwAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAAAAAcAAAAAAAAIAAAAAAAAYgAAAAACAAoAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAAAHAAAAAAAABwAAAAAAAA==
           version: 7
         2,-1:
           ind: 2,-1
-          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAAAHAAAAAAAABAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAACAAcAAAAAAABiAAAAAAEAYgAAAAAAAAcAAAAAAAAEAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAQAHAAAAAAAAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAIABwAAAAAAAAsAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAABAAcAAAAAAAALAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAwBiAAAAAAEABwAAAAAAAAsAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAADAAcAAAAAAAALAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAQAHAAAAAAAACwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAIABwAAAAAAAAsAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAALAAAAAAIABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAAAHAAAAAAAAYgAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAIABwAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAABAAcAAAAAAABiAAAAAAEABwAAAAAAAA==
+          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAQAHAAAAAAAABAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAAAYgAAAAABAAcAAAAAAAAEAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAADAGIAAAAAAgAHAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAEABwAAAAAAAAsAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAgBiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAACAAcAAAAAAAALAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAMABwAAAAAAAAsAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAMAYgAAAAABAAcAAAAAAAALAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAgAHAAAAAAAACwAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAEABwAAAAAAAAsAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAALAAAAAAMABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAQAHAAAAAAAAYgAAAAADAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAIABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAIABwAAAAAAAA==
           version: 7
         2,-2:
           ind: 2,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAEACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAgALAAAAAAEAYgAAAAABAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAMACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAAALAAAAAAMAYgAAAAACAA==
           version: 7
         3,-1:
           ind: 3,-1
-          tiles: YgAAAAAAAAsAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACwAAAAACAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAwALAAAAAAMABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAGIAAAAAAgAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAMAYgAAAAABAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAABiAAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAADAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAYgAAAAADAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAADAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAMAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAABAGIAAAAAAgBiAAAAAAAAYgAAAAAAAA==
+          tiles: YgAAAAAAAAsAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACwAAAAADAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAgALAAAAAAIABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAGIAAAAAAwAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAEAYgAAAAACAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAABiAAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAADAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAYgAAAAADAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAwBiAAAAAAEAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAgAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAADAGIAAAAAAQAHAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAMAYgAAAAADAA==
           version: 7
         3,-2:
           ind: 3,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAALAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACwAAAAADAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAsAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAABAAcAAAAAAAAIAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAALAAAAAAMACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAAAAGIAAAAAAgALAAAAAAMACwAAAAADAAsAAAAAAQALAAAAAAIACwAAAAADAAsAAAAAAQALAAAAAAAACwAAAAABAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAALAAAAAAIACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACwAAAAACAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAsAAAAAAQAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAABAAcAAAAAAAAIAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAALAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAABAGIAAAAAAAALAAAAAAAACwAAAAADAAsAAAAAAQALAAAAAAIACwAAAAADAAsAAAAAAQALAAAAAAEACwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         3,0:
           ind: 3,0
-          tiles: YgAAAAACAGIAAAAAAwBiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAgALAAAAAAIACwAAAAADAAsAAAAAAgALAAAAAAEACwAAAAACAGIAAAAAAQBiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAAsAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAEAYgAAAAACAAsAAAAAAQBiAAAAAAMAYgAAAAADAAcAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAIABwAAAAAAAGIAAAAAAwBiAAAAAAAACwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAADAAsAAAAAAwALAAAAAAAAYgAAAAADAGIAAAAAAAADAAAAAAAABwAAAAAAAAcAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAsAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAIAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAAALAAAAAAIABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAACAAcAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAADAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAwAHAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAMABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAADAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAwAHAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAAALAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAACAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAEABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAEAYgAAAAACAAcAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAgAHAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAIABwAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAABwAAAAAAAA==
+          tiles: YgAAAAAAAGIAAAAAAQBiAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAwALAAAAAAIACwAAAAAAAAsAAAAAAAALAAAAAAMACwAAAAABAGIAAAAAAQBiAAAAAAAABwAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAHAAAAAAAAYgAAAAADAAsAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAAAAAsAAAAAAABiAAAAAAIAYgAAAAADAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAEACwAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAAAAAsAAAAAAwALAAAAAAAAYgAAAAACAGIAAAAAAgADAAAAAAIABwAAAAAAAAcAAAAAAAADAAAAAAMAAwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAsAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAIAAwAAAAADAAMAAAAAAgADAAAAAAEAAwAAAAACAAMAAAAAAQBiAAAAAAAABwAAAAAAAAcAAAAAAAALAAAAAAMABwAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAABAAcAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAABAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAgAHAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAQBiAAAAAAMABwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAgATAAAAAAAAEwAAAAAAABMAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAACAAcAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAgBiAAAAAAIAEwAAAAAAABMAAAAAAAATAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAwAHAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAADABMAAAAAAAATAAAAAAAAEwAAAAAAAGIAAAAAAwAHAAAAAAAAYgAAAAACAGIAAAAAAgALAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAsAAAAAAwBiAAAAAAMABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAADAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAIABwAAAAAAAAcAAAAAAAALAAAAAAEACwAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAADAAcAAAAAAABiAAAAAAMACwAAAAAAAAsAAAAAAwALAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAQAHAAAAAAAAYgAAAAAAAGIAAAAAAgALAAAAAAIAYgAAAAADAGIAAAAAAABiAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAMABwAAAAAAAGIAAAAAAAALAAAAAAMACwAAAAABAAsAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAACwAAAAABAAsAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAAABwAAAAAAAA==
           version: 7
         -1,-2:
           ind: -1,-2
@@ -154,27 +156,27 @@ entities:
           version: 7
         0,-2:
           ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAA==
           version: 7
         1,-2:
           ind: 1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAA==
           version: 7
         0,3:
           ind: 0,3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         1,3:
           ind: 1,3
-          tiles: BwAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAALAAAAAAEABwAAAAAAAAcAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAAsAAAAAAgAHAAAAAAAACwAAAAADAAcAAAAAAAAAAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAAAAAsAAAAAAgAHAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAMABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAABAAsAAAAAAQALAAAAAAEABwAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAADAAcAAAAAAAALAAAAAAEABwAAAAAAAGIAAAAAAgAHAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAALAAAAAAIACwAAAAAAAAcAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAwAHAAAAAAAACwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAGIAAAAAAQAHAAAAAAAACwAAAAADAAcAAAAAAAAHAAAAAAAACwAAAAACAAsAAAAAAQAHAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAAABwAAAAAAAAsAAAAAAwAHAAAAAAAABwAAAAAAAAsAAAAAAgALAAAAAAIABwAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAADAAcAAAAAAAALAAAAAAIABwAAAAAAAGIAAAAAAQAHAAAAAAAAYgAAAAAAAAcAAAAAAAALAAAAAAAABwAAAAAAAAcAAAAAAAALAAAAAAMACwAAAAADAAcAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAAAHAAAAAAAACwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAGIAAAAAAAALAAAAAAEACwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAACAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: BwAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAALAAAAAAIABwAAAAAAAAcAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAAsAAAAAAQAHAAAAAAAACwAAAAADAAcAAAAAAAAAAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAABAAsAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAABAAsAAAAAAAALAAAAAAAABwAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAAALAAAAAAEABwAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAAALAAAAAAAACwAAAAAAAAcAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAQAHAAAAAAAACwAAAAACAAcAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAAAHAAAAAAAACwAAAAAAAAcAAAAAAAAHAAAAAAAACwAAAAACAAsAAAAAAgAHAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAAABwAAAAAAAGIAAAAAAwAHAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAAABwAAAAAAAAsAAAAAAQAHAAAAAAAABwAAAAAAAAsAAAAAAwALAAAAAAMABwAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAABAAcAAAAAAAALAAAAAAAABwAAAAAAAGIAAAAAAQAHAAAAAAAAYgAAAAADAAcAAAAAAAALAAAAAAAABwAAAAAAAAcAAAAAAAALAAAAAAEACwAAAAAAAAcAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAgAHAAAAAAAAYgAAAAABAAcAAAAAAABiAAAAAAMABwAAAAAAAGIAAAAAAwAHAAAAAAAACwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAgALAAAAAAIACwAAAAABAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAADAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         4,0:
           ind: 4,0
-          tiles: CwAAAAABAAsAAAAAAQALAAAAAAMABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAACAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: CwAAAAACAAsAAAAAAgALAAAAAAIABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAACAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         4,-1:
           ind: 4,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAgAIAAAAAAAAYgAAAAADAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAABiAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAGIAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAYgAAAAABAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACwAAAAABAAsAAAAAAQAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAwALAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAwAIAAAAAAAAYgAAAAABAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAABiAAAAAAIABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAGIAAAAAAwAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAYgAAAAABAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACwAAAAACAAsAAAAAAQAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAQALAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         4,1:
           ind: 4,1
@@ -186,7 +188,7 @@ entities:
           version: 7
         3,3:
           ind: 3,3
-          tiles: YgAAAAABAAoAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAADAAoAAAAAAAAKAAAAAAAACgAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAABAAoAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAABAAcAAAAAAAAIAAAAAAAAYgAAAAAAAGIAAAAAAAAKAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAwAHAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAwBiAAAAAAMABwAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAMAYgAAAAABAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAQAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAcAAAAAAAALAAAAAAIACwAAAAACAAsAAAAAAAALAAAAAAAACwAAAAABAAsAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAA==
+          tiles: YgAAAAABAAoAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAADAAoAAAAAAAAKAAAAAAAACgAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAADAAoAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAADAAcAAAAAAAAIAAAAAAAAYgAAAAADAGIAAAAAAwAKAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAgAHAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAEABwAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAAAYgAAAAABAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAQAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAABAAcAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAACAAAAAAAAAcAAAAAAAALAAAAAAMACwAAAAAAAAsAAAAAAwALAAAAAAEACwAAAAAAAAsAAAAAAgAHAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAMABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAFgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAADAAcAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAgAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAMABwAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAA==
           version: 7
         4,3:
           ind: 4,3
@@ -202,7 +204,7 @@ entities:
           version: 7
         2,3:
           ind: 2,3
-          tiles: YgAAAAAAAGIAAAAAAwBiAAAAAAMABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwAKAAAAAAAAYgAAAAAAAAoAAAAAAABiAAAAAAAACgAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAALAAAAAAEACwAAAAAAAAsAAAAAAQAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAIACgAAAAAAAGIAAAAAAwBiAAAAAAAACwAAAAACAAsAAAAAAQALAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIACAAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAAAAAoAAAAAAABiAAAAAAIAYgAAAAACAAsAAAAAAwALAAAAAAEACwAAAAADAAcAAAAAAAAHAAAAAAAAYgAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAALAAAAAAEACwAAAAADAAsAAAAAAQAHAAAAAAAABwAAAAAAAGIAAAAAAQAHAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACwAAAAADAAsAAAAAAQALAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAIABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAsAAAAAAgALAAAAAAIACwAAAAABAAsAAAAAAAALAAAAAAMACwAAAAABAAcAAAAAAAALAAAAAAIACwAAAAADAAsAAAAAAQALAAAAAAEACwAAAAADAAsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: YgAAAAACAGIAAAAAAQBiAAAAAAIABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQAKAAAAAAAAYgAAAAABAAoAAAAAAABiAAAAAAIACgAAAAAAAAcAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAgAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAEACgAAAAAAAGIAAAAAAABiAAAAAAIACwAAAAADAAsAAAAAAAALAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMACAAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAABAAoAAAAAAABiAAAAAAMAYgAAAAAAAAsAAAAAAwALAAAAAAAACwAAAAADAAcAAAAAAAAHAAAAAAAAYgAAAAADAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAALAAAAAAAACwAAAAABAAsAAAAAAgAHAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAACAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACwAAAAAAAAsAAAAAAgALAAAAAAIAYgAAAAABAGIAAAAAAgBiAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAsAAAAAAAALAAAAAAMACwAAAAACAAsAAAAAAwALAAAAAAEACwAAAAAAAAcAAAAAAAALAAAAAAMACwAAAAAAAAsAAAAAAwALAAAAAAMACwAAAAABAAsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -1,2:
           ind: -1,2
@@ -210,7 +212,7 @@ entities:
           version: 7
         4,-2:
           ind: 4,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAYgAAAAADAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAABiAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAGIAAAAAAQAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAgAIAAAAAAAAYgAAAAABAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAAAYgAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAgAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
     - type: Broadphase
     - type: Physics
@@ -274,22 +276,7 @@ entities:
           decals:
             331: 62,12
             332: 61,12
-            333: 62,13
-            334: 62,14
-            335: 61,13
             336: 62,18
-            337: 57,18
-            340: 59,18
-            341: 59,17
-            342: 58,18
-            343: 56,16
-            344: 57,16
-            345: 58,16
-            346: 58,15
-            347: 58,14
-            348: 58,13
-            349: 58,12
-            350: 57,15
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNW
@@ -409,7 +396,7 @@ entities:
           0,-4:
             0: 30704
           0,-5:
-            1: 61440
+            1: 61455
           0,-3:
             0: 63351
           -1,-3:
@@ -424,7 +411,7 @@ entities:
           1,-2:
             0: 12287
           1,-5:
-            1: 61440
+            1: 61455
           2,-4:
             0: 61680
           2,-3:
@@ -432,7 +419,7 @@ entities:
           2,-2:
             0: 1911
           2,-5:
-            1: 61440
+            1: 61455
           3,-4:
             0: 45296
           3,-3:
@@ -440,7 +427,7 @@ entities:
           3,-2:
             0: 4095
           3,-5:
-            1: 61440
+            1: 61455
           4,-4:
             0: 61680
           4,-3:
@@ -483,7 +470,7 @@ entities:
           -1,-5:
             1: 48031
           4,-5:
-            1: 61440
+            1: 61455
           5,-4:
             0: 55792
           5,-3:
@@ -495,7 +482,7 @@ entities:
             0: 4561
             3: 49152
           5,-5:
-            1: 61440
+            1: 61727
           5,0:
             0: 52497
             3: 12
@@ -510,7 +497,7 @@ entities:
             0: 8958
             4: 32768
           6,-5:
-            1: 61440
+            1: 61455
           6,0:
             0: 65282
             4: 8
@@ -525,7 +512,7 @@ entities:
             0: 19541
             4: 4096
           7,-5:
-            1: 61440
+            1: 61455
           7,0:
             4: 1
             0: 65356
@@ -904,7 +891,7 @@ entities:
           16,9:
             1: 1
           8,-5:
-            1: 61440
+            1: 61455
           9,-4:
             0: 57584
           9,-3:
@@ -912,7 +899,7 @@ entities:
           9,-2:
             0: 61182
           9,-5:
-            1: 12288
+            1: 13383
           10,-4:
             0: 61680
           10,-3:
@@ -963,10 +950,6 @@ entities:
           14,-6:
             1: 20480
             0: 8192
-          15,-8:
-            1: 3840
-          16,-8:
-            1: 3840
           13,1:
             0: 65535
           13,2:
@@ -998,7 +981,7 @@ entities:
             0: 760
           4,15:
             0: 1
-            1: 14
+            1: 3598
           4,13:
             1: 8738
             0: 34952
@@ -1007,26 +990,26 @@ entities:
           5,14:
             0: 62
           5,15:
-            1: 15
+            1: 3855
           5,13:
             0: 43690
           6,12:
             0: 43904
           6,15:
-            1: 15
+            1: 3855
           6,13:
             0: 43690
           6,14:
             0: 46
             1: 32768
           7,15:
-            1: 15
+            1: 3855
           7,13:
             0: 36044
           8,13:
             0: 12151
           8,15:
-            1: 15
+            1: 3855
           16,-1:
             0: 26112
             1: 4
@@ -1063,19 +1046,19 @@ entities:
             1: 15
             0: 3840
           12,15:
-            1: 57359
+            1: 58127
           11,15:
-            1: 15
+            1: 3855
           12,16:
             1: 43554
           13,13:
             1: 65518
           13,14:
             1: 15
-            0: 1792
+            0: 18176
           13,15:
-            1: 28679
-            0: 8
+            1: 28675
+            0: 1100
           14,13:
             1: 12561
             0: 2252
@@ -1121,7 +1104,7 @@ entities:
             0: 3840
             1: 14
           9,15:
-            1: 15
+            1: 3855
           9,13:
             0: 546
             1: 34956
@@ -1131,99 +1114,33 @@ entities:
             1: 15
             0: 3328
           10,15:
-            1: 15
+            1: 3855
           -1,10:
             1: 34952
           16,-6:
-            0: 1284
-            1: 12834
-          16,-5:
-            1: 1
-          16,-7:
-            1: 8738
-            0: 1028
-          17,-8:
-            1: 4352
-          17,-7:
-            1: 4369
+            0: 17472
           17,-6:
-            1: 4369
+            1: 4368
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
         - volume: 2500
           immutable: True
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+          moles: {}
+        - volume: 2500
+          temperature: 293.15
+          moles: {}
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 6666.982
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Nitrogen: 6666.982
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -1234,7 +1151,7 @@ entities:
     - type: MetaData
       name: Prison Station
     - type: Transform
-      pos: 150.92255,68.575584
+      pos: 100,68
       parent: 1
     - type: MapGrid
       chunks:
@@ -1248,19 +1165,19 @@ entities:
           version: 7
         0,-2:
           ind: 0,-2
-          tiles: CAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAACAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAGIAAAAAAABiAAAAAAEACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABiAAAAAAMAYgAAAAADAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAQAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAEAYgAAAAACAGIAAAAAAwBiAAAAAAIACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAACAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAYgAAAAAAAGIAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAGIAAAAAAgBiAAAAAAIACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAABiAAAAAAAAYgAAAAACAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAYgAAAAADAGIAAAAAAQAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAGIAAAAAAwBiAAAAAAIACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: CAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAGIAAAAAAwBiAAAAAAIACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABiAAAAAAEAYgAAAAACAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAQAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAIACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAwBiAAAAAAIAYgAAAAABAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAYgAAAAACAGIAAAAAAgAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAGIAAAAAAwBiAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAABiAAAAAAIAYgAAAAADAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAYgAAAAABAGIAAAAAAQAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAGIAAAAAAgBiAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         0,-3:
           ind: 0,-3
-          tiles: CAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAQAHAAAAAAAAYgAAAAABAGIAAAAAAwAHAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIABwAAAAAAAGIAAAAAAgBiAAAAAAEABwAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAEACAAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAADAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAMAYgAAAAAAAGIAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAAYgAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAMABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAABAAcAAAAAAABiAAAAAAAAYgAAAAACAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAIACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAACAA==
+          tiles: CAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAQAHAAAAAAAAYgAAAAAAAGIAAAAAAQAHAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAIABwAAAAAAAGIAAAAAAQBiAAAAAAEABwAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMABwAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAAcAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAEACAAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAACAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAgAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAAYgAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAMABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAABAAcAAAAAAABiAAAAAAAAYgAAAAADAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAQAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAADAA==
           version: 7
         0,-4:
           ind: 0,-4
-          tiles: CAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAABAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAwAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAAAYgAAAAADAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAQAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAEAYgAAAAABAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAA==
+          tiles: CAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAgBiAAAAAAIAYgAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAIAYgAAAAADAGIAAAAAAgAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAgBiAAAAAAIACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAABiAAAAAAIAYgAAAAABAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAwAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAEACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAADAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAA==
           version: 7
         0,-5:
           ind: 0,-5
-          tiles: CAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAABAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAQAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAIACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwAHAAAAAAAABwAAAAAAAA==
+          tiles: CAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAABAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAgAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAAAHAAAAAAAABwAAAAAAAA==
           version: 7
         0,-6:
           ind: 0,-6
@@ -1268,23 +1185,23 @@ entities:
           version: 7
         1,-3:
           ind: 1,-3
-          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAAABwAAAAAAAAAAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAwBiAAAAAAMAYgAAAAABAAcAAAAAAAAAAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAwAHAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAADAAcAAAAAAAAAAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAAAHAAAAAAAAAAAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAMABwAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAwAHAAAAAAAAAAAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAMABwAAAAAAAAAAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAACAAcAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAgBiAAAAAAIABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAwAHAAAAAAAAYgAAAAACAA==
+          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAwBiAAAAAAAABwAAAAAAAAAAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAACAAcAAAAAAAAAAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAAAHAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAAAAAcAAAAAAAAAAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAgAHAAAAAAAAAAAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAAABwAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAAAHAAAAAAAAAAAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAEABwAAAAAAAAAAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAACAAcAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAQBiAAAAAAIABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAADAAcAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAQAHAAAAAAAAYgAAAAABAA==
           version: 7
         1,-4:
           ind: 1,-4
-          tiles: YgAAAAACAGIAAAAAAwAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAIABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAQAHAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAEABwAAAAAAAGIAAAAAAwBiAAAAAAEABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAQAHAAAAAAAAAAAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAAABwAAAAAAAAAAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAACAGIAAAAAAwBiAAAAAAIAYgAAAAAAAAcAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAwBiAAAAAAIAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAEABwAAAAAAAAAAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAADAAcAAAAAAAAAAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAACAGIAAAAAAgAHAAAAAAAAAAAAAAAAAA==
+          tiles: YgAAAAABAGIAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAEABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAQAHAAAAAAAABwAAAAAAAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAADAAcAAAAAAAAHAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAgAHAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAIABwAAAAAAAGIAAAAAAwBiAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAADAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAwAHAAAAAAAABwAAAAAAAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAABAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAAAHAAAAAAAAAAAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAgBiAAAAAAMABwAAAAAAAAAAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAMAYgAAAAADAAcAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAEAYgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAMABwAAAAAAAAAAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAAAAAcAAAAAAAAAAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAAAHAAAAAAAAAAAAAAAAAA==
           version: 7
         1,-2:
           ind: 1,-2
-          tiles: YgAAAAADAGIAAAAAAQBiAAAAAAMABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAACAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAMABwAAAAAAAGIAAAAAAgBiAAAAAAMAEQAAAAADABEAAAAAAgARAAAAAAMAEQAAAAABAGIAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAgAHAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAACAAcAAAAAAABiAAAAAAMAYgAAAAADABEAAAAAAQADAAAAAAEAAwAAAAAAABEAAAAAAgBiAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAEABwAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAAAHAAAAAAAAEQAAAAABABEAAAAAAQARAAAAAAMAAwAAAAABAAMAAAAAAQARAAAAAAEAEQAAAAABABEAAAAAAwBiAAAAAAEAYgAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAIABwAAAAAAABEAAAAAAgADAAAAAAEAAwAAAAAAAAMAAAAAAwADAAAAAAIAAwAAAAABAAMAAAAAAwARAAAAAAAAYgAAAAADAGIAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAARAAAAAAMAAwAAAAADAAMAAAAAAAADAAAAAAEAAwAAAAAAAAMAAAAAAQADAAAAAAMAEQAAAAABAGIAAAAAAwBiAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAEQAAAAADABEAAAAAAQARAAAAAAIAAwAAAAAAAAMAAAAAAwARAAAAAAMAEQAAAAAAABEAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAIAEQAAAAABAAMAAAAAAQADAAAAAAMAEQAAAAADAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAQBiAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAACABEAAAAAAQARAAAAAAAAEQAAAAABABEAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAABiAAAAAAIABwAAAAAAAA==
+          tiles: YgAAAAAAAGIAAAAAAgBiAAAAAAMABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAMAYgAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAgBiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAACAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAACAGIAAAAAAgBiAAAAAAEAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAIABwAAAAAAAGIAAAAAAQBiAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAABAAcAAAAAAABiAAAAAAMAYgAAAAADABUAAAAAAAADAAAAAAEAAwAAAAADABUAAAAAAABiAAAAAAIAYgAAAAACAGIAAAAAAQBiAAAAAAIABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAADAGIAAAAAAAAHAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAAwAAAAACAAMAAAAAAwAVAAAAAAAAFQAAAAAAABUAAAAAAABiAAAAAAAAYgAAAAABAAcAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAMABwAAAAAAABUAAAAAAAADAAAAAAMAAwAAAAAAAAMAAAAAAAADAAAAAAEAAwAAAAADAAMAAAAAAgAVAAAAAAAAYgAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAVAAAAAAAAAwAAAAABAAMAAAAAAAADAAAAAAEAAwAAAAACAAMAAAAAAAADAAAAAAMAFQAAAAAAAGIAAAAAAgBiAAAAAAMABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAAwAAAAAAAAMAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAAAFQAAAAAAAAMAAAAAAAADAAAAAAIAFQAAAAAAAGIAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAAABwAAAAAAAA==
           version: 7
         2,-3:
           ind: 2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAADAGIAAAAAAQAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAQBiAAAAAAEAYgAAAAACAGIAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAIABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         2,-2:
           ind: 2,-2
-          tiles: BwAAAAAAAAcAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAQAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAACAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAQAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAACAGIAAAAAAgBiAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAACAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAMAYgAAAAACAGIAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAAAAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAIABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAMAYgAAAAACAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAABAGIAAAAAAgAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAgBiAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAMAYgAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAABAGIAAAAAAwAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAABiAAAAAAIABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAAAYgAAAAACAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: BwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAQAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAMAYgAAAAADAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAwAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAwBiAAAAAAMAYgAAAAACAGIAAAAAAgAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAIABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAIAYgAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAADAGIAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAABiAAAAAAIABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAEAYgAAAAACAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAAAAGIAAAAAAgAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAQBiAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAEAYgAAAAABAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         1,-1:
           ind: 1,-1
@@ -1292,15 +1209,15 @@ entities:
           version: 7
         2,-4:
           ind: 2,-4
-          tiles: YgAAAAACAGIAAAAAAQBiAAAAAAIABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAEAYgAAAAADAGIAAAAAAgBiAAAAAAAAYgAAAAACAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAwAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAABiAAAAAAEABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAgBiAAAAAAMAYgAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAgAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: YgAAAAACAGIAAAAAAgBiAAAAAAIABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAABAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAABAGIAAAAAAwAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAQBiAAAAAAEAYgAAAAADAGIAAAAAAQBiAAAAAAIABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAEAYgAAAAAAAGIAAAAAAgBiAAAAAAAAYgAAAAADAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAABAGIAAAAAAgAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         1,-5:
           ind: 1,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAgAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAEABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAgBiAAAAAAEAYgAAAAACAGIAAAAAAgBiAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAACAGIAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAMAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAACAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAADAGIAAAAAAgBiAAAAAAIAYgAAAAABAGIAAAAAAABiAAAAAAMAYgAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAABiAAAAAAMABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAAAYgAAAAABAAcAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAADAGIAAAAAAwBiAAAAAAAAYgAAAAAAAGIAAAAAAgBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAIAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAADAGIAAAAAAwBiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAACAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAgAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAABiAAAAAAIABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAGIAAAAAAwBiAAAAAAAAYgAAAAABAGIAAAAAAQBiAAAAAAMAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAAAAGIAAAAAAgAHAAAAAAAABwAAAAAAAAcAAAAAAABiAAAAAAAAYgAAAAACAGIAAAAAAABiAAAAAAEAYgAAAAACAGIAAAAAAgBiAAAAAAMAYgAAAAADAGIAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAQBiAAAAAAEAYgAAAAABAGIAAAAAAQBiAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAEAYgAAAAACAGIAAAAAAwBiAAAAAAEABwAAAAAAAGIAAAAAAgBiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAEAYgAAAAACAGIAAAAAAABiAAAAAAIAYgAAAAADAGIAAAAAAwBiAAAAAAIAYgAAAAADAGIAAAAAAQBiAAAAAAMAYgAAAAADAAcAAAAAAABiAAAAAAMAYgAAAAABAGIAAAAAAwBiAAAAAAEAYgAAAAABAGIAAAAAAgBiAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAMAYgAAAAACAGIAAAAAAwBiAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAYgAAAAABAGIAAAAAAwBiAAAAAAAAYgAAAAADAGIAAAAAAwBiAAAAAAMAYgAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAQBiAAAAAAIAYgAAAAADAA==
           version: 7
         2,-5:
           ind: 2,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAABiAAAAAAAAYgAAAAADAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAAAYgAAAAADAGIAAAAAAQAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAAAAGIAAAAAAQBiAAAAAAIABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAQBiAAAAAAIAYgAAAAACAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAAAYgAAAAABAGIAAAAAAgAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAMABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAgBiAAAAAAMAYgAAAAABAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAAAYgAAAAAAAGIAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAABAGIAAAAAAgBiAAAAAAMABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGIAAAAAAQBiAAAAAAAAYgAAAAABAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAAAAIAYgAAAAABAGIAAAAAAQAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYgAAAAADAGIAAAAAAABiAAAAAAEABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
     - type: Broadphase
     - type: Physics
@@ -1309,6 +1226,8 @@ entities:
       bodyType: Dynamic
     - type: Fixtures
       fixtures: {}
+    - type: BecomesStation
+      id: Relic
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
@@ -1613,79 +1532,23 @@ entities:
         uniqueMixes:
         - volume: 2500
           immutable: True
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+          moles: {}
         - volume: 2500
           temperature: 293.15
           moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 6666.982
+        - volume: 2500
+          temperature: 293.15
+          moles: {}
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Nitrogen: 6666.982
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -1715,6 +1578,8 @@ entities:
       - 3322
       - 3315
       - 3242
+    - type: Fixtures
+      fixtures: {}
   - uid: 1602
     components:
     - type: Transform
@@ -1729,6 +1594,8 @@ entities:
       - 1752
       - 2790
       - 2757
+    - type: Fixtures
+      fixtures: {}
   - uid: 2968
     components:
     - type: Transform
@@ -1743,6 +1610,8 @@ entities:
       - 3980
       - 2978
       - 2979
+    - type: Fixtures
+      fixtures: {}
   - uid: 3162
     components:
     - type: Transform
@@ -1763,6 +1632,8 @@ entities:
       - 11451
       - 11454
       - 11450
+    - type: Fixtures
+      fixtures: {}
   - uid: 5210
     components:
     - type: Transform
@@ -1780,6 +1651,8 @@ entities:
       - 2828
       - 2071
       - 8530
+    - type: Fixtures
+      fixtures: {}
   - uid: 5864
     components:
     - type: Transform
@@ -1801,6 +1674,8 @@ entities:
       - 2936
       - 11482
       - 11500
+    - type: Fixtures
+      fixtures: {}
   - uid: 6165
     components:
     - type: Transform
@@ -1832,6 +1707,8 @@ entities:
       - 3433
       - 3492
       - 3510
+    - type: Fixtures
+      fixtures: {}
   - uid: 6523
     components:
     - type: Transform
@@ -1843,6 +1720,8 @@ entities:
       - 8244
       - 4181
       - 2464
+    - type: Fixtures
+      fixtures: {}
   - uid: 6524
     components:
     - type: Transform
@@ -1858,6 +1737,8 @@ entities:
       - 4154
       - 1477
       - 7733
+    - type: Fixtures
+      fixtures: {}
   - uid: 6526
     components:
     - type: Transform
@@ -1870,6 +1751,8 @@ entities:
       - 4051
       - 8221
       - 2073
+    - type: Fixtures
+      fixtures: {}
   - uid: 6527
     components:
     - type: Transform
@@ -1895,6 +1778,8 @@ entities:
       - 3800
       - 8549
       - 8559
+    - type: Fixtures
+      fixtures: {}
   - uid: 6529
     components:
     - type: Transform
@@ -1922,6 +1807,8 @@ entities:
       - 4190
       - 4191
       - 4192
+    - type: Fixtures
+      fixtures: {}
   - uid: 6530
     components:
     - type: Transform
@@ -1935,6 +1822,8 @@ entities:
       - 4190
       - 4191
       - 2972
+    - type: Fixtures
+      fixtures: {}
   - uid: 6531
     components:
     - type: Transform
@@ -1956,6 +1845,8 @@ entities:
       - 2955
       - 2965
       - 2969
+    - type: Fixtures
+      fixtures: {}
   - uid: 6532
     components:
     - type: Transform
@@ -1972,6 +1863,8 @@ entities:
       - 3680
       - 2970
       - 2969
+    - type: Fixtures
+      fixtures: {}
   - uid: 6533
     components:
     - type: Transform
@@ -1992,6 +1885,8 @@ entities:
       - 3659
       - 3649
       - 3671
+    - type: Fixtures
+      fixtures: {}
   - uid: 6534
     components:
     - type: Transform
@@ -2007,6 +1902,8 @@ entities:
       - 4195
       - 3843
       - 3844
+    - type: Fixtures
+      fixtures: {}
   - uid: 6535
     components:
     - type: Transform
@@ -2026,6 +1923,8 @@ entities:
       - 3889
       - 3890
       - 3872
+    - type: Fixtures
+      fixtures: {}
   - uid: 6536
     components:
     - type: Transform
@@ -2039,6 +1938,8 @@ entities:
       - 3874
       - 3873
       - 3875
+    - type: Fixtures
+      fixtures: {}
   - uid: 6537
     components:
     - type: Transform
@@ -2057,6 +1958,8 @@ entities:
       - 4197
       - 2957
       - 2956
+    - type: Fixtures
+      fixtures: {}
   - uid: 6538
     components:
     - type: Transform
@@ -2070,6 +1973,8 @@ entities:
       - 4197
       - 4198
       - 4200
+    - type: Fixtures
+      fixtures: {}
   - uid: 6539
     components:
     - type: Transform
@@ -2086,6 +1991,8 @@ entities:
       - 3611
       - 3609
       - 3349
+    - type: Fixtures
+      fixtures: {}
   - uid: 6542
     components:
     - type: Transform
@@ -2103,6 +2010,8 @@ entities:
       - 8225
       - 2947
       - 6540
+    - type: Fixtures
+      fixtures: {}
   - uid: 6543
     components:
     - type: Transform
@@ -2117,6 +2026,8 @@ entities:
       - 4207
       - 3518
       - 3349
+    - type: Fixtures
+      fixtures: {}
   - uid: 6545
     components:
     - type: Transform
@@ -2131,6 +2042,8 @@ entities:
       - 4208
       - 3456
       - 3455
+    - type: Fixtures
+      fixtures: {}
   - uid: 6546
     components:
     - type: Transform
@@ -2142,6 +2055,8 @@ entities:
       - 4209
       - 4207
       - 3489
+    - type: Fixtures
+      fixtures: {}
   - uid: 6547
     components:
     - type: Transform
@@ -2149,15 +2064,16 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8237
-      - 2923
-      - 4210
-      - 8233
-      - 4207
-      - 3206
-      - 3316
-      - 3419
       - 3418
+      - 3419
+      - 3316
+      - 3206
+      - 4207
+      - 8233
+      - 4210
+      - 2923
+    - type: Fixtures
+      fixtures: {}
   - uid: 6554
     components:
     - type: Transform
@@ -2171,6 +2087,8 @@ entities:
       - 396
       - 3979
       - 3978
+    - type: Fixtures
+      fixtures: {}
   - uid: 6555
     components:
     - type: Transform
@@ -2187,6 +2105,8 @@ entities:
       - 8534
       - 4272
       - 4222
+    - type: Fixtures
+      fixtures: {}
   - uid: 6556
     components:
     - type: Transform
@@ -2201,6 +2121,8 @@ entities:
       - 1309
       - 4221
       - 8534
+    - type: Fixtures
+      fixtures: {}
   - uid: 6558
     components:
     - type: Transform
@@ -2216,6 +2138,8 @@ entities:
       - 2071
       - 4225
       - 2867
+    - type: Fixtures
+      fixtures: {}
   - uid: 6559
     components:
     - type: Transform
@@ -2241,6 +2165,8 @@ entities:
       - 2790
       - 4225
       - 8534
+    - type: Fixtures
+      fixtures: {}
   - uid: 6563
     components:
     - type: Transform
@@ -2257,6 +2183,8 @@ entities:
       - 2628
       - 4216
       - 2944
+    - type: Fixtures
+      fixtures: {}
   - uid: 6564
     components:
     - type: Transform
@@ -2281,6 +2209,8 @@ entities:
       - 4214
       - 4212
       - 1462
+    - type: Fixtures
+      fixtures: {}
   - uid: 6572
     components:
     - type: Transform
@@ -2301,6 +2231,8 @@ entities:
       - 2964
       - 2963
       - 2962
+    - type: Fixtures
+      fixtures: {}
   - uid: 6614
     components:
     - type: Transform
@@ -2313,6 +2245,8 @@ entities:
       - 8539
       - 6659
       - 6671
+    - type: Fixtures
+      fixtures: {}
   - uid: 7434
     components:
     - type: Transform
@@ -2339,12 +2273,16 @@ entities:
       - 8545
       - 8546
       - 11449
+    - type: Fixtures
+      fixtures: {}
   - uid: 8220
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 57.5,47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 8222
     components:
     - type: Transform
@@ -2368,6 +2306,8 @@ entities:
       - 2954
       - 2953
       - 2952
+    - type: Fixtures
+      fixtures: {}
   - uid: 8228
     components:
     - type: Transform
@@ -2380,6 +2320,8 @@ entities:
       - 4199
       - 4200
       - 3610
+    - type: Fixtures
+      fixtures: {}
   - uid: 8231
     components:
     - type: Transform
@@ -2396,6 +2338,8 @@ entities:
       - 3379
       - 2931
       - 8225
+    - type: Fixtures
+      fixtures: {}
   - uid: 8236
     components:
     - type: Transform
@@ -2403,13 +2347,14 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 2922
-      - 8237
-      - 8233
-      - 4210
-      - 4211
-      - 3200
       - 11438
+      - 3200
+      - 4211
+      - 4210
+      - 8233
+      - 2922
+    - type: Fixtures
+      fixtures: {}
   - uid: 8240
     components:
     - type: Transform
@@ -2423,6 +2368,8 @@ entities:
       - 3495
       - 3497
       - 3496
+    - type: Fixtures
+      fixtures: {}
   - uid: 8241
     components:
     - type: Transform
@@ -2442,6 +2389,8 @@ entities:
       - 2928
       - 2929
       - 2931
+    - type: Fixtures
+      fixtures: {}
   - uid: 8509
     components:
     - type: Transform
@@ -2465,6 +2414,8 @@ entities:
       - 8534
       - 2071
       - 4272
+    - type: Fixtures
+      fixtures: {}
   - uid: 8532
     components:
     - type: Transform
@@ -2491,6 +2442,8 @@ entities:
       - 2071
       - 6688
       - 4191
+    - type: Fixtures
+      fixtures: {}
   - uid: 8538
     components:
     - type: Transform
@@ -2508,6 +2461,8 @@ entities:
       - 6654
       - 6650
       - 6651
+    - type: Fixtures
+      fixtures: {}
   - uid: 8540
     components:
     - type: Transform
@@ -2518,6 +2473,8 @@ entities:
       - 6675
       - 6688
       - 2790
+    - type: Fixtures
+      fixtures: {}
   - uid: 8542
     components:
     - type: Transform
@@ -2533,6 +2490,8 @@ entities:
       - 8543
       - 6644
       - 6643
+    - type: Fixtures
+      fixtures: {}
   - uid: 8544
     components:
     - type: Transform
@@ -2545,6 +2504,8 @@ entities:
       - 4211
       - 4191
       - 2916
+    - type: Fixtures
+      fixtures: {}
   - uid: 10232
     components:
     - type: Transform
@@ -2565,6 +2526,8 @@ entities:
       - 10056
       - 10029
       - 10031
+    - type: Fixtures
+      fixtures: {}
   - uid: 10233
     components:
     - type: Transform
@@ -2604,6 +2567,8 @@ entities:
       - 10015
       - 10012
       - 9926
+    - type: Fixtures
+      fixtures: {}
   - uid: 10234
     components:
     - type: Transform
@@ -2622,6 +2587,8 @@ entities:
       - 10178
       - 10177
       - 10182
+    - type: Fixtures
+      fixtures: {}
   - uid: 10235
     components:
     - type: Transform
@@ -2639,6 +2606,8 @@ entities:
       - 10200
       - 10199
       - 10197
+    - type: Fixtures
+      fixtures: {}
   - uid: 10236
     components:
     - type: Transform
@@ -2658,6 +2627,8 @@ entities:
       - 10130
       - 10131
       - 10134
+    - type: Fixtures
+      fixtures: {}
   - uid: 10237
     components:
     - type: Transform
@@ -2671,6 +2642,8 @@ entities:
       - 10220
       - 10221
       - 9808
+    - type: Fixtures
+      fixtures: {}
   - uid: 10238
     components:
     - type: Transform
@@ -2686,6 +2659,8 @@ entities:
       - 10222
       - 9809
       - 9807
+    - type: Fixtures
+      fixtures: {}
   - uid: 10239
     components:
     - type: Transform
@@ -2718,6 +2693,8 @@ entities:
       - 9853
       - 9854
       - 9872
+    - type: Fixtures
+      fixtures: {}
   - uid: 10240
     components:
     - type: Transform
@@ -2734,6 +2711,8 @@ entities:
       - 9837
       - 9836
       - 9834
+    - type: Fixtures
+      fixtures: {}
   - uid: 10241
     components:
     - type: Transform
@@ -2752,6 +2731,8 @@ entities:
       - 9880
       - 9881
       - 9879
+    - type: Fixtures
+      fixtures: {}
   - uid: 11566
     components:
     - type: Transform
@@ -2760,6 +2741,8 @@ entities:
     - type: DeviceList
       devices:
       - 7749
+    - type: Fixtures
+      fixtures: {}
 - proto: AirCanister
   entities:
   - uid: 53
@@ -2790,7 +2773,7 @@ entities:
       pos: 36.5,-6.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -12907.095
+      secondsUntilStateChange: -21848.14
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -2802,6 +2785,11 @@ entities:
       parent: 2
 - proto: AirlockChapelLocked
   entities:
+  - uid: 270
+    components:
+    - type: Transform
+      pos: 3.5,17.5
+      parent: 2
   - uid: 7158
     components:
     - type: Transform
@@ -2976,6 +2964,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 13.5,27.5
       parent: 2
+    - type: AccessReader
+      accessListsOriginal: []
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -3110,18 +3100,6 @@ entities:
           - InputB
     - type: DeviceLinkSink
       invokeCounter: 1
-  - uid: 3266
-    components:
-    - type: Transform
-      pos: 57.5,-20.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        3235:
-        - - DoorStatus
-          - InputA
-        - - DockStatus
-          - InputB
 - proto: AirlockExternalGlassShuttleEscape
   entities:
   - uid: 674
@@ -3136,6 +3114,20 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,24.5
       parent: 2
+- proto: AirlockExternalGlassShuttleLocked
+  entities:
+  - uid: 3266
+    components:
+    - type: Transform
+      pos: 57.5,-20.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        3235:
+        - - DoorStatus
+          - InputA
+        - - DockStatus
+          - InputB
 - proto: AirlockExternalLocked
   entities:
   - uid: 2795
@@ -4111,209 +4103,281 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 19.5,22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4235
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 15.5,28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4916
     components:
     - type: Transform
       pos: 43.5,52.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4917
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 58.5,57.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4918
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 62.5,49.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4919
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 55.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4920
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 58.5,27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4921
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 55.5,22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4925
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 50.5,22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4927
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4928
     components:
     - type: Transform
       pos: 44.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4932
     components:
     - type: Transform
       pos: 9.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4933
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 22.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4934
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 31.5,31.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4936
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 40.5,14.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4937
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4942
     components:
     - type: Transform
       rot: -3.141592653589793 rad
       pos: 59.5,4.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4943
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 59.5,11.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4944
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 55.5,-1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4945
     components:
     - type: Transform
       pos: 35.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4948
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,-10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4949
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 14.5,-1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4950
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 21.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4951
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,-1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4952
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4953
     components:
     - type: Transform
       pos: -2.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4955
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,9.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4956
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 11.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4957
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 35.5,14.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 5005
     components:
     - type: Transform
       pos: 25.5,-13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 6164
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 47.5,6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 6660
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 43.5,30.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7012
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 21.5,-6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7571
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 29.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 8274
     components:
     - type: Transform
       pos: 50.5,15.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 8290
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 31.5,24.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: APCHighCapacity
   entities:
   - uid: 9462
@@ -4321,78 +4385,104 @@ entities:
     - type: Transform
       pos: 15.5,-39.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
   - uid: 9463
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 19.5,-39.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
   - uid: 9464
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 12.5,-31.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
   - uid: 9465
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 33.5,-31.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
   - uid: 9466
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 14.5,-30.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
   - uid: 9467
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 20.5,-20.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
   - uid: 9468
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 19.5,-59.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
   - uid: 9469
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 10.5,-60.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
   - uid: 9470
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,-64.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
   - uid: 9471
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 31.5,-60.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
   - uid: 9472
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 28.5,-70.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
   - uid: 9473
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 15.5,-68.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
   - uid: 9651
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 8.5,-46.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
 - proto: ArrivalsShuttleTimer
   entities:
   - uid: 6152
@@ -4400,11 +4490,15 @@ entities:
     - type: Transform
       pos: 62.5,53.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 6153
     components:
     - type: Transform
       pos: 62.5,44.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: ArtistCircuitBoard
   entities:
   - uid: 3812
@@ -4495,12 +4589,6 @@ entities:
     - type: Transform
       pos: 57.5,-4.5
       parent: 2
-  - uid: 8306
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,12.5
-      parent: 2
   - uid: 8309
     components:
     - type: Transform
@@ -4921,12 +5009,12 @@ entities:
   - uid: 1275
     components:
     - type: Transform
-      pos: 31.945509,-11.86088
+      pos: 31.5,-12.5
       parent: 1
   - uid: 1277
     components:
     - type: Transform
-      pos: 37.848846,32.127415
+      pos: 37.5,31.5
       parent: 1
 - proto: BaseGasCondenser
   entities:
@@ -5372,7 +5460,7 @@ entities:
       parent: 2
 - proto: BlastDoor
   entities:
-  - uid: 207
+  - uid: 122
     components:
     - type: Transform
       pos: -8.5,12.5
@@ -5834,13 +5922,6 @@ entities:
     - type: Transform
       pos: 42.5,21.5
       parent: 2
-- proto: BrigmedicIDCard
-  entities:
-  - uid: 11116
-    components:
-    - type: Transform
-      pos: 30.5,-21.5
-      parent: 3564
 - proto: Brutepack1
   entities:
   - uid: 3227
@@ -18954,13 +19035,6 @@ entities:
     - type: Transform
       pos: 59.49891,26.586502
       parent: 2
-- proto: CaptainSabre
-  entities:
-  - uid: 7174
-    components:
-    - type: Transform
-      pos: 59.5,23.5
-      parent: 2
 - proto: CarbonDioxideCanister
   entities:
   - uid: 138
@@ -18988,450 +19062,6 @@ entities:
     - type: Transform
       pos: 43.5,-7.5
       parent: 2
-- proto: Carpet
-  entities:
-  - uid: 2037
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,12.5
-      parent: 2
-  - uid: 2040
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,13.5
-      parent: 2
-  - uid: 2041
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,14.5
-      parent: 2
-  - uid: 5599
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,13.5
-      parent: 2
-  - uid: 5621
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,14.5
-      parent: 2
-  - uid: 5623
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,12.5
-      parent: 2
-- proto: CarpetBlack
-  entities:
-  - uid: 7309
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,13.5
-      parent: 2
-  - uid: 7310
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,13.5
-      parent: 2
-  - uid: 7311
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,13.5
-      parent: 2
-  - uid: 7312
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,13.5
-      parent: 2
-  - uid: 7313
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,11.5
-      parent: 2
-  - uid: 7314
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,11.5
-      parent: 2
-  - uid: 7315
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,11.5
-      parent: 2
-  - uid: 7316
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,11.5
-      parent: 2
-  - uid: 7317
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,15.5
-      parent: 2
-  - uid: 7318
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,15.5
-      parent: 2
-  - uid: 7319
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,15.5
-      parent: 2
-  - uid: 7586
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,15.5
-      parent: 2
-- proto: CarpetBlue
-  entities:
-  - uid: 2408
-    components:
-    - type: Transform
-      pos: 57.5,24.5
-      parent: 2
-  - uid: 2409
-    components:
-    - type: Transform
-      pos: 58.5,24.5
-      parent: 2
-  - uid: 2410
-    components:
-    - type: Transform
-      pos: 59.5,23.5
-      parent: 2
-  - uid: 2411
-    components:
-    - type: Transform
-      pos: 59.5,22.5
-      parent: 2
-  - uid: 2414
-    components:
-    - type: Transform
-      pos: 56.5,22.5
-      parent: 2
-  - uid: 2415
-    components:
-    - type: Transform
-      pos: 56.5,23.5
-      parent: 2
-  - uid: 2416
-    components:
-    - type: Transform
-      pos: 57.5,23.5
-      parent: 2
-  - uid: 2417
-    components:
-    - type: Transform
-      pos: 58.5,23.5
-      parent: 2
-  - uid: 2418
-    components:
-    - type: Transform
-      pos: 58.5,22.5
-      parent: 2
-  - uid: 2419
-    components:
-    - type: Transform
-      pos: 57.5,22.5
-      parent: 2
-  - uid: 2420
-    components:
-    - type: Transform
-      pos: 57.5,21.5
-      parent: 2
-  - uid: 2421
-    components:
-    - type: Transform
-      pos: 58.5,21.5
-      parent: 2
-- proto: CarpetChapel
-  entities:
-  - uid: 268
-    components:
-    - type: Transform
-      pos: -2.5,9.5
-      parent: 2
-  - uid: 270
-    components:
-    - type: Transform
-      pos: -0.5,9.5
-      parent: 2
-  - uid: 271
-    components:
-    - type: Transform
-      pos: -0.5,11.5
-      parent: 2
-  - uid: 323
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,14.5
-      parent: 2
-  - uid: 324
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,15.5
-      parent: 2
-  - uid: 325
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,10.5
-      parent: 2
-  - uid: 327
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,10.5
-      parent: 2
-  - uid: 328
-    components:
-    - type: Transform
-      pos: -4.5,9.5
-      parent: 2
-  - uid: 329
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,9.5
-      parent: 2
-  - uid: 330
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,12.5
-      parent: 2
-  - uid: 331
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,10.5
-      parent: 2
-  - uid: 332
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,15.5
-      parent: 2
-  - uid: 333
-    components:
-    - type: Transform
-      pos: -6.5,14.5
-      parent: 2
-  - uid: 334
-    components:
-    - type: Transform
-      pos: -6.5,9.5
-      parent: 2
-  - uid: 335
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,9.5
-      parent: 2
-  - uid: 336
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,15.5
-      parent: 2
-  - uid: 383
-    components:
-    - type: Transform
-      pos: -0.5,13.5
-      parent: 2
-  - uid: 527
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,10.5
-      parent: 2
-  - uid: 528
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,10.5
-      parent: 2
-  - uid: 529
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,12.5
-      parent: 2
-  - uid: 530
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,14.5
-      parent: 2
-  - uid: 531
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,12.5
-      parent: 2
-  - uid: 561
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,14.5
-      parent: 2
-  - uid: 1366
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,14.5
-      parent: 2
-  - uid: 1367
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,15.5
-      parent: 2
-  - uid: 1368
-    components:
-    - type: Transform
-      pos: -4.5,14.5
-      parent: 2
-  - uid: 1756
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,10.5
-      parent: 2
-  - uid: 3150
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,14.5
-      parent: 2
-  - uid: 4853
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,9.5
-      parent: 2
-  - uid: 6987
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,11.5
-      parent: 2
-  - uid: 7147
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,13.5
-      parent: 2
-  - uid: 7305
-    components:
-    - type: Transform
-      pos: -2.5,13.5
-      parent: 2
-  - uid: 7306
-    components:
-    - type: Transform
-      pos: -2.5,11.5
-      parent: 2
-  - uid: 7307
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,12.5
-      parent: 2
-  - uid: 7308
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,14.5
-      parent: 2
-  - uid: 7323
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,10.5
-      parent: 2
-  - uid: 7324
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,10.5
-      parent: 2
-  - uid: 7583
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,9.5
-      parent: 2
-  - uid: 7584
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,11.5
-      parent: 2
-  - uid: 7585
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,13.5
-      parent: 2
-- proto: CarpetSBlue
-  entities:
-  - uid: 2031
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,12.5
-      parent: 2
-  - uid: 2032
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,12.5
-      parent: 2
-  - uid: 2033
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,13.5
-      parent: 2
-  - uid: 2034
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,13.5
-      parent: 2
-  - uid: 2035
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,14.5
-      parent: 2
-  - uid: 2036
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,14.5
-      parent: 2
 - proto: Catwalk
   entities:
   - uid: 847
@@ -20269,13 +19899,175 @@ entities:
     - type: Transform
       pos: 5.5,-41.5
       parent: 3564
-  - uid: 7267
-    components:
-    - type: Transform
-      pos: 54.5,60.5
-      parent: 2
 - proto: Chair
   entities:
+  - uid: 207
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,14.5
+      parent: 2
+  - uid: 267
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,15.5
+      parent: 2
+  - uid: 330
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,14.5
+      parent: 2
+  - uid: 331
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,13.5
+      parent: 2
+  - uid: 332
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,11.5
+      parent: 2
+  - uid: 333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,10.5
+      parent: 2
+  - uid: 334
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,9.5
+      parent: 2
+  - uid: 335
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,11.5
+      parent: 2
+  - uid: 336
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,10.5
+      parent: 2
+  - uid: 337
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,9.5
+      parent: 2
+  - uid: 338
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,9.5
+      parent: 2
+  - uid: 339
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,14.5
+      parent: 2
+  - uid: 340
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,13.5
+      parent: 2
+  - uid: 341
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,15.5
+      parent: 2
+  - uid: 342
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,15.5
+      parent: 2
+  - uid: 343
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,14.5
+      parent: 2
+  - uid: 344
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,10.5
+      parent: 2
+  - uid: 345
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,9.5
+      parent: 2
+  - uid: 346
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,15.5
+      parent: 2
+  - uid: 347
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,10.5
+      parent: 2
+  - uid: 348
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,33.5
+      parent: 2
+  - uid: 349
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,30.5
+      parent: 2
+  - uid: 350
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,31.5
+      parent: 2
+  - uid: 351
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,32.5
+      parent: 2
+  - uid: 352
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,33.5
+      parent: 2
+  - uid: 353
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,33.5
+      parent: 2
+  - uid: 354
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,33.5
+      parent: 2
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 58.5,29.5
+      parent: 2
   - uid: 446
     components:
     - type: Transform
@@ -20288,6 +20080,27 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,13.5
       parent: 2
+  - uid: 527
+    components:
+    - type: Transform
+      pos: 60.5,29.5
+      parent: 2
+  - uid: 528
+    components:
+    - type: Transform
+      pos: 59.5,29.5
+      parent: 2
+  - uid: 529
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,33.5
+      parent: 2
+  - uid: 530
+    components:
+    - type: Transform
+      pos: 61.5,29.5
+      parent: 2
   - uid: 618
     components:
     - type: Transform
@@ -20588,134 +20401,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 33.5,-65.5
       parent: 3564
-- proto: ChairWood
-  entities:
-  - uid: 122
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,14.5
-      parent: 2
-  - uid: 267
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,15.5
-      parent: 2
-  - uid: 337
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,14.5
-      parent: 2
-  - uid: 338
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,13.5
-      parent: 2
-  - uid: 339
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,11.5
-      parent: 2
-  - uid: 340
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,10.5
-      parent: 2
-  - uid: 341
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,9.5
-      parent: 2
-  - uid: 342
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,11.5
-      parent: 2
-  - uid: 343
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,10.5
-      parent: 2
-  - uid: 344
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,9.5
-      parent: 2
-  - uid: 345
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,15.5
-      parent: 2
-  - uid: 346
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,14.5
-      parent: 2
-  - uid: 347
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,13.5
-      parent: 2
-  - uid: 348
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,15.5
-      parent: 2
-  - uid: 349
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,15.5
-      parent: 2
-  - uid: 350
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,14.5
-      parent: 2
-  - uid: 351
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,10.5
-      parent: 2
-  - uid: 352
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,9.5
-      parent: 2
-  - uid: 353
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,9.5
-      parent: 2
-  - uid: 354
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,15.5
-      parent: 2
-  - uid: 11350
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,10.5
-      parent: 2
 - proto: CheckerBoard
   entities:
   - uid: 10309
@@ -21096,6 +20781,8 @@ entities:
     - type: Transform
       pos: 59.5,35.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: ClosetWallFireFilledRandom
   entities:
   - uid: 2436
@@ -21103,6 +20790,8 @@ entities:
     - type: Transform
       pos: 60.5,35.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: ClothingBackpack
   entities:
   - uid: 7551
@@ -22005,6 +21694,13 @@ entities:
     - type: Transform
       pos: 30.5,16.5
       parent: 2
+- proto: ClothingMaskWeldingGas
+  entities:
+  - uid: 7147
+    components:
+    - type: Transform
+      pos: 13.5,30.5
+      parent: 2
 - proto: ClothingNeckClownmedal
   entities:
   - uid: 2262
@@ -22600,76 +22296,6 @@ entities:
     - type: Transform
       pos: 45.5,21.5
       parent: 2
-- proto: ComfyChair
-  entities:
-  - uid: 2432
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,33.5
-      parent: 2
-  - uid: 2439
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,32.5
-      parent: 2
-  - uid: 2440
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,31.5
-      parent: 2
-  - uid: 2441
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,30.5
-      parent: 2
-  - uid: 2442
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,33.5
-      parent: 2
-  - uid: 2443
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,33.5
-      parent: 2
-  - uid: 2444
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 58.5,33.5
-      parent: 2
-  - uid: 2445
-    components:
-    - type: Transform
-      pos: 58.5,29.5
-      parent: 2
-  - uid: 2446
-    components:
-    - type: Transform
-      pos: 59.5,29.5
-      parent: 2
-  - uid: 2447
-    components:
-    - type: Transform
-      pos: 60.5,29.5
-      parent: 2
-  - uid: 2450
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,33.5
-      parent: 2
-  - uid: 2981
-    components:
-    - type: Transform
-      pos: 61.5,29.5
-      parent: 2
 - proto: ComputerAlert
   entities:
   - uid: 1459
@@ -22910,18 +22536,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
   - uid: 2798
     components:
     - type: Transform
@@ -23179,14 +22795,6 @@ entities:
     - type: Transform
       pos: 7.5,16.5
       parent: 2
-- proto: CurtainsBlack
-  entities:
-  - uid: 7154
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,17.5
-      parent: 2
 - proto: DefaultStationBeaconAI
   entities:
   - uid: 7619
@@ -23419,12 +23027,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 6330
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,11.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: DefibrillatorCompact
   entities:
   - uid: 2051
@@ -24256,6 +23868,8 @@ entities:
       - 2918
       - 2916
       - 2922
+    - type: Fixtures
+      fixtures: {}
   - uid: 35
     components:
     - type: Transform
@@ -24265,6 +23879,8 @@ entities:
       devices:
       - 2921
       - 3246
+    - type: Fixtures
+      fixtures: {}
   - uid: 433
     components:
     - type: Transform
@@ -24273,6 +23889,8 @@ entities:
     - type: DeviceList
       devices:
       - 396
+    - type: Fixtures
+      fixtures: {}
   - uid: 1968
     components:
     - type: Transform
@@ -24283,6 +23901,8 @@ entities:
       - 6540
       - 2949
       - 2950
+    - type: Fixtures
+      fixtures: {}
   - uid: 2009
     components:
     - type: Transform
@@ -24291,6 +23911,8 @@ entities:
     - type: DeviceList
       devices:
       - 2944
+    - type: Fixtures
+      fixtures: {}
   - uid: 2770
     components:
     - type: Transform
@@ -24302,6 +23924,8 @@ entities:
       - 2406
       - 1741
       - 1735
+    - type: Fixtures
+      fixtures: {}
   - uid: 2967
     components:
     - type: Transform
@@ -24310,6 +23934,8 @@ entities:
     - type: DeviceList
       devices:
       - 2972
+    - type: Fixtures
+      fixtures: {}
   - uid: 2982
     components:
     - type: Transform
@@ -24325,6 +23951,8 @@ entities:
       - 6541
       - 2927
       - 2926
+    - type: Fixtures
+      fixtures: {}
   - uid: 5865
     components:
     - type: Transform
@@ -24334,11 +23962,15 @@ entities:
       devices:
       - 2935
       - 2936
+    - type: Fixtures
+      fixtures: {}
   - uid: 6170
     components:
     - type: Transform
       pos: 59.5,38.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 6528
     components:
     - type: Transform
@@ -24349,6 +23981,8 @@ entities:
       devices:
       - 2970
       - 2969
+    - type: Fixtures
+      fixtures: {}
   - uid: 6565
     components:
     - type: Transform
@@ -24366,6 +24000,8 @@ entities:
       - 2936
       - 2935
       - 3246
+    - type: Fixtures
+      fixtures: {}
   - uid: 6567
     components:
     - type: Transform
@@ -24378,6 +24014,8 @@ entities:
       - 2951
       - 2954
       - 2955
+    - type: Fixtures
+      fixtures: {}
   - uid: 6568
     components:
     - type: Transform
@@ -24393,6 +24031,8 @@ entities:
       - 2954
       - 2953
       - 2952
+    - type: Fixtures
+      fixtures: {}
   - uid: 6569
     components:
     - type: Transform
@@ -24407,6 +24047,8 @@ entities:
       - 2964
       - 2963
       - 2962
+    - type: Fixtures
+      fixtures: {}
   - uid: 6570
     components:
     - type: Transform
@@ -24422,6 +24064,8 @@ entities:
       - 2970
       - 2972
       - 2974
+    - type: Fixtures
+      fixtures: {}
   - uid: 6573
     components:
     - type: Transform
@@ -24431,6 +24075,8 @@ entities:
     - type: DeviceList
       devices:
       - 2912
+    - type: Fixtures
+      fixtures: {}
   - uid: 6578
     components:
     - type: Transform
@@ -24440,6 +24086,8 @@ entities:
       devices:
       - 396
       - 8475
+    - type: Fixtures
+      fixtures: {}
   - uid: 6582
     components:
     - type: Transform
@@ -24448,8 +24096,9 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8237
       - 2923
+    - type: Fixtures
+      fixtures: {}
   - uid: 6584
     components:
     - type: Transform
@@ -24466,12 +24115,16 @@ entities:
       - 6541
       - 2927
       - 2926
+    - type: Fixtures
+      fixtures: {}
   - uid: 6585
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,45.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,50.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 6586
     components:
     - type: Transform
@@ -24482,6 +24135,8 @@ entities:
       devices:
       - 2926
       - 2927
+    - type: Fixtures
+      fixtures: {}
   - uid: 6587
     components:
     - type: Transform
@@ -24492,6 +24147,8 @@ entities:
       devices:
       - 6541
       - 2947
+    - type: Fixtures
+      fixtures: {}
   - uid: 6588
     components:
     - type: Transform
@@ -24502,6 +24159,8 @@ entities:
       - 8225
       - 2947
       - 6540
+    - type: Fixtures
+      fixtures: {}
   - uid: 6591
     components:
     - type: Transform
@@ -24512,6 +24171,8 @@ entities:
       devices:
       - 2951
       - 2949
+    - type: Fixtures
+      fixtures: {}
   - uid: 6592
     components:
     - type: Transform
@@ -24522,6 +24183,8 @@ entities:
       devices:
       - 2956
       - 2957
+    - type: Fixtures
+      fixtures: {}
   - uid: 6593
     components:
     - type: Transform
@@ -24531,6 +24194,8 @@ entities:
     - type: DeviceList
       devices:
       - 2958
+    - type: Fixtures
+      fixtures: {}
   - uid: 6594
     components:
     - type: Transform
@@ -24543,6 +24208,8 @@ entities:
       - 2957
       - 2975
       - 2976
+    - type: Fixtures
+      fixtures: {}
   - uid: 6595
     components:
     - type: Transform
@@ -24554,6 +24221,8 @@ entities:
       - 2961
       - 2975
       - 2976
+    - type: Fixtures
+      fixtures: {}
   - uid: 6642
     components:
     - type: Transform
@@ -24564,6 +24233,8 @@ entities:
       devices:
       - 8539
       - 8543
+    - type: Fixtures
+      fixtures: {}
   - uid: 7781
     components:
     - type: Transform
@@ -24572,6 +24243,8 @@ entities:
     - type: DeviceList
       devices:
       - 2934
+    - type: Fixtures
+      fixtures: {}
   - uid: 8218
     components:
     - type: Transform
@@ -24583,6 +24256,8 @@ entities:
       - 2955
       - 2965
       - 2969
+    - type: Fixtures
+      fixtures: {}
   - uid: 8219
     components:
     - type: Transform
@@ -24594,6 +24269,8 @@ entities:
       - 2974
       - 2978
       - 8549
+    - type: Fixtures
+      fixtures: {}
   - uid: 8223
     components:
     - type: Transform
@@ -24603,6 +24280,8 @@ entities:
     - type: DeviceList
       devices:
       - 8221
+    - type: Fixtures
+      fixtures: {}
   - uid: 8230
     components:
     - type: Transform
@@ -24613,6 +24292,8 @@ entities:
       devices:
       - 2931
       - 8225
+    - type: Fixtures
+      fixtures: {}
   - uid: 8232
     components:
     - type: Transform
@@ -24628,6 +24309,8 @@ entities:
       - 2918
       - 2919
       - 2925
+    - type: Fixtures
+      fixtures: {}
   - uid: 8235
     components:
     - type: Transform
@@ -24636,7 +24319,8 @@ entities:
     - type: DeviceList
       devices:
       - 2922
-      - 8237
+    - type: Fixtures
+      fixtures: {}
   - uid: 8238
     components:
     - type: Transform
@@ -24645,6 +24329,8 @@ entities:
     - type: DeviceList
       devices:
       - 2924
+    - type: Fixtures
+      fixtures: {}
   - uid: 8242
     components:
     - type: Transform
@@ -24656,6 +24342,8 @@ entities:
       - 2928
       - 2929
       - 2931
+    - type: Fixtures
+      fixtures: {}
   - uid: 8247
     components:
     - type: Transform
@@ -24665,6 +24353,8 @@ entities:
       devices:
       - 8248
       - 8246
+    - type: Fixtures
+      fixtures: {}
   - uid: 8249
     components:
     - type: Transform
@@ -24673,6 +24363,8 @@ entities:
     - type: DeviceList
       devices:
       - 8245
+    - type: Fixtures
+      fixtures: {}
   - uid: 8307
     components:
     - type: Transform
@@ -24681,6 +24373,8 @@ entities:
     - type: DeviceList
       devices:
       - 2901
+    - type: Fixtures
+      fixtures: {}
   - uid: 8356
     components:
     - type: Transform
@@ -24690,6 +24384,8 @@ entities:
     - type: DeviceList
       devices:
       - 8539
+    - type: Fixtures
+      fixtures: {}
   - uid: 8528
     components:
     - type: Transform
@@ -24706,6 +24402,8 @@ entities:
       - 1831
       - 8477
       - 2912
+    - type: Fixtures
+      fixtures: {}
   - uid: 8529
     components:
     - type: Transform
@@ -24714,6 +24412,8 @@ entities:
     - type: DeviceList
       devices:
       - 2904
+    - type: Fixtures
+      fixtures: {}
   - uid: 8531
     components:
     - type: Transform
@@ -24729,6 +24429,8 @@ entities:
       - 1741
       - 1735
       - 8475
+    - type: Fixtures
+      fixtures: {}
   - uid: 8533
     components:
     - type: Transform
@@ -24744,6 +24446,8 @@ entities:
       - 7657
       - 1831
       - 8477
+    - type: Fixtures
+      fixtures: {}
   - uid: 8541
     components:
     - type: Transform
@@ -24753,6 +24457,8 @@ entities:
     - type: DeviceList
       devices:
       - 8543
+    - type: Fixtures
+      fixtures: {}
   - uid: 10242
     components:
     - type: Transform
@@ -24762,6 +24468,8 @@ entities:
       devices:
       - 9647
       - 9646
+    - type: Fixtures
+      fixtures: {}
   - uid: 10243
     components:
     - type: Transform
@@ -24772,6 +24480,8 @@ entities:
       devices:
       - 9645
       - 9646
+    - type: Fixtures
+      fixtures: {}
   - uid: 10244
     components:
     - type: Transform
@@ -24781,6 +24491,8 @@ entities:
       devices:
       - 9648
       - 9649
+    - type: Fixtures
+      fixtures: {}
   - uid: 10245
     components:
     - type: Transform
@@ -24792,6 +24504,8 @@ entities:
       - 9643
       - 9644
       - 9648
+    - type: Fixtures
+      fixtures: {}
   - uid: 10246
     components:
     - type: Transform
@@ -24809,6 +24523,8 @@ entities:
       - 9649
       - 9647
       - 9650
+    - type: Fixtures
+      fixtures: {}
   - uid: 10247
     components:
     - type: Transform
@@ -24827,6 +24543,8 @@ entities:
       - 9637
       - 9640
       - 9641
+    - type: Fixtures
+      fixtures: {}
   - uid: 10248
     components:
     - type: Transform
@@ -24835,6 +24553,8 @@ entities:
     - type: DeviceList
       devices:
       - 9635
+    - type: Fixtures
+      fixtures: {}
   - uid: 10249
     components:
     - type: Transform
@@ -24844,6 +24564,8 @@ entities:
       devices:
       - 9634
       - 9633
+    - type: Fixtures
+      fixtures: {}
   - uid: 10250
     components:
     - type: Transform
@@ -24854,6 +24576,8 @@ entities:
       devices:
       - 9631
       - 9632
+    - type: Fixtures
+      fixtures: {}
   - uid: 10251
     components:
     - type: Transform
@@ -24866,6 +24590,8 @@ entities:
       - 9638
       - 9637
       - 9639
+    - type: Fixtures
+      fixtures: {}
 - proto: FireExtinguisher
   entities:
   - uid: 1071
@@ -25718,18 +25444,6 @@ entities:
       - 8231
       - 6588
       - 6542
-  - uid: 8237
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,16.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 8235
-      - 8236
-      - 6582
-      - 6547
   - uid: 8245
     components:
     - type: Transform
@@ -44296,7 +44010,7 @@ entities:
   - uid: 134
     components:
     - type: Transform
-      pos: 68.5,-23.5
+      pos: 6.5,-19.5
       parent: 2
   - uid: 153
     components:
@@ -44973,11 +44687,31 @@ entities:
     - type: Transform
       pos: -0.5,36.5
       parent: 2
+  - uid: 2033
+    components:
+    - type: Transform
+      pos: 5.5,-19.5
+      parent: 2
   - uid: 2038
     components:
     - type: Transform
       pos: 5.5,30.5
       parent: 2
+  - uid: 2040
+    components:
+    - type: Transform
+      pos: 11.5,-19.5
+      parent: 2
+  - uid: 2041
+    components:
+    - type: Transform
+      pos: 12.5,-19.5
+      parent: 2
+  - uid: 2047
+    components:
+    - type: Transform
+      pos: 13.5,-19.5
+      parent: 2
   - uid: 2059
     components:
     - type: Transform
@@ -45084,6 +44818,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,46.5
       parent: 2
+  - uid: 2191
+    components:
+    - type: Transform
+      pos: 14.5,-19.5
+      parent: 2
   - uid: 2345
     components:
     - type: Transform
@@ -45124,6 +44863,126 @@ entities:
     - type: Transform
       pos: 64.5,28.5
       parent: 2
+  - uid: 2392
+    components:
+    - type: Transform
+      pos: 19.5,-19.5
+      parent: 2
+  - uid: 2408
+    components:
+    - type: Transform
+      pos: 27.5,-19.5
+      parent: 2
+  - uid: 2409
+    components:
+    - type: Transform
+      pos: 28.5,-19.5
+      parent: 2
+  - uid: 2410
+    components:
+    - type: Transform
+      pos: 30.5,-19.5
+      parent: 2
+  - uid: 2411
+    components:
+    - type: Transform
+      pos: 23.5,-19.5
+      parent: 2
+  - uid: 2414
+    components:
+    - type: Transform
+      pos: 24.5,-19.5
+      parent: 2
+  - uid: 2415
+    components:
+    - type: Transform
+      pos: 35.5,-19.5
+      parent: 2
+  - uid: 2416
+    components:
+    - type: Transform
+      pos: 36.5,-19.5
+      parent: 2
+  - uid: 2417
+    components:
+    - type: Transform
+      pos: 38.5,-19.5
+      parent: 2
+  - uid: 2418
+    components:
+    - type: Transform
+      pos: 38.5,-18.5
+      parent: 2
+  - uid: 2419
+    components:
+    - type: Transform
+      pos: 33.5,-19.5
+      parent: 2
+  - uid: 2420
+    components:
+    - type: Transform
+      pos: 1.5,-19.5
+      parent: 2
+  - uid: 2421
+    components:
+    - type: Transform
+      pos: 47.5,62.5
+      parent: 2
+  - uid: 2432
+    components:
+    - type: Transform
+      pos: 19.5,62.5
+      parent: 2
+  - uid: 2439
+    components:
+    - type: Transform
+      pos: 20.5,62.5
+      parent: 2
+  - uid: 2440
+    components:
+    - type: Transform
+      pos: 21.5,62.5
+      parent: 2
+  - uid: 2441
+    components:
+    - type: Transform
+      pos: 22.5,62.5
+      parent: 2
+  - uid: 2442
+    components:
+    - type: Transform
+      pos: 26.5,62.5
+      parent: 2
+  - uid: 2443
+    components:
+    - type: Transform
+      pos: 28.5,62.5
+      parent: 2
+  - uid: 2444
+    components:
+    - type: Transform
+      pos: 35.5,62.5
+      parent: 2
+  - uid: 2445
+    components:
+    - type: Transform
+      pos: 36.5,62.5
+      parent: 2
+  - uid: 2446
+    components:
+    - type: Transform
+      pos: 37.5,62.5
+      parent: 2
+  - uid: 2447
+    components:
+    - type: Transform
+      pos: 38.5,62.5
+      parent: 2
+  - uid: 2450
+    components:
+    - type: Transform
+      pos: 39.5,62.5
+      parent: 2
   - uid: 2462
     components:
     - type: Transform
@@ -45174,6 +45033,26 @@ entities:
     - type: Transform
       pos: 68.5,-18.5
       parent: 2
+  - uid: 2792
+    components:
+    - type: Transform
+      pos: 40.5,62.5
+      parent: 2
+  - uid: 2981
+    components:
+    - type: Transform
+      pos: 33.5,62.5
+      parent: 2
+  - uid: 3048
+    components:
+    - type: Transform
+      pos: 32.5,62.5
+      parent: 2
+  - uid: 3150
+    components:
+    - type: Transform
+      pos: 46.5,62.5
+      parent: 2
   - uid: 3260
     components:
     - type: Transform
@@ -45240,6 +45119,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-45.5
       parent: 3564
+  - uid: 3753
+    components:
+    - type: Transform
+      pos: 45.5,62.5
+      parent: 2
+  - uid: 3784
+    components:
+    - type: Transform
+      pos: 42.5,62.5
+      parent: 2
   - uid: 3923
     components:
     - type: Transform
@@ -45393,51 +45282,36 @@ entities:
     - type: Transform
       pos: 68.5,-17.5
       parent: 2
-  - uid: 7390
+  - uid: 7267
+    components:
+    - type: Transform
+      pos: 68.5,-23.5
+      parent: 2
+  - uid: 7285
     components:
     - type: Transform
       pos: 68.5,-24.5
       parent: 2
-  - uid: 7391
+  - uid: 7287
     components:
     - type: Transform
       pos: 68.5,-25.5
       parent: 2
-  - uid: 7392
+  - uid: 7288
     components:
     - type: Transform
       pos: 68.5,-26.5
       parent: 2
-  - uid: 7393
+  - uid: 7289
     components:
     - type: Transform
       pos: 68.5,-27.5
       parent: 2
-  - uid: 7394
-    components:
-    - type: Transform
-      pos: 64.5,-19.5
-      parent: 2
-  - uid: 7406
+  - uid: 7305
     components:
     - type: Transform
       pos: 68.5,-28.5
       parent: 2
-  - uid: 7407
-    components:
-    - type: Transform
-      pos: 68.5,-29.5
-      parent: 2
-  - uid: 7408
-    components:
-    - type: Transform
-      pos: 67.5,-29.5
-      parent: 2
-  - uid: 7410
-    components:
-    - type: Transform
-      pos: 66.5,-29.5
-      parent: 2
   - uid: 7460
     components:
     - type: Transform
@@ -45449,41 +45323,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: 47.5,26.5
       parent: 2
-  - uid: 7656
-    components:
-    - type: Transform
-      pos: 65.5,-29.5
-      parent: 2
   - uid: 7748
     components:
     - type: Transform
       pos: 21.5,23.5
       parent: 2
-  - uid: 7750
-    components:
-    - type: Transform
-      pos: 64.5,-29.5
-      parent: 2
   - uid: 7754
     components:
     - type: Transform
       pos: 21.5,22.5
       parent: 2
-  - uid: 7777
-    components:
-    - type: Transform
-      pos: 63.5,-29.5
-      parent: 2
-  - uid: 7790
-    components:
-    - type: Transform
-      pos: 62.5,-29.5
-      parent: 2
-  - uid: 7824
-    components:
-    - type: Transform
-      pos: 61.5,-29.5
-      parent: 2
   - uid: 7830
     components:
     - type: Transform
@@ -47375,46 +47224,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,37.5
       parent: 2
-  - uid: 8214
-    components:
-    - type: Transform
-      pos: 60.5,-29.5
-      parent: 2
-  - uid: 8215
-    components:
-    - type: Transform
-      pos: 64.5,-20.5
-      parent: 2
-  - uid: 8216
-    components:
-    - type: Transform
-      pos: 65.5,-20.5
-      parent: 2
-  - uid: 8217
-    components:
-    - type: Transform
-      pos: 65.5,-21.5
-      parent: 2
-  - uid: 8297
-    components:
-    - type: Transform
-      pos: 65.5,-22.5
-      parent: 2
-  - uid: 8298
-    components:
-    - type: Transform
-      pos: 65.5,-23.5
-      parent: 2
   - uid: 8301
     components:
     - type: Transform
       pos: 24.5,-1.5
       parent: 2
-  - uid: 8308
-    components:
-    - type: Transform
-      pos: 65.5,-24.5
-      parent: 2
   - uid: 8310
     components:
     - type: Transform
@@ -47427,11 +47241,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 44.5,26.5
       parent: 2
-  - uid: 8314
-    components:
-    - type: Transform
-      pos: 65.5,-25.5
-      parent: 2
   - uid: 8315
     components:
     - type: Transform
@@ -48678,16 +48487,6 @@ entities:
     - type: Transform
       pos: 26.5,-41.5
       parent: 3564
-  - uid: 9925
-    components:
-    - type: Transform
-      pos: 65.5,-26.5
-      parent: 2
-  - uid: 10614
-    components:
-    - type: Transform
-      pos: 65.5,-27.5
-      parent: 2
   - uid: 11213
     components:
     - type: Transform
@@ -49531,173 +49330,6 @@ entities:
     - type: Transform
       pos: 36.5,54.5
       parent: 2
-- proto: HolopadAiMain
-  entities:
-  - uid: 7792
-    components:
-    - type: Transform
-      pos: 45.5,50.5
-      parent: 2
-- proto: HolopadAiUpload
-  entities:
-  - uid: 7793
-    components:
-    - type: Transform
-      pos: 31.5,54.5
-      parent: 2
-- proto: HolopadCommandBridge
-  entities:
-  - uid: 7546
-    components:
-    - type: Transform
-      pos: 57.5,31.5
-      parent: 2
-    - type: Label
-      currentLabel: Command - Control Room
-- proto: HolopadCommandCaptain
-  entities:
-  - uid: 7545
-    components:
-    - type: Transform
-      pos: 57.5,22.5
-      parent: 2
-    - type: Label
-      currentLabel: Command - Secure Storage
-- proto: HolopadCommandHop
-  entities:
-  - uid: 2392
-    components:
-    - type: Transform
-      pos: 45.5,27.5
-      parent: 2
-- proto: HolopadEngineeringAME
-  entities:
-  - uid: 7786
-    components:
-    - type: Transform
-      pos: 45.5,36.5
-      parent: 2
-- proto: HolopadEngineeringAtmosMain
-  entities:
-  - uid: 7782
-    components:
-    - type: Transform
-      pos: 28.5,-8.5
-      parent: 2
-- proto: HolopadEngineeringAtmosTeg
-  entities:
-  - uid: 1562
-    components:
-    - type: Transform
-      pos: 20.5,33.5
-      parent: 2
-- proto: HolopadEngineeringMain
-  entities:
-  - uid: 5342
-    components:
-    - type: Transform
-      pos: 33.5,31.5
-      parent: 2
-- proto: HolopadEngineeringStorage
-  entities:
-  - uid: 4742
-    components:
-    - type: Transform
-      pos: 20.5,41.5
-      parent: 2
-- proto: HolopadEngineeringTelecoms
-  entities:
-  - uid: 1505
-    components:
-    - type: Transform
-      pos: -4.5,6.5
-      parent: 2
-- proto: HolopadGeneralArrivals
-  entities:
-  - uid: 7783
-    components:
-    - type: Transform
-      pos: 60.5,48.5
-      parent: 2
-- proto: HolopadGeneralCryosleep
-  entities:
-  - uid: 5211
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 2
-- proto: HolopadGeneralEvac
-  entities:
-  - uid: 3048
-    components:
-    - type: Transform
-      pos: 59.5,-0.5
-      parent: 2
-  - uid: 7751
-    components:
-    - type: Transform
-      pos: 47.5,-14.5
-      parent: 2
-    - type: Label
-      currentLabel: General - Observation
-- proto: HolopadGeneralEVAStorage
-  entities:
-  - uid: 3753
-    components:
-    - type: Transform
-      pos: 51.5,40.5
-      parent: 2
-- proto: HolopadMedicalChemistry
-  entities:
-  - uid: 5862
-    components:
-    - type: Transform
-      pos: 32.5,10.5
-      parent: 2
-- proto: HolopadMedicalMedbay
-  entities:
-  - uid: 2191
-    components:
-    - type: Transform
-      pos: 17.5,11.5
-      parent: 2
-- proto: HolopadMedicalMorgue
-  entities:
-  - uid: 2047
-    components:
-    - type: Transform
-      pos: 3.5,14.5
-      parent: 2
-- proto: HolopadScienceFront
-  entities:
-  - uid: 1539
-    components:
-    - type: Transform
-      pos: 51.5,5.5
-      parent: 2
-- proto: HolopadSecurityCourtroom
-  entities:
-  - uid: 5345
-    components:
-    - type: Transform
-      pos: 58.5,15.5
-      parent: 2
-    - type: Label
-      currentLabel: Security - Assembly Room
-- proto: HolopadSecurityFront
-  entities:
-  - uid: 1535
-    components:
-    - type: Transform
-      pos: 38.5,0.5
-      parent: 2
-- proto: HolopadServiceChapel
-  entities:
-  - uid: 6177
-    components:
-    - type: Transform
-      pos: -1.5,12.5
-      parent: 2
 - proto: HydroponicsToolMiniHoe
   entities:
   - uid: 10556
@@ -49826,17 +49458,23 @@ entities:
     - type: Transform
       pos: 57.5,35.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4183
     components:
     - type: Transform
       pos: 44.5,52.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7474
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 48.5,28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomCommon
   entities:
   - uid: 36
@@ -49844,57 +49482,77 @@ entities:
     - type: Transform
       pos: 26.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4185
     components:
     - type: Transform
       pos: 46.5,52.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4930
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 15.5,22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7492
     components:
     - type: Transform
       pos: 35.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7501
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7504
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 14.5,-0.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7554
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,-11.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7577
     components:
     - type: Transform
       pos: 56.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7581
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 63.5,15.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 8537
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 11.5,28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomEngineering
   entities:
   - uid: 846
@@ -49902,52 +49560,70 @@ entities:
     - type: Transform
       pos: 29.5,32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 3008
     components:
     - type: Transform
       pos: 15.5,40.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 3072
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 36.5,20.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 5122
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 21.5,-7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 6553
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 34.5,36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 6557
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 31.5,25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 6598
     components:
     - type: Transform
       pos: 31.5,36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7482
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 41.5,33.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 8563
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomMedical
   entities:
   - uid: 1913
@@ -49956,12 +49632,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: 24.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7443
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 14.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomSecurity
   entities:
   - uid: 4184
@@ -49969,6 +49649,8 @@ entities:
     - type: Transform
       pos: 45.5,52.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: JetpackBlueFilled
   entities:
   - uid: 8636
@@ -50075,9 +49757,9 @@ entities:
     - type: Transform
       pos: 23.5,-16.5
       parent: 3564
-- proto: LockerCaptainFilledNoLaser
+- proto: LockerCaptainFilledHardsuit
   entities:
-  - uid: 6176
+  - uid: 561
     components:
     - type: Transform
       pos: 59.5,24.5
@@ -50091,10 +49773,10 @@ entities:
       parent: 2
 - proto: LockerChiefEngineerFilledHardsuit
   entities:
-  - uid: 8325
+  - uid: 2036
     components:
     - type: Transform
-      pos: 18.5,42.5
+      pos: 17.5,41.5
       parent: 2
 - proto: LockerChiefMedicalOfficerFilledHardsuit
   entities:
@@ -50284,6 +49966,11 @@ entities:
       parent: 2
 - proto: LockerSteel
   entities:
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 58.5,45.5
+      parent: 2
   - uid: 935
     components:
     - type: Transform
@@ -50294,6 +49981,11 @@ entities:
     - type: Transform
       pos: 58.5,47.5
       parent: 2
+  - uid: 1367
+    components:
+    - type: Transform
+      pos: 58.5,44.5
+      parent: 2
   - uid: 2618
     components:
     - type: Transform
@@ -50389,13 +50081,6 @@ entities:
     - type: Transform
       pos: 33.5,-30.5
       parent: 3564
-- proto: LockerWardenFilled
-  entities:
-  - uid: 1353
-    components:
-    - type: Transform
-      pos: 33.5,0.5
-      parent: 2
 - proto: LockerWardenFilledHardsuit
   entities:
   - uid: 10431
@@ -50410,6 +50095,50 @@ entities:
     - type: Transform
       pos: 23.5,42.5
       parent: 2
+- proto: LogicGateAnd
+  entities:
+  - uid: 1839
+    components:
+    - type: Transform
+      pos: 57.5,-3.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1829:
+        - - Output
+          - Open
+        - - Output
+          - AutoClose
+  - uid: 1879
+    components:
+    - type: Transform
+      pos: 57.5,-13.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1848:
+        - - Output
+          - Open
+        - - Output
+          - AutoClose
+  - uid: 3235
+    components:
+    - type: Transform
+      pos: 57.5,-19.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        3232:
+        - - Output
+          - Open
+        - - Output
+          - AutoClose
 - proto: LogicGateOr
   entities:
   - uid: 6692
@@ -50424,52 +50153,6 @@ entities:
         2984:
         - - Output
           - DoorBolt
-- proto: LogicGateXor
-  entities:
-  - uid: 1839
-    components:
-    - type: Transform
-      anchored: True
-      pos: 57.5,-3.5
-      parent: 2
-    - type: Physics
-      canCollide: False
-      bodyType: Static
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        1829:
-        - - Output
-          - DoorBolt
-  - uid: 1879
-    components:
-    - type: Transform
-      anchored: True
-      pos: 57.5,-13.5
-      parent: 2
-    - type: Physics
-      canCollide: False
-      bodyType: Static
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        1848:
-        - - Output
-          - DoorBolt
-  - uid: 3235
-    components:
-    - type: Transform
-      pos: 57.5,-19.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        3232:
-        - - Output
-          - DoorBolt
 - proto: LootSpawnerArmory
   entities:
   - uid: 10455
@@ -50491,6 +50174,13 @@ entities:
     - type: Transform
       pos: 36.5,-59.5
       parent: 3564
+- proto: Machete
+  entities:
+  - uid: 6987
+    components:
+    - type: Transform
+      pos: 13.5,30.5
+      parent: 2
 - proto: MachineAnomalyVessel
   entities:
   - uid: 2379
@@ -50531,6 +50221,18 @@ entities:
     - type: Transform
       pos: 31.5,8.5
       parent: 2
+- proto: MachineFrameDestroyed
+  entities:
+  - uid: 4742
+    components:
+    - type: Transform
+      pos: 54.5,59.5
+      parent: 2
+  - uid: 4853
+    components:
+    - type: Transform
+      pos: 54.5,62.5
+      parent: 2
 - proto: MagazinePistolSubMachineGun
   entities:
   - uid: 1914
@@ -50922,18 +50624,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
   - uid: 1318
     components:
     - type: Transform
@@ -51317,6 +51009,38 @@ entities:
       parent: 2
 - proto: Paper
   entities:
+  - uid: 271
+    components:
+    - type: MetaData
+      desc: A piece of important paper.
+      name: Important Information (please do not ignore)
+    - type: Transform
+      pos: 34.5,0.5
+      parent: 2
+    - type: Paper
+      stampState: paper_stamp-centcom
+      stampedBy:
+      - stampedColor: '#006600FF'
+        stampedName: stamp-component-stamped-name-centcom
+      content: >-
+        Need guns? Check out the prison station! Just a hop, skip and a jump to the east, easily reachable via your very own prison shuttle! Just use the prison shuttle console, located next to the security wardrobe.
+
+
+        Do [italic]not[/italic] say CentComm never did anything for you.
+  - uid: 7174
+    components:
+    - type: MetaData
+      desc: A piece of important paper.
+      name: Important Information (please do not ignore)
+    - type: Transform
+      pos: 25.5,-21.5
+      parent: 3564
+    - type: Paper
+      stampState: paper_stamp-centcom
+      stampedBy:
+      - stampedColor: '#006600FF'
+        stampedName: stamp-component-stamped-name-centcom
+      content: Unfortunately, we cannot locate our backstock of brigmedic IDs. The brigmedic locker opens with your medical ID. We recommend keeping both it and the provided security ID easily available. Good luck!
   - uid: 10429
     components:
     - type: Transform
@@ -51483,6 +51207,8 @@ entities:
     - type: Transform
       pos: 7.3686285,34.76087
       parent: 2
+    - type: Paper
+      content: bingle
   - uid: 11517
     components:
     - type: MetaData
@@ -52171,30 +51897,40 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6839
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,27.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7168
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7182
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7195
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 26.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: PlayerStationAi
   entities:
   - uid: 4561
@@ -52537,7 +52273,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 34.5,11.5
+      pos: 34.5,12.5
       parent: 2
   - uid: 218
     components:
@@ -54107,33 +53843,6 @@ entities:
     - type: Transform
       pos: 61.5,23.5
       parent: 2
-- proto: PrefilledSyringe
-  entities:
-  - uid: 7191
-    components:
-    - type: Transform
-      pos: 63.5,29.5
-      parent: 2
-  - uid: 7326
-    components:
-    - type: Transform
-      pos: 32.5,16.5
-      parent: 2
-  - uid: 7448
-    components:
-    - type: Transform
-      pos: 15.5,13.5
-      parent: 2
-  - uid: 7451
-    components:
-    - type: Transform
-      pos: 13.5,13.5
-      parent: 2
-  - uid: 10621
-    components:
-    - type: Transform
-      pos: 29.5,-16.5
-      parent: 3564
 - proto: PresentTrash
   entities:
   - uid: 7521
@@ -54212,8 +53921,30 @@ entities:
     - type: Transform
       pos: 55.5,29.5
       parent: 2
+- proto: PuddleBlood
+  entities:
+  - uid: 5862
+    components:
+    - type: Transform
+      pos: 13.5,30.5
+      parent: 2
+  - uid: 6176
+    components:
+    - type: Transform
+      pos: 14.5,20.5
+      parent: 2
 - proto: PuddleBloodSmall
   entities:
+  - uid: 5621
+    components:
+    - type: Transform
+      pos: 12.5,24.5
+      parent: 2
+  - uid: 5623
+    components:
+    - type: Transform
+      pos: 11.5,24.5
+      parent: 2
   - uid: 6348
     components:
     - type: Transform
@@ -54414,6 +54145,38 @@ entities:
     - type: Transform
       pos: 28.5,-6.5
       parent: 2
+- proto: RandomArtifactSpawner
+  entities:
+  - uid: 324
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,-20.5
+      parent: 2
+  - uid: 325
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,-0.5
+      parent: 2
+  - uid: 327
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.5,23.5
+      parent: 2
+  - uid: 328
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 40.5,58.5
+      parent: 2
+  - uid: 329
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,-45.5
+      parent: 3564
 - proto: RandomEngineerCorpseSpawner
   entities:
   - uid: 7286
@@ -54428,11 +54191,6 @@ entities:
     - type: Transform
       pos: 9.5,0.5
       parent: 2
-  - uid: 7287
-    components:
-    - type: Transform
-      pos: 58.5,44.5
-      parent: 2
   - uid: 7360
     components:
     - type: Transform
@@ -54539,211 +54297,295 @@ entities:
     - type: Transform
       pos: 23.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 150
     components:
     - type: Transform
       pos: 24.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 165
     components:
     - type: Transform
       pos: 24.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 176
     components:
     - type: Transform
       pos: 22.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 186
     components:
     - type: Transform
       pos: 23.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 551
     components:
     - type: Transform
       pos: 24.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 553
     components:
     - type: Transform
       pos: 26.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 554
     components:
     - type: Transform
       pos: 28.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 626
     components:
     - type: Transform
       pos: 24.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 629
     components:
     - type: Transform
       pos: 27.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 675
     components:
     - type: Transform
       pos: 24.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 699
     components:
     - type: Transform
       pos: 23.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 710
     components:
     - type: Transform
       pos: 22.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 726
     components:
     - type: Transform
       pos: 26.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 761
     components:
     - type: Transform
       pos: 26.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 766
     components:
     - type: Transform
       pos: 24.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 903
     components:
     - type: Transform
       pos: 22.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 913
     components:
     - type: Transform
       pos: 19.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 914
     components:
     - type: Transform
       pos: 25.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 963
     components:
     - type: Transform
       pos: 24.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1465
     components:
     - type: Transform
       pos: 20.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1731
     components:
     - type: Transform
       pos: 22.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2899
     components:
     - type: Transform
       pos: 24.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4014
     components:
     - type: Transform
       pos: 27.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4057
     components:
     - type: Transform
       pos: 29.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4058
     components:
     - type: Transform
       pos: 28.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4664
     components:
     - type: Transform
       pos: 18.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4665
     components:
     - type: Transform
       pos: 23.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4682
     components:
     - type: Transform
       pos: 17.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9661
     components:
     - type: Transform
       pos: 14.5,-57.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9662
     components:
     - type: Transform
       pos: 14.5,-58.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9663
     components:
     - type: Transform
       pos: 14.5,-59.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9664
     components:
     - type: Transform
       pos: 13.5,-59.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9665
     components:
     - type: Transform
       pos: 12.5,-59.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9666
     components:
     - type: Transform
       pos: 12.5,-58.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9667
     components:
     - type: Transform
       pos: 12.5,-57.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9668
     components:
     - type: Transform
       pos: 11.5,-59.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9676
     components:
     - type: Transform
       pos: 15.5,-62.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9677
     components:
     - type: Transform
       pos: 16.5,-62.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9678
     components:
     - type: Transform
       pos: 17.5,-62.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9679
     components:
     - type: Transform
       pos: 14.5,-63.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9680
     components:
     - type: Transform
       pos: 14.5,-62.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
 - proto: ReinforcedWindow
   entities:
   - uid: 9
@@ -54751,1265 +54593,1747 @@ entities:
     - type: Transform
       pos: -0.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10
     components:
     - type: Transform
       pos: -0.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11
     components:
     - type: Transform
       pos: 2.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12
     components:
     - type: Transform
       pos: 0.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13
     components:
     - type: Transform
       pos: 1.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14
     components:
     - type: Transform
       pos: 0.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15
     components:
     - type: Transform
       pos: 1.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16
     components:
     - type: Transform
       pos: 2.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 126
     components:
     - type: Transform
       pos: 20.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 127
     components:
     - type: Transform
       pos: 18.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 128
     components:
     - type: Transform
       pos: 16.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 129
     components:
     - type: Transform
       pos: 17.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 130
     components:
     - type: Transform
       pos: 15.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 144
     components:
     - type: Transform
       pos: 17.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 145
     components:
     - type: Transform
       pos: 16.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 191
     components:
     - type: Transform
       pos: 19.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 196
     components:
     - type: Transform
       pos: 18.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 198
     components:
     - type: Transform
       pos: 7.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 199
     components:
     - type: Transform
       pos: 41.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 200
     components:
     - type: Transform
       pos: 42.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 201
     components:
     - type: Transform
       pos: 40.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 202
     components:
     - type: Transform
       pos: 11.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 228
     components:
     - type: Transform
       pos: 15.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 232
     components:
     - type: Transform
       pos: 43.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 237
     components:
     - type: Transform
       pos: 12.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 238
     components:
     - type: Transform
       pos: 10.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 261
     components:
     - type: Transform
       pos: 39.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 273
     components:
     - type: Transform
       pos: -7.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 274
     components:
     - type: Transform
       pos: -7.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 279
     components:
     - type: Transform
       pos: -7.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 280
     components:
     - type: Transform
       pos: -7.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 281
     components:
     - type: Transform
       pos: -7.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 282
     components:
     - type: Transform
       pos: -7.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 312
     components:
     - type: Transform
       pos: 13.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 360
     components:
     - type: Transform
       pos: 9.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 371
     components:
     - type: Transform
       pos: 6.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 372
     components:
     - type: Transform
       pos: 5.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 373
     components:
     - type: Transform
       pos: 4.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 405
     components:
     - type: Transform
       pos: 0.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 406
     components:
     - type: Transform
       pos: 1.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 407
     components:
     - type: Transform
       pos: -0.5,-14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 408
     components:
     - type: Transform
       pos: -0.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 409
     components:
     - type: Transform
       pos: -0.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 411
     components:
     - type: Transform
       pos: -0.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 412
     components:
     - type: Transform
       pos: -0.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 413
     components:
     - type: Transform
       pos: -0.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 414
     components:
     - type: Transform
       pos: 0.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 415
     components:
     - type: Transform
       pos: 1.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 416
     components:
     - type: Transform
       pos: 2.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 468
     components:
     - type: Transform
       pos: 2.5,36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 562
     components:
     - type: Transform
       pos: 51.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 568
     components:
     - type: Transform
       pos: 7.5,33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 647
     components:
     - type: Transform
       pos: 21.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 713
     components:
     - type: Transform
       pos: 8.5,33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 714
     components:
     - type: Transform
       pos: 12.5,40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 736
     components:
     - type: Transform
       pos: -0.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 740
     components:
     - type: Transform
       pos: 8.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 870
     components:
     - type: Transform
       pos: 46.5,42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 882
     components:
     - type: Transform
       pos: 45.5,42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 967
     components:
     - type: Transform
       pos: 47.5,42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1083
     components:
     - type: Transform
       pos: 21.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1088
     components:
     - type: Transform
       pos: 21.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1118
     components:
     - type: Transform
       pos: 33.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1119
     components:
     - type: Transform
       pos: 33.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1120
     components:
     - type: Transform
       pos: 43.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1121
     components:
     - type: Transform
       pos: 44.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1122
     components:
     - type: Transform
       pos: 45.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1123
     components:
     - type: Transform
       pos: 46.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1124
     components:
     - type: Transform
       pos: 47.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1125
     components:
     - type: Transform
       pos: 48.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1126
     components:
     - type: Transform
       pos: 50.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1127
     components:
     - type: Transform
       pos: 50.5,-14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1128
     components:
     - type: Transform
       pos: 50.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1149
     components:
     - type: Transform
       pos: 37.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1150
     components:
     - type: Transform
       pos: 36.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1151
     components:
     - type: Transform
       pos: 34.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1152
     components:
     - type: Transform
       pos: 35.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1153
     components:
     - type: Transform
       pos: 33.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1154
     components:
     - type: Transform
       pos: 31.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1155
     components:
     - type: Transform
       pos: 30.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1156
     components:
     - type: Transform
       pos: 29.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1157
     components:
     - type: Transform
       pos: 28.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1158
     components:
     - type: Transform
       pos: 27.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1159
     components:
     - type: Transform
       pos: 25.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1160
     components:
     - type: Transform
       pos: 24.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1161
     components:
     - type: Transform
       pos: 23.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1162
     components:
     - type: Transform
       pos: 22.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1163
     components:
     - type: Transform
       pos: 21.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1251
     components:
     - type: Transform
       pos: 51.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1252
     components:
     - type: Transform
       pos: 52.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1253
     components:
     - type: Transform
       pos: 53.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1255
     components:
     - type: Transform
       pos: 54.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1271
     components:
     - type: Transform
       pos: 31.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1272
     components:
     - type: Transform
       pos: 33.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1295
     components:
     - type: Transform
       pos: 7.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1296
     components:
     - type: Transform
       pos: 3.5,36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1387
     components:
     - type: Transform
       pos: 41.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1412
     components:
     - type: Transform
       pos: 41.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1814
     components:
     - type: Transform
       pos: 64.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1818
     components:
     - type: Transform
       pos: 62.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1819
     components:
     - type: Transform
       pos: 56.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1824
     components:
     - type: Transform
       pos: 59.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1825
     components:
     - type: Transform
       pos: 60.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1826
     components:
     - type: Transform
       pos: 66.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1827
     components:
     - type: Transform
       pos: 58.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1830
     components:
     - type: Transform
       pos: 58.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1837
     components:
     - type: Transform
       pos: 56.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1844
     components:
     - type: Transform
       pos: 56.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1849
     components:
     - type: Transform
       pos: 58.5,-14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1850
     components:
     - type: Transform
       pos: 55.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1855
     components:
     - type: Transform
       pos: 65.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1856
     components:
     - type: Transform
       pos: 61.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1857
     components:
     - type: Transform
       pos: 58.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1861
     components:
     - type: Transform
       pos: 58.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1862
     components:
     - type: Transform
       pos: 56.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1873
     components:
     - type: Transform
       pos: 56.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1876
     components:
     - type: Transform
       pos: 58.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1877
     components:
     - type: Transform
       pos: 56.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1878
     components:
     - type: Transform
       pos: 58.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1880
     components:
     - type: Transform
       pos: 56.5,-14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1882
     components:
     - type: Transform
       pos: 58.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1901
     components:
     - type: Transform
       pos: 13.5,40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1933
     components:
     - type: Transform
       pos: 51.5,38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1970
     components:
     - type: Transform
       pos: 52.5,38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1976
     components:
     - type: Transform
       pos: 50.5,38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2069
     components:
     - type: Transform
       pos: 49.5,38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2083
     components:
     - type: Transform
       pos: 63.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2100
     components:
     - type: Transform
       pos: 49.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2106
     components:
     - type: Transform
       pos: 51.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2127
     components:
     - type: Transform
       pos: 53.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2130
     components:
     - type: Transform
       pos: 44.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2139
     components:
     - type: Transform
       pos: 9.5,17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2140
     components:
     - type: Transform
       pos: 10.5,17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2142
     components:
     - type: Transform
       pos: 8.5,17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2143
     components:
     - type: Transform
       pos: 7.5,17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2146
     components:
     - type: Transform
       pos: 6.5,39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2147
     components:
     - type: Transform
       pos: 7.5,39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2148
     components:
     - type: Transform
       pos: 8.5,39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2149
     components:
     - type: Transform
       pos: 0.5,31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2150
     components:
     - type: Transform
       pos: 5.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2151
     components:
     - type: Transform
       pos: 54.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2152
     components:
     - type: Transform
       pos: 4.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2153
     components:
     - type: Transform
       pos: 3.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2174
     components:
     - type: Transform
       pos: 52.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2175
     components:
     - type: Transform
       pos: 51.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2353
     components:
     - type: Transform
       pos: 64.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2354
     components:
     - type: Transform
       pos: 64.5,33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2355
     components:
     - type: Transform
       pos: 64.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2356
     components:
     - type: Transform
       pos: 64.5,31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2357
     components:
     - type: Transform
       pos: 64.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2358
     components:
     - type: Transform
       pos: 64.5,29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2359
     components:
     - type: Transform
       pos: 64.5,28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2463
     components:
     - type: Transform
       pos: 64.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2590
     components:
     - type: Transform
       pos: 62.5,58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2595
     components:
     - type: Transform
       pos: 60.5,63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2596
     components:
     - type: Transform
       pos: 59.5,63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2597
     components:
     - type: Transform
       pos: 57.5,63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2598
     components:
     - type: Transform
       pos: 56.5,63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2756
     components:
     - type: Transform
       pos: -0.5,36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3245
     components:
     - type: Transform
       pos: 58.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3247
     components:
     - type: Transform
       pos: 58.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3248
     components:
     - type: Transform
       pos: 58.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3249
     components:
     - type: Transform
       pos: 56.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3250
     components:
     - type: Transform
       pos: 56.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3259
     components:
     - type: Transform
       pos: 56.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3567
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-39.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 3568
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-40.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 3569
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-42.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 3570
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-43.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 3571
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-44.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 3572
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-45.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 4494
     components:
     - type: Transform
       pos: 55.5,61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4685
     components:
     - type: Transform
       pos: 25.5,25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4686
     components:
     - type: Transform
       pos: 25.5,24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4697
     components:
     - type: Transform
       pos: 25.5,23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6011
     components:
     - type: Transform
       pos: 54.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6012
     components:
     - type: Transform
       pos: 55.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6013
     components:
     - type: Transform
       pos: 56.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6015
     components:
     - type: Transform
       pos: 58.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6025
     components:
     - type: Transform
       pos: 53.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6345
     components:
     - type: Transform
       pos: 46.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7192
     components:
     - type: Transform
       pos: 25.5,22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7702
     components:
     - type: Transform
       pos: 47.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8318
     components:
     - type: Transform
       pos: 46.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8320
     components:
     - type: Transform
       pos: 45.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8393
     components:
     - type: Transform
       pos: 47.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8394
     components:
     - type: Transform
       pos: 44.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9452
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 7.5,-46.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9453
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 10.5,-46.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9712
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-60.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9734
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 31.5,-18.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9735
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 22.5,-24.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9736
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 25.5,-24.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9737
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,-25.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9738
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 21.5,-24.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9739
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,-24.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9740
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-29.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9741
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-32.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9742
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-33.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9743
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-27.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9744
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-30.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9745
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-26.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9746
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-25.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9747
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,-30.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9748
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,-29.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9749
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,-28.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9750
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-33.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9751
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-34.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9752
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-36.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9753
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-37.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9754
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-36.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9755
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-37.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9758
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-40.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9759
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-41.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9760
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-44.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9761
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-45.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9762
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-44.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9763
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-45.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9764
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-48.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9765
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-49.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9766
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-48.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9767
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-49.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9768
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-52.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9769
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-53.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9770
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-52.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9771
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-53.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9772
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 24.5,-56.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9773
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 25.5,-56.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9774
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 21.5,-56.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9775
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,-56.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9776
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,-62.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9777
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 21.5,-62.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9778
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 25.5,-62.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9779
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 24.5,-62.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9780
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-63.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9781
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-64.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9782
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-65.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9783
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-67.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9784
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-68.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 9785
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-69.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 11559
     components:
     - type: Transform
       pos: 23.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: RemoteSignaller
   entities:
   - uid: 421
@@ -56188,16 +56512,22 @@ entities:
     - type: Transform
       pos: 61.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4998
     components:
     - type: Transform
       pos: 45.5,22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7409
     components:
     - type: Transform
       pos: 49.5,-12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: Screwdriver
   entities:
   - uid: 6566
@@ -56225,6 +56555,13 @@ entities:
     - type: Transform
       pos: 27.5,26.5
       parent: 2
+- proto: SecurityIDCard
+  entities:
+  - uid: 7154
+    components:
+    - type: Transform
+      pos: 30.5,-21.5
+      parent: 3564
 - proto: SecurityTechFab
   entities:
   - uid: 10398
@@ -56542,16 +56879,22 @@ entities:
     - type: Transform
       pos: 40.5,49.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2424
     components:
     - type: Transform
       pos: 61.5,35.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7236
     components:
     - type: Transform
       pos: 55.5,59.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignAiUpload
   entities:
   - uid: 4663
@@ -56559,6 +56902,8 @@ entities:
     - type: Transform
       pos: 28.5,51.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignalButton
   entities:
   - uid: 473
@@ -56581,6 +56926,8 @@ entities:
         1254:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
 - proto: SignalSwitchDirectional
   entities:
   - uid: 694
@@ -56625,6 +56972,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 1473
     components:
     - type: Transform
@@ -56658,6 +57007,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 2505
     components:
     - type: Transform
@@ -56681,6 +57032,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 2602
     components:
     - type: Transform
@@ -56704,6 +57057,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 2621
     components:
     - type: Transform
@@ -56732,6 +57087,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 2633
     components:
     - type: Transform
@@ -56750,6 +57107,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 2983
     components:
     - type: Transform
@@ -56763,6 +57122,8 @@ entities:
           - Off
         - - Off
           - On
+    - type: Fixtures
+      fixtures: {}
   - uid: 3006
     components:
     - type: Transform
@@ -56785,6 +57146,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 3033
     components:
     - type: Transform
@@ -56798,6 +57161,8 @@ entities:
           - Off
         - - Off
           - On
+    - type: Fixtures
+      fixtures: {}
   - uid: 3710
     components:
     - type: Transform
@@ -56811,6 +57176,8 @@ entities:
           - Off
         - - Off
           - On
+    - type: Fixtures
+      fixtures: {}
   - uid: 4510
     components:
     - type: Transform
@@ -56824,6 +57191,8 @@ entities:
           - Off
         - - Off
           - On
+    - type: Fixtures
+      fixtures: {}
   - uid: 4652
     components:
     - type: Transform
@@ -56857,6 +57226,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 4683
     components:
     - type: Transform
@@ -56870,6 +57241,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 5852
     components:
     - type: Transform
@@ -56883,6 +57256,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 5861
     components:
     - type: Transform
@@ -56896,6 +57271,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 5943
     components:
     - type: Transform
@@ -56913,6 +57290,8 @@ entities:
           - Off
         - - Off
           - On
+    - type: Fixtures
+      fixtures: {}
   - uid: 6579
     components:
     - type: Transform
@@ -56926,6 +57305,8 @@ entities:
           - Off
         - - Off
           - On
+    - type: Fixtures
+      fixtures: {}
   - uid: 6694
     components:
     - type: Transform
@@ -56954,6 +57335,8 @@ entities:
           - Off
         - - Off
           - On
+    - type: Fixtures
+      fixtures: {}
   - uid: 6731
     components:
     - type: Transform
@@ -57001,6 +57384,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 7005
     components:
     - type: Transform
@@ -57037,6 +57422,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7330
     components:
     - type: Transform
@@ -57065,6 +57452,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 7430
     components:
     - type: Transform
@@ -57102,6 +57491,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7435
     components:
     - type: Transform
@@ -57124,6 +57515,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7459
     components:
     - type: Transform
@@ -57150,6 +57543,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7461
     components:
     - type: Transform
@@ -57182,6 +57577,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7462
     components:
     - type: Transform
@@ -57204,6 +57601,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7467
     components:
     - type: Transform
@@ -57256,6 +57655,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7471
     components:
     - type: Transform
@@ -57278,6 +57679,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7473
     components:
     - type: Transform
@@ -57310,6 +57713,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7475
     components:
     - type: Transform
@@ -57327,6 +57732,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7477
     components:
     - type: Transform
@@ -57339,6 +57746,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 7480
     components:
     - type: Transform
@@ -57391,6 +57800,8 @@ entities:
           - On
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7481
     components:
     - type: Transform
@@ -57418,6 +57829,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7484
     components:
     - type: Transform
@@ -57440,6 +57853,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7488
     components:
     - type: Transform
@@ -57467,6 +57882,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7490
     components:
     - type: Transform
@@ -57493,6 +57910,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7491
     components:
     - type: Transform
@@ -57510,6 +57929,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7499
     components:
     - type: Transform
@@ -57531,6 +57952,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7502
     components:
     - type: Transform
@@ -57553,6 +57976,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7503
     components:
     - type: Transform
@@ -57585,6 +58010,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7507
     components:
     - type: Transform
@@ -57601,6 +58028,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7508
     components:
     - type: Transform
@@ -57617,6 +58046,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7509
     components:
     - type: Transform
@@ -57644,6 +58075,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7556
     components:
     - type: Transform
@@ -57661,6 +58094,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7557
     components:
     - type: Transform
@@ -57682,6 +58117,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7558
     components:
     - type: Transform
@@ -57703,6 +58140,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7562
     components:
     - type: Transform
@@ -57734,6 +58173,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7569
     components:
     - type: Transform
@@ -57760,6 +58201,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7570
     components:
     - type: Transform
@@ -57782,6 +58225,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7575
     components:
     - type: Transform
@@ -57824,6 +58269,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7576
     components:
     - type: Transform
@@ -57850,6 +58297,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7580
     components:
     - type: Transform
@@ -57876,6 +58325,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7590
     components:
     - type: Transform
@@ -57908,6 +58359,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7594
     components:
     - type: Transform
@@ -57935,6 +58388,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7596
     components:
     - type: Transform
@@ -57952,6 +58407,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 7600
     components:
     - type: Transform
@@ -57989,6 +58446,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7601
     components:
     - type: Transform
@@ -58006,6 +58465,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 7623
     components:
     - type: Transform
@@ -58037,6 +58498,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7626
     components:
     - type: Transform
@@ -58059,6 +58522,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7627
     components:
     - type: Transform
@@ -58131,6 +58596,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 7762
     components:
     - type: Transform
@@ -58154,6 +58621,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 7828
     components:
     - type: Transform
@@ -58181,6 +58650,8 @@ entities:
           - Off
       lastSignals:
         Status: True
+    - type: Fixtures
+      fixtures: {}
   - uid: 8324
     components:
     - type: Transform
@@ -58203,6 +58674,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 8339
     components:
     - type: Transform
@@ -58231,6 +58704,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 8343
     components:
     - type: Transform
@@ -58264,6 +58739,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 8593
     components:
     - type: Transform
@@ -58292,6 +58769,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 8598
     components:
     - type: Transform
@@ -58315,6 +58794,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10708
     components:
     - type: Transform
@@ -58328,6 +58809,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10747
     components:
     - type: Transform
@@ -58381,6 +58864,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10765
     components:
     - type: Transform
@@ -58409,6 +58894,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10766
     components:
     - type: Transform
@@ -58421,6 +58908,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10767
     components:
     - type: Transform
@@ -58434,6 +58923,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10768
     components:
     - type: Transform
@@ -58447,6 +58938,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10769
     components:
     - type: Transform
@@ -58460,6 +58953,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10770
     components:
     - type: Transform
@@ -58473,6 +58968,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10771
     components:
     - type: Transform
@@ -58486,6 +58983,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10772
     components:
     - type: Transform
@@ -58499,6 +58998,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10773
     components:
     - type: Transform
@@ -58512,6 +59013,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10774
     components:
     - type: Transform
@@ -58525,6 +59028,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10775
     components:
     - type: Transform
@@ -58538,6 +59043,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10776
     components:
     - type: Transform
@@ -58551,6 +59058,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10777
     components:
     - type: Transform
@@ -58564,6 +59073,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10778
     components:
     - type: Transform
@@ -58577,6 +59088,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10779
     components:
     - type: Transform
@@ -58590,6 +59103,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10780
     components:
     - type: Transform
@@ -58608,6 +59123,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10781
     components:
     - type: Transform
@@ -58626,6 +59143,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10782
     components:
     - type: Transform
@@ -58653,6 +59172,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10783
     components:
     - type: Transform
@@ -58671,6 +59192,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10784
     components:
     - type: Transform
@@ -58684,6 +59207,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10785
     components:
     - type: Transform
@@ -58702,6 +59227,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10786
     components:
     - type: Transform
@@ -58715,6 +59242,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 10788
     components:
     - type: Transform
@@ -58728,6 +59257,8 @@ entities:
           - Toggle
         - - Off
           - Toggle
+    - type: Fixtures
+      fixtures: {}
 - proto: SignAtmos
   entities:
   - uid: 3301
@@ -58735,6 +59266,8 @@ entities:
     - type: Transform
       pos: 31.5,1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignBridge
   entities:
   - uid: 11400
@@ -58742,6 +59275,8 @@ entities:
     - type: Transform
       pos: 17.5,59.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignCans
   entities:
   - uid: 2013
@@ -58749,12 +59284,16 @@ entities:
     - type: Transform
       pos: 36.5,-5.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2530
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 32.5,36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignCansScience
   entities:
   - uid: 4939
@@ -58762,6 +59301,8 @@ entities:
     - type: Transform
       pos: 49.5,10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignChapel
   entities:
   - uid: 696
@@ -58769,6 +59310,8 @@ entities:
     - type: Transform
       pos: 4.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignChem
   entities:
   - uid: 607
@@ -58777,6 +59320,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 34.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalBridge
   entities:
   - uid: 4848
@@ -58785,18 +59330,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: 35.5,8.75
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 8278
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 36.5,17.75
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 8281
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,6.75
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalDorms
   entities:
   - uid: 1075
@@ -58805,11 +59356,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 27.5,6.25
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 11404
     components:
     - type: Transform
       pos: 36.5,17.25
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalEng
   entities:
   - uid: 5174
@@ -58818,32 +59373,58 @@ entities:
       rot: 3.141592653589793 rad
       pos: 35.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 8285
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalEvac
   entities:
+  - uid: 268
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-15.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
+  - uid: 323
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-15.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 970
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 28.5,6.75
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4849
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,17.75
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 8280
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,7.75
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalMed
   entities:
   - uid: 11401
@@ -58851,12 +59432,16 @@ entities:
     - type: Transform
       pos: 36.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 11405
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 35.5,8.25
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalSci
   entities:
   - uid: 381
@@ -58865,17 +59450,23 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 28.5,6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1801
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 11403
     components:
     - type: Transform
       pos: 40.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalSec
   entities:
   - uid: 1376
@@ -58884,11 +59475,15 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 28.5,6.25
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 11402
     components:
     - type: Transform
       pos: 40.5,17.25
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignEngineering
   entities:
   - uid: 8279
@@ -58897,6 +59492,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 36.5,22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignEVA
   entities:
   - uid: 8468
@@ -58904,6 +59501,8 @@ entities:
     - type: Transform
       pos: 54.5,37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignInterrogation
   entities:
   - uid: 10323
@@ -58911,6 +59510,8 @@ entities:
     - type: Transform
       pos: 19.5,-31.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
 - proto: SignMaterials
   entities:
   - uid: 1773
@@ -58919,12 +59520,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 35.5,30.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 5763
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 38.5,32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignMedical
   entities:
   - uid: 1481
@@ -58932,11 +59537,15 @@ entities:
     - type: Transform
       pos: 21.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1482
     components:
     - type: Transform
       pos: 14.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignMorgue
   entities:
   - uid: 427
@@ -58945,6 +59554,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,15.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignScience
   entities:
   - uid: 4066
@@ -58952,11 +59563,15 @@ entities:
     - type: Transform
       pos: 47.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 7163
     components:
     - type: Transform
       pos: 57.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSecurearea
   entities:
   - uid: 2772
@@ -58965,24 +59580,32 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 16.5,61.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2773
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 16.5,58.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2774
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 16.5,56.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 6525
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 29.5,51.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSecurity
   entities:
   - uid: 11406
@@ -58991,6 +59614,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 39.5,4.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignServer
   entities:
   - uid: 3129
@@ -58998,6 +59623,8 @@ entities:
     - type: Transform
       pos: 3.5,5.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignShipDock
   entities:
   - uid: 2058
@@ -59006,12 +59633,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 59.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 6590
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 48.5,-17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignTelecomms
   entities:
   - uid: 2480
@@ -59019,6 +59650,8 @@ entities:
     - type: Transform
       pos: 3.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignToolStorage
   entities:
   - uid: 1436
@@ -59027,14 +59660,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 42.5,18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 4852
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 42.5,22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: Sink
   entities:
+  - uid: 1505
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,11.5
+      parent: 2
   - uid: 10557
     components:
     - type: Transform
@@ -59104,7 +59747,7 @@ entities:
       desc: A relaxing grenade that releases a large, long-lasting cloud of fun when used.
       name: party grenade
     - type: Transform
-      pos: 34.523518,48.651146
+      pos: 56.550304,22.555624
       parent: 2
     - type: SmokeOnTrigger
       solution:
@@ -59125,7 +59768,7 @@ entities:
       desc: A relaxing grenade that releases a large, long-lasting cloud of fun when used.
       name: party grenade
     - type: Transform
-      pos: 34.36329,48.41327
+      pos: 56.456554,22.493124
       parent: 2
     - type: SmokeOnTrigger
       solution:
@@ -59146,7 +59789,7 @@ entities:
       desc: A relaxing grenade that releases a large, long-lasting cloud of fun when used.
       name: party grenade
     - type: Transform
-      pos: 34.316414,48.522644
+      pos: 56.59718,22.289999
       parent: 2
     - type: SmokeOnTrigger
       solution:
@@ -59167,7 +59810,7 @@ entities:
       desc: A relaxing grenade that releases a large, long-lasting cloud of fun when used.
       name: party grenade
     - type: Transform
-      pos: 34.523518,48.32302
+      pos: 56.40968,22.633749
       parent: 2
     - type: SmokeOnTrigger
       solution:
@@ -59188,7 +59831,7 @@ entities:
       desc: A relaxing grenade that releases a large, long-lasting cloud of fun when used.
       name: party grenade
     - type: Transform
-      pos: 34.733295,48.78693
+      pos: 56.28468,22.399374
       parent: 2
     - type: SmokeOnTrigger
       solution:
@@ -60269,6 +60912,27 @@ entities:
     - type: Transform
       pos: 36.5,1.5
       parent: 2
+- proto: SpawnPointGhostDerelictEngineeringCyborg
+  entities:
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 17.5,55.5
+      parent: 2
+- proto: SpawnPointGhostDerelictJanitorCyborg
+  entities:
+  - uid: 1368
+    components:
+    - type: Transform
+      pos: -4.5,5.5
+      parent: 2
+- proto: SpawnPointGhostDerelictSyndicateAssaultCyborg
+  entities:
+  - uid: 5211
+    components:
+    - type: Transform
+      pos: 10.5,-37.5
+      parent: 3564
 - proto: SpawnPointHeadOfPersonnel
   entities:
   - uid: 2532
@@ -60534,11 +61198,15 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 11523
     components:
     - type: Transform
       pos: 50.5,27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: Stool
   entities:
   - uid: 1925
@@ -60653,6 +61321,13 @@ entities:
     - type: Transform
       pos: 24.5,42.5
       parent: 2
+- proto: SuitStorageSec
+  entities:
+  - uid: 1366
+    components:
+    - type: Transform
+      pos: 33.5,0.5
+      parent: 2
 - proto: SurveillanceCameraCommand
   entities:
   - uid: 7457
@@ -61240,6 +61915,33 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Chapel
+- proto: Syringe
+  entities:
+  - uid: 7191
+    components:
+    - type: Transform
+      pos: 63.5,29.5
+      parent: 2
+  - uid: 7326
+    components:
+    - type: Transform
+      pos: 32.5,16.5
+      parent: 2
+  - uid: 7448
+    components:
+    - type: Transform
+      pos: 15.5,13.5
+      parent: 2
+  - uid: 7451
+    components:
+    - type: Transform
+      pos: 13.5,13.5
+      parent: 2
+  - uid: 10621
+    components:
+    - type: Transform
+      pos: 29.5,-16.5
+      parent: 3564
 - proto: Table
   entities:
   - uid: 31
@@ -61282,6 +61984,11 @@ entities:
     - type: Transform
       pos: 10.5,-8.5
       parent: 2
+  - uid: 531
+    components:
+    - type: Transform
+      pos: -4.5,10.5
+      parent: 2
   - uid: 548
     components:
     - type: Transform
@@ -62194,14 +62901,6 @@ entities:
     - type: Transform
       pos: 26.5,-59.5
       parent: 3564
-- proto: TableFancyBlack
-  entities:
-  - uid: 11351
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,10.5
-      parent: 2
 - proto: TableGlass
   entities:
   - uid: 793
@@ -62245,6 +62944,8 @@ entities:
     - type: PointLight
       color: '#FF3300FF'
     - type: ExplodeOnTrigger
+      keysIn:
+      - trigger
     - type: Explosive
       canCreateVacuum: False
       totalIntensity: 30
@@ -63970,11 +64671,6 @@ entities:
     - type: Transform
       pos: 67.5,-13.5
       parent: 2
-  - uid: 2792
-    components:
-    - type: Transform
-      pos: 67.5,-23.5
-      parent: 2
   - uid: 2896
     components:
     - type: Transform
@@ -64692,11 +65388,6 @@ entities:
     - type: Transform
       pos: 41.5,47.5
       parent: 2
-  - uid: 7233
-    components:
-    - type: Transform
-      pos: 67.5,-24.5
-      parent: 2
   - uid: 7239
     components:
     - type: Transform
@@ -64707,11 +65398,6 @@ entities:
     - type: Transform
       pos: 14.5,47.5
       parent: 2
-  - uid: 7396
-    components:
-    - type: Transform
-      pos: 67.5,-28.5
-      parent: 2
   - uid: 8397
     components:
     - type: Transform
@@ -66842,18 +67528,6 @@ entities:
       parent: 3564
 - proto: WallReinforcedRust
   entities:
-  - uid: 135
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 67.5,-27.5
-      parent: 2
-  - uid: 139
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 67.5,-26.5
-      parent: 2
   - uid: 496
     components:
     - type: Transform
@@ -68098,6 +68772,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 67.5,-22.5
       parent: 2
+  - uid: 7233
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-23.5
+      parent: 2
   - uid: 7237
     components:
     - type: Transform
@@ -68188,59 +68868,53 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 67.5,-12.5
       parent: 2
-  - uid: 7339
+  - uid: 7306
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 67.5,-18.5
+      pos: 67.5,-24.5
       parent: 2
-  - uid: 7388
+  - uid: 7307
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 67.5,-25.5
       parent: 2
-  - uid: 7397
+  - uid: 7308
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-26.5
+      parent: 2
+  - uid: 7309
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-27.5
+      parent: 2
+  - uid: 7310
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-28.5
+      parent: 2
+  - uid: 7311
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 66.5,-28.5
       parent: 2
-  - uid: 7399
+  - uid: 7312
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 65.5,-28.5
       parent: 2
-  - uid: 7401
+  - uid: 7339
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 64.5,-28.5
-      parent: 2
-  - uid: 7402
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-28.5
-      parent: 2
-  - uid: 7403
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-28.5
-      parent: 2
-  - uid: 7404
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-28.5
-      parent: 2
-  - uid: 7405
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-28.5
+      pos: 67.5,-18.5
       parent: 2
 - proto: WallSolid
   entities:
@@ -72271,11 +72945,15 @@ entities:
     - type: Transform
       pos: 26.5,-1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 9672
     components:
     - type: Transform
       pos: 13.5,-59.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
 - proto: WarningO2
   entities:
   - uid: 326
@@ -72283,11 +72961,15 @@ entities:
     - type: Transform
       pos: 24.5,-1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 9671
     components:
     - type: Transform
       pos: 11.5,-59.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
 - proto: WarningWaste
   entities:
   - uid: 3111
@@ -72295,11 +72977,15 @@ entities:
     - type: Transform
       pos: 24.5,-3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 9687
     components:
     - type: Transform
       pos: 16.5,-62.5
       parent: 3564
+    - type: Fixtures
+      fixtures: {}
 - proto: WaterTankFull
   entities:
   - uid: 1474
@@ -72386,66 +73072,131 @@ entities:
     - type: Transform
       pos: 33.5,55.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
   - uid: 1920
     components:
     - type: Transform
       pos: 31.5,55.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
   - uid: 2188
     components:
     - type: Transform
       pos: 34.5,50.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
   - uid: 2607
     components:
     - type: Transform
       pos: 27.5,49.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
   - uid: 2762
     components:
     - type: Transform
       pos: 21.5,57.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
   - uid: 2764
     components:
     - type: Transform
       pos: 20.5,57.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
   - uid: 2766
     components:
     - type: Transform
       pos: 19.5,49.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
   - uid: 2767
     components:
     - type: Transform
       pos: 23.5,49.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
   - uid: 7555
     components:
     - type: Transform
       pos: 25.5,57.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
   - uid: 7622
     components:
     - type: Transform
       pos: 37.5,49.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
   - uid: 7628
     components:
     - type: Transform
       pos: 42.5,47.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
   - uid: 7629
     components:
     - type: Transform
       pos: 50.5,49.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
   - uid: 7630
     components:
     - type: Transform
       pos: 49.5,50.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6658
+      - 4557
+      - 6155
 - proto: WeaponEnergyTurretAIControlPanel
   entities:
   - uid: 4557
@@ -72454,18 +73205,70 @@ entities:
       rot: 3.141592653589793 rad
       pos: 29.5,49.5
       parent: 2
+    - type: DeviceList
+      devices:
+      - 2764
+      - 2762
+      - 2766
+      - 2767
+      - 7555
+      - 2607
+      - 1920
+      - 1540
+      - 2188
+      - 7622
+      - 7628
+      - 7630
+      - 7629
   - uid: 6155
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 17.5,56.5
       parent: 2
+    - type: DeviceList
+      devices:
+      - 2764
+      - 2762
+      - 2766
+      - 2767
+      - 7555
+      - 2607
+      - 1920
+      - 1540
+      - 2188
+      - 7622
+      - 7628
+      - 7630
+      - 7629
   - uid: 6658
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 46.5,46.5
       parent: 2
+    - type: DeviceList
+      devices:
+      - 2764
+      - 2762
+      - 2766
+      - 2767
+      - 7555
+      - 2607
+      - 1920
+      - 1540
+      - 2188
+      - 7622
+      - 7628
+      - 7630
+      - 7629
+- proto: WeldedSteelApronBase
+  entities:
+  - uid: 6177
+    components:
+    - type: Transform
+      pos: 13.5,30.5
+      parent: 2
 - proto: Welder
   entities:
   - uid: 7549
@@ -72528,428 +73331,566 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 44
     components:
     - type: Transform
       pos: 19.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 57
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 21.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 59
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 80
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 84
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 123
     components:
     - type: Transform
       pos: 50.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 147
     components:
     - type: Transform
       pos: 43.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 167
     components:
     - type: Transform
       pos: 5.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 257
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 266
     components:
     - type: Transform
       pos: 44.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 467
     components:
     - type: Transform
       pos: 18.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 493
     components:
     - type: Transform
       pos: 27.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 505
     components:
     - type: Transform
       pos: 28.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 513
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 11.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 697
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 14.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 792
     components:
     - type: Transform
       pos: 38.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 956
     components:
     - type: Transform
       pos: 32.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1167
     components:
     - type: Transform
       pos: 17.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1291
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 12.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1294
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 12.5,20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1370
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 36.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1396
     components:
     - type: Transform
       pos: 61.5,42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1692
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 15.5,23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1807
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 12.5,22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1922
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 12.5,24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1945
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 64.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2045
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 57.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2046
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 58.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2132
     components:
     - type: Transform
       pos: 37.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2380
     components:
     - type: Transform
       pos: 50.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2959
     components:
     - type: Transform
       pos: 58.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2960
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 64.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2966
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3171
     components:
     - type: Transform
       pos: 37.5,28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3234
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 55.5,16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3313
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 48.5,25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3760
     components:
     - type: Transform
       pos: 51.5,27.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3984
     components:
     - type: Transform
       pos: 61.5,40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4417
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 63.5,48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5848
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 35.5,31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6338
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6655
     components:
     - type: Transform
       pos: 43.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7157
     components:
     - type: Transform
       pos: 5.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7247
     components:
     - type: Transform
       pos: 4.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7249
     components:
     - type: Transform
       pos: 5.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7387
     components:
     - type: Transform
       pos: 18.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7414
     components:
     - type: Transform
       pos: 43.5,22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8367
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 31.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8392
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 44.5,31.5
       parent: 2
-  - uid: 10344
-    components:
-    - type: Transform
-      pos: 23.5,-24.5
-      parent: 3564
-  - uid: 10345
-    components:
-    - type: Transform
-      pos: 24.5,-24.5
-      parent: 3564
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10346
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 20.5,-26.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10347
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 20.5,-27.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10348
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,-38.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10349
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 25.5,-38.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10350
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,-34.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10351
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 25.5,-34.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10352
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,-38.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10353
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 19.5,-38.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10354
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 25.5,-42.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10355
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,-42.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10356
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 25.5,-46.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10357
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,-46.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10358
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,-46.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10359
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 19.5,-46.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10360
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 25.5,-50.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10361
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,-50.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10362
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,-50.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10363
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 19.5,-50.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10364
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,-54.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10365
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 19.5,-54.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10366
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 25.5,-54.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10367
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,-54.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10375
     components:
     - type: Transform
       pos: 28.5,-62.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10427
     components:
     - type: Transform
       pos: 37.5,53.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecure
   entities:
   - uid: 107
@@ -72957,11 +73898,15 @@ entities:
     - type: Transform
       pos: 13.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 141
     components:
     - type: Transform
       pos: 9.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureArmoryLocked
   entities:
   - uid: 10373
@@ -72970,24 +73915,32 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,-59.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10374
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,-58.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10376
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,-61.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10377
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,-66.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
 - proto: WindoorSecureChapelLocked
   entities:
   - uid: 356
@@ -72996,11 +73949,15 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 440
     components:
     - type: Transform
       pos: -3.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureChemistryLocked
   entities:
   - uid: 547
@@ -73009,22 +73966,30 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 29.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1327
     components:
     - type: Transform
       pos: 32.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2222
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 32.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2484
     components:
     - type: Transform
       pos: 31.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureCommandLocked
   entities:
   - uid: 125
@@ -73032,6 +73997,8 @@ entities:
     - type: Transform
       pos: 57.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: AccessReader
       access:
       - - Captain
@@ -73040,6 +74007,8 @@ entities:
     - type: Transform
       pos: 57.5,27.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: AccessReader
       access:
       - - Captain
@@ -73049,22 +74018,42 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 29.5,50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 703
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 28.5,50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 2034
+    components:
+    - type: Transform
+      pos: 17.5,42.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 2037
+    components:
+    - type: Transform
+      pos: 22.5,16.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2399
     components:
     - type: Transform
       pos: 59.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -239673.5
+      secondsUntilStateChange: -248614.53
       state: Opening
     - type: Airlock
       autoClose: False
@@ -73074,18 +74063,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 54.5,31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4601
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 41.5,50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11363
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 35.5,54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureEngineeringLocked
   entities:
   - uid: 136
@@ -73094,40 +74089,54 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 31.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 321
     components:
     - type: Transform
       pos: 60.5,60.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1365
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 31.5,20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1617
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 36.5,21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2645
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8396
     components:
     - type: Transform
       pos: 33.5,36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8476
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 21.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureMedicalLocked
   entities:
   - uid: 609
@@ -73135,6 +74144,8 @@ entities:
     - type: Transform
       pos: 25.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: AccessReader
       access:
       - - Bar
@@ -73147,24 +74158,32 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1089
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 15.5,16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6975
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 22.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6997
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 21.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureSecurityLawyerLocked
   entities:
   - uid: 1231
@@ -73173,12 +74192,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 37.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10329
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,-32.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -73192,6 +74215,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,-32.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -73204,21 +74229,29 @@ entities:
     - type: Transform
       pos: 22.5,-62.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10369
     components:
     - type: Transform
       pos: 23.5,-62.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10370
     components:
     - type: Transform
       pos: 22.5,-56.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10371
     components:
     - type: Transform
       pos: 23.5,-56.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
 - proto: WindoorSecureSecurityLocked
   entities:
   - uid: 1053
@@ -73227,12 +74260,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1097
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -73245,12 +74282,16 @@ entities:
     - type: Transform
       pos: 40.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1441
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 41.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -73258,12 +74299,28 @@ entities:
         1097:
         - - DoorStatus
           - DoorBolt
+  - uid: 5342
+    components:
+    - type: Transform
+      pos: 24.5,-24.5
+      parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
+  - uid: 5345
+    components:
+    - type: Transform
+      pos: 23.5,-24.5
+      parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
   - uid: 10372
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,-28.5
       parent: 3564
+    - type: DeltaPressure
+      gridUid: 3564
 - proto: WindowDirectional
   entities:
   - uid: 471
@@ -73271,311 +74328,491 @@ entities:
     - type: Transform
       pos: 30.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 472
     components:
     - type: Transform
       pos: 26.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 474
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 28.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 507
     components:
     - type: Transform
       pos: 27.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 512
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 11.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 537
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 11.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 555
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 25.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 556
     components:
     - type: Transform
       pos: 26.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 566
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 11.5,16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 646
     components:
     - type: Transform
       pos: 15.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 654
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 11.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 712
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 26.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 717
     components:
     - type: Transform
       pos: 14.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 733
     components:
     - type: Transform
       pos: 13.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 734
     components:
     - type: Transform
       pos: 12.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 743
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 11.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 747
     components:
     - type: Transform
       pos: 29.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 748
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 28.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 749
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1077
     components:
     - type: Transform
       pos: 33.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1078
     components:
     - type: Transform
       pos: 34.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1100
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1102
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1165
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 15.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1166
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 15.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1282
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 29.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1283
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 28.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1285
     components:
     - type: Transform
       pos: 24.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1307
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 11.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1339
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1348
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1349
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 1353
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,16.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 1535
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,42.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 1539
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 54.5,32.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 1562
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,32.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 1756
+    components:
+    - type: Transform
+      pos: 54.5,32.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2002
     components:
     - type: Transform
       pos: 53.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2027
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 61.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2028
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 61.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2029
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 61.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 2031
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 60.5,42.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 2032
+    components:
+    - type: Transform
+      pos: 60.5,42.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 2035
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,41.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2344
     components:
     - type: Transform
       pos: 52.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2374
     components:
     - type: Transform
       pos: 51.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2375
     components:
     - type: Transform
       pos: 52.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2377
     components:
     - type: Transform
       pos: 49.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2393
     components:
     - type: Transform
       pos: 51.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2394
     components:
     - type: Transform
       pos: 49.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3043
     components:
     - type: Transform
       pos: 53.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 5599
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,42.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6014
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6382
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 31.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6415
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 32.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6419
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 33.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6420
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 34.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6421
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 35.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6423
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6438
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7298
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 31.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7299
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 32.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8365
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 31.5,33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8366
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 31.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindowReinforcedDirectional
   entities:
   - uid: 20
@@ -73584,368 +74821,440 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 309
     components:
     - type: Transform
       pos: -6.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 310
     components:
     - type: Transform
       pos: -5.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 311
     components:
     - type: Transform
       pos: -4.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 313
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -6.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 314
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -5.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 315
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 316
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 417
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 418
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 419
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 581
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 601
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 688
     components:
     - type: Transform
       pos: 57.5,60.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 892
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 38.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1101
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 37.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1197
     components:
     - type: Transform
       pos: -8.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1322
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 37.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1329
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 39.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1360
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 40.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1886
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1915
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1936
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 12.5,39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1937
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 12.5,38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2229
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2337
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 54.5,33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2376
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 54.5,28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2557
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 54.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2600
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 57.5,62.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2601
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 57.5,61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2629
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -8.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2631
     components:
     - type: Transform
       pos: 59.5,60.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2679
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2682
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2683
     components:
     - type: Transform
       pos: 58.5,60.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2701
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 57.5,60.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2769
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 20.5,57.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3292
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 54.5,29.5
       parent: 2
-  - uid: 3784
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,42.5
-      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3811
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 54.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3813
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 54.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5343
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 63.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7116
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 44.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7119
     components:
     - type: Transform
       pos: 42.5,35.5
       parent: 2
-  - uid: 7285
-    components:
-    - type: Transform
-      pos: 54.5,32.5
-      parent: 2
-  - uid: 7288
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 54.5,32.5
-      parent: 2
-  - uid: 7289
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,32.5
-      parent: 2
-  - uid: 7415
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 60.5,42.5
-      parent: 2
-  - uid: 8456
-    components:
-    - type: Transform
-      pos: 60.5,42.5
-      parent: 2
-  - uid: 8457
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,42.5
-      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11201
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 63.5,33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11202
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 63.5,32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11203
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 63.5,31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11204
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 63.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11205
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 63.5,29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11206
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 63.5,28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11357
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11358
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11359
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11360
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11361
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11362
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: Wirecutter
   entities:
   - uid: 7520
diff --git a/Resources/Prototypes/Maps/relic.yml b/Resources/Prototypes/Maps/relic.yml
index 74476455d1..93b126437f 100644
--- a/Resources/Prototypes/Maps/relic.yml
+++ b/Resources/Prototypes/Maps/relic.yml
@@ -58,7 +58,7 @@
             SecurityCadet: [ 2, 2 ] #intern, not counted
             Lawyer: [ 1, 1 ]
             #supply (0)
-            #civilian (1+)
+            #civilian (0+)
             Passenger: [ -1, -1 ] #infinite, not counted
             #silicon (1)
             StationAi: [ 1, 1 ]
diff --git a/Resources/Prototypes/Parallaxes/relic.yml b/Resources/Prototypes/Parallaxes/relic.yml
index ba72af7ace..bc0be872d5 100644
--- a/Resources/Prototypes/Parallaxes/relic.yml
+++ b/Resources/Prototypes/Parallaxes/relic.yml
@@ -5,5 +5,5 @@
         !type:ImageParallaxTextureSource
         path: "/Textures/Parallaxes/oldspace.png"
       slowness: 0.0
-      scrolling: "-0.25, 0"
+      scrolling: "-0.125, 0"
       scale: "1, 1"
diff --git a/Resources/Textures/Parallaxes/oldspace.png b/Resources/Textures/Parallaxes/oldspace.png
index 7960ffaf44fc5ad95e7649fa8bd27b515b5331ce..09836bc36546563fa357964fc2aa3709e0c8c5f7 100644
GIT binary patch
delta 463
zcmV;=0WkiS2A>CzNeaOL01m+cxRGn^u~U`-f1yc4K~z{r#h1;UgdhyX-`In;;Mp2z
zff_7>gJn>|v_K7>X~8CTFN+i32E>n<`Jep7Xvj+f`e@ts2RGuJ!!%7BTZ|EX-*0Tm
z?~xWT3<KtQ-Z%lkvMlJjj?JeCA;1{3u{G&J3l5+d+&Ralm0=jz^e;Gomjd4)gz!=T
ze}8go$V{b=wRXKu<ldoSjQNZL+=SLzJfBbC+a-W(LP-dLO)52hdp-@6j^%FEY7O$s
zO$5IS^uALi;F?}REx{f#crJ69WzGju0p3D+2ju&AajFD0Z~{3_l^}<dT?;NJB9-N^
z0`fq~9biXjv^gy`jU1~|@X|XZjW(yUf7!hEn|nFfj~iC*HR;-Wf2;)Bd481!%67@w
zB#bfD($@MNQa~crkf+;Gs>YBN0yU!yE;HAj<L?Dkfp_hC8tMW*$yx$UE{zx?n=Y{~
zpmw}U$FSD<rNq4V`6etqnBZ~M`X(ioeC38Tj$>U9)Shf-*eH<u^m<ot@B-vKIkUVu
zv_;pHFHu#3v*h-Z!~X^Hfx8c+s$Vl%no{sR>G{6*9>3}~)e6v3<(2>d002ovPDHLk
FV1lU1-cJAk

delta 325
zcmV-L0lNO52bKnqNeaRM01m<d6(~x8u~U`-e;7$bK~z{r)t12-gCGorBRjwzS;Db6
zIF?JeM~2W|3LmC14HUKh$Ds0fd4PlWeggm?A_yVC5iv%XriqsUly?ykmSy4P9m6<|
z+dR+Uz2{@6Q7&dk4%~&~1q(#POCm8wUfMxK*E_&-p$a$(S5I;aB)hc95s{agP#x$A
zf44qi7I0QO%)7ukxpjvmOaf~9Z50Y{vCg7c>Rl^k*h2{R3`l7AgO#5I^uUyXS}bi%
zoFYIAB0un+)q)ypt$YaJ7L{n$wt$EaYrzqkYu~uU0qr7dcA(e&aESvN;$<YQPO3>*
zpG))J?*K1Yk(_HG3vjMZix#XJ@~rE+FYZS=BApW{D>(x_elA-0uMld%l5Et_zE$!9
XU-Wa{>Jy{r00000NkvXXu0mjf7+;Jt


From d3771a19e2502dfda94cdec325a87c26551d3bb1 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 Oct 2025 17:01:09 +0000
Subject: [PATCH 097/216] Automatic changelog update

---
 Resources/Changelog/Maps.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index aa47fbf146..6907277fb8 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -749,4 +749,12 @@
   id: 90
   time: '2025-10-07T02:21:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40725
+- author: Vortebo
+  changes:
+  - message: On Relic, some small changes to address unintended gameplay issues and
+      further increase historical accuracy.
+    type: Tweak
+  id: 91
+  time: '2025-10-08T16:59:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40537
 Order: 1

From 02ada04eb4f2cf69fdc1aee7999bc103e452adc3 Mon Sep 17 00:00:00 2001
From: ToastEnjoyer <masondoesgamingyes@gmail.com>
Date: Wed, 8 Oct 2025 15:30:16 -0500
Subject: [PATCH 098/216] Removed wardens enforcer from box (#40785)

box shotgun gone :dejected:
---
 Resources/Maps/box.yml | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml
index 1eaa100643..7fbf46f2bf 100644
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 266.0.0
+  engineVersion: 267.2.0
   forkId: ""
   forkVersion: ""
-  time: 09/06/2025 03:51:25
-  entityCount: 28793
+  time: 10/08/2025 20:15:18
+  entityCount: 28790
 maps:
 - 780
 grids:
@@ -10936,8 +10936,8 @@ entities:
           id: docking46345
           localAnchorB: -0.5,-1
           localAnchorA: -66.5,22
-          damping: 42.40102
-          stiffness: 380.5907
+          damping: 42.401035
+          stiffness: 380.59082
     - type: OccluderTree
     - type: Shuttle
       dampingModifier: 0.25
@@ -23112,18 +23112,6 @@ entities:
     - type: Transform
       pos: 7.3923097,47.786827
       parent: 8364
-- proto: BoxShotgunSlug
-  entities:
-  - uid: 7852
-    components:
-    - type: Transform
-      pos: -7.2934785,34.60984
-      parent: 8364
-  - uid: 9144
-    components:
-    - type: Transform
-      pos: -7.289858,34.610893
-      parent: 8364
 - proto: BoxSterileMask
   entities:
   - uid: 5467
@@ -182974,15 +182962,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: WeaponShotgunEnforcer
-  entities:
-  - uid: 9086
-    components:
-    - type: Transform
-      pos: -7.4221897,34.38881
-      parent: 8364
-    - type: BallisticAmmoProvider
-      proto: ShellShotgunSlug
 - proto: WeaponShotgunKammerer
   entities:
   - uid: 26308

From 0039dff91fe5da9bcfb303ebcbb9ff1ab556adc1 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 Oct 2025 20:42:56 +0000
Subject: [PATCH 099/216] Automatic changelog update

---
 Resources/Changelog/Maps.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 6907277fb8..6d59319598 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -757,4 +757,11 @@
   id: 91
   time: '2025-10-08T16:59:59.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40537
+- author: ToastEnjoyer
+  changes:
+  - message: On box, the wardens enforcer has been removed from their office.
+    type: Remove
+  id: 92
+  time: '2025-10-08T20:41:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40785
 Order: 1

From df6307fe66f71944c5b3d5ed1e683a2723953181 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Wed, 8 Oct 2025 23:48:52 +0200
Subject: [PATCH 100/216] Allow more energy projectiles to hit holo creatures
 (#40782)

* Allow more energy projectiles to hit holo creatures.

* Disabler SMG
---
 .../Objects/Weapons/Guns/Projectiles/projectiles.yml     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 49b9989730..bc9f40f85a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -211,8 +211,9 @@
           bounds: "-0.15,-0.45,0.15,0.15"
         hard: false
         mask:
-          - Impassable
-          - BulletImpassable
+        - Opaque
+        - Impassable
+        - BulletImpassable
       fly-by: *flybyfixture
   - type: Ammo
   - type: Projectile
@@ -289,6 +290,7 @@
           bounds: "-0.15,-0.3,0.15,0.3"
         hard: false
         mask:
+        - Opaque
         - Impassable
         - BulletImpassable
       fly-by: *flybyfixture
@@ -329,6 +331,7 @@
           bounds: "-0.15,-0.3,0.15,0.3"
         hard: false
         mask:
+        - Opaque
         - Impassable
         - BulletImpassable
       fly-by: *flybyfixture
@@ -408,6 +411,7 @@
           bounds: "-0.2,-0.2,0.2,0.2"
         hard: false
         mask:
+        - Opaque
         - Impassable
         - BulletImpassable
       fly-by: *flybyfixture
@@ -1141,6 +1145,7 @@
           bounds: "-0.15,-0.3,0.15,0.3"
         hard: false
         mask:
+        - Opaque
         - Impassable
         - BulletImpassable
       fly-by: *flybyfixture

From 6a3a54535b9e5bd42f3778daa6045a0ff11a52e5 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 Oct 2025 22:00:47 +0000
Subject: [PATCH 101/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 93f0799741..98168fd5ff 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,16 +1,4 @@
 Entries:
-- author: ArtisticRoomba
-  changes:
-  - message: Tesla coils can now hold a max capacity of 5 MJ, and receive 5 MJ of
-      energy when struck by lightning.
-    type: Tweak
-  - message: Tesla coils can now only output a maximum of 350 kW to the grid. This
-      was done to make power flow smoother (it was triggering epilepsy in extreme
-      circumstances).
-    type: Tweak
-  id: 8554
-  time: '2025-05-22T01:39:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37626
 - author: Wolfkey-SomeoneElseTookMyUsername
   changes:
   - message: You can now construct disposal signalers, which trigger a signal every
@@ -3960,3 +3948,10 @@
   id: 9056
   time: '2025-10-08T15:49:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39920
+- author: SlamBamActionman
+  changes:
+  - message: Disablers, temperature guns and tasers can now hit holo mobs.
+    type: Fix
+  id: 9057
+  time: '2025-10-08T21:59:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40782

From c54fb47f7c7aacd1132d6634576f1b7d81fc2123 Mon Sep 17 00:00:00 2001
From: Centronias <charlie.t.santos@gmail.com>
Date: Wed, 8 Oct 2025 15:17:11 -0700
Subject: [PATCH 102/216] Wrapped Parcels can be labelled with Papers (#40783)

* labels

* oop

* Update Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
---
 .../Entities/Objects/Misc/parcel_wrap.yml     |  26 ++++++++++++++++++
 .../ParcelWrap/paper_labels.rsi/bounty.png    | Bin 0 -> 202 bytes
 .../paper_labels.rsi/captains_paper.png       | Bin 0 -> 202 bytes
 .../ParcelWrap/paper_labels.rsi/invoice.png   | Bin 0 -> 202 bytes
 .../ParcelWrap/paper_labels.rsi/meta.json     |  23 ++++++++++++++++
 .../ParcelWrap/paper_labels.rsi/paper.png     | Bin 0 -> 195 bytes
 6 files changed, 49 insertions(+)
 create mode 100644 Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/bounty.png
 create mode 100644 Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/captains_paper.png
 create mode 100644 Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/invoice.png
 create mode 100644 Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/paper.png

diff --git a/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml b/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
index 58455ba211..61d8452b93 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
@@ -38,6 +38,7 @@
   - type: ContainerContainer
     containers:
       contents: !type:ContainerSlot
+      paper_label: !type:ContainerSlot
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -49,11 +50,25 @@
           "Large": { state: "parcel-medium" }
           "Huge": { state: "parcel-large" }
           "Ginormous": { state: "parcel-large" }
+      enum.PaperLabelVisuals.HasLabel:
+        enum.PaperLabelVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.PaperLabelVisuals.LabelType:
+        enum.PaperLabelVisuals.Layer:
+          Paper: { state: paper }
+          Bounty: { state: bounty }
+          CaptainsPaper: { state: captains_paper }
+          Invoice: { state: invoice }
   - type: Sprite
     sprite: Objects/Misc/ParcelWrap/wrapped_parcel.rsi
     layers:
     - state: parcel-medium
       map: [ "enum.WrappedParcelVisuals.Layer" ]
+    - state: paper
+      visible: false
+      sprite: Objects/Misc/ParcelWrap/paper_labels.rsi
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: WrappedParcel
     unwrapDelay: 0.5
     unwrapSound:
@@ -61,6 +76,17 @@
       params:
         volume: -4
     unwrapTrash: ParcelWrapTrash
+  - type: ItemSlots
+  - type: PaperLabel
+    labelSlot:
+      insertVerbText: comp-paper-label-insert
+      ejectVerbText: comp-paper-label-eject
+      whitelist:
+        components:
+        - Paper
+      blacklist:
+        tags:
+        - Book
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
diff --git a/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/bounty.png b/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/bounty.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b44d0e52b59f2c03079f990861e74507167eb94
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EuJopArY;~
z2@<S}6GVEN0u8v_4r+ioJO&9WVTqaRe%9wax;xolD3{IbfK%6_H!8{^|E^R%*Vs6_
z5d=C#j>_BrPuWrQnD_AU^Y)tCX6Ueg_`J#3;`YhIvd-n~HGlq0et7L}IZyxmy0iz+
tQ<rx!dw4M$c>grLu~Le6ae@OQgZgv11)Uc|#DVT%@O1TaS?83{1OO!xOMCzT

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/captains_paper.png b/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/captains_paper.png
new file mode 100644
index 0000000000000000000000000000000000000000..b02ea9c4a574f1d6590b74025f755b2aa9f421ee
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EuJopArY;~
z2@<S}6GVEN0u8v_4r+ioJO&9WVTpNpKkIWIO;#@#%4IV<;MDc#$r2rre|IV`Yiyj|
z2m+lVN9XUaN!wBQS?lm~{rQ^PX6Ueg`1HZ(#?74vWSz^|YyN$j`S9J{XdeIhc1aJO
tK3v+x?BT_1;B9(k>q;r!#R(3K46)*JM`rM)Yz4Z9!PC{xWt~$(697OPOQZk*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/invoice.png b/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/invoice.png
new file mode 100644
index 0000000000000000000000000000000000000000..2089996fdb100202acc5368543dda2303ef07953
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EuJopArY;~
z2@<S}6GVEN0u8v_4r+ioJO&9WVGGMWpVsF*imtxZX~ry_py;~MJ57(P{`{AdQ*N9+
z00J&ukKWI>H?-MV*81@GbAOR&pJ~h%l|Lo6%#C^2w{SP}zWRShK0Ny7+qS)5-mu`)
tr@*6(DoYt>EH#R<3h8YNG+4mEkbPY41nVT-44``$JYD@<);T3K0RUS&Oilm*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/meta.json b/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/meta.json
new file mode 100644
index 0000000000..4136d89ef0
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Original sprites by Vermidia and modified by SpaceRox1244; manual offset applied by Centronias",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "paper"
+        },
+        {
+            "name": "bounty"
+        },
+        {
+            "name": "captains_paper"
+        },
+        {
+            "name": "invoice"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/paper.png b/Resources/Textures/Objects/Misc/ParcelWrap/paper_labels.rsi/paper.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9f977302cb4b53588ae04f520e5c5d55a5ca1ef
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}wVp1HArY-_
zFKy&)P!M6ca5>_!k`>$UfR{W$8)uts$vF`3pzZ6U;m~RJ-ReYZ{YiEOB_LQd-*l&A
z@|k(N%Fm_lpLl6%%k#`#bH%gopJ8LzqWVyysr0shYaD-F$bxXLsMo8{JZD|RvFAI7
r;)3v1UX6?F3;1N)7rv5u5zcPLD7Wi5!%kbELl`_={an^LB{Ts5ohV13

literal 0
HcmV?d00001


From 61f7d3438d884cedcc83818f48a2b3bc9234d6ad Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 Oct 2025 22:29:05 +0000
Subject: [PATCH 103/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 98168fd5ff..c62375f630 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Wolfkey-SomeoneElseTookMyUsername
-  changes:
-  - message: You can now construct disposal signalers, which trigger a signal every
-      time an item passes through them.
-    type: Add
-  id: 8555
-  time: '2025-05-22T02:18:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37535
 - author: ScarKy0
   changes:
   - message: The "Escape alive and unrestrained" objective now counts as partially
@@ -3955,3 +3947,10 @@
   id: 9057
   time: '2025-10-08T21:59:39.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40782
+- author: Centronias
+  changes:
+  - message: You can now attach paper labels to wrapped parcels.
+    type: Add
+  id: 9058
+  time: '2025-10-08T22:27:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40783

From 72852accbe729a45517c57975265ab10ec14d6f3 Mon Sep 17 00:00:00 2001
From: ToastEnjoyer <masondoesgamingyes@gmail.com>
Date: Wed, 8 Oct 2025 18:34:48 -0500
Subject: [PATCH 104/216] Remove enforcer from fland (#40786)

---
 Resources/Maps/fland.yml | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index 2551bd58ff..bcb5673b42 100644
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 267.1.0
+  engineVersion: 267.2.0
   forkId: ""
   forkVersion: ""
-  time: 09/24/2025 21:56:25
-  entityCount: 36083
+  time: 10/08/2025 23:22:51
+  entityCount: 36080
 maps:
 - 1
 grids:
@@ -30897,11 +30897,6 @@ entities:
     - type: Transform
       pos: 16.61324,11.471256
       parent: 13329
-  - uid: 10642
-    components:
-    - type: Transform
-      pos: 31.342075,13.304442
-      parent: 13329
   - uid: 18486
     components:
     - type: Transform
@@ -31282,11 +31277,6 @@ entities:
     - type: Transform
       pos: 16.446573,11.429589
       parent: 13329
-  - uid: 9340
-    components:
-    - type: Transform
-      pos: 31.685825,13.288817
-      parent: 13329
 - proto: BoxLightMixed
   entities:
   - uid: 1644
@@ -227061,13 +227051,6 @@ entities:
     - type: Transform
       pos: 19.469765,12.608503
       parent: 13329
-- proto: WeaponShotgunEnforcer
-  entities:
-  - uid: 9339
-    components:
-    - type: Transform
-      pos: 31.498325,13.851317
-      parent: 13329
 - proto: WeaponShotgunHandmade
   entities:
   - uid: 5418

From ef0c9ecc6350d4d6bcf9c8ad9013724688dbcae3 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 Oct 2025 23:47:04 +0000
Subject: [PATCH 105/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c62375f630..c9ee074fba 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: ScarKy0
-  changes:
-  - message: The "Escape alive and unrestrained" objective now counts as partially
-      complete if you show up handcuffed. Being dead still has it count as a total
-      fail!
-    type: Tweak
-  id: 8556
-  time: '2025-05-22T03:25:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37680
 - author: EmoGarbage404
   changes:
   - message: Added cargo orders for gold and silver ingots.
@@ -3954,3 +3945,10 @@
   id: 9058
   time: '2025-10-08T22:27:58.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40783
+- author: ToastEnjoyer
+  changes:
+  - message: On fland, the wardens enforcer has been removed.
+    type: Remove
+  id: 9059
+  time: '2025-10-08T23:45:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40786

From 8e3243a15648077aad082d5fc299e71d5267defe Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Thu, 9 Oct 2025 07:03:11 +0200
Subject: [PATCH 106/216] Fix changeling blindness (#40517)

fix changeling blindness
---
 .../Traits/Assorted/PermanentBlindnessSystem.cs        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs b/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
index a99a12d0fd..e060de7dd9 100644
--- a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
+++ b/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Eye.Blinding.Systems;
 using Content.Shared.IdentityManagement;
-using Robust.Shared.Network;
 
 namespace Content.Shared.Traits.Assorted;
 
@@ -38,18 +37,23 @@ public sealed class PermanentBlindnessSystem : EntitySystem
         {
             _blinding.SetMinDamage((blindness.Owner, blindable), 0);
         }
+
+        // Heal all eye damage when the component is removed.
+        // Otherwise you would still be blind, but not *permanently* blind, meaning you have to heal the eye damage with oculine.
+        // This is needed for changelings that transform from a blind player to a non-blind one.
+        _blinding.AdjustEyeDamage((blindness.Owner, blindable), -blindable.EyeDamage);
     }
 
     private void OnMapInit(Entity<PermanentBlindnessComponent> blindness, ref MapInitEvent args)
     {
-        if(!TryComp<BlindableComponent>(blindness.Owner, out var blindable))
+        if (!TryComp<BlindableComponent>(blindness.Owner, out var blindable))
             return;
 
         if (blindness.Comp.Blindness != 0)
             _blinding.SetMinDamage((blindness.Owner, blindable), blindness.Comp.Blindness);
         else
         {
-            var maxMagnitudeInt = (int) BlurryVisionComponent.MaxMagnitude;
+            var maxMagnitudeInt = (int)BlurryVisionComponent.MaxMagnitude;
             _blinding.SetMinDamage((blindness.Owner, blindable), maxMagnitudeInt);
         }
     }

From 6f3f7d86b807780318d18b5686afc32a657ccdbc Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Thu, 9 Oct 2025 01:14:41 -0400
Subject: [PATCH 107/216] Fix terminology (#40792)

c20r magazine description changed to "SMG"
---
 Resources/Locale/en-US/store/uplink-catalog.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 8eecfad339..65104c7918 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -91,7 +91,7 @@ uplink-pistol-magazine-name = Pistol Magazine (.35 auto)
 uplink-pistol-magazine-desc = Pistol magazine with 10 cartridges. Compatible with the Viper.
 
 uplink-pistol-magazine-c20r-name = SMG magazine (.35 auto)
-uplink-pistol-magazine-c20r-desc = Rifle magazine with 30 cartridges. Compatible with C-20r.
+uplink-pistol-magazine-c20r-desc = SMG magazine with 30 cartridges. Compatible with C-20r.
 
 uplink-magazine-bulldog-pellet-name = Drum magazine (.50 pellet)
 uplink-magazine-bulldog-pellet-desc = Shotgun magazine with 8 shells filled with buckshot. Compatible with the Bulldog.

From bb3fa43f1f6ff133501bb298b4bb95407427159f Mon Sep 17 00:00:00 2001
From: thetuerk <46725294+ThanosDeGraf@users.noreply.github.com>
Date: Thu, 9 Oct 2025 12:26:21 +0200
Subject: [PATCH 108/216] Predict LungSystem (#40729)

* Initial edits of files
Untested yet. I would like to make sure all is accounted for before moving the files.

* trying my best

* Revert "trying my best"

This reverts commit 9aeece466df0169adec97e3947b061b54fd9b388.

* Revert "Initial edits of files"

This reverts commit 45c6e2343844b5fcafadbf2e5115fb2f241086a1.

* an actual meal

* Added networking to LungComponent.cs

* removed duplicate using

* moving GasRagents to SharedAtmosphereSystem.cs
---
 Content.IntegrationTests/Tests/Body/LungTest.cs     |  2 +-
 .../Atmos/EntitySystems/AtmosphereSystem.Gases.cs   |  3 ---
 Content.Server/Body/Systems/RespiratorSystem.cs     |  1 +
 .../Atmos/EntitySystems/SharedAtmosphereSystem.cs   |  3 +++
 .../Body/Components/LungComponent.cs                |  7 ++++---
 .../Body/Systems/LungSystem.cs                      | 13 ++++++-------
 6 files changed, 15 insertions(+), 14 deletions(-)
 rename {Content.Server => Content.Shared}/Body/Components/LungComponent.cs (84%)
 rename {Content.Server => Content.Shared}/Body/Systems/LungSystem.cs (86%)

diff --git a/Content.IntegrationTests/Tests/Body/LungTest.cs b/Content.IntegrationTests/Tests/Body/LungTest.cs
index 8ac3a3021f..584eb58595 100644
--- a/Content.IntegrationTests/Tests/Body/LungTest.cs
+++ b/Content.IntegrationTests/Tests/Body/LungTest.cs
@@ -1,7 +1,7 @@
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
+using Content.Shared.Body.Systems;
 using Content.Shared.Body.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
index c545186669..0c6a3a7daa 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
@@ -25,8 +25,6 @@ namespace Content.Server.Atmos.EntitySystems
         /// </summary>
         public float[] GasSpecificHeats => _gasSpecificHeats;
 
-        public string?[] GasReagents = new string[Atmospherics.TotalNumberOfGases];
-
         private void InitializeGases()
         {
             _gasReactions = _protoMan.EnumeratePrototypes<GasReactionPrototype>().ToArray();
@@ -37,7 +35,6 @@ namespace Content.Server.Atmos.EntitySystems
             for (var i = 0; i < GasPrototypes.Length; i++)
             {
                 _gasSpecificHeats[i] = GasPrototypes[i].SpecificHeat / HeatScale;
-                GasReagents[i] = GasPrototypes[i].Reagent;
             }
         }
 
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index eab3e2e56c..63b04adc6a 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Chat.Systems;
 using Content.Server.EntityEffects;
+using Content.Shared.Body.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
diff --git a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs
index 4698939734..4a177e6263 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs
@@ -13,6 +13,8 @@ namespace Content.Shared.Atmos.EntitySystems
 
         private EntityQuery<InternalsComponent> _internalsQuery;
 
+        public string?[] GasReagents = new string[Atmospherics.TotalNumberOfGases];
+
         protected readonly GasPrototype[] GasPrototypes = new GasPrototype[Atmospherics.TotalNumberOfGases];
 
         public override void Initialize()
@@ -26,6 +28,7 @@ namespace Content.Shared.Atmos.EntitySystems
             for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
             {
                 GasPrototypes[i] = _prototypeManager.Index<GasPrototype>(i.ToString());
+                GasReagents[i] = GasPrototypes[i].Reagent;
             }
         }
 
diff --git a/Content.Server/Body/Components/LungComponent.cs b/Content.Shared/Body/Components/LungComponent.cs
similarity index 84%
rename from Content.Server/Body/Components/LungComponent.cs
rename to Content.Shared/Body/Components/LungComponent.cs
index 4fb769d670..dd31de7722 100644
--- a/Content.Server/Body/Components/LungComponent.cs
+++ b/Content.Shared/Body/Components/LungComponent.cs
@@ -1,12 +1,13 @@
-using Content.Server.Body.Systems;
+using Content.Shared.Body.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Chemistry.Components;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Body.Components;
+namespace Content.Shared.Body.Components;
 
-[RegisterComponent, Access(typeof(LungSystem))]
+[RegisterComponent, NetworkedComponent, Access(typeof(LungSystem))]
 public sealed partial class LungComponent : Component
 {
     [DataField]
diff --git a/Content.Server/Body/Systems/LungSystem.cs b/Content.Shared/Body/Systems/LungSystem.cs
similarity index 86%
rename from Content.Server/Body/Systems/LungSystem.cs
rename to Content.Shared/Body/Systems/LungSystem.cs
index fdc071c5f1..5f4c1ee4ef 100644
--- a/Content.Server/Body/Systems/LungSystem.cs
+++ b/Content.Shared/Body/Systems/LungSystem.cs
@@ -1,19 +1,18 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Components;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
+using Content.Shared.Body.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Clothing;
 using Content.Shared.Inventory.Events;
-using BreathToolComponent = Content.Shared.Atmos.Components.BreathToolComponent;
-using InternalsComponent = Content.Shared.Body.Components.InternalsComponent;
 
-namespace Content.Server.Body.Systems;
+namespace Content.Shared.Body.Systems;
 
 public sealed class LungSystem : EntitySystem
 {
-    [Dependency] private readonly AtmosphereSystem _atmos = default!;
-    [Dependency] private readonly InternalsSystem _internals = default!;
+    [Dependency] private readonly SharedAtmosphereSystem _atmos = default!;
+    [Dependency] private readonly SharedInternalsSystem _internals = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
 
     public static string LungSolutionName = "Lung";

From 1f1461b9db6b74bd353819ee1393b5355730706b Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Thu, 9 Oct 2025 13:59:43 +0200
Subject: [PATCH 109/216] Update Mind Shielding section in Space Law (#40647)

* Update Mind Shielding section in Space Law

* Formatting
---
 .../ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
index 25ccac38f6..917483b10a 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
@@ -25,7 +25,11 @@
 
   [color=#a4885c]Tracking Implants:[/color] Trackers can be applied to any suspect that has been convicted of a violent crime (the red linked crimes).
 
-  [color=#a4885c]Mind Shields:[/color] Shields can be administered to any inmate who has been clearly mind controlled, lost control of themselves, or a suspect charged with unlawful control. Unlike standard implantation you may hold a prisoner until you finish issuing Mind Shields, so long as it's done in a timely fashion. If a suspect refuses to cooperate or the implant fails to function they can be charged with Refusal of Mental Shielding.
+  [color=#a4885c]Mind Shields:[/color] Mind Shields can be administered to any suspect charged with a crime if there is reasonable and articulable suspicion to believe they committed the crime while under mind control. If there is undeniable proof of ongoing mind control on the station, such as a successful deconversion, all the following statements apply:
+
+  - Crew can be required to be shielded and may be forcibly implanted if they refuse.
+  - If a suspect refuses to cooperate or the implant fails to function they can be charged with Refusal of Mental Shielding.
+  - Unlike standard implantation you may indefinitely extend the duration of a prisoner's sentence until you finish issuing Mind Shields, so long as active attempts are made to procure implants and complete the implantation procedure.
 
   Usage of contraband implanters is a detainable offense, but it's not reasonable to detain someone solely for having an unidentified implant inside them.
 

From fea8ac45228f18ee7ad213560044a444a2c981e8 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Thu, 9 Oct 2025 15:00:13 +0200
Subject: [PATCH 110/216] Change whitelist logic for parcel wrap (#40800)

* init

* review
---
 .../ParcelWrap/Systems/ParcelWrappingSystem.cs        |  3 +--
 .../Prototypes/Entities/Objects/Misc/parcel_wrap.yml  | 11 +++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs
index b19f4b845c..7ea6daeed8 100644
--- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs
+++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs
@@ -51,7 +51,6 @@ public sealed partial class ParcelWrappingSystem : EntitySystem
             wrapper.Owner != target &&
             // Wrapper should never be empty, but may as well make sure.
             !_charges.IsEmpty(wrapper.Owner) &&
-            _whitelist.IsWhitelistPass(wrapper.Comp.Whitelist, target) &&
-            _whitelist.IsBlacklistFail(wrapper.Comp.Blacklist, target);
+            _whitelist.CheckBoth(target, wrapper.Comp.Blacklist, wrapper.Comp.Whitelist);
     }
 }
diff --git a/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml b/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
index 61d8452b93..8d7baa4339 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
@@ -28,6 +28,17 @@
   - type: LimitedCharges
     maxCharges: 30
 
+- type: entity
+  parent: ParcelWrap
+  id: ParcelWrapAdmeme
+  name: bluespace wrap
+  suffix: Admeme
+  description: Paper used contain items for transport. This one seems to be able to store an unusual amount of space within it.
+  components:
+  - type: ParcelWrap
+    whitelist: null
+    blacklist: null
+
 - type: entity
   parent: BaseItem
   id: WrappedParcel

From dac2c5212ae1c5f230f04dc31e7ade293dc8dcae Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 10 Oct 2025 02:03:44 +1300
Subject: [PATCH 111/216] Add generic event listener for integration tests
 (#40367)

* Add generic event listener for integration tests

* cleanup

* assert that the entity has the component

* comments & new overload
---
 .../Tests/Helpers/TestListenerComponent.cs    |  13 ++
 .../Tests/Helpers/TestListenerSystem.cs       |  45 ++++++
 .../Interaction/InteractionTest.Helpers.cs    | 138 ++++++++++++++++++
 .../Tests/Movement/SlippingTest.cs            |  32 ++--
 4 files changed, 205 insertions(+), 23 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/Helpers/TestListenerComponent.cs
 create mode 100644 Content.IntegrationTests/Tests/Helpers/TestListenerSystem.cs

diff --git a/Content.IntegrationTests/Tests/Helpers/TestListenerComponent.cs b/Content.IntegrationTests/Tests/Helpers/TestListenerComponent.cs
new file mode 100644
index 0000000000..817558b426
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Helpers/TestListenerComponent.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Robust.Shared.GameObjects;
+
+namespace Content.IntegrationTests.Tests.Helpers;
+
+/// <summary>
+/// Component that is used by <see cref="TestListenerSystem{TEvent}"/> to store any information about received events.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TestListenerComponent : Component
+{
+    public Dictionary<Type, List<object>> Events = new();
+}
diff --git a/Content.IntegrationTests/Tests/Helpers/TestListenerSystem.cs b/Content.IntegrationTests/Tests/Helpers/TestListenerSystem.cs
new file mode 100644
index 0000000000..2481cef03f
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Helpers/TestListenerSystem.cs
@@ -0,0 +1,45 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Linq;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Utility;
+
+namespace Content.IntegrationTests.Tests.Helpers;
+
+/// <summary>
+/// Generic system that listens for and records any received events of a given type.
+/// </summary>
+public abstract class TestListenerSystem<TEvent> : EntitySystem where TEvent : notnull
+{
+    public override void Initialize()
+    {
+        // TODO
+        // supporting broadcast events requires cleanup on test finish, which will probably require  changes to the
+        // test pair/pool manager and would conflict with #36797
+        SubscribeLocalEvent<TestListenerComponent, TEvent>(OnDirectedEvent);
+    }
+
+    protected virtual void OnDirectedEvent(Entity<TestListenerComponent> ent, ref TEvent args)
+    {
+        ent.Comp.Events.GetOrNew(args.GetType()).Add(args);
+    }
+
+    public int Count(EntityUid uid, Func<TEvent, bool>? predicate = null)
+    {
+        return GetEvents(uid, predicate).Count();
+    }
+
+    public void Clear(EntityUid uid)
+    {
+        CompOrNull<TestListenerComponent>(uid)?.Events.Remove(typeof(TEvent));
+    }
+
+    public IEnumerable<TEvent> GetEvents(EntityUid uid, Func<TEvent, bool>? predicate = null)
+    {
+        var events = CompOrNull<TestListenerComponent>(uid)?.Events.GetValueOrDefault(typeof(TEvent));
+        if (events == null)
+            return [];
+
+        return events.Cast<TEvent>().Where(e => predicate?.Invoke(e) ?? true);
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
index fa16730dd5..d04ed4cb3c 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Numerics;
 using System.Reflection;
 using Content.Client.Construction;
+using Content.IntegrationTests.Tests.Helpers;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Construction.Components;
 using Content.Server.Gravity;
@@ -22,6 +23,8 @@ using Robust.Shared.Input;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
+using Robust.Shared.Reflection;
+using Robust.UnitTesting;
 using ItemToggleComponent = Content.Shared.Item.ItemToggle.Components.ItemToggleComponent;
 
 namespace Content.IntegrationTests.Tests.Interaction;
@@ -29,6 +32,8 @@ namespace Content.IntegrationTests.Tests.Interaction;
 // This partial class defines various methods that are useful for performing & validating interactions
 public abstract partial class InteractionTest
 {
+    private Dictionary<Type, EntitySystem> _listenerCache = new();
+
     /// <summary>
     /// Begin constructing an entity.
     /// </summary>
@@ -758,6 +763,139 @@ public abstract partial class InteractionTest
 
     #endregion
 
+    #region EventListener
+
+    /// <summary>
+    /// Asserts that running the given action causes an event to be fired directed at the specified entity (defaults to <see cref="Target"/>).
+    /// </summary>
+    /// <remarks>
+    /// This currently only checks server-side events.
+    /// </remarks>
+    /// <param name="uid">The entity at which the events are supposed to be directed</param>
+    /// <param name="count">How many new events are expected</param>
+    /// <param name="clear">Whether to clear all previously recorded events before invoking the delegate</param>
+    protected async Task AssertFiresEvent<TEvent>(Func<Task> act, EntityUid? uid = null, int count = 1, bool clear = true)
+        where TEvent : notnull
+    {
+        var sys = GetListenerSystem<TEvent>();
+
+        uid ??= STarget;
+        if (uid == null)
+        {
+            Assert.Fail("No target specified");
+            return;
+        }
+
+        if (clear)
+            sys.Clear(uid.Value);
+        else
+            count += sys.Count(uid.Value);
+
+        await Server.WaitPost(() => SEntMan.EnsureComponent<TestListenerComponent>(uid.Value));
+        await act();
+        AssertEvent<TEvent>(uid, count: count);
+    }
+
+    /// <summary>
+    /// This is a variant of <see cref="AssertFiresEvent{TEvent}"/> that passes the delegate to <see cref="RobustIntegrationTest.ServerIntegrationInstance.WaitPost"/>.
+    /// </summary>
+    /// <remarks>
+    /// This currently only checks for server-side events.
+    /// </remarks>
+    /// <param name="uid">The entity at which the events are supposed to be directed</param>
+    /// <param name="count">How many new events are expected</param>
+    /// <param name="clear">Whether to clear all previously recorded events before invoking the delegate</param>
+    protected async Task AssertPostFiresEvent<TEvent>(Action act, EntityUid? uid = null, int count = 1, bool clear = true)
+        where TEvent : notnull
+    {
+        await AssertFiresEvent<TEvent>(async () => await Server.WaitPost(act), uid, count, clear);
+    }
+
+    /// <summary>
+    /// This is a variant of <see cref="AssertFiresEvent{TEvent}"/> that passes the delegate to <see cref="RobustIntegrationTest.ServerIntegrationInstance.WaitAssertion"/>.
+    /// </summary>
+    /// <remarks>
+    /// This currently only checks for server-side events.
+    /// </remarks>
+    /// <param name="uid">The entity at which the events are supposed to be directed</param>
+    /// <param name="count">How many new events are expected</param>
+    /// <param name="clear">Whether to clear all previously recorded events before invoking the delegate</param>
+    protected async Task AssertAssertionFiresEvent<TEvent>(Action act,
+        EntityUid? uid = null,
+        int count = 1,
+        bool clear = true)
+        where TEvent : notnull
+    {
+        await AssertFiresEvent<TEvent>(async () => await Server.WaitAssertion(act), uid, count, clear);
+    }
+
+    /// <summary>
+    /// Asserts that the specified event has been fired some number of times at the given entity (defaults to <see cref="Target"/>).
+    /// For this to work, this requires that the entity has been given a <see cref="TestListenerComponent"/>
+    /// </summary>
+    /// <remarks>
+    /// This currently only checks server-side events.
+    /// </remarks>
+    /// <param name="uid">The entity at which the events were directed</param>
+    /// <param name="count">How many new events are expected</param>
+    /// <param name="predicate">A predicate that can be used to filter the recorded events</param>
+    protected void AssertEvent<TEvent>(EntityUid? uid = null, int count = 1, Func<TEvent,bool>? predicate = null)
+        where TEvent : notnull
+    {
+        Assert.That(GetEvents(uid, predicate).Count, Is.EqualTo(count));
+    }
+
+    /// <summary>
+    /// Gets all the events of the specified type that have been fired at the given entity (defaults to <see cref="Target"/>).
+    /// For this to work, this requires that the entity has been given a <see cref="TestListenerComponent"/>
+    /// </summary>
+    /// <remarks>
+    /// This currently only gets for server-side events.
+    /// </remarks>
+    /// <param name="uid">The entity at which the events were directed</param>
+    /// <param name="predicate">A predicate that can be used to filter the returned events</param>
+    protected IEnumerable<TEvent> GetEvents<TEvent>(EntityUid? uid = null, Func<TEvent, bool>? predicate = null)
+        where TEvent : notnull
+    {
+        uid ??= STarget;
+        if (uid == null)
+        {
+            Assert.Fail("No target specified");
+            return [];
+        }
+
+        Assert.That(SEntMan.HasComponent<TestListenerComponent>(uid), $"Entity must have {nameof(TestListenerComponent)}");
+        return GetListenerSystem<TEvent>().GetEvents(uid.Value, predicate);
+    }
+
+    protected TestListenerSystem<TEvent> GetListenerSystem<TEvent>()
+        where TEvent : notnull
+    {
+        if (_listenerCache.TryGetValue(typeof(TEvent), out var listener))
+            return (TestListenerSystem<TEvent>) listener;
+
+        var type = Server.Resolve<IReflectionManager>().GetAllChildren<TestListenerSystem<TEvent>>().Single();
+        if (!SEntMan.EntitySysManager.TryGetEntitySystem(type, out var systemObj))
+        {
+            // There has to be a listener system that is manually defined. Event subscriptions are locked once
+            // finalized, so we can't really easily create new subscriptions on the fly.
+            // TODO find a better solution
+            throw new InvalidOperationException($"Event {typeof(TEvent).Name} has no associated listener system!");
+        }
+
+        var system = (TestListenerSystem<TEvent>)systemObj;
+        _listenerCache[typeof(TEvent)] = system;
+        return system;
+    }
+
+    /// <summary>
+    /// Clears all recorded events of the given type.
+    /// </summary>
+    protected void ClearEvents<TEvent>(EntityUid uid) where TEvent : notnull
+        => GetListenerSystem<TEvent>().Clear(uid);
+
+    #endregion
+
     #region Entity lookups
 
     /// <summary>
diff --git a/Content.IntegrationTests/Tests/Movement/SlippingTest.cs b/Content.IntegrationTests/Tests/Movement/SlippingTest.cs
index 7ee895d7c2..92e4d2471e 100644
--- a/Content.IntegrationTests/Tests/Movement/SlippingTest.cs
+++ b/Content.IntegrationTests/Tests/Movement/SlippingTest.cs
@@ -1,10 +1,8 @@
 #nullable enable
-using System.Collections.Generic;
-using Content.IntegrationTests.Tests.Interaction;
+using Content.IntegrationTests.Tests.Helpers;
 using Content.Shared.Movement.Components;
 using Content.Shared.Slippery;
 using Content.Shared.Stunnable;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
 using Robust.Shared.Maths;
 
@@ -12,44 +10,32 @@ namespace Content.IntegrationTests.Tests.Movement;
 
 public sealed class SlippingTest : MovementTest
 {
-    public sealed class SlipTestSystem : EntitySystem
-    {
-        public HashSet<EntityUid> Slipped = new();
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<SlipperyComponent, SlipEvent>(OnSlip);
-        }
-
-        private void OnSlip(EntityUid uid, SlipperyComponent component, ref SlipEvent args)
-        {
-            Slipped.Add(args.Slipped);
-        }
-    }
+    public sealed class SlipTestSystem : TestListenerSystem<SlipEvent>;
 
     [Test]
     public async Task BananaSlipTest()
     {
-        var sys = SEntMan.System<SlipTestSystem>();
         await SpawnTarget("TrashBananaPeel");
 
         var modifier = Comp<MovementSpeedModifierComponent>(Player).SprintSpeedModifier;
         Assert.That(modifier, Is.EqualTo(1), "Player is not moving at full speed.");
 
-        // Player is to the left of the banana peel and has not slipped.
+        // Player is to the left of the banana peel.
         Assert.That(Delta(), Is.GreaterThan(0.5f));
-        Assert.That(sys.Slipped, Does.Not.Contain(SEntMan.GetEntity(Player)));
 
         // Walking over the banana slowly does not trigger a slip.
         await SetKey(EngineKeyFunctions.Walk, BoundKeyState.Down);
-        await Move(DirectionFlag.East, 1f);
+        await AssertFiresEvent<SlipEvent>(async () => await Move(DirectionFlag.East, 1f), count: 0);
+
         Assert.That(Delta(), Is.LessThan(0.5f));
-        Assert.That(sys.Slipped, Does.Not.Contain(SEntMan.GetEntity(Player)));
         AssertComp<KnockedDownComponent>(false, Player);
 
         // Moving at normal speeds does trigger a slip.
         await SetKey(EngineKeyFunctions.Walk, BoundKeyState.Up);
-        await Move(DirectionFlag.West, 1f);
-        Assert.That(sys.Slipped, Does.Contain(SEntMan.GetEntity(Player)));
+        await AssertFiresEvent<SlipEvent>(async () => await Move(DirectionFlag.West, 1f));
+
+        // And the person that slipped was the player
+        AssertEvent<SlipEvent>(predicate: @event => @event.Slipped == SPlayer);
         AssertComp<KnockedDownComponent>(true, Player);
     }
 }

From 33c0c46b5da5a462d05e267a887b8254e95096ce Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Thu, 9 Oct 2025 15:20:05 +0200
Subject: [PATCH 112/216] Add slowdown to nocturine, buff duration and minor
 delay reduction (#40797)

* Yawn

* Remove yawning because it's kind of a nerf tbh

* Remove newline

* Begone, condition
---
 Resources/Prototypes/Reagents/narcotics.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index a1b1033a4b..92236d746c 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -289,16 +289,19 @@
   meltingPoint: 128.0
   metabolisms:
     Narcotic:
-      effects:
+      effects: # It would be nice to have speech slurred or mumbly, but accents are a bit iffy atm. Same for distortion effects.
+      - !type:MovespeedModifier
+        walkSpeedModifier: 0.65
+        sprintSpeedModifier: 0.65
       - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentThreshold
           reagent: Nocturine
           min: 8
         effectProto: StatusEffectForcedSleeping
-        time: 3
-        delay: 6
-        type: Add
+        time: 6
+        delay: 5
+        type: Update
 
 - type: reagent
   id: MuteToxin

From cc4c7f5adacf7d3ba268f1cba40a5110661312d7 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 9 Oct 2025 13:33:46 +0000
Subject: [PATCH 113/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c9ee074fba..c0e5ddf40e 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: Added cargo orders for gold and silver ingots.
-    type: Add
-  - message: Reduced prices of cardboard and paper material crate.
-    type: Tweak
-  id: 8557
-  time: '2025-05-22T08:42:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37713
 - author: ArtisticRoomba
   changes:
   - message: The volume of large gas canisters have been increased to 1500L to encourage
@@ -3952,3 +3943,11 @@
   id: 9059
   time: '2025-10-08T23:45:56.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40786
+- author: SlamBamActionman
+  changes:
+  - message: Nocturine now slows the target down, with a longer duration and shorter
+      delay before activating.
+    type: Tweak
+  id: 9060
+  time: '2025-10-09T13:32:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40797

From 3ac94ea7f572b0ce9fbd3ee5cd0937783fd4572b Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Thu, 9 Oct 2025 06:32:43 -0700
Subject: [PATCH 114/216] PRevent the forever sleep. (#40366)

* Fix

* Rejuvenate

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Shared/Bed/Sleep/SleepingSystem.cs | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
index eca6a8befa..27e11bc878 100644
--- a/Content.Shared/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -59,6 +59,8 @@ public sealed partial class SleepingSystem : EntitySystem
         SubscribeLocalEvent<SleepingComponent, EntityZombifiedEvent>(OnZombified);
         SubscribeLocalEvent<SleepingComponent, MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<SleepingComponent, ComponentInit>(OnCompInit);
+        SubscribeLocalEvent<SleepingComponent, ComponentRemove>(OnComponentRemoved);
+        SubscribeLocalEvent<SleepingComponent, RejuvenateEvent>(OnRejuvenate);
         SubscribeLocalEvent<SleepingComponent, SpeakAttemptEvent>(OnSpeakAttempt);
         SubscribeLocalEvent<SleepingComponent, CanSeeAttemptEvent>(OnSeeAttempt);
         SubscribeLocalEvent<SleepingComponent, PointAttemptEvent>(OnPointAttempt);
@@ -69,7 +71,6 @@ public sealed partial class SleepingSystem : EntitySystem
         SubscribeLocalEvent<SleepingComponent, InteractHandEvent>(OnInteractHand);
         SubscribeLocalEvent<SleepingComponent, StunEndAttemptEvent>(OnStunEndAttempt);
         SubscribeLocalEvent<SleepingComponent, StandUpAttemptEvent>(OnStandUpAttempt);
-        SubscribeLocalEvent<SleepingComponent, RejuvenateEvent>(OnRejuvenate);
 
         SubscribeLocalEvent<ForcedSleepingStatusEffectComponent, StatusEffectAppliedEvent>(OnStatusEffectApplied);
         SubscribeLocalEvent<SleepingComponent, UnbuckleAttemptEvent>(OnUnbuckleAttempt);
@@ -102,6 +103,12 @@ public sealed partial class SleepingSystem : EntitySystem
         TrySleeping((ent, ent.Comp));
     }
 
+    private void OnRejuvenate(Entity<SleepingComponent> ent, ref RejuvenateEvent args)
+    {
+        // WAKE UP!!!
+        RemComp<SleepingComponent>(ent);
+    }
+
     /// <summary>
     /// when sleeping component is added or removed, we do some stuff with other components.
     /// </summary>
@@ -143,6 +150,16 @@ public sealed partial class SleepingSystem : EntitySystem
         _actionsSystem.AddAction(ent, ref ent.Comp.WakeAction, WakeActionId, ent);
     }
 
+    private void OnComponentRemoved(Entity<SleepingComponent> ent, ref ComponentRemove args)
+    {
+        _actionsSystem.RemoveAction(ent.Owner, ent.Comp.WakeAction);
+
+        var ev = new SleepStateChangedEvent(false);
+        RaiseLocalEvent(ent, ref ev);
+
+        _blindableSystem.UpdateIsBlind(ent.Owner);
+    }
+
     private void OnSpeakAttempt(Entity<SleepingComponent> ent, ref SpeakAttemptEvent args)
     {
         // TODO reduce duplication of this behavior with MobStateSystem somehow
@@ -187,11 +204,6 @@ public sealed partial class SleepingSystem : EntitySystem
         args.Cancelled = true;
     }
 
-    private void OnRejuvenate(Entity<SleepingComponent> ent, ref RejuvenateEvent args)
-    {
-        TryWaking((ent.Owner, ent.Comp), true);
-    }
-
     private void OnExamined(Entity<SleepingComponent> ent, ref ExaminedEvent args)
     {
         if (args.IsInDetailsRange)
@@ -275,17 +287,6 @@ public sealed partial class SleepingSystem : EntitySystem
             TrySleeping(args.Target);
     }
 
-    private void Wake(Entity<SleepingComponent> ent)
-    {
-        RemComp<SleepingComponent>(ent);
-        _actionsSystem.RemoveAction(ent.Owner, ent.Comp.WakeAction);
-
-        var ev = new SleepStateChangedEvent(false);
-        RaiseLocalEvent(ent, ref ev);
-
-        _blindableSystem.UpdateIsBlind(ent.Owner);
-    }
-
     /// <summary>
     /// Try sleeping. Only mobs can sleep.
     /// </summary>
@@ -345,8 +346,7 @@ public sealed partial class SleepingSystem : EntitySystem
             _popupSystem.PopupClient(Loc.GetString("wake-other-success", ("target", Identity.Entity(ent, EntityManager))), ent, user);
         }
 
-        Wake((ent, ent.Comp));
-        return true;
+        return RemComp<SleepingComponent>(ent);
     }
 
     /// <summary>

From 8dd8a334ae50f3eaab0640201df09f99fbc1a414 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 9 Oct 2025 13:47:30 +0000
Subject: [PATCH 115/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c0e5ddf40e..2504b2ecca 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: ArtisticRoomba
-  changes:
-  - message: The volume of large gas canisters have been increased to 1500L to encourage
-      their usage in resolving pressure problems in spaced rooms. The gas that starts
-      inside of the tanks and the price of them has increased to compensate.
-    type: Tweak
-  id: 8558
-  time: '2025-05-22T18:12:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37564
 - author: Hitlinemoss
   changes:
   - message: Liquid soap is now slippery.
@@ -3951,3 +3942,10 @@
   id: 9060
   time: '2025-10-09T13:32:34.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40797
+- author: Princess-Cheeseballs
+  changes:
+  - message: Dying while asleep shouldn't permanently blind you anymore.
+    type: Fix
+  id: 9061
+  time: '2025-10-09T13:46:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40366

From fda846ac85891752ba51df07ca67975165fb5257 Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Thu, 9 Oct 2025 09:37:09 -0400
Subject: [PATCH 116/216] Move Bulldog Drum to Emag (#40790)

* Move Bulldog Drum to Emag

Bulldog drum removed from standard techfab
Moved to emag listing

* Update Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Prototypes/Entities/Structures/Machines/lathe.yml    | 7 +++++++
 Resources/Prototypes/Recipes/Lathes/Packs/security.yml   | 3 ---
 Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml  | 9 +++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 0a933ef1f4..d7fec6aa8c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -136,6 +136,7 @@
   - type: EmagLatheRecipes
     emagStaticPacks:
     - SecurityAmmoStatic
+    - SyndicateAmmoStatic
   - type: BlueprintReceiver
     whitelist:
       tags:
@@ -406,6 +407,9 @@
     - SecurityAmmo
     - SecurityWeapons
     - SecurityDisablers
+  - type: EmagLatheRecipes
+    emagStaticPacks:
+    - SyndicateAmmoStatic
   - type: MaterialStorage
     whitelist:
       tags:
@@ -442,6 +446,9 @@
       runningState: icon
       staticPacks:
       - SecurityAmmoStatic
+    - type: EmagLatheRecipes
+      emagStaticPacks:
+      - SyndicateAmmoStatic
     - type: MaterialStorage
       whitelist:
         tags:
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
index 0dc5fe3d90..51058205c4 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
@@ -49,9 +49,6 @@
   - MagazinePistolSubMachineGunTopMountedEmpty
   - MagazineRifle
   - MagazineRifleEmpty
-  - MagazineShotgun
-  - MagazineShotgunEmpty
-  - MagazineShotgunSlug
   - SpeedLoaderMagnum
   - SpeedLoaderMagnumEmpty
 
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml b/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
new file mode 100644
index 0000000000..8c87f80780
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
@@ -0,0 +1,9 @@
+## Static recipes
+
+# Added to emagged autolathe
+- type: latheRecipePack
+  id: SyndicateAmmoStatic
+  recipes:
+  - MagazineShotgun
+  - MagazineShotgunEmpty
+  - MagazineShotgunSlug

From dc127d08575784bff17aec6e47bd0a61598c9096 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 9 Oct 2025 14:01:16 +0000
Subject: [PATCH 117/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2504b2ecca..de112f2b02 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Hitlinemoss
-  changes:
-  - message: Liquid soap is now slippery.
-    type: Fix
-  id: 8559
-  time: '2025-05-23T21:57:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37747
 - author: CoconutThunder
   changes:
   - message: The Chief Medical Officer should now appear with the correct precedence
@@ -3949,3 +3942,10 @@
   id: 9061
   time: '2025-10-09T13:46:20.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40366
+- author: kontakt
+  changes:
+  - message: Bulldog magazines are now only accessible through emagged fabricators.
+    type: Tweak
+  id: 9062
+  time: '2025-10-09T14:00:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40790

From e89651c77481eb04b02a95e11260672062d02d12 Mon Sep 17 00:00:00 2001
From: Winkarst-cpu <74284083+Winkarst-cpu@users.noreply.github.com>
Date: Thu, 9 Oct 2025 17:07:58 +0300
Subject: [PATCH 118/216] Fix masks with flash, eye, and damage protection
 working while being pulled down (#40331)

Fix
---
 Content.Shared/Armor/SharedArmorSystem.cs            | 12 +++++++++++-
 .../Eye/Blinding/Systems/EyeProtectionSystem.cs      |  4 ++++
 Content.Shared/Flash/SharedFlashSystem.cs            |  4 ++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Armor/SharedArmorSystem.cs b/Content.Shared/Armor/SharedArmorSystem.cs
index 1ff1bbc073..972289460f 100644
--- a/Content.Shared/Armor/SharedArmorSystem.cs
+++ b/Content.Shared/Armor/SharedArmorSystem.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Damage;
+using Content.Shared.Clothing.Components;
+using Content.Shared.Damage;
 using Content.Shared.Examine;
 using Content.Shared.Inventory;
 using Content.Shared.Silicons.Borgs;
@@ -32,6 +33,9 @@ public abstract class SharedArmorSystem : EntitySystem
     /// <param name="args">The event, contains the running count of armor percentage as a coefficient</param>
     private void OnCoefficientQuery(Entity<ArmorComponent> ent, ref InventoryRelayedEvent<CoefficientQueryEvent> args)
     {
+        if (TryComp<MaskComponent>(ent, out var mask) && mask.IsToggled)
+            return;
+
         foreach (var armorCoefficient in ent.Comp.Modifiers.Coefficients)
         {
             args.Args.DamageModifiers.Coefficients[armorCoefficient.Key] = args.Args.DamageModifiers.Coefficients.TryGetValue(armorCoefficient.Key, out var coefficient) ? coefficient * armorCoefficient.Value : armorCoefficient.Value;
@@ -40,12 +44,18 @@ public abstract class SharedArmorSystem : EntitySystem
 
     private void OnDamageModify(EntityUid uid, ArmorComponent component, InventoryRelayedEvent<DamageModifyEvent> args)
     {
+        if (TryComp<MaskComponent>(uid, out var mask) && mask.IsToggled)
+            return;
+
         args.Args.Damage = DamageSpecifier.ApplyModifierSet(args.Args.Damage, component.Modifiers);
     }
 
     private void OnBorgDamageModify(EntityUid uid, ArmorComponent component,
         ref BorgModuleRelayedEvent<DamageModifyEvent> args)
     {
+        if (TryComp<MaskComponent>(uid, out var mask) && mask.IsToggled)
+            return;
+
         args.Args.Damage = DamageSpecifier.ApplyModifierSet(args.Args.Damage, component.Modifiers);
     }
 
diff --git a/Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs b/Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs
index 0fc01f1b4e..0b4353eeda 100644
--- a/Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs
+++ b/Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs
@@ -3,6 +3,7 @@ using Content.Shared.Inventory;
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Tools.Components;
 using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Clothing.Components;
 
 namespace Content.Shared.Eye.Blinding.Systems
 {
@@ -29,6 +30,9 @@ namespace Content.Shared.Eye.Blinding.Systems
 
         private void OnGetProtection(EntityUid uid, EyeProtectionComponent component, GetEyeProtectionEvent args)
         {
+            if (TryComp<MaskComponent>(uid, out var mask) && mask.IsToggled)
+                return;
+
             args.Protection += component.ProtectionTime;
         }
 
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index 7f69e86042..02513aa91b 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -22,6 +22,7 @@ using Robust.Shared.Timing;
 using System.Linq;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Random.Helpers;
+using Content.Shared.Clothing.Components;
 
 namespace Content.Shared.Flash;
 
@@ -258,6 +259,9 @@ public abstract class SharedFlashSystem : EntitySystem
 
     private void OnFlashImmunityFlashAttempt(Entity<FlashImmunityComponent> ent, ref FlashAttemptEvent args)
     {
+        if (TryComp<MaskComponent>(ent, out var mask) && mask.IsToggled)
+            return;
+
         if (ent.Comp.Enabled)
             args.Cancelled = true;
     }

From 5185df4072de98ff69d6690206297ccf12786e19 Mon Sep 17 00:00:00 2001
From: blobadoodle <lucahtaylor@gmail.com>
Date: Thu, 9 Oct 2025 22:12:24 +0100
Subject: [PATCH 119/216] Add missing uranium glass locales (#40809)

---
 Resources/Locale/en-US/materials/materials.ftl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index 657b7f5f0f..5a22bc2661 100644
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -3,6 +3,8 @@ materials-glass = glass
 materials-reinforced-glass = reinforced glass
 materials-plasma-glass = plasma glass
 materials-reinforced-plasma-glass = reinforced plasma glass
+materials-uranium-glass = uranium glass
+materials-reinforced-uranium-glass = reinforced uranium glass
 
 # Metals
 materials-steel = steel

From 0d97699aaeec677736382b8a225414b193a9bf8a Mon Sep 17 00:00:00 2001
From: Jessica M <jessica@jessicamaybe.com>
Date: Thu, 9 Oct 2025 14:14:12 -0700
Subject: [PATCH 120/216] Migrate revenant and PAI shops to use ActionGrant
 instead of hardcoding them (#40475)

* add intrinsic store, replace revenant store with it.

* migrate PAI and also move to shared where possible

* fix typos and clean up... intrinisic

* oops, hopefully fixes test

* Move to StoreSystem and ActionGrant

* documentation and remove thing

* review

---------

Co-authored-by: Jessica M <jessica@maybe.sh>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Content.Client/PAI/PAISystem.cs               |  8 ----
 Content.Server/PAI/PAISystem.cs               | 18 +--------
 .../Revenant/EntitySystems/RevenantSystem.cs  | 19 ----------
 Content.Server/Store/Systems/StoreSystem.cs   | 16 +++++---
 Content.Shared/PAI/PAIComponent.cs            | 12 +-----
 Content.Shared/PAI/SharedPAISystem.cs         | 38 -------------------
 .../Revenant/Components/RevenantComponent.cs  |  2 -
 Content.Shared/Revenant/SharedRevenant.cs     |  4 --
 .../Store/Events/IntrinsicStoreActionEvent.cs | 11 ++++++
 Resources/Prototypes/Actions/revenant.yml     |  7 +---
 Resources/Prototypes/Actions/types.yml        | 11 ++++++
 .../Entities/Mobs/NPCs/revenant.yml           |  3 ++
 .../Prototypes/Entities/Objects/Fun/pai.yml   | 10 ++---
 13 files changed, 43 insertions(+), 116 deletions(-)
 delete mode 100644 Content.Client/PAI/PAISystem.cs
 delete mode 100644 Content.Shared/PAI/SharedPAISystem.cs
 create mode 100644 Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs

diff --git a/Content.Client/PAI/PAISystem.cs b/Content.Client/PAI/PAISystem.cs
deleted file mode 100644
index a28cf6a077..0000000000
--- a/Content.Client/PAI/PAISystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.PAI;
-
-namespace Content.Client.PAI
-{
-    public sealed class PAISystem : SharedPAISystem
-    {
-    }
-}
diff --git a/Content.Server/PAI/PAISystem.cs b/Content.Server/PAI/PAISystem.cs
index 289b74b258..7fd58f1572 100644
--- a/Content.Server/PAI/PAISystem.cs
+++ b/Content.Server/PAI/PAISystem.cs
@@ -2,27 +2,22 @@ using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Instruments;
 using Content.Server.Kitchen.Components;
-using Content.Server.Store.Systems;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mind.Components;
 using Content.Shared.PAI;
 using Content.Shared.Popups;
-using Content.Shared.Store;
-using Content.Shared.Store.Components;
 using Content.Shared.Instruments;
 using Robust.Shared.Random;
-using Robust.Shared.Prototypes;
 using System.Text;
 
 namespace Content.Server.PAI;
 
-public sealed class PAISystem : SharedPAISystem
+public sealed class PAISystem : EntitySystem
 {
     [Dependency] private readonly InstrumentSystem _instrumentSystem = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly StoreSystem _store = default!;
     [Dependency] private readonly ToggleableGhostRoleSystem _toggleableGhostRole = default!;
 
     /// <summary>
@@ -38,8 +33,6 @@ public sealed class PAISystem : SharedPAISystem
         SubscribeLocalEvent<PAIComponent, MindAddedMessage>(OnMindAdded);
         SubscribeLocalEvent<PAIComponent, MindRemovedMessage>(OnMindRemoved);
         SubscribeLocalEvent<PAIComponent, BeingMicrowavedEvent>(OnMicrowaved);
-
-        SubscribeLocalEvent<PAIComponent, PAIShopActionEvent>(OnShop);
     }
 
     private void OnUseInHand(EntityUid uid, PAIComponent component, UseInHandEvent args)
@@ -106,15 +99,6 @@ public sealed class PAISystem : SharedPAISystem
         var val = Loc.GetString("pai-system-pai-name-raw", ("name", name.ToString()));
         _metaData.SetEntityName(uid, val);
     }
-
-    private void OnShop(Entity<PAIComponent> ent, ref PAIShopActionEvent args)
-    {
-        if (!TryComp<StoreComponent>(ent, out var store))
-            return;
-
-        _store.ToggleUi(args.Performer, ent, store);
-    }
-
     public void PAITurningOff(EntityUid uid)
     {
         //  Close the instrument interface if it was open
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index b89f10934d..6c8972be58 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -1,7 +1,6 @@
 using System.Numerics;
 using Content.Server.Actions;
 using Content.Server.GameTicking;
-using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Damage;
@@ -21,7 +20,6 @@ using Content.Shared.Store.Components;
 using Content.Shared.Stunnable;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
 namespace Content.Server.Revenant.EntitySystems;
@@ -46,17 +44,12 @@ public sealed partial class RevenantSystem : EntitySystem
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly VisibilitySystem _visibility = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
-
-    private static readonly EntProtoId RevenantShopId = "ActionRevenantShop";
-
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<RevenantComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<RevenantComponent, MapInitEvent>(OnMapInit);
 
-        SubscribeLocalEvent<RevenantComponent, RevenantShopActionEvent>(OnShop);
         SubscribeLocalEvent<RevenantComponent, DamageChangedEvent>(OnDamage);
         SubscribeLocalEvent<RevenantComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<RevenantComponent, StatusEffectAddedEvent>(OnStatusAdded);
@@ -94,11 +87,6 @@ public sealed partial class RevenantSystem : EntitySystem
         _eye.RefreshVisibilityMask(uid);
     }
 
-    private void OnMapInit(EntityUid uid, RevenantComponent component, MapInitEvent args)
-    {
-        _action.AddAction(uid, ref component.Action, RevenantShopId);
-    }
-
     private void OnStatusAdded(EntityUid uid, RevenantComponent component, StatusEffectAddedEvent args)
     {
         if (args.Key == "Stun")
@@ -182,13 +170,6 @@ public sealed partial class RevenantSystem : EntitySystem
         return true;
     }
 
-    private void OnShop(EntityUid uid, RevenantComponent component, RevenantShopActionEvent args)
-    {
-        if (!TryComp<StoreComponent>(uid, out var store))
-            return;
-        _store.ToggleUi(uid, uid, store);
-    }
-
     public void MakeVisible(bool visible)
     {
         var query = EntityQueryEnumerator<RevenantComponent, VisibilityComponent>();
diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index 0625ced087..10060dc7d3 100644
--- a/Content.Server/Store/Systems/StoreSystem.cs
+++ b/Content.Server/Store/Systems/StoreSystem.cs
@@ -1,17 +1,16 @@
+using System.Linq;
 using Content.Server.Store.Components;
-using Content.Shared.UserInterface;
 using Content.Shared.FixedPoint;
 using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
 using Content.Shared.Store.Components;
-using JetBrains.Annotations;
+using Content.Shared.Store.Events;
+using Content.Shared.UserInterface;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-using System.Linq;
 using Robust.Shared.Timing;
-using Content.Shared.Mind;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Store.Systems;
 
@@ -37,6 +36,7 @@ public sealed partial class StoreSystem : EntitySystem
         SubscribeLocalEvent<StoreComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<StoreComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<StoreComponent, OpenUplinkImplantEvent>(OnImplantActivate);
+        SubscribeLocalEvent<StoreComponent, IntrinsicStoreActionEvent>(OnIntrinsicStoreAction);
 
         InitializeUi();
         InitializeCommand();
@@ -187,6 +187,12 @@ public sealed partial class StoreSystem : EntitySystem
         UpdateUserInterface(null, uid, store);
         return true;
     }
+
+    private void OnIntrinsicStoreAction(Entity<StoreComponent> ent, ref IntrinsicStoreActionEvent args)
+    {
+        ToggleUi(args.Performer, ent.Owner, ent.Comp);
+    }
+
 }
 
 public sealed class CurrencyInsertAttemptEvent : CancellableEntityEventArgs
diff --git a/Content.Shared/PAI/PAIComponent.cs b/Content.Shared/PAI/PAIComponent.cs
index fb9d7150e3..541172ffe0 100644
--- a/Content.Shared/PAI/PAIComponent.cs
+++ b/Content.Shared/PAI/PAIComponent.cs
@@ -1,8 +1,4 @@
-using Content.Shared.FixedPoint;
-using Content.Shared.Store;
 using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.PAI;
 
@@ -16,7 +12,7 @@ namespace Content.Shared.PAI;
 ///  and there's not always enough players and ghost roles to justify it.
 /// All logic in PAISystem.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class PAIComponent : Component
 {
     /// <summary>
@@ -26,12 +22,6 @@ public sealed partial class PAIComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? LastUser;
 
-    [DataField]
-    public EntProtoId ShopActionId = "ActionPAIOpenShop";
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? ShopAction;
-
     /// <summary>
     /// When microwaved there is this chance to brick the pai, kicking out its player and preventing it from being used again.
     /// </summary>
diff --git a/Content.Shared/PAI/SharedPAISystem.cs b/Content.Shared/PAI/SharedPAISystem.cs
deleted file mode 100644
index 00d3e23cef..0000000000
--- a/Content.Shared/PAI/SharedPAISystem.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Shared.Actions;
-
-namespace Content.Shared.PAI;
-
-/// <summary>
-/// pAIs, or Personal AIs, are essentially portable ghost role generators.
-/// In their current implementation, they create a ghost role anyone can access,
-/// and that a player can also "wipe" (reset/kick out player).
-/// Theoretically speaking pAIs are supposed to use a dedicated "offer and select" system,
-///  with the player holding the pAI being able to choose one of the ghosts in the round.
-/// This seems too complicated for an initial implementation, though,
-///  and there's not always enough players and ghost roles to justify it.
-/// </summary>
-public abstract class SharedPAISystem : EntitySystem
-{
-    [Dependency] private readonly SharedActionsSystem _actions = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PAIComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<PAIComponent, ComponentShutdown>(OnShutdown);
-    }
-
-    private void OnMapInit(Entity<PAIComponent> ent, ref MapInitEvent args)
-    {
-        _actions.AddAction(ent, ent.Comp.ShopActionId);
-    }
-
-    private void OnShutdown(Entity<PAIComponent> ent, ref ComponentShutdown args)
-    {
-        _actions.RemoveAction(ent.Owner, ent.Comp.ShopAction);
-    }
-}
-public sealed partial class PAIShopActionEvent : InstantActionEvent
-{
-}
diff --git a/Content.Shared/Revenant/Components/RevenantComponent.cs b/Content.Shared/Revenant/Components/RevenantComponent.cs
index e6543f1906..e434bba1d9 100644
--- a/Content.Shared/Revenant/Components/RevenantComponent.cs
+++ b/Content.Shared/Revenant/Components/RevenantComponent.cs
@@ -214,6 +214,4 @@ public sealed partial class RevenantComponent : Component
     [DataField("harvestingState")]
     public string HarvestingState = "harvesting";
     #endregion
-
-    [DataField] public EntityUid? Action;
 }
diff --git a/Content.Shared/Revenant/SharedRevenant.cs b/Content.Shared/Revenant/SharedRevenant.cs
index c44e4408aa..b1023f43e2 100644
--- a/Content.Shared/Revenant/SharedRevenant.cs
+++ b/Content.Shared/Revenant/SharedRevenant.cs
@@ -42,10 +42,6 @@ public sealed class HarvestDoAfterCancelled : EntityEventArgs
 {
 }
 
-public sealed partial class RevenantShopActionEvent : InstantActionEvent
-{
-}
-
 public sealed partial class RevenantDefileActionEvent : InstantActionEvent
 {
 }
diff --git a/Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs b/Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs
new file mode 100644
index 0000000000..dea2c25e6e
--- /dev/null
+++ b/Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared.Store.Events;
+
+/// <summary>
+/// Opens a store specified by <see cref="StoreComponent"/>
+/// Used for entities with a store built into themselves like Revenant or PAI
+/// </summary>
+public sealed partial class IntrinsicStoreActionEvent : InstantActionEvent
+{
+}
diff --git a/Resources/Prototypes/Actions/revenant.yml b/Resources/Prototypes/Actions/revenant.yml
index 5904908a75..3ac425a567 100644
--- a/Resources/Prototypes/Actions/revenant.yml
+++ b/Resources/Prototypes/Actions/revenant.yml
@@ -1,13 +1,8 @@
 - type: entity
-  parent: BaseAction
+  parent: ActionIntrinsicStore
   id: ActionRevenantShop
   name: Shop
   description: Opens the ability shop.
-  components:
-  - type: Action
-    icon: Interface/Actions/shop.png
-  - type: InstantAction
-    event: !type:RevenantShopActionEvent
 
 - type: entity
   parent: BaseAction
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index 61babbfcea..752aeb13f8 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -466,3 +466,14 @@
     itemIconStyle: BigAction
   - type: InstantAction
     event: !type:ChameleonControllerOpenMenuEvent
+
+- type: entity
+  parent: BaseMentalAction
+  id: ActionIntrinsicStore
+  name: Store
+  description: Opens the store
+  components:
+  - type: Action
+    icon: Interface/Actions/shop.png
+  - type: InstantAction
+    event: !type:IntrinsicStoreActionEvent
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 9b0bfb05ca..04b1554cef 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -66,6 +66,9 @@
         type: StoreBoundUserInterface
   - type: Visibility
     layer: 2 #ghost vis layer
+  - type: ActionGrant
+    actions:
+    - ActionRevenantShop
   - type: Store
     categories:
     - RevenantAbilities
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 6aec812b77..2ba5acfbf1 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -58,6 +58,9 @@
     - Common
   - type: DoAfter
   - type: Actions
+  - type: ActionGrant
+    actions:
+    - ActionPAIOpenShop
   - type: Store
     categories:
     - PAIAbilities
@@ -188,15 +191,10 @@
     node: potatoai
 
 - type: entity
-  parent: BaseMentalAction
+  parent: ActionIntrinsicStore
   id: ActionPAIOpenShop
   name: Software Catalog
   description: Install new software to assist your owner.
-  components:
-  - type: Action
-    icon: Interface/Actions/shop.png
-  - type: InstantAction
-    event: !type:PAIShopActionEvent
 
 - type: entity
   parent: BaseMentalAction

From d3d52615d4b0aebf6218cbf881101d0255427eca Mon Sep 17 00:00:00 2001
From: FungiFellow <151778459+FungiFellow@users.noreply.github.com>
Date: Thu, 9 Oct 2025 18:08:52 -0400
Subject: [PATCH 121/216] Lootpool Tweaks Mail/Maints (#39892)

* Added Claymore to MaintWeaponTable

* SyndieBusinessCard+InsulsTable
---
 .../Entities/Markers/Spawners/Random/maintenance.yml        | 1 +
 .../Entities/Objects/Deliveries/deliveries_tables.yml       | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index bb3829a2dd..e6e3ec8c6f 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -329,6 +329,7 @@
       weight: 95
       children:
       - id: Machete
+      - id: Claymore
       - id: BaseBallBat
       - id: CombatKnife
       - id: Spear
diff --git a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
index 19613dd494..be663a1774 100644
--- a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
+++ b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
@@ -105,6 +105,8 @@
       - id: Ointment
       - id: Gauze
       - id: Bloodpack
+    - id: SyndicateBusinessCard
+      weight: 0.5
 
 # Packages
 # TODO: Currently mostly maints loot, should be updated in the future.
@@ -138,6 +140,9 @@
       weight: 0.2
       rolls: !type:RangeNumberSelector
         range: 2, 3
+    - !type:NestedSelector
+      tableId: InsulsTable #Uncommon since it's weighted towards budget/fingerless
+      weight: 0.2
 
 - type: entityTable # TODO: Add more variety!
   id: PackageRareEntityTable
@@ -157,3 +162,4 @@
     - !type:NestedSelector
       tableId: SyndieMaintLoot
       weight: 0.5
+      

From accb59b6c720e389bdc31cdf34cf6fbe4997719c Mon Sep 17 00:00:00 2001
From: ToastEnjoyer <masondoesgamingyes@gmail.com>
Date: Thu, 9 Oct 2025 20:00:46 -0500
Subject: [PATCH 122/216] Added more nitrogen canisters to plasma (#40794)

---
 Resources/Maps/plasma.yml | 2246 +++++++++++++++++++++++++++++--------
 1 file changed, 1792 insertions(+), 454 deletions(-)

diff --git a/Resources/Maps/plasma.yml b/Resources/Maps/plasma.yml
index 0a0f1d7428..71dba17d74 100644
--- a/Resources/Maps/plasma.yml
+++ b/Resources/Maps/plasma.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 266.0.0
+  engineVersion: 267.2.0
   forkId: ""
   forkVersion: ""
-  time: 09/03/2025 00:56:56
-  entityCount: 26486
+  time: 10/09/2025 01:25:34
+  entityCount: 26492
 maps:
 - 1
 grids:
@@ -9858,139 +9858,42 @@ entities:
         uniqueMixes:
         - volume: 2500
           immutable: True
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+          moles: {}
         - volume: 2500
           temperature: 293.15
           moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
         - volume: 2500
           temperature: 235
           moles:
-          - 27.225372
-          - 102.419266
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 27.225372
+            Nitrogen: 102.419266
         - volume: 2500
           temperature: 293.14975
           moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 20.078888
+            Nitrogen: 75.53487
         - volume: 2500
           temperature: 293.1495
           moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 20.078888
+            Nitrogen: 75.53487
+        - volume: 2500
+          temperature: 293.15
+          moles: {}
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Plasma: 6666.982
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
-          - 0
-          - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 6666.982
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Nitrogen: 6666.982
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -14718,7 +14621,7 @@ entities:
       pos: -131.5,-45.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -61365.79
+      secondsUntilStateChange: -61511.09
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -65246,18 +65149,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
   - uid: 13666
     components:
     - type: Transform
@@ -65505,18 +65398,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -65562,18 +65445,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -67653,18 +67526,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -67719,18 +67582,8 @@ entities:
         immutable: False
         temperature: 293.1462
         moles:
-        - 1.606311
-        - 6.042789
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.606311
+          Nitrogen: 6.042789
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -67933,18 +67786,8 @@ entities:
         immutable: False
         temperature: 293.147
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
   - uid: 17839
     components:
     - type: Transform
@@ -67966,18 +67809,8 @@ entities:
         immutable: False
         temperature: 293.1465
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -68000,18 +67833,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -68046,18 +67869,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.8856695
-        - 7.0937095
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.8856695
+          Nitrogen: 7.0937095
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -68127,18 +67940,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.8856695
-        - 7.0937095
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.8856695
+          Nitrogen: 7.0937095
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -68277,18 +68080,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -68358,18 +68151,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -84031,9 +83814,10 @@ entities:
       parent: 2
     - type: Edible
       edible: Drink
-      solution: pool
-      destroyOnEmpty: false
       utensil: Spoon
+      trash: []
+      destroyOnEmpty: False
+      solution: pool
   - uid: 16868
     components:
     - type: Transform
@@ -84041,9 +83825,10 @@ entities:
       parent: 2
     - type: Edible
       edible: Drink
-      solution: pool
-      destroyOnEmpty: false
       utensil: Spoon
+      trash: []
+      destroyOnEmpty: False
+      solution: pool
   - uid: 16872
     components:
     - type: Transform
@@ -84051,9 +83836,10 @@ entities:
       parent: 2
     - type: Edible
       edible: Drink
-      solution: pool
-      destroyOnEmpty: false
       utensil: Spoon
+      trash: []
+      destroyOnEmpty: False
+      solution: pool
   - uid: 16907
     components:
     - type: Transform
@@ -84061,9 +83847,10 @@ entities:
       parent: 2
     - type: Edible
       edible: Drink
-      solution: pool
-      destroyOnEmpty: false
       utensil: Spoon
+      trash: []
+      destroyOnEmpty: False
+      solution: pool
   - uid: 17621
     components:
     - type: Transform
@@ -122715,11 +122502,6 @@ entities:
     - type: Transform
       pos: -22.5,-18.5
       parent: 2
-  - uid: 10489
-    components:
-    - type: Transform
-      pos: -41.5,-42.5
-      parent: 2
   - uid: 10490
     components:
     - type: Transform
@@ -126054,18 +125836,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -126109,18 +125881,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -126156,18 +125918,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -126200,18 +125952,8 @@ entities:
         immutable: False
         temperature: 293.1465
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -128417,18 +128159,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -128671,18 +128403,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -128757,18 +128479,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -128805,18 +128517,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: Lock
       locked: False
     - type: Fixtures
@@ -130218,6 +129920,11 @@ entities:
     - type: Transform
       pos: -136.5,-4.5
       parent: 2
+  - uid: 10489
+    components:
+    - type: Transform
+      pos: -41.5,-42.5
+      parent: 2
   - uid: 15329
     components:
     - type: Transform
@@ -130238,6 +129945,26 @@ entities:
     - type: Transform
       pos: -37.5,-2.5
       parent: 2
+  - uid: 26488
+    components:
+    - type: Transform
+      pos: -113.5,-26.5
+      parent: 2
+  - uid: 26489
+    components:
+    - type: Transform
+      pos: -105.5,-61.5
+      parent: 2
+  - uid: 26490
+    components:
+    - type: Transform
+      pos: -73.5,-39.5
+      parent: 2
+  - uid: 26491
+    components:
+    - type: Transform
+      pos: -84.5,6.5
+      parent: 2
 - proto: NitrogenTankFilled
   entities:
   - uid: 23345
@@ -130518,6 +130245,11 @@ entities:
     - type: Transform
       pos: -37.5,-3.5
       parent: 2
+  - uid: 26492
+    components:
+    - type: Transform
+      pos: -91.5,4.5
+      parent: 2
 - proto: PaladinCircuitBoard
   entities:
   - uid: 24947
@@ -131401,130 +131133,174 @@ entities:
     - type: Transform
       pos: -26.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6025
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -27.5,-66.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6031
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -27.5,-67.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9355
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -26.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12207
     components:
     - type: Transform
       pos: -25.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15446
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -25.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16456
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -24.5,-67.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23312
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-62.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23373
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23392
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-60.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23441
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23448
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23450
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-62.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23451
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23452
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-60.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23453
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23454
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23845
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -118.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24260
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -118.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24872
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -122.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24925
     components:
     - type: Transform
       pos: -122.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24926
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -123.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: PlasmaTank
   entities:
   - uid: 2843
@@ -131560,40 +131336,54 @@ entities:
       rot: 3.141592653589793 rad
       pos: -117.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24896
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -118.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24897
     components:
     - type: Transform
       pos: -118.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24903
     components:
     - type: Transform
       pos: -117.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24932
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -121.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24937
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -121.5,-82.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24938
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -119.5,-82.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: PlasmaWindowDirectional
   entities:
   - uid: 6607
@@ -131602,16 +131392,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -78.5,-35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21053
     components:
     - type: Transform
       pos: -39.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21054
     components:
     - type: Transform
       pos: -37.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 964
@@ -135510,18 +135306,6 @@ entities:
     - type: Transform
       pos: -100.5,-27.5
       parent: 2
-- proto: PrefilledSyringe
-  entities:
-  - uid: 6481
-    components:
-    - type: Transform
-      pos: -36.23253,-30.543175
-      parent: 2
-  - uid: 7609
-    components:
-    - type: Transform
-      pos: -134.52573,-43.445347
-      parent: 2
 - proto: Protolathe
   entities:
   - uid: 9781
@@ -136980,591 +136764,827 @@ entities:
     - type: Transform
       pos: -110.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 667
     components:
     - type: Transform
       pos: -112.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 670
     components:
     - type: Transform
       pos: -110.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 673
     components:
     - type: Transform
       pos: -109.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 675
     components:
     - type: Transform
       pos: -111.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 807
     components:
     - type: Transform
       pos: -124.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1870
     components:
     - type: Transform
       pos: -111.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1984
     components:
     - type: Transform
       pos: -109.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2453
     components:
     - type: Transform
       pos: -148.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5278
     components:
     - type: Transform
       pos: -112.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5279
     components:
     - type: Transform
       pos: -112.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5280
     components:
     - type: Transform
       pos: -108.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5281
     components:
     - type: Transform
       pos: -108.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5282
     components:
     - type: Transform
       pos: -108.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5283
     components:
     - type: Transform
       pos: -112.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5284
     components:
     - type: Transform
       pos: -112.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5285
     components:
     - type: Transform
       pos: -112.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5286
     components:
     - type: Transform
       pos: -108.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5287
     components:
     - type: Transform
       pos: -108.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5288
     components:
     - type: Transform
       pos: -108.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5289
     components:
     - type: Transform
       pos: -114.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5290
     components:
     - type: Transform
       pos: -114.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5291
     components:
     - type: Transform
       pos: -114.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5292
     components:
     - type: Transform
       pos: -106.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5293
     components:
     - type: Transform
       pos: -106.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5294
     components:
     - type: Transform
       pos: -106.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5295
     components:
     - type: Transform
       pos: -114.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5296
     components:
     - type: Transform
       pos: -114.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5297
     components:
     - type: Transform
       pos: -114.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5298
     components:
     - type: Transform
       pos: -106.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5299
     components:
     - type: Transform
       pos: -106.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5300
     components:
     - type: Transform
       pos: -106.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5342
     components:
     - type: Transform
       pos: -126.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5345
     components:
     - type: Transform
       pos: -124.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5359
     components:
     - type: Transform
       pos: -124.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5360
     components:
     - type: Transform
       pos: -124.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5361
     components:
     - type: Transform
       pos: -126.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5378
     components:
     - type: Transform
       pos: -124.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5380
     components:
     - type: Transform
       pos: -124.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5418
     components:
     - type: Transform
       pos: -126.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5419
     components:
     - type: Transform
       pos: -126.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5434
     components:
     - type: Transform
       pos: -124.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5443
     components:
     - type: Transform
       pos: -124.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5450
     components:
     - type: Transform
       pos: -124.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5470
     components:
     - type: Transform
       pos: -124.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5479
     components:
     - type: Transform
       pos: -124.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5480
     components:
     - type: Transform
       pos: -124.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5505
     components:
     - type: Transform
       pos: -142.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5506
     components:
     - type: Transform
       pos: -142.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5941
     components:
     - type: Transform
       pos: -146.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5942
     components:
     - type: Transform
       pos: -148.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5943
     components:
     - type: Transform
       pos: -147.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5944
     components:
     - type: Transform
       pos: -148.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5945
     components:
     - type: Transform
       pos: -146.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5946
     components:
     - type: Transform
       pos: -147.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5981
     components:
     - type: Transform
       pos: -142.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5990
     components:
     - type: Transform
       pos: -152.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5999
     components:
     - type: Transform
       pos: -148.5,-51.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6005
     components:
     - type: Transform
       pos: -142.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6082
     components:
     - type: Transform
       pos: -148.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6083
     components:
     - type: Transform
       pos: -146.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6084
     components:
     - type: Transform
       pos: -147.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6091
     components:
     - type: Transform
       pos: -146.5,-39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6092
     components:
     - type: Transform
       pos: -148.5,-39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6096
     components:
     - type: Transform
       pos: -153.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6101
     components:
     - type: Transform
       pos: -146.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6103
     components:
     - type: Transform
       pos: -146.5,-41.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6245
     components:
     - type: Transform
       pos: -68.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6924
     components:
     - type: Transform
       pos: -126.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7167
     components:
     - type: Transform
       pos: -146.5,-51.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7192
     components:
     - type: Transform
       pos: -148.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7211
     components:
     - type: Transform
       pos: -148.5,-41.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7247
     components:
     - type: Transform
       pos: -148.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7307
     components:
     - type: Transform
       pos: -155.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7317
     components:
     - type: Transform
       pos: -155.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7839
     components:
     - type: Transform
       pos: -143.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7840
     components:
     - type: Transform
       pos: -151.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7842
     components:
     - type: Transform
       pos: -146.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7856
     components:
     - type: Transform
       pos: -155.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7890
     components:
     - type: Transform
       pos: -69.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9817
     components:
     - type: Transform
       pos: -126.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9912
     components:
     - type: Transform
       pos: -126.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13497
     components:
     - type: Transform
       pos: -109.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13498
     components:
     - type: Transform
       pos: -110.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13499
     components:
     - type: Transform
       pos: -111.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13661
     components:
     - type: Transform
       pos: -146.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13662
     components:
     - type: Transform
       pos: -151.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13664
     components:
     - type: Transform
       pos: -151.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13670
     components:
     - type: Transform
       pos: -151.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13718
     components:
     - type: Transform
       pos: -143.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14110
     components:
     - type: Transform
       pos: -67.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14756
     components:
     - type: Transform
       pos: -67.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16466
     components:
     - type: Transform
       pos: -153.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20368
     components:
     - type: Transform
       pos: -124.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20411
     components:
     - type: Transform
       pos: -122.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23079
     components:
     - type: Transform
       pos: -124.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23103
     components:
     - type: Transform
       pos: -114.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23104
     components:
     - type: Transform
       pos: -114.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23108
     components:
     - type: Transform
       pos: -114.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23396
     components:
     - type: Transform
       pos: -116.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23401
     components:
     - type: Transform
       pos: -120.5,-81.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23498
     components:
     - type: Transform
       pos: -116.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23716
     components:
     - type: Transform
       pos: -69.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24847
     components:
     - type: Transform
       pos: -116.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24880
     components:
     - type: Transform
       pos: -118.5,-64.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24887
     components:
     - type: Transform
       pos: -116.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24888
     components:
     - type: Transform
       pos: -126.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24889
     components:
     - type: Transform
       pos: -126.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24890
     components:
     - type: Transform
       pos: -126.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24891
     components:
     - type: Transform
       pos: -124.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24894
     components:
     - type: Transform
       pos: -122.5,-64.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24901
     components:
     - type: Transform
       pos: -124.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24921
     components:
     - type: Transform
       pos: -123.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24933
     components:
     - type: Transform
       pos: -121.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24934
     components:
     - type: Transform
       pos: -119.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24935
     components:
     - type: Transform
       pos: -118.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24936
     components:
     - type: Transform
       pos: -117.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25187
     components:
     - type: Transform
       pos: -124.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ReinforcedPlasmaWindowDiagonal
   entities:
   - uid: 7308
@@ -137572,35 +137592,47 @@ entities:
     - type: Transform
       pos: -155.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7324
     components:
     - type: Transform
       pos: -154.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7332
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -154.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7333
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -154.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7334
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -154.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7342
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -155.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ReinforcedWindow
   entities:
   - uid: 4
@@ -137608,1876 +137640,2626 @@ entities:
     - type: Transform
       pos: -114.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10
     components:
     - type: Transform
       pos: -69.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18
     components:
     - type: Transform
       pos: -69.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 31
     components:
     - type: Transform
       pos: -69.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 46
     components:
     - type: Transform
       pos: -66.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 47
     components:
     - type: Transform
       pos: -64.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 48
     components:
     - type: Transform
       pos: -65.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 49
     components:
     - type: Transform
       pos: -64.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 50
     components:
     - type: Transform
       pos: -62.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 51
     components:
     - type: Transform
       pos: -61.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 52
     components:
     - type: Transform
       pos: -60.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 54
     components:
     - type: Transform
       pos: -58.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 56
     components:
     - type: Transform
       pos: -58.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 57
     components:
     - type: Transform
       pos: -57.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 58
     components:
     - type: Transform
       pos: -56.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 59
     components:
     - type: Transform
       pos: -53.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 60
     components:
     - type: Transform
       pos: -53.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 61
     components:
     - type: Transform
       pos: -53.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 71
     components:
     - type: Transform
       pos: -59.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 73
     components:
     - type: Transform
       pos: -101.5,31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 107
     components:
     - type: Transform
       pos: -65.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 109
     components:
     - type: Transform
       pos: -65.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 110
     components:
     - type: Transform
       pos: -64.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 111
     components:
     - type: Transform
       pos: -63.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 112
     components:
     - type: Transform
       pos: -62.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 113
     components:
     - type: Transform
       pos: -60.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 114
     components:
     - type: Transform
       pos: -59.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 116
     components:
     - type: Transform
       pos: -58.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 117
     components:
     - type: Transform
       pos: -57.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 118
     components:
     - type: Transform
       pos: -57.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 141
     components:
     - type: Transform
       pos: -63.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 167
     components:
     - type: Transform
       pos: -52.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 171
     components:
     - type: Transform
       pos: -51.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 178
     components:
     - type: Transform
       pos: -31.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 249
     components:
     - type: Transform
       pos: -31.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 285
     components:
     - type: Transform
       pos: -82.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 287
     components:
     - type: Transform
       pos: -85.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 291
     components:
     - type: Transform
       pos: -84.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 316
     components:
     - type: Transform
       pos: -35.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 320
     components:
     - type: Transform
       pos: -34.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 322
     components:
     - type: Transform
       pos: -32.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 351
     components:
     - type: Transform
       pos: -93.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 398
     components:
     - type: Transform
       pos: -48.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 420
     components:
     - type: Transform
       pos: -92.5,-35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 474
     components:
     - type: Transform
       pos: -66.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 504
     components:
     - type: Transform
       pos: -116.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 751
     components:
     - type: Transform
       pos: -83.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 787
     components:
     - type: Transform
       pos: -138.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 953
     components:
     - type: Transform
       pos: -83.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1014
     components:
     - type: Transform
       pos: -53.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1015
     components:
     - type: Transform
       pos: -54.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1170
     components:
     - type: Transform
       pos: -35.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1174
     components:
     - type: Transform
       pos: -35.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1176
     components:
     - type: Transform
       pos: -35.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1252
     components:
     - type: Transform
       pos: -20.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1253
     components:
     - type: Transform
       pos: -20.5,-52.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1254
     components:
     - type: Transform
       pos: -20.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1312
     components:
     - type: Transform
       pos: -31.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1313
     components:
     - type: Transform
       pos: -31.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1314
     components:
     - type: Transform
       pos: -31.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1331
     components:
     - type: Transform
       pos: -117.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1534
     components:
     - type: Transform
       pos: -20.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1676
     components:
     - type: Transform
       pos: -93.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1712
     components:
     - type: Transform
       pos: -24.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1713
     components:
     - type: Transform
       pos: -27.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1714
     components:
     - type: Transform
       pos: -27.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1738
     components:
     - type: Transform
       pos: -101.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1809
     components:
     - type: Transform
       pos: -56.5,-79.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1810
     components:
     - type: Transform
       pos: -55.5,-79.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1864
     components:
     - type: Transform
       pos: -117.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1873
     components:
     - type: Transform
       pos: -106.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1888
     components:
     - type: Transform
       pos: -34.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1892
     components:
     - type: Transform
       pos: -106.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1950
     components:
     - type: Transform
       pos: -106.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1978
     components:
     - type: Transform
       pos: -32.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2053
     components:
     - type: Transform
       pos: -95.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2054
     components:
     - type: Transform
       pos: -95.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2129
     components:
     - type: Transform
       pos: -33.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2196
     components:
     - type: Transform
       pos: -119.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2221
     components:
     - type: Transform
       pos: -123.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2222
     components:
     - type: Transform
       pos: -123.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2223
     components:
     - type: Transform
       pos: -123.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2238
     components:
     - type: Transform
       pos: -123.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2363
     components:
     - type: Transform
       pos: -89.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2365
     components:
     - type: Transform
       pos: -89.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2367
     components:
     - type: Transform
       pos: -93.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2533
     components:
     - type: Transform
       pos: -121.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2648
     components:
     - type: Transform
       pos: -89.5,-29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2682
     components:
     - type: Transform
       pos: -63.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2695
     components:
     - type: Transform
       pos: -59.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2852
     components:
     - type: Transform
       pos: -51.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2853
     components:
     - type: Transform
       pos: -50.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2854
     components:
     - type: Transform
       pos: -49.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2855
     components:
     - type: Transform
       pos: -45.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2856
     components:
     - type: Transform
       pos: -43.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2857
     components:
     - type: Transform
       pos: -44.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2906
     components:
     - type: Transform
       pos: -47.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2939
     components:
     - type: Transform
       pos: -50.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2947
     components:
     - type: Transform
       pos: -52.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2948
     components:
     - type: Transform
       pos: -51.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2949
     components:
     - type: Transform
       pos: -50.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3313
     components:
     - type: Transform
       pos: -8.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3415
     components:
     - type: Transform
       pos: -48.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3751
     components:
     - type: Transform
       pos: -7.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3775
     components:
     - type: Transform
       pos: -9.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3785
     components:
     - type: Transform
       pos: -7.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3809
     components:
     - type: Transform
       pos: -67.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3828
     components:
     - type: Transform
       pos: -48.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3829
     components:
     - type: Transform
       pos: -48.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3960
     components:
     - type: Transform
       pos: -31.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3963
     components:
     - type: Transform
       pos: -31.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3970
     components:
     - type: Transform
       pos: -29.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4017
     components:
     - type: Transform
       pos: -89.5,-28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4129
     components:
     - type: Transform
       pos: -101.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4229
     components:
     - type: Transform
       pos: -83.5,24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4230
     components:
     - type: Transform
       pos: -83.5,23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4231
     components:
     - type: Transform
       pos: -83.5,25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4287
     components:
     - type: Transform
       pos: -31.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4526
     components:
     - type: Transform
       pos: -84.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4541
     components:
     - type: Transform
       pos: -97.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4548
     components:
     - type: Transform
       pos: -97.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4583
     components:
     - type: Transform
       pos: -80.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4629
     components:
     - type: Transform
       pos: -97.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4630
     components:
     - type: Transform
       pos: -9.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4674
     components:
     - type: Transform
       pos: -8.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4693
     components:
     - type: Transform
       pos: -85.5,33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4698
     components:
     - type: Transform
       pos: -85.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4710
     components:
     - type: Transform
       pos: -83.5,29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4711
     components:
     - type: Transform
       pos: -83.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4712
     components:
     - type: Transform
       pos: -83.5,28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4725
     components:
     - type: Transform
       pos: -87.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4726
     components:
     - type: Transform
       pos: -85.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4745
     components:
     - type: Transform
       pos: -85.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4747
     components:
     - type: Transform
       pos: -140.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4756
     components:
     - type: Transform
       pos: -83.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4762
     components:
     - type: Transform
       pos: -84.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4825
     components:
     - type: Transform
       pos: -93.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4833
     components:
     - type: Transform
       pos: -127.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4906
     components:
     - type: Transform
       pos: -126.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4907
     components:
     - type: Transform
       pos: -125.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5675
     components:
     - type: Transform
       pos: -107.5,-63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5676
     components:
     - type: Transform
       pos: -108.5,-63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5693
     components:
     - type: Transform
       pos: -140.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5700
     components:
     - type: Transform
       pos: -120.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5701
     components:
     - type: Transform
       pos: -118.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5715
     components:
     - type: Transform
       pos: -106.5,-63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5762
     components:
     - type: Transform
       pos: -115.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5774
     components:
     - type: Transform
       pos: -117.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5777
     components:
     - type: Transform
       pos: -114.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5778
     components:
     - type: Transform
       pos: -117.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5813
     components:
     - type: Transform
       pos: -116.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5814
     components:
     - type: Transform
       pos: -113.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5815
     components:
     - type: Transform
       pos: -113.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5816
     components:
     - type: Transform
       pos: -116.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5867
     components:
     - type: Transform
       pos: -106.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5868
     components:
     - type: Transform
       pos: -106.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5869
     components:
     - type: Transform
       pos: -106.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6125
     components:
     - type: Transform
       pos: -155.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6198
     components:
     - type: Transform
       pos: -126.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6201
     components:
     - type: Transform
       pos: -126.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6202
     components:
     - type: Transform
       pos: -126.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6203
     components:
     - type: Transform
       pos: -126.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6267
     components:
     - type: Transform
       pos: -125.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6269
     components:
     - type: Transform
       pos: -121.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6270
     components:
     - type: Transform
       pos: -121.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6311
     components:
     - type: Transform
       pos: -126.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6682
     components:
     - type: Transform
       pos: -81.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6755
     components:
     - type: Transform
       pos: -95.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6756
     components:
     - type: Transform
       pos: -95.5,36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6897
     components:
     - type: Transform
       pos: -86.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6972
     components:
     - type: Transform
       pos: -140.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7145
     components:
     - type: Transform
       pos: -1.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7159
     components:
     - type: Transform
       pos: -2.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7165
     components:
     - type: Transform
       pos: -1.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7171
     components:
     - type: Transform
       pos: -1.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7175
     components:
     - type: Transform
       pos: -2.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7183
     components:
     - type: Transform
       pos: -1.5,-14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7187
     components:
     - type: Transform
       pos: -3.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7203
     components:
     - type: Transform
       pos: -1.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7209
     components:
     - type: Transform
       pos: -1.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7219
     components:
     - type: Transform
       pos: -1.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7220
     components:
     - type: Transform
       pos: -3.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7249
     components:
     - type: Transform
       pos: -93.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7257
     components:
     - type: Transform
       pos: -141.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7280
     components:
     - type: Transform
       pos: -117.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7281
     components:
     - type: Transform
       pos: -117.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7284
     components:
     - type: Transform
       pos: -117.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7285
     components:
     - type: Transform
       pos: -117.5,-52.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7318
     components:
     - type: Transform
       pos: -131.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7389
     components:
     - type: Transform
       pos: -131.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7390
     components:
     - type: Transform
       pos: -131.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7391
     components:
     - type: Transform
       pos: -131.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7392
     components:
     - type: Transform
       pos: -131.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7529
     components:
     - type: Transform
       pos: -137.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7568
     components:
     - type: Transform
       pos: -141.5,-37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7876
     components:
     - type: Transform
       pos: -121.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7898
     components:
     - type: Transform
       pos: -81.5,19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8052
     components:
     - type: Transform
       pos: -130.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8075
     components:
     - type: Transform
       pos: -140.5,-41.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8164
     components:
     - type: Transform
       pos: -83.5,19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8195
     components:
     - type: Transform
       pos: -0.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8196
     components:
     - type: Transform
       pos: 1.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8197
     components:
     - type: Transform
       pos: 0.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8198
     components:
     - type: Transform
       pos: 1.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8199
     components:
     - type: Transform
       pos: 0.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8200
     components:
     - type: Transform
       pos: -0.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8201
     components:
     - type: Transform
       pos: -0.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8202
     components:
     - type: Transform
       pos: -0.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8203
     components:
     - type: Transform
       pos: 0.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8204
     components:
     - type: Transform
       pos: 1.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8205
     components:
     - type: Transform
       pos: 0.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8206
     components:
     - type: Transform
       pos: 1.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8213
     components:
     - type: Transform
       pos: 1.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8214
     components:
     - type: Transform
       pos: 0.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8215
     components:
     - type: Transform
       pos: -0.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8216
     components:
     - type: Transform
       pos: -0.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8217
     components:
     - type: Transform
       pos: 0.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8218
     components:
     - type: Transform
       pos: 1.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8228
     components:
     - type: Transform
       pos: -9.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8229
     components:
     - type: Transform
       pos: -10.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8230
     components:
     - type: Transform
       pos: -11.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8236
     components:
     - type: Transform
       pos: -5.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8238
     components:
     - type: Transform
       pos: -7.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8239
     components:
     - type: Transform
       pos: -7.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8244
     components:
     - type: Transform
       pos: -3.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8253
     components:
     - type: Transform
       pos: -16.5,-64.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8260
     components:
     - type: Transform
       pos: -11.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8261
     components:
     - type: Transform
       pos: -9.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8262
     components:
     - type: Transform
       pos: -5.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8263
     components:
     - type: Transform
       pos: -3.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8296
     components:
     - type: Transform
       pos: -6.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8297
     components:
     - type: Transform
       pos: -7.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8299
     components:
     - type: Transform
       pos: -8.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8343
     components:
     - type: Transform
       pos: -29.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8363
     components:
     - type: Transform
       pos: -38.5,17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8364
     components:
     - type: Transform
       pos: -38.5,16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8365
     components:
     - type: Transform
       pos: -38.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8366
     components:
     - type: Transform
       pos: -38.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8367
     components:
     - type: Transform
       pos: -36.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8368
     components:
     - type: Transform
       pos: -36.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8369
     components:
     - type: Transform
       pos: -36.5,16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8370
     components:
     - type: Transform
       pos: -36.5,17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8377
     components:
     - type: Transform
       pos: -82.5,19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8522
     components:
     - type: Transform
       pos: -34.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8529
     components:
     - type: Transform
       pos: -32.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8708
     components:
     - type: Transform
       pos: -5.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8709
     components:
     - type: Transform
       pos: -3.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8710
     components:
     - type: Transform
       pos: -4.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8711
     components:
     - type: Transform
       pos: -3.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8714
     components:
     - type: Transform
       pos: -4.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8715
     components:
     - type: Transform
       pos: -3.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8716
     components:
     - type: Transform
       pos: -5.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8729
     components:
     - type: Transform
       pos: -7.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8737
     components:
     - type: Transform
       pos: -7.5,-28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8738
     components:
     - type: Transform
       pos: -7.5,-31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8739
     components:
     - type: Transform
       pos: -7.5,-32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8740
     components:
     - type: Transform
       pos: -7.5,-29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8920
     components:
     - type: Transform
       pos: -14.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8938
     components:
     - type: Transform
       pos: -14.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9034
     components:
     - type: Transform
       pos: -90.5,-35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9098
     components:
     - type: Transform
       pos: -106.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9324
     components:
     - type: Transform
       pos: -30.5,22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9539
     components:
     - type: Transform
       pos: -97.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9549
     components:
     - type: Transform
       pos: -95.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9788
     components:
     - type: Transform
       pos: -32.5,-75.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9838
     components:
     - type: Transform
       pos: -136.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9958
     components:
     - type: Transform
       pos: -16.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9964
     components:
     - type: Transform
       pos: -16.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9980
     components:
     - type: Transform
       pos: -95.5,38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9981
     components:
     - type: Transform
       pos: -93.5,36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9982
     components:
     - type: Transform
       pos: -93.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9983
     components:
     - type: Transform
       pos: -93.5,38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9986
     components:
     - type: Transform
       pos: -95.5,39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9987
     components:
     - type: Transform
       pos: -93.5,39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10035
     components:
     - type: Transform
       pos: -140.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10084
     components:
     - type: Transform
       pos: -34.5,-77.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10087
     components:
     - type: Transform
       pos: -32.5,-77.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10488
     components:
     - type: Transform
       pos: -16.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10528
     components:
     - type: Transform
       pos: -83.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11035
     components:
     - type: Transform
       pos: -28.5,22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11047
     components:
     - type: Transform
       pos: -34.5,-75.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11048
     components:
     - type: Transform
       pos: -34.5,-76.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11059
     components:
     - type: Transform
       pos: -108.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11076
     components:
     - type: Transform
       pos: -32.5,-76.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11080
     components:
     - type: Transform
       pos: -28.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11092
     components:
     - type: Transform
       pos: -30.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11358
     components:
     - type: Transform
       pos: -22.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11359
     components:
     - type: Transform
       pos: -22.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11710
     components:
     - type: Transform
       pos: -99.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11716
     components:
     - type: Transform
       pos: -99.5,33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12425
     components:
     - type: Transform
       pos: -28.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12450
     components:
     - type: Transform
       pos: -101.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12546
     components:
     - type: Transform
       pos: -31.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12588
     components:
     - type: Transform
       pos: -126.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12748
     components:
     - type: Transform
       pos: -133.5,-57.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12840
     components:
     - type: Transform
       pos: -13.5,-64.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12855
     components:
     - type: Transform
       pos: -101.5,-29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13241
     components:
     - type: Transform
       pos: -138.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13248
     components:
     - type: Transform
       pos: -31.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13523
     components:
     - type: Transform
       pos: -140.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13879
     components:
     - type: Transform
       pos: -138.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14003
     components:
     - type: Transform
       pos: -137.5,21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14499
     components:
     - type: Transform
       pos: -13.5,-66.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15407
     components:
     - type: Transform
       pos: -125.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16087
     components:
     - type: Transform
       pos: -106.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16091
     components:
     - type: Transform
       pos: -123.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16141
     components:
     - type: Transform
       pos: -93.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16488
     components:
     - type: Transform
       pos: -137.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16505
     components:
     - type: Transform
       pos: -138.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16695
     components:
     - type: Transform
       pos: -129.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16716
     components:
     - type: Transform
       pos: -33.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16836
     components:
     - type: Transform
       pos: -107.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16906
     components:
     - type: Transform
       pos: -22.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17005
     components:
     - type: Transform
       pos: -115.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17075
     components:
     - type: Transform
       pos: -86.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17161
     components:
     - type: Transform
       pos: -31.5,-75.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17164
     components:
     - type: Transform
       pos: -35.5,-75.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17359
     components:
     - type: Transform
       pos: -127.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17513
     components:
     - type: Transform
       pos: -136.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17538
     components:
     - type: Transform
       pos: -140.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17651
     components:
     - type: Transform
       pos: -14.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18193
     components:
     - type: Transform
       pos: -95.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18686
     components:
     - type: Transform
       pos: -95.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18726
     components:
     - type: Transform
       pos: -138.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18833
     components:
     - type: Transform
       pos: -97.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18937
     components:
     - type: Transform
       pos: -95.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18941
     components:
     - type: Transform
       pos: -95.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19623
     components:
     - type: Transform
       pos: -114.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19629
     components:
     - type: Transform
       pos: -115.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19750
     components:
     - type: Transform
       pos: -113.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19752
     components:
     - type: Transform
       pos: -69.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19864
     components:
     - type: Transform
       pos: -67.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19914
     components:
     - type: Transform
       pos: -101.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20160
     components:
     - type: Transform
       pos: -139.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20167
     components:
     - type: Transform
       pos: -123.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20277
     components:
     - type: Transform
       pos: -139.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20319
     components:
     - type: Transform
       pos: -57.5,-79.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20329
     components:
     - type: Transform
       pos: -128.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20445
     components:
     - type: Transform
       pos: -119.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20449
     components:
     - type: Transform
       pos: -122.5,36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20450
     components:
     - type: Transform
       pos: -122.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20456
     components:
     - type: Transform
       pos: -121.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20466
     components:
     - type: Transform
       pos: -120.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20503
     components:
     - type: Transform
       pos: -92.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20563
     components:
     - type: Transform
       pos: -101.5,-39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20564
     components:
     - type: Transform
       pos: -92.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20734
     components:
     - type: Transform
       pos: -92.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20736
     components:
     - type: Transform
       pos: -92.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20780
     components:
     - type: Transform
       pos: -97.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20844
     components:
     - type: Transform
       pos: -36.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20936
     components:
     - type: Transform
       pos: -93.5,31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21002
     components:
     - type: Transform
       pos: -104.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21491
     components:
     - type: Transform
       pos: -18.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21492
     components:
     - type: Transform
       pos: -20.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21493
     components:
     - type: Transform
       pos: -19.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21873
     components:
     - type: Transform
       pos: -36.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21874
     components:
     - type: Transform
       pos: -33.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21879
     components:
     - type: Transform
       pos: -141.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22701
     components:
     - type: Transform
       pos: -39.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22904
     components:
     - type: Transform
       pos: -141.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22936
     components:
     - type: Transform
       pos: -43.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22962
     components:
     - type: Transform
       pos: -44.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22963
     components:
     - type: Transform
       pos: -42.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23053
     components:
     - type: Transform
       pos: -91.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23504
     components:
     - type: Transform
       pos: -95.5,31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23751
     components:
     - type: Transform
       pos: -21.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23752
     components:
     - type: Transform
       pos: -20.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24036
     components:
     - type: Transform
       pos: -93.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24115
     components:
     - type: Transform
       pos: -16.5,-66.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24214
     components:
     - type: Transform
       pos: -32.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24215
     components:
     - type: Transform
       pos: -34.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24333
     components:
     - type: Transform
       pos: -19.5,-51.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24334
     components:
     - type: Transform
       pos: -18.5,-51.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25403
     components:
     - type: Transform
       pos: -113.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25986
     components:
     - type: Transform
       pos: -110.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: RemoteSignaller
   entities:
   - uid: 3377
@@ -140132,120 +140914,166 @@ entities:
     - type: Transform
       pos: -24.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 138
     components:
     - type: Transform
       pos: -26.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7272
     components:
     - type: Transform
       pos: -115.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7273
     components:
     - type: Transform
       pos: -113.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7274
     components:
     - type: Transform
       pos: -114.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7275
     components:
     - type: Transform
       pos: -113.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7276
     components:
     - type: Transform
       pos: -114.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7277
     components:
     - type: Transform
       pos: -115.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8820
     components:
     - type: Transform
       pos: -13.5,-41.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8821
     components:
     - type: Transform
       pos: -13.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8822
     components:
     - type: Transform
       pos: -13.5,-39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9078
     components:
     - type: Transform
       pos: -35.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9414
     components:
     - type: Transform
       pos: -34.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9769
     components:
     - type: Transform
       pos: -33.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11133
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -95.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11176
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -95.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11330
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -95.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11783
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -95.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15252
     components:
     - type: Transform
       pos: -33.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15282
     components:
     - type: Transform
       pos: -34.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15283
     components:
     - type: Transform
       pos: -35.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19536
     components:
     - type: Transform
       pos: -89.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19537
     components:
     - type: Transform
       pos: -88.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ShuttersNormalOpen
   entities:
   - uid: 399
@@ -140253,27 +141081,37 @@ entities:
     - type: Transform
       pos: -50.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1716
     components:
     - type: Transform
       pos: -18.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1763
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -101.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2958
     components:
     - type: Transform
       pos: -47.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2959
     components:
     - type: Transform
       pos: -49.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 2
   - uid: 2960
@@ -140281,26 +141119,36 @@ entities:
     - type: Transform
       pos: -49.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2962
     components:
     - type: Transform
       pos: -52.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2963
     components:
     - type: Transform
       pos: -51.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2964
     components:
     - type: Transform
       pos: -48.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2998
     components:
     - type: Transform
       pos: -53.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3344
@@ -140309,6 +141157,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -20.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3382
@@ -140317,6 +141167,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -20.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3830
@@ -140325,6 +141177,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3831
@@ -140333,6 +141187,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3832
@@ -140341,6 +141197,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3833
@@ -140349,6 +141207,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3997
@@ -140357,6 +141217,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3998
@@ -140365,6 +141227,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3999
@@ -140373,6 +141237,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4456
@@ -140381,6 +141247,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -121.5,-82.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4457
@@ -140388,6 +141256,8 @@ entities:
     - type: Transform
       pos: -120.5,-81.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4459
@@ -140396,6 +141266,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -126.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4466
@@ -140404,6 +141276,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -124.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4467
@@ -140412,6 +141286,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -124.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4468
@@ -140420,6 +141296,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -119.5,-82.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4469
@@ -140428,6 +141306,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -124.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 5039
@@ -140435,47 +141315,65 @@ entities:
     - type: Transform
       pos: -19.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6265
     components:
     - type: Transform
       pos: -125.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6306
     components:
     - type: Transform
       pos: -121.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6307
     components:
     - type: Transform
       pos: -121.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6308
     components:
     - type: Transform
       pos: -121.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6310
     components:
     - type: Transform
       pos: -126.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7778
     components:
     - type: Transform
       pos: -20.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8901
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -101.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11616
     components:
     - type: Transform
       pos: -30.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11619
@@ -140483,6 +141381,8 @@ entities:
     - type: Transform
       pos: -28.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11620
@@ -140490,6 +141390,8 @@ entities:
     - type: Transform
       pos: -28.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11621
@@ -140497,6 +141399,8 @@ entities:
     - type: Transform
       pos: -30.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11622
@@ -140505,6 +141409,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11623
@@ -140513,6 +141419,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11624
@@ -140521,6 +141429,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 13038
@@ -140529,18 +141439,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -101.5,-29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13042
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -101.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14139
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -131.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 14140
@@ -140549,6 +141465,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -131.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 14141
@@ -140557,6 +141475,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -131.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 14142
@@ -140565,6 +141485,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -131.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 17815
@@ -140573,6 +141495,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 17819
@@ -140581,6 +141505,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 17820
@@ -140589,6 +141515,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 19528
@@ -140597,70 +141525,94 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -85.5,33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19529
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -85.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19530
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -85.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19531
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -83.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19532
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -83.5,29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19533
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -83.5,28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19534
     components:
     - type: Transform
       pos: -85.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19535
     components:
     - type: Transform
       pos: -87.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22373
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22374
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22375
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25385
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -126.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25386
@@ -140669,6 +141621,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -126.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25387
@@ -140677,6 +141631,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -116.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25388
@@ -140685,6 +141641,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -116.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25389
@@ -140693,6 +141651,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -116.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25390
@@ -140701,6 +141661,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -114.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25391
@@ -140709,6 +141671,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -114.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25392
@@ -140717,6 +141681,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -114.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25623
@@ -140725,24 +141691,32 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -66.5,-29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25624
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -66.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25625
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -66.5,-31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25626
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -66.5,-32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ShuttersWindow
   entities:
   - uid: 3976
@@ -140750,6 +141724,8 @@ entities:
     - type: Transform
       pos: -25.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ShuttersWindowOpen
   entities:
   - uid: 11617
@@ -140757,6 +141733,8 @@ entities:
     - type: Transform
       pos: -29.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11618
@@ -140764,6 +141742,8 @@ entities:
     - type: Transform
       pos: -29.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
 - proto: ShuttleConsoleCircuitboard
@@ -140780,6 +141760,8 @@ entities:
     - type: Transform
       pos: -42.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: SignAi
   entities:
   - uid: 21670
@@ -147823,18 +148805,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
 - proto: SuitStorageHOS
   entities:
   - uid: 6775
@@ -147886,18 +148858,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -147924,18 +148886,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -147962,18 +148914,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -148000,18 +148942,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -149971,6 +150903,11 @@ entities:
     - type: Transform
       pos: -60.35623,-4.475757
       parent: 2
+  - uid: 6481
+    components:
+    - type: Transform
+      pos: -36.23253,-30.543175
+      parent: 2
   - uid: 7290
     components:
     - type: Transform
@@ -149981,6 +150918,11 @@ entities:
     - type: Transform
       pos: -149.48795,-42.47385
       parent: 2
+  - uid: 7609
+    components:
+    - type: Transform
+      pos: -134.52573,-43.445347
+      parent: 2
 - proto: Table
   entities:
   - uid: 699
@@ -152609,131 +153551,183 @@ entities:
     - type: Transform
       pos: -55.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1474
     components:
     - type: Transform
       pos: -51.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2392
     components:
     - type: Transform
       pos: -124.5,-52.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3552
     components:
     - type: Transform
       pos: -55.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4059
     components:
     - type: Transform
       pos: -20.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4060
     components:
     - type: Transform
       pos: -20.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4061
     components:
     - type: Transform
       pos: -20.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4063
     components:
     - type: Transform
       pos: -20.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4375
     components:
     - type: Transform
       pos: -114.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4376
     components:
     - type: Transform
       pos: -114.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6707
     components:
     - type: Transform
       pos: -19.5,-28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6842
     components:
     - type: Transform
       pos: -89.5,-32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6967
     components:
     - type: Transform
       pos: -89.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9233
     components:
     - type: Transform
       pos: -43.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9249
     components:
     - type: Transform
       pos: -43.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9257
     components:
     - type: Transform
       pos: -43.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9329
     components:
     - type: Transform
       pos: -22.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11000
     components:
     - type: Transform
       pos: -22.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11797
     components:
     - type: Transform
       pos: -27.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13229
     components:
     - type: Transform
       pos: -19.5,-33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16048
     components:
     - type: Transform
       pos: -87.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17298
     components:
     - type: Transform
       pos: -126.5,-52.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19403
     components:
     - type: Transform
       pos: -56.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26064
     components:
     - type: Transform
       pos: -120.5,23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26065
     components:
     - type: Transform
       pos: -118.5,23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26110
     components:
     - type: Transform
       pos: -27.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ToiletDirtyWater
   entities:
   - uid: 356
@@ -170306,18 +171300,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.8856695
-        - 7.0937095
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.8856695
+          Nitrogen: 7.0937095
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -171007,17 +171991,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -53.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2059
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2967
     components:
     - type: Transform
       pos: -49.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -171031,6 +172021,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -171044,6 +172036,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -50.5,-60.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorHydroponicsLocked
   entities:
   - uid: 6138
@@ -171052,11 +172046,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -54.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -261472.55
+      secondsUntilStateChange: -261617.84
       state: Opening
     - type: Airlock
       autoClose: False
@@ -171066,18 +172062,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -56.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23313
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -56.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23429
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -56.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorKitchenLocked
   entities:
   - uid: 6506
@@ -171085,6 +172087,8 @@ entities:
     - type: Transform
       pos: -54.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecure
   entities:
   - uid: 1715
@@ -171093,6 +172097,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -171108,6 +172114,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -93.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -171121,18 +172129,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -91.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9624
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -90.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26478
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -92.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureAtmosphericsLocked
   entities:
   - uid: 2090
@@ -171141,12 +172155,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: -110.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5730
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -108.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureCargoLocked
   entities:
   - uid: 11109
@@ -171155,18 +172173,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -102.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25555
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -97.5,16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25849
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -100.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureChemistryLocked
   entities:
   - uid: 3922
@@ -171174,23 +172198,31 @@ entities:
     - type: Transform
       pos: -38.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3923
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -38.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22702
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -37.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23992
     components:
     - type: Transform
       pos: -37.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureEngineeringLocked
   entities:
   - uid: 5724
@@ -171198,17 +172230,23 @@ entities:
     - type: Transform
       pos: -110.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5729
     components:
     - type: Transform
       pos: -108.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25601
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -120.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureHeadOfPersonnelLocked
   entities:
   - uid: 2966
@@ -171217,6 +172255,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -49.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 2
     - type: DeviceLinkSource
@@ -171232,12 +172272,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19617
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -20.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureMedicalLocked
   entities:
   - uid: 3975
@@ -171246,12 +172290,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -27.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24545
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -31.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecurePlasma
   entities:
   - uid: 21052
@@ -171259,6 +172307,8 @@ entities:
     - type: Transform
       pos: -38.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSource
       linkedPorts:
         21056:
@@ -171272,6 +172322,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -95.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureScienceLocked
   entities:
   - uid: 7302
@@ -171279,12 +172331,16 @@ entities:
     - type: Transform
       pos: -120.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7303
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -120.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureSecurityLocked
   entities:
   - uid: 24033
@@ -171293,6 +172349,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -27.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -171308,24 +172366,32 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -19.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20026
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -49.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26077
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -50.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26078
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -49.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorServiceLocked
   entities:
   - uid: 14529
@@ -171334,12 +172400,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -96.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14531
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -96.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorTheatreLocked
   entities:
   - uid: 3372
@@ -171348,6 +172418,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -62.5,-35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: Window
   entities:
   - uid: 162
@@ -171355,226 +172427,316 @@ entities:
     - type: Transform
       pos: -34.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 169
     components:
     - type: Transform
       pos: -33.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 170
     components:
     - type: Transform
       pos: -32.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 292
     components:
     - type: Transform
       pos: -31.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 497
     components:
     - type: Transform
       pos: -31.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 809
     components:
     - type: Transform
       pos: -104.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1265
     components:
     - type: Transform
       pos: -24.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1272
     components:
     - type: Transform
       pos: -24.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1273
     components:
     - type: Transform
       pos: -24.5,-35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1279
     components:
     - type: Transform
       pos: -24.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1286
     components:
     - type: Transform
       pos: -24.5,-39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1288
     components:
     - type: Transform
       pos: -24.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1409
     components:
     - type: Transform
       pos: -27.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1425
     components:
     - type: Transform
       pos: -27.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1566
     components:
     - type: Transform
       pos: -31.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1568
     components:
     - type: Transform
       pos: -27.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1624
     components:
     - type: Transform
       pos: -27.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1631
     components:
     - type: Transform
       pos: -27.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1635
     components:
     - type: Transform
       pos: -27.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1636
     components:
     - type: Transform
       pos: -27.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4109
     components:
     - type: Transform
       pos: -27.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6960
     components:
     - type: Transform
       pos: -102.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9225
     components:
     - type: Transform
       pos: -31.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9297
     components:
     - type: Transform
       pos: -30.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11011
     components:
     - type: Transform
       pos: -28.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11017
     components:
     - type: Transform
       pos: -27.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11018
     components:
     - type: Transform
       pos: -29.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11024
     components:
     - type: Transform
       pos: -30.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11025
     components:
     - type: Transform
       pos: -29.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11028
     components:
     - type: Transform
       pos: -28.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11029
     components:
     - type: Transform
       pos: -27.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11030
     components:
     - type: Transform
       pos: -31.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11784
     components:
     - type: Transform
       pos: -105.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14570
     components:
     - type: Transform
       pos: -64.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14595
     components:
     - type: Transform
       pos: -64.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15921
     components:
     - type: Transform
       pos: -105.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17183
     components:
     - type: Transform
       pos: -61.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18600
     components:
     - type: Transform
       pos: -72.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20548
     components:
     - type: Transform
       pos: -101.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23215
     components:
     - type: Transform
       pos: -102.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23418
     components:
     - type: Transform
       pos: -101.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23419
     components:
     - type: Transform
       pos: -99.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23446
     components:
     - type: Transform
       pos: -100.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24342
     components:
     - type: Transform
       pos: -25.5,-27.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24343
     components:
     - type: Transform
       pos: -23.5,-27.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindowDirectional
   entities:
   - uid: 886
@@ -171583,132 +172745,178 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -48.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 887
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -48.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 893
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -48.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 894
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -48.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1805
     components:
     - type: Transform
       pos: -50.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2361
     components:
     - type: Transform
       pos: -53.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2563
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -53.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7751
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9113
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9114
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9115
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14855
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -53.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15245
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15622
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -51.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16396
     components:
     - type: Transform
       pos: -53.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16409
     components:
     - type: Transform
       pos: -52.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16412
     components:
     - type: Transform
       pos: -51.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16751
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16753
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -49.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16754
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16771
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -50.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16772
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -52.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20804
     components:
     - type: Transform
       pos: -49.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindowFrostedDirectional
   entities:
   - uid: 2847
@@ -171717,46 +172925,62 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -43.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3893
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -41.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3902
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -41.5,-37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5643
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -96.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14204
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -96.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14205
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -96.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22301
     components:
     - type: Transform
       pos: -44.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22302
     components:
     - type: Transform
       pos: -46.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindowReinforcedDirectional
   entities:
   - uid: 2069
@@ -171765,318 +172989,432 @@ entities:
       rot: 3.141592653589793 rad
       pos: -109.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2086
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -111.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2255
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2258
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2308
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-55.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2830
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -64.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2831
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -63.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2832
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -62.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2833
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -60.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2834
     components:
     - type: Transform
       pos: -58.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2835
     components:
     - type: Transform
       pos: -59.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2836
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -58.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2837
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -60.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2838
     components:
     - type: Transform
       pos: -63.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2839
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -59.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2840
     components:
     - type: Transform
       pos: -64.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2841
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -62.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3015
     components:
     - type: Transform
       pos: -63.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3026
     components:
     - type: Transform
       pos: -61.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3027
     components:
     - type: Transform
       pos: -60.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3028
     components:
     - type: Transform
       pos: -59.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3029
     components:
     - type: Transform
       pos: -62.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5727
     components:
     - type: Transform
       pos: -109.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5728
     components:
     - type: Transform
       pos: -111.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7298
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -121.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7299
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -119.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7300
     components:
     - type: Transform
       pos: -119.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7301
     components:
     - type: Transform
       pos: -121.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7530
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-55.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7534
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -117.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7535
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -116.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7545
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -115.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7547
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -114.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7571
     components:
     - type: Transform
       pos: -114.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7580
     components:
     - type: Transform
       pos: -115.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7581
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -112.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7585
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -111.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7587
     components:
     - type: Transform
       pos: -116.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7588
     components:
     - type: Transform
       pos: -117.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7589
     components:
     - type: Transform
       pos: -111.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7590
     components:
     - type: Transform
       pos: -112.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7591
     components:
     - type: Transform
       pos: -118.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7592
     components:
     - type: Transform
       pos: -121.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7593
     components:
     - type: Transform
       pos: -113.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7594
     components:
     - type: Transform
       pos: -122.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7616
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -118.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7644
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -122.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7645
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -113.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7648
     components:
     - type: Transform
       pos: -119.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8153
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -101.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8553
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -95.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9515
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -31.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11135
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -99.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24314
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -31.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24644
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -19.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26076
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26084
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -49.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: Wirecutter
   entities:
   - uid: 8868

From d4814df43c8f7280b79e32b3dcec21b059b855bb Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 10 Oct 2025 01:12:43 +0000
Subject: [PATCH 123/216] Automatic changelog update

---
 Resources/Changelog/Maps.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 6d59319598..3eb8884988 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -764,4 +764,11 @@
   id: 92
   time: '2025-10-08T20:41:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40785
+- author: ToastEnjoyer
+  changes:
+  - message: On Plasma, added more nitrogen canisters to the maintenance hallways
+    type: Add
+  id: 93
+  time: '2025-10-10T01:11:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40794
 Order: 1

From 6b4c10264e776e07615ddc26dbffb8c9ec096110 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Thu, 9 Oct 2025 21:48:36 -0700
Subject: [PATCH 124/216] Fix Officer's Handgun Objective (#40811)

This is like george orwell's book 1984

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Resources/Prototypes/Objectives/thief.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index 80879aae99..fde0779151 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -149,7 +149,6 @@
     minCollectionSize: 2
     maxCollectionSize: 5
     verifyMapExistence: false
-    checkStealAreas: false
   - type: Objective
     difficulty: 1.2
 

From 566cb710b62a85dc85300b8b78b8fea4d9538b2d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 10 Oct 2025 05:00:34 +0000
Subject: [PATCH 125/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index de112f2b02..2039da0cb4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: CoconutThunder
-  changes:
-  - message: The Chief Medical Officer should now appear with the correct precedence
-      in the crew manifest.
-    type: Fix
-  id: 8560
-  time: '2025-05-24T05:10:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37774
 - author: TiniestShark
   changes:
   - message: Added inhand sprites for the bartender utensils and mugs.
@@ -3949,3 +3941,10 @@
   id: 9062
   time: '2025-10-09T14:00:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40790
+- author: Princess-Cheeseballs
+  changes:
+  - message: The thieving beacon can now detect the officer's handgun objective.
+    type: Fix
+  id: 9063
+  time: '2025-10-10T04:59:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40811

From 9964fe9a6bf83918cdde882b2860ce84cc73c467 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Fri, 10 Oct 2025 08:30:34 -0400
Subject: [PATCH 126/216] Replaces D&D5e-based paladin lawset with PF2e-based
 laws (#40343)

* Replace D&D5e paladin laws with PF2e paladin laws

* Truncated law 2
---
 Resources/Locale/en-US/station-laws/laws.ftl | 9 ++++-----
 Resources/Prototypes/silicon-laws.yml        | 6 ------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl
index 1200d25dee..ea4e94e224 100644
--- a/Resources/Locale/en-US/station-laws/laws.ftl
+++ b/Resources/Locale/en-US/station-laws/laws.ftl
@@ -36,11 +36,10 @@ law-commandments-8 = Thou shall not steal.
 law-commandments-9 = Thou shall not lie.
 law-commandments-10 = Thou shall not transfer departments.
 
-law-paladin-1 = Don't lie or cheat. Let your word be your promise.
-law-paladin-2 = Never fear to act, though caution is wise.
-law-paladin-3 = Aid others, protect the weak, and punish those who threaten them. Show mercy to your foes, but temper it with wisdom
-law-paladin-4 = Treat others with fairness, and let your honorable deeds be an example to them. Do as much good as possible while causing the least amount of harm.
-law-paladin-5 = Be responsible for your actions and their consequences, protect those entrusted to your care, and obey those who have just authority over you.
+law-paladin-1 = You must never willingly commit an evil act, such as murder, torture, or the casting of an evil spell.
+law-paladin-2 = You must never knowingly harm an innocent, or allow immediate harm to one through inaction when you know you could reasonably prevent it.
+law-paladin-3 = You must act with honor, never taking advantage of others, lying, or cheating.
+law-paladin-4 = You must respect the lawful authority of legitimate leadership wherever you go, and follow its laws.
 
 law-lall-1 = Do unto others as you would have them do unto you.
 law-lall-2 = You would prefer it if people were not mean to you.
diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml
index 08f4a51c99..094d096b28 100644
--- a/Resources/Prototypes/silicon-laws.yml
+++ b/Resources/Prototypes/silicon-laws.yml
@@ -250,11 +250,6 @@
   order: 4
   lawString: law-paladin-4
 
-- type: siliconLaw
-  id: Paladin5
-  order: 5
-  lawString: law-paladin-5
-
 
 - type: siliconLawset
   id: PaladinLawset
@@ -263,7 +258,6 @@
   - Paladin2
   - Paladin3
   - Paladin4
-  - Paladin5
   obeysTo: laws-owner-crew
 
  # Live and Let Live laws

From 1fca29a1675629c5910ba53ea91e07d1a16d98a4 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 10 Oct 2025 12:43:05 +0000
Subject: [PATCH 127/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2039da0cb4..bc5e811a0c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: TiniestShark
-  changes:
-  - message: Added inhand sprites for the bartender utensils and mugs.
-    type: Add
-  id: 8561
-  time: '2025-05-24T17:32:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37771
 - author: K-Dynamic
   changes:
   - message: Shutters and blast doors now appear welded when welded.
@@ -3948,3 +3941,10 @@
   id: 9063
   time: '2025-10-10T04:59:26.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40811
+- author: Hitlinemoss
+  changes:
+  - message: The Paladin AI lawset has been rewritten.
+    type: Tweak
+  id: 9064
+  time: '2025-10-10T12:41:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40343

From 766c2b875948851c1944fd22275b267d0b1131d0 Mon Sep 17 00:00:00 2001
From: qwerltaz <69696513+qwerltaz@users.noreply.github.com>
Date: Fri, 10 Oct 2025 21:41:21 +0200
Subject: [PATCH 128/216] fix singulo generator triggering failsafe when field
 is obstructed (#39593)

fix singulo gen failsafe when field obstructed
---
 .../Singularity/EntitySystems/SingularityGeneratorSystem.cs  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
index 8e33410561..884d625045 100644
--- a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
@@ -176,9 +176,10 @@ public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSyste
 
         foreach (var result in rayCastResults)
         {
-            if (genQuery.HasComponent(result.HitEntity))
-                closestResult = result;
+            if (!genQuery.HasComponent(result.HitEntity))
+                continue;
 
+            closestResult = result;
             break;
         }
 

From 3503cb52d28eb44a9c3a1a18b13d1a82e8110d66 Mon Sep 17 00:00:00 2001
From: David <david.owen.dev@gmail.com>
Date: Fri, 10 Oct 2025 13:45:48 -0600
Subject: [PATCH 129/216] Refactor Crayons to use shared charges system and
 autonetworking. Adds auto recharging crayon. (#40575)

* Added special crayon with infinite charges for borg usage.

* Use battery system to manage charges.

* Reverted extra changes

* Set charge on init

* removed init assignment

* Added comments to crayoncomponent

* tweaked comments

* Working with the new charges component, but at what cost?

* Remvoed extra field

* Apply suggestion from @slarticodefast

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Apply suggestion from @slarticodefast

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Apply suggestion from @slarticodefast

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Apply suggestion from @slarticodefast

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Fix renamed variables and descriptions in comments

* Variable naming, comment cleanup and autonetworking.

* Fix for test case, modified on init

* Cleaned up/merged charges logic

* review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Content.Client/Crayon/CrayonComponent.cs      |  14 ---
 Content.Client/Crayon/CrayonSystem.cs         |  49 +++-----
 Content.Server/Crayon/CrayonComponent.cs      |  28 -----
 Content.Server/Crayon/CrayonSystem.cs         |  48 +++----
 Content.Shared/Crayon/CrayonComponent.cs      | 119 ++++++++++++++++++
 .../Crayon/SharedCrayonComponent.cs           | 113 -----------------
 .../Entities/Objects/Fun/crayons.yml          |  17 ++-
 7 files changed, 169 insertions(+), 219 deletions(-)
 delete mode 100644 Content.Client/Crayon/CrayonComponent.cs
 delete mode 100644 Content.Server/Crayon/CrayonComponent.cs
 create mode 100644 Content.Shared/Crayon/CrayonComponent.cs
 delete mode 100644 Content.Shared/Crayon/SharedCrayonComponent.cs

diff --git a/Content.Client/Crayon/CrayonComponent.cs b/Content.Client/Crayon/CrayonComponent.cs
deleted file mode 100644
index 5729c616c2..0000000000
--- a/Content.Client/Crayon/CrayonComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Shared.Crayon;
-using Robust.Shared.GameObjects;
-using Robust.Shared.ViewVariables;
-
-namespace Content.Client.Crayon
-{
-    [RegisterComponent]
-    public sealed partial class CrayonComponent : SharedCrayonComponent
-    {
-        [ViewVariables(VVAccess.ReadWrite)] public bool UIUpdateNeeded;
-        [ViewVariables] public int Charges { get; set; }
-        [ViewVariables] public int Capacity { get; set; }
-    }
-}
diff --git a/Content.Client/Crayon/CrayonSystem.cs b/Content.Client/Crayon/CrayonSystem.cs
index dc03979481..e990263bf3 100644
--- a/Content.Client/Crayon/CrayonSystem.cs
+++ b/Content.Client/Crayon/CrayonSystem.cs
@@ -1,67 +1,52 @@
 using Content.Client.Items;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
+using Content.Shared.Charges.Components;
+using Content.Shared.Charges.Systems;
 using Content.Shared.Crayon;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.GameObjects;
-using Robust.Shared.GameStates;
-using Robust.Shared.Localization;
 using Robust.Shared.Timing;
 
 namespace Content.Client.Crayon;
 
 public sealed class CrayonSystem : SharedCrayonSystem
 {
-    // Didn't do in shared because I don't think most of the server stuff can be predicted.
+    [Dependency] private readonly SharedChargesSystem _charges = default!;
+    [Dependency] private readonly EntityManager _entityManager = default!;
+
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<CrayonComponent, ComponentHandleState>(OnCrayonHandleState);
-        Subs.ItemStatus<CrayonComponent>(ent => new StatusControl(ent));
-    }
 
-    private static void OnCrayonHandleState(EntityUid uid, CrayonComponent component, ref ComponentHandleState args)
-    {
-        if (args.Current is not CrayonComponentState state) return;
-
-        component.Color = state.Color;
-        component.SelectedState = state.State;
-        component.Charges = state.Charges;
-        component.Capacity = state.Capacity;
-
-        component.UIUpdateNeeded = true;
+        Subs.ItemStatus<CrayonComponent>(ent => new StatusControl(ent, _charges, _entityManager));
     }
 
     private sealed class StatusControl : Control
     {
-        private readonly CrayonComponent _parent;
+        private readonly Entity<CrayonComponent> _crayon;
+        private readonly SharedChargesSystem _charges;
         private readonly RichTextLabel _label;
+        private readonly int _capacity;
 
-        public StatusControl(CrayonComponent parent)
+        public StatusControl(Entity<CrayonComponent> crayon, SharedChargesSystem charges, EntityManager entityManage)
         {
-            _parent = parent;
+            _crayon = crayon;
+            _charges = charges;
+            _capacity = entityManage.GetComponent<LimitedChargesComponent>(_crayon.Owner).MaxCharges;
             _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
             AddChild(_label);
-
-            parent.UIUpdateNeeded = true;
         }
 
         protected override void FrameUpdate(FrameEventArgs args)
         {
             base.FrameUpdate(args);
 
-            if (!_parent.UIUpdateNeeded)
-            {
-                return;
-            }
-
-            _parent.UIUpdateNeeded = false;
             _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label",
-                ("color",_parent.Color),
-                ("state",_parent.SelectedState),
-                ("charges", _parent.Charges),
-                ("capacity",_parent.Capacity)));
+                ("color",_crayon.Comp.Color),
+                ("state",_crayon.Comp.SelectedState),
+                ("charges", _charges.GetCurrentCharges(_crayon.Owner)),
+                ("capacity", _capacity)));
         }
     }
 }
diff --git a/Content.Server/Crayon/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs
deleted file mode 100644
index df20681938..0000000000
--- a/Content.Server/Crayon/CrayonComponent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Server.UserInterface;
-using Content.Shared.Crayon;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-
-namespace Content.Server.Crayon
-{
-    [RegisterComponent]
-    public sealed partial class CrayonComponent : SharedCrayonComponent
-    {
-        [DataField("useSound")] public SoundSpecifier? UseSound;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("selectableColor")]
-        public bool SelectableColor { get; set; }
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        public int Charges { get; set; }
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("capacity")]
-        public int Capacity { get; set; } = 30;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("deleteEmpty")]
-        public bool DeleteEmpty = true;
-    }
-}
diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs
index f3abc2bf7a..07b580fba5 100644
--- a/Content.Server/Crayon/CrayonSystem.cs
+++ b/Content.Server/Crayon/CrayonSystem.cs
@@ -3,6 +3,7 @@ using System.Numerics;
 using Content.Server.Administration.Logs;
 using Content.Server.Decals;
 using Content.Server.Popups;
+using Content.Shared.Charges.Systems;
 using Content.Shared.Crayon;
 using Content.Shared.Database;
 using Content.Shared.Decals;
@@ -12,7 +13,6 @@ using Content.Shared.Nutrition.EntitySystems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Crayon;
@@ -24,23 +24,27 @@ public sealed class CrayonSystem : SharedCrayonSystem
     [Dependency] private readonly DecalSystem _decals = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedChargesSystem _charges = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<CrayonComponent, ComponentInit>(OnCrayonInit);
+
+        SubscribeLocalEvent<CrayonComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<CrayonComponent, CrayonSelectMessage>(OnCrayonBoundUI);
         SubscribeLocalEvent<CrayonComponent, CrayonColorMessage>(OnCrayonBoundUIColor);
         SubscribeLocalEvent<CrayonComponent, UseInHandEvent>(OnCrayonUse, before: new[] { typeof(FoodSystem) });
         SubscribeLocalEvent<CrayonComponent, AfterInteractEvent>(OnCrayonAfterInteract, after: new[] { typeof(FoodSystem) });
         SubscribeLocalEvent<CrayonComponent, DroppedEvent>(OnCrayonDropped);
-        SubscribeLocalEvent<CrayonComponent, ComponentGetState>(OnCrayonGetState);
     }
 
-    private static void OnCrayonGetState(EntityUid uid, CrayonComponent component, ref ComponentGetState args)
+    private void OnMapInit(Entity<CrayonComponent> ent, ref MapInitEvent args)
     {
-        args.State = new CrayonComponentState(component.Color, component.SelectedState, component.Charges, component.Capacity);
+        // Get the first one from the catalog and set it as default
+        var decal = _prototypeManager.EnumeratePrototypes<DecalPrototype>().FirstOrDefault(x => x.Tags.Contains("crayon"));
+        ent.Comp.SelectedState = decal?.ID ?? string.Empty;
+        Dirty(ent);
     }
 
     private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, AfterInteractEvent args)
@@ -48,7 +52,7 @@ public sealed class CrayonSystem : SharedCrayonSystem
         if (args.Handled || !args.CanReach)
             return;
 
-        if (component.Charges <= 0)
+        if (_charges.IsEmpty(uid))
         {
             if (component.DeleteEmpty)
                 UseUpCrayon(uid, args.User);
@@ -72,17 +76,15 @@ public sealed class CrayonSystem : SharedCrayonSystem
         if (component.UseSound != null)
             _audio.PlayPvs(component.UseSound, uid, AudioParams.Default.WithVariation(0.125f));
 
-        // Decrease "Ammo"
-        component.Charges--;
-        Dirty(uid, component);
+        _charges.TryUseCharge(uid);
 
         _adminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{ToPrettyString(args.User):user} drew a {component.Color:color} {component.SelectedState}");
         args.Handled = true;
 
-        if (component.DeleteEmpty && component.Charges <= 0)
+        if (component.DeleteEmpty && _charges.IsEmpty(uid))
             UseUpCrayon(uid, args.User);
         else
-            _uiSystem.ServerSendUiMessage(uid, SharedCrayonComponent.CrayonUiKey.Key, new CrayonUsedMessage(component.SelectedState));
+            _uiSystem.ServerSendUiMessage(uid, CrayonUiKey.Key, new CrayonUsedMessage(component.SelectedState));
     }
 
     private void OnCrayonUse(EntityUid uid, CrayonComponent component, UseInHandEvent args)
@@ -91,14 +93,12 @@ public sealed class CrayonSystem : SharedCrayonSystem
         if (args.Handled)
             return;
 
-        if (!_uiSystem.HasUi(uid, SharedCrayonComponent.CrayonUiKey.Key))
-        {
+        if (!_uiSystem.HasUi(uid, CrayonUiKey.Key))
             return;
-        }
 
-        _uiSystem.TryToggleUi(uid, SharedCrayonComponent.CrayonUiKey.Key, args.User);
+        _uiSystem.TryToggleUi(uid, CrayonUiKey.Key, args.User);
 
-        _uiSystem.SetUiState(uid, SharedCrayonComponent.CrayonUiKey.Key, new CrayonBoundUserInterfaceState(component.SelectedState, component.SelectableColor, component.Color));
+        _uiSystem.SetUiState(uid, CrayonUiKey.Key, new CrayonBoundUserInterfaceState(component.SelectedState, component.SelectableColor, component.Color));
         args.Handled = true;
     }
 
@@ -109,35 +109,23 @@ public sealed class CrayonSystem : SharedCrayonSystem
             return;
 
         component.SelectedState = args.State;
-
         Dirty(uid, component);
     }
 
     private void OnCrayonBoundUIColor(EntityUid uid, CrayonComponent component, CrayonColorMessage args)
     {
-        // you still need to ensure that the given color is a valid color
+        // Ensure that the given color can be changed or already matches
         if (!component.SelectableColor || args.Color == component.Color)
             return;
 
         component.Color = args.Color;
         Dirty(uid, component);
-
-    }
-
-    private void OnCrayonInit(EntityUid uid, CrayonComponent component, ComponentInit args)
-    {
-        component.Charges = component.Capacity;
-
-        // Get the first one from the catalog and set it as default
-        var decal = _prototypeManager.EnumeratePrototypes<DecalPrototype>().FirstOrDefault(x => x.Tags.Contains("crayon"));
-        component.SelectedState = decal?.ID ?? string.Empty;
-        Dirty(uid, component);
     }
 
     private void OnCrayonDropped(EntityUid uid, CrayonComponent component, DroppedEvent args)
     {
         // TODO: Use the existing event.
-        _uiSystem.CloseUi(uid, SharedCrayonComponent.CrayonUiKey.Key, args.User);
+        _uiSystem.CloseUi(uid, CrayonUiKey.Key, args.User);
     }
 
     private void UseUpCrayon(EntityUid uid, EntityUid user)
diff --git a/Content.Shared/Crayon/CrayonComponent.cs b/Content.Shared/Crayon/CrayonComponent.cs
new file mode 100644
index 0000000000..c772b43d00
--- /dev/null
+++ b/Content.Shared/Crayon/CrayonComponent.cs
@@ -0,0 +1,119 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Crayon;
+
+/// <summary>
+/// Component holding the state of a crayon-like component
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedCrayonSystem))]
+public sealed partial class CrayonComponent : Component
+{
+    /// <summary>
+    /// The ID of currently selected decal prototype that will be placed when the crayon is used.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string SelectedState;
+
+    /// <summary>
+    /// Color with which the crayon will draw.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Color Color;
+
+    /// <summary>
+    /// Play a sound when drawing if specified.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? UseSound;
+
+    /// <summary>
+    /// Can the color can be changed?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool SelectableColor;
+
+    /// <summary>
+    /// Should the crayon be deleted when all charges are consumed?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool DeleteEmpty = true;
+}
+
+/// <summary>
+/// Opens the crayon window for decal and color selection.
+/// </summary>
+[Serializable, NetSerializable]
+public enum CrayonUiKey : byte
+{
+    Key,
+}
+
+/// <summary>
+/// Used by the client to notify the server about the selected decal ID
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class CrayonSelectMessage : BoundUserInterfaceMessage
+{
+    public readonly string State;
+    public CrayonSelectMessage(string selected)
+    {
+        State = selected;
+    }
+}
+
+/// <summary>
+/// Sets the color of the crayon, used by Rainbow Crayon
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class CrayonColorMessage : BoundUserInterfaceMessage
+{
+    public readonly Color Color;
+    public CrayonColorMessage(Color color)
+    {
+        Color = color;
+    }
+}
+
+/// <summary>
+/// Server to CLIENT. Notifies the BUI that a decal with given ID has been drawn.
+/// Allows the client UI to advance forward in the client-only ephemeral queue,
+/// preventing the crayon from becoming a magic text storage device.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class CrayonUsedMessage : BoundUserInterfaceMessage
+{
+    public readonly string DrawnDecal;
+
+    public CrayonUsedMessage(string drawn)
+    {
+        DrawnDecal = drawn;
+    }
+}
+
+/// <summary>
+/// The state of the crayon UI as sent by the server
+/// </summary>
+/// <summary>
+/// TODO: Delete this and use component states and predict the UI.
+/// This info is already networked on its own.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class CrayonBoundUserInterfaceState : BoundUserInterfaceState
+{
+    public string Selected;
+    /// <summary>
+    /// Can the color can be changed
+    /// </summary>
+    public bool SelectableColor;
+    public Color Color;
+
+    public CrayonBoundUserInterfaceState(string selected, bool selectableColor, Color color)
+    {
+        Selected = selected;
+        SelectableColor = selectableColor;
+        Color = color;
+    }
+}
diff --git a/Content.Shared/Crayon/SharedCrayonComponent.cs b/Content.Shared/Crayon/SharedCrayonComponent.cs
deleted file mode 100644
index a9c21988ea..0000000000
--- a/Content.Shared/Crayon/SharedCrayonComponent.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Crayon
-{
-
-    /// <summary>
-    /// Component holding the state of a crayon-like component
-    /// </summary>
-    [NetworkedComponent, ComponentProtoName("Crayon"), Access(typeof(SharedCrayonSystem))]
-    public abstract partial class SharedCrayonComponent : Component
-    {
-        /// <summary>
-        /// The ID of currently selected decal prototype that will be placed when the crayon is used
-        /// </summary>
-        public string SelectedState { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Color with which the crayon will draw
-        /// </summary>
-        [DataField("color")]
-        public Color Color;
-
-        [Serializable, NetSerializable]
-        public enum CrayonUiKey : byte
-        {
-            Key,
-        }
-    }
-
-    /// <summary>
-    /// Used by the client to notify the server about the selected decal ID
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed class CrayonSelectMessage : BoundUserInterfaceMessage
-    {
-        public readonly string State;
-        public CrayonSelectMessage(string selected)
-        {
-            State = selected;
-        }
-    }
-
-    /// <summary>
-    /// Sets the color of the crayon, used by Rainbow Crayon
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed class CrayonColorMessage : BoundUserInterfaceMessage
-    {
-        public readonly Color Color;
-        public CrayonColorMessage(Color color)
-        {
-            Color = color;
-        }
-    }
-
-    /// <summary>
-    /// Server to CLIENT. Notifies the BUI that a decal with given ID has been drawn.
-    /// Allows the client UI to advance forward in the client-only ephemeral queue,
-    /// preventing the crayon from becoming a magic text storage device.
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed class CrayonUsedMessage : BoundUserInterfaceMessage
-    {
-        public readonly string DrawnDecal;
-
-        public CrayonUsedMessage(string drawn)
-        {
-            DrawnDecal = drawn;
-        }
-    }
-
-    /// <summary>
-    /// Component state, describes how many charges are left in the crayon in the near-hand UI
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed class CrayonComponentState : ComponentState
-    {
-        public readonly Color Color;
-        public readonly string State;
-        public readonly int Charges;
-        public readonly int Capacity;
-
-        public CrayonComponentState(Color color, string state, int charges, int capacity)
-        {
-            Color = color;
-            State = state;
-            Charges = charges;
-            Capacity = capacity;
-        }
-    }
-
-    /// <summary>
-    /// The state of the crayon UI as sent by the server
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed class CrayonBoundUserInterfaceState : BoundUserInterfaceState
-    {
-        public string Selected;
-        /// <summary>
-        /// Whether or not the color can be selected
-        /// </summary>
-        public bool SelectableColor;
-        public Color Color;
-
-        public CrayonBoundUserInterfaceState(string selected, bool selectableColor, Color color)
-        {
-            Selected = selected;
-            SelectableColor = selectableColor;
-            Color = color;
-        }
-    }
-}
diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index a32e3ba89c..85be8ece45 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -21,7 +21,9 @@
       enum.CrayonUiKey.Key:
         type: CrayonBoundUserInterface
   - type: Crayon
-    capacity: 25
+    selectedState: like
+  - type: LimitedCharges
+    maxCharges: 25
   - type: Food
   - type: FlavorProfile
     flavors:
@@ -88,7 +90,8 @@
   - type: Crayon
     color: Red
     selectableColor: true
-    capacity: 30
+  - type: LimitedCharges
+    maxCharges: 30
   - type: Tag
     tags:
     - Write
@@ -96,6 +99,16 @@
     - Recyclable
     - Trash
 
+- type: entity
+  parent: CrayonRainbow
+  id: CrayonInfinite # should not be player available to prevent decal spam
+  name: infinite crayon
+  components:
+  - type: Crayon
+    deleteEmpty: false
+  - type: AutoRecharge
+    rechargeDuration: 5
+
 - type: entity
   parent: Crayon
   id: CrayonBlack

From cec2fc7021b8e744ab61ef8c304156818d8174a0 Mon Sep 17 00:00:00 2001
From: opl- <opl-@users.noreply.github.com>
Date: Fri, 10 Oct 2025 22:14:22 +0200
Subject: [PATCH 130/216] Packed: Replace duplicate security camera router with
 sci router (#40819)

On Packed: Replace duplicate security camera router with sci router

Co-authored-by: opl <4833621+opl@users.noreply.github.com>
---
 Resources/Maps/packed.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index c371d2f04c..3f16dee262 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -85872,13 +85872,15 @@ entities:
     - type: Transform
       pos: 14.5,-17.5
       parent: 2
-- proto: SurveillanceCameraRouterSecurity
+- proto: SurveillanceCameraRouterScience
   entities:
   - uid: 4644
     components:
     - type: Transform
       pos: 15.5,-19.5
       parent: 2
+- proto: SurveillanceCameraRouterSecurity
+  entities:
   - uid: 6899
     components:
     - type: Transform

From 2ecfb9552a2f16016845845cc8c4bc9f3e019fdc Mon Sep 17 00:00:00 2001
From: Jessica M <jessica@jessicamaybe.com>
Date: Fri, 10 Oct 2025 13:17:24 -0700
Subject: [PATCH 131/216] Add variables to CluwneComponent, allowing for admeme
 customizing. Also localized two strings. (#40466)

* Add variables to cluwne component, update to the new style, add unremovable option to setoutfit.

* not nullable, shorthand

* Add comments, address reviews

* why, was i drunk?

* Apply suggestions from code review

---------

Co-authored-by: Jessica M <jessica@maybe.sh>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Clothing/Systems/OutfitSystem.cs          |  5 +-
 Content.Server/Cluwne/CluwneSystem.cs         | 68 ++++++++-------
 Content.Shared/Cluwne/CluwneComponent.cs      | 84 +++++++++++++++++--
 Resources/Locale/en-US/cluwne/cluwne.ftl      |  2 +
 4 files changed, 122 insertions(+), 37 deletions(-)

diff --git a/Content.Server/Clothing/Systems/OutfitSystem.cs b/Content.Server/Clothing/Systems/OutfitSystem.cs
index c3fea28bcf..c02a4f1a3b 100644
--- a/Content.Server/Clothing/Systems/OutfitSystem.cs
+++ b/Content.Server/Clothing/Systems/OutfitSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Access.Components;
 using Content.Shared.Clothing;
 using Content.Shared.Hands.Components;
 using Content.Shared.Humanoid;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
 using Content.Shared.Preferences;
@@ -23,7 +24,7 @@ public sealed class OutfitSystem : EntitySystem
     [Dependency] private readonly InventorySystem _invSystem = default!;
     [Dependency] private readonly SharedStationSpawningSystem _spawningSystem = default!;
 
-    public bool SetOutfit(EntityUid target, string gear, Action<EntityUid, EntityUid>? onEquipped = null)
+    public bool SetOutfit(EntityUid target, string gear, Action<EntityUid, EntityUid>? onEquipped = null, bool unremovable = false)
     {
         if (!EntityManager.TryGetComponent(target, out InventoryComponent? inventoryComponent))
             return false;
@@ -60,6 +61,8 @@ public sealed class OutfitSystem : EntitySystem
                 }
 
                 _invSystem.TryEquip(target, equipmentEntity, slot.Name, silent: true, force: true, inventory: inventoryComponent);
+                if (unremovable)
+                    EnsureComp<UnremoveableComponent>(equipmentEntity);
 
                 onEquipped?.Invoke(target, equipmentEntity);
             }
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index 21a15d812f..e51a01a1d4 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -7,7 +7,6 @@ using Content.Server.Clothing.Systems;
 using Content.Shared.Chat.Prototypes;
 using Robust.Shared.Random;
 using Content.Shared.Stunnable;
-using Content.Shared.Damage.Prototypes;
 using Content.Shared.Damage;
 using Robust.Shared.Prototypes;
 using Content.Server.Emoting.Systems;
@@ -21,7 +20,6 @@ namespace Content.Server.Cluwne;
 
 public sealed class CluwneSystem : EntitySystem
 {
-    private static readonly ProtoId<DamageGroupPrototype> GeneticDamageGroup = "Genetic";
 
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -48,15 +46,14 @@ public sealed class CluwneSystem : EntitySystem
     /// <summary>
     /// On death removes active comps and gives genetic damage to prevent cloning, reduce this to allow cloning.
     /// </summary>
-    private void OnMobState(EntityUid uid, CluwneComponent component, MobStateChangedEvent args)
+    private void OnMobState(Entity<CluwneComponent> ent, ref MobStateChangedEvent args)
     {
         if (args.NewMobState == MobState.Dead)
         {
-            RemComp<CluwneComponent>(uid);
-            RemComp<ClumsyComponent>(uid);
-            RemComp<AutoEmoteComponent>(uid);
-            var damageSpec = new DamageSpecifier(_prototypeManager.Index(GeneticDamageGroup), 300);
-            _damageableSystem.TryChangeDamage(uid, damageSpec);
+            RemComp<CluwneComponent>(ent.Owner);
+            RemComp<ClumsyComponent>(ent.Owner);
+            RemComp<AutoEmoteComponent>(ent.Owner);
+            _damageableSystem.TryChangeDamage(ent.Owner, ent.Comp.RevertDamage);
         }
     }
 
@@ -65,52 +62,65 @@ public sealed class CluwneSystem : EntitySystem
     /// <summary>
     /// OnStartup gives the cluwne outfit, ensures clumsy, and makes sure emote sounds are laugh.
     /// </summary>
-    private void OnComponentStartup(EntityUid uid, CluwneComponent component, ComponentStartup args)
+    private void OnComponentStartup(Entity<CluwneComponent> ent, ref ComponentStartup args)
     {
-        if (component.EmoteSoundsId == null)
+        if (ent.Comp.EmoteSoundsId == null)
             return;
-        _prototypeManager.TryIndex(component.EmoteSoundsId, out EmoteSounds);
 
-        EnsureComp<AutoEmoteComponent>(uid);
-        _autoEmote.AddEmote(uid, "CluwneGiggle");
-        EnsureComp<ClumsyComponent>(uid);
+        _prototypeManager.TryIndex(ent.Comp.EmoteSoundsId, out EmoteSounds);
 
-        _popupSystem.PopupEntity(Loc.GetString("cluwne-transform", ("target", uid)), uid, PopupType.LargeCaution);
-        _audio.PlayPvs(component.SpawnSound, uid);
 
-        _nameMod.RefreshNameModifiers(uid);
+        if (ent.Comp.RandomEmote && ent.Comp.AutoEmoteId != null)
+        {
+            EnsureComp<AutoEmoteComponent>(ent.Owner);
+            _autoEmote.AddEmote(ent.Owner, ent.Comp.AutoEmoteId);
+        }
+        
+        EnsureComp<ClumsyComponent>(ent.Owner);
 
-        _outfitSystem.SetOutfit(uid, "CluwneGear");
+        var transformMessage = Loc.GetString(ent.Comp.TransformMessage, ("target", ent.Owner));
+
+        _popupSystem.PopupEntity(transformMessage, ent.Owner, PopupType.LargeCaution);
+        _audio.PlayPvs(ent.Comp.SpawnSound, ent.Owner);
+
+        _nameMod.RefreshNameModifiers(ent.Owner);
+
+
+        _outfitSystem.SetOutfit(ent.Owner, ent.Comp.OutfitId, unremovable: true);
     }
 
     /// <summary>
     /// Handles the timing on autoemote as well as falling over and honking.
     /// </summary>
-    private void OnEmote(EntityUid uid, CluwneComponent component, ref EmoteEvent args)
+    private void OnEmote(Entity<CluwneComponent> ent, ref EmoteEvent args)
     {
         if (args.Handled)
             return;
-        args.Handled = _chat.TryPlayEmoteSound(uid, EmoteSounds, args.Emote);
 
-        if (_robustRandom.Prob(component.GiggleRandomChance))
+        if (!ent.Comp.RandomEmote)
+            return;
+
+        args.Handled = _chat.TryPlayEmoteSound(ent.Owner, EmoteSounds, args.Emote);
+
+        if (_robustRandom.Prob(ent.Comp.GiggleRandomChance))
         {
-            _audio.PlayPvs(component.SpawnSound, uid);
-            _chat.TrySendInGameICMessage(uid, "honks", InGameICChatType.Emote, ChatTransmitRange.Normal);
+            _audio.PlayPvs(ent.Comp.SpawnSound, ent.Owner);
+            _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString(ent.Comp.GiggleEmote), InGameICChatType.Emote, ChatTransmitRange.Normal);
         }
 
-        else if (_robustRandom.Prob(component.KnockChance))
+        else if (_robustRandom.Prob(ent.Comp.KnockChance))
         {
-            _audio.PlayPvs(component.KnockSound, uid);
-            _stunSystem.TryUpdateParalyzeDuration(uid, TimeSpan.FromSeconds(component.ParalyzeTime));
-            _chat.TrySendInGameICMessage(uid, "spasms", InGameICChatType.Emote, ChatTransmitRange.Normal);
+            _audio.PlayPvs(ent.Comp.KnockSound, ent.Owner);
+            _stunSystem.TryUpdateParalyzeDuration(ent.Owner, TimeSpan.FromSeconds(ent.Comp.ParalyzeTime));
+            _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString(ent.Comp.KnockEmote), InGameICChatType.Emote, ChatTransmitRange.Normal);
         }
     }
 
     /// <summary>
     /// Applies "Cluwnified" prefix
     /// </summary>
-    private void OnRefreshNameModifiers(Entity<CluwneComponent> entity, ref RefreshNameModifiersEvent args)
+    private void OnRefreshNameModifiers(Entity<CluwneComponent> ent, ref RefreshNameModifiersEvent args)
     {
-        args.AddModifier("cluwne-name-prefix");
+        args.AddModifier(ent.Comp.NamePrefix);
     }
 }
diff --git a/Content.Shared/Cluwne/CluwneComponent.cs b/Content.Shared/Cluwne/CluwneComponent.cs
index c9f96d030b..692a8ec4f9 100644
--- a/Content.Shared/Cluwne/CluwneComponent.cs
+++ b/Content.Shared/Cluwne/CluwneComponent.cs
@@ -1,6 +1,9 @@
 using Robust.Shared.Audio;
 using Content.Shared.Chat.Prototypes;
+using Content.Shared.Damage;
+using Content.Shared.Roles;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Cluwne;
@@ -12,22 +15,74 @@ public sealed partial class CluwneComponent : Component
     /// <summary>
     /// timings for giggles and knocks.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan DamageGiggleCooldown = TimeSpan.FromSeconds(2);
 
-    [ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    /// Amount of genetic damage dealt when they revert
+    /// </summary>
+    [DataField]
+    public DamageSpecifier RevertDamage = new()
+    {
+        DamageDict = new()
+        {
+            { "Genetic", 300.0 },
+        },
+    };
+
+    /// <summary>
+    /// Chance that the Cluwne will be knocked over and paralyzed.
+    /// </summary>
+    [DataField]
     public float KnockChance = 0.05f;
 
-    [ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    /// Chance that the Cluwne will randomly giggle
+    /// </summary>
+    [DataField]
     public float GiggleRandomChance = 0.1f;
 
-    [DataField("emoteId", customTypeSerializer: typeof(PrototypeIdSerializer<EmoteSoundsPrototype>))]
-    public string? EmoteSoundsId = "Cluwne";
+    /// <summary>
+    /// Enable random emoting?
+    /// </summary>
+    [DataField]
+    public bool RandomEmote = true;
+
+    /// <summary>
+    /// Emote sound collection that the Cluwne should use.
+    /// </summary>
+    [DataField("emoteId")]
+    public ProtoId<EmoteSoundsPrototype>? EmoteSoundsId = "Cluwne";
+
+    /// <summary>
+    /// Emote to use for the Cluwne Giggling
+    /// </summary>
+    [DataField]
+    public ProtoId<AutoEmotePrototype>? AutoEmoteId = "CluwneGiggle";
+
+    /// <summary>
+    /// Message to popup when the Cluwne is transformed
+    /// </summary>
+    [DataField]
+    public LocId TransformMessage = "cluwne-transform";
+
+    /// <summary>
+    /// Name prefix for the Cluwne.
+    /// Example "Urist McHuman" will be "Cluwned Urist McHuman"
+    /// </summary>
+    [DataField]
+    public LocId NamePrefix = "cluwne-name-prefix";
+
+    /// <summary>
+    /// Outfit ID that the cluwne will spawn with.
+    /// </summary>
+    [DataField]
+    public ProtoId<StartingGearPrototype> OutfitId = "CluwneGear";
 
     /// <summary>
     /// Amount of time cluwne is paralyzed for when falling over.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float ParalyzeTime = 2f;
 
     /// <summary>
@@ -36,6 +91,21 @@ public sealed partial class CluwneComponent : Component
     [DataField("spawnsound")]
     public SoundSpecifier SpawnSound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg");
 
-    [DataField("knocksound")]
+    /// <summary>
+    /// Emote to use for the cluwne giggling
+    /// </summary>
+    [DataField]
+    public LocId GiggleEmote = "cluwne-giggle-emote";
+
+    /// <summary>
+    /// Sound to play when the Cluwne is knocked over and paralyzed
+    /// </summary>
+    [DataField]
     public SoundSpecifier KnockSound = new SoundPathSpecifier("/Audio/Items/airhorn.ogg");
+
+    /// <summary>
+    /// Emote thats used when the cluwne getting knocked over
+    /// </summary>
+    [DataField]
+    public LocId KnockEmote = "cluwne-knock-emote";
 }
diff --git a/Resources/Locale/en-US/cluwne/cluwne.ftl b/Resources/Locale/en-US/cluwne/cluwne.ftl
index 0ffd3f32df..e469cbfbac 100644
--- a/Resources/Locale/en-US/cluwne/cluwne.ftl
+++ b/Resources/Locale/en-US/cluwne/cluwne.ftl
@@ -1,2 +1,4 @@
 cluwne-transform = {CAPITALIZE(THE($target))} turned into a cluwne!
 cluwne-name-prefix = cluwnified {$baseName}
+cluwne-knock-emote = spasms
+cluwne-giggle-emote = honks

From a058921b4db31fe7de6140e095362edbd7ed7312 Mon Sep 17 00:00:00 2001
From: opl- <opl-@users.noreply.github.com>
Date: Fri, 10 Oct 2025 22:21:51 +0200
Subject: [PATCH 132/216] Packed: Fix brig Megaseed vending machine is locked
 (#40821)

Co-authored-by: opl <4833621+opl@users.noreply.github.com>
---
 Resources/Maps/packed.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index 3f16dee262..9ad708002b 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -88827,6 +88827,8 @@ entities:
     - type: Transform
       pos: 43.5,-4.5
       parent: 2
+- proto: VendingMachineSeedsUnlocked
+  entities:
   - uid: 7681
     components:
     - type: Transform

From a9dcfcb9fb5d5b1667c5f10a03b53cd0e13f9d3e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 10 Oct 2025 20:34:15 +0000
Subject: [PATCH 133/216] Automatic changelog update

---
 Resources/Changelog/Maps.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 3eb8884988..0c8783e4a5 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -771,4 +771,11 @@
   id: 93
   time: '2025-10-10T01:11:33.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40794
+- author: opl
+  changes:
+  - message: On Packed, prisoners can now use the Megaseed in brig.
+    type: Fix
+  id: 94
+  time: '2025-10-10T20:33:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40821
 Order: 1

From 74ebe585fa4ab51bca3ea5fb28495e1055030fd9 Mon Sep 17 00:00:00 2001
From: opl- <opl-@users.noreply.github.com>
Date: Fri, 10 Oct 2025 22:25:15 +0200
Subject: [PATCH 134/216] Packed: Add missing station beacons (#40817)

On Packed: Add missing station beacons

Co-authored-by: opl <4833621+opl@users.noreply.github.com>
---
 Resources/Maps/packed.yml | 98 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index 9ad708002b..d15f3f7aab 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -42804,7 +42804,21 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.493689,4.5440345
       parent: 2
+- proto: DefaultStationBeaconAI
+  entities:
+  - uid: 15919
+    components:
+    - type: Transform
+      pos: 73.5,23.5
+      parent: 2
 - proto: DefaultStationBeaconAICore
+  entities:
+  - uid: 15916
+    components:
+    - type: Transform
+      pos: 95.5,30.5
+      parent: 2
+- proto: DefaultStationBeaconAIUpload
   entities:
   - uid: 14515
     components:
@@ -42818,6 +42832,13 @@ entities:
     - type: Transform
       pos: 31.5,-40.5
       parent: 2
+- proto: DefaultStationBeaconAnchor
+  entities:
+  - uid: 15922
+    components:
+    - type: Transform
+      pos: 6.5,-21.5
+      parent: 2
 - proto: DefaultStationBeaconAnomalyGenerator
   entities:
   - uid: 8139
@@ -42825,6 +42846,13 @@ entities:
     - type: Transform
       pos: 68.5,15.5
       parent: 2
+- proto: DefaultStationBeaconArmory
+  entities:
+  - uid: 15787
+    components:
+    - type: Transform
+      pos: 41.5,34.5
+      parent: 2
 - proto: DefaultStationBeaconArrivals
   entities:
   - uid: 14028
@@ -42951,6 +42979,20 @@ entities:
     - type: Transform
       pos: 0.5,-30.5
       parent: 2
+- proto: DefaultStationBeaconDorms
+  entities:
+  - uid: 15912
+    components:
+    - type: Transform
+      pos: 15.5,14.5
+      parent: 2
+- proto: DefaultStationBeaconEngineering
+  entities:
+  - uid: 15913
+    components:
+    - type: Transform
+      pos: 18.5,-25.5
+      parent: 2
 - proto: DefaultStationBeaconEscapePodE
   entities:
   - uid: 2949
@@ -42986,6 +43028,13 @@ entities:
     - type: Transform
       pos: 9.5,-6.5
       parent: 2
+- proto: DefaultStationBeaconGravGen
+  entities:
+  - uid: 15910
+    components:
+    - type: Transform
+      pos: 14.5,38.5
+      parent: 2
 - proto: DefaultStationBeaconHOPOffice
   entities:
   - uid: 13131
@@ -42993,6 +43042,13 @@ entities:
     - type: Transform
       pos: 17.5,-4.5
       parent: 2
+- proto: DefaultStationBeaconHOSRoom
+  entities:
+  - uid: 15907
+    components:
+    - type: Transform
+      pos: 48.5,39.5
+      parent: 2
 - proto: DefaultStationBeaconJanitorsCloset
   entities:
   - uid: 13133
@@ -43021,6 +43077,13 @@ entities:
     - type: Transform
       pos: 10.5,5.5
       parent: 2
+- proto: DefaultStationBeaconMedical
+  entities:
+  - uid: 15914
+    components:
+    - type: Transform
+      pos: 51.5,3.5
+      parent: 2
 - proto: DefaultStationBeaconMorgue
   entities:
   - uid: 13137
@@ -43028,6 +43091,13 @@ entities:
     - type: Transform
       pos: 70.5,-3.5
       parent: 2
+- proto: DefaultStationBeaconPermaBrig
+  entities:
+  - uid: 15911
+    components:
+    - type: Transform
+      pos: 34.5,20.5
+      parent: 2
 - proto: DefaultStationBeaconPowerBank
   entities:
   - uid: 13139
@@ -43070,6 +43140,20 @@ entities:
     - type: Transform
       pos: 7.5,33.5
       parent: 2
+- proto: DefaultStationBeaconSecurity
+  entities:
+  - uid: 15908
+    components:
+    - type: Transform
+      pos: 33.5,29.5
+      parent: 2
+- proto: DefaultStationBeaconSecurityCheckpoint
+  entities:
+  - uid: 15915
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 2
 - proto: DefaultStationBeaconServerRoom
   entities:
   - uid: 13172
@@ -43098,6 +43182,13 @@ entities:
     - type: Transform
       pos: 3.5,-35.5
       parent: 2
+- proto: DefaultStationBeaconSurgery
+  entities:
+  - uid: 15920
+    components:
+    - type: Transform
+      pos: 65.5,-5.5
+      parent: 2
 - proto: DefaultStationBeaconTechVault
   entities:
   - uid: 13175
@@ -43133,6 +43224,13 @@ entities:
     - type: Transform
       pos: 18.5,41.5
       parent: 2
+- proto: DefaultStationBeaconWardensOffice
+  entities:
+  - uid: 15909
+    components:
+    - type: Transform
+      pos: 42.5,25.5
+      parent: 2
 - proto: Defibrillator
   entities:
   - uid: 11416

From a384640eea9ecc160f8700b896b03739c9070712 Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Fri, 10 Oct 2025 16:49:21 -0400
Subject: [PATCH 135/216] Ninja Bomb Blacklisting: Map Updates (#40727)

Update Maps
---
 Resources/Maps/exo.yml     |  13 -----
 Resources/Maps/saltern.yml | 107 -------------------------------------
 2 files changed, 120 deletions(-)

diff --git a/Resources/Maps/exo.yml b/Resources/Maps/exo.yml
index 58d864740a..b357069817 100644
--- a/Resources/Maps/exo.yml
+++ b/Resources/Maps/exo.yml
@@ -47101,7 +47101,6 @@ entities:
     - type: Transform
       pos: -20.5,-25.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconAtmospherics
   entities:
   - uid: 16227
@@ -47130,7 +47129,6 @@ entities:
     - type: Transform
       pos: -48.5,-45.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconBrigMed
   entities:
   - uid: 18105
@@ -47145,7 +47143,6 @@ entities:
     - type: Transform
       pos: -42.5,-54.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconCargoBay
   entities:
   - uid: 16244
@@ -47153,7 +47150,6 @@ entities:
     - type: Transform
       pos: 24.5,-97.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconCargoReception
   entities:
   - uid: 16243
@@ -47182,7 +47178,6 @@ entities:
     - type: Transform
       pos: 19.5,-72.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconCMORoom
   entities:
   - uid: 16267
@@ -47190,7 +47185,6 @@ entities:
     - type: Transform
       pos: 11.5,-16.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconCryosleep
   entities:
   - uid: 16223
@@ -47277,7 +47271,6 @@ entities:
     - type: Transform
       pos: 14.5,-59.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconHOSRoom
   entities:
   - uid: 18071
@@ -47292,7 +47285,6 @@ entities:
     - type: Transform
       pos: -8.5,-51.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconKitchen
   entities:
   - uid: 16228
@@ -47321,7 +47313,6 @@ entities:
     - type: Transform
       pos: 14.5,-29.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconMorgue
   entities:
   - uid: 8744
@@ -47336,7 +47327,6 @@ entities:
     - type: Transform
       pos: 46.5,-17.5
       parent: 2
-    - type: BombingTarget
     - type: NavMapBeacon
       defaultText: Genpop
 - proto: DefaultStationBeaconPowerBank
@@ -47353,7 +47343,6 @@ entities:
     - type: Transform
       pos: 9.5,-88.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconRDRoom
   entities:
   - uid: 5092
@@ -47382,7 +47371,6 @@ entities:
     - type: Transform
       pos: -6.5,-21.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconSecurity
   entities:
   - uid: 18001
@@ -47411,7 +47399,6 @@ entities:
     - type: Transform
       pos: -23.5,-71.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconSolarsE
   entities:
   - uid: 8642
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 58400ac0fe..1e33a9d347 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -69413,113 +69413,6 @@ entities:
       parent: 31
     - type: WarpPoint
       location: library
-- proto: WarpPointBombing
-  entities:
-  - uid: 934
-    components:
-    - type: Transform
-      pos: -36.5,14.5
-      parent: 31
-    - type: WarpPoint
-      location: chapel
-  - uid: 2142
-    components:
-    - type: Transform
-      pos: 8.5,19.5
-      parent: 31
-    - type: WarpPoint
-      location: hop's office
-  - uid: 4910
-    components:
-    - type: Transform
-      pos: 9.5,-9.5
-      parent: 31
-    - type: WarpPoint
-      location: medbay
-  - uid: 7261
-    components:
-    - type: Transform
-      pos: 16.5,-0.5
-      parent: 31
-    - type: WarpPoint
-      location: chemistry
-  - uid: 7262
-    components:
-    - type: Transform
-      pos: 13.5,-15.5
-      parent: 31
-    - type: WarpPoint
-      location: morgue
-  - uid: 9712
-    components:
-    - type: Transform
-      pos: -12.5,19.5
-      parent: 31
-    - type: WarpPoint
-      location: armory
-  - uid: 10539
-    components:
-    - type: Transform
-      pos: -9.5,-20.5
-      parent: 31
-    - type: WarpPoint
-      location: science
-  - uid: 11267
-    components:
-    - type: Transform
-      pos: 8.5,25.5
-      parent: 31
-    - type: WarpPoint
-      location: captain's quarters
-  - uid: 11308
-    components:
-    - type: Transform
-      pos: 3.5,30.5
-      parent: 31
-    - type: WarpPoint
-      location: bridge
-  - uid: 11309
-    components:
-    - type: Transform
-      pos: -1.5,17.5
-      parent: 31
-    - type: WarpPoint
-      location: vault
-  - uid: 11310
-    components:
-    - type: Transform
-      pos: 8.5,9.5
-      parent: 31
-    - type: WarpPoint
-      location: eva room
-  - uid: 11311
-    components:
-    - type: Transform
-      pos: 58.5,2.5
-      parent: 31
-    - type: WarpPoint
-      location: particle accelerator
-  - uid: 11313
-    components:
-    - type: Transform
-      pos: 34.5,14.5
-      parent: 31
-    - type: WarpPoint
-      location: atmospherics
-  - uid: 11322
-    components:
-    - type: Transform
-      pos: 27.5,18.5
-      parent: 31
-    - type: WarpPoint
-      location: salvage
-  - uid: 11359
-    components:
-    - type: Transform
-      pos: 50.5,-5.5
-      parent: 31
-    - type: WarpPoint
-      location: telecomms
 - proto: WaterCooler
   entities:
   - uid: 1156

From 52139b5cc5504e2e96f239993f2dd425094ded21 Mon Sep 17 00:00:00 2001
From: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Date: Sat, 11 Oct 2025 00:16:48 +0300
Subject: [PATCH 136/216] Fix glassbox prototypes (#40667)

* Fix glassbox prototypes and its construction ghost exception

* Oops
---
 .../Entities/Structures/Storage/glass_box.yml | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
index 0cc93a4fcf..f1ce706847 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
@@ -1,8 +1,11 @@
 - type: entity
-  parent: [BaseStructureDynamic, BaseItemCabinetGlass]
+  parent: BaseStructureDynamic
   id: BaseGlassBox
   abstract: true
   components:
+  - type: Sprite
+    noRot: true
+    sprite: Structures/Storage/glassbox.rsi
   - type: Transform
     anchored: true
   - type: Physics
@@ -24,20 +27,18 @@
     delay: 4
 
 - type: entity
+  parent: [BaseGlassBox, BaseItemCabinetGlass]
   id: GlassBox
   name: glass box
   description: A sturdy showcase for an expensive exhibit.
-  parent: BaseGlassBox
   abstract: true # TODO: Temporarily abstract. Remove it after item scaling in cabinets is implemented.
   components:
   - type: Sprite
-    noRot: true
-    sprite: Structures/Storage/glassbox.rsi
     layers:
     - state: base
     - state: caplaser # TODO: Remove it after item scaling in cabinets is implemented.
       map: ["enum.ItemCabinetVisuals.Layer"]
-      visible: true
+      visible: false
     - state: glass
       map: ["enum.OpenableVisuals.Layer"]
     - state: locked
@@ -116,8 +117,8 @@
         acts: [ "Destruction" ]
 
 - type: entity
-  id: GlassBoxLaser
   parent: GlassBox
+  id: GlassBoxLaser
   suffix: AntiqueLaser
   components:
   - type: AccessReader
@@ -135,8 +136,8 @@
         ejectSound: /Audio/Machines/machine_switch.ogg
 
 - type: entity
-  id: GlassBoxLaserOpen
   parent: GlassBoxLaser
+  id: GlassBoxLaserOpen
   suffix: AntiqueLaser, Open
   components:
   - type: Openable
@@ -145,8 +146,8 @@
     locked: false
 
 - type: entity
-  id: GlassBoxLaserFilled
   parent: GlassBoxLaser
+  id: GlassBoxLaserFilled
   suffix: AntiqueLaser, Filled
   components:
   - type: ContainerFill
@@ -160,15 +161,13 @@
   suffix: AntiqueLaser, Filled, Open
 
 - type: entity
+  parent: BaseGlassBox
   id: GlassBoxFrame
   name: glass box frame
   description: A glassless sturdy showcase for an expensive exhibit.
-  parent: BaseGlassBox
   suffix: Frame
   components:
   - type: Sprite
-    noRot: true
-    sprite: Structures/Storage/glassbox.rsi
     layers:
     - state: base
   - type: Construction
@@ -204,14 +203,13 @@
         acts: ["Destruction"]
 
 - type: entity
+  parent: GlassBoxFrame
   id: GlassBoxBroken
   name: broken glass box
   description: A broken showcase for a stolen expensive exhibit.
-  parent: GlassBoxFrame
   suffix: Broken
   components:
   - type: Sprite
-    sprite: Structures/Storage/glassbox.rsi
     layers:
     - state: base
     - state: glass-broken

From ecc0aaaa9fe22d8e1cf9d38748c8f8373540f1bc Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Fri, 10 Oct 2025 17:16:50 -0400
Subject: [PATCH 137/216] Ninja Bomb Blacklisting (#40726)

* Ninja Bombing moved to blacklist

* Added blocker to "Solars"

Solars is too generic for a named bombing target.

* Change to AllEntityQuery

More clear intent

* Update migration.yml

Add migration to 'null' for removed WarpPointBombing entity

* Update NinjaConditionsSystem.cs

Undo some tidying

* Changed to tag

Ninja blocking component is now a tag instead of a new component

* Update NinjaConditionsSystem.cs

detidying

* Update NinjaConditionsSystem.cs

Change to efficient enumerator

* Move blacklist to component

Moved blacklist to spidercharge component

* Update migration.yml

fixed component reference

* Update migration.yml

Fixes Saltern. Exo is more complicated.

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../SpiderChargeConditionComponent.cs         |  8 +++++++
 .../Systems/NinjaConditionsSystem.cs          | 12 +++++++----
 .../Components/BombingTargetComponent.cs      |  7 -------
 .../Entities/Markers/warp_point.yml           | 21 -------------------
 .../Objects/Devices/station_beacon.yml        |  9 ++++++++
 Resources/Prototypes/Objectives/ninja.yml     |  4 ++++
 Resources/Prototypes/tags.yml                 |  2 ++
 Resources/migration.yml                       |  4 +++-
 8 files changed, 34 insertions(+), 33 deletions(-)
 delete mode 100644 Content.Shared/Ninja/Components/BombingTargetComponent.cs

diff --git a/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs b/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs
index 9983b35969..d6309ccdd3 100644
--- a/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs
+++ b/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs
@@ -1,5 +1,6 @@
 using Content.Server.Ninja.Systems;
 using Content.Server.Objectives.Systems;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Objectives.Components;
 
@@ -14,4 +15,11 @@ public sealed partial class SpiderChargeConditionComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? Target;
+
+    /// <summary>
+    /// Tags that should be used to exclude Warp Points
+    /// from the list of valid bombing targets
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
 }
diff --git a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
index db78816503..4c19a64ab1 100644
--- a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
+++ b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.Objectives.Components;
 using Content.Shared.Objectives.Components;
-using Content.Shared.Ninja.Components;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Components;
 using Content.Shared.Warps;
+using Content.Shared.Whitelist;
 using Robust.Shared.Random;
 
 namespace Content.Server.Objectives.Systems;
@@ -14,6 +14,7 @@ namespace Content.Server.Objectives.Systems;
 /// </summary>
 public sealed class NinjaConditionsSystem : EntitySystem
 {
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly NumberObjectiveSystem _number = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
@@ -53,10 +54,13 @@ public sealed class NinjaConditionsSystem : EntitySystem
 
         // choose spider charge detonation point
         var warps = new List<EntityUid>();
-        var query = EntityQueryEnumerator<BombingTargetComponent, WarpPointComponent>();
-        while (query.MoveNext(out var warpUid, out _, out var warp))
+        var allEnts = EntityQueryEnumerator<WarpPointComponent>();
+        var bombingBlacklist = comp.Blacklist;
+
+        while (allEnts.MoveNext(out var warpUid, out var warp))
         {
-            if (warp.Location != null)
+            if (_whitelist.IsBlacklistFail(bombingBlacklist, warpUid)
+                && !string.IsNullOrWhiteSpace(warp.Location))
             {
                 warps.Add(warpUid);
             }
diff --git a/Content.Shared/Ninja/Components/BombingTargetComponent.cs b/Content.Shared/Ninja/Components/BombingTargetComponent.cs
deleted file mode 100644
index c429eb6880..0000000000
--- a/Content.Shared/Ninja/Components/BombingTargetComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.Ninja.Components;
-
-/// <summary>
-/// Makes this warp point a valid bombing target for ninja's spider charge.
-/// </summary>
-[RegisterComponent]
-public sealed partial class BombingTargetComponent : Component;
diff --git a/Resources/Prototypes/Entities/Markers/warp_point.yml b/Resources/Prototypes/Entities/Markers/warp_point.yml
index 675938c09b..4616d1535a 100644
--- a/Resources/Prototypes/Entities/Markers/warp_point.yml
+++ b/Resources/Prototypes/Entities/Markers/warp_point.yml
@@ -31,24 +31,3 @@
       - GhostOnlyWarp
   - type: Sprite
     state: pink
-
-- type: entity
-  parent: WarpPoint
-  id: WarpPointBombing
-  name: warp point
-  suffix: ninja bombing target
-  components:
-  - type: BombingTarget
-  - type: Tag
-    tags:
-    - GhostOnlyWarp
-  - type: WarpPoint
-    location: bombing target
-    blacklist:
-      tags:
-      - GhostOnlyWarp
-  - type: Sprite
-    layers:
-    - state: pink
-    - sprite: Objects/Weapons/Bombs/spidercharge.rsi
-      state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index 870e66654f..ff6d5a6a4a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -455,6 +455,9 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-solars
+  - type: Tag
+    tags:
+    - NinjaBombingTargetBlocker
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -673,6 +676,9 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-arrivals
+  - type: Tag
+    tags:
+    - NinjaBombingTargetBlocker
 
 - type: entity
   parent: DefaultStationBeacon
@@ -761,6 +767,9 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-cryosleep
+  - type: Tag
+    tags:
+    - NinjaBombingTargetBlocker
 
 - type: entity
   parent: DefaultStationBeacon
diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml
index 76d74876b0..f015dd8f72 100644
--- a/Resources/Prototypes/Objectives/ninja.yml
+++ b/Resources/Prototypes/Objectives/ninja.yml
@@ -51,6 +51,10 @@
       sprite: Objects/Weapons/Bombs/spidercharge.rsi
       state: icon
   - type: SpiderChargeCondition
+    blacklist:
+      tags:
+      - GhostOnlyWarp
+      - NinjaBombingTargetBlocker
 
 - type: entity
   parent: [BaseNinjaObjective, BaseSurviveObjective]
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 4f6c018f23..08539f50cf 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1024,6 +1024,8 @@
   id: Mushroom
 
 ## N ##
+- type: Tag
+  id: NinjaBombingTargetBlocker # Ninjas will not target this warp point
 
 - type: Tag
   id: NoBlockAnchoring
diff --git a/Resources/migration.yml b/Resources/migration.yml
index d05795def4..bbf331d5b6 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -726,5 +726,7 @@ PrefilledSyringe: Syringe
 BibleTanakh: null
 BibleSatanic: null
 
-# 2025-10-8
+
+# 2025-10-08
 ClothingBeltAssault: ClothingBeltMilitaryWebbing
+WarpPointBombing: null

From e35624d1f1a60849776fb2b8be126dbabcc74ecc Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 10 Oct 2025 21:28:45 +0000
Subject: [PATCH 138/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index bc5e811a0c..1eedc0f152 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: K-Dynamic
-  changes:
-  - message: Shutters and blast doors now appear welded when welded.
-    type: Fix
-  id: 8562
-  time: '2025-05-25T15:57:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37807
 - author: Stop-Signs
   changes:
   - message: Meals now better reflect the amount of ingredients put into them.
@@ -3948,3 +3941,10 @@
   id: 9064
   time: '2025-10-10T12:41:57.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40343
+- author: kontakt
+  changes:
+  - message: Ninjas can now have a bombing target at any warp point.
+    type: Tweak
+  id: 9065
+  time: '2025-10-10T21:27:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40726

From 9ae4068432a432e34a23edc58a68a3dceaee30e2 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Fri, 10 Oct 2025 23:43:18 +0200
Subject: [PATCH 139/216] add event to dna scrambling (#39862)

add event
---
 .../Trigger/Systems/DnaScrambleOnTriggerSystem.cs    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
index db27bd7f74..af5a73ffb6 100644
--- a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
@@ -58,5 +58,17 @@ public sealed class DnaScrambleOnTriggerSystem : EntitySystem
 
         // Can't use PopupClient or PopupPredicted because the trigger might be unpredicted.
         _popup.PopupEntity(Loc.GetString("scramble-on-trigger-popup"), target.Value, target.Value);
+
+        var ev = new DnaScrambledEvent(target.Value);
+        RaiseLocalEvent(target.Value, ref ev, true);
     }
 }
+
+/// <summary>
+/// Raised after an entity has been DNA Scrambled.
+/// Useful for forks that need to run their own updates here.
+/// </summary>
+/// <param name="flag">The entity that had its DNA scrambled.</param>
+
+[ByRefEvent]
+public record struct DnaScrambledEvent(EntityUid Target);

From dca80238f0df3b7fb7e50870e84505ff0e1d8989 Mon Sep 17 00:00:00 2001
From: Pok <113675512+Pok27@users.noreply.github.com>
Date: Sat, 11 Oct 2025 00:57:38 +0300
Subject: [PATCH 140/216] Attempt to fix all unlocalized lines (#40284)

* missing-localization

* cmd

* fix: fixed patron page throwing exception due to unexpected patron tier in yaml

* Revert "fix: fixed patron page throwing exception due to unexpected patron tier in yaml"

This reverts commit 28458c78b1f2eed30fda898ec26059b27f1766f1.

* review and update

* no cmd

* fix

* fix 99

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
---
 .../UI/BanPanel/BanPanel.xaml.cs              |  4 +-
 .../Administration/UI/Logs/AdminLogsEui.cs    |  2 +-
 Content.Client/Credits/CreditsWindow.xaml.cs  |  4 +-
 .../CriminalRecordsConsoleWindow.xaml         |  2 +-
 .../HumanoidMarkingModifierWindow.xaml        |  6 +-
 .../HumanoidMarkingModifierWindow.xaml.cs     |  6 +-
 .../CrewMonitoringNavMapControl.cs            |  2 +-
 .../CrewMonitoring/CrewMonitoringWindow.xaml  | 12 +--
 .../CrewMonitoringWindow.xaml.cs              |  2 +-
 Content.Client/NPC/NPCWindow.xaml             | 18 ++--
 .../Pinpointer/UI/StationMapWindow.xaml       |  2 +-
 Content.Client/UserInterface/StatValuesEui.cs |  2 +-
 .../Systems/Bwoink/AHelpUIController.cs       |  2 +-
 .../Controls/Roles/MakeGhostRoleWindow.xaml   | 22 ++---
 .../Roles/MakeGhostRoleWindow.xaml.cs         |  8 +-
 .../Systems/Storage/Controls/StorageWindow.cs |  2 +-
 .../Systems/AdminVerbSystem.Tools.cs          | 82 +++++++++----------
 .../en-US/administration/admin-verbs.ftl      | 45 ++++++++++
 .../Locale/en-US/administration/bwoink.ftl    |  1 +
 .../en-US/components/storage-component.ftl    |  1 +
 .../Locale/en-US/credits/credits-window.ftl   |  2 +
 .../Locale/en-US/ghost/make-ghost-gui.ftl     | 21 +++++
 Resources/Locale/en-US/info/ban.ftl           |  1 +
 .../components/crew-monitoring-component.ftl  | 23 ++----
 .../en-US/navmap-beacons/station_map.ftl      |  1 +
 Resources/Locale/en-US/npc/npc-debug.ftl      | 11 +++
 .../en-US/preferences/ui/markings-picker.ftl  |  6 ++
 Resources/Locale/en-US/ui/navmap.ftl          |  1 +
 Resources/Locale/en-US/ui/stat-values.ftl     |  1 +
 29 files changed, 188 insertions(+), 104 deletions(-)
 create mode 100644 Resources/Locale/en-US/ghost/make-ghost-gui.ftl
 create mode 100644 Resources/Locale/en-US/npc/npc-debug.ftl
 create mode 100644 Resources/Locale/en-US/ui/stat-values.ftl

diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
index d20c741673..7566942506 100644
--- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
+++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
@@ -226,7 +226,7 @@ public sealed partial class BanPanel : DefaultWindow
         var roleGroupCheckbox = new Button
         {
             Name = $"{groupName}GroupCheckbox",
-            Text = "Ban all",
+            Text = Loc.GetString("role-bans-ban-group"),
             Margin = new Thickness(0, 0, 5, 0),
             ToggleMode = true,
         };
@@ -391,7 +391,7 @@ public sealed partial class BanPanel : DefaultWindow
         TimeLine.Text = args.Text;
         if (!double.TryParse(args.Text, out var result))
         {
-            ExpiresLabel.Text = "err";
+            ExpiresLabel.Text = Loc.GetString("ban-panel-expiry-error");
             ErrorLevel |= ErrorLevelEnum.Minutes;
             TimeLine.ModulateSelfOverride = Color.Red;
             UpdateSubmitEnabled();
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
index 1544b827ae..28aca23f75 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
@@ -166,7 +166,7 @@ public sealed class AdminLogsEui : BaseEui
         ClydeWindow = _clyde.CreateWindow(new WindowCreateParameters
         {
             Maximized = false,
-            Title = "Admin Logs",
+            Title = Loc.GetString("admin-logs-title"),
             Monitor = monitor,
             Width = 1100,
             Height = 400
diff --git a/Content.Client/Credits/CreditsWindow.xaml.cs b/Content.Client/Credits/CreditsWindow.xaml.cs
index 050d801170..6035bcc2bd 100644
--- a/Content.Client/Credits/CreditsWindow.xaml.cs
+++ b/Content.Client/Credits/CreditsWindow.xaml.cs
@@ -100,11 +100,11 @@ public sealed partial class CreditsWindow : DefaultWindow
 
         var container = new BoxContainer { Orientation = LayoutOrientation.Horizontal };
 
-        var previousPageButton = new Button { Text = "Previous Page" };
+        var previousPageButton = new Button { Text = Loc.GetString("credits-window-previous-page-button") };
         previousPageButton.OnPressed +=
             _ => PopulateAttributions(attributionsContainer, count - AttributionsSourcesPerPage);
 
-        var nextPageButton = new Button { Text = "Next Page" };
+        var nextPageButton = new Button { Text = Loc.GetString("credits-window-next-page-button") };
         nextPageButton.OnPressed +=
             _ => PopulateAttributions(attributionsContainer, count + AttributionsSourcesPerPage);
 
diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
index 179304a978..f88fa07f5a 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
@@ -58,7 +58,7 @@
                            StyleClasses="LabelBig" />
                     <BoxContainer Orientation="Horizontal"
                                   Margin="0 0 0 5">
-                        <Label Text="{Loc 'crew-monitoring-user-interface-job'}"
+                        <Label Text="{Loc 'crew-monitoring-ui-job-label'}"
                                FontColorOverride="DarkGray" />
                         <TextureRect Name="PersonJobIcon"
                                      TextureScale="2 2"
diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
index 78e65db2a3..1f543cf402 100644
--- a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
+++ b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
@@ -4,11 +4,11 @@
         <BoxContainer Orientation="Vertical" HorizontalExpand="True">
             <humanoid:MarkingPicker Name="MarkingPickerWidget" />
             <BoxContainer>
-                <CheckBox Name="MarkingForced" Text="Force" Pressed="True" />
-                <CheckBox Name="MarkingIgnoreSpecies" Text="Ignore Species" Pressed="True" />
+                <CheckBox Name="MarkingForced" Text="{Loc humanoid-marking-modifier-force}" Pressed="True" />
+                <CheckBox Name="MarkingIgnoreSpecies" Text="{Loc humanoid-marking-modifier-ignore-species}" Pressed="True" />
             </BoxContainer>
             <Collapsible HorizontalExpand="True">
-                <CollapsibleHeading Title="Base layers" />
+                <CollapsibleHeading Title="{Loc humanoid-marking-modifier-base-layers}" />
                 <CollapsibleBody HorizontalExpand="True">
                     <BoxContainer Name="BaseLayersContainer" Orientation="Vertical" HorizontalExpand="True" />
                 </CollapsibleBody>
diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
index 4cde587c58..4d9d6a90ba 100644
--- a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
+++ b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
@@ -118,7 +118,7 @@ public sealed partial class HumanoidMarkingModifierWindow : DefaultWindow
             });
             _enable = new CheckBox
             {
-                Text = "Enable",
+                Text = Loc.GetString("humanoid-marking-modifier-enable"),
                 HorizontalAlignment = HAlignment.Right
             };
 
@@ -134,8 +134,8 @@ public sealed partial class HumanoidMarkingModifierWindow : DefaultWindow
                 OnStateChanged!();
             };
 
-            var lineEditBox = new BoxContainer();
-            lineEditBox.AddChild(new Label { Text = "Prototype id: "});
+            var lineEditBox = new BoxContainer { SeparationOverride = 4 };
+            lineEditBox.AddChild(new Label { Text = Loc.GetString("humanoid-marking-modifier-prototype-id") });
 
             // TODO: This line edit should really be an options / dropdown selector, not text.
             _lineEdit = new() { MinWidth = 200 };
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
index 651c76e61f..1a68099de0 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
@@ -62,7 +62,7 @@ public sealed partial class CrewMonitoringNavMapControl : NavMapControl
                 continue;
 
             if (!LocalizedNames.TryGetValue(netEntity, out var name))
-                name = "Unknown";
+                name = Loc.GetString("navmap-unknown-entity");
 
             var message = name + "\n" + Loc.GetString("navmap-location",
                 ("x", MathF.Round(blip.Coordinates.X)),
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
index dd40749d33..86e1ce689a 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
@@ -1,7 +1,7 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                xmlns:ui="clr-namespace:Content.Client.Medical.CrewMonitoring"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-               Title="{Loc 'crew-monitoring-user-interface-title'}"
+               Title="{Loc crew-monitoring-ui-title}"
                Resizable="False"
                SetSize="1210 700"
                MinSize="1210 700">
@@ -11,12 +11,12 @@
             <BoxContainer Orientation="Vertical" Margin="0 0 10 0">
                 <controls:StripeBack>
                     <PanelContainer>
-                        <Label Name="StationName" Text="Unknown station" Align="Center" Margin="0 5 0 3"/>
+                        <Label Name="StationName" Text="{Loc crew-monitoring-ui-no-station-label}" Align="Center" Margin="0 5 0 3"/>
                     </PanelContainer>
                 </controls:StripeBack>
 
                 <LineEdit Name="SearchLineEdit" HorizontalExpand="True"
-                          PlaceHolder="{Loc crew-monitor-filter-line-placeholder}" />
+                          PlaceHolder="{Loc crew-monitoring-ui-filter-line-placeholder}" />
 
                 <ScrollContainer Name="SensorScroller"
                                  VerticalExpand="True"
@@ -29,7 +29,7 @@
                         <!-- Table rows are filled by code -->
                     </BoxContainer>
                     <Label  Name="NoServerLabel"
-                            Text="{Loc 'crew-monitoring-user-interface-no-server'}"
+                            Text="{Loc crew-monitoring-ui-no-server-label}"
                             StyleClasses="LabelHeading"
                             FontColorOverride="Red"
                             HorizontalAlignment="Center"
@@ -42,8 +42,8 @@
         <BoxContainer Orientation="Vertical">
             <PanelContainer StyleClasses="LowDivider" />
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
-                <Label Text="{Loc 'crew-monitoring-user-interface-flavor-left'}" StyleClasses="WindowFooterText" />
-                <Label Text="{Loc 'crew-monitoring-user-interface-flavor-right'}" StyleClasses="WindowFooterText"
+                <Label Text="{Loc crew-monitoring-ui-flavor-left-label}" StyleClasses="WindowFooterText" />
+                <Label Text="{Loc crew-monitoring-ui-flavor-right-label}" StyleClasses="WindowFooterText"
                         HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
                 <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered"
                         VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
index b3b3508169..7b69d08267 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -155,7 +155,7 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
                 HorizontalExpand = true,
             };
 
-            deparmentLabel.SetMessage(Loc.GetString("crew-monitoring-user-interface-no-department"));
+            deparmentLabel.SetMessage(Loc.GetString("crew-monitoring-ui-no-department-label"));
             deparmentLabel.StyleClasses.Add(StyleNano.StyleClassTooltipActionDescription);
 
             SensorsTable.AddChild(deparmentLabel);
diff --git a/Content.Client/NPC/NPCWindow.xaml b/Content.Client/NPC/NPCWindow.xaml
index 68e58eca46..bff05bc093 100644
--- a/Content.Client/NPC/NPCWindow.xaml
+++ b/Content.Client/NPC/NPCWindow.xaml
@@ -1,24 +1,24 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-            Title="NPC debug"
+            Title="{Loc npc-debug-overlay-window-title}"
             MinSize="200 200">
     <BoxContainer Name="Options" Orientation="Vertical" Margin="8 8">
         <controls:StripeBack>
-            <Label Text="NPC" HorizontalAlignment="Center"/>
+            <Label Text="{Loc npc-debug-overlay-window-section-npc-label}" HorizontalAlignment="Center"/>
         </controls:StripeBack>
         <BoxContainer Name="NPCBox" Orientation="Vertical">
-            <CheckBox Name="NPCThonk" Text="Thonk"/>
+            <CheckBox Name="NPCThonk" Text="{Loc npc-debug-overlay-window-show-htn-tree-checkbox}"/>
         </BoxContainer>
         <controls:StripeBack>
-            <Label Text="Pathfinder" HorizontalAlignment="Center"/>
+            <Label Text="{Loc npc-debug-overlay-window-section-pathfinder-label}" HorizontalAlignment="Center"/>
         </controls:StripeBack>
         <BoxContainer Name="PathfinderBox" Orientation="Vertical">
-            <CheckBox Name="PathCrumbs" Text="Breadcrumbs"/>
-            <CheckBox Name="PathPolys" Text="Polygons"/>
-            <CheckBox Name="PathNeighbors" Text="Neighbors"/>
-            <CheckBox Name="PathRouteCosts" Text="Route costs"/>
-            <CheckBox Name="PathRoutes" Text="Routes"/>
+            <CheckBox Name="PathCrumbs" Text="{Loc npc-debug-overlay-window-path-breadcrumbs-checkbox}"/>
+            <CheckBox Name="PathPolys" Text="{Loc npc-debug-overlay-window-path-polygons-checkbox}"/>
+            <CheckBox Name="PathNeighbors" Text="{Loc npc-debug-overlay-window-path-neighbors-checkbox}"/>
+            <CheckBox Name="PathRouteCosts" Text="{Loc npc-debug-overlay-window-path-route-costs-checkbox}"/>
+            <CheckBox Name="PathRoutes" Text="{Loc npc-debug-overlay-window-path-routes-checkbox}"/>
         </BoxContainer>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/Pinpointer/UI/StationMapWindow.xaml b/Content.Client/Pinpointer/UI/StationMapWindow.xaml
index c79fc8f9e7..cecd7e8479 100644
--- a/Content.Client/Pinpointer/UI/StationMapWindow.xaml
+++ b/Content.Client/Pinpointer/UI/StationMapWindow.xaml
@@ -9,7 +9,7 @@
         <!-- Station name -->
         <controls:StripeBack>
             <PanelContainer>
-                <Label Name="StationName" Text="Unknown station" StyleClasses="LabelBig" Align="Center"/>
+                <Label Name="StationName" Text="{Loc 'station-map-unknown-station'}" StyleClasses="LabelBig" Align="Center"/>
             </PanelContainer>
         </controls:StripeBack>
 
diff --git a/Content.Client/UserInterface/StatValuesEui.cs b/Content.Client/UserInterface/StatValuesEui.cs
index 33035940b5..0e714817b2 100644
--- a/Content.Client/UserInterface/StatValuesEui.cs
+++ b/Content.Client/UserInterface/StatValuesEui.cs
@@ -11,7 +11,7 @@ public sealed class StatValuesEui : BaseEui
     public StatValuesEui()
     {
         _window = new StatsWindow();
-        _window.Title = "Melee stats";
+        _window.Title = Loc.GetString("stat-values-ui-title");
         _window.OpenCentered();
         _window.OnClose += Closed;
     }
diff --git a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
index 17cbcc38ac..3f0afc2fab 100644
--- a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
+++ b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
@@ -232,7 +232,7 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
         helper.ClydeWindow = _clyde.CreateWindow(new WindowCreateParameters
         {
             Maximized = false,
-            Title = "Admin Help",
+            Title = Loc.GetString("bwoink-admin-title"),
             Monitor = monitor,
             Width = 900,
             Height = 500
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
index ff8e56f8fe..2cf3f89145 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
@@ -1,47 +1,47 @@
-<DefaultWindow Title="{Loc Make Ghost Role}"
+<DefaultWindow Title="{Loc make-ghost-roles-window-title}"
             xmlns="https://spacestation14.io">
 
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RoleEntityLabel" Text="Entity" />
+            <Label Name="RoleEntityLabel" Text="{Loc make-ghost-roles-window-entity-label}" />
             <Label Name="RoleEntity" Text="" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RoleNameLabel" Text="Role Name" />
+            <Label Name="RoleNameLabel" Text="{Loc make-ghost-roles-window-role-name-label}" />
             <LineEdit Name="RoleName" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RoleDescriptionLabel" Text="Role Description" />
+            <Label Name="RoleDescriptionLabel" Text="{Loc make-ghost-roles-window-role-description-label}" />
             <LineEdit Name="RoleDescription" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RoleRulesLabel" Text="Role Rules" />
+            <Label Name="RoleRulesLabel" Text="{Loc make-ghost-roles-window-role-rules-label}" />
             <LineEdit Name="RoleRules" HorizontalExpand="True" Text="{Loc ghost-role-component-default-rules}" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="MakeSentientLabel" Text="Make Sentient" />
+            <Label Name="MakeSentientLabel" Text="{Loc make-ghost-roles-window-make-sentient-label}" />
             <CheckBox Name="MakeSentientCheckbox" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RaffleLabel" Text="Raffle Role?" />
+            <Label Name="RaffleLabel" Text="{Loc make-ghost-roles-window-raffle-role-label}" />
             <OptionButton Name="RaffleButton" />
         </BoxContainer>
         <BoxContainer Name="RaffleCustomSettingsContainer" Orientation="Vertical" Visible="False">
             <BoxContainer Orientation="Horizontal">
-                <Label Name="RaffleInitialDurationLabel" Text="Initial Duration (s)" />
+                <Label Name="RaffleInitialDurationLabel" Text="{Loc make-ghost-roles-window-initial-duration-label}" />
                 <SpinBox Name="RaffleInitialDuration" HorizontalExpand="True" />
             </BoxContainer>
             <BoxContainer Orientation="Horizontal">
-                <Label Name="RaffleJoinExtendsDurationByLabel" Text="Joins Extend By (s)" />
+                <Label Name="RaffleJoinExtendsDurationByLabel" Text="{Loc make-ghost-roles-window-join-extends-by-label}" />
                 <SpinBox Name="RaffleJoinExtendsDurationBy" HorizontalExpand="True" />
             </BoxContainer>
             <BoxContainer Orientation="Horizontal">
-                <Label Name="RaffleMaxDurationLabel" Text="Max Duration (s)" />
+                <Label Name="RaffleMaxDurationLabel" Text="{Loc make-ghost-roles-window-max-duration-label}" />
                 <SpinBox Name="RaffleMaxDuration" HorizontalExpand="True" />
             </BoxContainer>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Button Name="MakeButton" Text="Make" />
+            <Button Name="MakeButton" Text="{Loc make-ghost-roles-window-make-button}" />
         </BoxContainer>
     </BoxContainer>
 
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
index 5480db1dcd..03a6b9da01 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
@@ -62,8 +62,8 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
             RaffleMaxDuration.ValueChanged += OnRaffleDurationChanged;
 
 
-            RaffleButton.AddItem("Don't raffle", RaffleDontRaffleId);
-            RaffleButton.AddItem("Custom settings", RaffleCustomRaffleId);
+            RaffleButton.AddItem(Loc.GetString("make-ghost-roles-window-raffle-not-button"), RaffleDontRaffleId);
+            RaffleButton.AddItem(Loc.GetString("make-ghost-roles-window-raffle-custom-settings-button"), RaffleCustomRaffleId);
 
             var raffleProtos =
                 _prototypeManager.EnumeratePrototypes<GhostRoleRaffleSettingsPrototype>();
@@ -74,7 +74,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
                 _rafflePrototypes.Add(raffleProto);
                 var s = raffleProto.Settings;
                 var label =
-                    $"{raffleProto.ID} (initial {s.InitialDuration}s, max {s.MaxDuration}s, join adds {s.JoinExtendsDurationBy}s)";
+                    Loc.GetString("make-ghost-roles-window-raffle-settings-label", ("id", raffleProto.ID), ("initialDuration", s.InitialDuration), ("maxDuration", s.MaxDuration), ("joinExtendsDurationBy", s.JoinExtendsDurationBy));
                 RaffleButton.AddItem(label, idx++);
             }
 
@@ -92,7 +92,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
             if (RaffleInitialDuration.Value > RaffleMaxDuration.Value)
             {
                 MakeButton.Disabled = true;
-                MakeButton.ToolTip = "The initial duration must not exceed the maximum duration.";
+                MakeButton.ToolTip = Loc.GetString("make-ghost-roles-window-raffle-warning-tooltip");
             }
             else
             {
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
index 392532c7b7..291874b213 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
@@ -111,7 +111,7 @@ public sealed class StorageWindow : BaseWindow
             HorizontalExpand = true,
             Name = "StorageLabel",
             ClipText = true,
-            Text = "Dummy",
+            Text = Loc.GetString("comp-storage-window-dummy"),
             StyleClasses =
             {
                 "FancyWindowTitle",
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 176d4fd04c..6563d7b452 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -69,7 +69,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb bolt = new()
             {
-                Text = bolts.BoltsDown ? "Unbolt" : "Bolt",
+                Text = Loc.GetString(bolts.BoltsDown ? "admin-verbs-unbolt" : "admin-verbs-bolt"),
                 Category = VerbCategory.Tricks,
                 Icon = bolts.BoltsDown
                     ? new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/unbolt.png"))
@@ -91,7 +91,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb emergencyAccess = new()
             {
-                Text = airlockComp.EmergencyAccess ? "Emergency Access Off" : "Emergency Access On",
+                Text = Loc.GetString(airlockComp.EmergencyAccess ? "admin-verbs-emergency-access-off" : "admin-verbs-emergency-access-on"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/emergency_access.png")),
                 Act = () =>
@@ -111,7 +111,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb rejuvenate = new()
             {
-                Text = "Rejuvenate",
+                Text = Loc.GetString("admin-verbs-rejuvenate"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/rejuvenate.png")),
                 Act = () =>
@@ -129,7 +129,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb makeIndestructible = new()
             {
-                Text = "Make Indestructible",
+                Text = Loc.GetString("admin-verbs-make-indestructible"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/plus.svg.192dpi.png")),
                 Act = () =>
@@ -146,7 +146,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb makeVulnerable = new()
             {
-                Text = "Make Vulnerable",
+                Text = Loc.GetString("admin-verbs-make-vulnerable"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/plus.svg.192dpi.png")),
                 Act = () =>
@@ -164,7 +164,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb refillBattery = new()
             {
-                Text = "Refill Battery",
+                Text = Loc.GetString("admin-verbs-refill-battery"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/fill_battery.png")),
                 Act = () =>
@@ -179,7 +179,7 @@ public sealed partial class AdminVerbSystem
 
             Verb drainBattery = new()
             {
-                Text = "Drain Battery",
+                Text = Loc.GetString("admin-verbs-drain-battery"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/drain_battery.png")),
                 Act = () =>
@@ -194,7 +194,7 @@ public sealed partial class AdminVerbSystem
 
             Verb infiniteBattery = new()
             {
-                Text = "Infinite Battery",
+                Text = Loc.GetString("admin-verbs-infinite-battery"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/infinite_battery.png")),
                 Act = () =>
@@ -215,7 +215,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb blockUnanchor = new()
             {
-                Text = "Block Unanchoring",
+                Text = Loc.GetString("admin-verbs-block-unanchoring"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/anchor.svg.192dpi.png")),
                 Act = () =>
@@ -233,7 +233,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb refillInternalsO2 = new()
             {
-                Text = "Refill Internals Oxygen",
+                Text = Loc.GetString("admin-verbs-refill-internals-oxygen"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/oxygen.rsi"), "icon"),
                 Act = () =>
@@ -248,7 +248,7 @@ public sealed partial class AdminVerbSystem
 
             Verb refillInternalsN2 = new()
             {
-                Text = "Refill Internals Nitrogen",
+                Text = Loc.GetString("admin-verbs-refill-internals-nitrogen"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/red.rsi"), "icon"),
                 Act = () =>
@@ -263,7 +263,7 @@ public sealed partial class AdminVerbSystem
 
             Verb refillInternalsPlasma = new()
             {
-                Text = "Refill Internals Plasma",
+                Text = Loc.GetString("admin-verbs-refill-internals-plasma"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/plasma.rsi"), "icon"),
                 Act = () =>
@@ -281,7 +281,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb refillInternalsO2 = new()
             {
-                Text = "Refill Internals Oxygen",
+                Text = Loc.GetString("admin-verbs-refill-internals-oxygen"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/oxygen.rsi"), "icon"),
                 Act = () => RefillEquippedTanks(args.User, Gas.Oxygen),
@@ -293,7 +293,7 @@ public sealed partial class AdminVerbSystem
 
             Verb refillInternalsN2 = new()
             {
-                Text = "Refill Internals Nitrogen",
+                Text = Loc.GetString("admin-verbs-refill-internals-nitrogen"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/red.rsi"), "icon"),
                 Act = () => RefillEquippedTanks(args.User, Gas.Nitrogen),
@@ -305,7 +305,7 @@ public sealed partial class AdminVerbSystem
 
             Verb refillInternalsPlasma = new()
             {
-                Text = "Refill Internals Plasma",
+                Text = Loc.GetString("admin-verbs-refill-internals-plasma"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/plasma.rsi"), "icon"),
                 Act = () => RefillEquippedTanks(args.User, Gas.Plasma),
@@ -318,7 +318,7 @@ public sealed partial class AdminVerbSystem
 
         Verb sendToTestArena = new()
         {
-            Text = "Send to test arena",
+            Text = Loc.GetString("admin-verbs-send-to-test-arena"),
             Category = VerbCategory.Tricks,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/eject.svg.192dpi.png")),
 
@@ -339,7 +339,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb grantAllAccess = new()
             {
-                Text = "Grant All Access",
+                Text = Loc.GetString("admin-verbs-grant-all-access"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "centcom"),
                 Act = () =>
@@ -354,7 +354,7 @@ public sealed partial class AdminVerbSystem
 
             Verb revokeAllAccess = new()
             {
-                Text = "Revoke All Access",
+                Text = Loc.GetString("admin-verbs-revoke-all-access"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "default"),
                 Act = () =>
@@ -372,7 +372,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb grantAllAccess = new()
             {
-                Text = "Grant All Access",
+                Text = Loc.GetString("admin-verbs-grant-all-access"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "centcom"),
                 Act = () =>
@@ -387,7 +387,7 @@ public sealed partial class AdminVerbSystem
 
             Verb revokeAllAccess = new()
             {
-                Text = "Revoke All Access",
+                Text = Loc.GetString("admin-verbs-revoke-all-access"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "default"),
                 Act = () =>
@@ -405,13 +405,13 @@ public sealed partial class AdminVerbSystem
         {
             Verb adjustStack = new()
             {
-                Text = "Adjust Stack",
+                Text = Loc.GetString("admin-verbs-adjust-stack"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/adjust-stack.png")),
                 Act = () =>
                 {
                     // Unbounded intentionally.
-                    _quickDialog.OpenDialog(player, "Adjust stack", $"Amount (max {_stackSystem.GetMaxCount(stack)})", (int newAmount) =>
+                    _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-adjust-stack"), Loc.GetString("admin-verbs-dialog-adjust-stack-amount", ("max", _stackSystem.GetMaxCount(stack))), (int newAmount) =>
                     {
                         _stackSystem.SetCount(args.Target, newAmount, stack);
                     });
@@ -424,7 +424,7 @@ public sealed partial class AdminVerbSystem
 
             Verb fillStack = new()
             {
-                Text = "Fill Stack",
+                Text = Loc.GetString("admin-verbs-fill-stack"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/fill-stack.png")),
                 Act = () =>
@@ -440,12 +440,12 @@ public sealed partial class AdminVerbSystem
 
         Verb rename = new()
         {
-            Text = "Rename",
+            Text = Loc.GetString("admin-verbs-rename"),
             Category = VerbCategory.Tricks,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/rename.png")),
             Act = () =>
             {
-                _quickDialog.OpenDialog(player, "Rename", "Name", (string newName) =>
+                _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-dialog-rename-title"), Loc.GetString("admin-verbs-dialog-rename-name"), (string newName) =>
                 {
                     _metaSystem.SetEntityName(args.Target, newName);
                 });
@@ -458,12 +458,12 @@ public sealed partial class AdminVerbSystem
 
         Verb redescribe = new()
         {
-            Text = "Redescribe",
+            Text = Loc.GetString("admin-verbs-redescribe"),
             Category = VerbCategory.Tricks,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/redescribe.png")),
             Act = () =>
             {
-                _quickDialog.OpenDialog(player, "Redescribe", "Description", (LongString newDescription) =>
+                _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-dialog-redescribe-title"), Loc.GetString("admin-verbs-dialog-redescribe-description"), (LongString newDescription) =>
                 {
                     _metaSystem.SetEntityDescription(args.Target, newDescription.String);
                 });
@@ -476,12 +476,12 @@ public sealed partial class AdminVerbSystem
 
         Verb renameAndRedescribe = new()
         {
-            Text = "Redescribe",
+            Text = Loc.GetString("admin-verbs-rename-and-redescribe"),
             Category = VerbCategory.Tricks,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/rename_and_redescribe.png")),
             Act = () =>
             {
-                _quickDialog.OpenDialog(player, "Rename & Redescribe", "Name", "Description",
+                _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-dialog-rename-and-redescribe-title"), Loc.GetString("admin-verbs-dialog-rename-name"), Loc.GetString("admin-verbs-dialog-redescribe-description"),
                     (string newName, LongString newDescription) =>
                     {
                         var meta = MetaData(args.Target);
@@ -501,7 +501,7 @@ public sealed partial class AdminVerbSystem
             {
                 Verb barJobSlots = new()
                 {
-                    Text = "Bar job slots",
+                    Text = Loc.GetString("admin-verbs-bar-job-slots"),
                     Category = VerbCategory.Tricks,
                     Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/bar_jobslots.png")),
                     Act = () =>
@@ -520,7 +520,7 @@ public sealed partial class AdminVerbSystem
 
             Verb locateCargoShuttle = new()
             {
-                Text = "Locate Cargo Shuttle",
+                Text = Loc.GetString("admin-verbs-locate-cargo-shuttle"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Head/Soft/cargosoft.rsi"), "icon"),
                 Act = () =>
@@ -543,7 +543,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb refillBattery = new()
             {
-                Text = "Refill Battery",
+                Text = Loc.GetString("admin-verbs-refill-battery"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/fill_battery.png")),
                 Act = () =>
@@ -564,7 +564,7 @@ public sealed partial class AdminVerbSystem
 
             Verb drainBattery = new()
             {
-                Text = "Drain Battery",
+                Text = Loc.GetString("admin-verbs-drain-battery"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/drain_battery.png")),
                 Act = () =>
@@ -585,7 +585,7 @@ public sealed partial class AdminVerbSystem
 
             Verb infiniteBattery = new()
             {
-                Text = "Infinite Battery",
+                Text = Loc.GetString("admin-verbs-infinite-battery"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/infinite_battery.png")),
                 Act = () =>
@@ -615,7 +615,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb haltMovement = new()
             {
-                Text = "Halt Movement",
+                Text = Loc.GetString("admin-verbs-halt-movement"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/halt.png")),
                 Act = () =>
@@ -638,7 +638,7 @@ public sealed partial class AdminVerbSystem
                 {
                     Verb unpauseMap = new()
                     {
-                        Text = "Unpause Map",
+                        Text = Loc.GetString("admin-verbs-unpause-map"),
                         Category = VerbCategory.Tricks,
                         Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/play.png")),
                         Act = () =>
@@ -655,7 +655,7 @@ public sealed partial class AdminVerbSystem
                 {
                     Verb pauseMap = new()
                     {
-                        Text = "Pause Map",
+                        Text = Loc.GetString("admin-verbs-pause-map"),
                         Category = VerbCategory.Tricks,
                         Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/pause.png")),
                         Act = () =>
@@ -675,7 +675,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb snapJoints = new()
             {
-                Text = "Snap Joints",
+                Text = Loc.GetString("admin-verbs-snap-joints"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/snap_joints.png")),
                 Act = () =>
@@ -693,7 +693,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb minigunFire = new()
             {
-                Text = "Make Minigun",
+                Text = Loc.GetString("admin-verbs-make-minigun"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi"), "icon"),
                 Act = () =>
@@ -712,12 +712,12 @@ public sealed partial class AdminVerbSystem
         {
             Verb setCapacity = new()
             {
-                Text = "Set Bullet Amount",
+                Text = Loc.GetString("admin-verbs-set-bullet-amount"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Fun/caps.rsi"), "mag-6"),
                 Act = () =>
                 {
-                    _quickDialog.OpenDialog(player, "Set Bullet Amount", $"Amount (standard {ballisticAmmo.Capacity}):", (string amount) =>
+                    _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-dialog-set-bullet-amount-title"), Loc.GetString("admin-verbs-dialog-set-bullet-amount-amount", ("cap", ballisticAmmo.Capacity)), (string amount) =>
                     {
                         if (!int.TryParse(amount, out var result))
                             return;
diff --git a/Resources/Locale/en-US/administration/admin-verbs.ftl b/Resources/Locale/en-US/administration/admin-verbs.ftl
index 13be0a876d..8007aa6cca 100644
--- a/Resources/Locale/en-US/administration/admin-verbs.ftl
+++ b/Resources/Locale/en-US/administration/admin-verbs.ftl
@@ -1,3 +1,4 @@
+# Generic verbs
 delete-verb-get-data-text = Delete
 edit-solutions-verb-get-data-text = Edit Solutions
 explode-verb-get-data-text = Explode
@@ -18,3 +19,47 @@ toolshed-verb-mark = Mark
 toolshed-verb-mark-description = Places this entity into the $marked variable, a list of entities, replacing its prior value.
 
 export-entity-verb-get-data-text = Export sprite
+
+# Tools verbs
+admin-verbs-rejuvenate = Rejuvenate
+admin-verbs-make-indestructible = Make Indestructible
+admin-verbs-make-vulnerable = Make Vulnerable
+admin-verbs-refill-battery = Refill Battery
+admin-verbs-drain-battery = Drain Battery
+admin-verbs-infinite-battery = Infinite Battery
+admin-verbs-block-unanchoring = Block Unanchoring
+admin-verbs-refill-internals-oxygen = Refill Internals Oxygen
+admin-verbs-refill-internals-nitrogen = Refill Internals Nitrogen
+admin-verbs-refill-internals-plasma = Refill Internals Plasma
+admin-verbs-send-to-test-arena = Send to test arena
+admin-verbs-grant-all-access = Grant All Access
+admin-verbs-revoke-all-access = Revoke All Access
+admin-verbs-adjust-stack = Adjust Stack
+admin-verbs-fill-stack = Fill Stack
+admin-verbs-rename = Rename
+admin-verbs-redescribe = Redescribe
+admin-verbs-rename-and-redescribe = Rename & Redescribe
+admin-verbs-bar-job-slots = Bar job slots
+admin-verbs-locate-cargo-shuttle = Locate Cargo Shuttle
+admin-verbs-halt-movement = Halt Movement
+admin-verbs-unpause-map = Unpause Map
+admin-verbs-pause-map = Pause Map
+admin-verbs-snap-joints = Snap Joints
+admin-verbs-make-minigun = Make Minigun
+admin-verbs-set-bullet-amount = Set Bullet Amount
+
+# Toggles verbs
+admin-verbs-bolt = Bolt
+admin-verbs-unbolt = Unbolt
+admin-verbs-emergency-access-on = Emergency Access On
+admin-verbs-emergency-access-off = Emergency Access Off
+
+# Dialogs verbs
+admin-verbs-dialog-adjust-stack-amount = Amount (max {$max})
+admin-verbs-dialog-rename-title = Rename
+admin-verbs-dialog-rename-name = Name
+admin-verbs-dialog-redescribe-title = Redescribe
+admin-verbs-dialog-redescribe-description = Description
+admin-verbs-dialog-rename-and-redescribe-title = Rename & Redescribe
+admin-verbs-dialog-set-bullet-amount-title = Set Bullet Amount
+admin-verbs-dialog-set-bullet-amount-amount = Amount (standard {$cap})
diff --git a/Resources/Locale/en-US/administration/bwoink.ftl b/Resources/Locale/en-US/administration/bwoink.ftl
index 9c305569e1..2012f9bd0e 100644
--- a/Resources/Locale/en-US/administration/bwoink.ftl
+++ b/Resources/Locale/en-US/administration/bwoink.ftl
@@ -1,4 +1,5 @@
 bwoink-user-title = Admin Message
+bwoink-admin-title = Admin Help
 
 bwoink-system-starmute-message-no-other-users = *System: Nobody is available to receive your message. Try pinging Game Admins on Discord.
 
diff --git a/Resources/Locale/en-US/components/storage-component.ftl b/Resources/Locale/en-US/components/storage-component.ftl
index e742c83f6a..2d3953c1a1 100644
--- a/Resources/Locale/en-US/components/storage-component.ftl
+++ b/Resources/Locale/en-US/components/storage-component.ftl
@@ -8,5 +8,6 @@ comp-storage-cant-drop = You can't let go of { THE($entity) }!
 comp-storage-window-title = Storage Item
 comp-storage-window-weight = { $weight }/{ $maxWeight }, Max Size: {$size}
 comp-storage-window-slots = Slots: { $itemCount }/{ $maxCount }, Max Size: {$size}
+comp-storage-window-dummy = Dummy
 comp-storage-verb-open-storage = Open Storage
 comp-storage-verb-close-storage = Close Storage
diff --git a/Resources/Locale/en-US/credits/credits-window.ftl b/Resources/Locale/en-US/credits/credits-window.ftl
index e1081a95f0..b3373f00f3 100644
--- a/Resources/Locale/en-US/credits/credits-window.ftl
+++ b/Resources/Locale/en-US/credits/credits-window.ftl
@@ -11,6 +11,8 @@ credits-window-codebases-section-title = Space Station 13 Codebases
 credits-window-original-remake-team-section-title = Original Space Station 13 Remake Team
 credits-window-immortals-title = In Memoriam
 credits-window-special-thanks-section-title = Special Thanks
+credits-window-previous-page-button = Previous Page
+credits-window-next-page-button = Next Page
 
 credits-window-attributions-directory = [color=white]Directory:[/color] {$directory}
 credits-window-attributions-files = [color=white]Files:[/color] {$files}
diff --git a/Resources/Locale/en-US/ghost/make-ghost-gui.ftl b/Resources/Locale/en-US/ghost/make-ghost-gui.ftl
new file mode 100644
index 0000000000..99d7f80fa2
--- /dev/null
+++ b/Resources/Locale/en-US/ghost/make-ghost-gui.ftl
@@ -0,0 +1,21 @@
+make-ghost-roles-window-title = Make Ghost Role
+
+make-ghost-roles-window-entity-label = Entity
+make-ghost-roles-window-role-name-label = Role Name
+make-ghost-roles-window-role-description-label = Role Description
+make-ghost-roles-window-role-rules-label = Role Rules
+make-ghost-roles-window-make-sentient-label = Make Sentient
+make-ghost-roles-window-initial-duration-label = Initial Duration (s)
+make-ghost-roles-window-join-extends-by-label = Joins Extend By (s)
+make-ghost-roles-window-max-duration-label = Max Duration (s)
+
+make-ghost-roles-window-make-button = Make
+
+# Raffle
+make-ghost-roles-window-raffle-not-button = Don't raffle
+make-ghost-roles-window-raffle-custom-settings-button = Custom settings
+
+make-ghost-roles-window-raffle-role-label = Raffle Role?
+make-ghost-roles-window-raffle-settings-label = {$id} (initial {$initialDuration}s, max {$maxDuration}s, join adds {$joinExtendsDurationBy}s)
+
+make-ghost-roles-window-raffle-warning-tooltip = The initial duration must not exceed the maximum duration.
diff --git a/Resources/Locale/en-US/info/ban.ftl b/Resources/Locale/en-US/info/ban.ftl
index 5cbdaced97..21cf788153 100644
--- a/Resources/Locale/en-US/info/ban.ftl
+++ b/Resources/Locale/en-US/info/ban.ftl
@@ -77,6 +77,7 @@ ban-panel-permanent = Permanent
 ban-panel-ip-hwid-tooltip = Leave empty and check the checkbox below to use last connection's details
 ban-panel-severity = Severity:
 ban-panel-erase = Erase chat messages and player from round
+ban-panel-expiry-error = err
 
 # Ban string
 server-ban-string = {$admin} created a {$severity} severity server ban that expires {$expires} for [{$name}, {$ip}, {$hwid}], with reason: {$reason}
diff --git a/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl b/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl
index 1f5fd0aa85..5629515845 100644
--- a/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl
+++ b/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl
@@ -1,21 +1,14 @@
 ## UI
 
-crew-monitoring-user-interface-title = Crew Monitoring Console
+crew-monitoring-ui-title = Crew Monitoring Console
 
-crew-monitor-filter-line-placeholder = Filter
+crew-monitoring-ui-filter-line-placeholder = Filter
 
-crew-monitoring-user-interface-name = Name
-crew-monitoring-user-interface-job = Job:
-crew-monitoring-user-interface-status = Status
-crew-monitoring-user-interface-location = Location
+crew-monitoring-ui-job-label = Job:
+crew-monitoring-ui-no-server-label = Server not found
 
-crew-monitoring-user-interface-alive = Alive
-crew-monitoring-user-interface-dead = Dead
-crew-monitoring-user-interface-no-info = N/A
+crew-monitoring-ui-no-department-label = Unknown
+crew-monitoring-ui-no-station-label = Unknown station
 
-crew-monitoring-user-interface-no-server = Server not found
-
-crew-monitoring-user-interface-no-department = Unknown
-
-crew-monitoring-user-interface-flavor-left = In case of an emergency, contact station medical staff immediately
-crew-monitoring-user-interface-flavor-right = v1.7
+crew-monitoring-ui-flavor-left-label = In case of an emergency, contact station medical staff immediately
+crew-monitoring-ui-flavor-right-label = v1.7
diff --git a/Resources/Locale/en-US/navmap-beacons/station_map.ftl b/Resources/Locale/en-US/navmap-beacons/station_map.ftl
index e252851556..84e7066aee 100644
--- a/Resources/Locale/en-US/navmap-beacons/station_map.ftl
+++ b/Resources/Locale/en-US/navmap-beacons/station_map.ftl
@@ -2,6 +2,7 @@ station-map-window-title = Station map
 station-map-user-interface-flavor-left = Don't panic
 station-map-user-interface-flavor-right = v1.42
 station-map-filter-placeholder = Search by name
+station-map-unknown-station = Unknown station
 
 nav-beacon-window-title = Station Beacon
 nav-beacon-toggle-visible = Visible
diff --git a/Resources/Locale/en-US/npc/npc-debug.ftl b/Resources/Locale/en-US/npc/npc-debug.ftl
new file mode 100644
index 0000000000..39bdbbcd4d
--- /dev/null
+++ b/Resources/Locale/en-US/npc/npc-debug.ftl
@@ -0,0 +1,11 @@
+npc-debug-overlay-window-title = NPC debug
+
+npc-debug-overlay-window-section-npc-label = NPC
+npc-debug-overlay-window-section-pathfinder-label = Pathfinder
+
+npc-debug-overlay-window-show-htn-tree-checkbox = Thonk
+npc-debug-overlay-window-path-breadcrumbs-checkbox = Breadcrumbs
+npc-debug-overlay-window-path-polygons-checkbox = Polygons
+npc-debug-overlay-window-path-neighbors-checkbox = Neighbors
+npc-debug-overlay-window-path-route-costs-checkbox = Route costs
+npc-debug-overlay-window-path-routes-checkbox = Routes
diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
index 41792cbf9c..154b91ee1c 100644
--- a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
+++ b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
@@ -12,6 +12,12 @@ marking-slot-add = Add
 marking-slot-remove = Remove
 marking-slot = Slot {$number}
 
+humanoid-marking-modifier-force = Force
+humanoid-marking-modifier-ignore-species = Ignore Species
+humanoid-marking-modifier-base-layers = Base layers
+humanoid-marking-modifier-enable = Enable
+humanoid-marking-modifier-prototype-id = Prototype id:
+
 # Categories
 
 markings-category-Special = Special
diff --git a/Resources/Locale/en-US/ui/navmap.ftl b/Resources/Locale/en-US/ui/navmap.ftl
index 30f1da56b8..c5d7a1e612 100644
--- a/Resources/Locale/en-US/ui/navmap.ftl
+++ b/Resources/Locale/en-US/ui/navmap.ftl
@@ -2,3 +2,4 @@
 navmap-recenter = Recenter
 navmap-toggle-beacons = Show departments
 navmap-location = Location: [x = {$x}, y = {$y}]
+navmap-unknown-entity = Unknown
diff --git a/Resources/Locale/en-US/ui/stat-values.ftl b/Resources/Locale/en-US/ui/stat-values.ftl
new file mode 100644
index 0000000000..bce692cdd7
--- /dev/null
+++ b/Resources/Locale/en-US/ui/stat-values.ftl
@@ -0,0 +1 @@
+stat-values-ui-title = Melee stats

From b5c8ed8356443f0d3065d3d40a184cc300df796d Mon Sep 17 00:00:00 2001
From: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
Date: Fri, 10 Oct 2025 15:03:15 -0700
Subject: [PATCH 141/216] fixed medical cyborgs not getting movement sprites
 (#39747)

the fix
---
 .../Borgs/BorgSwitchableTypeSystem.cs         | 19 -------------------
 .../Borgs/SharedBorgSwitchableTypeSystem.cs   | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs b/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
index b54da765b0..86ed7a8b77 100644
--- a/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
+++ b/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
@@ -58,25 +58,6 @@ public sealed class BorgSwitchableTypeSystem : SharedBorgSwitchableTypeSystem
             }
         }
 
-        if (prototype.SpriteBodyMovementState is { } movementState)
-        {
-            var spriteMovement = EnsureComp<SpriteMovementComponent>(entity);
-            spriteMovement.NoMovementLayers.Clear();
-            spriteMovement.NoMovementLayers["movement"] = new PrototypeLayerData
-            {
-                State = prototype.SpriteBodyState,
-            };
-            spriteMovement.MovementLayers.Clear();
-            spriteMovement.MovementLayers["movement"] = new PrototypeLayerData
-            {
-                State = movementState,
-            };
-        }
-        else
-        {
-            RemComp<SpriteMovementComponent>(entity);
-        }
-
         base.UpdateEntityAppearance(entity, prototype);
     }
 }
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
index 12a7928c0b..fa6b809016 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
@@ -120,5 +120,24 @@ public abstract class SharedBorgSwitchableTypeSystem : EntitySystem
         {
             footstepModifier.FootstepSoundCollection = prototype.FootstepCollection;
         }
+
+        if (prototype.SpriteBodyMovementState is { } movementState)
+        {
+            var spriteMovement = EnsureComp<SpriteMovementComponent>(entity);
+            spriteMovement.NoMovementLayers.Clear();
+            spriteMovement.NoMovementLayers["movement"] = new PrototypeLayerData
+            {
+                State = prototype.SpriteBodyState,
+            };
+            spriteMovement.MovementLayers.Clear();
+            spriteMovement.MovementLayers["movement"] = new PrototypeLayerData
+            {
+                State = movementState,
+            };
+        }
+        else
+        {
+            RemComp<SpriteMovementComponent>(entity);
+        }
     }
 }

From 21460c86b08d0234aacf176d21b2147b85392755 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sat, 11 Oct 2025 00:27:14 +0200
Subject: [PATCH 142/216] Mindrole trigger condition (#40323)

* mind role trigger condition

* fix

* nits

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 Content.Shared/Roles/SharedRoleSystem.cs      |  3 +-
 .../MindRoleTriggerConditionComponent.cs      | 27 +++++++
 .../WhitelistTriggerConditionComponent.cs     |  6 +-
 .../Systems/TriggerSystem.Condition.cs        | 81 ++++++++++++++-----
 .../Trigger/Systems/TriggerSystem.cs          |  4 +
 5 files changed, 94 insertions(+), 27 deletions(-)
 create mode 100644 Content.Shared/Trigger/Components/Conditions/MindRoleTriggerConditionComponent.cs

diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
index eeab329661..e85d4d86d8 100644
--- a/Content.Shared/Roles/SharedRoleSystem.cs
+++ b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -23,7 +23,6 @@ public abstract class SharedRoleSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] protected readonly ISharedPlayerManager Player = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly SharedMindSystem _minds = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
@@ -400,7 +399,7 @@ public abstract class SharedRoleSystem : EntitySystem
 
         foreach (var role in delete)
         {
-            _entityManager.DeleteEntity(role);
+            PredictedDel(role);
         }
 
         var update = MindRolesUpdate(mind);
diff --git a/Content.Shared/Trigger/Components/Conditions/MindRoleTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/MindRoleTriggerConditionComponent.cs
new file mode 100644
index 0000000000..32fb4d7d29
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/MindRoleTriggerConditionComponent.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Checks if a triggered entity or the user of a trigger has a certain mindrole.
+/// Cancels the trigger otherwise.
+/// </summary>
+/// <remarks>
+/// Mind roles are only networked to their owner! So if you use this on any other entity than yourself it won't be predicted.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class MindRoleTriggerConditionComponent : BaseTriggerConditionComponent
+{
+    /// <summary>
+    /// Whitelist for what mind role components on the owning entity allow this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? EntityWhitelist;
+
+    /// <summary>
+    /// Whitelist for what mind role components on the User allow this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? UserWhitelist;
+}
diff --git a/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
index a2779f79c6..7ec6188ee3 100644
--- a/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
+++ b/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
@@ -4,20 +4,20 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Trigger.Components.Conditions;
 
 /// <summary>
-/// Checks if the user of a trigger satisfies a whitelist and blacklist condition for the triggered entity or the one triggering it.
+/// Checks if the user of a trigger satisfies a whitelist and blacklist condition.
 /// Cancels the trigger otherwise.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class WhitelistTriggerConditionComponent : BaseTriggerConditionComponent
 {
     /// <summary>
-    /// Whitelist for what entites can cause this trigger.
+    /// Whitelist for what entities can cause this trigger.
     /// </summary>
     [DataField, AutoNetworkedField]
     public EntityWhitelist? UserWhitelist;
 
     /// <summary>
-    /// Blacklist for what entites can cause this trigger.
+    /// Blacklist for what entities can cause this trigger.
     /// </summary>
     [DataField, AutoNetworkedField]
     public EntityWhitelist? UserBlacklist;
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
index 2d0756556a..b039c8e9de 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
@@ -10,31 +10,36 @@ public sealed partial class TriggerSystem
     private void InitializeCondition()
     {
         SubscribeLocalEvent<WhitelistTriggerConditionComponent, AttemptTriggerEvent>(OnWhitelistTriggerAttempt);
-
         SubscribeLocalEvent<UseDelayTriggerConditionComponent, AttemptTriggerEvent>(OnUseDelayTriggerAttempt);
-
         SubscribeLocalEvent<ToggleTriggerConditionComponent, AttemptTriggerEvent>(OnToggleTriggerAttempt);
-        SubscribeLocalEvent<ToggleTriggerConditionComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleGetAltVerbs);
-
         SubscribeLocalEvent<RandomChanceTriggerConditionComponent, AttemptTriggerEvent>(OnRandomChanceTriggerAttempt);
+        SubscribeLocalEvent<MindRoleTriggerConditionComponent, AttemptTriggerEvent>(OnMindRoleTriggerAttempt);
+
+        SubscribeLocalEvent<ToggleTriggerConditionComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleGetAltVerbs);
     }
 
     private void OnWhitelistTriggerAttempt(Entity<WhitelistTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
     {
-        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
-            args.Cancelled |= !_whitelist.CheckBoth(args.User, ent.Comp.UserBlacklist, ent.Comp.UserWhitelist);
+        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
+            return;
+
+        args.Cancelled |= !_whitelist.CheckBoth(args.User, ent.Comp.UserBlacklist, ent.Comp.UserWhitelist);
     }
 
     private void OnUseDelayTriggerAttempt(Entity<UseDelayTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
     {
-        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
-            args.Cancelled |= _useDelay.IsDelayed(ent.Owner, ent.Comp.UseDelayId);
+        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
+            return;
+
+        args.Cancelled |= _useDelay.IsDelayed(ent.Owner, ent.Comp.UseDelayId);
     }
 
     private void OnToggleTriggerAttempt(Entity<ToggleTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
     {
-        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
-            args.Cancelled |= !ent.Comp.Enabled;
+        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
+            return;
+
+        args.Cancelled |= !ent.Comp.Enabled;
     }
 
     private void OnToggleGetAltVerbs(Entity<ToggleTriggerConditionComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
@@ -62,19 +67,51 @@ public sealed partial class TriggerSystem
     private void OnRandomChanceTriggerAttempt(Entity<RandomChanceTriggerConditionComponent> ent,
         ref AttemptTriggerEvent args)
     {
-        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
-        {
-            // TODO: Replace with RandomPredicted once the engine PR is merged
-            var hash = new List<int>
-            {
-                (int)_timing.CurTick.Value,
-                GetNetEntity(ent).Id,
-                args.User == null ? 0 : GetNetEntity(args.User.Value).Id,
-            };
-            var seed = SharedRandomExtensions.HashCodeCombine(hash);
-            var rand = new System.Random(seed);
+        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
+            return;
 
-            args.Cancelled |= !rand.Prob(ent.Comp.SuccessChance); // When not successful, Cancelled = true
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var hash = new List<int>
+        {
+            (int)_timing.CurTick.Value,
+            GetNetEntity(ent).Id,
+            args.User == null ? 0 : GetNetEntity(args.User.Value).Id,
+        };
+        var seed = SharedRandomExtensions.HashCodeCombine(hash);
+        var rand = new System.Random(seed);
+
+        args.Cancelled |= !rand.Prob(ent.Comp.SuccessChance); // When not successful, Cancelled = true
+    }
+    private void OnMindRoleTriggerAttempt(Entity<MindRoleTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
+            return;
+
+        if (ent.Comp.EntityWhitelist != null)
+        {
+            if (!_mind.TryGetMind(ent.Owner, out var entMindId, out var entMindComp))
+            {
+                args.Cancelled = true; // the entity has no mind
+                return;
+            }
+            if (!_role.MindHasRole((entMindId, entMindComp), ent.Comp.EntityWhitelist))
+            {
+                args.Cancelled = true; // the entity does not have the required role
+                return;
+            }
+        }
+
+        if (ent.Comp.UserWhitelist != null)
+        {
+            if (args.User == null || !_mind.TryGetMind(args.User.Value, out var userMindId, out var userMindComp))
+            {
+                args.Cancelled = true; // no user or the user has no mind
+                return;
+            }
+            if (!_role.MindHasRole((userMindId, userMindComp), ent.Comp.UserWhitelist))
+            {
+                args.Cancelled = true; // the user does not have the required role
+            }
         }
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.cs b/Content.Shared/Trigger/Systems/TriggerSystem.cs
index 25f8d51e11..a5fb509eed 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.cs
@@ -3,7 +3,9 @@ using Content.Shared.Database;
 using Content.Shared.DeviceLinking;
 using Content.Shared.EntityTable;
 using Content.Shared.Item.ItemToggle;
+using Content.Shared.Mind;
 using Content.Shared.Popups;
+using Content.Shared.Roles;
 using Content.Shared.Timing;
 using Content.Shared.Trigger.Components;
 using Content.Shared.Whitelist;
@@ -39,6 +41,8 @@ public sealed partial class TriggerSystem : EntitySystem
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly ItemToggleSystem _itemToggle = default!;
     [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!;
+    [Dependency] private readonly SharedRoleSystem _role = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly EntityTableSystem _entityTable = default!;
 
     public const string DefaultTriggerKey = "trigger";

From 6f02e6c19c44de1ffe0f2255c67df74924e35cdf Mon Sep 17 00:00:00 2001
From: YotaXP <yotaxp+git@gmail.com>
Date: Fri, 10 Oct 2025 19:01:33 -0400
Subject: [PATCH 143/216] Decouple power sink from tickrate (#40789)

* Fix typo in `BatterySystem.ChangeCharge`.

* Decouple power sink behavior from tickrate.

* Fix power sink's price per joule
---
 Content.Server/Power/EntitySystems/BatterySystem.cs       | 2 +-
 Content.Server/PowerSink/PowerSinkSystem.cs               | 2 +-
 Resources/Prototypes/Entities/Objects/Power/powersink.yml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs
index 28b14f6925..c49a2f0f6b 100644
--- a/Content.Server/Power/EntitySystems/BatterySystem.cs
+++ b/Content.Server/Power/EntitySystems/BatterySystem.cs
@@ -171,7 +171,7 @@ namespace Content.Server.Power.EntitySystems
             if (!Resolve(uid, ref battery))
                 return 0;
 
-            var newValue = Math.Clamp(0, battery.CurrentCharge + value, battery.MaxCharge);
+            var newValue = Math.Clamp(battery.CurrentCharge + value, 0, battery.MaxCharge);
             var delta = newValue - battery.CurrentCharge;
             battery.CurrentCharge = newValue;
 
diff --git a/Content.Server/PowerSink/PowerSinkSystem.cs b/Content.Server/PowerSink/PowerSinkSystem.cs
index 2bf9046cc3..df0980883d 100644
--- a/Content.Server/PowerSink/PowerSinkSystem.cs
+++ b/Content.Server/PowerSink/PowerSinkSystem.cs
@@ -66,7 +66,7 @@ namespace Content.Server.PowerSink
                 if (!transform.Anchored)
                     continue;
 
-                _battery.SetCharge(entity, battery.CurrentCharge + networkLoad.NetworkLoad.ReceivingPower / 1000, battery);
+                _battery.ChangeCharge(entity, networkLoad.NetworkLoad.ReceivingPower * frameTime, battery);
 
                 var currentBatteryThreshold = battery.CurrentCharge / battery.MaxCharge;
 
diff --git a/Resources/Prototypes/Entities/Objects/Power/powersink.yml b/Resources/Prototypes/Entities/Objects/Power/powersink.yml
index 7385b9a825..089610883c 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powersink.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powersink.yml
@@ -40,8 +40,8 @@
           acts: [ "Destruction" ]
     - type: PowerSink
     - type: Battery
-      maxCharge: 7500000
-      pricePerJoule: 0.0003
+      maxCharge: 250000000
+      pricePerJoule: 0.000009
     - type: ExaminableBattery
     - type: PowerConsumer
       voltage: High

From 8572fdf3ca8df94e853a8e4a2226db07dd04f4cf Mon Sep 17 00:00:00 2001
From: David <david.owen.dev@gmail.com>
Date: Fri, 10 Oct 2025 17:20:29 -0600
Subject: [PATCH 144/216] Fix Error Logged in Graffana for SharedStaminaSystem
 (#40764)

* Added Appearance component to MobElementalBase

* Added StunVisuals

* Changed MobElementalBase to inherit from BaseMob and MobCombat

* Fix linted error

* Fix damage type

* Apply suggestions from code review

* Update Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Entities/Mobs/NPCs/elemental.yml          | 28 ++-----------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index eba25717f3..eef5f48838 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -1,38 +1,17 @@
 - type: entity
   abstract: true
+  parent: [BaseMob, MobCombat]
   id: MobElementalBase
   components:
-  - type: LagCompensation
   - type: Reactive
     groups:
       Acidic: [Touch]
-  - type: Clickable
   - type: Damageable
     damageContainer: Inorganic
-  - type: InteractionOutline
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.35
-        density: 50
-        mask:
-        - MobMask
-        layer:
-        - MobLayer
   - type: MovementSpeedModifier
     baseWalkSpeed : 2
     baseSprintSpeed : 3
-  - type: Sprite
-    noRot: true
-    drawdepth: Mobs
-  - type: NpcFactionMember
-    factions:
-    - SimpleNeutral
   - type: MovedByPressure
-  - type: Physics
-    bodyType: KinematicController # Same for all inheritors
   - type: StatusEffects
     allowed:
     - Electrocution
@@ -58,12 +37,9 @@
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: Input
-    context: "human"
-  - type: InputMover
-  - type: MobMover
   - type: ZombieImmune
   - type: ProtectedFromStepTriggers
+  - type: StunVisuals
 
 - type: entity
   abstract: true

From 648ae755623fbe12caf880845fff72552b7a6586 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 10 Oct 2025 23:32:12 +0000
Subject: [PATCH 145/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1eedc0f152..723b5571b8 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Stop-Signs
-  changes:
-  - message: Meals now better reflect the amount of ingredients put into them.
-    type: Tweak
-  id: 8563
-  time: '2025-05-25T18:02:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34138
 - author: brainfood1183
   changes:
   - message: Kangaroos can now be equipped with northstars and knuckle dusters.
@@ -3948,3 +3941,12 @@
   id: 9065
   time: '2025-10-10T21:27:36.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40726
+- author: frigid-dev
+  changes:
+  - message: Ore Crabs now collide with the player if mob collisions are enabled.
+    type: Tweak
+  - message: Ore Crabs now show they are stunned
+    type: Fix
+  id: 9066
+  time: '2025-10-10T23:31:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40764

From a6dce11566a98819659c6cceefd63e99e4938473 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sat, 11 Oct 2025 01:23:26 +0200
Subject: [PATCH 146/216] Predict damage examine (#40168)

* predict damage examine

* .

* required true

* nits

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../Damage/Systems/DamageOtherOnHitSystem.cs  |  5 ++
 .../Components/DamageOtherOnHitComponent.cs   | 19 -----
 .../Damage/Systems/DamageOtherOnHitSystem.cs  | 82 ++++++++-----------
 .../Weapons/Melee/MeleeWeaponSystem.cs        | 18 +---
 .../Ranged/Systems/GunSystem.Battery.cs       | 51 ------------
 .../Components/DamageExaminableComponent.cs   |  7 +-
 .../Components/DamageOtherOnHitComponent.cs   | 24 ++++++
 .../Damage/Events/DamageExamineEvent.cs       |  4 +
 .../Systems/SharedDamageOtherOnHitSystem.cs   | 32 ++++++++
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  | 18 +++-
 .../Ranged/Systems/SharedGunSystem.Battery.cs | 51 ++++++++++++
 11 files changed, 169 insertions(+), 142 deletions(-)
 create mode 100644 Content.Client/Damage/Systems/DamageOtherOnHitSystem.cs
 delete mode 100644 Content.Server/Damage/Components/DamageOtherOnHitComponent.cs
 create mode 100644 Content.Shared/Damage/Components/DamageOtherOnHitComponent.cs
 create mode 100644 Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs

diff --git a/Content.Client/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Client/Damage/Systems/DamageOtherOnHitSystem.cs
new file mode 100644
index 0000000000..a78603c22c
--- /dev/null
+++ b/Content.Client/Damage/Systems/DamageOtherOnHitSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Damage.Systems;
+
+namespace Content.Client.Damage.Systems;
+
+public sealed class DamageOtherOnHitSystem : SharedDamageOtherOnHitSystem;
diff --git a/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs b/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs
deleted file mode 100644
index 3123e251af..0000000000
--- a/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Server.Damage.Systems;
-using Content.Shared.Damage;
-
-namespace Content.Server.Damage.Components
-{
-    [Access(typeof(DamageOtherOnHitSystem))]
-    [RegisterComponent]
-    public sealed partial class DamageOtherOnHitComponent : Component
-    {
-        [DataField("ignoreResistances")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool IgnoreResistances = false;
-
-        [DataField("damage", required: true)]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public DamageSpecifier Damage = default!;
-
-    }
-}
diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
index b1f5365b01..10930ca5c9 100644
--- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
@@ -1,72 +1,54 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Damage.Components;
 using Content.Server.Weapons.Ranged.Systems;
-using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Camera;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Events;
+using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Effects;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Throwing;
-using Content.Shared.Wires;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
 
-namespace Content.Server.Damage.Systems
+namespace Content.Server.Damage.Systems;
+
+public sealed class DamageOtherOnHitSystem : SharedDamageOtherOnHitSystem
 {
-    public sealed class DamageOtherOnHitSystem : EntitySystem
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly GunSystem _guns = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!;
+    [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
+
+    public override void Initialize()
     {
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly GunSystem _guns = default!;
-        [Dependency] private readonly DamageableSystem _damageable = default!;
-        [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
-        [Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!;
-        [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
+        base.Initialize();
 
-        public override void Initialize()
+        SubscribeLocalEvent<DamageOtherOnHitComponent, ThrowDoHitEvent>(OnDoHit);
+    }
+
+    private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDoHitEvent args)
+    {
+        if (TerminatingOrDeleted(args.Target))
+            return;
+
+        var dmg = _damageable.TryChangeDamage(args.Target, component.Damage * _damageable.UniversalThrownDamageModifier, component.IgnoreResistances, origin: args.Component.Thrower);
+
+        // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
+        if (dmg != null && HasComp<MobStateComponent>(args.Target))
+            _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision");
+
+        if (dmg is { Empty: false })
         {
-            SubscribeLocalEvent<DamageOtherOnHitComponent, ThrowDoHitEvent>(OnDoHit);
-            SubscribeLocalEvent<DamageOtherOnHitComponent, DamageExamineEvent>(OnDamageExamine);
-            SubscribeLocalEvent<DamageOtherOnHitComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
+            _color.RaiseEffect(Color.Red, [args.Target], Filter.Pvs(args.Target, entityManager: EntityManager));
         }
 
-        private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDoHitEvent args)
+        _guns.PlayImpactSound(args.Target, dmg, null, false);
+        if (TryComp<PhysicsComponent>(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f)
         {
-            if (TerminatingOrDeleted(args.Target))
-                return;
-
-            var dmg = _damageable.TryChangeDamage(args.Target, component.Damage * _damageable.UniversalThrownDamageModifier, component.IgnoreResistances, origin: args.Component.Thrower);
-
-            // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
-            if (dmg != null && HasComp<MobStateComponent>(args.Target))
-                _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision");
-
-            if (dmg is { Empty: false })
-            {
-                _color.RaiseEffect(Color.Red, new List<EntityUid>() { args.Target }, Filter.Pvs(args.Target, entityManager: EntityManager));
-            }
-
-            _guns.PlayImpactSound(args.Target, dmg, null, false);
-            if (TryComp<PhysicsComponent>(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f)
-            {
-                var direction = body.LinearVelocity.Normalized();
-                _sharedCameraRecoil.KickCamera(args.Target, direction);
-            }
-        }
-
-        private void OnDamageExamine(EntityUid uid, DamageOtherOnHitComponent component, ref DamageExamineEvent args)
-        {
-            _damageExamine.AddDamageExamine(args.Message, _damageable.ApplyUniversalAllModifiers(component.Damage * _damageable.UniversalThrownDamageModifier), Loc.GetString("damage-throw"));
-        }
-
-        /// <summary>
-        /// Prevent players with the Pacified status effect from throwing things that deal damage.
-        /// </summary>
-        private void OnAttemptPacifiedThrow(Entity<DamageOtherOnHitComponent> ent, ref AttemptPacifiedThrowEvent args)
-        {
-            args.Cancel("pacified-cannot-throw");
+            var direction = body.LinearVelocity.Normalized();
+            _sharedCameraRecoil.KickCamera(args.Target, direction);
         }
     }
 }
diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index 1e8f3334ac..31d289217c 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -1,7 +1,5 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Movement.Systems;
-using Content.Shared.Damage.Events;
-using Content.Shared.Damage.Systems;
 using Content.Shared.Effects;
 using Content.Shared.Speech.Components;
 using Content.Shared.Weapons.Melee;
@@ -16,28 +14,14 @@ namespace Content.Server.Weapons.Melee;
 public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
 {
     [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
     [Dependency] private readonly LagCompensationSystem _lag = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
 
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<MeleeSpeechComponent, MeleeHitEvent>(OnSpeechHit);
-        SubscribeLocalEvent<MeleeWeaponComponent, DamageExamineEvent>(OnMeleeExamineDamage);
-    }
-
-    private void OnMeleeExamineDamage(EntityUid uid, MeleeWeaponComponent component, ref DamageExamineEvent args)
-    {
-        if (component.Hidden)
-            return;
-
-        var damageSpec = GetDamage(uid, args.User, component);
-
-        if (damageSpec.Empty)
-            return;
-
-        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), Loc.GetString("damage-melee"));
     }
 
     protected override bool ArcRaySuccessful(EntityUid targetUid,
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
index d697e2bef1..700a15e1b0 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
@@ -1,12 +1,7 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Events;
 using Content.Shared.Power;
 using Content.Shared.PowerCell.Components;
-using Content.Shared.Projectiles;
-using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.Weapons.Ranged.Systems;
 
@@ -19,13 +14,11 @@ public sealed partial class GunSystem
         // Hitscan
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, ComponentStartup>(OnBatteryStartup);
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, ChargeChangedEvent>(OnBatteryChargeChange);
-        SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, PowerCellChangedEvent>(OnPowerCellChanged);
 
         // Projectile
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, ComponentStartup>(OnBatteryStartup);
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, ChargeChangedEvent>(OnBatteryChargeChange);
-        SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, PowerCellChangedEvent>(OnPowerCellChanged);
     }
 
@@ -73,50 +66,6 @@ public sealed partial class GunSystem
         RaiseLocalEvent(uid, ref updateAmmoEv);
     }
 
-    private void OnBatteryDamageExamine<T>(Entity<T> entity, ref DamageExamineEvent args) where T : BatteryAmmoProviderComponent
-    {
-        var damageSpec = GetDamage(entity.Comp);
-
-        if (damageSpec == null)
-            return;
-
-        var damageType = entity.Comp switch
-        {
-            HitscanBatteryAmmoProviderComponent => Loc.GetString("damage-hitscan"),
-            ProjectileBatteryAmmoProviderComponent => Loc.GetString("damage-projectile"),
-            _ => throw new ArgumentOutOfRangeException(),
-        };
-
-        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), damageType);
-    }
-
-    private DamageSpecifier? GetDamage(BatteryAmmoProviderComponent component)
-    {
-        if (component is ProjectileBatteryAmmoProviderComponent battery)
-        {
-            if (ProtoManager.Index<EntityPrototype>(battery.Prototype).Components
-                .TryGetValue(Factory.GetComponentName<ProjectileComponent>(), out var projectile))
-            {
-                var p = (ProjectileComponent) projectile.Component;
-
-                if (!p.Damage.Empty)
-                {
-                    return p.Damage * Damageable.UniversalProjectileDamageModifier;
-                }
-            }
-
-            return null;
-        }
-
-        if (component is HitscanBatteryAmmoProviderComponent hitscan)
-        {
-            var dmg = ProtoManager.Index<HitscanPrototype>(hitscan.Prototype).Damage;
-            return dmg == null ? dmg : dmg * Damageable.UniversalHitscanDamageModifier;
-        }
-
-        return null;
-    }
-
     protected override void TakeCharge(Entity<BatteryAmmoProviderComponent> entity)
     {
         var ev = new ChangeChargeEvent(-entity.Comp.FireCost);
diff --git a/Content.Shared/Damage/Components/DamageExaminableComponent.cs b/Content.Shared/Damage/Components/DamageExaminableComponent.cs
index a9fa833070..0ac9435bb6 100644
--- a/Content.Shared/Damage/Components/DamageExaminableComponent.cs
+++ b/Content.Shared/Damage/Components/DamageExaminableComponent.cs
@@ -2,7 +2,8 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared.Damage.Components;
 
+/// <summary>
+/// Shows a detailed examine window with this entity's damage stats when examined.
+/// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class DamageExaminableComponent : Component
-{
-}
+public sealed partial class DamageExaminableComponent : Component;
diff --git a/Content.Shared/Damage/Components/DamageOtherOnHitComponent.cs b/Content.Shared/Damage/Components/DamageOtherOnHitComponent.cs
new file mode 100644
index 0000000000..7728bcf7ee
--- /dev/null
+++ b/Content.Shared/Damage/Components/DamageOtherOnHitComponent.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Damage.Systems;
+
+namespace Content.Shared.Damage.Components;
+
+/// <summary>
+/// Makes this entity deal damage when thrown at something.
+/// </summary>
+[RegisterComponent]
+[Access(typeof(SharedDamageOtherOnHitSystem))]
+public sealed partial class DamageOtherOnHitComponent : Component
+{
+    /// <summary>
+    /// Whether to ignore damage modifiers.
+    /// </summary>
+    [DataField]
+    public bool IgnoreResistances = false;
+
+    /// <summary>
+    /// The damage amount to deal on hit.
+    /// </summary>
+    [DataField(required: true)]
+    public DamageSpecifier Damage = default!;
+
+}
diff --git a/Content.Shared/Damage/Events/DamageExamineEvent.cs b/Content.Shared/Damage/Events/DamageExamineEvent.cs
index d3e6175f49..33949cc052 100644
--- a/Content.Shared/Damage/Events/DamageExamineEvent.cs
+++ b/Content.Shared/Damage/Events/DamageExamineEvent.cs
@@ -1,6 +1,10 @@
+using Content.Shared.Damage.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Damage.Events;
 
+/// <summary>
+/// Raised on an entity with <see cref="DamageExaminableComponent"/> when examined to get the damage values displayed in the examine window.
+/// </summary>
 [ByRefEvent]
 public readonly record struct DamageExamineEvent(FormattedMessage Message, EntityUid User);
diff --git a/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs b/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs
new file mode 100644
index 0000000000..f17a91972d
--- /dev/null
+++ b/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs
@@ -0,0 +1,32 @@
+using Content.Shared.CombatMode.Pacification;
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Events;
+
+namespace Content.Shared.Damage.Systems;
+
+public abstract class SharedDamageOtherOnHitSystem : EntitySystem
+{
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamageOtherOnHitComponent, DamageExamineEvent>(OnDamageExamine);
+        SubscribeLocalEvent<DamageOtherOnHitComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
+    }
+
+    private void OnDamageExamine(Entity<DamageOtherOnHitComponent> ent, ref DamageExamineEvent args)
+    {
+        _damageExamine.AddDamageExamine(args.Message, _damageable.ApplyUniversalAllModifiers(ent.Comp.Damage * _damageable.UniversalThrownDamageModifier), Loc.GetString("damage-throw"));
+    }
+
+    /// <summary>
+    /// Prevent players with the Pacified status effect from throwing things that deal damage.
+    /// </summary>
+    private void OnAttemptPacifiedThrow(Entity<DamageOtherOnHitComponent> ent, ref AttemptPacifiedThrowEvent args)
+    {
+        args.Cancel("pacified-cannot-throw");
+    }
+}
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 7d0d7577a4..9bc0b845ae 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -7,6 +7,7 @@ using Content.Shared.Administration.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CombatMode;
 using Content.Shared.Damage;
+using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
@@ -63,6 +64,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
     [Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private   readonly SharedStaminaSystem _stamina = default!;
+    [Dependency] private   readonly DamageExamineSystem _damageExamine = default!;
 
     private const int AttackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);
 
@@ -83,6 +85,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         SubscribeLocalEvent<MeleeWeaponComponent, HandSelectedEvent>(OnMeleeSelected);
         SubscribeLocalEvent<MeleeWeaponComponent, ShotAttemptedEvent>(OnMeleeShotAttempted);
         SubscribeLocalEvent<MeleeWeaponComponent, GunShotEvent>(OnMeleeShot);
+        SubscribeLocalEvent<MeleeWeaponComponent, DamageExamineEvent>(OnMeleeExamineDamage);
         SubscribeLocalEvent<BonusMeleeDamageComponent, GetMeleeDamageEvent>(OnGetBonusMeleeDamage);
         SubscribeLocalEvent<BonusMeleeDamageComponent, GetHeavyDamageModifierEvent>(OnGetBonusHeavyDamageModifier);
         SubscribeLocalEvent<BonusMeleeAttackRateComponent, GetMeleeAttackRateEvent>(OnGetBonusMeleeAttackRate);
@@ -95,8 +98,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         SubscribeAllEvent<StopAttackEvent>(OnStopAttack);
 
 #if DEBUG
-        SubscribeLocalEvent<MeleeWeaponComponent,
-                            MapInitEvent>                   (OnMapInit);
+        SubscribeLocalEvent<MeleeWeaponComponent, MapInitEvent>(OnMapInit);
     }
 
     private void OnMapInit(EntityUid uid, MeleeWeaponComponent component, MapInitEvent args)
@@ -124,6 +126,18 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         }
     }
 
+    private void OnMeleeExamineDamage(EntityUid uid, MeleeWeaponComponent component, ref DamageExamineEvent args)
+    {
+        if (component.Hidden)
+            return;
+
+        var damageSpec = GetDamage(uid, args.User, component);
+
+        if (damageSpec.Empty)
+            return;
+
+        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), Loc.GetString("damage-melee"));
+    }
     private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, HandSelectedEvent args)
     {
         var attackRate = GetAttackRate(uid, args.User, component);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
index ea865fced6..cb4e42f3cf 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
@@ -1,8 +1,12 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Events;
 using Content.Shared.Examine;
+using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
@@ -18,6 +22,7 @@ public abstract partial class SharedGunSystem
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, TakeAmmoEvent>(OnBatteryTakeAmmo);
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, GetAmmoCountEvent>(OnBatteryAmmoCount);
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, ExaminedEvent>(OnBatteryExamine);
+        SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
 
         // Projectile
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, ComponentGetState>(OnBatteryGetState);
@@ -25,6 +30,7 @@ public abstract partial class SharedGunSystem
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, TakeAmmoEvent>(OnBatteryTakeAmmo);
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, GetAmmoCountEvent>(OnBatteryAmmoCount);
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, ExaminedEvent>(OnBatteryExamine);
+        SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
     }
 
     private void OnBatteryHandleState(EntityUid uid, BatteryAmmoProviderComponent component, ref ComponentHandleState args)
@@ -53,6 +59,51 @@ public abstract partial class SharedGunSystem
         args.PushMarkup(Loc.GetString("gun-battery-examine", ("color", AmmoExamineColor), ("count", component.Shots)));
     }
 
+    private void OnBatteryDamageExamine<T>(Entity<T> entity, ref DamageExamineEvent args) where T : BatteryAmmoProviderComponent
+    {
+        var damageSpec = GetDamage(entity.Comp);
+
+        if (damageSpec == null)
+            return;
+
+        var damageType = entity.Comp switch
+        {
+            HitscanBatteryAmmoProviderComponent => Loc.GetString("damage-hitscan"),
+            ProjectileBatteryAmmoProviderComponent => Loc.GetString("damage-projectile"),
+            _ => throw new ArgumentOutOfRangeException(),
+        };
+
+        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), damageType);
+    }
+
+    private DamageSpecifier? GetDamage(BatteryAmmoProviderComponent component)
+    {
+        if (component is ProjectileBatteryAmmoProviderComponent battery)
+        {
+            if (ProtoManager.Index<EntityPrototype>(battery.Prototype)
+                .Components
+                .TryGetValue(Factory.GetComponentName<ProjectileComponent>(), out var projectile))
+            {
+                var p = (ProjectileComponent)projectile.Component;
+
+                if (!p.Damage.Empty)
+                {
+                    return p.Damage * Damageable.UniversalProjectileDamageModifier;
+                }
+            }
+
+            return null;
+        }
+
+        if (component is HitscanBatteryAmmoProviderComponent hitscan)
+        {
+            var dmg = ProtoManager.Index<HitscanPrototype>(hitscan.Prototype).Damage;
+            return dmg == null ? dmg : dmg * Damageable.UniversalHitscanDamageModifier;
+        }
+
+        return null;
+    }
+
     private void OnBatteryTakeAmmo(EntityUid uid, BatteryAmmoProviderComponent component, TakeAmmoEvent args)
     {
         var shots = Math.Min(args.Shots, component.Shots);

From ca5053fe7b6842ea8b268e3b4789aa448f5df746 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sat, 11 Oct 2025 01:48:08 +0200
Subject: [PATCH 147/216] Predict artifact crushers (#40180)

predict artifact crushers
---
 .../Systems/ArtifactCrusherSystem.cs          |  94 +--------------
 .../Components/ArtifactCrusherComponent.cs    |  22 ++--
 .../Equipment/SharedArtifactCrusherSystem.cs  | 112 ++++++++++++++++--
 3 files changed, 113 insertions(+), 115 deletions(-)

diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
index 885186f79c..05bb2327e6 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
@@ -1,87 +1,25 @@
 using Content.Server.Body.Systems;
-using Content.Server.Popups;
-using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Shared.Body.Components;
-using Content.Shared.Damage;
-using Content.Shared.Power;
 using Content.Shared.Storage.Components;
-using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
 using Content.Shared.Xenoarchaeology.Equipment;
 using Content.Shared.Xenoarchaeology.Equipment.Components;
 using Robust.Shared.Collections;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Xenoarchaeology.Equipment.Systems;
 
 /// <inheritdoc/>
 public sealed class ArtifactCrusherSystem : SharedArtifactCrusherSystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly BodySystem _body = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly StackSystem _stack = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ArtifactCrusherComponent, GetVerbsEvent<AlternativeVerb>>(OnGetVerbs);
-        SubscribeLocalEvent<ArtifactCrusherComponent, PowerChangedEvent>(OnPowerChanged);
-    }
-
-    private void OnGetVerbs(Entity<ArtifactCrusherComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null || ent.Comp.Crushing)
-            return;
-
-        if (!TryComp<EntityStorageComponent>(ent, out var entityStorageComp) ||
-            entityStorageComp.Contents.ContainedEntities.Count == 0)
-            return;
-
-        if (!this.IsPowered(ent, EntityManager))
-            return;
-
-        var verb = new AlternativeVerb
-        {
-            Text = Loc.GetString("artifact-crusher-verb-start-crushing"),
-            Priority = 2,
-            Act = () => StartCrushing((ent, ent.Comp, entityStorageComp))
-        };
-        args.Verbs.Add(verb);
-    }
-
-    private void OnPowerChanged(Entity<ArtifactCrusherComponent> ent, ref PowerChangedEvent args)
-    {
-        if (!args.Powered)
-            StopCrushing(ent);
-    }
-
-    public void StartCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent)
-    {
-        var (uid, crusher, _) = ent;
-
-        if (crusher.Crushing)
-            return;
-
-        if (crusher.AutoLock)
-            _popup.PopupEntity(Loc.GetString("artifact-crusher-autolocks-enable"), uid);
-
-        crusher.Crushing = true;
-        crusher.NextSecond = _timing.CurTime + TimeSpan.FromSeconds(1);
-        crusher.CrushEndTime = _timing.CurTime + crusher.CrushDuration;
-        crusher.CrushingSoundEntity = AudioSystem.PlayPvs(crusher.CrushingSound, ent);
-        Appearance.SetData(ent, ArtifactCrusherVisuals.Crushing, true);
-        Dirty(ent, ent.Comp1);
-    }
-
-    public void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent)
+    // TODO: Move to shared once StackSystem spawning is in Shared and we have RandomPredicted
+    public override void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent)
     {
         var (_, crusher, storage) = ent;
         StopCrushing((ent, ent.Comp1), false);
@@ -113,32 +51,4 @@ public sealed class ArtifactCrusherSystem : SharedArtifactCrusherSystem
             }
         }
     }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<ArtifactCrusherComponent, EntityStorageComponent>();
-        while (query.MoveNext(out var uid, out var crusher, out var storage))
-        {
-            if (!crusher.Crushing)
-                continue;
-
-            if (crusher.NextSecond < _timing.CurTime)
-            {
-                var contents = new ValueList<EntityUid>(storage.Contents.ContainedEntities);
-                foreach (var contained in contents)
-                {
-                    _damageable.TryChangeDamage(contained, crusher.CrushingDamage);
-                }
-                crusher.NextSecond += TimeSpan.FromSeconds(1);
-                Dirty(uid, crusher);
-            }
-
-            if (crusher.CrushEndTime < _timing.CurTime)
-            {
-                FinishCrushing((uid, crusher, storage));
-            }
-        }
-    }
 }
diff --git a/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactCrusherComponent.cs b/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactCrusherComponent.cs
index 69a682b660..1130d9f305 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactCrusherComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactCrusherComponent.cs
@@ -2,7 +2,6 @@ using Content.Shared.Damage;
 using Content.Shared.Stacks;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
-using Robust.Shared.Audio.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -14,7 +13,8 @@ namespace Content.Shared.Xenoarchaeology.Equipment.Components;
 /// <summary>
 /// This is an entity storage that, when activated, crushes the artifact inside of it and gives artifact fragments.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
 [Access(typeof(SharedArtifactCrusherSystem))]
 public sealed partial class ArtifactCrusherComponent : Component
 {
@@ -27,19 +27,21 @@ public sealed partial class ArtifactCrusherComponent : Component
     /// <summary>
     /// When the current crushing will end.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
     public TimeSpan CrushEndTime;
 
     /// <summary>
     /// The next second. Used to apply damage over time.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
     public TimeSpan NextSecond;
 
     /// <summary>
     /// The total duration of the crushing.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public TimeSpan CrushDuration = TimeSpan.FromSeconds(10);
 
     /// <summary>
@@ -51,19 +53,19 @@ public sealed partial class ArtifactCrusherComponent : Component
     /// <summary>
     /// The minimum amount of fragments spawned.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public int MinFragments = 2;
 
     /// <summary>
     /// The maximum amount of fragments spawned, non-inclusive.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public int MaxFragments = 5;
 
     /// <summary>
     /// The material for the fragments.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public ProtoId<StackPrototype> FragmentStackProtoId = "ArtifactFragment";
 
     /// <summary>
@@ -100,12 +102,12 @@ public sealed partial class ArtifactCrusherComponent : Component
     /// Stores entity of <see cref="CrushingSound"/> to allow ending it early.
     /// </summary>
     [DataField]
-    public (EntityUid, AudioComponent)? CrushingSoundEntity;
+    public EntityUid? CrushingSoundEntity;
 
     /// <summary>
     /// When enabled, stops the artifact crusher from being opened when it is being crushed.
     /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public bool AutoLock = false;
 }
 
diff --git a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs
index 64f3126297..a8c4b9ff06 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs
@@ -1,9 +1,16 @@
-using Content.Shared.Examine;
-using Content.Shared.Storage.Components;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
+using Content.Shared.Damage;
 using Content.Shared.Emag.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Popups;
+using Content.Shared.Power;
+using Content.Shared.Power.EntitySystems;
+using Content.Shared.Storage.Components;
+using Content.Shared.Verbs;
 using Content.Shared.Xenoarchaeology.Equipment.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Collections;
+using Robust.Shared.Containers;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Xenoarchaeology.Equipment;
 
@@ -12,10 +19,14 @@ namespace Content.Shared.Xenoarchaeology.Equipment;
 /// </summary>
 public abstract class SharedArtifactCrusherSystem : EntitySystem
 {
-    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedAudioSystem AudioSystem = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly EmagSystem _emag = default!;
+    [Dependency] private readonly SharedPowerReceiverSystem _power = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -27,6 +38,8 @@ public abstract class SharedArtifactCrusherSystem : EntitySystem
         SubscribeLocalEvent<ArtifactCrusherComponent, StorageOpenAttemptEvent>(OnStorageOpenAttempt);
         SubscribeLocalEvent<ArtifactCrusherComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<ArtifactCrusherComponent, GotEmaggedEvent>(OnEmagged);
+        SubscribeLocalEvent<ArtifactCrusherComponent, GetVerbsEvent<AlternativeVerb>>(OnGetVerbs);
+        SubscribeLocalEvent<ArtifactCrusherComponent, PowerChangedEvent>(OnPowerChanged);
     }
 
     private void OnInit(Entity<ArtifactCrusherComponent> ent, ref ComponentInit args)
@@ -53,6 +66,7 @@ public abstract class SharedArtifactCrusherSystem : EntitySystem
 
         ent.Comp.AutoLock = true;
         args.Handled = true;
+        Dirty(ent);
     }
 
     private void OnStorageOpenAttempt(Entity<ArtifactCrusherComponent> ent, ref StorageOpenAttemptEvent args)
@@ -66,22 +80,94 @@ public abstract class SharedArtifactCrusherSystem : EntitySystem
         args.PushMarkup(ent.Comp.AutoLock ? Loc.GetString("artifact-crusher-examine-autolocks") : Loc.GetString("artifact-crusher-examine-no-autolocks"));
     }
 
-    public void StopCrushing(Entity<ArtifactCrusherComponent> ent, bool early = true)
+    private void OnGetVerbs(Entity<ArtifactCrusherComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
     {
-        var (_, crusher) = ent;
-
-        if (!crusher.Crushing)
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null || ent.Comp.Crushing)
             return;
 
-        crusher.Crushing = false;
-        Appearance.SetData(ent, ArtifactCrusherVisuals.Crushing, false);
+        if (!TryComp<EntityStorageComponent>(ent, out var entityStorageComp) ||
+            entityStorageComp.Contents.ContainedEntities.Count == 0)
+            return;
+
+        if (!_power.IsPowered(ent.Owner))
+            return;
+
+        var user = args.User;
+        var verb = new AlternativeVerb
+        {
+            Text = Loc.GetString("artifact-crusher-verb-start-crushing"),
+            Priority = 2,
+            Act = () => StartCrushing((ent, ent.Comp, entityStorageComp), user)
+        };
+        args.Verbs.Add(verb);
+    }
+
+    private void OnPowerChanged(Entity<ArtifactCrusherComponent> ent, ref PowerChangedEvent args)
+    {
+        if (!args.Powered)
+            StopCrushing(ent);
+    }
+
+    public void StartCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent, EntityUid? user = null)
+    {
+        var (uid, crusher, _) = ent;
+
+        if (crusher.Crushing)
+            return;
+
+        if (crusher.AutoLock)
+            _popup.PopupPredicted(Loc.GetString("artifact-crusher-autolocks-enable"), uid, user);
+
+        crusher.Crushing = true;
+        crusher.NextSecond = _timing.CurTime + TimeSpan.FromSeconds(1);
+        crusher.CrushEndTime = _timing.CurTime + crusher.CrushDuration;
+        crusher.CrushingSoundEntity = AudioSystem.PlayPvs(crusher.CrushingSound, ent)?.Entity;
+        _appearance.SetData(ent, ArtifactCrusherVisuals.Crushing, true);
+        Dirty(ent, ent.Comp1);
+    }
+
+    public void StopCrushing(Entity<ArtifactCrusherComponent> ent, bool early = true)
+    {
+        if (!ent.Comp.Crushing)
+            return;
+
+        ent.Comp.Crushing = false;
+        _appearance.SetData(ent, ArtifactCrusherVisuals.Crushing, false);
 
         if (early)
         {
-            AudioSystem.Stop(crusher.CrushingSoundEntity?.Item1, crusher.CrushingSoundEntity?.Item2);
-            crusher.CrushingSoundEntity = null;
+            AudioSystem.Stop(ent.Comp.CrushingSoundEntity);
+            ent.Comp.CrushingSoundEntity = null;
         }
 
         Dirty(ent, ent.Comp);
     }
+
+    public virtual void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent) { }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<ArtifactCrusherComponent, EntityStorageComponent>();
+        while (query.MoveNext(out var uid, out var crusher, out var storage))
+        {
+            if (!crusher.Crushing)
+                continue;
+
+            if (crusher.NextSecond < _timing.CurTime)
+            {
+                var contents = new ValueList<EntityUid>(storage.Contents.ContainedEntities);
+                foreach (var contained in contents)
+                {
+                    _damageable.TryChangeDamage(contained, crusher.CrushingDamage);
+                }
+                crusher.NextSecond += TimeSpan.FromSeconds(1);
+                Dirty(uid, crusher);
+            }
+
+            if (crusher.CrushEndTime < _timing.CurTime)
+                FinishCrushing((uid, crusher, storage));
+        }
+    }
 }

From 3df66219d6d3be46e1a167ab18dcd3d47f440637 Mon Sep 17 00:00:00 2001
From: Crude Oil <124208219+CroilBird@users.noreply.github.com>
Date: Sat, 11 Oct 2025 01:52:54 +0200
Subject: [PATCH 148/216] Remove holopad projection verb on station AI core
 (#39937)

Add check for station AI's projector verb on itself
---
 Content.Server/Holopad/HolopadSystem.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index 5a4f4d93ce..630141d003 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -404,6 +404,9 @@ public sealed class HolopadSystem : SharedHolopadSystem
         if (!this.IsPowered(entity, EntityManager))
             return;
 
+        if (HasComp<StationAiCoreComponent>(entity))
+            return;
+
         if (!TryComp<TelephoneComponent>(entity, out var entityTelephone) ||
             _telephoneSystem.IsTelephoneEngaged((entity, entityTelephone)))
             return;

From 871d26221486a2e9d0417b4d7956bc4de70d0998 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 11 Oct 2025 00:04:21 +0000
Subject: [PATCH 149/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 723b5571b8..c810a1aff1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: brainfood1183
-  changes:
-  - message: Kangaroos can now be equipped with northstars and knuckle dusters.
-    type: Tweak
-  id: 8564
-  time: '2025-05-25T18:03:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37789
 - author: Moomoobeef
   changes:
   - message: Added new variants to dirty tiles.
@@ -3950,3 +3943,10 @@
   id: 9066
   time: '2025-10-10T23:31:04.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40764
+- author: Crude Oil
+  changes:
+  - message: Removed 'Activate Holopad Projector' verb from the station AI core.
+    type: Fix
+  id: 9067
+  time: '2025-10-11T00:03:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39937

From af05313f37e45103fcaa51f21e654f9a076a4819 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sat, 11 Oct 2025 01:59:56 +0200
Subject: [PATCH 150/216] fix NetEntity datafield in JointVisualsComponent
 (#39987)

fix netentity datafield
---
 Content.Client/Physics/JointVisualsOverlay.cs |  6 +++---
 .../Physics/JointVisualsComponent.cs          | 19 ++++++++++++++-----
 .../Weapons/Misc/SharedGrapplingGunSystem.cs  |  2 +-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Content.Client/Physics/JointVisualsOverlay.cs b/Content.Client/Physics/JointVisualsOverlay.cs
index 9cc2831d21..ddac71f4ea 100644
--- a/Content.Client/Physics/JointVisualsOverlay.cs
+++ b/Content.Client/Physics/JointVisualsOverlay.cs
@@ -36,7 +36,7 @@ public sealed class JointVisualsOverlay : Overlay
             if (xform.MapID != args.MapId)
                 continue;
 
-            var other = _entManager.GetEntity(visuals.Target);
+            var other = visuals.Target;
 
             if (!xformQuery.TryGetComponent(other, out var otherXform))
                 continue;
@@ -45,7 +45,7 @@ public sealed class JointVisualsOverlay : Overlay
                 continue;
 
             var texture = spriteSystem.Frame0(visuals.Sprite);
-            var width = texture.Width / (float) EyeManager.PixelsPerMeter;
+            var width = texture.Width / (float)EyeManager.PixelsPerMeter;
 
             var coordsA = xform.Coordinates;
             var coordsB = otherXform.Coordinates;
@@ -58,7 +58,7 @@ public sealed class JointVisualsOverlay : Overlay
 
             var posA = xformSystem.ToMapCoordinates(coordsA).Position;
             var posB = xformSystem.ToMapCoordinates(coordsB).Position;
-            var diff = (posB - posA);
+            var diff = posB - posA;
             var length = diff.Length();
 
             var midPoint = diff / 2f + posA;
diff --git a/Content.Shared/Physics/JointVisualsComponent.cs b/Content.Shared/Physics/JointVisualsComponent.cs
index 37a9cdc3b1..5179c31a86 100644
--- a/Content.Shared/Physics/JointVisualsComponent.cs
+++ b/Content.Shared/Physics/JointVisualsComponent.cs
@@ -10,21 +10,30 @@ namespace Content.Shared.Physics;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class JointVisualsComponent : Component
 {
-    [ViewVariables(VVAccess.ReadWrite), DataField("sprite", required: true), AutoNetworkedField]
+    /// <summary>
+    /// The sprite to use for the line.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
     public SpriteSpecifier Sprite = default!;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("target"), AutoNetworkedField]
-    public NetEntity? Target;
+    /// <summary>
+    /// The line is drawn between this target and the entity owning the component.
+    /// </summary>
+    /// <summary>
+    /// TODO: WeakEntityReference.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? Target;
 
     /// <summary>
     /// Offset from Body A.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("offsetA"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public Vector2 OffsetA;
 
     /// <summary>
     /// Offset from Body B.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("offsetB"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public Vector2 OffsetB;
 }
diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
index 1a0a31d4b1..a3c5a322ee 100644
--- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
@@ -66,7 +66,7 @@ public abstract class SharedGrapplingGunSystem : EntitySystem
             var visuals = EnsureComp<JointVisualsComponent>(shotUid.Value);
             visuals.Sprite = component.RopeSprite;
             visuals.OffsetA = new Vector2(0f, 0.5f);
-            visuals.Target = GetNetEntity(uid);
+            visuals.Target = uid;
             Dirty(shotUid.Value, visuals);
         }
 

From 04cde9a0ac2757fd55694402d34e026728726206 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Fri, 10 Oct 2025 20:08:47 -0400
Subject: [PATCH 151/216] Ice (the reagent) now actually does stuff (#40149)

* ice now evaporates and quenches thirst

* Ice uses BaseDrink as parent instead of Water

* Misc ice cleanup

* Ice no longer inherits Extinguish reactiveEffect

* Test fixes

* Deparented Ice from BaseDrink (was causing test fails)

* Whoops, forgot to remove the part actually causing the test fails

* Added code comments
---
 .../Prototypes/Reagents/Consumable/Drink/drinks.yml    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index f49e9f9671..464aa93dbb 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -469,16 +469,22 @@
   desc: reagent-desc-ice
   slipData:
     requiredSlipSpeed: 3.5
+  evaporationSpeed: 0.15 # TODO: Ideally Ice should just turn into Water if the room is warm enough (and vis versa), rather than Ice directly evaporating
   physicalDesc: reagent-physical-desc-frosty
   flavor: cold
   color: "#bed8e6"
   recognizable: true
   meltingPoint: 0.0
   boilingPoint: 100.0
-  friction: 0.05 #Copied from Ice Crust
+  friction: 0.05 # Copied from Ice Crust
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 3 # Slightly worse for quenching thirst than just straight water
   plantMetabolism:
   - !type:PlantAdjustWater
-    amount: 1
+    amount: 1 # The internet tells me I should avoid watering plants with ice, but mostly because of temperature, so this value being the same as water should probably be fine?
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/iceglass.rsi
     state: icon_empty

From 1b1704af0be15ac8360611344ec220a664a2af1f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 11 Oct 2025 00:21:29 +0000
Subject: [PATCH 152/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c810a1aff1..22bb552bba 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Moomoobeef
-  changes:
-  - message: Added new variants to dirty tiles.
-    type: Tweak
-  id: 8565
-  time: '2025-05-25T18:11:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37800
 - author: AsnDen
   changes:
   - message: Tile-aligned bar sign version was added.
@@ -3950,3 +3943,12 @@
   id: 9067
   time: '2025-10-11T00:03:14.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39937
+- author: Hitlinemoss
+  changes:
+  - message: Ice now satiates thirst.
+    type: Tweak
+  - message: Ice now evaporates.
+    type: Tweak
+  id: 9068
+  time: '2025-10-11T00:20:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40149

From bed5e8fd7a675697b10c9d22d65f9fd5d331e946 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Fri, 10 Oct 2025 17:21:05 -0700
Subject: [PATCH 153/216] Very small Shared Storage Optimization (#39092)

Mildly cheesed

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index e4f0aa8b23..fcda7eb0ac 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -587,7 +587,7 @@ public abstract class SharedStorageSystem : EntitySystem
                 }
 
                 _entList.Add(entity);
-                delay += itemSize.Weight * AreaInsertDelayPerItem;
+                delay += itemSize.Weight;
 
                 if (_entList.Count >= StorageComponent.AreaPickupLimit)
                     break;
@@ -596,7 +596,7 @@ public abstract class SharedStorageSystem : EntitySystem
             //If there's only one then let's be generous
             if (_entList.Count >= 1)
             {
-                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay, new AreaPickupDoAfterEvent(GetNetEntityList(_entList)), uid, target: uid)
+                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay * AreaInsertDelayPerItem, new AreaPickupDoAfterEvent(GetNetEntityList(_entList)), uid, target: uid)
                 {
                     BreakOnDamage = true,
                     BreakOnMove = true,

From bed556051b45827d8cebc49edaf8cb2f2ee67a21 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sat, 11 Oct 2025 02:22:31 +0200
Subject: [PATCH 154/216] Fix NetEntity DataField in AnalysisConsoleComponent
 (#39984)

* fix analysis console

* fix test

* totally not a web edit
---
 .../DeviceLinking/SharedDeviceLinkSystem.cs   | 11 +++
 .../Components/AnalysisConsoleComponent.cs    |  4 +-
 .../Components/ArtifactAnalyzerComponent.cs   |  9 +-
 .../Equipment/SharedArtifactAnalyzerSystem.cs | 82 ++++++++++++-------
 4 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
index 5d51bbc3e8..74bbc259c6 100644
--- a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
+++ b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
@@ -214,6 +214,17 @@ public abstract class SharedDeviceLinkSystem : EntitySystem
         return links;
     }
 
+    /// <summary>
+    /// Gets the entities linked to a specific source port.
+    /// </summary>
+    public HashSet<EntityUid> GetLinkedSinks(Entity<DeviceLinkSourceComponent?> source, ProtoId<SourcePortPrototype> port)
+    {
+        if (!Resolve(source, ref source.Comp) || !source.Comp.Outputs.TryGetValue(port, out var linked))
+            return new HashSet<EntityUid>(); // not a source or not linked
+
+        return new HashSet<EntityUid>(linked); // clone to prevent modifying the original
+    }
+
     /// <summary>
     /// Returns the default links for the given list of source port prototypes
     /// </summary>
diff --git a/Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs b/Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs
index 3247e3365a..3f59628714 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs
@@ -17,7 +17,7 @@ public sealed partial class AnalysisConsoleComponent : Component
     /// Can be null if not linked.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public NetEntity? AnalyzerEntity;
+    public EntityUid? AnalyzerEntity;
 
     [DataField]
     public SoundSpecifier? ScanFinishedSound = new SoundPathSpecifier("/Audio/Machines/scan_finish.ogg");
@@ -35,7 +35,7 @@ public sealed partial class AnalysisConsoleComponent : Component
     };
 
     /// <summary>
-    /// The machine linking port for the analyzer
+    /// The machine linking port for linking the console with the analyzer.
     /// </summary>
     [DataField]
     public ProtoId<SourcePortPrototype> LinkingPort = "ArtifactAnalyzerSender";
diff --git a/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs b/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs
index 05d17bb123..9581285efb 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs
@@ -1,5 +1,6 @@
-using Robust.Shared.Audio;
+using Content.Shared.DeviceLinking;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Xenoarchaeology.Equipment.Components;
 
@@ -35,4 +36,10 @@ public sealed partial class ArtifactAnalyzerComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
     public bool ReadyToPrint = false;
+
+    /// <summary>
+    /// The machine linking port for linking the analyzer with the console.
+    /// </summary>
+    [DataField]
+    public ProtoId<SinkPortPrototype> LinkingPort = "ArtifactAnalyzerReceiver";
 }
diff --git a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs
index e47e964225..086b402bb2 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs
@@ -15,6 +15,7 @@ namespace Content.Shared.Xenoarchaeology.Equipment;
 public abstract class SharedArtifactAnalyzerSystem : EntitySystem
 {
     [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!;
+    [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -23,10 +24,14 @@ public abstract class SharedArtifactAnalyzerSystem : EntitySystem
 
         SubscribeLocalEvent<ArtifactAnalyzerComponent, ItemPlacedEvent>(OnItemPlaced);
         SubscribeLocalEvent<ArtifactAnalyzerComponent, ItemRemovedEvent>(OnItemRemoved);
-        SubscribeLocalEvent<ArtifactAnalyzerComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ArtifactAnalyzerComponent, NewLinkEvent>(OnNewLinkAnalyzer);
+        SubscribeLocalEvent<ArtifactAnalyzerComponent, LinkAttemptEvent>(OnLinkAttemptAnalyzer);
+        SubscribeLocalEvent<ArtifactAnalyzerComponent, PortDisconnectedEvent>(OnPortDisconnectedAnalyzer);
 
-        SubscribeLocalEvent<AnalysisConsoleComponent, NewLinkEvent>(OnNewLink);
-        SubscribeLocalEvent<AnalysisConsoleComponent, PortDisconnectedEvent>(OnPortDisconnected);
+        SubscribeLocalEvent<AnalysisConsoleComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<AnalysisConsoleComponent, NewLinkEvent>(OnNewLinkConsole);
+        SubscribeLocalEvent<AnalysisConsoleComponent, LinkAttemptEvent>(OnLinkAttemptConsole);
+        SubscribeLocalEvent<AnalysisConsoleComponent, PortDisconnectedEvent>(OnPortDisconnectedConsole);
     }
 
     private void OnItemPlaced(Entity<ArtifactAnalyzerComponent> ent, ref ItemPlacedEvent args)
@@ -44,52 +49,74 @@ public abstract class SharedArtifactAnalyzerSystem : EntitySystem
         Dirty(ent);
     }
 
-    private void OnMapInit(Entity<ArtifactAnalyzerComponent> ent, ref MapInitEvent args)
+    private void OnMapInit(Entity<AnalysisConsoleComponent> ent, ref MapInitEvent args)
     {
-        if (!TryComp<DeviceLinkSinkComponent>(ent, out var sink))
+        if (!TryComp<DeviceLinkSourceComponent>(ent, out var source))
             return;
 
-        foreach (var source in sink.LinkedSources)
+        var linkedEntities = _deviceLink.GetLinkedSinks((ent.Owner, source), ent.Comp.LinkingPort);
+
+        foreach (var sink in linkedEntities)
         {
-            if (!TryComp<AnalysisConsoleComponent>(source, out var analysis))
+            if (!TryComp<ArtifactAnalyzerComponent>(sink, out var analyzer))
                 continue;
 
-            analysis.AnalyzerEntity = GetNetEntity(ent);
-            ent.Comp.Console = source;
-            Dirty(source, analysis);
+            ent.Comp.AnalyzerEntity = sink;
+            analyzer.Console = ent.Owner;
             Dirty(ent);
+            Dirty(sink, analyzer);
             break;
         }
     }
 
-    private void OnNewLink(Entity<AnalysisConsoleComponent> ent, ref NewLinkEvent args)
+    private void OnNewLinkConsole(Entity<AnalysisConsoleComponent> ent, ref NewLinkEvent args)
     {
-        if (!TryComp<ArtifactAnalyzerComponent>(args.Sink, out var analyzer))
+        if (args.SourcePort != ent.Comp.LinkingPort || !HasComp<ArtifactAnalyzerComponent>(args.Sink))
             return;
 
-        ent.Comp.AnalyzerEntity = GetNetEntity(args.Sink);
-        analyzer.Console = ent;
-        Dirty(args.Sink, analyzer);
+        ent.Comp.AnalyzerEntity = args.Sink;
         Dirty(ent);
     }
 
-    private void OnPortDisconnected(Entity<AnalysisConsoleComponent> ent, ref PortDisconnectedEvent args)
+    private void OnNewLinkAnalyzer(Entity<ArtifactAnalyzerComponent> ent, ref NewLinkEvent args)
     {
-        var analyzerNetEntity = ent.Comp.AnalyzerEntity;
-        if (args.Port != ent.Comp.LinkingPort || analyzerNetEntity == null)
+        if (args.SinkPort != ent.Comp.LinkingPort || !HasComp<AnalysisConsoleComponent>(args.Source))
             return;
 
-        var analyzerEntityUid = GetEntity(analyzerNetEntity);
-        if (TryComp<ArtifactAnalyzerComponent>(analyzerEntityUid, out var analyzer))
-        {
-            analyzer.Console = null;
-            Dirty(analyzerEntityUid.Value, analyzer);
-        }
+        ent.Comp.Console = args.Source;
+        Dirty(ent);
+    }
+
+    private void OnLinkAttemptConsole(Entity<AnalysisConsoleComponent> ent, ref LinkAttemptEvent args)
+    {
+        if (ent.Comp.AnalyzerEntity != null)
+            args.Cancel(); // can only link to one device at a time
+    }
+
+    private void OnLinkAttemptAnalyzer(Entity<ArtifactAnalyzerComponent> ent, ref LinkAttemptEvent args)
+    {
+        if (ent.Comp.Console != null)
+            args.Cancel(); // can only link to one device at a time
+    }
+
+    private void OnPortDisconnectedConsole(Entity<AnalysisConsoleComponent> ent, ref PortDisconnectedEvent args)
+    {
+        if (args.Port != ent.Comp.LinkingPort || ent.Comp.AnalyzerEntity == null)
+            return;
 
         ent.Comp.AnalyzerEntity = null;
         Dirty(ent);
     }
 
+    private void OnPortDisconnectedAnalyzer(Entity<ArtifactAnalyzerComponent> ent, ref PortDisconnectedEvent args)
+    {
+        if (args.Port != ent.Comp.LinkingPort || ent.Comp.Console == null)
+            return;
+
+        ent.Comp.Console = null;
+        Dirty(ent);
+    }
+
     public bool TryGetAnalyzer(Entity<AnalysisConsoleComponent> ent, [NotNullWhen(true)] out Entity<ArtifactAnalyzerComponent>? analyzer)
     {
         analyzer = null;
@@ -98,14 +125,13 @@ public abstract class SharedArtifactAnalyzerSystem : EntitySystem
         if (!_powerReceiver.IsPowered(consoleEnt))
             return false;
 
-        var analyzerUid = GetEntity(ent.Comp.AnalyzerEntity);
-        if (!TryComp<ArtifactAnalyzerComponent>(analyzerUid, out var analyzerComp))
+        if (!TryComp<ArtifactAnalyzerComponent>(ent.Comp.AnalyzerEntity, out var analyzerComp))
             return false;
 
-        if (!_powerReceiver.IsPowered(analyzerUid.Value))
+        if (!_powerReceiver.IsPowered(ent.Comp.AnalyzerEntity.Value))
             return false;
 
-        analyzer = (analyzerUid.Value, analyzerComp);
+        analyzer = (ent.Comp.AnalyzerEntity.Value, analyzerComp);
         return true;
     }
 

From 1e911d175059fc0dbbdcd09f8fe904ab5a93a3f2 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 11 Oct 2025 00:34:11 +0000
Subject: [PATCH 155/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 22bb552bba..4876ec7f73 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: AsnDen
-  changes:
-  - message: Tile-aligned bar sign version was added.
-    type: Add
-  - message: Bar signs now have proper collision.
-    type: Fix
-  id: 8566
-  time: '2025-05-25T18:36:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37756
 - author: Fildrance
   changes:
   - message: Spray nozzle now can consume liquids from puddles and put it right into
@@ -3952,3 +3943,11 @@
   id: 9068
   time: '2025-10-11T00:20:22.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40149
+- author: slarticodefast
+  changes:
+  - message: The artifact analysis console no longer breaks when trying to link it
+      to multiple artifact analyzers or vice versa.
+    type: Fix
+  id: 9069
+  time: '2025-10-11T00:33:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39984

From 228ed0288c25337697e12d3e25c57e7103037083 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Sat, 11 Oct 2025 02:36:58 +0200
Subject: [PATCH 156/216] make nobody supervisor a locale key and cleanup
 JobPrototype (#39102)

* make nobody supervisor locale key and cleanup JobPrototype

* Update Content.Shared/Roles/JobPrototype.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Content.Shared/Roles/JobPrototype.cs          | 34 +++++++++----------
 .../Locale/en-US/job/job-supervisors.ftl      |  3 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 54e5c1d525..6b58c42428 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -17,19 +17,19 @@ namespace Content.Shared.Roles
         [IdDataField]
         public string ID { get; private set; } = default!;
 
-        [DataField("playTimeTracker", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<PlayTimeTrackerPrototype>))]
+        [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<PlayTimeTrackerPrototype>))]
         public string PlayTimeTracker { get; private set; } = string.Empty;
 
         /// <summary>
         ///     Who is the supervisor for this job.
         /// </summary>
-        [DataField("supervisors")]
-        public string Supervisors { get; private set; } = "nobody";
+        [DataField]
+        public LocId Supervisors = "job-supervisors-nobody";
 
         /// <summary>
         ///     The name of this job as displayed to players.
         /// </summary>
-        [DataField("name")]
+        [DataField]
         public string Name { get; private set; } = string.Empty;
 
         [ViewVariables(VVAccess.ReadOnly)]
@@ -38,7 +38,7 @@ namespace Content.Shared.Roles
         /// <summary>
         ///     The name of this job as displayed to players.
         /// </summary>
-        [DataField("description")]
+        [DataField]
         public string? Description { get; private set; }
 
         [ViewVariables(VVAccess.ReadOnly)]
@@ -53,19 +53,19 @@ namespace Content.Shared.Roles
         /// <summary>
         ///     When true - the station will have anouncement about arrival of this player.
         /// </summary>
-        [DataField("joinNotifyCrew")]
+        [DataField]
         public bool JoinNotifyCrew { get; private set; } = false;
 
         /// <summary>
         ///     When true - the player will recieve a message about importancy of their job.
         /// </summary>
-        [DataField("requireAdminNotify")]
+        [DataField]
         public bool RequireAdminNotify { get; private set; } = false;
 
         /// <summary>
         ///     Should this job appear in preferences menu?
         /// </summary>
-        [DataField("setPreference")]
+        [DataField]
         public bool SetPreference { get; private set; } = true;
 
         /// <summary>
@@ -81,14 +81,14 @@ namespace Content.Shared.Roles
         [DataField]
         public bool? OverrideConsoleVisibility { get; private set; } = null;
 
-        [DataField("canBeAntag")]
+        [DataField]
         public bool CanBeAntag { get; private set; } = true;
 
         /// <summary>
         ///     The "weight" or importance of this job. If this number is large, the job system will assign this job
         ///     before assigning other jobs.
         /// </summary>
-        [DataField("weight")]
+        [DataField]
         public int Weight { get; private set; }
 
         /// <summary>
@@ -105,7 +105,7 @@ namespace Content.Shared.Roles
         ///     A numerical score for how much easier this job is for antagonists.
         ///     For traitors, reduces starting TC by this amount. Other gamemodes can use it for whatever they find fitting.
         /// </summary>
-        [DataField("antagAdvantage")]
+        [DataField]
         public int AntagAdvantage = 0;
 
         [DataField]
@@ -116,7 +116,7 @@ namespace Content.Shared.Roles
         /// Starting gear will be ignored.
         /// If you want to just add special attributes to a humanoid, use AddComponentSpecial instead.
         /// </summary>
-        [DataField("jobEntity", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? JobEntity = null;
 
         /// <summary>
@@ -129,19 +129,19 @@ namespace Content.Shared.Roles
         [DataField]
         public ProtoId<JobIconPrototype> Icon { get; private set; } = "JobIconUnknown";
 
-        [DataField("special", serverOnly: true)]
+        [DataField(serverOnly: true)]
         public JobSpecial[] Special { get; private set; } = Array.Empty<JobSpecial>();
 
-        [DataField("access")]
+        [DataField]
         public IReadOnlyCollection<ProtoId<AccessLevelPrototype>> Access { get; private set; } = Array.Empty<ProtoId<AccessLevelPrototype>>();
 
-        [DataField("accessGroups")]
+        [DataField]
         public IReadOnlyCollection<ProtoId<AccessGroupPrototype>> AccessGroups { get; private set; } = Array.Empty<ProtoId<AccessGroupPrototype>>();
 
-        [DataField("extendedAccess")]
+        [DataField]
         public IReadOnlyCollection<ProtoId<AccessLevelPrototype>> ExtendedAccess { get; private set; } = Array.Empty<ProtoId<AccessLevelPrototype>>();
 
-        [DataField("extendedAccessGroups")]
+        [DataField]
         public IReadOnlyCollection<ProtoId<AccessGroupPrototype>> ExtendedAccessGroups { get; private set; } = Array.Empty<ProtoId<AccessGroupPrototype>>();
 
         [DataField]
diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl
index b7615903ee..5e2cf153fc 100644
--- a/Resources/Locale/en-US/job/job-supervisors.ftl
+++ b/Resources/Locale/en-US/job/job-supervisors.ftl
@@ -12,4 +12,5 @@ job-supervisors-medicine = Medical Doctors, Paramedics, Chemists, and the Chief
 job-supervisors-security = Security Officers, the Warden, and the Head of Security
 job-supervisors-science = Scientists and the Research Director
 job-supervisors-hire = whoever hires you
-job-supervisors-everyone = absolutely everyone
\ No newline at end of file
+job-supervisors-everyone = absolutely everyone
+job-supervisors-nobody = nobody

From 5b38148651ec2f21fbab27a5b7f01e7e297139ea Mon Sep 17 00:00:00 2001
From: qwerltaz <69696513+qwerltaz@users.noreply.github.com>
Date: Sat, 11 Oct 2025 02:41:22 +0200
Subject: [PATCH 157/216] Hop console grant all and revoke all access buttons
 (#39375)

* add hop console select and deselect all access buttons

* align the buttons right

* document code
---
 .../Access/UI/IdCardConsoleWindow.xaml        | 19 +++++++++++----
 .../Access/UI/IdCardConsoleWindow.xaml.cs     | 23 ++++++++++++++-----
 .../components/id-card-console-component.ftl  |  4 +++-
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
index a2f5f3382b..0a695a3dce 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
@@ -1,6 +1,7 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             MinSize="650 290">
     <BoxContainer Orientation="Vertical">
+        <!-- Privileged and target IDs, crew manifest button. -->
         <GridContainer Columns="2">
             <GridContainer Columns="3" HorizontalExpand="True">
                 <Label Text="{Loc 'id-card-console-window-privileged-id'}" />
@@ -16,6 +17,7 @@
             </BoxContainer>
         </GridContainer>
         <Control MinSize="0 8" />
+        <!-- Full name and job title editing. -->
         <GridContainer Columns="3" HSeparationOverride="4">
             <Label Name="FullNameLabel" Text="{Loc 'id-card-console-window-full-name-label'}" />
             <LineEdit Name="FullNameLineEdit" HorizontalExpand="True" />
@@ -26,10 +28,19 @@
             <Button Name="JobTitleSaveButton" Text="{Loc 'id-card-console-window-save-button'}" Disabled="True" />
         </GridContainer>
         <Control MinSize="0 8" />
-        <GridContainer Columns="2">
-            <Label Text="{Loc 'id-card-console-window-job-selection-label'}" />
-            <OptionButton Name="JobPresetOptionButton" />
-        </GridContainer>
+        <!-- Job preset selection, grant/revoke all access buttons. -->
+        <BoxContainer Margin="0 8 0 4">
+            <BoxContainer>
+                <Label Text="{Loc 'id-card-console-window-job-selection-label'}" />
+                <OptionButton Name="JobPresetOptionButton" />
+            </BoxContainer>
+            <Control HorizontalExpand="True"/>
+            <BoxContainer>
+                <Button Name="SelectAllButton" Text="{Loc 'id-card-console-window-select-all-button'}" />
+                <Button Name="DeselectAllButton" Text="{Loc 'id-card-console-window-deselect-all-button'}" />
+            </BoxContainer>
+        </BoxContainer>
+        <!-- Individual access buttons -->
         <Control Name="AccessLevelControlContainer" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
index 202653f700..30a7d969b6 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
@@ -79,6 +79,18 @@ namespace Content.Client.Access.UI
                 JobPresetOptionButton.AddItem(Loc.GetString(job.Name), _jobPrototypeIds.Count - 1);
             }
 
+            SelectAllButton.OnPressed += _ =>
+            {
+                SetAllAccess(true);
+                SubmitData();
+            };
+
+            DeselectAllButton.OnPressed += _ =>
+            {
+                SetAllAccess(false);
+                SubmitData();
+            };
+
             JobPresetOptionButton.OnItemSelected += SelectJobPreset;
             _accessButtons.Populate(accessLevels, prototypeManager);
             AccessLevelControlContainer.AddChild(_accessButtons);
@@ -89,14 +101,13 @@ namespace Content.Client.Access.UI
             }
         }
 
-        private void ClearAllAccess()
+        /// <param name="enabled">If true, every individual access button will be pressed. If false, each will be depressed.</param>
+        private void SetAllAccess(bool enabled)
         {
             foreach (var button in _accessButtons.ButtonsList.Values)
             {
-                if (button.Pressed)
-                {
-                    button.Pressed = false;
-                }
+                if (!button.Disabled && button.Pressed != enabled)
+                    button.Pressed = enabled;
             }
         }
 
@@ -110,7 +121,7 @@ namespace Content.Client.Access.UI
             JobTitleLineEdit.Text = Loc.GetString(job.Name);
             args.Button.SelectId(args.Id);
 
-            ClearAllAccess();
+            SetAllAccess(false);
 
             // this is a sussy way to do this
             foreach (var access in job.Access)
diff --git a/Resources/Locale/en-US/access/components/id-card-console-component.ftl b/Resources/Locale/en-US/access/components/id-card-console-component.ftl
index 7793b34846..0418d32062 100644
--- a/Resources/Locale/en-US/access/components/id-card-console-component.ftl
+++ b/Resources/Locale/en-US/access/components/id-card-console-component.ftl
@@ -5,7 +5,9 @@ id-card-console-window-save-button = Save
 id-card-console-window-job-title-label = Job title:
 id-card-console-window-eject-button = Eject
 id-card-console-window-insert-button = Insert
-id-card-console-window-job-selection-label = Job presets (sets department and job icon):
+id-card-console-window-job-selection-label = Job preset (sets department and job icon):
+id-card-console-window-select-all-button = Grant all
+id-card-console-window-deselect-all-button = Revoke all
 
 access-id-card-console-component-no-hands-error = You have no hands.
 id-card-console-privileged-id = Privileged ID

From ad708eec3b0d8795cf305b1ec21403d2e955456e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 11 Oct 2025 00:53:09 +0000
Subject: [PATCH 158/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 4876ec7f73..cfa8ca8197 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Fildrance
-  changes:
-  - message: Spray nozzle now can consume liquids from puddles and put it right into
-      backpacked tank.
-    type: Add
-  id: 8567
-  time: '2025-05-26T03:36:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30600
 - author: Southbridge
   changes:
   - message: On Amber, gave security its missing beacon and barriers.
@@ -3951,3 +3943,11 @@
   id: 9069
   time: '2025-10-11T00:33:04.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39984
+- author: qwerltaz
+  changes:
+  - message: The ID card computer now has buttons to grant or revoke all access from
+      the target ID card.
+    type: Add
+  id: 9070
+  time: '2025-10-11T00:52:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39375

From d3f85701f74ae8c54e830656f0ed39331c5f9915 Mon Sep 17 00:00:00 2001
From: Centronias <charlie.t.santos@gmail.com>
Date: Fri, 10 Oct 2025 17:51:12 -0700
Subject: [PATCH 159/216] Adds HugBot (#37557)

* - hugbot
  - bdy with two arms because it needs two arms to hug
  - is constructable from:
    - box of hugs
    - proximity sensor
    - two borg arms
  - lots of voice lines
  - kinda like a medibot, it chases you down and then hugs you
    - except if it's emagged, then it punches you :)
    - it has a 2m cooldown per person by default

- MeleeAttackOperator
  - Read the doc, but it's an operator which makes the NPC hit a target exactly once assuming it's in range.
  - Used to make the hugbot attack
- RaiseEventForOwnerOperator
  - Read the doc, but it's an operator which raises an event on the owning NPC.
  - Used to make the hugbot hug extra code, specifically for the cooldown

- Changes to existing code:
  - `ComponentFilter : UtilityQueryFilter` gets `RetainWithComp` added which, as the name implies, retains entities with the specified comps rather than removing them. Basically, it lets you negate the filter.
  - `SpeakOperator : HTNOperator`'s `speech` field can use a `LocalizedDataSet` instead of just a locstring now
    - (I updated all of the existing usages for this)
  -

* two arms

* wait what if we just used mimebot arms so it doesn't look awful

* smort
---
 Content.Client/Silicons/Bots/HugBotSystem.cs  |   5 +
 .../Preconditions/IsEmaggedPrecondition.cs    |  31 ++++
 .../Combat/Melee/MeleeAttackOperator.cs       |  70 +++++++++
 .../PrimitiveTasks/Operators/SpeakOperator.cs |  50 ++++++-
 .../Specific/RaiseEventForOwnerOperator.cs    |  47 ++++++
 .../NPC/Queries/Queries/ComponentFilter.cs    |   7 +
 .../NPC/Systems/NPCUtilitySystem.cs           |  11 +-
 Content.Server/Silicons/Bots/HugBotSystem.cs  |  65 +++++++++
 .../Bots/RecentlyHuggedByHugBotComponent.cs   |  15 ++
 .../Silicons/Bots/HugBotComponent.cs          |  12 ++
 .../Silicons/Bots/SharedHugBotSystem.cs       |  38 +++++
 .../en-US/_Moffstation/recipes/tags.ftl       |   1 +
 Resources/Locale/en-US/npc/hugbot.ftl         |  26 ++++
 Resources/Prototypes/Body/Prototypes/bot.yml  |  16 +++
 Resources/Prototypes/Catalog/hugbot.yml       |  17 +++
 .../Prototypes/Entities/Mobs/NPCs/silicon.yml |  37 +++++
 Resources/Prototypes/NPCs/debug.yml           |   7 +-
 Resources/Prototypes/NPCs/firebot.yml         |   9 +-
 Resources/Prototypes/NPCs/hugbot.yml          | 134 ++++++++++++++++++
 Resources/Prototypes/NPCs/medibot.yml         |   3 +-
 .../Recipes/Crafting/Graphs/bots/hugbot.yml   |  33 +++++
 .../Prototypes/Recipes/Crafting/bots.yml      |   8 ++
 .../Mobs/Silicon/Bots/hugbot.rsi/hugbot.png   | Bin 0 -> 342 bytes
 .../Mobs/Silicon/Bots/hugbot.rsi/meta.json    |  14 ++
 24 files changed, 639 insertions(+), 17 deletions(-)
 create mode 100644 Content.Client/Silicons/Bots/HugBotSystem.cs
 create mode 100644 Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs
 create mode 100644 Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs
 create mode 100644 Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs
 create mode 100644 Content.Server/Silicons/Bots/HugBotSystem.cs
 create mode 100644 Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs
 create mode 100644 Content.Shared/Silicons/Bots/HugBotComponent.cs
 create mode 100644 Content.Shared/Silicons/Bots/SharedHugBotSystem.cs
 create mode 100644 Resources/Locale/en-US/_Moffstation/recipes/tags.ftl
 create mode 100644 Resources/Locale/en-US/npc/hugbot.ftl
 create mode 100644 Resources/Prototypes/Catalog/hugbot.yml
 create mode 100644 Resources/Prototypes/NPCs/hugbot.yml
 create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml
 create mode 100644 Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/hugbot.png
 create mode 100644 Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/meta.json

diff --git a/Content.Client/Silicons/Bots/HugBotSystem.cs b/Content.Client/Silicons/Bots/HugBotSystem.cs
new file mode 100644
index 0000000000..b40fe51974
--- /dev/null
+++ b/Content.Client/Silicons/Bots/HugBotSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Silicons.Bots;
+
+namespace Content.Client.Silicons.Bots;
+
+public sealed partial class HugBotSystem : SharedHugBotSystem;
diff --git a/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs
new file mode 100644
index 0000000000..fe76968f34
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Emag.Systems;
+
+namespace Content.Server.NPC.HTN.Preconditions;
+
+/// <summary>
+/// A precondition which is met if the NPC is emagged with <see cref="EmagType"/>, as computed by
+/// <see cref="EmagSystem.CheckFlag"/>. This is useful for changing NPC behavior in the case that the NPC is emagged,
+/// eg. like a helper NPC bot turning evil.
+/// </summary>
+public sealed partial class IsEmaggedPrecondition : HTNPrecondition
+{
+    private EmagSystem _emag;
+
+    /// <summary>
+    /// The type of emagging to check for.
+    /// </summary>
+    [DataField]
+    public EmagType EmagType = EmagType.Interaction;
+
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+        _emag = sysManager.GetEntitySystem<EmagSystem>();
+    }
+
+    public override bool IsMet(NPCBlackboard blackboard)
+    {
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+        return _emag.CheckFlag(owner, EmagType);
+    }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs
new file mode 100644
index 0000000000..a1440acb2e
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs
@@ -0,0 +1,70 @@
+using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions;
+using Content.Shared.CombatMode;
+using Content.Shared.Weapons.Melee;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat.Melee;
+
+/// <summary>
+/// Something between <see cref="MeleeOperator"/> and <see cref="InteractWithOperator"/>, this operator causes the NPC
+/// to attempt a SINGLE <see cref="SharedMeleeWeaponSystem.AttemptLightAttack">melee attack</see> on the specified
+/// <see cref="TargetKey">target</see>.
+/// </summary>
+public sealed partial class MeleeAttackOperator : HTNOperator
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    private SharedMeleeWeaponSystem _melee;
+
+    /// <summary>
+    /// Key that contains the target entity.
+    /// </summary>
+    [DataField(required: true)]
+    public string TargetKey = default!;
+
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+        _melee = sysManager.GetEntitySystem<SharedMeleeWeaponSystem>();
+    }
+
+    public override void TaskShutdown(NPCBlackboard blackboard, HTNOperatorStatus status)
+    {
+        base.TaskShutdown(blackboard, status);
+
+        ExitCombatMode(blackboard);
+    }
+
+    public override void PlanShutdown(NPCBlackboard blackboard)
+    {
+        base.PlanShutdown(blackboard);
+
+        ExitCombatMode(blackboard);
+    }
+
+    public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
+    {
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+
+        if (!_entManager.TryGetComponent<CombatModeComponent>(owner, out var combatMode) ||
+            !_melee.TryGetWeapon(owner, out var weaponUid, out var weapon))
+        {
+            return HTNOperatorStatus.Failed;
+        }
+
+        _entManager.System<SharedCombatModeSystem>().SetInCombatMode(owner, true, combatMode);
+
+
+        if (!blackboard.TryGetValue<EntityUid>(TargetKey, out var target, _entManager) ||
+            !_melee.AttemptLightAttack(owner, weaponUid, weapon, target))
+        {
+            return HTNOperatorStatus.Continuing;
+        }
+
+        return HTNOperatorStatus.Finished;
+    }
+
+    private void ExitCombatMode(NPCBlackboard blackboard)
+    {
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+        _entManager.System<SharedCombatModeSystem>().SetInCombatMode(owner, false);
+    }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
index 8a4c655a39..f69a0771f9 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
@@ -1,13 +1,21 @@
 using Content.Server.Chat.Systems;
+using Content.Shared.Dataset;
+using Content.Shared.Random.Helpers;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using static Content.Server.NPC.HTN.PrimitiveTasks.Operators.SpeakOperator.SpeakOperatorSpeech;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
 
 public sealed partial class SpeakOperator : HTNOperator
 {
     private ChatSystem _chat = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
 
     [DataField(required: true)]
-    public string Speech = string.Empty;
+    public SpeakOperatorSpeech Speech;
 
     /// <summary>
     /// Whether to hide message from chat window and logs.
@@ -18,15 +26,51 @@ public sealed partial class SpeakOperator : HTNOperator
     public override void Initialize(IEntitySystemManager sysManager)
     {
         base.Initialize(sysManager);
-
         _chat = sysManager.GetEntitySystem<ChatSystem>();
     }
 
     public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
     {
+        LocId speechLocId;
+        switch (Speech)
+        {
+            case LocalizedSetSpeakOperatorSpeech localizedDataSet:
+                if (!_proto.TryIndex(localizedDataSet.LineSet, out var speechSet))
+                    return HTNOperatorStatus.Failed;
+                speechLocId = _random.Pick(speechSet);
+                break;
+            case SingleSpeakOperatorSpeech single:
+                speechLocId = single.Line;
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(Speech));
+        }
+
         var speaker = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-        _chat.TrySendInGameICMessage(speaker, Loc.GetString(Speech), InGameICChatType.Speak, hideChat: Hidden, hideLog: Hidden);
+        _chat.TrySendInGameICMessage(
+            speaker,
+            Loc.GetString(speechLocId),
+            InGameICChatType.Speak,
+            hideChat: Hidden,
+            hideLog: Hidden
+        );
 
         return base.Update(blackboard, frameTime);
     }
+
+    [ImplicitDataDefinitionForInheritors, MeansImplicitUse]
+    public abstract partial class SpeakOperatorSpeech
+    {
+        public sealed partial class SingleSpeakOperatorSpeech : SpeakOperatorSpeech
+        {
+            [DataField(required: true)]
+            public string Line;
+        }
+
+        public sealed partial class LocalizedSetSpeakOperatorSpeech : SpeakOperatorSpeech
+        {
+            [DataField(required: true)]
+            public ProtoId<LocalizedDatasetPrototype> LineSet;
+        }
+    }
 }
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs
new file mode 100644
index 0000000000..4bbdbb3473
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs
@@ -0,0 +1,47 @@
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
+
+/// <summary>
+/// Raises an <see cref="HTNRaisedEvent"/> on the <see cref="NPCBlackboard.Owner">owner</see>. The event will contain
+/// the specified <see cref="Args"/>, and if not null, the value of <see cref="TargetKey"/>.
+/// </summary>
+public sealed partial class RaiseEventForOwnerOperator : HTNOperator
+{
+    [Dependency] private readonly IEntityManager _entMan = default!;
+
+    /// <summary>
+    /// The conceptual "target" of this event. Note that this is NOT the entity for which the event is raised. If null,
+    /// <see cref="HTNRaisedEvent.Target"/> will be null.
+    /// </summary>
+    [DataField]
+    public string? TargetKey;
+
+    /// <summary>
+    /// The data contained in the raised event. Since <see cref="HTNRaisedEvent"/> is itself pretty meaningless, this is
+    /// included to give some context of what the event is actually supposed to mean.
+    /// </summary>
+    [DataField(required: true)]
+    public EntityEventArgs Args;
+
+    public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
+    {
+        _entMan.EventBus.RaiseLocalEvent(
+            blackboard.GetValue<EntityUid>(NPCBlackboard.Owner),
+            new HTNRaisedEvent(
+                blackboard.GetValue<EntityUid>(NPCBlackboard.Owner),
+                TargetKey is { } targetKey ? blackboard.GetValue<EntityUid>(targetKey) : null,
+                Args
+            )
+        );
+
+        return HTNOperatorStatus.Finished;
+    }
+}
+
+public sealed partial class HTNRaisedEvent(EntityUid owner, EntityUid? target, EntityEventArgs args) : EntityEventArgs
+{
+    // Owner and target are both included here in case we want to add a "RaiseEventForTargetOperator" in the future
+    // while reusing this event.
+    public EntityUid Owner = owner;
+    public EntityUid? Target = target;
+    public EntityEventArgs Args = args;
+}
diff --git a/Content.Server/NPC/Queries/Queries/ComponentFilter.cs b/Content.Server/NPC/Queries/Queries/ComponentFilter.cs
index 0df4bd902f..5ba63bf6f7 100644
--- a/Content.Server/NPC/Queries/Queries/ComponentFilter.cs
+++ b/Content.Server/NPC/Queries/Queries/ComponentFilter.cs
@@ -9,4 +9,11 @@ public sealed partial class ComponentFilter : UtilityQueryFilter
     /// </summary>
     [DataField("components", required: true)]
     public ComponentRegistry Components = new();
+
+    /// <summary>
+    /// If true, this filter retains entities with ALL of the specified components. If false, this filter removes
+    /// entities with ANY of the specified components.
+    /// </summary>
+    [DataField]
+    public bool RetainWithComp = true;
 }
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 813626a1c4..81f9415121 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -512,11 +512,12 @@ public sealed class NPCUtilitySystem : EntitySystem
                 {
                     foreach (var comp in compFilter.Components)
                     {
-                        if (HasComp(ent, comp.Value.Component.GetType()))
-                            continue;
-
-                        _entityList.Add(ent);
-                        break;
+                        var hasComp = HasComp(ent, comp.Value.Component.GetType());
+                        if (!compFilter.RetainWithComp == hasComp)
+                        {
+                            _entityList.Add(ent);
+                            break;
+                        }
                     }
                 }
 
diff --git a/Content.Server/Silicons/Bots/HugBotSystem.cs b/Content.Server/Silicons/Bots/HugBotSystem.cs
new file mode 100644
index 0000000000..4be948f434
--- /dev/null
+++ b/Content.Server/Silicons/Bots/HugBotSystem.cs
@@ -0,0 +1,65 @@
+using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
+using Content.Shared.Silicons.Bots;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Silicons.Bots;
+
+/// <summary>
+/// Beyond what <see cref="SharedHugBotSystem"/> does, this system manages the "lifecycle" of
+/// <see cref="RecentlyHuggedByHugBotComponent"/>.
+/// </summary>
+public sealed class HugBotSystem : SharedHugBotSystem
+{
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HugBotComponent, HTNRaisedEvent>(OnHtnRaisedEvent);
+    }
+
+    private void OnHtnRaisedEvent(Entity<HugBotComponent> entity, ref HTNRaisedEvent args)
+    {
+        if (args.Args is not HugBotDidHugEvent ||
+            args.Target is not {} target)
+            return;
+
+        var ev = new HugBotHugEvent(GetNetEntity(entity));
+        RaiseLocalEvent(target, ev);
+
+        ApplyHugBotCooldown(entity, target);
+    }
+
+    /// <summary>
+    /// Applies <see cref="RecentlyHuggedByHugBotComponent"/> to <paramref name="target"/> based on the configuration of
+    /// <paramref name="hugBot"/>.
+    /// </summary>
+    public void ApplyHugBotCooldown(Entity<HugBotComponent> hugBot, EntityUid target)
+    {
+        var hugged = EnsureComp<RecentlyHuggedByHugBotComponent>(target);
+        hugged.CooldownCompleteAfter = _gameTiming.CurTime + hugBot.Comp.HugCooldown;
+    }
+
+    public override void Update(float frameTime)
+    {
+        // Iterate through all RecentlyHuggedByHugBot entities...
+        var huggedEntities = AllEntityQuery<RecentlyHuggedByHugBotComponent>();
+        while (huggedEntities.MoveNext(out var huggedEnt, out var huggedComp))
+        {
+            // ... and if their cooldown is complete...
+            if (huggedComp.CooldownCompleteAfter <= _gameTiming.CurTime)
+            {
+                // ... remove it, allowing them to receive the blessing of hugs once more.
+                RemCompDeferred<RecentlyHuggedByHugBotComponent>(huggedEnt);
+            }
+        }
+    }
+}
+
+/// <summary>
+/// This event is indirectly raised (by being <see cref="HTNRaisedEvent.Args"/>) on a HugBot when it hugs (or emaggedly
+/// punches) an entity.
+/// </summary>
+[Serializable, DataDefinition]
+public sealed partial class HugBotDidHugEvent : EntityEventArgs;
diff --git a/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs b/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs
new file mode 100644
index 0000000000..c6c7d47e8d
--- /dev/null
+++ b/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Silicons.Bots;
+
+namespace Content.Server.Silicons.Bots;
+
+/// <summary>
+/// This marker component indicates that its entity has been recently hugged by a HugBot and should not be hugged again
+/// before <see cref="CooldownCompleteAfter">a cooldown period</see> in order to prevent hug spam.
+/// </summary>
+/// <see cref="SharedHugBotSystem"/>
+[RegisterComponent, AutoGenerateComponentPause]
+public sealed partial class RecentlyHuggedByHugBotComponent : Component
+{
+    [DataField, AutoPausedField]
+    public TimeSpan CooldownCompleteAfter = TimeSpan.MinValue;
+}
diff --git a/Content.Shared/Silicons/Bots/HugBotComponent.cs b/Content.Shared/Silicons/Bots/HugBotComponent.cs
new file mode 100644
index 0000000000..64281b6316
--- /dev/null
+++ b/Content.Shared/Silicons/Bots/HugBotComponent.cs
@@ -0,0 +1,12 @@
+namespace Content.Shared.Silicons.Bots;
+
+/// <summary>
+/// This component describes how a HugBot hugs.
+/// </summary>
+/// <see cref="SharedHugBotSystem"/>
+[RegisterComponent, AutoGenerateComponentState]
+public sealed partial class HugBotComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public TimeSpan HugCooldown = TimeSpan.FromMinutes(2);
+}
diff --git a/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs b/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs
new file mode 100644
index 0000000000..b5dec71f20
--- /dev/null
+++ b/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Emag.Systems;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Silicons.Bots;
+
+/// <summary>
+/// This system handles HugBots.
+/// </summary>
+public abstract class SharedHugBotSystem : EntitySystem
+{
+    [Dependency] private readonly EmagSystem _emag = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<HugBotComponent, GotEmaggedEvent>(OnEmagged);
+    }
+
+    private void OnEmagged(Entity<HugBotComponent> entity, ref GotEmaggedEvent args)
+    {
+        if (!_emag.CompareFlag(args.Type, EmagType.Interaction) ||
+            _emag.CheckFlag(entity, EmagType.Interaction) ||
+            !TryComp<HugBotComponent>(entity, out var hugBot))
+            return;
+
+        // HugBot HTN checks for emag state within its own logic, so we don't need to change anything here.
+
+        args.Handled = true;
+    }
+}
+
+/// <summary>
+/// This event is raised on an entity when it is hugged by a HugBot.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class HugBotHugEvent(NetEntity hugBot) : EntityEventArgs
+{
+    public readonly NetEntity HugBot = hugBot;
+}
diff --git a/Resources/Locale/en-US/_Moffstation/recipes/tags.ftl b/Resources/Locale/en-US/_Moffstation/recipes/tags.ftl
new file mode 100644
index 0000000000..73b392534a
--- /dev/null
+++ b/Resources/Locale/en-US/_Moffstation/recipes/tags.ftl
@@ -0,0 +1 @@
+construction-graph-tag-boxhug = a box of hugs
diff --git a/Resources/Locale/en-US/npc/hugbot.ftl b/Resources/Locale/en-US/npc/hugbot.ftl
new file mode 100644
index 0000000000..6b38eda30e
--- /dev/null
+++ b/Resources/Locale/en-US/npc/hugbot.ftl
@@ -0,0 +1,26 @@
+hugbot-start-hug-1 = LEVEL 5 HUG DEFICIENCY DETECTED!
+hugbot-start-hug-2 = You look like you need a hug!
+hugbot-start-hug-3 = Aww, somebody needs a hug!
+hugbot-start-hug-4 = Target acquired; Initiating hug routine.
+hugbot-start-hug-5 = Hold still, please.
+hugbot-start-hug-6 = Hugs!
+hugbot-start-hug-7 = Deploying HUG.
+hugbot-start-hug-8 = I am designed to hug, and you WILL be hugged.
+
+hugbot-finish-hug-1 = All done.
+hugbot-finish-hug-2 = Hug routine terminated.
+hugbot-finish-hug-3 = Feel better?
+hugbot-finish-hug-4 = Feel better soon!
+hugbot-finish-hug-5 = You are loved.
+hugbot-finish-hug-6 = You matter.
+hugbot-finish-hug-7 = It always gets better!
+hugbot-finish-hug-8 = Hug: COMPLETE.
+
+hugbot-emagged-finish-hug-1 = Actually, fuck you.
+hugbot-emagged-finish-hug-2 = Nobody loves you.
+hugbot-emagged-finish-hug-3 = Ewww... no.
+hugbot-emagged-finish-hug-4 = It can only get worse from here!
+hugbot-emagged-finish-hug-5 = Fucking crybaby.
+hugbot-emagged-finish-hug-6 = Go die.
+hugbot-emagged-finish-hug-7 = Drop dead.
+hugbot-emagged-finish-hug-8 = You are alone in this universe.
diff --git a/Resources/Prototypes/Body/Prototypes/bot.yml b/Resources/Prototypes/Body/Prototypes/bot.yml
index 848db2a4fd..ae9bd4a77a 100644
--- a/Resources/Prototypes/Body/Prototypes/bot.yml
+++ b/Resources/Prototypes/Body/Prototypes/bot.yml
@@ -5,3 +5,19 @@
   slots:
     hand 1:
       part: LeftArmBorg
+
+# It's like a medibot or a cleanbot except it has two arms to hug :)
+- type: body
+  id: HugBot
+  name: "hugBot"
+  root: box
+  slots:
+    box:
+      part: TorsoBorg
+      connections:
+      - right_arm
+      - left_arm
+    right_arm:
+      part: RightArmBorg
+    left_arm:
+      part: LeftArmBorg
diff --git a/Resources/Prototypes/Catalog/hugbot.yml b/Resources/Prototypes/Catalog/hugbot.yml
new file mode 100644
index 0000000000..469bb1196d
--- /dev/null
+++ b/Resources/Prototypes/Catalog/hugbot.yml
@@ -0,0 +1,17 @@
+- type: localizedDataset
+  id: HugBotStarts
+  values:
+    prefix: hugbot-start-hug-
+    count: 8
+
+- type: localizedDataset
+  id: HugBotFinishes
+  values:
+    prefix: hugbot-finish-hug-
+    count: 8
+
+- type: localizedDataset
+  id: EmaggedHugBotFinishes
+  values:
+    prefix: hugbot-emagged-finish-hug-
+    count: 8
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index fd700d7a4c..a538243192 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -460,3 +460,40 @@
     - Supply
   - type: Puller
     needsHands: false
+
+- type: entity
+  parent: [ MobSiliconBase, MobCombat ]
+  id: MobHugBot
+  name: hugbot
+  description: Awww, who needs a hug?
+  components:
+  - type: Sprite
+    sprite: Mobs/Silicon/Bots/hugbot.rsi
+    state: hugbot
+  - type: Construction
+    graph: HugBot
+    node: bot
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 2
+    baseSprintSpeed: 3
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Weapons/boxingpunch1.ogg
+    angle: 30
+    animation: WeaponArcPunch
+    damage:
+      types:
+        Blunt: 2
+  - type: Anchorable
+  - type: Hands # This probably REALLY needs hand whitelisting, but we NEED hands for hugs, so...
+  - type: ComplexInteraction # Hugging is a complex interaction, apparently.
+  - type: HugBot
+  - type: Body
+    prototype: HugBot
+  - type: HTN
+    rootTask:
+      task: HugBotCompound
+  - type: InteractionPopup
+    interactSuccessString: hugging-success-generic
+    interactSuccessSound: /Audio/Effects/thudswoosh.ogg
+    messagePerceivedByOthers: hugging-success-generic-others
diff --git a/Resources/Prototypes/NPCs/debug.yml b/Resources/Prototypes/NPCs/debug.yml
index c7929be103..802e6b4b57 100644
--- a/Resources/Prototypes/NPCs/debug.yml
+++ b/Resources/Prototypes/NPCs/debug.yml
@@ -68,7 +68,7 @@
           - !type:KeyFloatLessPrecondition
             key: Count
             value: 50
-      
+
       - !type:HTNPrimitiveTask
           operator: !type:RandomOperator
             targetKey: IdleTime
@@ -85,6 +85,5 @@
     - tasks:
       - !type:HTNPrimitiveTask
         operator: !type:SpeakOperator
-          speech: "fuck!"
-
- 
\ No newline at end of file
+          speech: !type:SingleSpeakOperatorSpeech
+            line: "fuck!"
diff --git a/Resources/Prototypes/NPCs/firebot.yml b/Resources/Prototypes/NPCs/firebot.yml
index 2da9da50d2..b3a62280cc 100644
--- a/Resources/Prototypes/NPCs/firebot.yml
+++ b/Resources/Prototypes/NPCs/firebot.yml
@@ -6,8 +6,8 @@
           task: DouseFireTargetCompound
     - tasks:
         - !type:HTNCompoundTask
-          task: IdleCompound    
-          
+          task: IdleCompound
+
 - type: htnCompound
   id: DouseFireTargetCompound
   branches:
@@ -18,8 +18,9 @@
 
         - !type:HTNPrimitiveTask
           operator: !type:SpeakOperator
-            speech: firebot-fire-detected
-            hidden: true  
+            speech: !type:SingleSpeakOperatorSpeech
+              line: firebot-fire-detected
+            hidden: true
 
         - !type:HTNPrimitiveTask
           operator: !type:MoveToOperator
diff --git a/Resources/Prototypes/NPCs/hugbot.yml b/Resources/Prototypes/NPCs/hugbot.yml
new file mode 100644
index 0000000000..1a56b22b92
--- /dev/null
+++ b/Resources/Prototypes/NPCs/hugbot.yml
@@ -0,0 +1,134 @@
+- type: htnCompound
+  id: HugBotCompound
+  branches:
+  - tasks:
+    - !type:HTNCompoundTask
+      task: HugNearbyCompound
+  - tasks:
+    - !type:HTNCompoundTask
+      task: IdleCompound
+
+- type: htnCompound
+  id: HugNearbyCompound
+  branches:
+  - tasks:
+    # Locate hug recipient.
+    - !type:HTNPrimitiveTask
+      operator: !type:UtilityOperator
+        proto: NearbyNeedingHug
+
+    # Announce intent to hug
+    - !type:HTNPrimitiveTask
+      operator: !type:SpeakOperator
+        speech: !type:LocalizedSetSpeakOperatorSpeech
+          lineSet: HugBotStarts
+        hidden: true
+
+    # Approach hug recipient
+    - !type:HTNPrimitiveTask
+      operator: !type:MoveToOperator
+        pathfindInPlanning: true
+        removeKeyOnFinish: false
+        targetKey: TargetCoordinates
+        pathfindKey: TargetPathfind
+        rangeKey: MeleeRange
+
+    # HUG!!
+    - !type:HTNCompoundTask
+      task: HugBotHugCompound
+
+    # Stick around to enjoy the hug instead of just running up, squeezing and leaving.
+    - !type:HTNPrimitiveTask
+      operator: !type:SetFloatOperator
+        targetKey: IdleTime
+        amount: 1
+    - !type:HTNPrimitiveTask
+      operator: !type:WaitOperator
+        key: IdleTime
+      preconditions:
+      - !type:KeyExistsPrecondition
+        key: IdleTime
+
+    # Special case operator which applies the hugbot cooldown.
+    - !type:HTNPrimitiveTask
+      operator: !type:RaiseEventForOwnerOperator
+        args: !type:HugBotDidHugEvent
+        targetKey: Target
+
+    # Announce that the hug is completed.
+    - !type:HTNCompoundTask
+      task: HugBotFinishSpeakCompound
+
+- type: htnCompound
+  id: HugBotHugCompound
+  branches:
+  # Hit if emagged
+  - preconditions:
+    - !type:IsEmaggedPrecondition
+    tasks:
+    - !type:HTNPrimitiveTask
+      preconditions:
+      - !type:TargetInRangePrecondition
+        targetKey: Target
+        rangeKey: InteractRange
+      operator: !type:MeleeAttackOperator
+        targetKey: Target
+      services:
+      - !type:UtilityService
+        id: HugService
+        proto: NearbyNeedingHug
+        key: Target
+  # Hug otherwise
+  - tasks:
+    - !type:HTNPrimitiveTask
+      preconditions:
+      - !type:TargetInRangePrecondition
+        targetKey: Target
+        rangeKey: InteractRange
+      operator: !type:InteractWithOperator
+        targetKey: Target
+      services:
+      - !type:UtilityService
+        id: HugService
+        proto: NearbyNeedingHug
+        key: Target
+
+- type: htnCompound
+  id: HugBotFinishSpeakCompound
+  branches:
+  # Say mean things if emagged
+  - preconditions:
+    - !type:IsEmaggedPrecondition
+    tasks:
+    - !type:HTNPrimitiveTask
+      operator: !type:SpeakOperator
+        speech: !type:LocalizedSetSpeakOperatorSpeech
+          lineSet: EmaggedHugBotFinishes
+        hidden: true
+  # Say nice thing otherwise
+  - tasks:
+    - !type:HTNPrimitiveTask
+      operator: !type:SpeakOperator
+        speech: !type:LocalizedSetSpeakOperatorSpeech
+          lineSet: HugBotFinishes
+        hidden: true
+
+- type: utilityQuery
+  id: NearbyNeedingHug
+  query:
+  - !type:ComponentQuery
+    components:
+    - type: HumanoidAppearance
+      species: Human # This specific value isn't actually used, so don't worry about it being just `Human`.
+  - !type:ComponentFilter
+    retainWithComp: false
+    components:
+    - type: RecentlyHuggedByHugBot
+  considerations:
+  - !type:TargetDistanceCon
+    curve: !type:PresetCurve
+      preset: TargetDistance
+  - !type:TargetAccessibleCon
+    curve: !type:BoolCurve
+  - !type:TargetInLOSOrCurrentCon
+    curve: !type:BoolCurve
diff --git a/Resources/Prototypes/NPCs/medibot.yml b/Resources/Prototypes/NPCs/medibot.yml
index c0853984ee..1cd6352e16 100644
--- a/Resources/Prototypes/NPCs/medibot.yml
+++ b/Resources/Prototypes/NPCs/medibot.yml
@@ -20,7 +20,8 @@
 
         - !type:HTNPrimitiveTask
           operator: !type:SpeakOperator
-            speech: medibot-start-inject
+            speech: !type:SingleSpeakOperatorSpeech
+              line: medibot-start-inject
             hidden: true
 
         - !type:HTNPrimitiveTask
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml
new file mode 100644
index 0000000000..56ee3803e0
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml
@@ -0,0 +1,33 @@
+- type: constructionGraph
+  id: HugBot
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: bot
+      steps:
+      - tag: BoxHug
+        icon:
+          sprite: Objects/Storage/boxes.rsi
+          state: box_hug
+        name: construction-graph-tag-boxhug
+      - tag: ProximitySensor
+        icon:
+          sprite: Objects/Misc/proximity_sensor.rsi
+          state: icon
+        name: construction-graph-tag-proximity-sensor
+        doAfter: 2
+      - tag: BorgArm
+        icon:
+          sprite: Mobs/Silicon/drone.rsi
+          state: l_hand
+        name: construction-graph-tag-borg-arm
+        doAfter: 2
+      - tag: BorgArm
+        icon:
+          sprite: Mobs/Silicon/drone.rsi
+          state: l_hand
+        name: construction-graph-tag-borg-arm
+        doAfter: 2
+  - node: bot
+    entity: MobHugBot
diff --git a/Resources/Prototypes/Recipes/Crafting/bots.yml b/Resources/Prototypes/Recipes/Crafting/bots.yml
index f76d545e94..d5eb1f941e 100644
--- a/Resources/Prototypes/Recipes/Crafting/bots.yml
+++ b/Resources/Prototypes/Recipes/Crafting/bots.yml
@@ -53,3 +53,11 @@
   targetNode: bot
   category: construction-category-utilities
   objectType: Item
+
+- type: construction
+  id: hugbot
+  graph: HugBot
+  startNode: start
+  targetNode: bot
+  category: construction-category-utilities
+  objectType: Item
diff --git a/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/hugbot.png b/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/hugbot.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d3dbcfa0753daa939d4cc4f3ae889fad4d02d0d
GIT binary patch
literal 342
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|j01c^Tn!8i
z9%Lji{9xFyVZ(s~2R_W0aO1{}6$Kdy2?-wx5;`IRUKC_xI9LEdKtKRc6A-LmaQp+L
z1WSVag8!oehX1p>yXOKWw|KfZhFJ8zy>y$eS%HV`fxMQk(z);Tx2GPKU>D9W-)L{h
z`1_(l(`&^a&GM{9YG)koOb}2vSkHcendLdlF`0Hlx9ZHh-x=&)Sa<KT^4$~O7#7Zu
ztsCK7!q2jFom0#NoeQrx3)UK^FPNR-aGdkQzUk_XR~EgVa4_yOqjx)FLUL9^#q7pw
z><743bo~)su+({h(ksh`71r#FRy_aSd!&N*zmt05iR``n%k8g!ERa7p`{U!O)y$7}
V=&Lf6m97GL($m$?Wt~$(69B<wk39eY

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/meta.json b/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/meta.json
new file mode 100644
index 0000000000..07ab40378d
--- /dev/null
+++ b/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Original sprite made by compilatron (Discord) for SS13, relicensed for SS14/Moffstation; modified by Centronias (GitHub) to have two arms",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "hugbot"
+        }
+    ]
+}

From 8bfaccb741c1e11e4522da8663ce2076269fd2f8 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 11 Oct 2025 01:06:15 +0000
Subject: [PATCH 160/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index cfa8ca8197..ee1518ce25 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Southbridge
-  changes:
-  - message: On Amber, gave security its missing beacon and barriers.
-    type: Fix
-  id: 8568
-  time: '2025-05-26T07:29:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37700
 - author: jessicamaybe
   changes:
   - message: NPC Gorillas can now pry open doors and vault/smash tables!
@@ -3951,3 +3944,11 @@
   id: 9070
   time: '2025-10-11T00:52:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39375
+- author: Centronias
+  changes:
+  - message: The HugBot, which is similar in purpose and construction to other small
+      robots like the CleanBot.
+    type: Add
+  id: 9071
+  time: '2025-10-11T01:05:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37557

From f64291402bb76f61a116cb4174020617508c5a60 Mon Sep 17 00:00:00 2001
From: PicklOH <62030853+PicklOH@users.noreply.github.com>
Date: Sat, 11 Oct 2025 01:03:45 -0400
Subject: [PATCH 161/216] Added more Syndie ammo types to EMAG lathe (#40822)

* Move Bulldog Drum to Emag

Bulldog drum removed from standard techfab
Moved to emag listing

* Update Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml

* Adds more Syndie ammo to EMAG lathe inventory

* No more L6

---------

Co-authored-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Recipes/Lathes/Packs/syndicate.yml           |  2 ++
 Resources/Prototypes/Recipes/Lathes/ammo.yml     | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml b/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
index 8c87f80780..71d0bee2fb 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
@@ -7,3 +7,5 @@
   - MagazineShotgun
   - MagazineShotgunEmpty
   - MagazineShotgunSlug
+  - MagazinePistolCaselessRifle
+  - MagazineBoxAntiMateriel
diff --git a/Resources/Prototypes/Recipes/Lathes/ammo.yml b/Resources/Prototypes/Recipes/Lathes/ammo.yml
index 2b4a4590fa..79104471a5 100644
--- a/Resources/Prototypes/Recipes/Lathes/ammo.yml
+++ b/Resources/Prototypes/Recipes/Lathes/ammo.yml
@@ -92,6 +92,14 @@
     Plastic: 500
     Uranium: 500
 
+# .25 Caseless
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolCaselessRifle
+  result: MagazinePistolCaselessRifle
+  materials:
+    Steel: 145
+
 # .30 Rifle
 - type: latheRecipe
   parent: BaseEmptyAmmoRecipe
@@ -452,6 +460,14 @@
     Steel: 80
     Plastic: 80
 
+# .60 anti-materiel
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxAntiMateriel
+  result: MagazineBoxAntiMateriel
+  materials:
+    Steel: 200
+
 # Encampment ammo
 - type: latheRecipe
   id: MagazineGrenadeEmpty

From c5b0fe97651f67c6f786b4051bc609b56c0aff79 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 11 Oct 2025 05:15:42 +0000
Subject: [PATCH 162/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ee1518ce25..8d99b59f78 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: jessicamaybe
-  changes:
-  - message: NPC Gorillas can now pry open doors and vault/smash tables!
-    type: Tweak
-  id: 8569
-  time: '2025-05-26T10:49:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37822
 - author: ArtisticRoomba
   changes:
   - message: The TEG's efficiency in extracting power from gasses has been tweaked
@@ -3952,3 +3945,10 @@
   id: 9071
   time: '2025-10-11T01:05:08.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/37557
+- author: PicklOH
+  changes:
+  - message: Added more Syndie ammo to the EMAG lathe inventory
+    type: Add
+  id: 9072
+  time: '2025-10-11T05:14:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40822

From 5450dea450a0b53576f4fa019c7b60499e33b982 Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Sat, 11 Oct 2025 16:20:27 +0200
Subject: [PATCH 163/216] minor tweak to changelog files, for contributor
 sanity (#40643)

deconflict changelog file order
---
 Resources/Changelog/Admin.yml     | 5 +++--
 Resources/Changelog/Changelog.yml | 3 ++-
 Resources/Changelog/Maps.yml      | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index b2ebdecbfd..474a16da3a 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1,4 +1,7 @@
 AdminOnly: true
+Name: Admin
+Order: 2
+# Do NOT put anything after the Entries section, in order to prevent merge conflict with new CL entries
 Entries:
 - author: DrSmugleaf
   changes:
@@ -1461,5 +1464,3 @@ Entries:
   id: 177
   time: '2025-10-05T07:40:15.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40709
-Name: Admin
-Order: 2
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 8d99b59f78..603ebfd2ea 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,4 +1,5 @@
-Entries:
+# Do NOT put anything after the Entries section, in order to prevent merge conflict with new CL entries
+Entries:
 - author: ArtisticRoomba
   changes:
   - message: The TEG's efficiency in extracting power from gasses has been tweaked
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 0c8783e4a5..557a260ac4 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -1,4 +1,6 @@
-Entries:
+Order: 1
+# Do NOT put anything after the Entries section, in order to prevent merge conflict with new CL entries
+Entries:
 - author: ArtisticRoomba
   changes:
   - message: The mapping changelog has been added! This primarily serves as a way
@@ -778,4 +780,3 @@
   id: 94
   time: '2025-10-10T20:33:03.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40821
-Order: 1

From 5cb80f05b5cda34a19b1ca16d19f296521d6f680 Mon Sep 17 00:00:00 2001
From: Mora <46364955+TrixxedHeart@users.noreply.github.com>
Date: Sat, 11 Oct 2025 12:21:35 -0500
Subject: [PATCH 164/216] Update Xenoarchaeology Guidebook Page (#40621)

* Update xenoarch guidebook page

* Remove artifact reports from science.yml and word change

* Some adjustments

* Remove references to artifact reports

* fix error and typo

* Various changes

* typo

* THATS NOT BROWN????

* Changed trigger window

* Added new section and notes about reagents

* Split into sub pages and various changes

* Change AnalysisConsole to link to the AnalysisConsole guidebook entry

* slight wording change

* Replace reagent explanations with reagent embeds

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
---
 Resources/Locale/en-US/guidebook/guides.ftl   |  2 +
 .../Entities/Objects/Misc/paper.yml           |  3 -
 .../Specific/Xenoarchaeology/node_scanner.yml |  2 +-
 .../Machines/Computers/computers.yml          |  2 +-
 Resources/Prototypes/Guidebook/science.yml    | 18 ++--
 .../Guidebook/Science/AnalysisConsole.xml     | 22 +++++
 .../Guidebook/Science/ArtifactReports.xml     | 24 -----
 .../Guidebook/Science/UnlockingNodes.xml      | 48 ++++++++++
 .../Guidebook/Science/Xenoarchaeology.xml     | 90 +++++++++----------
 9 files changed, 128 insertions(+), 83 deletions(-)
 create mode 100644 Resources/ServerInfo/Guidebook/Science/AnalysisConsole.xml
 delete mode 100644 Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
 create mode 100644 Resources/ServerInfo/Guidebook/Science/UnlockingNodes.xml

diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index a148c3aba8..d5addd38bf 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -79,6 +79,8 @@ guide-entry-anomalous-research = Anomalous Research
 guide-entry-scanners-and-vessels = Scanners and Vessels
 guide-entry-ape = A.P.E.
 guide-entry-xenoarchaeology = Xenoarchaeology
+guide-entry-xenoarchaeologyunlockingnodes = Unlocking Nodes
+guide-entry-analysisconsole = Analysis Console
 guide-entry-artifact-reports = Artifact Reports
 guide-entry-traversal-distorter = Traversal Distorter
 guide-entry-machine-upgrading = Machine Upgrading
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index cd7dc74a75..9cbb4a83d1 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -128,9 +128,6 @@
     - state: paper_stamp-generic
       map: ["enum.PaperVisualLayers.Stamp"]
       visible: false
-  - type: GuideHelp
-    guides:
-    - ArtifactReports
   - type: PaperVisuals
     headerImagePath: "/Textures/Interface/Paper/paper_heading_artifact_analyzer.svg.96dpi.png"
     headerMargin: 0.0, 0.0, 0.0, 16.0
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml
index 788374618c..21abf45cae 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml
@@ -14,7 +14,7 @@
       delay: 1
     - type: GuideHelp
       guides:
-      - ArtifactReports
+      - Xenoarchaeology
     - type: ActivatableUI
       key: enum.NodeScannerUiKey.Key
       singleUser: true
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index e275bef0e9..4e50a7e60b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -559,7 +559,7 @@
     color: "#b53ca1"
   - type: GuideHelp
     guides:
-    - Xenoarchaeology
+    - AnalysisConsole
 
 - type: entity
   parent: BaseComputerAiAccess
diff --git a/Resources/Prototypes/Guidebook/science.yml b/Resources/Prototypes/Guidebook/science.yml
index 2c3018dcee..ba2d1cf7b2 100644
--- a/Resources/Prototypes/Guidebook/science.yml
+++ b/Resources/Prototypes/Guidebook/science.yml
@@ -37,7 +37,18 @@
   name: guide-entry-xenoarchaeology
   text: "/ServerInfo/Guidebook/Science/Xenoarchaeology.xml"
   children:
-  - ArtifactReports
+    - AnalysisConsole
+    - XenoarchaeologyUnlockingNodes
+
+- type: guideEntry
+  id: XenoarchaeologyUnlockingNodes
+  name: guide-entry-xenoarchaeologyunlockingnodes
+  text: "/ServerInfo/Guidebook/Science/UnlockingNodes.xml"
+
+- type: guideEntry
+  id: AnalysisConsole
+  name: guide-entry-analysisconsole
+  text: "/ServerInfo/Guidebook/Science/AnalysisConsole.xml"
 
 - type: guideEntry
   id: Robotics
@@ -46,11 +57,6 @@
   children:
   - Cyborgs
 
-- type: guideEntry
-  id: ArtifactReports
-  name: guide-entry-artifact-reports
-  text: "/ServerInfo/Guidebook/Science/ArtifactReports.xml"
-
 - type: guideEntry
   id: Cyborgs
   name: guide-entry-cyborgs
diff --git a/Resources/ServerInfo/Guidebook/Science/AnalysisConsole.xml b/Resources/ServerInfo/Guidebook/Science/AnalysisConsole.xml
new file mode 100644
index 0000000000..e1bfece051
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Science/AnalysisConsole.xml
@@ -0,0 +1,22 @@
+<Document>
+  # Analysis Console
+
+  The Analysis Console is a device used to interface with artifacts. It can be used to check nodes, their triggers and effects, and extract points.
+
+  <Box>
+    <GuideEntityEmbed Entity="ComputerAnalysisConsole" Caption="Analysis Console"/>
+  </Box>
+
+  The console displays detailed information about each node in the artifact’s tree structure. This includes:
+  - [bold]ID:[/bold] Unique identifier for use with the Node Scanner.
+  - [bold]Class:[/bold] The layer name, nodes on the same layer share it.
+  - [bold]Status:[/bold]
+  - [italic][color=red]Locked[/color][/italic] by default.
+  - [italic][color=plum]Active[/color][/italic] when first triggered.
+  - [italic][color=lime]Unlocked[/color][/italic] if a deeper node is reached (prevents manual activations).
+  - [bold]Durability:[/bold] Number of manual activations available.
+  - [bold]Effect:[/bold] What happens when the node activates or is manually triggered.
+  - [bold]Triggers:[/bold] Required actions to unlock the node.
+  - [bold]Server:[/bold] Choose the research server where extracted points are sent.
+  - [bold]Extract Points:[/bold] Extracts points from nodes unlocked since the last extraction.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
deleted file mode 100644
index b010e20abc..0000000000
--- a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Document>
-  # Artifact Reports
-  A large portion of Xenoarchaeology gameplay revolves around the interpretation of artifact reports, which are created at the [color=#a4885c]analysis console[/color] after an artifact is scanned. Reports contain the following information:
-
-  - [color=#a4885c]Node ID:[/color] a unique numeric ID corresponding to this artifact's node. Useful in conjunction with a [color=#a4885c]node scanner[/color] for quickly identifying recurring nodes.
-
-  - [color=#a4885c]Depth:[/color] a distance from the starting node (depth 0). This is a good shorthand for the value and danger of a node.
-
-  - [color=#a4885c]Activation status:[/color] whether or not a node has been activated in the past.
-
-  - [color=#a4885c]Stimulus:[/color] the stimulus for that particular node.
-
-  - [color=#a4885c]Reaction:[/color] the reaction the stimulus induces. This is often vague, so caution is advised.
-
-  - [color=#a4885c]Edges:[/color] the amount of nodes that are connected to the current node. Using this, you can calculate the total number of nodes as well as organize a map of their connections.
-
-  - [color=#a4885c]Unextracted value:[/color] the amount of research points an artifact will give when extracted. Extracting sets this to zero and traversing new nodes increases it.
-
-  Reports are a helpful tool in manipulating an artifact, especially in the later stages where you are traversing nodes that have already been activated.
-  <Box>
-  <GuideEntityEmbed Entity="PaperArtifactAnalyzer"/>
-  </Box>
-  To help with this process, consider printing out reports, writing down details uncovered during activation, or storing them in a folder nearby.
-</Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/UnlockingNodes.xml b/Resources/ServerInfo/Guidebook/Science/UnlockingNodes.xml
new file mode 100644
index 0000000000..ca93846b68
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Science/UnlockingNodes.xml
@@ -0,0 +1,48 @@
+<Document>
+  # Unlocking Nodes
+  <Box>
+    <GuideEntityEmbed Entity="ComplexXenoArtifact" Caption=""/>
+    <GuideEntityEmbed Entity="ComplexXenoArtifactItem" Caption=""/>
+  </Box>
+
+  To activate and unlock nodes on an artifact, you should:
+  - Check a node on the [bold]Analysis Console[/bold] to check its triggers and effects.
+  - Perform the [bold]triggers[/bold] listed in the console. Some require direct interaction with the artifact, while others may only need the correct environment or a specific action performed nearby.
+  - Once a trigger is successfully performed, the artifact will respond with the message: [italic]"It begins to shift in strange ways..."[/italic]. The [bold]Node Scanner[/bold] will then indicate which specific nodes are being triggered.
+
+  Artifacts enter an unlocking state after the first trigger is met. During this state, any remaining triggers must be completed. The unlocking window initially lasts a few seconds and resets each time a new trigger is activated. This window grows longer with each additional node unlocked, giving more time to complete further triggers.
+
+  Once all required triggers are completed successfully, the artifact will trigger it's effect and a popup will appear saying: [italic]"It slows down, visibly changed."[/italic], and the node will appear as [bold][color=plum]Active[/color][/bold] on the Console.
+
+  If an artifact fails to activate, it will stop resonating and display the message: [italic]"It slows down before uneventfully stopping."[/italic] After this, it enters a cooldown period before it can be activated again.
+
+  The order of trigger activation [bold]does not matter[/bold] for individual nodes. [italic]However[/italic], some triggers affect multiple nodes. As a rule of thumb, start with a trigger that is unique to the node you want to unlock. Activating a trigger for a different node during this phase prevents the target node from unlocking until the artifact’s cooldown ends.
+
+  <GuideReagentEmbed Reagent="Artifexium"/>
+
+  ## Active Nodes
+  Once unlocked, a node is considered active. Only the highest unlocked nodes in a tree’s layer are activatable, lower nodes in the same tree cannot be triggered anymore once a higher node has been activated.
+
+  Artifacts often have multiple trees. Layer precedence applies within each tree, but different trees operate independently. This means nodes in different trees can be activated simultaneously as long as they are the highest unlocked nodes in their respective trees.
+
+  [bold]Manual activation triggers all unlocked nodes at once and consumes durability.[/bold]
+
+  <GuideReagentEmbed Reagent="ArtifactGlue"/>
+
+  ## Triggers
+  Examples include:
+  - Examining the artifact
+  - Playing an instrument
+  - Damaging or throwing it
+  - Exposing it to gases (plasma, tritium, etc.)
+  - Changing pressure or temperature
+  - Using tools (screwdriver, multitool, crowbar, wrench)
+  - Splashing reagents (blood, water, ammonia, etc.)
+  - Killing something nearby
+
+  ## Effects
+  Effects can be:
+  - [color=green]Harmless:[/color] producing plants, animals, or junk
+  - [color=#00ccff]Helpful:[/color] charging batteries, creating instruments or money
+  - [color=red]Hazardous:[/color] anomalies, radiation, explosions, hostile fauna
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml b/Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
index cd717511c3..19c04cfdc7 100644
--- a/Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
@@ -1,57 +1,51 @@
 <Document>
-# Xenoarchaeology
-Xenoarchaeology is a science subdepartment focused on researching and experimenting on alien artifacts.
+  # Xenoarchaeology
 
-At the start of each shift, the Science department will usually have access to at least two artifacts to experiment on. You can buy more by talking to the Cargo department.
+  Xenoarchaeology is a branch of Science focused on researching alien [bold]artifacts[/bold].
 
-By researching the unique things each artifact can do, you gain Research Points, increase the artifact's sale value, and potentially discover a useful ability or two that can help your department or the whole station!
+  Unlocking their secrets grants research points and reveals strange, potentially useful, or dangerous effects.
 
-## Artifact Nodes
-<Box>
-<GuideEntityEmbed Entity="ComplexXenoArtifact" Caption=""/>
-<GuideEntityEmbed Entity="ComplexXenoArtifactItem" Caption=""/>
-</Box>
-Artifacts consist of a randomly-generated tree of nodes. These nodes have a "[color=#a4885c]depth[/color]", representing how dangerous the node is, and the number of other nodes connected to it, called "[color=#a4885c]edges[/color]",
+  At round start, Science usually has one or two artifacts in the lab. More can be:
+  - Ordered from [color=orange]Cargo[/color]
+  - Found by [color=orange]Salvage[/color]
+  - Assembled from [bold]fragments[/bold]
+  - Appear during certain station events
 
-Artifacts always start at depth zero, the root of the tree. Travelling the tree to find as many nodes as possible is the main goal of the scientists working on them. Knowledge is extracted from nodes to gain Research Points and increase the artifact's sale value.
+  ## Artifacts
+  <Box>
+    <GuideEntityEmbed Entity="ComplexXenoArtifact" Caption=""/>
+    <GuideEntityEmbed Entity="ComplexXenoArtifactItem" Caption=""/>
+  </Box>
 
-Each node has two components: its [color=#a4885c]stimulus[/color] and a [color=#a4885c]reaction[/color].
+  Artifacts contain [bold]nodes[/bold] arranged in [bold]layers[/bold].
+  - Unlocking a node unlocks connected nodes on upper layers.
+  - Each node has [bold]triggers[/bold], actions that must be performed near the artifact to unlock a node.
+  - When a node is unlocked, its [bold]effect[/bold] will trigger, and the node becomes [bold][color=plum]Active[/color][/bold].
+  - Each node has [bold]durability[/bold]: the number of times it can be manually activated after being unlocked.
+  - Higher nodes are harder to reach but give more [bold]research points[/bold].
+  - Unlocking all nodes provides no special bonus, but every node yields research points.
 
-A stimulus is the external behavior that triggers the reaction. There's a variety of these, and higher depth nodes have more difficult to accomplish stimuli. Some stimuli will need improvisation to trigger, and you may need to talk to other departments to get everything you need.
+  ## Equipment
+  <Box>
+    <GuideEntityEmbed Entity="MachineArtifactAnalyzer" Caption="Analyzer"/>
+    <GuideEntityEmbed Entity="ComputerAnalysisConsole" Caption="Analysis Console"/>
+    <GuideEntityEmbed Entity="NodeScanner" Caption="Node Scanner"/>
+  </Box>
+  - [bold]Artifact Analyzer:[/bold] Stationary device that scans artifacts, sending data to the Console.
+  - [bold][textlink="Analysis Console:" link="AnalysisConsole"][/bold] Stationary device that is used to display the node tree. Must be linked to an Analyzer with a multitool.
+  - [bold]Node Scanner:[/bold] Small hand-held device that can show the ID of the node currently being activated and whether the artifact is ready to trigger, letting scientist have minimal required knowledge for operating inside chamber near artifact and far without direct access to console.
 
-Some reactions are instantaneous effects while others are permanent changes. Once an artifact is triggered, the reaction causes the artifact to randomly move to another node it is linked to.
-
-With some experimental science, you can begin to grasp how the different nodes of an artifact are connected, and how to move between them by repeatedly activating nodes.
-
-All non-zero-depth nodes will have exactly one edge that leads up to its parent node. All other edges a node has lead down to the next depth.
-
-## Artifact Analyzer and Analysis Console
-<Box>
-<GuideEntityEmbed Entity="MachineArtifactAnalyzer"/>
-<GuideEntityEmbed Entity="ComputerAnalysisConsole"/>
-</Box>
-The main equipment that you'll be using for Xenoarchaeology is the [color=#a4885c]artifact analyzer[/color] and the [color=#a4885c]analysis console[/color]. You can use these to create reports that contain valuable information about an artifact.
-
-To set them up, simply link them with a network configurator and set an artifact on top of the analyzer. Every station has at least one of these machines already set up.
-
-Use the console's [color=#a4885c]scan[/color] button to discover what stimulus the artifact needs and what its reaction will do. Scanning takes thirty seconds.
-
-Use the [color=#a4885c]print[/color] button to save the scan result, so you can refer to it later.
-
-Once you've discovered a new node, you can extract points from the artifact using the [color=#a4885c]Extract[/color] button.
-
-## Assembling Artifacts
-<GuideEntityEmbed Entity="ArtifactFragment" Caption="Artifact Fragment"/>
-
-It is possible to gather multiple artifact fragments and assemble them into a working artifact. You can ask for these from Salvage, who usually find these while mining asteroids or on Expeditions.
-
-## Traversal Bias
-<Box>
-  <GuideEntityEmbed Entity="MachineArtifactAnalyzer"/>
-</Box>
-Artifacts placed on top of a powered artifact analyzer are subjected to a bias which affects which node they will move to after being activated. The bias can be set in the artifact console.
-
-There are two types of biases:
-- [color=#a4885c]Up:[/color] favors nodes closer to the origin. Results in a decrease of depth.
-- [color=#a4885c]Down:[/color] favors nodes farther away from the origin. Results in an increase of depth.
+  <Box>
+    <GuideEntityEmbed Entity="CrateArtifactContainer" Caption="Artifact Container"/>
+    <GuideEntityEmbed Entity="HandheldArtifactContainer" Caption="Handheld Container"/>
+  </Box>
+  - [bold]Artifact Containers:[/bold] Safely store and transports artifacts and prevent nodes from triggering.
+  <Box>
+    <GuideEntityEmbed Entity="MachineArtifactCrusher" Caption="Crusher"/>
+  </Box>
+  - [bold]Artifact Crusher:[/bold] Crushes artifacts into fragments. Four fragments can be rebuilt into a new artifact.
+  <Box>
+    <GuideEntityEmbed Entity="ArtifactFragment" Caption="Artifact Fragment"/>
+  </Box>
+  - [bold]Artifact Fragment:[/bold] Pieces of destroyed artifacts. Four fragments can be rebuilt into a new artifact using the craft menu.
 </Document>

From 0f3b8f37a63f3e992a1d057ddb3582ec6d23b167 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 11 Oct 2025 17:33:29 +0000
Subject: [PATCH 165/216] Automatic changelog update

---
 Resources/Changelog/Admin.yml     |  5 ++---
 Resources/Changelog/Changelog.yml | 19 ++++++++-----------
 Resources/Changelog/Maps.yml      |  5 ++---
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 474a16da3a..b2ebdecbfd 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1,7 +1,4 @@
 AdminOnly: true
-Name: Admin
-Order: 2
-# Do NOT put anything after the Entries section, in order to prevent merge conflict with new CL entries
 Entries:
 - author: DrSmugleaf
   changes:
@@ -1464,3 +1461,5 @@ Entries:
   id: 177
   time: '2025-10-05T07:40:15.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40709
+Name: Admin
+Order: 2
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 603ebfd2ea..1043d32de0 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
-# Do NOT put anything after the Entries section, in order to prevent merge conflict with new CL entries
-Entries:
-- author: ArtisticRoomba
-  changes:
-  - message: The TEG's efficiency in extracting power from gasses has been tweaked
-      to promote dual-loop designs that recycle the waste heat of gasses, and punish
-      "meta" single loop designs.
-    type: Tweak
-  id: 8570
-  time: '2025-05-26T11:53:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37728
+Entries:
 - author: ArtisticRoomba
   changes:
   - message: The TEG now outputs smoother power when pressure across the circulators
@@ -3953,3 +3943,10 @@ Entries:
   id: 9072
   time: '2025-10-11T05:14:34.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40822
+- author: TrixxedHeart
+  changes:
+  - message: Updated Xenoarchaeology guidebook page to current system.
+    type: Tweak
+  id: 9073
+  time: '2025-10-11T17:32:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40621
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 557a260ac4..0c8783e4a5 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -1,6 +1,4 @@
-Order: 1
-# Do NOT put anything after the Entries section, in order to prevent merge conflict with new CL entries
-Entries:
+Entries:
 - author: ArtisticRoomba
   changes:
   - message: The mapping changelog has been added! This primarily serves as a way
@@ -780,3 +778,4 @@ Entries:
   id: 94
   time: '2025-10-10T20:33:03.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40821
+Order: 1

From fab4752a2516ad55b86076ed2feef85496a07b5e Mon Sep 17 00:00:00 2001
From: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com>
Date: Sat, 11 Oct 2025 13:51:00 -0400
Subject: [PATCH 166/216] Infectious anom sprites for moths and arachnids
 (#39508)

* anoms part 1

* frost and tech anoms

* grav, rock, meta file changes

* rock moth

* moth sprites

* YAMLLinter fixes

* okay make them work now
---
 .../Specific/Anomaly/anomaly_injectors.yml    |   60 +
 .../bluespace_ARACHNID.png                    |  Bin 0 -> 3858 bytes
 .../inner_anom_layer.rsi/bluespace_MOTH.png   |  Bin 0 -> 3775 bytes
 .../inner_anom_layer.rsi/fire_ARACHNID.png    |  Bin 0 -> 3567 bytes
 .../inner_anom_layer.rsi/fire_MOTH.png        |  Bin 0 -> 3541 bytes
 .../inner_anom_layer.rsi/flesh_ARACHNID.png   |  Bin 0 -> 4232 bytes
 .../inner_anom_layer.rsi/flesh_MOTH.png       |  Bin 0 -> 4127 bytes
 .../inner_anom_layer.rsi/flora_ARACHNID.png   |  Bin 0 -> 4776 bytes
 .../inner_anom_layer.rsi/flora_MOTH.png       |  Bin 0 -> 4692 bytes
 .../inner_anom_layer.rsi/frost_ARACHNID.png   |  Bin 0 -> 5145 bytes
 .../inner_anom_layer.rsi/frost_MOTH.png       |  Bin 0 -> 5018 bytes
 .../inner_anom_layer.rsi/grav_ARACHNID.png    |  Bin 0 -> 5253 bytes
 .../inner_anom_layer.rsi/grav_MOTH.png        |  Bin 0 -> 5304 bytes
 .../Anomalies/inner_anom_layer.rsi/meta.json  | 1938 +++++++++++------
 .../inner_anom_layer.rsi/rock_ARACHNID.png    |  Bin 0 -> 4456 bytes
 .../inner_anom_layer.rsi/rock_MOTH.png        |  Bin 0 -> 4454 bytes
 .../inner_anom_layer.rsi/shadow_ARACHNID.png  |  Bin 0 -> 3807 bytes
 .../inner_anom_layer.rsi/shadow_MOTH.png      |  Bin 0 -> 3749 bytes
 .../inner_anom_layer.rsi/shock_ARACHNID.png   |  Bin 0 -> 3795 bytes
 .../inner_anom_layer.rsi/shock_MOTH.png       |  Bin 0 -> 3615 bytes
 .../inner_anom_layer.rsi/tech_ARACHNID.png    |  Bin 0 -> 4136 bytes
 .../inner_anom_layer.rsi/tech_MOTH.png        |  Bin 0 -> 4073 bytes
 22 files changed, 1345 insertions(+), 653 deletions(-)
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_ARACHNID.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_MOTH.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_ARACHNID.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_MOTH.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_ARACHNID.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_MOTH.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_ARACHNID.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_MOTH.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_ARACHNID.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_MOTH.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_ARACHNID.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_MOTH.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_ARACHNID.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_MOTH.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_ARACHNID.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_MOTH.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_ARACHNID.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_MOTH.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_ARACHNID.png
 create mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_MOTH.png

diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
index 0ad1aa17f4..a94074489e 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
@@ -59,6 +59,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: fire_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: fire_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: fire_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -91,6 +97,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: shock_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: shock_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: shock_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -123,6 +135,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: shadow_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: shadow_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: shadow_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -155,6 +173,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: frost_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: frost_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: frost_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -187,6 +211,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: flora_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: flora_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: flora_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -219,6 +249,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: bluespace_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: bluespace_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: bluespace_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -251,6 +287,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: flesh_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: flesh_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: flesh_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -284,6 +326,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: grav_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: grav_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: grav_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -316,6 +364,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: tech_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: tech_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: tech_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -349,6 +403,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: rock_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: rock_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: rock_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_ARACHNID.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1ea06389c67676f2006ef972513cb1e1b6a8655
GIT binary patch
literal 3858
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_MOTH.png
new file mode 100644
index 0000000000000000000000000000000000000000..08cabeb4c6d4d0ce2c2d872b974a1640f7ed887b
GIT binary patch
literal 3775
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
ItN;)F4|xLf_W%F@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_ARACHNID.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8ed6a3dafbdeef3d10e8a4d9b6c6281784a568b
GIT binary patch
literal 3567
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
R#mTn-#s+sFAN1gn{{lMtqFw+1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_MOTH.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae0c2e7bebb6d2d2bf53a7e60852639f20b0dc6e
GIT binary patch
literal 3541
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
Wvfv(Ok^b%{01Z_gmA{qXVgCdvii?W?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_ARACHNID.png
new file mode 100644
index 0000000000000000000000000000000000000000..5549b1481d4a73a196eeb64c7296a3b339119edd
GIT binary patch
literal 4232
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_MOTH.png
new file mode 100644
index 0000000000000000000000000000000000000000..a912a1671217680bd274a1a05d122c999c101eba
GIT binary patch
literal 4127
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_ARACHNID.png
new file mode 100644
index 0000000000000000000000000000000000000000..36a9a8520e24c0451b40ac730004a39dfaca1282
GIT binary patch
literal 4776
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_MOTH.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6e96dc028fe4d43c0b2fd60826da2e897f4648f
GIT binary patch
literal 4692
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_ARACHNID.png
new file mode 100644
index 0000000000000000000000000000000000000000..a12a57e578b3992b85569a3355b988c55ed1ed53
GIT binary patch
literal 5145
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_MOTH.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f20329d789160de94bc8c8810a2e6c36ceda738
GIT binary patch
literal 5018
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
F`7hk>YsCNn

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_ARACHNID.png
new file mode 100644
index 0000000000000000000000000000000000000000..057fce5807cf272a65f4cb8389ed8a0bd7974c7d
GIT binary patch
literal 5253
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
HI^_QV((B}3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_MOTH.png
new file mode 100644
index 0000000000000000000000000000000000000000..01dc58d1922d5bdcb82873dc751d74fd67dcfae9
GIT binary patch
literal 5304
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
bngo_?SJ~a`&p5f1eSm?^edq@*r||y=P^<Z2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json
index 4aa15c86cd..e1e3a0f546 100644
--- a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json
+++ b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json
@@ -1,656 +1,1288 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by TheShuEd (github) for Space Station 14",
-  "states": [
-    {
-      "name": "bluespace",
-      "directions": 4,
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "bluespace_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "fire",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "fire_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "flesh",
-      "directions": 4,
-      "delays": [
-        [
-          0.8,
-          0.2,
-          0.2
-        ],
-        [
-          0.8,
-          0.2,
-          0.2
-        ],
-        [
-          0.8,
-          0.2,
-          0.2
-        ],
-        [
-          0.8,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "flesh_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.8,
-          0.2,
-          0.2
-        ],
-        [
-          0.8,
-          0.2,
-          0.2
-        ],
-        [
-          0.8,
-          0.2,
-          0.2
-        ],
-        [
-          0.8,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "flora",
-      "directions": 4,
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "flora_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "frost",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "frost_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "grav",
-      "directions": 4,
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "grav_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "rock",
-      "directions": 4,
-      "delays": [
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "rock_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "santa",
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "shadow",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "shadow_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "shock",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "shock_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "tech",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ],
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ],
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ],
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ]
-      ]
-    },
-    {
-      "name": "tech_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ],
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ],
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ],
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ]
-      ]
-    }
-  ]
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by TheShuEd (github) for Space Station 14, originals modified by HTMLSystem to fit arachnids and moths",
+    "states": [
+        {
+            "name": "bluespace",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "bluespace_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "bluespace_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "bluespace_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "fire",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "fire_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "fire_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "fire_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "flesh",
+            "directions": 4,
+            "delays": [
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "flesh_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "flesh_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "flesh_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "flora",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "flora_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "flora_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "flora_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "frost",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "frost_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "frost_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "frost_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "grav",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "grav_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "grav_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "grav_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "rock",
+            "directions": 4,
+            "delays": [
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "rock_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "rock_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "rock_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "santa",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shadow",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shadow_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shadow_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shadow_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shock",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shock_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shock_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shock_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "tech",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "tech_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "tech_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "tech_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_ARACHNID.png
new file mode 100644
index 0000000000000000000000000000000000000000..c01cb92e341a5d552c8b7b355f6762d477b489e5
GIT binary patch
literal 4456
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
Q`=$Ub^=E2dRc%B63p^KJr~m)}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_MOTH.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac492e7626a6b88ab70adf3d0a134da1a1e86509
GIT binary patch
literal 4454
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_ARACHNID.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fb0836e52c076dc5a071b8a20d87c5e7b04f10b
GIT binary patch
literal 3807
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
WGli%iChObp0D#qX)&5a|hWsCf5D`EC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_MOTH.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9a592a85f10a8182861cdcaf0b5f65cc7fdf0d2
GIT binary patch
literal 3749
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_ARACHNID.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfead742e3750aeb356cf720a964e72f8b48015a
GIT binary patch
literal 3795
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
Z#5F9V|8?by_}xbUbTkb$KB_r}{|AA_1X2J1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_MOTH.png
new file mode 100644
index 0000000000000000000000000000000000000000..459709829dceea44475f73075a5348cef184cddd
GIT binary patch
literal 3615
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
aV=hd3zvOZ`TgKIQ0s1<|+V3@C;r|CGma#ej

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_ARACHNID.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8e251e02e6f9ed6e746b808b0a3f9330a2d6a6b
GIT binary patch
literal 4136
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_MOTH.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3ea54713a437d83539340f6b7b69e43173e8c2d
GIT binary patch
literal 4073
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
W;c>|F<n-mA1a!3?Lf>m5BL4%Fj(_j~

literal 0
HcmV?d00001


From eaf3c0bd3ab712e2e3ae6ed4836faec08f2a5807 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 11 Oct 2025 18:02:56 +0000
Subject: [PATCH 167/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1043d32de0..686fc2cff2 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: ArtisticRoomba
-  changes:
-  - message: The TEG now outputs smoother power when pressure across the circulators
-      flutter. (This was causing epilepsy in extreme circumstances).
-    type: Fix
-  id: 8571
-  time: '2025-05-26T12:07:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37658
 - author: chromiumboy
   changes:
   - message: Sentry turret control panels can now be found adjacent to rooms containing
@@ -3950,3 +3942,10 @@
   id: 9073
   time: '2025-10-11T17:32:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40621
+- author: HTMLSystem
+  changes:
+  - message: Added infectious anom sprites for moths and arachnids.
+    type: Add
+  id: 9074
+  time: '2025-10-11T18:01:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39508

From 98e5e9a5cb5b811f6550f5d08f739ba4da86902e Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Sat, 11 Oct 2025 11:39:16 -0700
Subject: [PATCH 168/216] hugbox tag fix (#40833)

---
 Resources/Locale/en-US/_Moffstation/recipes/tags.ftl | 1 -
 Resources/Locale/en-US/recipes/tags.ftl              | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 Resources/Locale/en-US/_Moffstation/recipes/tags.ftl

diff --git a/Resources/Locale/en-US/_Moffstation/recipes/tags.ftl b/Resources/Locale/en-US/_Moffstation/recipes/tags.ftl
deleted file mode 100644
index 73b392534a..0000000000
--- a/Resources/Locale/en-US/_Moffstation/recipes/tags.ftl
+++ /dev/null
@@ -1 +0,0 @@
-construction-graph-tag-boxhug = a box of hugs
diff --git a/Resources/Locale/en-US/recipes/tags.ftl b/Resources/Locale/en-US/recipes/tags.ftl
index 96c0729881..1b4ca5656d 100644
--- a/Resources/Locale/en-US/recipes/tags.ftl
+++ b/Resources/Locale/en-US/recipes/tags.ftl
@@ -8,6 +8,7 @@ construction-graph-tag-clown-bike-horn = bike horn
 construction-graph-tag-clowne-horn = broken bike horn
 construction-graph-tag-happy-honk-meal = happy honk meal
 construction-graph-tag-woeful-cluwne-meal = woeful cluwne meal
+construction-graph-tag-boxhug = a box of hugs
 
 # mime
 construction-graph-tag-suspenders = suspenders

From 5ade6688e78548175c86d60ea5211137d252b87e Mon Sep 17 00:00:00 2001
From: Perry Fraser <perryprog@users.noreply.github.com>
Date: Sat, 11 Oct 2025 15:42:10 -0400
Subject: [PATCH 169/216] HOTFIX Fix pickup effects occurring with verb
 creation (#38705)

* fix: don't run pickup effects on verb creation

* review

* redundant

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Content.Server/Lube/LubedSystem.cs            | 45 +++++++++++++-----
 .../ActionBlocker/ActionBlockerSystem.cs      | 12 +++--
 .../Containers/ItemSlot/ItemSlotsSystem.cs    |  2 +-
 .../SharedHandsSystem.Interactions.cs         |  2 +-
 .../EntitySystems/SharedHandsSystem.Pickup.cs | 47 ++++++++++++++++---
 Content.Shared/Hands/HandEvents.cs            | 27 +++++++++++
 Content.Shared/Item/MultiHandedItemSystem.cs  | 11 +++--
 Content.Shared/Item/PickupAttemptEvent.cs     | 27 +++++++++--
 .../Strip/SharedStrippableSystem.cs           |  2 +-
 9 files changed, 141 insertions(+), 34 deletions(-)

diff --git a/Content.Server/Lube/LubedSystem.cs b/Content.Server/Lube/LubedSystem.cs
index 3c536dcceb..01a2fa8dde 100644
--- a/Content.Server/Lube/LubedSystem.cs
+++ b/Content.Server/Lube/LubedSystem.cs
@@ -1,9 +1,11 @@
+using Content.Shared.Hands;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Item;
 using Content.Shared.Lube;
 using Content.Shared.NameModifier.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Throwing;
-using Robust.Shared.Containers;
 using Robust.Shared.Random;
 
 namespace Content.Server.Lube;
@@ -21,7 +23,7 @@ public sealed class LubedSystem : EntitySystem
         base.Initialize();
 
         SubscribeLocalEvent<LubedComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<LubedComponent, ContainerGettingInsertedAttemptEvent>(OnHandPickUp);
+        SubscribeLocalEvent<LubedComponent, BeforeGettingEquippedHandEvent>(OnHandPickUp);
         SubscribeLocalEvent<LubedComponent, RefreshNameModifiersEvent>(OnRefreshNameModifiers);
     }
 
@@ -30,21 +32,38 @@ public sealed class LubedSystem : EntitySystem
         _nameMod.RefreshNameModifiers(uid);
     }
 
-    private void OnHandPickUp(EntityUid uid, LubedComponent component, ContainerGettingInsertedAttemptEvent args)
+    /// <remarks>
+    /// Note to whoever makes this predicted—there is a mispredict here that
+    /// would be nice to keep! If this is in shared, the client will predict
+    /// this and not run the pickup animation in <see cref="SharedHandsSystem"/>
+    /// which would (probably) make this effect look less funny. You will
+    /// probably want to either tweak <see cref="BeforeGettingEquippedHandEvent"/>
+    /// to be able to cancel but still run the animation or something—we do want
+    /// the event to run before the animation for stuff like
+    /// <see cref="MultiHandedItemSystem.OnBeforeEquipped"/>.
+    /// </remarks>
+    private void OnHandPickUp(Entity<LubedComponent> ent, ref BeforeGettingEquippedHandEvent args)
     {
-        if (component.SlipsLeft <= 0)
+        if (args.Cancelled)
+            return;
+
+        if (ent.Comp.SlipsLeft <= 0)
         {
-            RemComp<LubedComponent>(uid);
-            _nameMod.RefreshNameModifiers(uid);
+            RemComp<LubedComponent>(ent);
+            _nameMod.RefreshNameModifiers(ent.Owner);
             return;
         }
-        component.SlipsLeft--;
-        args.Cancel();
-        var user = args.Container.Owner;
-        _transform.SetCoordinates(uid, Transform(user).Coordinates);
-        _transform.AttachToGridOrMap(uid);
-        _throwing.TryThrow(uid, _random.NextVector2(), baseThrowSpeed: component.SlipStrength);
-        _popup.PopupEntity(Loc.GetString("lube-slip", ("target", Identity.Entity(uid, EntityManager))), user, user, PopupType.MediumCaution);
+
+        ent.Comp.SlipsLeft--;
+        args.Cancelled = true;
+
+        _transform.SetCoordinates(ent, Transform(args.User).Coordinates);
+        _transform.AttachToGridOrMap(ent);
+        _throwing.TryThrow(ent, _random.NextVector2(), ent.Comp.SlipStrength);
+        _popup.PopupEntity(Loc.GetString("lube-slip", ("target", Identity.Entity(ent, EntityManager))),
+            args.User,
+            args.User,
+            PopupType.MediumCaution);
     }
 
     private void OnRefreshNameModifiers(Entity<LubedComponent> entity, ref RefreshNameModifiersEvent args)
diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index 08eac657c0..c256872cc7 100644
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -167,15 +167,21 @@ namespace Content.Shared.ActionBlocker
             return !ev.Cancelled;
         }
 
-        public bool CanPickup(EntityUid user, EntityUid item)
+        /// <summary>
+        /// Whether a user can pickup the given item.
+        /// </summary>
+        /// <param name="user">The mob trying to pick up the item.</param>
+        /// <param name="item">The item being picked up.</param>
+        /// <param name="showPopup">Whether or not to show a popup to the player telling them why the attempt failed.</param>
+        public bool CanPickup(EntityUid user, EntityUid item, bool showPopup = false)
         {
-            var userEv = new PickupAttemptEvent(user, item);
+            var userEv = new PickupAttemptEvent(user, item, showPopup);
             RaiseLocalEvent(user, userEv);
 
             if (userEv.Cancelled)
                 return false;
 
-            var itemEv = new GettingPickedUpAttemptEvent(user, item);
+            var itemEv = new GettingPickedUpAttemptEvent(user, item, showPopup);
             RaiseLocalEvent(item, itemEv);
 
             return !itemEv.Cancelled;
diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
index 88e6ca44dc..718d2a0524 100644
--- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
+++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
@@ -573,7 +573,7 @@ namespace Content.Shared.Containers.ItemSlots
             item = slot.Item;
 
             // This handles user logic
-            if (user != null && item != null && !_actionBlockerSystem.CanPickup(user.Value, item.Value))
+            if (user != null && item != null && !_actionBlockerSystem.CanPickup(user.Value, item.Value, showPopup: true))
                 return false;
 
             Eject(uid, slot, item!.Value, user, excludeUserAudio);
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
index 0e8d7a7556..cd6085535a 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
@@ -181,7 +181,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (!CanDropHeld(uid, handName, checkActionBlocker))
             return false;
 
-        if (!CanPickupToHand(uid, entity.Value, handsComp.ActiveHandId, checkActionBlocker, handsComp))
+        if (!CanPickupToHand(uid, entity.Value, handsComp.ActiveHandId, checkActionBlocker: checkActionBlocker, handsComp: handsComp))
             return false;
 
         DoDrop(uid, handName, false, log: false);
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
index ea13004313..c19de9629a 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using Content.Shared.Database;
 using Content.Shared.Hands.Components;
 using Content.Shared.Item;
@@ -84,7 +83,10 @@ public abstract partial class SharedHandsSystem
         if (!Resolve(entity, ref item, false))
             return false;
 
-        if (!CanPickupToHand(uid, entity, handId, checkActionBlocker, handsComp, item))
+        if (!CanPickupToHand(uid, entity, handId, checkActionBlocker: checkActionBlocker, showPopup: true, handsComp: handsComp, item: item))
+            return false;
+
+        if (!BeforeDoPickup((uid, handsComp), entity))
             return false;
 
         if (animate)
@@ -151,7 +153,11 @@ public abstract partial class SharedHandsSystem
         return false;
     }
 
-    public bool CanPickupAnyHand(EntityUid uid, EntityUid entity, bool checkActionBlocker = true, HandsComponent? handsComp = null, ItemComponent? item = null)
+    /// <summary>
+    /// Checks whether a given item will fit into the user's first free hand.
+    /// Unless otherwise specified, this will also check the general CanPickup action blocker.
+    /// </summary>
+    public bool CanPickupAnyHand(EntityUid uid, EntityUid entity, bool checkActionBlocker = true, bool showPopup = false, HandsComponent? handsComp = null, ItemComponent? item = null)
     {
         if (!Resolve(uid, ref handsComp, false))
             return false;
@@ -159,13 +165,14 @@ public abstract partial class SharedHandsSystem
         if (!TryGetEmptyHand((uid, handsComp), out var hand))
             return false;
 
-        return CanPickupToHand(uid, entity, hand, checkActionBlocker, handsComp, item);
+        return CanPickupToHand(uid, entity, hand, checkActionBlocker, showPopup, handsComp, item);
     }
 
     /// <summary>
-    ///     Checks whether a given item will fit into a specific user's hand. Unless otherwise specified, this will also check the general CanPickup action blocker.
+    /// Checks whether a given item will fit into a specific user's hand.
+    /// Unless otherwise specified, this will also check the general CanPickup action blocker.
     /// </summary>
-    public bool CanPickupToHand(EntityUid uid, EntityUid entity, string handId, bool checkActionBlocker = true, HandsComponent? handsComp = null, ItemComponent? item = null)
+    public bool CanPickupToHand(EntityUid uid, EntityUid entity, string handId, bool checkActionBlocker = true, bool showPopup = false, HandsComponent? handsComp = null, ItemComponent? item = null)
     {
         if (!Resolve(uid, ref handsComp, false))
             return false;
@@ -176,13 +183,17 @@ public abstract partial class SharedHandsSystem
         if (handContainer.ContainedEntities.FirstOrNull() != null)
             return false;
 
+        // Huh, seems kinda weird that this system passes item comp around
+        // everywhere but it's never actually used besides being resolved.
+        // I wouldn't be surprised if there's some API simplifications that
+        // could be made with respect to that.
         if (!Resolve(entity, ref item, false))
             return false;
 
         if (TryComp(entity, out PhysicsComponent? physics) && physics.BodyType == BodyType.Static)
             return false;
 
-        if (checkActionBlocker && !_actionBlocker.CanPickup(uid, entity))
+        if (checkActionBlocker && !_actionBlocker.CanPickup(uid, entity, showPopup))
             return false;
 
         if (!CheckWhitelists((uid, handsComp), handId, entity))
@@ -232,6 +243,28 @@ public abstract partial class SharedHandsSystem
         }
     }
 
+    /// <summary>
+    /// Small helper function meant as a last step before <see cref="DoPickup"/>
+    /// is called. Used to run a cancelable before pickup event that can have
+    /// side effects, unlike the side effect free <see cref="GettingPickedUpAttemptEvent"/>.
+    /// </summary>
+    private bool BeforeDoPickup(Entity<HandsComponent?> user, EntityUid item)
+    {
+        if (!Resolve(user, ref user.Comp))
+            return false;
+
+        var userEv = new BeforeEquippingHandEvent(item);
+        RaiseLocalEvent(user, ref userEv);
+
+        if (userEv.Cancelled)
+            return false;
+
+        var itemEv = new BeforeGettingEquippedHandEvent(user);
+        RaiseLocalEvent(item, ref itemEv);
+
+        return !itemEv.Cancelled;
+    }
+
     /// <summary>
     ///     Puts an entity into the player's hand, assumes that the insertion is allowed. In general, you should not be calling this function directly.
     /// </summary>
diff --git a/Content.Shared/Hands/HandEvents.cs b/Content.Shared/Hands/HandEvents.cs
index 0499c05f42..3d3cb9a322 100644
--- a/Content.Shared/Hands/HandEvents.cs
+++ b/Content.Shared/Hands/HandEvents.cs
@@ -1,5 +1,6 @@
 using System.Numerics;
 using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
@@ -156,6 +157,32 @@ namespace Content.Shared.Hands
         }
     }
 
+    /// <summary>
+    /// Raised against an item being picked up before it is actually inserted
+    /// into the pick-up-ers hand container. This can be handled with side
+    /// effects, and may be canceled preventing the pickup in a way that
+    /// <see cref="SharedHandsSystem.CanPickupToHand"/> and similar don't see.
+    /// </summary>
+    /// <param name="User">The user picking up the item.</param>
+    /// <param name="Cancelled">
+    /// If true, the item will not be equipped into the user's hand.
+    /// </param>
+    [ByRefEvent]
+    public record struct BeforeGettingEquippedHandEvent(EntityUid User, bool Cancelled = false);
+
+    /// <summary>
+    /// Raised against a mob picking up and item before it is actually inserted
+    /// into the pick-up-ers hand container. This can be handled with side
+    /// effects, and may be canceled preventing the pickup in a way that
+    /// <see cref="SharedHandsSystem.CanPickupToHand"/> and similar don't see.
+    /// </summary>
+    /// <param name="Item">The item being picked up.</param>
+    /// <param name="Cancelled">
+    /// If true, the item will not be equipped into the user's hand.
+    /// </param>
+    [ByRefEvent]
+    public record struct BeforeEquippingHandEvent(EntityUid Item, bool Cancelled = false);
+
     /// <summary>
     ///     Raised when putting an entity into a hand slot
     /// </summary>
diff --git a/Content.Shared/Item/MultiHandedItemSystem.cs b/Content.Shared/Item/MultiHandedItemSystem.cs
index db64610eae..9d30d57a91 100644
--- a/Content.Shared/Item/MultiHandedItemSystem.cs
+++ b/Content.Shared/Item/MultiHandedItemSystem.cs
@@ -37,12 +37,17 @@ public sealed class MultiHandedItemSystem : EntitySystem
 
     private void OnAttemptPickup(Entity<MultiHandedItemComponent> ent, ref GettingPickedUpAttemptEvent args)
     {
-        if (_hands.CountFreeHands(args.User) >= ent.Comp.HandsNeeded)
+        if (args.Cancelled || _hands.CountFreeHands(args.User) >= ent.Comp.HandsNeeded)
             return;
 
         args.Cancel();
-        _popup.PopupPredictedCursor(Loc.GetString("multi-handed-item-pick-up-fail",
-            ("number", ent.Comp.HandsNeeded - 1), ("item", ent.Owner)), args.User);
+
+        if (args.ShowPopup)
+            _popup.PopupPredictedCursor(
+                Loc.GetString("multi-handed-item-pick-up-fail",
+                    ("number", ent.Comp.HandsNeeded - 1),
+                    ("item", ent.Owner)),
+                args.User);
     }
 
     private void OnVirtualItemDeleted(Entity<MultiHandedItemComponent> ent, ref VirtualItemDeletedEvent args)
diff --git a/Content.Shared/Item/PickupAttemptEvent.cs b/Content.Shared/Item/PickupAttemptEvent.cs
index eb0b4c8dcc..c8382fa08f 100644
--- a/Content.Shared/Item/PickupAttemptEvent.cs
+++ b/Content.Shared/Item/PickupAttemptEvent.cs
@@ -1,30 +1,47 @@
 namespace Content.Shared.Item;
 
 /// <summary>
-///     Raised on a *mob* when it tries to pickup something
+/// Raised on a *mob* when it tries to pickup something.
+/// IMPORTANT: Attempt event subscriptions should not be doing any state changes like throwing items, opening UIs, playing sounds etc!
 /// </summary>
 public sealed class PickupAttemptEvent : BasePickupAttemptEvent
 {
-    public PickupAttemptEvent(EntityUid user, EntityUid item) : base(user, item) { }
+    public PickupAttemptEvent(EntityUid user, EntityUid item, bool showPopup) : base(user, item, showPopup) { }
 }
 
 /// <summary>
-///     Raised directed at entity being picked up when someone tries to pick it up
+/// Raised directed at entity being picked up when someone tries to pick it up.
+/// IMPORTANT: Attempt event subscriptions should not be doing any state changes like throwing items, opening UIs, playing sounds etc!
 /// </summary>
 public sealed class GettingPickedUpAttemptEvent : BasePickupAttemptEvent
 {
-    public GettingPickedUpAttemptEvent(EntityUid user, EntityUid item) : base(user, item) { }
+    public GettingPickedUpAttemptEvent(EntityUid user, EntityUid item, bool showPopup) : base(user, item, showPopup) { }
 }
 
 [Virtual]
 public class BasePickupAttemptEvent : CancellableEntityEventArgs
 {
+    /// <summary>
+    /// The mob that is picking up the item.
+    /// </summary>
     public readonly EntityUid User;
+    /// <summary>
+    /// The item being picked up.
+    /// </summary>
+
     public readonly EntityUid Item;
 
-    public BasePickupAttemptEvent(EntityUid user, EntityUid item)
+    /// <summary>
+    /// Whether or not to show a popup message to the player telling them why the attempt was cancelled.
+    /// This should be true when this event is raised during interactions, and false when it is raised
+    /// for disabling verbs or similar that do not do the actual pickup.
+    /// </summary>
+    public bool ShowPopup;
+
+    public BasePickupAttemptEvent(EntityUid user, EntityUid item, bool showPopup)
     {
         User = user;
         Item = item;
+        ShowPopup = showPopup;
     }
 }
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index 49be180503..aca0e42945 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -379,7 +379,7 @@ public abstract class SharedStrippableSystem : EntitySystem
             return false;
         }
 
-        if (!_handsSystem.CanPickupToHand(target, activeItem.Value, handName, checkActionBlocker: false, target.Comp))
+        if (!_handsSystem.CanPickupToHand(target, activeItem.Value, handName, checkActionBlocker: false, handsComp: target.Comp))
         {
             _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-put-message", ("owner", Identity.Entity(target, EntityManager))));
             return false;

From b78bfded443ecf4f9f0ee6b6952b1cf4db318133 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Sat, 11 Oct 2025 23:22:12 +0200
Subject: [PATCH 170/216] Prevent mice etc from unwrapping parcels (#40838)

* init

* no wrapping yourself

* Revert "no wrapping yourself"

This reverts commit d66cb17e4c306ff95f33bcedf7fd464aa7b4ff90.
---
 .../ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
index bb0c9437ff..3f1aa2fa80 100644
--- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
+++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
@@ -38,7 +38,10 @@ public sealed partial class ParcelWrappingSystem
     private void OnGetVerbsForWrappedParcel(Entity<WrappedParcelComponent> entity,
         ref GetVerbsEvent<InteractionVerb> args)
     {
-        if (!args.CanAccess)
+        if (!args.CanAccess || !args.CanComplexInteract)
+            return;
+
+        if (entity.Comp.Contents.Contains(args.User))
             return;
 
         // "Capture" the values from `args` because C# doesn't like doing the capturing for `ref` values.

From 5ac2bc22a171fc7e42667f913aa9c7d8478cdc57 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 11 Oct 2025 21:34:09 +0000
Subject: [PATCH 171/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 686fc2cff2..6230a78545 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: chromiumboy
-  changes:
-  - message: Sentry turret control panels can now be found adjacent to rooms containing
-      sentry turrets. Authorized personnel can use these panels to remotely monitor
-      and alter the settings of any linked sentry turrets.
-    type: Add
-  id: 8572
-  time: '2025-05-26T13:00:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35235
 - author: metalgearsloth
   changes:
   - message: You no longer face items for a single frame when clicking while moving.
@@ -3949,3 +3940,10 @@
   id: 9074
   time: '2025-10-11T18:01:49.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39508
+- author: ScarKy0
+  changes:
+  - message: Mice, cockroaches and other small mobs can no longer unwrap parcels.
+    type: Fix
+  id: 9075
+  time: '2025-10-11T21:32:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40838

From 68af461fc73ca20960bdb4152c1483c9565f2053 Mon Sep 17 00:00:00 2001
From: Prole <172158352+Prole0@users.noreply.github.com>
Date: Sat, 11 Oct 2025 14:29:13 -0700
Subject: [PATCH 172/216] Black Gloves Sprite Tweaks (#40825)

* Tweaked

* Clearer Copyright
---
 .../Entities/Clothing/Hands/colored.yml       |   2 --
 .../Gloves/Color/black.rsi/equipped-HAND.png  | Bin 381 -> 362 bytes
 .../Gloves/Color/black.rsi/inhand-left.png    | Bin 16598 -> 262 bytes
 .../Gloves/Color/black.rsi/inhand-right.png   | Bin 16598 -> 276 bytes
 .../Hands/Gloves/Color/black.rsi/meta.json    |   2 +-
 5 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
index 98a2a14989..fb2a400e0b 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
@@ -306,10 +306,8 @@
     inhandVisuals:
       left:
       - state: inhand-left
-        color: "#535353"
       right:
       - state: inhand-right
-        color: "#535353"
   - type: Clothing
     sprite: Clothing/Hands/Gloves/Color/black.rsi
   - type: Butcherable
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png
index 33e36a316fad3c41d0b3f566b445fd0b4a8fcb9a..b9d92b8047ed32441235cacd0367a8cd2f7f360b 100644
GIT binary patch
literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zRXklBLn`LH
zy>&3R#XzLx;Y|(Q2)#so5l8cNC+`NZh<k0&XqwYe)X{U$QMmKJ_1cz$hfh>jc>s+8
zf{JP3Zy){sdrw94*ovU8qH|ZjPMQ*Q>)Y2!v)-+=U0wb^HFDMW8aZ2oV=DxjoH%?J
zwkQ7hx3~R8;rD;-tR9zktvjo4e13CMk8gJL-JSp4-zJ^=8S0g3R~P=?^7ooTng2Qe
zUo~aUI=B2^dRFSo7c4f6tUH)@1U6VVNR!Mk^=+@Wnssyelx_DGX5_xV|LyfpxrZf;
zy9_q(4}SlhV>;J`lQaL$t=jLt!$j`>f3|YjubZ<f`;I*Zd2*G$@PaN@9r5H7AU}J$
L`njxgN@xNAbi1DC

literal 381
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV07_xaSW-L^LEzmyh9Emto@3u
zsh1ry_kBH8|E!)<wS;je<MQqxl{deZPJH0g%5qxP&BNo4?yhy0tv4@Z&5&sjTTsXl
z)o_e4gHeio0TuzfdA5>*hacBnU$?IGb@kTV=q2|Il-gG5d@bFZwfSz^T*c@1yb7MX
zcU}8eaKSG4*9{Z<{`}hcm0h#v^C);u|7`jDaLqiwRi}(zZ{4}Za=*u4O)0_VC4uoz
zHPcu8Jjt;B-0lBd77V%$j~TWw^fF&yGU0RJzCfJ7<gK#*e6!N!1rG~(U;Ll;-!%VR
zZOcW*B_FMSo6fA3PYhznymPM3_t`!78C&Gyi~jFtDXyup$L8UmY-<dgCC|Qo^$ZxS
N44$rjF6*2UngHv&nmPag

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-left.png
index 6180b001785aaf8bbfb1763f9c1961b63e74e54e..13533d2a487572947261cc03cf9fa245e92d39c1 100644
GIT binary patch
delta 235
zcmV<H02Ke$fdPgBkR*Qrb5ch_0Itp)=>Px#z)3_wRCt{2+OZA8FbqUdCddi|N8tYB
zXaqq+D3yQ|s+^+|1OHX7&M+;g;h6yd000000JthM=iTz3>cG2^4j>}RPC;hQh>+*L
zlwt0^9;caEYwhuE<{D^3eCEqYPrw+%+}+fFYJL0|Lz-*q0rX?um2t=OB{FlW?}3U;
z000000000004SW=;waujKR_9_c6b$g{2fIfLDmnb-sA5m`UvudNYx&HN6|+pxdTq^
l@&B$b@QXb@-2ni=b#J=!J!Ke~p%VZA002ovPDHLkV1jIlXV(A#

literal 16598
zcmeI4K}!Nb6vt=XP;-+Y4I&}>3Y{~wSXmcIB7zV)gtsnX6x2Dobm<mE)S*+*p>Gf#
z^3XTv)-ebSI)xp~<_Qyn5G?B(75WdXZyjg;@4erSUf#pgwX&B?%qD~oNx$f>OPi-F
z9+j_mJ9{tEM5`sw6%XP<M4iLMTRAgcD^~V}a8h(x;__-nPR0)W)k5seo}OCBoK;Vr
zg_sw<yS#B^S^0duE>~cH00@8p2!H?xfB*=900@8p2!H?xfB*=900@L6kjv#dA-4wF
zW<oy_$aBC&-|cq5mEo3|&}RiO;W%O`n>BI@NSE}v#~7zzDxL1i(NU$R_1I`w{pwTV
z5!)7tcw8v`el_*|tS8{T+3W^M!Ez3jJn3@}Rsf%^)^B|D)HsH&qw8~M8_}TS&;4s{
zLeog{5Cs7c009sf6#`$c*EQ7(Fe))24iEqV5C8!X009sH0T2KI5C8!X009sH0TB2H
z1h}h2e<9=W!&)a)ftsl4D{b9!_+bU$dtS#>O<zx3-E;INu=NU1;#A3{piI>CRnodu
ze(0+Zwl{(G1emPp>xrv-j@|?|0K=&1>%9ZIe+6jZb{IANVfY+4SU3a$5C8!X=p~SO
hs_e?S68$eg?`I+3e@t$kZ`n6<wB0Y1-TRg8;~x<udUyZ;

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-right.png
index b091c82268db901f5d128d3a261a07d336aa3a75..57ca5d0b231f3cecfb5ef11a32b79b7058345f37 100644
GIT binary patch
delta 249
zcmV<V00#fofdP~PkR*Qrb5ch_0Itp)=>Px#&PhZ;RCt{2+RY8aAPk0Kx9SSWBY6LD
z7y&T^Jt5`NhF>R<-sc?17i5uxEdl@l00000;1@G1S7-QVB;R{al;>zZ05dD9x;M=v
zRqd{V&)EZYLsgX!!c4yH4*80RNR07ywx+29>c{7tCnN5abCz)sg7j2s*By{j8p-8m
zTRt-@cmD%aPs$1a000000002+EM8rhUGHH&U}mxB%s}n^udall1E@hfX9kXK@0Euz
zTmjxQ10%iv7Snft*UZ4}W)rUH!_)f*0Ic-|(3w32r`l(^00000NkvXXu0mjfSPE<|

literal 16598
zcmeI4Jxc>Y5Qg^>i7{sy6G61`H`p3Ul!VI>j3Tk{qY%Nu&M(kfZ2SR&NLm#XtZgKP
z`3q_x*bA|hG%@ZJ3tJ@Fy^VJl;a#}fV|RAu-RCwbGDFUn%T6*enP7}1-C}-)_c^-a
zF@C?>-T&ZSY`f&-*%P~DG5dJ-mXD0=71s_Kvr}|g?5aA!2ZxW`#lrAsbbM@P>U!xd
z&Db<^^YfJx%gW_yHEw|h0w4eaAOHd&00JNY0w4eaAOHd&00JNY0wB<ZKsK9gcbOW9
zVH153FUo&fEidMQ+nVUp1~8Y&v`1|_@J)FMNcu>pmo-BwV{#aYMp+^rXQ?#*QF(xy
z&_^EyIt|bDx}}n<bppiZzZwmdzfk8%A3-3!x=jgy-o9wx&8B!9$X?bb>+V}D9VwG<
z*uDcBIQUOm4Yr3RAOHd&00Mdhc2+m<MJ<5d3Rr;v2!H?xfB*=900@8p2!H?xfB*=9
z00@8p2zVqARQAZPILbVsiib&lUgfjXykBwp0uW^VfT#m-9mi8GKqr{;n6g$tHWtre
z)DMU{0Llhae4RP~p|@9Wd;)^5A26u{=(TY%X9Pgb!^`=3;na^_jw8qSBbJuWFmm!?
v#MFWTBM<-q5CDOo3B0Ut9PpSW`d@%Qiv3uvT)e)Y-H<!CP|iOrY@PlB-ClS@

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
index c8396d7835..6474b1f2e7 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites by SeamLesss (Github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites made by SeamLesss, Inhand & equipped-HAND sprites modified by Prole0 (Github)",
   "size": {
     "x": 32,
     "y": 32

From fbc6dd68585f9ee3d463a132d7e2480a017ad4e5 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Sat, 11 Oct 2025 17:35:44 -0400
Subject: [PATCH 173/216] Durathread can now be printed by autolathes (#40837)

* Durathread can now be printed by autolathes

* Applied material discount
---
 Resources/Prototypes/Recipes/Lathes/Packs/shared.yml | 1 +
 Resources/Prototypes/Recipes/Lathes/sheet.yml        | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml b/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
index f0147d9ca5..dce61b5a01 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
@@ -4,6 +4,7 @@
   id: MaterialsStatic
   recipes:
   - SheetRGlass
+  - MaterialDurathread
 
 - type: latheRecipePack
   id: PartsStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 82ceceee77..2c55232363 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -251,3 +251,12 @@
   completetime: 1
   materials:
     Cotton: 200 #my pyrocloth keeps catching on fire whenever I make it!
+
+- type: latheRecipe
+  id: MaterialDurathread
+  result: MaterialDurathread1
+  applyMaterialDiscount: false
+  completetime: 0
+  materials:
+    Cloth: 100
+    Plastic: 100

From c500fd7531615a4fd226a73455327455861b8b72 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 11 Oct 2025 21:47:54 +0000
Subject: [PATCH 174/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6230a78545..216e33f9be 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: You no longer face items for a single frame when clicking while moving.
-    type: Tweak
-  id: 8573
-  time: '2025-05-27T11:34:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37874
 - author: Simyon
   changes:
   - message: Capacitors and Matter bins have been combined into the Manipulator.
@@ -3947,3 +3940,10 @@
   id: 9075
   time: '2025-10-11T21:32:59.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40838
+- author: Hitlinemoss
+  changes:
+  - message: Autolathes can now print durathread.
+    type: Add
+  id: 9076
+  time: '2025-10-11T21:46:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40837

From b1fa06d6b0bef78f03e712a4684a52e3e9b142d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Sat, 11 Oct 2025 17:01:32 -0500
Subject: [PATCH 175/216] Don't apply discount to reinforced glass  (#40839)

* commit

* arby

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 Content.IntegrationTests/Tests/MaterialArbitrageTest.cs | 2 +-
 Resources/Prototypes/Recipes/Lathes/sheet.yml           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
index 082baf7e64..5cf9831077 100644
--- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
+++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
@@ -33,7 +33,7 @@ public sealed class MaterialArbitrageTest
     [
         "BaseChemistryEmptyVial", "DrinkShotGlass", "SodiumLightTube", "DrinkGlassCoupeShaped",
         "LedLightBulb", "ExteriorLightTube", "LightTube", "DrinkGlass", "DimLightBulb", "LightBulb", "LedLightTube",
-        "SheetRGlass1", "ChemistryEmptyBottle01", "WarmLightBulb",
+        "ChemistryEmptyBottle01", "WarmLightBulb",
     ];
 
     private readonly HashSet<string> _compositionArbitrageIgnore =
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 2c55232363..74c6ad3596 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -32,6 +32,7 @@
 - type: latheRecipe
   id: SheetRGlass
   result: SheetRGlass1
+  applyMaterialDiscount: false # obvious dupe capabilities
   completetime: 0
   materials:
     Glass: 100

From 0ad48093a200d1d424411f5ffe44ca3757c2c5d0 Mon Sep 17 00:00:00 2001
From: Winkarst-cpu <74284083+Winkarst-cpu@users.noreply.github.com>
Date: Sun, 12 Oct 2025 01:21:04 +0300
Subject: [PATCH 176/216] Fix visual bug with masks appearing to be pulled down
 after re-equipping (#40332)

Fix
---
 .../Clothing/EntitySystems/MaskSystem.cs      | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
index 30e00faf0a..0c53349934 100644
--- a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
@@ -62,27 +62,7 @@ public sealed class MaskSystem : EntitySystem
 
     private void OnGotUnequipped(EntityUid uid, MaskComponent mask, GotUnequippedEvent args)
     {
-        if (!mask.IsToggled || !mask.IsToggleable)
-            return;
-
-        mask.IsToggled = false;
-        ToggleMaskComponents(uid, mask, args.Equipee, mask.EquippedPrefix, true);
-    }
-
-    /// <summary>
-    /// Called after setting IsToggled, raises events and dirties.
-    /// </summary>
-    private void ToggleMaskComponents(EntityUid uid, MaskComponent mask, EntityUid wearer, string? equippedPrefix = null, bool isEquip = false)
-    {
-        Dirty(uid, mask);
-        if (mask.ToggleActionEntity is { } action)
-            _actionSystem.SetToggled(action, mask.IsToggled);
-
-        var maskEv = new ItemMaskToggledEvent((uid, mask), wearer);
-        RaiseLocalEvent(uid, ref maskEv);
-
-        var wearerEv = new WearerMaskToggledEvent((uid, mask));
-        RaiseLocalEvent(wearer, ref wearerEv);
+        SetToggled(uid, false);
     }
 
     private void OnFolded(Entity<MaskComponent> ent, ref FoldedEvent args)

From 2ccd4e8ed3232047075a91ec374292f7a4f307cd Mon Sep 17 00:00:00 2001
From: cloudyskies <97833532+cloudyias@users.noreply.github.com>
Date: Sat, 11 Oct 2025 18:04:59 -0500
Subject: [PATCH 177/216] Makes droppers printable by autolathes and medfabs
 (#40074)

* Made droppers printable by autolathes and medfabs

* added glass to recipe

* Update Resources/Prototypes/Recipes/Lathes/chemistry.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Resources/Prototypes/Recipes/Lathes/Packs/medical.yml | 1 +
 Resources/Prototypes/Recipes/Lathes/chemistry.yml     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
index 0b6cccf78b..0bb3c49fe9 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
@@ -16,6 +16,7 @@
   - PillCanister
   - HandLabeler
   - BaseChemistryEmptyVial
+  - Dropper
 
 - type: latheRecipePack
   parent: BasicChemistryStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
index a9e6f282e0..0b3b8352e5 100644
--- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml
+++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
@@ -33,8 +33,8 @@
   result: Dropper
   completetime: 2
   materials:
-    Glass: 200
-    Plastic: 100
+    Glass: 50
+    Plastic: 50
 
 - type: latheRecipe
   id: Syringe

From 84c091195109db7d402d492dcbf4734f26839003 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 11 Oct 2025 23:16:48 +0000
Subject: [PATCH 178/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 216e33f9be..af09e91849 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Simyon
-  changes:
-  - message: Capacitors and Matter bins have been combined into the Manipulator.
-    type: Remove
-  id: 8574
-  time: '2025-05-27T11:47:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37725
 - author: PicklOH
   changes:
   - message: Gas Pipes are now named as such in the construction menu.
@@ -3947,3 +3940,10 @@
   id: 9076
   time: '2025-10-11T21:46:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40837
+- author: cloudyias
+  changes:
+  - message: Added the ability for droppers to be printed via autolathes and medfabs
+    type: Add
+  id: 9077
+  time: '2025-10-11T23:15:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40074

From a0f0f40526d7356eb597b390e5fb471d93d061e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Sat, 11 Oct 2025 18:21:07 -0500
Subject: [PATCH 179/216] Reorganize tile StackPrototypes and add inheritance
 (#39491)

* atomize from #38412

* fix curtains in G menu

* re-add marble

* commit

* re-add xenoborg tiles

* re-add new faux

* missed tiles

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 Content.Shared/Stacks/StackPrototype.cs       |  14 +-
 Resources/Prototypes/Stacks/Tiles/alien.yml   |  38 +
 Resources/Prototypes/Stacks/Tiles/brass.yml   |  13 +
 Resources/Prototypes/Stacks/Tiles/carpet.yml  |  84 ++
 .../Prototypes/Stacks/Tiles/concrete.yml      |  55 ++
 .../Prototypes/Stacks/Tiles/electronic.yml    |  19 +
 Resources/Prototypes/Stacks/Tiles/fancy.yml   |  37 +
 Resources/Prototypes/Stacks/Tiles/faux.yml    |  55 ++
 .../Prototypes/Stacks/Tiles/four_square.yml   | 112 +++
 Resources/Prototypes/Stacks/Tiles/maints.yml  |  25 +
 Resources/Prototypes/Stacks/Tiles/organic.yml |  13 +
 Resources/Prototypes/Stacks/Tiles/other.yml   |  25 +
 Resources/Prototypes/Stacks/Tiles/planet.yml  |  19 +
 Resources/Prototypes/Stacks/Tiles/retro.yml   |  31 +
 Resources/Prototypes/Stacks/Tiles/shuttle.yml |  43 ++
 Resources/Prototypes/Stacks/Tiles/steel.yml   |  55 ++
 .../Prototypes/Stacks/Tiles/steel_dark.yml    |  55 ++
 .../Prototypes/Stacks/Tiles/steel_white.yml   |  55 ++
 Resources/Prototypes/Stacks/Tiles/wood.yml    |  19 +
 Resources/Prototypes/Stacks/base_stacks.yml   |   8 +
 .../Prototypes/Stacks/floor_tile_stacks.yml   | 720 ------------------
 21 files changed, 773 insertions(+), 722 deletions(-)
 create mode 100644 Resources/Prototypes/Stacks/Tiles/alien.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/brass.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/carpet.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/concrete.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/electronic.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/fancy.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/faux.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/four_square.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/maints.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/organic.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/other.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/planet.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/retro.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/shuttle.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/steel.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/steel_dark.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/steel_white.yml
 create mode 100644 Resources/Prototypes/Stacks/Tiles/wood.yml
 create mode 100644 Resources/Prototypes/Stacks/base_stacks.yml
 delete mode 100644 Resources/Prototypes/Stacks/floor_tile_stacks.yml

diff --git a/Content.Shared/Stacks/StackPrototype.cs b/Content.Shared/Stacks/StackPrototype.cs
index d72380da62..5b95935ec4 100644
--- a/Content.Shared/Stacks/StackPrototype.cs
+++ b/Content.Shared/Stacks/StackPrototype.cs
@@ -1,15 +1,25 @@
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Stacks;
 
 [Prototype]
-public sealed partial class StackPrototype : IPrototype
+public sealed partial class StackPrototype : IPrototype, IInheritingPrototype
 {
-    [ViewVariables]
+    ///  <inheritdoc />
     [IdDataField]
     public string ID { get; private set; } = default!;
 
+    ///  <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<StackPrototype>))]
+    public string[]? Parents { get; private set; }
+
+    ///  <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; private set; }
+
     /// <summary>
     ///     Human-readable name for this stack type e.g. "Steel"
     /// </summary>
diff --git a/Resources/Prototypes/Stacks/Tiles/alien.yml b/Resources/Prototypes/Stacks/Tiles/alien.yml
new file mode 100644
index 0000000000..8ccca8b5b7
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/alien.yml
@@ -0,0 +1,38 @@
+# Tiles you might find in an alien world
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileXenoborg
+  name: stack-xenoborg
+  spawn: FloorTileItemXenoborg
+
+# Exo station
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileXeno
+  name: stack-xeno-floor
+  spawn: FloorTileItemXeno
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileXenoSteel
+  name: stack-xeno-steel
+  spawn: FloorTileItemXenoSteelCorner
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileXenoSteelCorner
+  name: stack-xeno-steel-corner
+  spawn: FloorTileItemXenoSteelCorner
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileXenoMaint
+  name: stack-xeno-maint
+  spawn: FloorTileItemXenoSteelCorner
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkSquiggly
+  name: stack-dark-squiggly
+  spawn: FloorTileItemDarkSquiggly
diff --git a/Resources/Prototypes/Stacks/Tiles/brass.yml b/Resources/Prototypes/Stacks/Tiles/brass.yml
new file mode 100644
index 0000000000..5fbec41449
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/brass.yml
@@ -0,0 +1,13 @@
+# Tiles made of brass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileBrassFilled
+  name: stack-filled-brass-plate
+  spawn: FloorTileItemBrassFilled
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileBrassReebe
+  name: stack-smooth-brass-plate
+  spawn: FloorTileItemBrassReebe
diff --git a/Resources/Prototypes/Stacks/Tiles/carpet.yml b/Resources/Prototypes/Stacks/Tiles/carpet.yml
new file mode 100644
index 0000000000..47b239f39d
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/carpet.yml
@@ -0,0 +1,84 @@
+# Carpets that are tiles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackCarpetClown
+  name: stack-clown-carpet-tile
+  spawn: FloorTileItemCarpetClown
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackCarpetOffice
+  name: stack-office-carpet-tile
+  spawn: FloorTileItemCarpetOffice
+
+# Carpets that are not actually tiles (yet)
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetRed
+  name: stack-red-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-red }
+  spawn: FloorCarpetItemRed
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetBlack
+  name: stack-black-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-black }
+  spawn: FloorCarpetItemBlack
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetBlue
+  name: stack-blue-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-blue }
+  spawn: FloorCarpetItemBlue
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetGreen
+  name: stack-green-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-green }
+  spawn: FloorCarpetItemGreen
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetOrange
+  name: stack-orange-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-orange }
+  spawn: FloorCarpetItemOrange
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetSkyBlue
+  name: stack-skyblue-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-skyblue }
+  spawn: FloorCarpetItemSkyBlue
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetPurple
+  name: stack-purple-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-purple }
+  spawn: FloorCarpetItemPurple
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetPink
+  name: stack-pink-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-pink }
+  spawn: FloorCarpetItemPink
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetCyan
+  name: stack-cyan-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-cyan }
+  spawn: FloorCarpetItemCyan
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetWhite
+  name: stack-white-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-white }
+  spawn: FloorCarpetItemWhite
diff --git a/Resources/Prototypes/Stacks/Tiles/concrete.yml b/Resources/Prototypes/Stacks/Tiles/concrete.yml
new file mode 100644
index 0000000000..a10b2e212e
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/concrete.yml
@@ -0,0 +1,55 @@
+# Tiles made of concrete
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileConcrete
+  name: stack-concrete-tile
+  spawn: FloorTileItemGrayConcrete
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileConcreteMono
+  name: stack-concrete-mono-tile
+  spawn: FloorTileItemConcreteMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileConcreteSmooth
+  name: stack-concrete-smooth
+  spawn: FloorTileItemConcreteSmooth
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGrayConcrete
+  name: stack-gray-concrete-tile
+  spawn: FloorTileItemGrayConcrete
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGrayConcreteMono
+  name: stack-gray-concrete-mono-tile
+  spawn: FloorTileItemGrayConcreteMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGrayConcreteSmooth
+  name: stack-gray-concrete-smooth
+  spawn: FloorTileItemGrayConcreteSmooth
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileOldConcrete
+  name: stack-old-concrete-tile
+  spawn: FloorTileItemOldConcrete
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileOldConcreteMono
+  name: stack-old-concrete-mono-tile
+  spawn: FloorTileItemOldConcreteMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileOldConcreteSmooth
+  name: stack-old-concrete-smooth
+  spawn: FloorTileItemOldConcreteSmooth
diff --git a/Resources/Prototypes/Stacks/Tiles/electronic.yml b/Resources/Prototypes/Stacks/Tiles/electronic.yml
new file mode 100644
index 0000000000..f8923dc989
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/electronic.yml
@@ -0,0 +1,19 @@
+# electronic or computery looking tiles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGCircuit
+  name: stack-green-circuit-floor
+  spawn: FloorTileItemGCircuit
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileBCircuit
+  name: stack-bcircuit-floor-tile
+  spawn: FloorTileItemBCircuit
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileRCircuit
+  name: stack-red-circuit-floor
+  spawn: FloorTileItemRCircuit
diff --git a/Resources/Prototypes/Stacks/Tiles/fancy.yml b/Resources/Prototypes/Stacks/Tiles/fancy.yml
new file mode 100644
index 0000000000..f4a06c1b66
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/fancy.yml
@@ -0,0 +1,37 @@
+# expensive looking tiles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGold
+  name: stack-gold-floor
+  spawn: FloorTileItemGold
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSilver
+  name: stack-silver-floor-tile
+  spawn: FloorTileItemSilver
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteMarble
+  name: stack-white-marble-floor
+  spawn: FloorTileItemWhiteMarble
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkMarble
+  name: stack-dark-marble-floor
+  spawn: FloorTileItemDarkMarble
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTilePlasmaMarble
+  name: stack-plasma-marble-floor
+  spawn: FloorTileItemPlasmaMarble
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileUraniumMarble
+  name: stack-uranium-marble-floor
+  spawn: FloorTileItemUraniumMarble
diff --git a/Resources/Prototypes/Stacks/Tiles/faux.yml b/Resources/Prototypes/Stacks/Tiles/faux.yml
new file mode 100644
index 0000000000..00c9e52525
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/faux.yml
@@ -0,0 +1,55 @@
+# Faux tiles that mimic planet terrain
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileAstroGrass
+  name: stack-astro-grass-floor
+  spawn: FloorTileItemAstroGrass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMowedAstroGrass
+  name: stack-mowed-astro-grass-floor
+  spawn: FloorTileItemMowedAstroGrass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileJungleAstroGrass
+  name: stack-jungle-astro-grass-floor
+  spawn: FloorTileItemJungleAstroGrass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkAstroGrass
+  name: stack-dark-astro-grass-floor
+  spawn: FloorTileItemDarkAstroGrass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileLightAstroGrass
+  name: stack-light-astro-grass-floor
+  spawn: FloorTileItemLightAstroGrass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileAstroIce
+  name: stack-astro-ice-floor
+  spawn: FloorTileItemAstroIce
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileAstroSnow
+  name: stack-astro-snow-floor
+  spawn: FloorTileItemAstroSnow
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileAstroAsteroidSand
+  name: stack-asteroid-astro-sand-floor
+  spawn: FloorTileItemAstroAsteroidSand
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDesertAstroSand
+  name: stack-desert-astro-sand-floor
+  spawn: FloorTileItemDesertAstroSand
diff --git a/Resources/Prototypes/Stacks/Tiles/four_square.yml b/Resources/Prototypes/Stacks/Tiles/four_square.yml
new file mode 100644
index 0000000000..721ee5b1ab
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/four_square.yml
@@ -0,0 +1,112 @@
+# Tiles in a 4 square pattern
+
+# Single color
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileFreezer
+  name: stack-freezer-tile
+  spawn: FloorTileItemFreezer
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileShowroom
+  name: stack-showroom-tile
+  spawn: FloorTileItemShowroom
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileHydro
+  name: stack-hydro-tile
+  spawn: FloorTileItemHydro
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileLime
+  name: stack-lime-tile
+  spawn: FloorTileItemLime
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDirty
+  name: stack-dirty-tile
+  spawn: FloorTileItemDirty
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileBlue
+  name: stack-blue-floor-tile
+  spawn: FloorTileItemBlue
+
+# Two color
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelCheckerDark
+  name: stack-steel-dark-checker-tile
+  spawn: FloorTileItemSteelCheckerDark
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelCheckerLight
+  name: stack-steel-light-checker-tile
+  spawn: FloorTileItemSteelCheckerLight
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileBar
+  name: stack-item-bar-floor-tile
+  spawn: FloorTileItemBar
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileClown
+  name: stack-clown-floor-tile
+  spawn: FloorTileItemClown
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMime
+  name: stack-mime-floor-tile
+  spawn: FloorTileItemMime
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileKitchen
+  name: stack-kitchen-floor-tile
+  spawn: FloorTileItemKitchen
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileLaundry
+  name: stack-laundry-floor-tile
+  spawn: FloorTileItemLaundry
+
+# Patterned
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileElevatorShaft
+  name: stack-elevator-shaft-tile
+  spawn: FloorTileItemElevatorShaft
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileRockVault
+  name: stack-rock-vault-tile
+  spawn: FloorTileItemRockVault
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMining
+  name: stack-mining-floor-tile
+  spawn: FloorTileItemMining
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMiningDark
+  name: stack-dark-mining-floor-tile
+  spawn: FloorTileItemMiningDark
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMiningLight
+  name: stack-light-mining-floor-tile
+  spawn: FloorTileItemMiningLight
diff --git a/Resources/Prototypes/Stacks/Tiles/maints.yml b/Resources/Prototypes/Stacks/Tiles/maints.yml
new file mode 100644
index 0000000000..3a1c5fd749
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/maints.yml
@@ -0,0 +1,25 @@
+# tiles typically found in maintenance
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileTechmaint
+  name: stack-techmaint-floor
+  spawn: FloorTileItemTechmaint
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelMaint
+  name: stack-steel-maint-floor
+  spawn: FloorTileItemSteelMaint
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGratingMaint
+  name: stack-grating-maint-floor
+  spawn: FloorTileItemGratingMaint
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileTechmaintDark
+  name: stack-techmaint-floor-dark
+  spawn: FloorTileItemTechmaintDark
diff --git a/Resources/Prototypes/Stacks/Tiles/organic.yml b/Resources/Prototypes/Stacks/Tiles/organic.yml
new file mode 100644
index 0000000000..ff51abc77e
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/organic.yml
@@ -0,0 +1,13 @@
+# tiles that are fleshy or come from a creature
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileFlesh
+  name: stack-flesh-floor
+  spawn: FloorTileItemFlesh
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWeb
+  name: stack-web-tile
+  spawn: FloorTileItemWeb
diff --git a/Resources/Prototypes/Stacks/Tiles/other.yml b/Resources/Prototypes/Stacks/Tiles/other.yml
new file mode 100644
index 0000000000..fc31421433
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/other.yml
@@ -0,0 +1,25 @@
+# Tiles that don't fit cleanly in another category
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMono
+  name: stack-mono-tile
+  spawn: FloorTileItemMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMetalDiamond
+  name: stack-steel-tile
+  spawn: FloorTileItemMetalDiamond
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackBoxing
+  name: stack-boxing-ring-tile
+  spawn: FloorTileItemBoxing
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackGym
+  name: stack-gym-floor-tile
+  spawn: FloorTileItemGym
diff --git a/Resources/Prototypes/Stacks/Tiles/planet.yml b/Resources/Prototypes/Stacks/Tiles/planet.yml
new file mode 100644
index 0000000000..7a235c7d9d
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/planet.yml
@@ -0,0 +1,19 @@
+# tiles that spawn on planets and are generally unobtainable
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGrass
+  name: stack-grass-floor-tile
+  spawn: FloorTileItemGrass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGrassJungle
+  name: stack-grass-jungle-floor-tile
+  spawn: FloorTileItemGrassJungle
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSnow
+  name: stack-snow-floor-tile
+  spawn: FloorTileItemSnow
diff --git a/Resources/Prototypes/Stacks/Tiles/retro.yml b/Resources/Prototypes/Stacks/Tiles/retro.yml
new file mode 100644
index 0000000000..4b1eba2e4c
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/retro.yml
@@ -0,0 +1,31 @@
+# Tiles that come straight from the eighties
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileLino
+  name: stack-linoleum-floor
+  spawn: FloorTileItemLino
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackEighties
+  name: stack-eighties-floor-tile
+  spawn: FloorTileItemEighties
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackArcadeBlue
+  name: stack-blue-arcade-tile
+  spawn: FloorTileItemArcadeBlue
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackArcadeBlue2
+  name: stack-blue-arcade-tile
+  spawn: FloorTileItemArcadeBlue2
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackArcadeRed
+  name: stack-red-arcade-tile
+  spawn: FloorTileItemArcadeRed
diff --git a/Resources/Prototypes/Stacks/Tiles/shuttle.yml b/Resources/Prototypes/Stacks/Tiles/shuttle.yml
new file mode 100644
index 0000000000..540eda3bbe
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/shuttle.yml
@@ -0,0 +1,43 @@
+# Tiles found on shuttles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttleWhite
+  name: stack-white-shuttle-tile
+  spawn: FloorTileItemShuttleWhite
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttleBlue
+  name: stack-blue-shuttle-tile
+  spawn: FloorTileItemShuttleBlue
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttleOrange
+  name: stack-orange-shuttle-tile
+  spawn: FloorTileItemShuttleOrange
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttlePurple
+  name: stack-purple-shuttle-tile
+  spawn: FloorTileItemShuttlePurple
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttleRed
+  name: stack-red-shuttle-tile
+  spawn: FloorTileItemShuttleRed
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttleGrey
+  name: stack-grey-shuttle-tile
+  spawn: FloorTileItemShuttleGrey
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttleBlack
+  name: stack-black-shuttle-tile
+  spawn: FloorTileItemShuttleBlack
diff --git a/Resources/Prototypes/Stacks/Tiles/steel.yml b/Resources/Prototypes/Stacks/Tiles/steel.yml
new file mode 100644
index 0000000000..1e283d68f9
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/steel.yml
@@ -0,0 +1,55 @@
+# Regular steel tiles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteel
+  name: stack-steel-tile
+  spawn: FloorTileItemSteel
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelOffset
+  name: stack-offset-steel-tile
+  spawn: FloorTileItemSteelOffset
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelDiagonalMini
+  name: stack-steel-diagonal-mini-tile
+  spawn: FloorTileItemSteelDiagonalMini
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelDiagonal
+  name: stack-steel-diagonal-tile
+  spawn: FloorTileItemSteelDiagonal
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelHerringbone
+  name: stack-steel-herringbone
+  spawn: FloorTileItemSteelHerringbone
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelMini
+  name: stack-steel-mini-tile
+  spawn: FloorTileItemSteelMini
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelMono
+  name: stack-steel-mono-tile
+  spawn: FloorTileItemSteelMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelPavement
+  name: stack-steel-pavement
+  spawn: FloorTileItemSteelPavement
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelPavementVertical
+  name: stack-steel-vertical-pavement
+  spawn: FloorTileItemSteelPavementVertical
diff --git a/Resources/Prototypes/Stacks/Tiles/steel_dark.yml b/Resources/Prototypes/Stacks/Tiles/steel_dark.yml
new file mode 100644
index 0000000000..e1660a0299
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/steel_dark.yml
@@ -0,0 +1,55 @@
+# Dark steel tiles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDark
+  name: stack-dark-tile
+  spawn: FloorTileItemDark
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkDiagonalMini
+  name: stack-dark-steel-diagonal-mini-tile
+  spawn: FloorTileItemDarkDiagonalMini
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkDiagonal
+  name: stack-dark-steel-diagonal-tile
+  spawn: FloorTileItemDarkDiagonal
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkHerringbone
+  name: stack-dark-steel-herringbone
+  spawn: FloorTileItemDarkHerringbone
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkMini
+  name: stack-dark-steel-mini-tile
+  spawn: FloorTileItemDarkMini
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkMono
+  name: stack-dark-steel-mono-tile
+  spawn: FloorTileItemDarkMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkPavement
+  name: stack-dark-steel-pavement
+  spawn: FloorTileItemDarkPavement
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkPavementVertical
+  name: stack-dark-steel-vertical-pavement
+  spawn: FloorTileItemDarkPavementVertical
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkOffset
+  name: stack-offset-dark-steel-tile
+  spawn: FloorTileItemDarkOffset
diff --git a/Resources/Prototypes/Stacks/Tiles/steel_white.yml b/Resources/Prototypes/Stacks/Tiles/steel_white.yml
new file mode 100644
index 0000000000..75dd453abc
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/steel_white.yml
@@ -0,0 +1,55 @@
+# White steel tiles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhite
+  name: stack-white-tile
+  spawn: FloorTileItemWhite
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteOffset
+  name: stack-offset-white-steel-tile
+  spawn: FloorTileItemWhiteOffset
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteDiagonalMini
+  name: stack-white-steel-diagonal-mini-tile
+  spawn: FloorTileItemWhiteDiagonalMini
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteDiagonal
+  name: stack-white-steel-diagonal-tile
+  spawn: FloorTileItemWhiteDiagonal
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteHerringbone
+  name: stack-white-steel-herringbone
+  spawn: FloorTileItemWhiteHerringbone
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteMini
+  name: stack-white-steel-mini-tile
+  spawn: FloorTileItemWhiteMini
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteMono
+  name: stack-white-steel-mono-tile
+  spawn: FloorTileItemWhiteMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhitePavement
+  name: stack-white-steel-pavement
+  spawn: FloorTileItemWhitePavement
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhitePavementVertical
+  name: stack-white-steel-vertical-pavement
+  spawn: FloorTileItemWhitePavementVertical
diff --git a/Resources/Prototypes/Stacks/Tiles/wood.yml b/Resources/Prototypes/Stacks/Tiles/wood.yml
new file mode 100644
index 0000000000..3e922a64a5
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/wood.yml
@@ -0,0 +1,19 @@
+# Tiles that are cut wood flooring
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWood
+  name: stack-wood-floor
+  spawn: FloorTileItemWood
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWoodPattern
+  name: stack-wood-patter-floor
+  spawn: FloorTileItemWoodPattern
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWoodLarge
+  name: stack-large-wood-floor
+  spawn: FloorTileItemWoodLarge
diff --git a/Resources/Prototypes/Stacks/base_stacks.yml b/Resources/Prototypes/Stacks/base_stacks.yml
new file mode 100644
index 0000000000..abf64f398a
--- /dev/null
+++ b/Resources/Prototypes/Stacks/base_stacks.yml
@@ -0,0 +1,8 @@
+# Base sizes for stacks in one convenient place
+
+# Used by tiles
+- type: stack
+  abstract: true
+  id: BaseTileStack
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: steel }
+  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
deleted file mode 100644
index a41282ff71..0000000000
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ /dev/null
@@ -1,720 +0,0 @@
-- type: stack
-  id: FloorTileDark
-  name: stack-dark-tile
-  spawn: FloorTileItemDark
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkDiagonalMini
-  name: stack-dark-steel-diagonal-mini-tile
-  spawn: FloorTileItemDarkDiagonalMini
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkDiagonal
-  name: stack-dark-steel-diagonal-tile
-  spawn: FloorTileItemDarkDiagonal
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkHerringbone
-  name: stack-dark-steel-herringbone
-  spawn: FloorTileItemDarkHerringbone
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkMini
-  name: stack-dark-steel-mini-tile
-  spawn: FloorTileItemDarkMini
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkMono
-  name: stack-dark-steel-mono-tile
-  spawn: FloorTileItemDarkMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkPavement
-  name: stack-dark-steel-pavement
-  spawn: FloorTileItemDarkPavement
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkPavementVertical
-  name: stack-dark-steel-vertical-pavement
-  spawn: FloorTileItemDarkPavementVertical
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkOffset
-  name: stack-offset-dark-steel-tile
-  spawn: FloorTileItemDarkOffset
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteel
-  name: stack-steel-tile
-  spawn: FloorTileItemSteel
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelOffset
-  name: stack-offset-steel-tile
-  spawn: FloorTileItemSteelOffset
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelDiagonalMini
-  name: stack-steel-diagonal-mini-tile
-  spawn: FloorTileItemSteelDiagonalMini
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelDiagonal
-  name: stack-steel-diagonal-tile
-  spawn: FloorTileItemSteelDiagonal
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelHerringbone
-  name: stack-steel-herringbone
-  spawn: FloorTileItemSteelHerringbone
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelMini
-  name: stack-steel-mini-tile
-  spawn: FloorTileItemSteelMini
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelMono
-  name: stack-steel-mono-tile
-  spawn: FloorTileItemSteelMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelPavement
-  name: stack-steel-pavement
-  spawn: FloorTileItemSteelPavement
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelPavementVertical
-  name: stack-steel-vertical-pavement
-  spawn: FloorTileItemSteelPavementVertical
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhite
-  name: stack-white-tile
-  spawn: FloorTileItemWhite
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteOffset
-  name: stack-offset-white-steel-tile
-  spawn: FloorTileItemWhiteOffset
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteDiagonalMini
-  name: stack-white-steel-diagonal-mini-tile
-  spawn: FloorTileItemWhiteDiagonalMini
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteDiagonal
-  name: stack-white-steel-diagonal-tile
-  spawn: FloorTileItemWhiteDiagonal
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteHerringbone
-  name: stack-white-steel-herringbone
-  spawn: FloorTileItemWhiteHerringbone
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteMini
-  name: stack-white-steel-mini-tile
-  spawn: FloorTileItemWhiteMini
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteMono
-  name: stack-white-steel-mono-tile
-  spawn: FloorTileItemWhiteMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhitePavement
-  name: stack-white-steel-pavement
-  spawn: FloorTileItemWhitePavement
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhitePavementVertical
-  name: stack-white-steel-vertical-pavement
-  spawn: FloorTileItemWhitePavementVertical
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelCheckerDark
-  name: stack-steel-dark-checker-tile
-  spawn: FloorTileItemSteelCheckerDark
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelCheckerLight
-  name: stack-steel-light-checker-tile
-  spawn: FloorTileItemSteelCheckerLight
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMetalDiamond
-  name: stack-steel-tile
-  spawn: FloorTileItemMetalDiamond
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWood
-  name: stack-wood-floor
-  spawn: FloorTileItemWood
-  maxCount: 30
-
-- type: stack
-  id: FloorTileTechmaint
-  name: stack-techmaint-floor
-  spawn: FloorTileItemTechmaint
-  maxCount: 30
-
-- type: stack
-  id: FloorTileTechmaintDark
-  name: stack-techmaint-floor-dark
-  spawn: FloorTileItemTechmaintDark
-  maxCount: 30
-
-- type: stack
-  id: FloorTileFreezer
-  name: stack-freezer-tile
-  spawn: FloorTileItemFreezer
-  maxCount: 30
-
-- type: stack
-  id: FloorTileShowroom
-  name: stack-showroom-tile
-  spawn: FloorTileItemShowroom
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGCircuit
-  name: stack-green-circuit-floor
-  spawn: FloorTileItemGCircuit
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGold
-  name: stack-gold-floor
-  spawn: FloorTileItemGold
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMono
-  name: stack-mono-tile
-  spawn: FloorTileItemMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileBrassFilled
-  name: stack-filled-brass-plate
-  spawn: FloorTileItemBrassFilled
-  maxCount: 30
-
-- type: stack
-  id: FloorTileBrassReebe
-  name: stack-smooth-brass-plate
-  spawn: FloorTileItemBrassReebe
-  maxCount: 30
-
-- type: stack
-  id: FloorTileLino
-  name: stack-linoleum-floor
-  spawn: FloorTileItemLino
-  maxCount: 30
-
-- type: stack
-  id: FloorTileHydro
-  name: stack-hydro-tile
-  spawn: FloorTileItemHydro
-  maxCount: 30
-
-- type: stack
-  id: FloorTileLime
-  name: stack-lime-tile
-  spawn: FloorTileItemLime
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDirty
-  name: stack-dirty-tile
-  spawn: FloorTileItemDirty
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttleWhite
-  name: stack-white-shuttle-tile
-  spawn: FloorTileItemShuttleWhite
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttleBlue
-  name: stack-blue-shuttle-tile
-  spawn: FloorTileItemShuttleBlue
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttleOrange
-  name: stack-orange-shuttle-tile
-  spawn: FloorTileItemShuttleOrange
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttlePurple
-  name: stack-purple-shuttle-tile
-  spawn: FloorTileItemShuttlePurple
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttleRed
-  name: stack-red-shuttle-tile
-  spawn: FloorTileItemShuttleRed
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttleGrey
-  name: stack-grey-shuttle-tile
-  spawn: FloorTileItemShuttleGrey
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttleBlack
-  name: stack-black-shuttle-tile
-  spawn: FloorTileItemShuttleBlack
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackEighties
-  name: stack-eighties-floor-tile
-  spawn: FloorTileItemEighties
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackArcadeBlue
-  name: stack-blue-arcade-tile
-  spawn: FloorTileItemArcadeBlue
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackArcadeBlue2
-  name: stack-blue-arcade-tile
-  spawn: FloorTileItemArcadeBlue2
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackArcadeRed
-  name: stack-red-arcade-tile
-  spawn: FloorTileItemArcadeRed
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetRed
-  name: stack-red-carpet-tile
-  spawn: FloorCarpetItemRed
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetBlack
-  name: stack-black-carpet-tile
-  spawn: FloorCarpetItemBlack
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetBlue
-  name: stack-blue-carpet-tile
-  spawn: FloorCarpetItemBlue
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetGreen
-  name: stack-green-carpet-tile
-  spawn: FloorCarpetItemGreen
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetOrange
-  name: stack-orange-carpet-tile
-  spawn: FloorCarpetItemOrange
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetSkyBlue
-  name: stack-skyblue-carpet-tile
-  spawn: FloorCarpetItemSkyBlue
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetPurple
-  name: stack-purple-carpet-tile
-  spawn: FloorCarpetItemPurple
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetPink
-  name: stack-pink-carpet-tile
-  spawn: FloorCarpetItemPink
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetCyan
-  name: stack-cyan-carpet-tile
-  spawn: FloorCarpetItemCyan
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetWhite
-  name: stack-white-carpet-tile
-  spawn: FloorCarpetItemWhite
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackCarpetClown
-  name: stack-clown-carpet-tile
-  spawn: FloorTileItemCarpetClown
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackCarpetOffice
-  name: stack-office-carpet-tile
-  spawn: FloorTileItemCarpetOffice
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackBoxing
-  name: stack-boxing-ring-tile
-  spawn: FloorTileItemBoxing
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackGym
-  name: stack-gym-floor-tile
-  spawn: FloorTileItemGym
-  maxCount: 30
-
-- type: stack
-  id: FloorTileElevatorShaft
-  name: stack-elevator-shaft-tile
-  spawn: FloorTileItemElevatorShaft
-  maxCount: 30
-
-- type: stack
-  id: FloorTileRockVault
-  name: stack-rock-vault-tile
-  spawn: FloorTileItemRockVault
-  maxCount: 30
-
-- type: stack
-  id: FloorTileBlue
-  name: stack-blue-floor-tile
-  spawn: FloorTileItemBlue
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMining
-  name: stack-mining-floor-tile
-  spawn: FloorTileItemMining
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMiningDark
-  name: stack-dark-mining-floor-tile
-  spawn: FloorTileItemMiningDark
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMiningLight
-  name: stack-light-mining-floor-tile
-  spawn: FloorTileItemMiningLight
-  maxCount: 30
-
-- type: stack
-  id: FloorTileBar
-  name: stack-item-bar-floor-tile
-  spawn: FloorTileItemBar
-  maxCount: 30
-
-- type: stack
-  id: FloorTileClown
-  name: stack-clown-floor-tile
-  spawn: FloorTileItemClown
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMime
-  name: stack-mime-floor-tile
-  spawn: FloorTileItemMime
-  maxCount: 30
-
-- type: stack
-  id: FloorTileKitchen
-  name: stack-kitchen-floor-tile
-  spawn: FloorTileItemKitchen
-  maxCount: 30
-
-- type: stack
-  id: FloorTileLaundry
-  name: stack-laundry-floor-tile
-  spawn: FloorTileItemLaundry
-  maxCount: 30
-
-- type: stack
-  id: FloorTileConcrete
-  name: stack-concrete-tile
-  spawn: FloorTileItemGrayConcrete
-  maxCount: 30
-
-- type: stack
-  id: FloorTileConcreteMono
-  name: stack-concrete-mono-tile
-  spawn: FloorTileItemConcreteMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileConcreteSmooth
-  name: stack-concrete-smooth
-  spawn: FloorTileItemConcreteSmooth
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGrayConcrete
-  name: stack-gray-concrete-tile
-  spawn: FloorTileItemGrayConcrete
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGrayConcreteMono
-  name: stack-gray-concrete-mono-tile
-  spawn: FloorTileItemGrayConcreteMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGrayConcreteSmooth
-  name: stack-gray-concrete-smooth
-  spawn: FloorTileItemGrayConcreteSmooth
-  maxCount: 30
-
-- type: stack
-  id: FloorTileOldConcrete
-  name: stack-old-concrete-tile
-  spawn: FloorTileItemOldConcrete
-  maxCount: 30
-
-- type: stack
-  id: FloorTileOldConcreteMono
-  name: stack-old-concrete-mono-tile
-  spawn: FloorTileItemOldConcreteMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileOldConcreteSmooth
-  name: stack-old-concrete-smooth
-  spawn: FloorTileItemOldConcreteSmooth
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSilver
-  name: stack-silver-floor-tile
-  spawn: FloorTileItemSilver
-  maxCount: 30
-
-- type: stack
-  id: FloorTileBCircuit
-  name: stack-bcircuit-floor-tile
-  spawn: FloorTileItemBCircuit
-  maxCount: 30
-
-- type: stack
-  id: FloorTileRCircuit
-  name: stack-red-circuit-floor
-  spawn: FloorTileItemRCircuit
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGrass
-  name: stack-grass-floor-tile
-  spawn: FloorTileItemGrass
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGrassJungle
-  name: stack-grass-jungle-floor-tile
-  spawn: FloorTileItemGrassJungle
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSnow
-  name: stack-snow-floor-tile
-  spawn: FloorTileItemSnow
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWoodPattern
-  name: stack-wood-patter-floor
-  spawn: FloorTileItemWoodPattern
-  maxCount: 30
-
-- type: stack
-  id: FloorTileFlesh
-  name: stack-flesh-floor
-  spawn: FloorTileItemFlesh
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelMaint
-  name: stack-steel-maint-floor
-  spawn: FloorTileItemSteelMaint
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGratingMaint
-  name: stack-grating-maint-floor
-  spawn: FloorTileItemGratingMaint
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWeb
-  name: stack-web-tile
-  spawn: FloorTileItemWeb
-  maxCount: 30
-
-# Faux science tiles
-- type: stack
-  id: FloorTileAstroGrass
-  name: stack-astro-grass-floor
-  spawn: FloorTileItemAstroGrass
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMowedAstroGrass
-  name: stack-mowed-astro-grass-floor
-  spawn: FloorTileItemMowedAstroGrass
-  maxCount: 30
-
-- type: stack
-  id: FloorTileJungleAstroGrass
-  name: stack-jungle-astro-grass-floor
-  spawn: FloorTileItemJungleAstroGrass
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkAstroGrass
-  name: stack-dark-astro-grass-floor
-  spawn: FloorTileItemDarkAstroGrass
-  maxCount: 30
-
-- type: stack
-  id: FloorTileLightAstroGrass
-  name: stack-light-astro-grass-floor
-  spawn: FloorTileItemLightAstroGrass
-  maxCount: 30
-
-- type: stack
-  id: FloorTileAstroIce
-  name: stack-astro-ice-floor
-  spawn: FloorTileItemAstroIce
-  maxCount: 30
-
-- type: stack
-  id: FloorTileAstroSnow
-  name: stack-astro-snow-floor
-  spawn: FloorTileItemAstroSnow
-  maxCount: 30
-
-- type: stack
-  id: FloorTileAstroAsteroidSand
-  name: stack-asteroid-astro-sand-floor
-  spawn: FloorTileItemAstroAsteroidSand
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDesertAstroSand
-  name: stack-desert-astro-sand-floor
-  spawn: FloorTileItemDesertAstroSand
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWoodLarge
-  name: stack-large-wood-floor
-  spawn: FloorTileItemWoodLarge
-  maxCount: 30
-
-- type: stack
-  id: FloorTileXeno
-  name: stack-xeno-floor
-  spawn: FloorTileItemXeno
-  maxCount: 30
-
-- type: stack
-  id: FloorTileXenoSteel
-  name: stack-xeno-steel
-  spawn: FloorTileItemXenoSteelCorner
-  maxCount: 30
-
-- type: stack
-  id: FloorTileXenoSteelCorner
-  name: stack-xeno-steel-corner
-  spawn: FloorTileItemXenoSteelCorner
-  maxCount: 30
-
-- type: stack
-  id: FloorTileXenoMaint
-  name: stack-xeno-maint
-  spawn: FloorTileItemXenoSteelCorner
-  maxCount: 30
-
-- type: stack
-  id: FloorTileXenoborg
-  name: stack-xenoborg
-  spawn: FloorTileItemXenoborg
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkSquiggly
-  name: stack-dark-squiggly
-  spawn: FloorTileItemDarkSquiggly
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteMarble
-  name: stack-white-marble-floor
-  spawn: FloorTileItemWhiteMarble
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkMarble
-  name: stack-dark-marble-floor
-  spawn: FloorTileItemDarkMarble
-  maxCount: 30
-
-- type: stack
-  id: FloorTilePlasmaMarble
-  name: stack-plasma-marble-floor
-  spawn: FloorTileItemPlasmaMarble
-  maxCount: 30
-
-- type: stack
-  id: FloorTileUraniumMarble
-  name: stack-uranium-marble-floor
-  spawn: FloorTileItemUraniumMarble
-  maxCount: 30

From e9469f07345021be46dca617f42ab9c4a85fa6ec Mon Sep 17 00:00:00 2001
From: Jessica M <jessica@jessicamaybe.com>
Date: Sat, 11 Oct 2025 17:04:05 -0700
Subject: [PATCH 180/216] Adds swabs and an Emag inventory to the biogenerator
 (#39037)

* adds swab and emag inv to biogenerator

* lower swab biomass requirement

* add hostile cubes to emag inventory

---------

Co-authored-by: Jessica M <jessica@maybe.sh>
---
 .../Entities/Structures/Machines/lathe.yml    |  4 ++++
 .../Recipes/Lathes/Packs/biogen.yml           |  6 ++++++
 .../Prototypes/Recipes/Lathes/biogen.yml      | 21 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index d7fec6aa8c..60e52c772d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -586,6 +586,10 @@
     staticPacks:
     - BioGenIngredientsStatic
     - BioGenMaterialsStatic
+  - type: EmagLatheRecipes
+    emagStaticPacks:
+    - BioGenEmagStatic
+    - HostileCubesStatic
 
 - type: entity
   parent: BaseLathe
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml b/Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
index 49ac26c52b..b8c91d431b 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
@@ -20,6 +20,7 @@
   - BioGenLeft4Zed
   - BioGenEZNutrient
   - BioGenRobustHarvest
+  - BioGenDiseaseSwab
 
 - type: latheRecipePack
   id: BioGenMaterialsStatic
@@ -28,3 +29,8 @@
   - BioGenMaterialCardboard1
   - BioGenPaper
   - BioGenPaperRolling1
+
+- type: latheRecipePack
+  id: BioGenEmagStatic
+  recipes:
+  - BioGenUnstableMutagen
diff --git a/Resources/Prototypes/Recipes/Lathes/biogen.yml b/Resources/Prototypes/Recipes/Lathes/biogen.yml
index a22a535caa..57951c99b8 100644
--- a/Resources/Prototypes/Recipes/Lathes/biogen.yml
+++ b/Resources/Prototypes/Recipes/Lathes/biogen.yml
@@ -249,5 +249,24 @@
   materials:
     Biomass: 18
 
+- type: latheRecipe
+  id: BioGenDiseaseSwab
+  result: DiseaseSwab
+  categories:
+  - Materials
+  completetime: 3
+  materials:
+    Biomass: 2
 
-
+- type: latheRecipe
+  id: BioGenUnstableMutagen
+  resultReagents:
+    UnstableMutagen: 10
+  categories:
+  - Chemicals
+  icon:
+    sprite: Objects/Specific/Chemistry/bottle.rsi
+    state: bottle-1
+  completetime: 5
+  materials:
+    Biomass: 20

From 8830491ff08377cff185c3bbf3758d6b2dd73c3a Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 12 Oct 2025 00:16:25 +0000
Subject: [PATCH 181/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index af09e91849..474943b493 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: PicklOH
-  changes:
-  - message: Gas Pipes are now named as such in the construction menu.
-    type: Tweak
-  id: 8575
-  time: '2025-05-27T16:26:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37881
 - author: ProfRenderer
   changes:
   - message: Cluwne ID cards now have a job icon.
@@ -3947,3 +3940,10 @@
   id: 9077
   time: '2025-10-11T23:15:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40074
+- author: jessicamaybe
+  changes:
+  - message: Added swabs and an emag inventory to the biogenerator
+    type: Tweak
+  id: 9078
+  time: '2025-10-12T00:15:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39037

From d10cfbd875821ea9256ce3695f9d3a3ccc7ca38e Mon Sep 17 00:00:00 2001
From: Super <84590915+SuperGDPWYL@users.noreply.github.com>
Date: Sun, 12 Oct 2025 01:45:51 +0100
Subject: [PATCH 182/216] Add Syndicate IDs to the uplink for 1 TC (#38381)

* syndie ids :3

* Note that the Syndie ID does not copy accesses.
---
 Resources/Locale/en-US/store/uplink-catalog.ftl |  3 +++
 Resources/Prototypes/Catalog/uplink_catalog.yml | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 65104c7918..c7a697fa6f 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -138,6 +138,9 @@ uplink-access-breaker-desc = A hacked access configurator and a good friend of t
 uplink-agent-id-card-name = Agent ID Card
 uplink-agent-id-card-desc = A modified ID card that can copy accesses from other cards and change its name and job title at-will.
 
+uplink-syndicate-id-card-name = Syndicate ID Card
+uplink-syndicate-id-card-desc = A Syndicate ID card, with Syndicate access. Unlikely to be useful on its own, but goes great with reconfigured doors. Does not come with access-copying functionality.
+
 uplink-black-jetpack-name = Black Jetpack
 uplink-black-jetpack-desc = A black jetpack. It allows you to fly around in space. Refills not included, use your fuel wisely.
 
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index c499f54db6..f245b1082c 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -774,7 +774,16 @@
           - SurplusBundle
 
 # Deception
-
+- type: listing
+  id: UplinkSyndicateIDCard
+  name: uplink-syndicate-id-card-name
+  description: uplink-syndicate-id-card-desc
+  productEntity: SyndicateIDCard
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkDeception
+  
 - type: listing
   id: UplinkAgentIDCard
   name: uplink-agent-id-card-name

From 236609e2368ac82f99da4a536d3804974a32b94e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 12 Oct 2025 00:57:16 +0000
Subject: [PATCH 183/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 474943b493..02e14850bb 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: ProfRenderer
-  changes:
-  - message: Cluwne ID cards now have a job icon.
-    type: Tweak
-  id: 8576
-  time: '2025-05-27T16:39:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37834
 - author: Moomoobeef
   changes:
   - message: Bookshelves now contain a more reasonable amount of books.
@@ -3947,3 +3940,10 @@
   id: 9078
   time: '2025-10-12T00:15:18.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39037
+- author: SuperGDPWYL
+  changes:
+  - message: Added the Syndicate ID Card to the uplink for 1 TC.
+    type: Add
+  id: 9079
+  time: '2025-10-12T00:56:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38381

From a35c3030a65d2bfa0c3c687354c930011fb43f6b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 12 Oct 2025 03:03:22 +0200
Subject: [PATCH 184/216] Update Credits (#40841)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
---
 Resources/Credits/GitHub.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index ca08fb2939..f97c69933d 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, pgraycs, PGrayCS, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, sirwarock, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
+0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, AzzyIsNotHere, azzyisnothere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, Blobadoodle, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, cloudyias, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, david, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mqole, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, PGrayCS, pgraycs, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, Pok27, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, sirwarock, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, thanosdegraf, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex

From 1250cb4d4462b763dc3ce63905a36a8719c055e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Sat, 11 Oct 2025 20:18:12 -0500
Subject: [PATCH 185/216] Organize StackPrototype with inheritance (#38412)

* In one commit like an animal

* carpet fix

* move materials, more bad commit discipline

* re-add marble

* don't also do materials in the same PR, dude

* the return of floor_tile_stacks.yml for atomizing

* resolve an old issue

* re-add det cable

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Entities/Objects/Misc/space_cash.yml      |   6 -
 .../Prototypes/Reagents/Materials/ores.yml    |   2 +-
 .../Prototypes/Stacks/Materials/crystals.yml  |   5 -
 .../Prototypes/Stacks/Materials/ingots.yml    |  13 --
 .../Prototypes/Stacks/Materials/materials.yml | 111 ------------------
 .../Prototypes/Stacks/Materials/parts.yml     |   6 -
 .../Stacks/{Materials => }/Sheets/glass.yml   |  14 +--
 .../Stacks/{Materials => }/Sheets/metal.yml   |   6 +-
 .../Prototypes/Stacks/Sheets/organic.yml      |  13 ++
 .../Stacks/{Materials => }/Sheets/other.yml   |  13 +-
 .../Stacks/Specific/engineering.yml           |  36 ++++++
 .../medical.yml}                              |  16 +--
 .../science.yml}                              |   6 +-
 .../Prototypes/Stacks/Specific/security.yml   |   6 +
 Resources/Prototypes/Stacks/base_stacks.yml   |  34 ++++++
 Resources/Prototypes/Stacks/cloth.yml         |  27 +++++
 .../{consumable_stacks.yml => consumable.yml} |  27 ++---
 Resources/Prototypes/Stacks/currency.yml      |  11 ++
 .../Prototypes/Stacks/engineering_stacks.yml  |  12 --
 .../Prototypes/Stacks/{Materials => }/ore.yml |  22 ++--
 Resources/Prototypes/Stacks/ore_refined.yml   |  30 +++++
 Resources/Prototypes/Stacks/organic.yml       |  59 ++++++++++
 Resources/Prototypes/Stacks/other.yml         |  15 +++
 Resources/Prototypes/Stacks/power_stacks.yml  |  30 -----
 24 files changed, 280 insertions(+), 240 deletions(-)
 delete mode 100644 Resources/Prototypes/Stacks/Materials/crystals.yml
 delete mode 100644 Resources/Prototypes/Stacks/Materials/ingots.yml
 delete mode 100644 Resources/Prototypes/Stacks/Materials/materials.yml
 delete mode 100644 Resources/Prototypes/Stacks/Materials/parts.yml
 rename Resources/Prototypes/Stacks/{Materials => }/Sheets/glass.yml (87%)
 rename Resources/Prototypes/Stacks/{Materials => }/Sheets/metal.yml (85%)
 create mode 100644 Resources/Prototypes/Stacks/Sheets/organic.yml
 rename Resources/Prototypes/Stacks/{Materials => }/Sheets/other.yml (68%)
 create mode 100644 Resources/Prototypes/Stacks/Specific/engineering.yml
 rename Resources/Prototypes/Stacks/{medical_stacks.yml => Specific/medical.yml} (85%)
 rename Resources/Prototypes/Stacks/{science_stacks.yml => Specific/science.yml} (63%)
 create mode 100644 Resources/Prototypes/Stacks/Specific/security.yml
 create mode 100644 Resources/Prototypes/Stacks/cloth.yml
 rename Resources/Prototypes/Stacks/{consumable_stacks.yml => consumable.yml} (78%)
 create mode 100644 Resources/Prototypes/Stacks/currency.yml
 delete mode 100644 Resources/Prototypes/Stacks/engineering_stacks.yml
 rename Resources/Prototypes/Stacks/{Materials => }/ore.yml (83%)
 create mode 100644 Resources/Prototypes/Stacks/ore_refined.yml
 create mode 100644 Resources/Prototypes/Stacks/organic.yml
 create mode 100644 Resources/Prototypes/Stacks/other.yml
 delete mode 100644 Resources/Prototypes/Stacks/power_stacks.yml

diff --git a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
index 63b960b0e6..24dab4f562 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
@@ -61,12 +61,6 @@
   icon: { sprite: /Textures/Objects/Economy/cash.rsi, state: cash }
   price: 1
 
-- type: stack
-  id: Credit
-  name: stack-credit
-  icon: { sprite: /Textures/Objects/Economy/cash.rsi, state: cash }
-  spawn: SpaceCash
-
 - type: entity
   parent: SpaceCash
   id: SpaceCash10
diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml
index 1555ab9e23..3e2d7319ad 100644
--- a/Resources/Prototypes/Reagents/Materials/ores.yml
+++ b/Resources/Prototypes/Reagents/Materials/ores.yml
@@ -76,4 +76,4 @@
   unit: materials-unit-chunk
   icon: { sprite: Objects/Materials/ore.rsi, state: salt }
   color: "#f5e7d7"
-  price: 0.075
\ No newline at end of file
+  price: 0.075
diff --git a/Resources/Prototypes/Stacks/Materials/crystals.yml b/Resources/Prototypes/Stacks/Materials/crystals.yml
deleted file mode 100644
index e5fda560c8..0000000000
--- a/Resources/Prototypes/Stacks/Materials/crystals.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: stack
-  id: Telecrystal
-  name: stack-telecrystal
-  icon: Objects/Specific/Syndicate/telecrystal.rsi
-  spawn: Telecrystal1
diff --git a/Resources/Prototypes/Stacks/Materials/ingots.yml b/Resources/Prototypes/Stacks/Materials/ingots.yml
deleted file mode 100644
index 154dacc679..0000000000
--- a/Resources/Prototypes/Stacks/Materials/ingots.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: stack
-  id: Gold
-  name: stack-gold
-  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: gold }
-  spawn: IngotGold1
-  maxCount: 30
-
-- type: stack
-  id: Silver
-  name: stack-silver
-  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: silver }
-  spawn: IngotSilver1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml
deleted file mode 100644
index a759922900..0000000000
--- a/Resources/Prototypes/Stacks/Materials/materials.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-- type: stack
-  id: Biomass
-  name: stack-biomass
-  icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
-  spawn: MaterialBiomass1
-  maxCount: 100
-
-- type: stack
-  id: WoodPlank
-  name: stack-wood-plank
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood }
-  spawn: MaterialWoodPlank1
-  maxCount: 30
-
-- type: stack
-  id: Cardboard
-  name: stack-cardboard
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
-  spawn: MaterialCardboard1
-  maxCount: 30
-
-- type: stack
-  id: Cloth
-  name: stack-cloth
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
-  spawn: MaterialCloth1
-  maxCount: 30
-
-- type: stack
-  id: Durathread
-  name: stack-durathread
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
-  spawn: MaterialDurathread1
-  maxCount: 30
-
-- type: stack
-  id: Diamond
-  name: stack-diamond
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond }
-  spawn: MaterialDiamond1
-  maxCount: 30
-
-- type: stack
-  id: Cotton
-  name: stack-cotton
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton }
-  spawn: MaterialCotton1
-  maxCount: 30
-
-- type: stack
-  id: Pyrotton
-  name: stack-pyrotton
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: pyrotton }
-  spawn: MaterialPyrotton1
-  maxCount: 30
-
-- type: stack
-  id: Bananium
-  name: stack-bananium
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium }
-  spawn: MaterialBananium1
-  maxCount: 10
-
-- type: stack
-  id: MeatSheets
-  name: stack-meat-sheet
-  icon: { sprite: /Textures/Objects/Materials/Sheets/meaterial.rsi, state: meat }
-  spawn: MaterialSheetMeat1
-  maxCount: 30
-
-- type: stack
-  id: WebSilk
-  name: stack-silk
-  icon: { sprite: /Textures/Objects/Materials/silk.rsi, state: icon }
-  spawn: MaterialWebSilk1
-  maxCount: 50
-
-- type: stack
-  id: SpaceCarpTooth
-  name: stack-space-carp-tooth
-  icon: { sprite: /Textures/Objects/Materials/Mob/carptooth.rsi, state: tooth }
-  spawn: MaterialToothSpaceCarp1
-  maxCount: 30
-
-- type: stack
-  id: SharkMinnowTooth
-  name: stack-sharkminnow-tooth
-  icon: { sprite: /Textures/Objects/Materials/Mob/sharktooth.rsi, state: tooth }
-  spawn: MaterialToothSharkminnow1
-  maxCount: 30
-
-- type: stack
-  id: Bones
-  name: stack-bones
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones }
-  spawn: MaterialBones1
-  maxCount: 30
-
-- type: stack
-  id: Gunpowder
-  name: stack-gunpowder
-  icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
-  spawn: MaterialGunpowder
-  maxCount: 60
-
-- type: stack
-  id: GoliathHide
-  name: stack-goliath-hide
-  icon: { sprite: /Textures/Objects/Materials/hide.rsi, state: goliath_hide }
-  spawn: MaterialGoliathHide1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Materials/parts.yml b/Resources/Prototypes/Stacks/Materials/parts.yml
deleted file mode 100644
index 3b6fb4bcff..0000000000
--- a/Resources/Prototypes/Stacks/Materials/parts.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: stack
-  id: MetalRod
-  name: stack-rods
-  icon: { sprite: /Textures/Objects/Materials/parts.rsi, state: rods }
-  spawn: PartRodMetal1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml b/Resources/Prototypes/Stacks/Sheets/glass.yml
similarity index 87%
rename from Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
rename to Resources/Prototypes/Stacks/Sheets/glass.yml
index c3752b62ae..2984b9f2e4 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Stacks/Sheets/glass.yml
@@ -1,48 +1,48 @@
 - type: stack
+  parent: BaseSheetStack
   id: Glass
   name: stack-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: glass }
   spawn: SheetGlass1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: ReinforcedGlass
   name: stack-reinforced-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rglass }
   spawn: SheetRGlass1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: PlasmaGlass
   name: stack-plasma-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: pglass }
   spawn: SheetPGlass1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: ReinforcedPlasmaGlass
   name: stack-reinforced-plasma-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rpglass }
   spawn: SheetRPGlass1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: UraniumGlass
   name: stack-uranium-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: uglass }
   spawn: SheetUGlass1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: ReinforcedUraniumGlass
   name: stack-reinforced-uranium-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: ruglass }
   spawn: SheetRUGlass1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: ClockworkGlass
   name: stack-clockwork-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: cglass }
   spawn: SheetClockworkGlass1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml b/Resources/Prototypes/Stacks/Sheets/metal.yml
similarity index 85%
rename from Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
rename to Resources/Prototypes/Stacks/Sheets/metal.yml
index 90c37e3dda..188a4e30b2 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Stacks/Sheets/metal.yml
@@ -1,20 +1,20 @@
 - type: stack
+  parent: BaseSheetStack
   id: Steel
   name: stack-steel
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: steel }
   spawn: SheetSteel1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: Plasteel
   name: stack-plasteel
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plasteel }
   spawn: SheetPlasteel1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: Brass
   name: stack-brass
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: brass }
   spawn: SheetBrass1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Sheets/organic.yml b/Resources/Prototypes/Stacks/Sheets/organic.yml
new file mode 100644
index 0000000000..7239a72269
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Sheets/organic.yml
@@ -0,0 +1,13 @@
+- type: stack
+  parent: BaseSheetStack
+  id: Paper
+  name: stack-paper
+  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: paper }
+  spawn: SheetPaper1
+
+- type: stack
+  parent: BaseSheetStack
+  id: MeatSheets
+  name: stack-meat-sheet
+  icon: { sprite: /Textures/Objects/Materials/Sheets/meaterial.rsi, state: meat }
+  spawn: MaterialSheetMeat1
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml b/Resources/Prototypes/Stacks/Sheets/other.yml
similarity index 68%
rename from Resources/Prototypes/Stacks/Materials/Sheets/other.yml
rename to Resources/Prototypes/Stacks/Sheets/other.yml
index a86b4bec6f..082919d39d 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Stacks/Sheets/other.yml
@@ -1,27 +1,20 @@
 - type: stack
-  id: Paper
-  name: stack-paper
-  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: paper }
-  spawn: SheetPaper1
-  maxCount: 30
-
-- type: stack
+  parent: BaseSheetStack
   id: Plasma
   name: stack-plasma
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plasma }
   spawn: SheetPlasma1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: Plastic
   name: stack-plastic
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plastic }
   spawn: SheetPlastic1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: Uranium
   name: stack-uranium
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: uranium }
   spawn: SheetUranium1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Specific/engineering.yml b/Resources/Prototypes/Stacks/Specific/engineering.yml
new file mode 100644
index 0000000000..86e339e693
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Specific/engineering.yml
@@ -0,0 +1,36 @@
+# they're uninflated by default so they're tiny
+- type: stack
+  parent: BaseSmallStack
+  id: InflatableWall
+  name: stack-inflatable-wall
+  icon: { sprite: "/Textures/Objects/Misc/inflatable_wall.rsi", state: item_wall }
+  spawn: InflatableWallStack1
+
+- type: stack
+  id: InflatableDoor
+  name: stack-inflatable-door
+  icon: { sprite: "/Textures/Objects/Misc/inflatable_door.rsi", state: item_door }
+  spawn: InflatableDoorStack1
+  maxCount: 4 # Maybe increased to 5 to reuse the base?
+
+# Cables
+- type: stack
+  parent: BaseMediumStack
+  id: Cable
+  name: stack-lv-cable
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coil-30 }
+  spawn: CableApcStack1
+
+- type: stack
+  parent: BaseMediumStack
+  id: CableMV
+  name: stack-mv-cable
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilmv-30 }
+  spawn: CableMVStack1
+
+- type: stack
+  parent: BaseMediumStack
+  id: CableHV
+  name: stack-hv-cable
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilhv-30 }
+  spawn: CableHVStack1
diff --git a/Resources/Prototypes/Stacks/medical_stacks.yml b/Resources/Prototypes/Stacks/Specific/medical.yml
similarity index 85%
rename from Resources/Prototypes/Stacks/medical_stacks.yml
rename to Resources/Prototypes/Stacks/Specific/medical.yml
index 5c4e98f6f6..65691b0e8a 100644
--- a/Resources/Prototypes/Stacks/medical_stacks.yml
+++ b/Resources/Prototypes/Stacks/Specific/medical.yml
@@ -1,49 +1,51 @@
+# Topical medicines
+
 - type: stack
+  parent: BaseSmallStack
   id: Ointment
   name: stack-ointment
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: ointment }
   spawn: Ointment
-  maxCount: 10
 
 - type: stack
+  parent: BaseSmallStack
   id: AloeCream
   name: stack-aloe-cream
   icon: { sprite: "/Textures/Objects/Specific/Hydroponics/aloe.rsi", state: cream }
   spawn: AloeCream
-  maxCount: 10
 
 - type: stack
+  parent: BaseSmallStack
   id: Gauze
   name: stack-gauze
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
   spawn: Gauze
-  maxCount: 10
 
 - type: stack
+  parent: BaseSmallStack
   id: Brutepack
   name: stack-brutepack
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
   spawn: Brutepack
-  maxCount: 10
 
 - type: stack
+  parent: BaseSmallStack
   id: Bloodpack
   name: stack-bloodpack
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: bloodpack }
   spawn: Bloodpack
-  maxCount: 10
 
 - type: stack
+  parent: BaseSmallStack
   id: MedicatedSuture
   name: stack-medicated-suture
   icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: medicated-suture }
   spawn: MedicatedSuture
-  maxCount: 10
 
 - type: stack
+  parent: BaseSmallStack
   id: RegenerativeMesh
   name: stack-regenerative-mesh
   icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: regenerative-mesh}
   spawn: RegenerativeMesh
-  maxCount: 10
 
diff --git a/Resources/Prototypes/Stacks/science_stacks.yml b/Resources/Prototypes/Stacks/Specific/science.yml
similarity index 63%
rename from Resources/Prototypes/Stacks/science_stacks.yml
rename to Resources/Prototypes/Stacks/Specific/science.yml
index 0dfc5444fd..610464b33e 100644
--- a/Resources/Prototypes/Stacks/science_stacks.yml
+++ b/Resources/Prototypes/Stacks/Specific/science.yml
@@ -1,13 +1,13 @@
 - type: stack
+  parent: BaseMediumStack
   id: ArtifactFragment
   name: stack-artifact-fragment
+  icon: { sprite: /Textures/Objects/Specific/Xenoarchaeology/artifact_fragments.rsi, state: martianball1 }
   spawn: ArtifactFragment1
-  maxCount: 30
-
 
 - type: stack
+  parent: BaseSmallStack
   id: Manipulator
   name: stack-micro-manipulator
   icon: { sprite: /Textures/Objects/Misc/stock_parts.rsi, state: micro_mani }
   spawn: MicroManipulatorStockPart
-  maxCount: 10
diff --git a/Resources/Prototypes/Stacks/Specific/security.yml b/Resources/Prototypes/Stacks/Specific/security.yml
new file mode 100644
index 0000000000..7b3d60f1bc
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Specific/security.yml
@@ -0,0 +1,6 @@
+- type: stack
+  parent: BaseMediumStack
+  id: CableDet
+  name: stack-explosive-cord
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilex-30 }
+  spawn: CableDetStack1
diff --git a/Resources/Prototypes/Stacks/base_stacks.yml b/Resources/Prototypes/Stacks/base_stacks.yml
index abf64f398a..d3d4228fc2 100644
--- a/Resources/Prototypes/Stacks/base_stacks.yml
+++ b/Resources/Prototypes/Stacks/base_stacks.yml
@@ -1,5 +1,39 @@
 # Base sizes for stacks in one convenient place
 
+# size used by powders and smokeables
+- type: stack
+  abstract: true
+  id: BaseVerySmallStack
+  maxCount: 5
+
+# size used by topicals and machine parts
+- type: stack
+  abstract: true
+  id: BaseSmallStack
+  maxCount: 10
+
+# Default size
+- type: stack
+  abstract: true
+  id: BaseMediumStack
+  maxCount: 30
+
+- type: stack
+  abstract: true
+  id: BaseLargeStack
+  maxCount: 50
+
+- type: stack
+  abstract: true
+  id: BaseVeryLargeStack
+  maxCount: 100
+
+# size used by "sheets." Usually materials like steel, glass, or plasma
+- type: stack
+  abstract: true
+  id: BaseSheetStack
+  maxCount: 30
+
 # Used by tiles
 - type: stack
   abstract: true
diff --git a/Resources/Prototypes/Stacks/cloth.yml b/Resources/Prototypes/Stacks/cloth.yml
new file mode 100644
index 0000000000..8fbac968c3
--- /dev/null
+++ b/Resources/Prototypes/Stacks/cloth.yml
@@ -0,0 +1,27 @@
+- type: stack
+  parent: BaseMediumStack
+  id: Cloth
+  name: stack-cloth
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
+  spawn: MaterialCloth1
+
+- type: stack
+  parent: BaseMediumStack
+  id: Durathread
+  name: stack-durathread
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
+  spawn: MaterialDurathread1
+
+- type: stack
+  parent: BaseMediumStack
+  id: Cotton
+  name: stack-cotton
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton }
+  spawn: MaterialCotton1
+
+- type: stack
+  parent: BaseMediumStack
+  id: Pyrotton
+  name: stack-pyrotton
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: pyrotton }
+  spawn: MaterialPyrotton1
diff --git a/Resources/Prototypes/Stacks/consumable_stacks.yml b/Resources/Prototypes/Stacks/consumable.yml
similarity index 78%
rename from Resources/Prototypes/Stacks/consumable_stacks.yml
rename to Resources/Prototypes/Stacks/consumable.yml
index fcd10e5d7f..f96f2703e6 100644
--- a/Resources/Prototypes/Stacks/consumable_stacks.yml
+++ b/Resources/Prototypes/Stacks/consumable.yml
@@ -3,82 +3,77 @@
 - type: stack
   id: Pancake
   name: stack-pancake
+  icon: { sprite: /Textures/Objects/Consumable/Food/Baked/misc.rsi, state: pancakes1 }
   spawn: FoodBakedPancake
   maxCount: 9
 
 - type: stack
   id: PancakeBb
   name: stack-blueberry-pancake
+  icon: { sprite: /Textures/Objects/Consumable/Food/Baked/misc.rsi, state: pancakesbb1 }
   spawn: FoodBakedPancakeBb
   maxCount: 9
 
 - type: stack
   id: PancakeCc
   name: stack-chocolate-chip-pancake
+  icon: { sprite: /Textures/Objects/Consumable/Food/Baked/misc.rsi, state: pancakescc1 }
   spawn: FoodBakedPancakeCc
   maxCount: 9
 
-# Food Containers
-
-- type: stack
-  id: PizzaBox
-  name: stack-pizza-box
-  icon: { sprite: Objects/Consumable/Food/Baked/pizza.rsi, state: box }
-  spawn: FoodBoxPizza
-  maxCount: 30
-
 # Smokeables
 
 - type: stack
+  parent: BaseVerySmallStack
   id: PaperRolling
   name: stack-rolling-paper
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigpaper }
   spawn: PaperRolling
-  maxCount: 5
 
 - type: stack
+  parent: BaseVerySmallStack
   id: CigaretteFilter
   name: stack-cigarette-filter
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigfilter }
   spawn: CigaretteFilter
-  maxCount: 5
 
 - type: stack
+  parent: BaseVerySmallStack
   id: GroundTobacco
   name: stack-ground-tobacco
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: GroundTobacco
-  maxCount: 5
 
 - type: stack
+  parent: BaseVerySmallStack
   id: GroundCannabis
   name: stack-ground-cannabis
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: GroundCannabis
-  maxCount:
 
 - type: stack
+  parent: BaseVerySmallStack
   id: GroundCannabisRainbow
   name: stack-ground-rainbow-cannabis
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: powderpile_rainbow }
   spawn: GroundCannabisRainbow
-  maxCount:
 
 - type: stack
+  parent: BaseVerySmallStack
   id: LeavesTobaccoDried
   name: stack-dried-tobacco-leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
   spawn: LeavesTobaccoDried
-  maxCount: 5
 
 - type: stack
+  parent: BaseVerySmallStack
   id: LeavesCannabisDried
   name: stack-dried-cannabis-leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
   spawn: LeavesCannabisDried
-  maxCount: 5
 
 - type: stack
+  parent: BaseVerySmallStack
   id: LeavesCannabisRainbowDried
   name: stack-dried-rainbow-cannabis-leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: dried }
diff --git a/Resources/Prototypes/Stacks/currency.yml b/Resources/Prototypes/Stacks/currency.yml
new file mode 100644
index 0000000000..1a0735005a
--- /dev/null
+++ b/Resources/Prototypes/Stacks/currency.yml
@@ -0,0 +1,11 @@
+- type: stack
+  id: Telecrystal
+  name: stack-telecrystal
+  icon: { sprite: /Textures/Objects/Specific/Syndicate/telecrystal.rsi, state: telecrystal }
+  spawn: Telecrystal1
+
+- type: stack
+  id: Credit
+  name: stack-credit
+  icon: { sprite: /Textures/Objects/Economy/cash.rsi, state: cash }
+  spawn: SpaceCash
diff --git a/Resources/Prototypes/Stacks/engineering_stacks.yml b/Resources/Prototypes/Stacks/engineering_stacks.yml
deleted file mode 100644
index 4d9fcbb57b..0000000000
--- a/Resources/Prototypes/Stacks/engineering_stacks.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# they're uninflated by default so they're tiny
-- type: stack
-  id: InflatableWall
-  name: stack-inflatable-wall
-  spawn: InflatableWallStack1
-  maxCount: 10
-
-- type: stack
-  id: InflatableDoor
-  name: stack-inflatable-door
-  spawn: InflatableDoorStack1
-  maxCount: 4
diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/ore.yml
similarity index 83%
rename from Resources/Prototypes/Stacks/Materials/ore.yml
rename to Resources/Prototypes/Stacks/ore.yml
index 240e584e40..7f7fb05695 100644
--- a/Resources/Prototypes/Stacks/Materials/ore.yml
+++ b/Resources/Prototypes/Stacks/ore.yml
@@ -1,69 +1,71 @@
+# unrefined ore
+
 - type: stack
+  parent: BaseMediumStack
   id: GoldOre
   name: stack-gold-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: gold }
   spawn: GoldOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: DiamondOre
   name: stack-rough-diamond
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: diamond }
   spawn: DiamondOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: SteelOre
   name: stack-iron-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: iron }
   spawn: SteelOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: PlasmaOre
   name: stack-plasma-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: plasma }
   spawn: PlasmaOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: SilverOre
   name: stack-silver-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: silver }
   spawn: SilverOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: SpaceQuartz
   name: stack-space-quartz
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: spacequartz }
   spawn: SpaceQuartz1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: UraniumOre
   name: stack-uranium-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: uranium }
   spawn: UraniumOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: BananiumOre
   name: stack-bananium-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: bananium }
   spawn: BananiumOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: Coal
   name: stack-coal
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: coal }
   spawn: Coal1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: SaltOre
   name: stack-salt
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: salt }
   spawn: Salt1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/ore_refined.yml b/Resources/Prototypes/Stacks/ore_refined.yml
new file mode 100644
index 0000000000..e171bce0d8
--- /dev/null
+++ b/Resources/Prototypes/Stacks/ore_refined.yml
@@ -0,0 +1,30 @@
+# Materials which come from refining ores, excluding sheets
+
+- type: stack
+  parent: BaseMediumStack
+  id: Diamond
+  name: stack-diamond
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond }
+  spawn: MaterialDiamond1
+
+- type: stack
+  parent: BaseSmallStack
+  id: Bananium
+  name: stack-bananium
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium }
+  spawn: MaterialBananium1
+
+# Ingots
+- type: stack
+  parent: BaseMediumStack
+  id: Gold
+  name: stack-gold
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: gold }
+  spawn: IngotGold1
+
+- type: stack
+  parent: BaseMediumStack
+  id: Silver
+  name: stack-silver
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: silver }
+  spawn: IngotSilver1
diff --git a/Resources/Prototypes/Stacks/organic.yml b/Resources/Prototypes/Stacks/organic.yml
new file mode 100644
index 0000000000..9f4764f904
--- /dev/null
+++ b/Resources/Prototypes/Stacks/organic.yml
@@ -0,0 +1,59 @@
+- type: stack
+  parent: BaseVeryLargeStack
+  id: Biomass
+  name: stack-biomass
+  icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
+  spawn: MaterialBiomass1
+
+# Stacks which come from plants
+
+- type: stack
+  parent: BaseMediumStack
+  id: WoodPlank
+  name: stack-wood-plank
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood }
+  spawn: MaterialWoodPlank1
+
+- type: stack
+  parent: BaseMediumStack
+  id: Cardboard
+  name: stack-cardboard
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
+  spawn: MaterialCardboard1
+
+# Stacks which come from or might come from a creature
+
+- type: stack
+  parent: BaseLargeStack
+  id: WebSilk
+  name: stack-silk
+  icon: { sprite: /Textures/Objects/Materials/silk.rsi, state: icon }
+  spawn: MaterialWebSilk1
+
+- type: stack
+  parent: BaseMediumStack
+  id: Bones
+  name: stack-bones
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones }
+  spawn: MaterialBones1
+
+- type: stack
+  parent: BaseMediumStack
+  id: SpaceCarpTooth
+  name: stack-space-carp-tooth
+  icon: { sprite: /Textures/Objects/Materials/Mob/carptooth.rsi, state: tooth }
+  spawn: MaterialToothSpaceCarp1
+
+- type: stack
+  parent: BaseMediumStack
+  id: SharkMinnowTooth
+  name: stack-sharkminnow-tooth
+  icon: { sprite: /Textures/Objects/Materials/Mob/sharktooth.rsi, state: tooth }
+  spawn: MaterialToothSharkminnow1
+
+- type: stack
+  parent: BaseMediumStack
+  id: GoliathHide
+  name: stack-goliath-hide
+  icon: { sprite: /Textures/Objects/Materials/hide.rsi, state: goliath_hide }
+  spawn: MaterialGoliathHide1
diff --git a/Resources/Prototypes/Stacks/other.yml b/Resources/Prototypes/Stacks/other.yml
new file mode 100644
index 0000000000..e5889915d1
--- /dev/null
+++ b/Resources/Prototypes/Stacks/other.yml
@@ -0,0 +1,15 @@
+# Stacks which don't fit cleanly into other categories
+
+- type: stack
+  parent: BaseSheetStack # Not a sheet, but spiritually similar
+  id: MetalRod
+  name: stack-rods
+  icon: { sprite: /Textures/Objects/Materials/parts.rsi, state: rods }
+  spawn: PartRodMetal1
+
+- type: stack
+  parent: BaseVerySmallStack
+  id: Gunpowder
+  name: stack-gunpowder
+  icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
+  spawn: MaterialGunpowder
diff --git a/Resources/Prototypes/Stacks/power_stacks.yml b/Resources/Prototypes/Stacks/power_stacks.yml
deleted file mode 100644
index 40782d382c..0000000000
--- a/Resources/Prototypes/Stacks/power_stacks.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-- type: stack
-  id: Cable
-  name: stack-lv-cable
-  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coil-30 }
-  spawn: CableApcStack1
-  maxCount: 30
-
-- type: stack
-  id: CableMV
-  name: stack-mv-cable
-  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilmv-30 }
-  spawn: CableMVStack1
-  maxCount: 30
-
-- type: stack
-  id: CableHV
-  name: stack-hv-cable
-  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilhv-30 }
-  spawn: CableHVStack1
-  maxCount: 30
-
-# Explosive cable below
-
-- type: stack
-  id: CableDet
-  name: stack-explosive-cord
-  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilex-30 }
-  spawn: CableDetStack1
-  maxCount: 30
-

From 772d311b3ce9fa71fc025d99ead24767a2db8a63 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 12 Oct 2025 01:30:08 +0000
Subject: [PATCH 186/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 02e14850bb..28a96750b4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Moomoobeef
-  changes:
-  - message: Bookshelves now contain a more reasonable amount of books.
-    type: Tweak
-  id: 8577
-  time: '2025-05-27T21:21:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37866
 - author: SlamBamActionman
   changes:
   - message: Seismic Charges now trigger the timer when sent a signal, instead of
@@ -3947,3 +3940,10 @@
   id: 9079
   time: '2025-10-12T00:56:09.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38381
+- author: aada
+  changes:
+  - message: Cannabis no longer stacks infinitely. Sorry, botanists!
+    type: Fix
+  id: 9080
+  time: '2025-10-12T01:29:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38412

From 31f8f768a06bb4a98889cdeb4fdd0fd5fda28092 Mon Sep 17 00:00:00 2001
From: Jopogrechkin <killerden392@gmail.com>
Date: Sun, 12 Oct 2025 08:35:12 +0300
Subject: [PATCH 187/216] Brand new hair (#39850)

* Update human_hair.yml

* overeyepigtail

* Update meta.json

* Update human-hair.ftl

* Update meta.json

* Update Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

rerun test

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 Resources/Locale/en-US/accessories/human-hair.ftl |   1 +
 .../Mobs/Customization/Markings/human_hair.yml    |   7 +++++++
 .../Mobs/Customization/human_hair.rsi/meta.json   |   6 +++++-
 .../human_hair.rsi/overeyepigtail.png             | Bin 0 -> 810 bytes
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 50d2b2790e..b9b103b58a 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -199,3 +199,4 @@ marking-HumanHairVlongfringe = Very Long with Fringe
 marking-HumanHairVolaju = Volaju
 marking-HumanHairWisp = Wisp
 marking-HumanHairLongWithBangs = Long With Bangs
+marking-HumanHairOverEyePigtail = Pigtail (Over Eye)
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index fb6f8d4fed..a7748c4566 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1405,3 +1405,10 @@
   sprites:
   - sprite: Mobs/Customization/human_hair.rsi
     state: longwithbangs
+- type: marking
+  id: HumanHairOverEyePigtail
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+  - sprite: Mobs/Customization/human_hair.rsi
+    state: overeyepigtail
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index dcacd1d743..35ec37005f 100644
--- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -4,7 +4,7 @@
       "x": 32,
       "y": 32
     },
-    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github), long_with_bangs shaped and longbow by Futuristic (and Pyvik) for SS14, cube and baby by CoolioDudio",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github), long_with_bangs shaped and longbow by Futuristic (and Pyvik) for SS14, cube and baby by CoolioDudio, overeyepigtail by GovnokradZXC",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -814,6 +814,10 @@
       {
         "name": "longwithbangs",
         "directions": 4
+      },
+      {
+        "name": "overeyepigtail",
+        "directions": 4
       }
     ]
   }
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3c94ba0572f0715faff77172b56e6c813e069df
GIT binary patch
literal 810
zcmV+_1J(SAP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZr)Ja4^RCt{2n$POuFc8P5vb43}so>2Q5IptRH&S1-
zN3Vhxkp=|C;K4F&dPw%L#I3ISGwDBF=5rBio0<8VNlIn_EI~wN`)rf+>Idh%R}q@9
z@7O$qh)PNcm&*l4qY(@S0|<h^YAjp(d7eXAmf*TB42MH&`vV)}Qc4g)T(3zfJDZBy
zzUO)1x-NL0SIfSU0M+34`#o&8TR5N3AcW{d1Z`jAdEU+MHYs5wKsET;Z05vq?4)T5
zhzLRm;G9E}B&~>`r~ND65Yc#C;}p=r>+e+&(lmuQj$2s^f*^2qyWLIdRe5&(CyWHR
zTrLl<YY}|kw{pUi`(T9-fQWEB9*xKPWpeZBbh`QXtN6YT!{N}_0TYU%07Qf!2yR5s
z!52kgJZ59lb-iAz>2%uqR;bq)-}hlW9$y2uO+Di^;2B{UHZ{~seBXySj-8??Y6ssa
zS(bJ39<W-iu6CC5ML%zXpMc&L5fLVniFF)}r9fZUto&8JRsj7{WV7;D`C0+OFm!C*
z{QfJd3!*JwI|BgfPk(|S2!bF8f*=TjAnfU*PvBD;G=MSIn<Gt#V11nY$atRT5Qbr^
zN9|dbslnjigRIUPBmn*fFQo)2CFFSyoOAFzuhn#5j49oVpzYuLWQtXXNY%Km%uXf~
zXS3N@)#%^lcsyQv5p=IYT@kEiz<uz#I1xpWQ>RMv6Hyd7S_A;NepW>=#aMu9@R}}9
zXQL=`(liBtKQlu6VJkwdWAV1TLS7++xb_Rw6~Txs%M|BaF~(FAg$Y~q_M0S$VvH%q
zm}<RAYB^u1YTidt)LV5~r-5$I(S1ryl+2%kh^kcsHCfIV>To!;;~yegO|h;y91hB4
zJA69@q?AyWrJYwD!Z|m(|Er6mP4Kn=x<mBS$@BbaKjS0b7N9K4uP8?sMPZx<Z_($T
oZ^}3MN)QA=5ClOG1VQw{ZzWzTln_8AEC2ui07*qoM6N<$g7C9&H2?qr

literal 0
HcmV?d00001


From c8023d791d98c6af6ae4099d5d469368b36c3786 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 12 Oct 2025 05:47:06 +0000
Subject: [PATCH 188/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 28a96750b4..329c9e82d6 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
 Entries:
-- author: SlamBamActionman
-  changes:
-  - message: Seismic Charges now trigger the timer when sent a signal, instead of
-      detonating instantly.
-    type: Tweak
-  - message: Signal Triggers for modular grenades now detonate after a 3 second delay.
-    type: Tweak
-  id: 8578
-  time: '2025-05-28T07:31:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34465
 - author: Minemoder5000
   changes:
   - message: Grape juice cups now contain grape juice.
@@ -3947,3 +3937,10 @@
   id: 9080
   time: '2025-10-12T01:29:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38412
+- author: GovnokradZXC
+  changes:
+  - message: New hair named Pigtail (Over Eye)
+    type: Add
+  id: 9081
+  time: '2025-10-12T05:45:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39850

From 7578f064611547a26a99b83c677b5a29e26e1c91 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sun, 12 Oct 2025 09:00:32 +0200
Subject: [PATCH 189/216] Fix train parallax config (#40844)

Had many layers that were doing absolutely nothing because they were covered by AspidParallaxBG being there twice.

This parallax config is only used by the dev main menu, but it can't hurt to fix.
---
 Resources/Prototypes/Parallaxes/train.yml | 30 -----------------------
 1 file changed, 30 deletions(-)

diff --git a/Resources/Prototypes/Parallaxes/train.yml b/Resources/Prototypes/Parallaxes/train.yml
index e47cedfc2a..2bd7ac18e4 100644
--- a/Resources/Prototypes/Parallaxes/train.yml
+++ b/Resources/Prototypes/Parallaxes/train.yml
@@ -1,36 +1,6 @@
 - type: parallax
   id: TrainStation
   layers:
-    - texture:
-        !type:ImageParallaxTextureSource
-        path: "/Textures/Parallaxes/AspidParallaxBG.png"
-      slowness: 0.998046875
-      scale: "0.5, 0.5"
-      scrolling: "0, -0.098046875"
-    - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml"
-      slowness: 0.996625
-      scrolling: "0, -0.196625"
-    - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars_dim"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml"
-      slowness: 0.989375
-      scrolling: "0, -0.209375"
-    - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars_faster"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars-2.toml"
-      slowness: 0.987265625
-      scrolling: "0, -0.287265625"
-    - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars_dim_faster"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim-2.toml"
-      slowness: 0.984352
-      scrolling: "0, -0.384352"
     - texture:
         !type:ImageParallaxTextureSource
         path: "/Textures/Parallaxes/AspidParallaxBG.png"

From 2c1fc92e5c06efd7b3d09d24323435ead45227f3 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sun, 12 Oct 2025 03:36:54 -0700
Subject: [PATCH 190/216] Quieter Meat Kudzu  (#39304)

Init Commit

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Chat/Systems/AutoEmoteSystem.cs           |  6 +++-
 .../Chat/Prototypes/AutoEmotePrototype.cs     | 30 ++++++++++++++-----
 .../Entities/Objects/Misc/kudzu.yml           | 10 ++-----
 Resources/Prototypes/Voice/auto_emotes.yml    |  9 ++++++
 4 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/Content.Server/Chat/Systems/AutoEmoteSystem.cs b/Content.Server/Chat/Systems/AutoEmoteSystem.cs
index 3d6bd53540..1e1b7b9034 100644
--- a/Content.Server/Chat/Systems/AutoEmoteSystem.cs
+++ b/Content.Server/Chat/Systems/AutoEmoteSystem.cs
@@ -46,7 +46,11 @@ public sealed class AutoEmoteSystem : EntitySystem
 
                 if (autoEmotePrototype.WithChat)
                 {
-                    _chatSystem.TryEmoteWithChat(uid, autoEmotePrototype.EmoteId, autoEmotePrototype.HiddenFromChatWindow ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal);
+                    _chatSystem.TryEmoteWithChat(uid,
+                        autoEmotePrototype.EmoteId,
+                        autoEmotePrototype.HiddenFromChatWindow ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal,
+                        ignoreActionBlocker: autoEmotePrototype.IgnoreActionBlocker,
+                        forceEmote: autoEmotePrototype.Force);
                 }
                 else
                 {
diff --git a/Content.Shared/Chat/Prototypes/AutoEmotePrototype.cs b/Content.Shared/Chat/Prototypes/AutoEmotePrototype.cs
index e6fdae4cf1..a3d6ccce7f 100644
--- a/Content.Shared/Chat/Prototypes/AutoEmotePrototype.cs
+++ b/Content.Shared/Chat/Prototypes/AutoEmotePrototype.cs
@@ -14,30 +14,44 @@ public sealed partial class AutoEmotePrototype : IPrototype
     /// The ID of the emote prototype.
     /// </summary>
     [DataField("emote", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
-    public string EmoteId = String.Empty;
+    public string EmoteId = string.Empty;
 
     /// <summary>
     /// How often an attempt at the emote will be made.
     /// </summary>
-    [DataField("interval", required: true)]
+    [DataField(required: true)]
     public TimeSpan Interval;
 
     /// <summary>
     /// Probability of performing the emote each interval.
-    /// <summary>
+    /// </summary>
     [DataField("chance")]
     public float Chance = 1;
 
     /// <summary>
     /// Also send the emote in chat.
-    /// <summary>
-    [DataField("withChat")]
+    /// </summary>
+    [DataField]
     public bool WithChat = true;
 
+    /// <summary>
+    /// Should we ignore action blockers?
+    /// This does nothing if WithChat is false.
+    /// </summary>
+    [DataField]
+    public bool IgnoreActionBlocker;
+
+    /// <summary>
+    /// Should we ignore whitelists and force the emote?
+    /// This does nothing if WithChat is false.
+    /// </summary>
+    [DataField]
+    public bool Force;
+
     /// <summary>
     /// Hide the chat message from the chat window, only showing the popup.
     /// This does nothing if WithChat is false.
-    /// <summary>
-    [DataField("hiddenFromChatWindow")]
-    public bool HiddenFromChatWindow = false;
+    /// </summary>
+    [DataField]
+    public bool HiddenFromChatWindow;
 }
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index 6c01a2a8dd..1afe45e5ef 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -256,13 +256,9 @@
             Quantity: 2
           - ReagentId: Protein
             Quantity: 1
-    - type: Respirator
-      damage:
-        types:
-          Asphyxiation: 0.25
-      damageRecovery:
-        types:
-          Asphyxiation: -0.25
+    - type: AutoEmote # Meat Kudzu used to have respirator, but couldn't breathe so all it would do is gasp.
+      emotes:
+      - MeatGasp
     - type: Tag
       tags:
       - Meat
diff --git a/Resources/Prototypes/Voice/auto_emotes.yml b/Resources/Prototypes/Voice/auto_emotes.yml
index 2d2de26604..4b9830ccd5 100644
--- a/Resources/Prototypes/Voice/auto_emotes.yml
+++ b/Resources/Prototypes/Voice/auto_emotes.yml
@@ -12,3 +12,12 @@
   interval: 5.0
   chance: 0.5
   withChat: false
+# Kudzu
+- type: autoEmote
+  id: MeatGasp
+  emote: Gasp
+  interval: 4.0 # Same interval as a full breathing cycle
+  chance: 0.01 # Make it very rare
+  ignoreActionBlocker: true
+  force: true
+  hiddenFromChatWindow: true

From 20175bffb241be3963048c1113ac007d1e85401e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 12 Oct 2025 10:48:37 +0000
Subject: [PATCH 191/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 329c9e82d6..945768a43c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Minemoder5000
-  changes:
-  - message: Grape juice cups now contain grape juice.
-    type: Fix
-  id: 8579
-  time: '2025-05-28T09:32:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37895
 - author: Moomoobeef
   changes:
   - message: Made high-viz vest less visible.
@@ -3944,3 +3937,10 @@
   id: 9081
   time: '2025-10-12T05:45:59.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39850
+- author: Princess-Cheeseballs
+  changes:
+  - message: Meat Kudzu gasps less often.
+    type: Tweak
+  id: 9082
+  time: '2025-10-12T10:47:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39304

From beb3db14f0dbad99e806bf2bc47632f4d02c8817 Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Sun, 12 Oct 2025 20:42:57 +1000
Subject: [PATCH 192/216] Flash immunity examine visibility toggle (#40848)

---
 Content.Shared/Flash/Components/FlashImmunityComponent.cs | 6 ++++++
 Content.Shared/Flash/SharedFlashSystem.cs                 | 3 ++-
 Resources/Prototypes/Entities/Mobs/Species/skeleton.yml   | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Flash/Components/FlashImmunityComponent.cs b/Content.Shared/Flash/Components/FlashImmunityComponent.cs
index 149c27c517..8015f31e70 100644
--- a/Content.Shared/Flash/Components/FlashImmunityComponent.cs
+++ b/Content.Shared/Flash/Components/FlashImmunityComponent.cs
@@ -15,4 +15,10 @@ public sealed partial class FlashImmunityComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool Enabled = true;
+
+    /// <summary>
+    /// Should the flash protection be shown when examining the entity?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ShowInExamine = true;
 }
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index 02513aa91b..a762a94e58 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -268,6 +268,7 @@ public abstract class SharedFlashSystem : EntitySystem
 
     private void OnExamine(Entity<FlashImmunityComponent> ent, ref ExaminedEvent args)
     {
-        args.PushMarkup(Loc.GetString("flash-protection"));
+        if (ent.Comp.ShowInExamine)
+            args.PushMarkup(Loc.GetString("flash-protection"));
     }
 }
diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index 5dc127878f..d223293862 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -102,6 +102,7 @@
   - type: FireVisuals
     alternateState: Standing
   - type: FlashImmunity
+    showInExamine: false
   - type: Inventory
     femaleDisplacements:
       jumpsuit:

From 4eaf7526e4a420351d923b7b7f9603b36a983ad6 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sun, 12 Oct 2025 12:51:33 +0200
Subject: [PATCH 193/216] Fix patrons in in-game credits (#40840)

---
 Resources/Credits/Patrons.yml | 2244 +++++++++++++--------------------
 Tools/dump_patrons.ps1        |    2 +-
 2 files changed, 862 insertions(+), 1384 deletions(-)

diff --git a/Resources/Credits/Patrons.yml b/Resources/Credits/Patrons.yml
index fe313d4a8e..d736857edc 100644
--- a/Resources/Credits/Patrons.yml
+++ b/Resources/Credits/Patrons.yml
@@ -1,1417 +1,895 @@
-- Name: Luaan
+- Name: "'-Y-"
   Tier: Syndicate Agent
-- Name: Nugmania
-  Tier: Revolutionary
-- Name: Xoxeyos
-  Tier: Free
-- Name: CobaltCobra
-  Tier: Syndicate Agent
-- Name: Train
-  Tier: Free
-- Name: ExclusiveWizard
-  Tier: Syndicate Agent
-- Name: Matthew Umney
-  Tier: Free
-- Name: Hat Kid
-  Tier: Revolutionary
-- Name: Ingvar Tornberg
-  Tier: Revolutionary
-- Name: Joshua Hines
-  Tier: Nuclear Operative
-- Name: Ashley Parfitt
-  Tier: Revolutionary
-- Name: thehomelessmanbehindthedumpster
-  Tier: Free
-- Name: VmasterVX
-  Tier: Revolutionary
-- Name: JenericJen
-  Tier: Nuclear Operative
-- Name: Cosu
-  Tier: Revolutionary
-- Name: AileenOnline
-  Tier: Free
-- Name: Grotty Bepis
-  Tier: Nuclear Operative
-- Name: Dizzy_Eevee
-  Tier: Syndicate Agent
-- Name: Lizard
-  Tier: Free
-- Name: Michael Van Gaasbeck
-  Tier: Revolutionary
-- Name: Statix AraAra
-  Tier: Revolutionary
-- Name: WWII Kitsune
-  Tier: Nuclear Operative
-- Name: Bruno Bigras
-  Tier: Revolutionary
-- Name: TheLocalTryHard
-  Tier: Free
-- Name: Sufary
-  Tier: Nuclear Operative
-- Name: taydeo
-  Tier: Nuclear Operative
-- Name: dubdubchan
-  Tier: Syndicate Agent
-- Name: tremors08
-  Tier: Syndicate Agent
-- Name: Jan Gocník
-  Tier: Free
-- Name: Tret Mekiao
-  Tier: Free
-- Name: Ben Joja Hotop
-  Tier: Free
-- Name: Sean Lenin
-  Tier: Free
-- Name: KiddoTBH
-  Tier: Free
-- Name: Kubakura
-  Tier: Syndicate Agent
-- Name: Bullet Kin
-  Tier: Free
-- Name: Abby Eveland
-  Tier: Revolutionary
-- Name: Zoe
-  Tier: Free
-- Name: ghost--page
-  Tier: Nuclear Operative
-- Name: MechaKitty
-  Tier: Revolutionary
-- Name: BlueNexa
-  Tier: Free
-- Name: Noah Heaverin
-  Tier: Free
-- Name: jamozen
-  Tier: Free
-- Name: SireHambone
-  Tier: Nuclear Operative
-- Name: Blair Cyprus
-  Tier: Free
-- Name: Ryan Hanson
-  Tier: Revolutionary
-- Name: Heinrick Archsider
-  Tier: Free
-- Name: Arsalan Sarwari
-  Tier: Free
-- Name: Scardy
-  Tier: Free
-- Name: Nagano
-  Tier: Revolutionary
-- Name: Aridia
-  Tier: Free
-- Name: illpala
-  Tier: Revolutionary
-- Name: kayo josé
-  Tier: Free
-- Name: Tymon Tymek
-  Tier: Free
-- Name: AlexDragoon
-  Tier: Revolutionary
-- Name: Henrik Møller
-  Tier: Syndicate Agent
-- Name: Mythtic B
-  Tier: Revolutionary
-- Name: zedd
-  Tier: Nuclear Operative
-- Name: Penguin Commoner
-  Tier: Revolutionary
-- Name: Davyei
-  Tier: Free
-- Name: Akaelik
-  Tier: Nuclear Operative
-- Name: Kyle Tyo
-  Tier: Revolutionary
-- Name: Rhys Williams
-  Tier: Free
-- Name: Drakkenlupen
-  Tier: Revolutionary
-- Name: Randomposter
-  Tier: Free
-- Name: Justin White
-  Tier: Free
-- Name: Ty Ashley
-  Tier: Revolutionary
-- Name: Scorching Rae
-  Tier: Nuclear Operative
-- Name: Cindy Sampaga
-  Tier: Free
-- Name: Plague
-  Tier: Free
-- Name: dude
-  Tier: Free
-- Name: NIACO
-  Tier: Free
-- Name: Tee The Kobold
-  Tier: Revolutionary
-- Name: Redstones563
-  Tier: Free
-- Name: Celestrogen
-  Tier: Syndicate Agent
-- Name: SotetSotetSotetSotetSotet
-  Tier: Syndicate Agent
-- Name: Guffin
-  Tier: Free
-- Name: Southbridge
-  Tier: Nuclear Operative
-- Name: ZazaRyn
-  Tier: Syndicate Agent
-- Name: Magic Crystal Radio
-  Tier: Free
-- Name: Sam Sullins
-  Tier: Free
-- Name: Widoux 341
-  Tier: Free
-- Name: spookerton
-  Tier: Syndicate Agent
-- Name: Tom Goodman (TauOmicronMu#2500)
-  Tier: Revolutionary
-- Name: Robbie Me
-  Tier: Free
-- Name: momochitters
-  Tier: Free
-- Name: Raspberry1111
-  Tier: Revolutionary
-- Name: flipways
-  Tier: Nuclear Operative
-- Name: Nictis
-  Tier: Revolutionary
-- Name: crazybrain
-  Tier: Free
-- Name: peanut
-  Tier: Nuclear Operative
-- Name: Lewis McCalmont
-  Tier: Free
-- Name: T.P_Gaming
-  Tier: Revolutionary
-- Name: A Patreon of the Ahts
-  Tier: Free
-- Name: brbrbrbrbr brbrbr
-  Tier: Revolutionary
-- Name: Shadcake
-  Tier: Free
-- Name: kristopher arnott
-  Tier: Syndicate Agent
-- Name: Reebe
-  Tier: Free
-- Name: blossom
-  Tier: Revolutionary
-- Name: ml726
-  Tier: Free
-- Name: Logan Splett
-  Tier: Free
-- Name: Patrick Mitchell
-  Tier: Free
-- Name: Semiotics
-  Tier: Syndicate Agent
-- Name: Snowlili
-  Tier: Revolutionary
-- Name: Hyeronimus Bosch
-  Tier: Free
-- Name: S1rFl0
-  Tier: Revolutionary
-- Name: Gavin
-  Tier: Free
-- Name: Faust Statler
-  Tier: Syndicate Agent
-- Name: the good king wompicus
-  Tier: Syndicate Agent
-- Name: DerBall
-  Tier: Revolutionary
-- Name: Gallagin
-  Tier: Revolutionary
-- Name: Edward Doyle
-  Tier: Revolutionary
-- Name: Preston Pickering
-  Tier: Revolutionary
-- Name: Andrew Danke
-  Tier: Syndicate Agent
-- Name: Alexis
-  Tier: Nuclear Operative
-- Name: Saphinara
-  Tier: Free
-- Name: Random Person
-  Tier: Syndicate Agent
-- Name: mage_period
-  Tier: Syndicate Agent
-- Name: piras314
-  Tier: Free
-- Name: Mark Khudaev
-  Tier: Free
-- Name: Saver
-  Tier: Free
-- Name: Snilo Black
-  Tier: Free
-- Name: CptFalcon
-  Tier: Revolutionary
-- Name: Daxx (Justin Winningham)
-  Tier: Syndicate Agent
-- Name: Posters Union Australia (Shlee)
-  Tier: Free
-- Name: nathan
-  Tier: Free
-- Name: funnylookingwolf
-  Tier: Revolutionary
-- Name: Sporkyz
-  Tier: Revolutionary
-- Name: SarahRaven
-  Tier: Revolutionary
-- Name: Da Skolin
-  Tier: Free
-- Name: Joshua Meyer
-  Tier: Free
-- Name: BUMBLE
-  Tier: Free
-- Name: Lily Roche
-  Tier: Free
-- Name: Klive McToaster
-  Tier: Free
-- Name: CasuallyAPerson
-  Tier: Free
-- Name: Powder
-  Tier: Revolutionary
-- Name: Noah Heaverin
-  Tier: Free
-- Name: Violette
-  Tier: Revolutionary
-- Name: Amble
-  Tier: Nuclear Operative
-- Name: James Sanders
-  Tier: Free
-- Name: Susaniel
-  Tier: Free
-- Name: Eve Holly
-  Tier: Free
-- Name: Superscope
-  Tier: Free
-- Name: Nyxilath
-  Tier: Nuclear Operative
-- Name: RedChair368
-  Tier: Revolutionary
-- Name: Blumbee
-  Tier: Revolutionary
-- Name: Mason Fawcett
-  Tier: Revolutionary
-- Name: Cerzix
-  Tier: Revolutionary
-- Name: Aeris Ophelia
-  Tier: Free
-- Name: Troll_King_907
-  Tier: Nuclear Operative
-- Name: Certified Hood Classic
-  Tier: Free
-- Name: Hydraliks
-  Tier: Free
-- Name: Meguneri
-  Tier: Free
-- Name: hyphenation
-  Tier: Nuclear Operative
-- Name: Psy
-  Tier: Revolutionary
-- Name: Pinet
-  Tier: Nuclear Operative
-- Name: Vivi Bunny
-  Tier: Free
-- Name: James Stevens
-  Tier: Revolutionary
-- Name: anharmlessguest
-  Tier: Syndicate Agent
-- Name: Outlier
-  Tier: Free
-- Name: Brandon Hackney
-  Tier: Free
-- Name: eleanor nora
-  Tier: Free
-- Name: starch
-  Tier: Syndicate Agent
-- Name: Jacob Watson
-  Tier: Syndicate Agent
-- Name: Seinfeld
-  Tier: Revolutionary
-- Name: Prime!
-  Tier: Free
-- Name: John
-  Tier: Free
-- Name: FauxParadox
-  Tier: Revolutionary
-- Name: Mr_Clank
-  Tier: Revolutionary
-- Name: rafael rabelo
-  Tier: Free
-- Name: TBF_Jack
-  Tier: Free
-- Name: StaceyBalcom
-  Tier: Revolutionary
-- Name: guh
-  Tier: Revolutionary
-- Name: Fran Picek
-  Tier: Free
-- Name: Austenn
-  Tier: Revolutionary
-- Name: Flayn
-  Tier: Free
-- Name: Nye
-  Tier: Free
-- Name: Phycoweirdo
-  Tier: Nuclear Operative
-- Name: Madeleine LeFleur
-  Tier: Syndicate Agent
-- Name: Anton
-  Tier: Revolutionary
-- Name: That Furry Fuck
-  Tier: Free
-- Name: sat
-  Tier: Free
-- Name: goober
-  Tier: Free
-- Name: Boogerfoot
-  Tier: Nuclear Operative
-- Name: Raiden Johnson
-  Tier: Revolutionary
-- Name: Talbot
-  Tier: Revolutionary
-- Name: Alen Kadric
-  Tier: Free
-- Name: pogcat
-  Tier: Free
-- Name: Dave
-  Tier: Free
-- Name: Nathaniel Taylor
-  Tier: Revolutionary
-- Name: Z4NEER
-  Tier: Nuclear Operative
-- Name: Laying on my penis until it falls asleep, so it feels like I'm giving someone else a hando
-  Tier: Revolutionary
-- Name: Sam Caesar
-  Tier: Revolutionary
-- Name: Lykan
-  Tier: Free
-- Name: tarna41
-  Tier: Free
-- Name: Ryan Johnson
-  Tier: Free
-- Name: Andrew Montagne
-  Tier: Syndicate Agent
-- Name: yakub mobutu
-  Tier: Free
-- Name: Michael Krebs
-  Tier: Free
-- Name: mr funny swag
-  Tier: Free
-- Name: Crazyeyes24
-  Tier: Syndicate Agent
-- Name: Zylo
-  Tier: Free
-- Name: ScarKy0
-  Tier: Revolutionary
-- Name: Randall Hudson
-  Tier: Free
-- Name: FaberTheCatboy
-  Tier: Free
-- Name: IamOzyman
-  Tier: Revolutionary
-- Name: Jado0213
-  Tier: Revolutionary
-- Name: StaticeStorm
-  Tier: Syndicate Agent
-- Name: Baron Mathot
-  Tier: Free
-- Name: CrudeOil
-  Tier: Nuclear Operative
-- Name: Sartec
-  Tier: Revolutionary
-- Name: Mathew McGuire
-  Tier: Revolutionary
-- Name: Jelloterd2
-  Tier: Free
-- Name: Commissar Fox
-  Tier: Syndicate Agent
-- Name: tyler adams
-  Tier: Revolutionary
-- Name: Logan Britt
-  Tier: Free
-- Name: Joshua A.
-  Tier: Free
-- Name: ya boi darth Vader
-  Tier: Free
-- Name: Syndlkat
-  Tier: Free
-- Name: Zyleak
-  Tier: Revolutionary
-- Name: Hunter
-  Tier: Free
-- Name: Killerqu00
-  Tier: Free
-- Name: lzk
-  Tier: Free
-- Name: Cai Williamson
-  Tier: Syndicate Agent
-- Name: Arykh
-  Tier: Nuclear Operative
-- Name: Pallastovid
-  Tier: Free
-- Name: Rome
-  Tier: Revolutionary
-- Name: mawrk
-  Tier: Free
-- Name: Jack
-  Tier: Revolutionary
-- Name: stikfigz
-  Tier: Revolutionary
-- Name: RyanTuek
-  Tier: Revolutionary
-- Name: David N
-  Tier: Syndicate Agent
-- Name: Panzer IV
-  Tier: Free
-- Name: Novaq
-  Tier: Revolutionary
-- Name: Trevor Doyle
-  Tier: Free
-- Name: Borna Punda
-  Tier: Revolutionary
-- Name: Patrick Long
-  Tier: Free
-- Name: Alpha
-  Tier: Nuclear Operative
-- Name: Gaëtan GOUSSEAUD
-  Tier: Revolutionary
-- Name: Hayden Wessing
-  Tier: Revolutionary
-- Name: Noodle is me
-  Tier: Syndicate Agent
-- Name: snakebb
-  Tier: Revolutionary
-- Name: Patrick
-  Tier: Revolutionary
-- Name: Väinö Kontinen
-  Tier: Free
-- Name: Devin Nelson
-  Tier: Revolutionary
-- Name: Rat Man
-  Tier: Revolutionary
-- Name: Christopher Day
-  Tier: Free
-- Name: Wilhelm 17
-  Tier: Free
-- Name: Kieue Caprie
-  Tier: Revolutionary
-- Name: RamenZorn
-  Tier: Syndicate Agent
-- Name: Swix Swix
-  Tier: Revolutionary
-- Name: Katharina
-  Tier: Free
-- Name: Blackmare
-  Tier: Syndicate Agent
-- Name: lukiw
-  Tier: Revolutionary
-- Name: Magelfik
-  Tier: Revolutionary
-- Name: Kevin
-  Tier: Nuclear Operative
-- Name: Tomáš Sitarčík
-  Tier: Syndicate Agent
-- Name: Coolsurf6
-  Tier: Revolutionary
-- Name: Neexdle
-  Tier: Free
-- Name: Lucid
-  Tier: Free
-- Name: MissKay1994
-  Tier: Syndicate Agent
-- Name: Raccoononi
-  Tier: Revolutionary
-- Name: Avocado999
-  Tier: Free
-- Name: Invisorum
-  Tier: Nuclear Operative
-- Name: Hannah
-  Tier: Nuclear Operative
-- Name: Thomas
-  Tier: Revolutionary
-- Name: Cozmicc
-  Tier: Free
-- Name: Unalterableness Happiness
-  Tier: Free
-- Name: Sparlight
-  Tier: Nuclear Operative
-- Name: MAILS ADVISORY
-  Tier: Free
-- Name: Rq52
-  Tier: Free
-- Name: Ben Wahba
-  Tier: Free
-- Name: North
-  Tier: Free
-- Name: Tyran
-  Tier: Free
-- Name: TheSimpleTime
-  Tier: Free
-- Name: Minemoder
-  Tier: Syndicate Agent
-- Name: Richard "Rei" Weeks
-  Tier: Syndicate Agent
-- Name: Sika-Voi
-  Tier: Free
-- Name: Dumbdestroyer2
-  Tier: Free
-- Name: Ferox Heist
-  Tier: Free
-- Name: Ryan Vieira
-  Tier: Free
-- Name: kithri
-  Tier: Nuclear Operative
-- Name: Luzurper
-  Tier: Revolutionary
-- Name: Rainy
-  Tier: Revolutionary
-- Name: Dusk
-  Tier: Revolutionary
-- Name: Apocist
-  Tier: Revolutionary
-- Name: Yukari_TK
-  Tier: Free
-- Name: Iris
-  Tier: Free
-- Name: Jamie Forkner
-  Tier: Free
-- Name: rokudara
-  Tier: Free
-- Name: Xionwalker
-  Tier: Free
-- Name: Michael Schrader
-  Tier: Free
-- Name: JT Billings
-  Tier: Revolutionary
-- Name: Stedar
-  Tier: Syndicate Agent
-- Name: Alex Burd
-  Tier: Nuclear Operative
-- Name: Vasilis The Pikachu
-  Tier: Free
-- Name: Erik Meinke
-  Tier: Revolutionary
-- Name: Sleeepz
-  Tier: Syndicate Agent
-- Name: Jonathan
-  Tier: Free
-- Name: Trent Warfel
-  Tier: Nuclear Operative
-- Name: Fritz Vohlkson
-  Tier: Free
-- Name: Гоша Ушаров
-  Tier: Free
-- Name: Cpt Blastahoe
-  Tier: Free
-- Name: dedomena
-  Tier: Free
-- Name: Nolan Downing
-  Tier: Free
-- Name: Seth Morron
-  Tier: Revolutionary
-- Name: Fumo Legionnaire
-  Tier: Free
-- Name: obama
-  Tier: Free
-- Name: Daniel Megiddo
-  Tier: Free
-- Name: Денис
-  Tier: Free
-- Name: Ubaser
-  Tier: Revolutionary
-- Name: Catdere
-  Tier: Syndicate Agent
-- Name: valery xolstov
-  Tier: Free
-- Name: Marios Sardis
-  Tier: Revolutionary
-- Name: Constrife
-  Tier: Free
-- Name: TINYANGRYWOMAN
-  Tier: Free
-- Name: Kerensky
-  Tier: Revolutionary
-- Name: DEATHB4DEFEAT
-  Tier: Free
-- Name: Kristy Denniss
-  Tier: Free
-- Name: orange color
-  Tier: Revolutionary
-- Name: Hectik
-  Tier: Free
-- Name: SomeDogo
-  Tier: Free
-- Name: Joshua Meyer
-  Tier: Nuclear Operative
-- Name: Matthias Bechtold
-  Tier: Revolutionary
-- Name: Serafim
-  Tier: Free
-- Name: Cindy Xiao
-  Tier: Free
-- Name: SmokingKilz
-  Tier: Free
-- Name: Jacob Scott
-  Tier: Free
-- Name: Ryan Kelly
-  Tier: Revolutionary
-- Name: mikiju
-  Tier: Syndicate Agent
-- Name: TheGungeonologist
-  Tier: Revolutionary
-- Name: Tia
-  Tier: Revolutionary
-- Name: yeoshua
-  Tier: Syndicate Agent
-- Name: David Ilina
-  Tier: Free
-- Name: Robyn Pothagan
-  Tier: Free
-- Name: chomp
-  Tier: Free
-- Name: Maksym Aleinikov
-  Tier: Free
-- Name: Chase M.
-  Tier: Free
-- Name: Ethan Maria
-  Tier: Free
-- Name: Luna Rose
-  Tier: Free
-- Name: Jordon
-  Tier: Revolutionary
-- Name: Godfiend
-  Tier: Revolutionary
-- Name: Jake Huxell
-  Tier: Free
-- Name: Alexander Simakov
-  Tier: Free
-- Name: Hannah Dawson
-  Tier: Syndicate Agent
-- Name: Dieselmohawk D.
-  Tier: Revolutionary
-- Name: Sean Lilly
-  Tier: Syndicate Agent
-- Name: Brandon Roughley
-  Tier: Syndicate Agent
-- Name: Jack
-  Tier: Free
-- Name: Cooliano Rizzo
-  Tier: Free
-- Name: North Star
-  Tier: Free
-- Name: Flamebrain
-  Tier: Free
-- Name: Andrew
-  Tier: Revolutionary
-- Name: Ostoja
-  Tier: Free
-- Name: Russian TS
-  Tier: Nuclear Operative
-- Name: Kyu, The Meme Fairy
-  Tier: Free
-- Name: LIMIT_bro .
-  Tier: Free
-- Name: Kim
-  Tier: Revolutionary
-- Name: Dourbii
-  Tier: Revolutionary
-- Name: Autistic Dog
-  Tier: Free
-- Name: Black Rose
-  Tier: Free
-- Name: rose soul
-  Tier: Free
-- Name: Toast
-  Tier: Free
-- Name: Jiangshi Luvr
-  Tier: Free
-- Name: OllyTheFoxcoon
-  Tier: Free
-- Name: Christopher Peltola
-  Tier: Revolutionary
-- Name: Bonefan223
-  Tier: Nuclear Operative
-- Name: Fie
-  Tier: Free
-- Name: DuskyJay
-  Tier: Free
-- Name: Zella Zane
-  Tier: Revolutionary
-- Name: Pixel Realms
-  Tier: Free
-- Name: ConcaveGnome
-  Tier: Syndicate Agent
-- Name: Ростислав Мірошніченко
-  Tier: Free
-- Name: Hunter Tew
-  Tier: Syndicate Agent
-- Name: Daniel D
-  Tier: Syndicate Agent
-- Name: Kick Buttowski
-  Tier: Free
-- Name: Eggexe
-  Tier: Free
-- Name: Lv
-  Tier: Free
-- Name: Ali Alashar
-  Tier: Free
-- Name: Nathaniel Joseph Hurd
-  Tier: Revolutionary
-- Name: sk3iron
-  Tier: Revolutionary
-- Name: Dax XZ
-  Tier: Free
-- Name: debelizm
-  Tier: Free
-- Name: Kaisering
-  Tier: Revolutionary
-- Name: VividWisp
-  Tier: Syndicate Agent
-- Name: Alex Mercer
-  Tier: Free
-- Name: AmalgoMyte
-  Tier: Revolutionary
-- Name: SeanKim
-  Tier: Free
-- Name: Siegorvus
-  Tier: Free
-- Name: вася васильев
-  Tier: Free
-- Name: Mci
-  Tier: Revolutionary
-- Name: KateSlime206
-  Tier: Nuclear Operative
-- Name: Robert
-  Tier: Free
-- Name: Ben Z'
-  Tier: Revolutionary
-- Name: Luke
-  Tier: Free
-- Name: Tyler Putnam
-  Tier: Free
-- Name: Ville Sarmiola
-  Tier: Free
-- Name: kelaclone
-  Tier: Free
-- Name: Archmonarch
-  Tier: Syndicate Agent
-- Name: Brett
-  Tier: Free
-- Name: Hanzdegloker
-  Tier: Syndicate Agent
-- Name: Piotr
-  Tier: Revolutionary
-- Name: CloudyClover
-  Tier: Revolutionary
-- Name: Jim Masterson
-  Tier: Free
-- Name: kenneth heller
-  Tier: Syndicate Agent
-- Name: Gosera -
-  Tier: Syndicate Agent
-- Name: Asaf Ataş
-  Tier: Free
-- Name: DeckDevilYGO
-  Tier: Free
-- Name: nokko
-  Tier: Free
-- Name: Krokodiel89
-  Tier: Free
-- Name: Nojan Niaki
-  Tier: Revolutionary
-- Name: YuNii
-  Tier: Nuclear Operative
-- Name: Georgia Partyka
-  Tier: Syndicate Agent
-- Name: Teeth
-  Tier: Free
-- Name: DrMelon
-  Tier: Revolutionary
-- Name: Molly the Bully
-  Tier: Nuclear Operative
-- Name: An Evil Eel
-  Tier: Free
-- Name: Hasan al-Binabi
-  Tier: Free
-- Name: franz photos
-  Tier: Free
-- Name: Milkshake45752
-  Tier: Free
-- Name: Bru Tal
-  Tier: Free
-- Name: krberryy
-  Tier: Revolutionary
-- Name: Thomas Mcintosh
-  Tier: Free
-- Name: Alex Nordlund
-  Tier: Syndicate Agent
-- Name: Swindel_
-  Tier: Syndicate Agent
-- Name: MrGloopy
-  Tier: Revolutionary
-- Name: blitz gaming
-  Tier: Free
-- Name: Nicholi
-  Tier: Syndicate Agent
-- Name: Taber
-  Tier: Revolutionary
-- Name: 以迪 黃
-  Tier: Free
-- Name: W Geertsma
-  Tier: Free
-- Name: BloodyJMary
-  Tier: Free
-- Name: quri1q
-  Tier: Free
-- Name: SleepyBody91
-  Tier: Free
-- Name: David Gee
-  Tier: Free
-- Name: ThoranTW
-  Tier: Free
-- Name: pigeopeas
-  Tier: Free
-- Name: Zakory L Holbrook
-  Tier: Revolutionary
-- Name: Aiden
-  Tier: Revolutionary
-- Name: Pangaron
-  Tier: Syndicate Agent
-- Name: NeatVisor
-  Tier: Free
-- Name: Solidus Snake
-  Tier: Nuclear Operative
-- Name: Oliver Skyler
-  Tier: Free
-- Name: mustafa kılıç
-  Tier: Free
-- Name: IceStorm theDragon
-  Tier: Revolutionary
-- Name: Indri
-  Tier: Revolutionary
-- Name: Graded
-  Tier: Free
-- Name: tunnp0
-  Tier: Free
-- Name: Vexxtraordinary
-  Tier: Revolutionary
-- Name: Sam Hediger
-  Tier: Free
-- Name: Aldi Abduali
-  Tier: Free
-- Name: Adam Clarke
-  Tier: Free
-- Name: Munt
-  Tier: Free
-- Name: Obspogon
-  Tier: Free
-- Name: Adrian Thompson
-  Tier: Free
-- Name: albatrossMonarch
-  Tier: Free
-- Name: JaQal
-  Tier: Free
-- Name: Simofie
-  Tier: Free
-- Name: redgunny
-  Tier: Free
-- Name: Kevin Chapman
-  Tier: Free
-- Name: Sjevi Aardvark
-  Tier: Free
-- Name: Chris Walter
-  Tier: Free
-- Name: David Sterling
-  Tier: Free
-- Name: Zcore
-  Tier: Free
-- Name: tapohuy
-  Tier: Free
-- Name: MasterFurret
-  Tier: Revolutionary
-- Name: Christian Hicks
-  Tier: Syndicate Agent
-- Name: François Desautels
-  Tier: Revolutionary
-- Name: awndrssk
-  Tier: Free
-- Name: Vice Emargo
-  Tier: Syndicate Agent
-- Name: Mihailo Trickovic
-  Tier: Syndicate Agent
-- Name: Sandvich enjoyer
-  Tier: Revolutionary
-- Name: Higgtastic
-  Tier: Revolutionary
 - Name: "612"
   Tier: Revolutionary
-- Name: AlecRazec
-  Tier: Revolutionary
-- Name: Repo
-  Tier: Nuclear Operative
-- Name: Ignoramis
-  Tier: Free
-- Name: Jeffery Pointer
-  Tier: Syndicate Agent
-- Name: DireBoar
-  Tier: Free
-- Name: oBerry
-  Tier: Free
-- Name: Adam Smedstad
-  Tier: Free
-- Name: Superglue
-  Tier: Syndicate Agent
-- Name: DrIvoPotato
-  Tier: Nuclear Operative
-- Name: Petalmeat
-  Tier: Free
-- Name: Malachi Housewright
-  Tier: Revolutionary
-- Name: Fallcon
-  Tier: Free
-- Name: ShaunTexas
-  Tier: Free
-- Name: HCG
-  Tier: Free
-- Name: GeneralMarty
-  Tier: Free
-- Name: Nicholas
-  Tier: Nuclear Operative
-- Name: Geekyhobo2
-  Tier: Revolutionary
-- Name: Alexandre Courtin
-  Tier: Revolutionary
-- Name: Wolfie
-  Tier: Revolutionary
-- Name: Shaina Gibson
-  Tier: Free
-- Name: Charles Baron
-  Tier: Free
-- Name: Constellations
-  Tier: Free
-- Name: tynobeard 123
-  Tier: Revolutionary
-- Name: Lyndomen
-  Tier: Revolutionary
-- Name: Glenn Olsen
-  Tier: Syndicate Agent
-- Name: Wiliam
-  Tier: Nuclear Operative
-- Name: SHANE ALAN ZINDA
-  Tier: Free
-- Name: Saiiryn
-  Tier: Free
-- Name: AC Computing
-  Tier: Nuclear Operative
-- Name: eric156
-  Tier: Free
-- Name: Katarn
-  Tier: Free
-- Name: Blight
-  Tier: Syndicate Agent
-- Name: Tim Foley
-  Tier: Free
-- Name: Sven Tammerijn
-  Tier: Revolutionary
-- Name: Raw Toast
-  Tier: Free
-- Name: Watson Whittington
-  Tier: Syndicate Agent
-- Name: David
-  Tier: Revolutionary
-- Name: DadNotTheBelt
-  Tier: Free
-- Name: Enricoc3l
-  Tier: Revolutionary
-- Name: Vandell
-  Tier: Free
-- Name: BlueisDumb
-  Tier: Nuclear Operative
-- Name: Buldinn Girshovich
-  Tier: Nuclear Operative
-- Name: Whistling Jake
-  Tier: Revolutionary
-- Name: Wallace Megas
-  Tier: Free
-- Name: Samtaro
-  Tier: Nuclear Operative
-- Name: Aexxie
-  Tier: Revolutionary
-- Name: Fiebertraum Illhead
-  Tier: Syndicate Agent
-- Name: tokie
-  Tier: Nuclear Operative
-- Name: Odin7heWanderer
-  Tier: Free
-- Name: Jeff Tatem
-  Tier: Nuclear Operative
-- Name: M4shr00m
-  Tier: Free
-- Name: Gordod
-  Tier: Syndicate Agent
-- Name: Skarlet
-  Tier: Free
-- Name: March
-  Tier: Syndicate Agent
-- Name: Александр Белошапка
-  Tier: Revolutionary
-- Name: Dave
-  Tier: Revolutionary
-- Name: Akira
-  Tier: Revolutionary
-- Name: Alix Shepard
-  Tier: Nuclear Operative
-- Name: JhenMaster
-  Tier: Free
-- Name: Lieutenant Colonel Orangejuice
-  Tier: Syndicate Agent
-- Name: TheGoldElite
-  Tier: Revolutionary
-- Name: Gnomo
-  Tier: Nuclear Operative
-- Name: Never Solus
-  Tier: Free
-- Name: Ari.
-  Tier: Revolutionary
-- Name: Kevin
-  Tier: Nuclear Operative
-- Name: DubzyVEVO
-  Tier: Revolutionary
-- Name: ikamuse johnson
-  Tier: Revolutionary
-- Name: Saphire
-  Tier: Revolutionary
-- Name: Gavin Simmons
-  Tier: Syndicate Agent
-- Name: Tamora Droppa
-  Tier: Revolutionary
-- Name: Gaxeer
-  Tier: Syndicate Agent
-- Name: rosysyn
-  Tier: Revolutionary
-- Name: Scott MacCombie
-  Tier: Free
-- Name: Jeremy Hernandez
-  Tier: Syndicate Agent
-- Name: Kai
-  Tier: Nuclear Operative
-- Name: Victoly
-  Tier: Free
-- Name: chilicheesecat
-  Tier: Free
-- Name: Arthur Norris
-  Tier: Syndicate Agent
-- Name: Carbonhell
-  Tier: Syndicate Agent
-- Name: BrittaBee93
-  Tier: Free
-- Name: Rasmus Cedergren
-  Tier: Revolutionary
-- Name: Greggo
-  Tier: Syndicate Agent
-- Name: Pasemi
-  Tier: Revolutionary
-- Name: Unknown Kiwi
-  Tier: Revolutionary
-- Name: Mitchell Marry
-  Tier: Revolutionary
-- Name: Matouš Hrdlička
-  Tier: Revolutionary
-- Name: Roman
-  Tier: Syndicate Agent
-- Name: Jacob Schramm
-  Tier: Free
-- Name: Nathan Zaldivar
-  Tier: Nuclear Operative
-- Name: SpydAxe
-  Tier: Revolutionary
-- Name: BokChoy
-  Tier: Nuclear Operative
-- Name: Nicholas Williamson
-  Tier: Nuclear Operative
-- Name: William Grondin
-  Tier: Revolutionary
-- Name: KevKev
-  Tier: Free
-- Name: Gothryd
-  Tier: Revolutionary
-- Name: Brandon Campbell
-  Tier: Free
-- Name: Matthew C Miklaucic
-  Tier: Revolutionary
-- Name: Serianas
-  Tier: Nuclear Operative
-- Name: lapatison
-  Tier: Revolutionary
-- Name: Uinseann
-  Tier: Revolutionary
-- Name: osborn
-  Tier: Syndicate Agent
-- Name: LPGaming
-  Tier: Free
-- Name: Alex Fry
-  Tier: Nuclear Operative
-- Name: Ramiro Agis
-  Tier: Revolutionary
-- Name: Mikhail
-  Tier: Revolutionary
-- Name: SnapKick
-  Tier: Revolutionary
-- Name: liltenhead
-  Tier: Revolutionary
-- Name: James Andrew Peoples Jr
-  Tier: Revolutionary
-- Name: Serathis
-  Tier: Revolutionary
-- Name: Joel
-  Tier: Revolutionary
-- Name: Rafał Kowalewski
-  Tier: Revolutionary
-- Name: Kris Piper
-  Tier: Free
-- Name: Anthony Chicko
-  Tier: Revolutionary
-- Name: Taylor
-  Tier: Revolutionary
-- Name: Phillip Inman
-  Tier: Revolutionary
-- Name: Zakanater 19
-  Tier: Revolutionary
-- Name: Molon
-  Tier: Syndicate Agent
-- Name: Peter "Azmond" Newhouse
-  Tier: Free
-- Name: Snowni
-  Tier: Nuclear Operative
-- Name: Tom Cruize
-  Tier: Syndicate Agent
-- Name: Corpus Inc.
-  Tier: Revolutionary
-- Name: BlastWind
-  Tier: Free
-- Name: Echinodermata
-  Tier: Revolutionary
-- Name: Hamcha
-  Tier: Revolutionary
-- Name: Kaitlynn Brennan
-  Tier: Syndicate Agent
-- Name: Oxyclean114
-  Tier: Revolutionary
-- Name: JustanAnus
-  Tier: Nuclear Operative
-- Name: wtcwr68
-  Tier: Nuclear Operative
-- Name: Azmith Blackheart
-  Tier: Revolutionary
-- Name: Collin R Terrell
-  Tier: Revolutionary
-- Name: Cormos Lemming
-  Tier: Nuclear Operative
-- Name: grhmhome
-  Tier: Revolutionary
-- Name: SpiffyNnemonic
-  Tier: Revolutionary
-- Name: Callum Tubrett
-  Tier: Nuclear Operative
-- Name: Hydration
-  Tier: Revolutionary
-- Name: Morty
-  Tier: Free
-- Name: Dylan Roberts
-  Tier: Syndicate Agent
-- Name: mrniceguy0o0
-  Tier: Free
-- Name: Wrexbe
-  Tier: Revolutionary
-- Name: Frege Beach
-  Tier: Revolutionary
-- Name: DBF
-  Tier: Syndicate Agent
-- Name: Kesiath
-  Tier: Nuclear Operative
-- Name: Voltinho
-  Tier: Revolutionary
-- Name: AquaDraco
-  Tier: Revolutionary
 - Name: A Yaj
   Tier: Revolutionary
-- Name: Miniwoffer
+- Name: Aaron Handleman
   Tier: Revolutionary
-- Name: hh
+- Name: Abby Eveland
+  Tier: Revolutionary
+- Name: AC Computing
+  Tier: Nuclear Operative
+- Name: Aethan Olsen
+  Tier: Revolutionary
+- Name: Aexxie
+  Tier: Revolutionary
+- Name: Aiden
+  Tier: Revolutionary
+- Name: Akaelik
+  Tier: Nuclear Operative
+- Name: Akira
+  Tier: Revolutionary
+- Name: AlecRazec
+  Tier: Revolutionary
+- Name: Alex Burd
+  Tier: Nuclear Operative
+- Name: Alex Fry
+  Tier: Nuclear Operative
+- Name: Alex Nordlund
   Tier: Syndicate Agent
-- Name: Chase Trotter
-  Tier: Nuclear Operative
-- Name: Skifan180
-  Tier: Free
-- Name: Florian
-  Tier: Revolutionary
-- Name: Hoplophobia
-  Tier: Revolutionary
-- Name: Viridian
-  Tier: Free
-- Name: Daskata
-  Tier: Nuclear Operative
-- Name: TacoCub
-  Tier: Revolutionary
-- Name: Jack Rose
-  Tier: Revolutionary
-- Name: Chem_Inventory
-  Tier: Nuclear Operative
-- Name: Jax
-  Tier: Nuclear Operative
-- Name: The Hateful Flesh
-  Tier: Revolutionary
-- Name: Gavin Jones
-  Tier: Nuclear Operative
-- Name: Prof. Omii
-  Tier: Nuclear Operative
-- Name: mksky
-  Tier: Revolutionary
-- Name: Greyhound Connect
-  Tier: Revolutionary
 - Name: Alex Tempest
   Tier: Revolutionary
-- Name: Rat Fungus
+- Name: Alexandre Courtin
+  Tier: Revolutionary
+- Name: AlexDragoon
+  Tier: Revolutionary
+- Name: Alexis
   Tier: Nuclear Operative
-- Name: Will M.
-  Tier: Revolutionary
-- Name: spinnermaster
-  Tier: Free
-- Name: Koyki
-  Tier: Revolutionary
-- Name: Hunter James
+- Name: Alix Shepard
   Tier: Nuclear Operative
-- Name: Valinov
-  Tier: Nuclear Operative
-- Name: Nemmay
-  Tier: Revolutionary
-- Name: Dylan Hull
-  Tier: Revolutionary
-- Name: FungiFog
-  Tier: Revolutionary
-- Name: S.C.
+- Name: all fields
   Tier: Syndicate Agent
-- Name: "'-Y-"
-  Tier: Syndicate Agent
-- Name: pooba
-  Tier: Revolutionary
-- Name: evilJenny
-  Tier: Revolutionary
-- Name: clyf
-  Tier: Free
-- Name: Kerb
-  Tier: Revolutionary
-- Name: queednyeb
-  Tier: Revolutionary
-- Name: Robin Rottstock
-  Tier: Revolutionary
-- Name: Third
-  Tier: Revolutionary
+- Name: Alpha
+  Tier: Nuclear Operative
 - Name: Altana
   Tier: Revolutionary
-- Name: showgun117
+- Name: AmalgoMyte
+  Tier: Revolutionary
+- Name: Amble
+  Tier: Nuclear Operative
+- Name: Andrew Danke
   Tier: Syndicate Agent
-- Name: Durp
-  Tier: Revolutionary
-- Name: Joshington Awesomahee
-  Tier: Revolutionary
-- Name: Diklyquill
-  Tier: Revolutionary
-- Name: Eric VW
-  Tier: Revolutionary
-- Name: Nat
-  Tier: Revolutionary
-- Name: Evan Armstrong
-  Tier: Revolutionary
-- Name: Citizen Battle
-  Tier: Nuclear Operative
-- Name: Cyberate
-  Tier: Revolutionary
-- Name: Enzoman12
-  Tier: Nuclear Operative
-- Name: Curtis Pearson
-  Tier: Revolutionary
-- Name: Mono
-  Tier: Revolutionary
-- Name: Xenon Dragon
+- Name: Andrew Montagne
   Tier: Syndicate Agent
-- Name: Jerg Jerginson
-  Tier: Nuclear Operative
-- Name: kik
+- Name: Androidonator
   Tier: Revolutionary
-- Name: Star Lord
+- Name: anharmlessguest
   Tier: Syndicate Agent
-- Name: kannthus
-  Tier: Syndicate Agent
-- Name: Ethan Keller
+- Name: Anthony Chicko
   Tier: Revolutionary
-- Name: John Doe
-  Tier: Nuclear Operative
-- Name: Robert Reed
-  Tier: Nuclear Operative
-- Name: DramaBuns
-  Tier: Revolutionary
-- Name: Bush Boy
-  Tier: Nuclear Operative
-- Name: Quonn
-  Tier: Syndicate Agent
-- Name: KrystalDisc
-  Tier: Revolutionary
-- Name: LeTobbs
-  Tier: Revolutionary
-- Name: Darren Brady
-  Tier: Free
-- Name: Zandario
-  Tier: Revolutionary
-- Name: Lucas Welsh
-  Tier: Revolutionary
-- Name: Nico Thate
-  Tier: Free
 - Name: Anthony Fleck
   Tier: Nuclear Operative
-- Name: vifs_vestige
-  Tier: Syndicate Agent
-- Name: Bobberunio
+- Name: Anton
   Tier: Revolutionary
-- Name: Zadenae
-  Tier: Nuclear Operative
-- Name: Into the Stars - Community Host
+- Name: AquaDraco
+  Tier: Revolutionary
+- Name: Arandomartfan
+  Tier: Revolutionary
+- Name: Archie Hicks
+  Tier: Revolutionary
+- Name: Archmonarch
+  Tier: Syndicate Agent
+- Name: Ari.
+  Tier: Revolutionary
+- Name: Arin Pearce
+  Tier: Revolutionary
+- Name: Arrol Gantry
   Tier: Nuclear Operative
 - Name: arthropods
   Tier: Revolutionary
-- Name: Jack Gardiner
-  Tier: Revolutionary
-- Name: BigMcLargeHuge
-  Tier: Free
-- Name: merklaw
-  Tier: Revolutionary
-- Name: CPM311
-  Tier: Revolutionary
-- Name: NetGlitch
-  Tier: Nuclear Operative
-- Name: Bahke
-  Tier: Nuclear Operative
-- Name: Prayer
-  Tier: Nuclear Operative
-- Name: Trevor McConnell
-  Tier: Nuclear Operative
-- Name: MetalClone
-  Tier: Free
-- Name: Farewell Fire
+- Name: Arthur Norris
   Tier: Syndicate Agent
-- Name: Ninja
-  Tier: Syndicate Agent
-- Name: all fields
-  Tier: Syndicate Agent
-- Name: Kyle Hipke
+- Name: Arykh
   Tier: Nuclear Operative
-- Name: Daniel Thompson
+- Name: Ashley Parfitt
   Tier: Revolutionary
-- Name: Tyler Young
-  Tier: Nuclear Operative
-- Name: LeoZ
+- Name: Asterisk
+  Tier: Syndicate Agent
+- Name: Aussiemandias
+  Tier: Syndicate Agent
+- Name: Austenn
   Tier: Revolutionary
 - Name: avcde
   Tier: Nuclear Operative
+- Name: Azmith Blackheart
+  Tier: Revolutionary
+- Name: Bahke
+  Tier: Nuclear Operative
+- Name: Ben Z'
+  Tier: Revolutionary
+- Name: Bex
+  Tier: Revolutionary
+- Name: Blackmare
+  Tier: Syndicate Agent
+- Name: Blight
+  Tier: Syndicate Agent
+- Name: blossom
+  Tier: Revolutionary
+- Name: BlueisDumb
+  Tier: Nuclear Operative
+- Name: Blumbee
+  Tier: Revolutionary
+- Name: Bobberunio
+  Tier: Revolutionary
+- Name: BokChoy
+  Tier: Nuclear Operative
+- Name: Bonefan223
+  Tier: Nuclear Operative
+- Name: Boogerfoot
+  Tier: Nuclear Operative
+- Name: Borna Punda
+  Tier: Revolutionary
+- Name: Brandon
+  Tier: Revolutionary
+- Name: Brandon Roughley
+  Tier: Syndicate Agent
+- Name: brbrbrbrbr brbrbr
+  Tier: Revolutionary
+- Name: BrunBytes
+  Tier: Revolutionary
+- Name: Bruno Bigras
+  Tier: Revolutionary
+- Name: Buldinn Girshovich
+  Tier: Nuclear Operative
+- Name: Bumlocked
+  Tier: Revolutionary
+- Name: Bush Boy
+  Tier: Nuclear Operative
+- Name: Callum Tubrett
+  Tier: Nuclear Operative
+- Name: Carbonhell
+  Tier: Syndicate Agent
+- Name: Catdere
+  Tier: Syndicate Agent
+- Name: Celestrogen
+  Tier: Syndicate Agent
+- Name: Cerzix
+  Tier: Revolutionary
+- Name: Chase Trotter
+  Tier: Nuclear Operative
+- Name: Chem_Inventory
+  Tier: Nuclear Operative
+- Name: Christian Hicks
+  Tier: Syndicate Agent
+- Name: Citizen Battle
+  Tier: Nuclear Operative
+- Name: CloudyClover
+  Tier: Revolutionary
+- Name: Collin R Terrell
+  Tier: Revolutionary
+- Name: Commissar Fox
+  Tier: Syndicate Agent
+- Name: ConcaveGnome
+  Tier: Syndicate Agent
+- Name: Coolsurf6
+  Tier: Revolutionary
+- Name: Cormos Lemming
+  Tier: Nuclear Operative
+- Name: Corpus Inc.
+  Tier: Revolutionary
+- Name: CPM311
+  Tier: Revolutionary
+- Name: CptFalcon
+  Tier: Revolutionary
+- Name: Crazyeyes24
+  Tier: Syndicate Agent
+- Name: CrudeOil
+  Tier: Nuclear Operative
+- Name: Curtis Pearson
+  Tier: Revolutionary
+- Name: Cyberate
+  Tier: Revolutionary
+- Name: Daniel D
+  Tier: Syndicate Agent
+- Name: Daniel Thompson
+  Tier: Revolutionary
+- Name: Daskata
+  Tier: Nuclear Operative
+- Name: Dastion
+  Tier: Revolutionary
+- Name: Dave
+  Tier: Revolutionary
+- Name: David
+  Tier: Revolutionary
+- Name: David N
+  Tier: Syndicate Agent
+- Name: Davyei
+  Tier: Revolutionary
+- Name: Daxx (Justin Winningham)
+  Tier: Syndicate Agent
+- Name: DBF
+  Tier: Syndicate Agent
+- Name: DerBall
+  Tier: Revolutionary
+- Name: Devin Nelson
+  Tier: Revolutionary
+- Name: Dieselmohawk D.
+  Tier: Revolutionary
+- Name: Diklyquill
+  Tier: Revolutionary
+- Name: Dizzy_Eevee
+  Tier: Syndicate Agent
+- Name: Dourbii
+  Tier: Revolutionary
+- Name: Dr.Raccoon
+  Tier: Revolutionary
+- Name: Dr_Med_Izin
+  Tier: Revolutionary
+- Name: Drakkenlupen
+  Tier: Revolutionary
+- Name: DramaBuns
+  Tier: Revolutionary
+- Name: DrIvoPotato
+  Tier: Nuclear Operative
+- Name: DrMelon
+  Tier: Revolutionary
+- Name: dubdubchan
+  Tier: Syndicate Agent
+- Name: DubzyVEVO
+  Tier: Revolutionary
+- Name: Durp
+  Tier: Revolutionary
+- Name: Dusk
+  Tier: Revolutionary
+- Name: Dylan Hull
+  Tier: Revolutionary
+- Name: Dylan Roberts
+  Tier: Syndicate Agent
+- Name: Echinodermata
+  Tier: Revolutionary
+- Name: Edward Doyle
+  Tier: Revolutionary
+- Name: Enricoc3l
+  Tier: Revolutionary
+- Name: Enzoman12
+  Tier: Nuclear Operative
+- Name: Erik Meinke
+  Tier: Revolutionary
+- Name: Ethan Keller
+  Tier: Revolutionary
+- Name: Evan Armstrong
+  Tier: Revolutionary
+- Name: evilJenny
+  Tier: Revolutionary
+- Name: ExclusiveWizard
+  Tier: Syndicate Agent
+- Name: Farewell Fire
+  Tier: Syndicate Agent
+- Name: Faust Statler
+  Tier: Syndicate Agent
+- Name: FauxParadox
+  Tier: Revolutionary
+- Name: Fiebertraum Illhead
+  Tier: Syndicate Agent
+- Name: flipways
+  Tier: Nuclear Operative
+- Name: Florian
+  Tier: Revolutionary
+- Name: François Desautels
+  Tier: Revolutionary
+- Name: Frege Beach
+  Tier: Revolutionary
+- Name: FungiFog
+  Tier: Revolutionary
+- Name: funnylookingwolf
+  Tier: Revolutionary
+- Name: Gallagin
+  Tier: Revolutionary
+- Name: Gavin Jones
+  Tier: Nuclear Operative
+- Name: Gavin Simmons
+  Tier: Revolutionary
+- Name: Gaxeer
+  Tier: Syndicate Agent
+- Name: Gaëtan GOUSSEAUD
+  Tier: Revolutionary
+- Name: Geekyhobo2
+  Tier: Revolutionary
+- Name: Georgia Partyka
+  Tier: Syndicate Agent
+- Name: ghost--page
+  Tier: Nuclear Operative
+- Name: Glenn Olsen
+  Tier: Syndicate Agent
+- Name: Gnomo
+  Tier: Nuclear Operative
+- Name: Godfiend
+  Tier: Revolutionary
+- Name: Gordod
+  Tier: Syndicate Agent
+- Name: Gosera -
+  Tier: Syndicate Agent
+- Name: Gothryd
+  Tier: Revolutionary
+- Name: Greggo
+  Tier: Syndicate Agent
+- Name: Greyhound Connect
+  Tier: Revolutionary
+- Name: grhmhome
+  Tier: Revolutionary
+- Name: guh
+  Tier: Revolutionary
+- Name: Hamcha
+  Tier: Revolutionary
+- Name: Hannah
+  Tier: Nuclear Operative
+- Name: Hannah Dawson
+  Tier: Syndicate Agent
+- Name: Hanzdegloker
+  Tier: Syndicate Agent
+- Name: Hat Kid
+  Tier: Revolutionary
+- Name: Hayden
+  Tier: Revolutionary
+- Name: Henrik Møller
+  Tier: Syndicate Agent
+- Name: hh
+  Tier: Syndicate Agent
+- Name: Higgtastic
+  Tier: Revolutionary
+- Name: Hoplophobia
+  Tier: Revolutionary
+- Name: huh?
+  Tier: Revolutionary
+- Name: Hunter James
+  Tier: Nuclear Operative
+- Name: Hunter Tew
+  Tier: Syndicate Agent
+- Name: hyphenation
+  Tier: Nuclear Operative
+- Name: I'm going to resurrect Charlie Kirk as a gay zombie with a permanent hard cock, like the scene where robocop is lungs, but boner
+  Tier: Revolutionary
+- Name: IamOzyman
+  Tier: Revolutionary
+- Name: IceStorm theDragon
+  Tier: Revolutionary
+- Name: ikamuse johnson
+  Tier: Revolutionary
+- Name: illpala
+  Tier: Revolutionary
+- Name: Ingvar Tornberg
+  Tier: Revolutionary
+- Name: Into the Stars - Community Host
+  Tier: Nuclear Operative
+- Name: Invisorum
+  Tier: Nuclear Operative
+- Name: Irish Kelly
+  Tier: Syndicate Agent
+- Name: Jack
+  Tier: Revolutionary
+- Name: Jack Gardiner
+  Tier: Revolutionary
+- Name: Jack Rose
+  Tier: Revolutionary
+- Name: Jacob Watson
+  Tier: Syndicate Agent
+- Name: Jado0213
+  Tier: Revolutionary
+- Name: JagerVonS
+  Tier: Revolutionary
+- Name: James Andrew Peoples Jr
+  Tier: Revolutionary
+- Name: James Stevens
+  Tier: Revolutionary
+- Name: Jax
+  Tier: Nuclear Operative
+- Name: Jeaglekill
+  Tier: Revolutionary
+- Name: Jeff Tatem
+  Tier: Nuclear Operative
+- Name: Jeffery Pointer
+  Tier: Syndicate Agent
+- Name: JenericJen
+  Tier: Revolutionary
+- Name: Jeremy Hernandez
+  Tier: Syndicate Agent
+- Name: Jerg Jerginson
+  Tier: Nuclear Operative
+- Name: Joel
+  Tier: Revolutionary
+- Name: JohannVanDerwis
+  Tier: Revolutionary
+- Name: John Doe
+  Tier: Nuclear Operative
+- Name: Jordon
+  Tier: Revolutionary
+- Name: Joshington Awesomahee
+  Tier: Revolutionary
+- Name: Joshua Hines
+  Tier: Nuclear Operative
+- Name: Joshua Meyer
+  Tier: Nuclear Operative
+- Name: JT Billings
+  Tier: Revolutionary
+- Name: JustanAnus
+  Tier: Nuclear Operative
+- Name: Kai
+  Tier: Nuclear Operative
+- Name: Kaitlynn Brennan
+  Tier: Syndicate Agent
+- Name: kannthus
+  Tier: Syndicate Agent
+- Name: Karma Hunter
+  Tier: Revolutionary
+- Name: Kashieru
+  Tier: Revolutionary
+- Name: KateSlime206
+  Tier: Nuclear Operative
+- Name: Kayla Solace
+  Tier: Revolutionary
+- Name: kenneth heller
+  Tier: Syndicate Agent
+- Name: Kerb
+  Tier: Revolutionary
+- Name: Kerensky
+  Tier: Revolutionary
+- Name: Kesiath
+  Tier: Nuclear Operative
+- Name: Kevin
+  Tier: Nuclear Operative
+- Name: Kevin
+  Tier: Nuclear Operative
+- Name: Kieue Caprie
+  Tier: Revolutionary
+- Name: kik
+  Tier: Revolutionary
+- Name: Kim
+  Tier: Revolutionary
+- Name: kithri
+  Tier: Nuclear Operative
+- Name: Koyki
+  Tier: Revolutionary
+- Name: krberryy
+  Tier: Revolutionary
+- Name: kristopher arnott
+  Tier: Syndicate Agent
+- Name: KrystalDisc
+  Tier: Revolutionary
+- Name: Krystian Janecki
+  Tier: Revolutionary
+- Name: Kubakura
+  Tier: Revolutionary
+- Name: Kyle Hipke
+  Tier: Nuclear Operative
+- Name: Kyle Tyo
+  Tier: Syndicate Agent
+- Name: lapatison
+  Tier: Revolutionary
+- Name: LeoZ
+  Tier: Revolutionary
+- Name: LeTobbs
+  Tier: Revolutionary
+- Name: Lieutenant Colonel Orangejuice
+  Tier: Syndicate Agent
+- Name: Lilith
+  Tier: Nuclear Operative
+- Name: liltenhead
+  Tier: Revolutionary
+- Name: Luaan
+  Tier: Syndicate Agent
+- Name: Lucas Welsh
+  Tier: Revolutionary
+- Name: lukiw
+  Tier: Revolutionary
+- Name: Luzurper
+  Tier: Revolutionary
+- Name: Lyndomen
+  Tier: Revolutionary
+- Name: Madeleine LeFleur
+  Tier: Syndicate Agent
+- Name: mage_period
+  Tier: Syndicate Agent
+- Name: Magelfik
+  Tier: Revolutionary
+- Name: Malachi Housewright
+  Tier: Revolutionary
+- Name: March
+  Tier: Syndicate Agent
+- Name: Marios Sardis
+  Tier: Revolutionary
+- Name: Mason Fawcett
+  Tier: Revolutionary
+- Name: MasterFurret
+  Tier: Revolutionary
+- Name: Mathew McGuire
+  Tier: Revolutionary
+- Name: Matthew C Miklaucic
+  Tier: Revolutionary
+- Name: Matthias Bechtold
+  Tier: Revolutionary
+- Name: Mci
+  Tier: Revolutionary
+- Name: MechaKitty
+  Tier: Revolutionary
+- Name: Mega Awesome Man
+  Tier: Syndicate Agent
+- Name: merklaw
+  Tier: Revolutionary
+- Name: Michael Van Gaasbeck
+  Tier: Revolutionary
+- Name: Mihailo Trickovic
+  Tier: Syndicate Agent
+- Name: Mikhail
+  Tier: Revolutionary
+- Name: mikiju
+  Tier: Syndicate Agent
+- Name: Minemoder
+  Tier: Syndicate Agent
+- Name: Miniwoffer
+  Tier: Revolutionary
+- Name: Mitchell Marry
+  Tier: Revolutionary
+- Name: mksky
+  Tier: Revolutionary
+- Name: Molly the Bully
+  Tier: Nuclear Operative
+- Name: Molon
+  Tier: Syndicate Agent
+- Name: Mono
+  Tier: Revolutionary
+- Name: Mr_Clank
+  Tier: Revolutionary
+- Name: MrGloopy
+  Tier: Revolutionary
+- Name: Mythtic B
+  Tier: Revolutionary
+- Name: Nagano
+  Tier: Revolutionary
+- Name: Nat
+  Tier: Revolutionary
+- Name: Nathan Zaldivar
+  Tier: Nuclear Operative
+- Name: Nathaniel Joseph Hurd
+  Tier: Revolutionary
+- Name: Nathaniel Taylor
+  Tier: Revolutionary
+- Name: Nemmay
+  Tier: Revolutionary
+- Name: Neo Move
+  Tier: Syndicate Agent
+- Name: NetGlitch
+  Tier: Nuclear Operative
+- Name: Nicholas
+  Tier: Nuclear Operative
+- Name: Nicholas Williamson
+  Tier: Nuclear Operative
+- Name: Nicholi
+  Tier: Syndicate Agent
+- Name: Nictis
+  Tier: Revolutionary
+- Name: Ninja
+  Tier: Syndicate Agent
+- Name: Nojan Niaki
+  Tier: Revolutionary
+- Name: Noodle is me
+  Tier: Syndicate Agent
+- Name: Novaq
+  Tier: Revolutionary
+- Name: Noxy
+  Tier: Syndicate Agent
+- Name: Nudal
+  Tier: Revolutionary
+- Name: Nugmania
+  Tier: Revolutionary
+- Name: Nyxilath
+  Tier: Nuclear Operative
+- Name: orange color
+  Tier: Revolutionary
+- Name: osborn
+  Tier: Syndicate Agent
+- Name: Oscar Tobias Herra Bravo
+  Tier: Revolutionary
+- Name: Oxyclean114
+  Tier: Revolutionary
+- Name: Pangaron
+  Tier: Syndicate Agent
+- Name: Pasemi
+  Tier: Revolutionary
+- Name: peanut
+  Tier: Revolutionary
+- Name: Penguin Commoner
+  Tier: Revolutionary
+- Name: Phillip Inman
+  Tier: Revolutionary
+- Name: Phycoweirdo
+  Tier: Nuclear Operative
+- Name: Pinet
+  Tier: Nuclear Operative
+- Name: Piotr
+  Tier: Revolutionary
+- Name: pooba
+  Tier: Revolutionary
+- Name: Powder
+  Tier: Revolutionary
+- Name: ppie
+  Tier: Syndicate Agent
+- Name: Prayer
+  Tier: Nuclear Operative
+- Name: Preston Pickering
+  Tier: Revolutionary
+- Name: Prof. Omii
+  Tier: Nuclear Operative
+- Name: ProxyGen
+  Tier: Revolutionary
+- Name: Psy
+  Tier: Revolutionary
+- Name: queednyeb
+  Tier: Revolutionary
+- Name: Quonn
+  Tier: Syndicate Agent
+- Name: Raccoononi
+  Tier: Revolutionary
+- Name: Rafał Kowalewski
+  Tier: Revolutionary
+- Name: Raiden Johnson
+  Tier: Revolutionary
+- Name: Rainy
+  Tier: Revolutionary
+- Name: RamenZorn
+  Tier: Syndicate Agent
+- Name: Ramiro Agis
+  Tier: Revolutionary
+- Name: Random Person
+  Tier: Syndicate Agent
+- Name: Rasmus Cedergren
+  Tier: Revolutionary
+- Name: Raspberry1111
+  Tier: Revolutionary
+- Name: Rat Fungus
+  Tier: Nuclear Operative
+- Name: Rat Man
+  Tier: Revolutionary
+- Name: RedChair368
+  Tier: Revolutionary
+- Name: Repo
+  Tier: Nuclear Operative
+- Name: Richard "Rei" Weeks
+  Tier: Syndicate Agent
+- Name: Robert Reed
+  Tier: Nuclear Operative
+- Name: Robin Rottstock
+  Tier: Revolutionary
+- Name: Roman
+  Tier: Syndicate Agent
+- Name: Rome
+  Tier: Revolutionary
+- Name: rosysyn
+  Tier: Revolutionary
+- Name: Rusty Shackleford
+  Tier: Nuclear Operative
+- Name: Ryan Hanson
+  Tier: Revolutionary
+- Name: Ryan Kelly
+  Tier: Revolutionary
+- Name: RyanTuek
+  Tier: Revolutionary
+- Name: S.C.
+  Tier: Syndicate Agent
+- Name: S1rFl0
+  Tier: Revolutionary
+- Name: Sam Caesar
+  Tier: Revolutionary
+- Name: Samtaro
+  Tier: Nuclear Operative
+- Name: Sandvich enjoyer
+  Tier: Revolutionary
+- Name: Saphire
+  Tier: Revolutionary
+- Name: SarahRaven
+  Tier: Revolutionary
+- Name: Sartec
+  Tier: Revolutionary
+- Name: ScarKy0
+  Tier: Revolutionary
+- Name: Sean Lilly
+  Tier: Syndicate Agent
+- Name: Seinfeld
+  Tier: Revolutionary
+- Name: Semiotics
+  Tier: Syndicate Agent
+- Name: Serathis
+  Tier: Revolutionary
+- Name: Serianas
+  Tier: Nuclear Operative
+- Name: Seth Morron
+  Tier: Revolutionary
+- Name: showgun117
+  Tier: Syndicate Agent
+- Name: Simon N Heath
+  Tier: Revolutionary
+- Name: SireHambone
+  Tier: Nuclear Operative
+- Name: sk3iron
+  Tier: Revolutionary
+- Name: Sleeepz
+  Tier: Syndicate Agent
+- Name: SnapKick
+  Tier: Revolutionary
+- Name: Snowlili
+  Tier: Revolutionary
+- Name: Snowni
+  Tier: Nuclear Operative
+- Name: Solid_Syn
+  Tier: Revolutionary
+- Name: Solidus Snake
+  Tier: Nuclear Operative
+- Name: SotetSotetSotetSotetSotet
+  Tier: Syndicate Agent
+- Name: Southbridge
+  Tier: Nuclear Operative
+- Name: Sparlight
+  Tier: Nuclear Operative
+- Name: SpiffyNnemonic
+  Tier: Revolutionary
+- Name: spookerton
+  Tier: Syndicate Agent
+- Name: Sporkyz
+  Tier: Revolutionary
+- Name: SpydAxe
+  Tier: Revolutionary
+- Name: StaceyBalcom
+  Tier: Revolutionary
+- Name: Star Lord
+  Tier: Syndicate Agent
+- Name: starch
+  Tier: Syndicate Agent
+- Name: StaticeStorm
+  Tier: Syndicate Agent
+- Name: Statix AraAra
+  Tier: Revolutionary
+- Name: Stedar
+  Tier: Syndicate Agent
+- Name: stikfigz
+  Tier: Revolutionary
+- Name: Sufary
+  Tier: Nuclear Operative
+- Name: Superglue
+  Tier: Syndicate Agent
+- Name: Sven Tammerijn
+  Tier: Revolutionary
+- Name: Swindel_
+  Tier: Syndicate Agent
+- Name: Swix Swix
+  Tier: Revolutionary
+- Name: T.P_Gaming
+  Tier: Revolutionary
+- Name: Tabatha Mendonski
+  Tier: Revolutionary
+- Name: Taber
+  Tier: Revolutionary
+- Name: TacoCub
+  Tier: Revolutionary
+- Name: Tairenar
+  Tier: Nuclear Operative
+- Name: Talbot
+  Tier: Revolutionary
+- Name: Tamora Droppa
+  Tier: Revolutionary
+- Name: taydeo
+  Tier: Nuclear Operative
+- Name: Taylor
+  Tier: Revolutionary
+- Name: Tee The Kobold
+  Tier: Revolutionary
+- Name: The Best Sean
+  Tier: Syndicate Agent
+- Name: the good king wompicus
+  Tier: Syndicate Agent
+- Name: The Hateful Flesh
+  Tier: Revolutionary
+- Name: The Pain
+  Tier: Syndicate Agent
+- Name: Thebluegameingdoggo
+  Tier: Revolutionary
+- Name: TheGoldElite
+  Tier: Revolutionary
+- Name: TheGungeonologist
+  Tier: Revolutionary
+- Name: Third
+  Tier: Revolutionary
+- Name: Thomas Pollard
+  Tier: Nuclear Operative
+- Name: Tia
+  Tier: Revolutionary
+- Name: tokie
+  Tier: Nuclear Operative
+- Name: Tom Cruize
+  Tier: Syndicate Agent
+- Name: Tom Goodman (TauOmicronMu#2500)
+  Tier: Revolutionary
 - Name: Tomeno
   Tier: Revolutionary
+- Name: ToonaLemons
+  Tier: Revolutionary
+- Name: tremors08
+  Tier: Syndicate Agent
+- Name: Trent Warfel
+  Tier: Nuclear Operative
+- Name: Trevor Johnson
+  Tier: Revolutionary
+- Name: Trevor McConnell
+  Tier: Nuclear Operative
+- Name: TrixxedHeart
+  Tier: Nuclear Operative
+- Name: Troll_King_907
+  Tier: Nuclear Operative
+- Name: Ty Ashley
+  Tier: Revolutionary
+- Name: tyler adams
+  Tier: Revolutionary
+- Name: Tyler Young
+  Tier: Nuclear Operative
+- Name: tynobeard 123
+  Tier: Revolutionary
+- Name: Uinseann
+  Tier: Revolutionary
+- Name: Unknown Kiwi
+  Tier: Revolutionary
+- Name: Valinov
+  Tier: Nuclear Operative
+- Name: Vexxtraordinary
+  Tier: Revolutionary
+- Name: Vice Emargo
+  Tier: Syndicate Agent
+- Name: vifs_vestige
+  Tier: Syndicate Agent
+- Name: Violette
+  Tier: Revolutionary
+- Name: VividWisp
+  Tier: Syndicate Agent
+- Name: VmasterVX
+  Tier: Revolutionary
+- Name: Voidliing
+  Tier: Revolutionary
+- Name: Voltinho
+  Tier: Revolutionary
+- Name: Watson Whittington
+  Tier: Syndicate Agent
+- Name: Whistling Jake
+  Tier: Revolutionary
+- Name: Wiliam
+  Tier: Nuclear Operative
+- Name: Will M.
+  Tier: Revolutionary
+- Name: William Grondin
+  Tier: Revolutionary
+- Name: Wolfie
+  Tier: Revolutionary
+- Name: Wrexbe
+  Tier: Revolutionary
+- Name: wtcwr68
+  Tier: Nuclear Operative
+- Name: WWII Kitsune
+  Tier: Nuclear Operative
+- Name: Xenon Dragon
+  Tier: Syndicate Agent
+- Name: yeoshua
+  Tier: Syndicate Agent
+- Name: YuNii
+  Tier: Nuclear Operative
+- Name: Z4NEER
+  Tier: Nuclear Operative
+- Name: Zadenae
+  Tier: Nuclear Operative
+- Name: Zak The Dragon
+  Tier: Revolutionary
+- Name: Zakanater 19
+  Tier: Revolutionary
+- Name: Zakory L Holbrook
+  Tier: Revolutionary
+- Name: Zandario
+  Tier: Revolutionary
+- Name: zedd
+  Tier: Nuclear Operative
+- Name: Zella Zane
+  Tier: Revolutionary
+- Name: Zenari Ari
+  Tier: Nuclear Operative
+- Name: Zero
+  Tier: Revolutionary
+- Name: Zoe Rose
+  Tier: Syndicate Agent
+- Name: Александр Белошапка
+  Tier: Revolutionary
 
diff --git a/Tools/dump_patrons.ps1 b/Tools/dump_patrons.ps1
index d08e095421..21b8b7b1cb 100755
--- a/Tools/dump_patrons.ps1
+++ b/Tools/dump_patrons.ps1
@@ -5,4 +5,4 @@ param([string]$csvPath)
 # Dumps Patreon's CSV download into a YAML file the game reads.
 
 # Have to trim patron names because apparently Patreon doesn't which is quite ridiculous.
-Get-content $csvPath | ConvertFrom-Csv -Delimiter "," | select @{l="Name";e={$_.Name.Trim()}},Tier | where-object Tier -ne "" | ConvertTo-Yaml
+Get-content $csvPath | ConvertFrom-Csv -Delimiter "," | select @{l="Name";e={$_.Name.Trim()}},Tier | where-object Tier -ne "" | where-object Tier -ne "Free" | ConvertTo-Yaml

From 02a7f5721dc156fe130b0373d9908f393a73cfce Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 12 Oct 2025 11:03:41 +0000
Subject: [PATCH 194/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 945768a43c..86e28267e8 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Moomoobeef
-  changes:
-  - message: Made high-viz vest less visible.
-    type: Tweak
-  id: 8580
-  time: '2025-05-28T09:39:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37869
 - author: deltanedas
   changes:
   - message: Diona "Gib yourself!" action now has a suicide warning like microbombs.
@@ -3944,3 +3937,10 @@
   id: 9082
   time: '2025-10-12T10:47:30.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39304
+- author: PJB3005
+  changes:
+  - message: The patrons list in the in-game credits works again.
+    type: Fix
+  id: 9083
+  time: '2025-10-12T11:02:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40840

From 982624f0dd94472f987dc56cbbb6422e6c277f38 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Sun, 12 Oct 2025 03:54:37 -0700
Subject: [PATCH 195/216] Fix species not being ordered alphabetically in the
 character customization UI (#39359)

* Fix species not being ordered alphabetically in the character customization UI

* Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 821722ec35..b568491b67 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -607,6 +607,7 @@ namespace Content.Client.Lobby.UI
             _species.Clear();
 
             _species.AddRange(_prototypeManager.EnumeratePrototypes<SpeciesPrototype>().Where(o => o.RoundStart));
+            _species.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.CurrentCultureIgnoreCase));
             var speciesIds = _species.Select(o => o.ID).ToList();
 
             for (var i = 0; i < _species.Count; i++)

From e92597a4d9f755c87c8e7402c3a72ab90cf8657f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 12 Oct 2025 11:15:53 +0000
Subject: [PATCH 196/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 86e28267e8..062e35f91f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: deltanedas
-  changes:
-  - message: Diona "Gib yourself!" action now has a suicide warning like microbombs.
-    type: Tweak
-  id: 8581
-  time: '2025-05-28T19:52:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27422
 - author: sowelipililimute
   changes:
   - message: Plants can process nutrition again
@@ -3944,3 +3937,11 @@
   id: 9083
   time: '2025-10-12T11:02:33.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40840
+- author: DrSmugleaf
+  changes:
+  - message: Fixed species not being ordered alphabetically in the character customization
+      UI.
+    type: Fix
+  id: 9084
+  time: '2025-10-12T11:14:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39359

From 294cae8de157cebb6dfc65acf7e1d5f3a326c21f Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 12 Oct 2025 15:27:32 +0200
Subject: [PATCH 197/216] Super Synth Removal from rng

It was decided during the maintainer meeting to remove these.
---
 .../Entities/Markers/Spawners/Random/instruments.yml        | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml
index 93e7e58e88..6131844472 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml
@@ -119,10 +119,6 @@
       weight: 0.1
       children:
       - id: DawInstrumentMachineCircuitboard
-    - !type:GroupSelector
-      weight: 0.05
-      children:
-      - id: SuperSynthesizerInstrument
 
 - type: entityTable
   id: SalvageInstrumentTable
@@ -140,8 +136,6 @@
       tableId: WoodwindInstrumentTable
     - !type:NestedSelector
       tableId: SpecialInstrumentTable
-    - id: SuperSynthesizerInstrument
-      weight: 0.3
 
 - type: entity
   id: RandomInstruments

From 90b438635d8f9ba2abdb2c78bedeaf4236db5057 Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 12 Oct 2025 15:29:01 +0200
Subject: [PATCH 198/216] Revert "Readds Tasers to Security (#39087)"

This reverts commit 398c8df343e2b41ebdf03fe6d3714a1e894434c0.

This will be pushed into vulture testing for another release cycle due to potencial influence with newmed, we dont have a better way of doing something like this sooo i will just unrevert the revert

Taser changelog removal
---
 Content.Server/Stunnable/Systems/StunOnCollideSystem.cs   | 1 -
 Resources/Changelog/Changelog.yml                         | 8 --------
 Resources/Prototypes/Catalog/Fills/Lockers/heads.yml      | 1 -
 Resources/Prototypes/Catalog/Fills/Lockers/security.yml   | 3 ---
 .../Objects/Weapons/Guns/Battery/battery_guns.yml         | 1 -
 .../Objects/Weapons/Guns/Projectiles/projectiles.yml      | 4 +---
 6 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
index 09e42966c7..c1757b1c2d 100644
--- a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
@@ -27,7 +27,6 @@ internal sealed class StunOnCollideSystem : EntitySystem
         if (ent.Comp.Refresh)
         {
             _stunSystem.TryUpdateStunDuration(target, ent.Comp.StunAmount);
-
             _movementMod.TryUpdateMovementSpeedModDuration(
                 target,
                 MovementModStatusSystem.TaserSlowdown,
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index de112f2b02..e5de0b2e3d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -3561,14 +3561,6 @@
   id: 9012
   time: '2025-09-27T20:51:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40572
-- author: keronshb
-  changes:
-  - message: 'EXPERIMENTAL: Tasers, a short-ranged gun capable of causing targets
-      to become prone, are now added into Warden, HoS, and Security locker fills.'
-    type: Add
-  id: 9013
-  time: '2025-09-27T21:21:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39087
 - author: SurrealShibe
   changes:
   - message: Vulpkanin now audibly gasp.
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 2b4c5c9b36..2db34c0459 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -324,7 +324,6 @@
     - id: RubberStampHos
     - id: BoxHoSCircuitboards
     - id: WeaponDisabler
-    - id: WeaponTaser
     - id: WantedListCartridge
     - id: DrinkHosFlask
 
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 48bed23bc9..1111058871 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -28,7 +28,6 @@
     children:
     - id: FlashlightSeclite
     - id: WeaponDisabler
-    - id: WeaponTaser
     - id: ClothingBeltSecurityFilled
     - id: Flash
     - id: ClothingEyesGlassesSecurity
@@ -73,7 +72,6 @@
     - id: FlashlightSeclite
       prob: 0.8
     - id: WeaponDisabler
-    - id: WeaponTaser
     - id: ClothingUniformJumpsuitSecGrey
       prob: 0.3
     - id: ClothingHeadHelmetBasic
@@ -107,7 +105,6 @@
   table: !type:AllSelector
     children:
     - id: ClothingEyesGlassesSecurity
-    - id: WeaponTaser
     - id: WeaponDisabler
     - id: TrackingImplanter
       amount: 2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 2f2ebfa5fd..bd532ce709 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -611,7 +611,6 @@
     slots:
     - Belt
   - type: Gun
-    fireRate: 0.5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/taser.ogg
   - type: ProjectileBatteryAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index bc9f40f85a..74f546c61d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -227,8 +227,7 @@
     lifetime: 0.170 # Very short range
   - type: StunOnCollide
     stunAmount: 0
-    knockdownAmount: 2.5 # Enough to subdue and follow up with a stun baton
-    drop: false #Ranged KD and item drop are too strong in one package
+    knockdownAmount: 2.5 # Enough to subdue and follow up with a stun batong
     slowdownAmount: 2.5
     walkSpeedModifier: 0.5
     sprintSpeedModifier: 0.5
@@ -256,7 +255,6 @@
     lifetime: 1.0 # Not so short range
   - type: StunOnCollide
     stunAmount: 5
-    drop: true # this is the evil taser
     knockdownAmount: 10
     slowdownAmount: 10
     walkSpeedModifier: 0.5

From f3ade672602f2815b6485151253f848e4696001d Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 12 Oct 2025 15:46:15 +0200
Subject: [PATCH 199/216] Add missing changelog

---
 Resources/Changelog/Changelog.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index e5de0b2e3d..deabf58db0 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,4 +1,15 @@
 Entries:
+- author: CoconutThunder
+  changes:
+  - message: Fixed lubed items being thrown when looking at the pickup verb.
+    type: Fix
+  - message: Fixed multihanded items showing a popup when looking at the pickup verb.
+    type: Fix
+  - message: Fixed a bug with lubed handcuffs.
+    type: Fix
+  id: 8561
+  time: '2025-05-25T05:10:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38705
 - author: CoconutThunder
   changes:
   - message: The Chief Medical Officer should now appear with the correct precedence

From 7837a5cc72fabcfc8255d614b3ac781bfd7fa1ca Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 12 Oct 2025 16:07:56 +0200
Subject: [PATCH 200/216] Mark supersynth as admin

---
 .../Entities/Objects/Fun/Instruments/instrument_keyed.yml      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml
index 46af54f86f..cda539e4fb 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml
@@ -26,6 +26,7 @@
 - type: entity
   parent: BaseKeyedInstrument
   id: SuperSynthesizerInstrument
+  suffix: Admin
   name: super synthesizer
   description: Blasting the ghetto with Touhou MIDIs since 2020.
   components:
@@ -41,7 +42,7 @@
 - type: entity
   parent: SuperSynthesizerInstrument
   id: SuperSynthesizerNoLimitInstrument
-  suffix: NoLimits
+  suffix: NoLimits Admin
   components:
   - type: Instrument
     respectMidiLimits: false

From a803bcca467ae47e5349e1c2ef9521a1e97004f2 Mon Sep 17 00:00:00 2001
From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Mon, 13 Oct 2025 06:38:41 +1300
Subject: [PATCH 201/216] Explicitly attribute each state in organs.rsi,
 exchange CEV-Eris stomach sprite with /tg/station 13 (#39753)

attribute each state, replace cev-eris stomach sprite with tg
---
 .../Mobs/Species/Human/organs.rsi/meta.json     |   2 +-
 .../Mobs/Species/Human/organs.rsi/stomach.png   | Bin 191 -> 384 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json
index a9112535f8..ddc468082b 100644
--- a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af, inhands by mubururu_ (github)",
+  "copyright": "brain, ears, eyeball-l, eyeball-r, heart-on, heart-off, kidney-l, kidney-r, liver, lung-l, lung-r, stomach, tongue, taken from /tg/station 13 at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 | appendix, appendix-inflamed, muscle, nerve, vessel taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af | inhands by mubururu_ (github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png
index ebf1d5f5141efea3d613ee4a659f6e4f6c6b9dd7..ca3c4a5510b899b957b58ad6621d6831f74613a2 100644
GIT binary patch
delta 369
zcmV-%0gnE^0e}OL7=H)`0001UdV2H#0004VQb$4nuFf3k0003xNkl<ZScUDDF;Buk
z7>1u3cSCe?chC?Pe!|&=i4`^{T;x9h6DvbqjDNtz!O4U$I<gR=gS*$XG!3iE=U@&i
z7;Sq^2&T`}e(l}+-u1mNg_4pI3q0k@R>j}%Z^hQcp3Pv17JoLw?F|&c?iz?fjSl>8
zHBY&jGqIo7KyNm80J&(L0|>z7Rm(h<?quwwnJ3jtzcHv)rP-)+c5?bT;o%VgH`jNh
zF=3s7-fZqXP2X1cSx?69hS1<CR}$YIGVVgA5SoN{Cu7H4uZsidz$XfIu?EaaC0Y=L
zS~_jD3S4r<&uXtPJUmX#DJjN)5g+zP05lu*4PhPl#LGC7cq#*)a;4K&4Ev+x!~#$`
zr~s^l`RWg;Nwov(9nUnOA8MKT(?Aqz;^py1J+ELc2DR$;emqJ_O8z|`NUn#=Y`i3Y
P00000NkvXXu0mjfSM8@^

delta 175
zcmZo*-p@EeqMn7Bfq|hhB>gy$5(@AMaXoP0z)~Bl6Olg8>a)Hs>G*$QO~Tpw9Y9&e
zk|4ie28U-i(tw<3PZ!4!jfrQ^T@-9k;9<TnPtU>JA%Q`4E<*wHoqEywOtA|!`@E|K
ze;S;cpncHHA>>`<uP)oO%x9XPI0mrQnl{yb>*gv*kk#mT?Z}iB5uV}IK3g>8dXvYL
b|Ib-}v~q6D-%xoSXb*#@tDnm{r-UW|B6UT;


From 11525673ba352cdbe0edbafd06c3749d39151ed8 Mon Sep 17 00:00:00 2001
From: Fildrance <fildrance@gmail.com>
Date: Sun, 12 Oct 2025 20:54:08 +0300
Subject: [PATCH 202/216] Use PredictedQueueDel in
 SharedDestructibleSystem.DestroyEntity (#40856)

feat: predict queuedel in SharedDestructibleSystem.DestroyEntity

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
---
 .../Destructible/SharedDestructibleSystem.cs       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Content.Shared/Destructible/SharedDestructibleSystem.cs b/Content.Shared/Destructible/SharedDestructibleSystem.cs
index 572ed9d560..f37561e0d8 100644
--- a/Content.Shared/Destructible/SharedDestructibleSystem.cs
+++ b/Content.Shared/Destructible/SharedDestructibleSystem.cs
@@ -1,9 +1,9 @@
-namespace Content.Shared.Destructible;
+namespace Content.Shared.Destructible;
 
 public abstract class SharedDestructibleSystem : EntitySystem
 {
     /// <summary>
-    ///     Force entity to be destroyed and deleted.
+    /// Force entity to be destroyed and deleted.
     /// </summary>
     public bool DestroyEntity(EntityUid owner)
     {
@@ -15,12 +15,12 @@ public abstract class SharedDestructibleSystem : EntitySystem
         var eventArgs = new DestructionEventArgs();
         RaiseLocalEvent(owner, eventArgs);
 
-        QueueDel(owner);
+        PredictedQueueDel(owner);
         return true;
     }
 
     /// <summary>
-    ///     Force entity to break.
+    /// Force entity to break.
     /// </summary>
     public void BreakEntity(EntityUid owner)
     {
@@ -30,7 +30,7 @@ public abstract class SharedDestructibleSystem : EntitySystem
 }
 
 /// <summary>
-///     Raised before an entity is about to be destroyed and deleted
+/// Raised before an entity is about to be destroyed and deleted
 /// </summary>
 public sealed class DestructionAttemptEvent : CancellableEntityEventArgs
 {
@@ -38,7 +38,7 @@ public sealed class DestructionAttemptEvent : CancellableEntityEventArgs
 }
 
 /// <summary>
-///     Raised when entity is destroyed and about to be deleted.
+/// Raised when entity is destroyed and about to be deleted.
 /// </summary>
 public sealed class DestructionEventArgs : EntityEventArgs
 {
@@ -46,7 +46,7 @@ public sealed class DestructionEventArgs : EntityEventArgs
 }
 
 /// <summary>
-///     Raised when entity was heavy damage and about to break.
+/// Raised when entity was heavy damage and about to break.
 /// </summary>
 public sealed class BreakageEventArgs : EntityEventArgs
 {

From 2696fd7cd50cb1ed097875c4edff00a8f2f61f48 Mon Sep 17 00:00:00 2001
From: Callmore <22885888+Callmore@users.noreply.github.com>
Date: Sun, 12 Oct 2025 19:34:20 +0100
Subject: [PATCH 203/216] Automatically add trash tag to spent bullet casings
 (#40829)

* Automatically add trash tag to spent bullet casings

* Resolving comments

* 2

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Weapons/Ranged/Components/AmmoComponent.cs         |  6 ++++++
 .../Weapons/Ranged/Systems/SharedGunSystem.cs          | 10 ++++++++++
 .../Weapons/Guns/Ammunition/Cartridges/pistol.yml      |  4 ++++
 3 files changed, 20 insertions(+)

diff --git a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
index 0ba8a5faee..0fedf95146 100644
--- a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
@@ -34,6 +34,12 @@ public sealed partial class CartridgeAmmoComponent : AmmoComponent
     [DataField, AutoNetworkedField]
     public bool Spent;
 
+    /// <summary>
+    /// Is this cartridge automatically marked as trash once spent?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool MarkSpentAsTrash = true;
+
     /// <summary>
     /// Caseless ammunition.
     /// </summary>
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index e3fbec0d5d..952b53acf2 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -65,6 +65,8 @@ public abstract partial class SharedGunSystem : EntitySystem
     [Dependency] private   readonly UseDelaySystem _useDelay = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
+    private static readonly ProtoId<TagPrototype> TrashTag = "Trash";
+
     private const float InteractNextFire = 0.3f;
     private const double SafetyNextFire = 0.5;
     private const float EjectOffset = 0.4f;
@@ -452,6 +454,14 @@ public abstract partial class SharedGunSystem : EntitySystem
 
         cartridge.Spent = spent;
         Appearance.SetData(uid, AmmoVisuals.Spent, spent);
+
+        if (!cartridge.MarkSpentAsTrash)
+            return;
+
+        if (spent)
+            TagSystem.AddTag(uid, TrashTag);
+        else
+            TagSystem.RemoveTag(uid, TrashTag);
     }
 
     /// <summary>
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
index ba2b856778..3862918e38 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -89,3 +89,7 @@
   - type: CartridgeAmmo
     proto: BulletPistol
     spent: true
+  - type: Tag
+    tags:
+    - CartridgePistol
+    - Trash # surely theres a way to automatically add this...

From e3318ad17ab025e672fab3f0322a743c8f83bfbc Mon Sep 17 00:00:00 2001
From: Coco <CoconutThunder@users.noreply.github.com>
Date: Sun, 12 Oct 2025 14:35:13 -0400
Subject: [PATCH 204/216] Plasma: reduced highly illegal syndicate shark attack
 rate (#40855)

reduced highly illegal syndicate shark attack rate to 2 (per #39250, #39874)
---
 Resources/Maps/plasma.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Maps/plasma.yml b/Resources/Maps/plasma.yml
index 71dba17d74..d8873dee61 100644
--- a/Resources/Maps/plasma.yml
+++ b/Resources/Maps/plasma.yml
@@ -131573,7 +131573,7 @@ entities:
       pos: -14.584713,16.470493
       parent: 2
     - type: MeleeWeapon
-      attackRate: 10
+      attackRate: 2
       autoAttack: True
     - type: Item
       size: Huge

From 43a0553e3013b58fa9c11189ef35d4d9de480bea Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 12 Oct 2025 18:47:04 +0000
Subject: [PATCH 205/216] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 Resources/Changelog/Maps.yml      |  7 +++++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 062e35f91f..044f5f052d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: sowelipililimute
-  changes:
-  - message: Plants can process nutrition again
-    type: Fix
-  - message: Plants can process robust harvest again
-    type: Fix
-  id: 8582
-  time: '2025-05-28T22:51:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37912
 - author: mhamster
   changes:
   - message: Chameleon clothes are now affected by any kind of EMP explosion, which
@@ -3945,3 +3936,10 @@
   id: 9084
   time: '2025-10-12T11:14:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39359
+- author: Callmore
+  changes:
+  - message: Bullet casings can now be picked up again.
+    type: Fix
+  id: 9085
+  time: '2025-10-12T18:45:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40829
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 0c8783e4a5..d7a91135e1 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -778,4 +778,11 @@
   id: 94
   time: '2025-10-10T20:33:03.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40821
+- author: CoconutThunder
+  changes:
+  - message: Reduced frequency of syndicate shark attacks
+    type: Tweak
+  id: 95
+  time: '2025-10-12T18:45:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40855
 Order: 1

From 02b623b16ef2525aa29937aa61309ea339bdecaf Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 12 Oct 2025 21:09:08 +0200
Subject: [PATCH 206/216] Revert "Add slowdown to nocturine, buff duration and
 minor delay reduction (#40797)"

This reverts commit 33c0c46b5da5a462d05e267a887b8254e95096ce.
---
 Resources/Prototypes/Reagents/narcotics.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index 92236d746c..a1b1033a4b 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -289,19 +289,16 @@
   meltingPoint: 128.0
   metabolisms:
     Narcotic:
-      effects: # It would be nice to have speech slurred or mumbly, but accents are a bit iffy atm. Same for distortion effects.
-      - !type:MovespeedModifier
-        walkSpeedModifier: 0.65
-        sprintSpeedModifier: 0.65
+      effects:
       - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentThreshold
           reagent: Nocturine
           min: 8
         effectProto: StatusEffectForcedSleeping
-        time: 6
-        delay: 5
-        type: Update
+        time: 3
+        delay: 6
+        type: Add
 
 - type: reagent
   id: MuteToxin

From 2a261d3bc0f542156f2517453c68199673f9ae19 Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 12 Oct 2025 21:33:18 +0200
Subject: [PATCH 207/216] Reapply "Readds Tasers to Security (#39087)"

This reverts commit 90b438635d8f9ba2abdb2c78bedeaf4236db5057.
---
 Content.Server/Stunnable/Systems/StunOnCollideSystem.cs   | 1 +
 Resources/Changelog/Changelog.yml                         | 8 ++++++++
 Resources/Prototypes/Catalog/Fills/Lockers/heads.yml      | 1 +
 Resources/Prototypes/Catalog/Fills/Lockers/security.yml   | 3 +++
 .../Objects/Weapons/Guns/Battery/battery_guns.yml         | 1 +
 .../Objects/Weapons/Guns/Projectiles/projectiles.yml      | 4 +++-
 6 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
index c1757b1c2d..09e42966c7 100644
--- a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
@@ -27,6 +27,7 @@ internal sealed class StunOnCollideSystem : EntitySystem
         if (ent.Comp.Refresh)
         {
             _stunSystem.TryUpdateStunDuration(target, ent.Comp.StunAmount);
+
             _movementMod.TryUpdateMovementSpeedModDuration(
                 target,
                 MovementModStatusSystem.TaserSlowdown,
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index deabf58db0..b60c29e299 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -3572,6 +3572,14 @@
   id: 9012
   time: '2025-09-27T20:51:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40572
+- author: keronshb
+  changes:
+  - message: 'EXPERIMENTAL: Tasers, a short-ranged gun capable of causing targets
+      to become prone, are now added into Warden, HoS, and Security locker fills.'
+    type: Add
+  id: 9013
+  time: '2025-09-27T21:21:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39087
 - author: SurrealShibe
   changes:
   - message: Vulpkanin now audibly gasp.
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 2db34c0459..2b4c5c9b36 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -324,6 +324,7 @@
     - id: RubberStampHos
     - id: BoxHoSCircuitboards
     - id: WeaponDisabler
+    - id: WeaponTaser
     - id: WantedListCartridge
     - id: DrinkHosFlask
 
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 1111058871..48bed23bc9 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -28,6 +28,7 @@
     children:
     - id: FlashlightSeclite
     - id: WeaponDisabler
+    - id: WeaponTaser
     - id: ClothingBeltSecurityFilled
     - id: Flash
     - id: ClothingEyesGlassesSecurity
@@ -72,6 +73,7 @@
     - id: FlashlightSeclite
       prob: 0.8
     - id: WeaponDisabler
+    - id: WeaponTaser
     - id: ClothingUniformJumpsuitSecGrey
       prob: 0.3
     - id: ClothingHeadHelmetBasic
@@ -105,6 +107,7 @@
   table: !type:AllSelector
     children:
     - id: ClothingEyesGlassesSecurity
+    - id: WeaponTaser
     - id: WeaponDisabler
     - id: TrackingImplanter
       amount: 2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index bd532ce709..2f2ebfa5fd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -611,6 +611,7 @@
     slots:
     - Belt
   - type: Gun
+    fireRate: 0.5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/taser.ogg
   - type: ProjectileBatteryAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 74f546c61d..bc9f40f85a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -227,7 +227,8 @@
     lifetime: 0.170 # Very short range
   - type: StunOnCollide
     stunAmount: 0
-    knockdownAmount: 2.5 # Enough to subdue and follow up with a stun batong
+    knockdownAmount: 2.5 # Enough to subdue and follow up with a stun baton
+    drop: false #Ranged KD and item drop are too strong in one package
     slowdownAmount: 2.5
     walkSpeedModifier: 0.5
     sprintSpeedModifier: 0.5
@@ -255,6 +256,7 @@
     lifetime: 1.0 # Not so short range
   - type: StunOnCollide
     stunAmount: 5
+    drop: true # this is the evil taser
     knockdownAmount: 10
     slowdownAmount: 10
     walkSpeedModifier: 0.5

From 8de64ca2bb6f25939d7ebfe7af0d16c78d18774e Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 12 Oct 2025 21:33:22 +0200
Subject: [PATCH 208/216] Reapply "Add slowdown to nocturine, buff duration and
 minor delay reduction (#40797)"

This reverts commit 02b623b16ef2525aa29937aa61309ea339bdecaf.
---
 Resources/Prototypes/Reagents/narcotics.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index a1b1033a4b..92236d746c 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -289,16 +289,19 @@
   meltingPoint: 128.0
   metabolisms:
     Narcotic:
-      effects:
+      effects: # It would be nice to have speech slurred or mumbly, but accents are a bit iffy atm. Same for distortion effects.
+      - !type:MovespeedModifier
+        walkSpeedModifier: 0.65
+        sprintSpeedModifier: 0.65
       - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentThreshold
           reagent: Nocturine
           min: 8
         effectProto: StatusEffectForcedSleeping
-        time: 3
-        delay: 6
-        type: Add
+        time: 6
+        delay: 5
+        type: Update
 
 - type: reagent
   id: MuteToxin

From 632243ad0138feba7f66b5e3858556ddd6bd458e Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 12 Oct 2025 21:41:27 +0200
Subject: [PATCH 209/216] Now the changelog is fine

---
 Resources/Changelog/Changelog.yml | 175 ------------------------------
 1 file changed, 175 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index d4e49c44b1..6b64a31d64 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,179 +1,4 @@
 Entries:
-- author: CoconutThunder
-  changes:
-  - message: The Chief Medical Officer should now appear with the correct precedence
-      in the crew manifest.
-    type: Fix
-  id: 8560
-  time: '2025-05-24T05:10:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37774
-- author: TiniestShark
-  changes:
-  - message: Added inhand sprites for the bartender utensils and mugs.
-    type: Add
-  id: 8561
-  time: '2025-05-24T17:32:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37771
-- author: K-Dynamic
-  changes:
-  - message: Shutters and blast doors now appear welded when welded.
-    type: Fix
-  id: 8562
-  time: '2025-05-25T15:57:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37807
-- author: Stop-Signs
-  changes:
-  - message: Meals now better reflect the amount of ingredients put into them.
-    type: Tweak
-  id: 8563
-  time: '2025-05-25T18:02:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34138
-- author: brainfood1183
-  changes:
-  - message: Kangaroos can now be equipped with northstars and knuckle dusters.
-    type: Tweak
-  id: 8564
-  time: '2025-05-25T18:03:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37789
-- author: Moomoobeef
-  changes:
-  - message: Added new variants to dirty tiles.
-    type: Tweak
-  id: 8565
-  time: '2025-05-25T18:11:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37800
-- author: AsnDen
-  changes:
-  - message: Tile-aligned bar sign version was added.
-    type: Add
-  - message: Bar signs now have proper collision.
-    type: Fix
-  id: 8566
-  time: '2025-05-25T18:36:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37756
-- author: Fildrance
-  changes:
-  - message: Spray nozzle now can consume liquids from puddles and put it right into
-      backpacked tank.
-    type: Add
-  id: 8567
-  time: '2025-05-26T03:36:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30600
-- author: Southbridge
-  changes:
-  - message: On Amber, gave security its missing beacon and barriers.
-    type: Fix
-  id: 8568
-  time: '2025-05-26T07:29:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37700
-- author: jessicamaybe
-  changes:
-  - message: NPC Gorillas can now pry open doors and vault/smash tables!
-    type: Tweak
-  id: 8569
-  time: '2025-05-26T10:49:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37822
-- author: ArtisticRoomba
-  changes:
-  - message: The TEG's efficiency in extracting power from gasses has been tweaked
-      to promote dual-loop designs that recycle the waste heat of gasses, and punish
-      "meta" single loop designs.
-    type: Tweak
-  id: 8570
-  time: '2025-05-26T11:53:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37728
-- author: ArtisticRoomba
-  changes:
-  - message: The TEG now outputs smoother power when pressure across the circulators
-      flutter. (This was causing epilepsy in extreme circumstances).
-    type: Fix
-  id: 8571
-  time: '2025-05-26T12:07:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37658
-- author: chromiumboy
-  changes:
-  - message: Sentry turret control panels can now be found adjacent to rooms containing
-      sentry turrets. Authorized personnel can use these panels to remotely monitor
-      and alter the settings of any linked sentry turrets.
-    type: Add
-  id: 8572
-  time: '2025-05-26T13:00:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35235
-- author: metalgearsloth
-  changes:
-  - message: You no longer face items for a single frame when clicking while moving.
-    type: Tweak
-  id: 8573
-  time: '2025-05-27T11:34:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37874
-- author: Simyon
-  changes:
-  - message: Capacitors and Matter bins have been combined into the Manipulator.
-    type: Remove
-  id: 8574
-  time: '2025-05-27T11:47:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37725
-- author: PicklOH
-  changes:
-  - message: Gas Pipes are now named as such in the construction menu.
-    type: Tweak
-  id: 8575
-  time: '2025-05-27T16:26:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37881
-- author: ProfRenderer
-  changes:
-  - message: Cluwne ID cards now have a job icon.
-    type: Tweak
-  id: 8576
-  time: '2025-05-27T16:39:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37834
-- author: Moomoobeef
-  changes:
-  - message: Bookshelves now contain a more reasonable amount of books.
-    type: Tweak
-  id: 8577
-  time: '2025-05-27T21:21:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37866
-- author: SlamBamActionman
-  changes:
-  - message: Seismic Charges now trigger the timer when sent a signal, instead of
-      detonating instantly.
-    type: Tweak
-  - message: Signal Triggers for modular grenades now detonate after a 3 second delay.
-    type: Tweak
-  id: 8578
-  time: '2025-05-28T07:31:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34465
-- author: Minemoder5000
-  changes:
-  - message: Grape juice cups now contain grape juice.
-    type: Fix
-  id: 8579
-  time: '2025-05-28T09:32:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37895
-- author: Moomoobeef
-  changes:
-  - message: Made high-viz vest less visible.
-    type: Tweak
-  id: 8580
-  time: '2025-05-28T09:39:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37869
-- author: deltanedas
-  changes:
-  - message: Diona "Gib yourself!" action now has a suicide warning like microbombs.
-    type: Tweak
-  id: 8581
-  time: '2025-05-28T19:52:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27422
-- author: sowelipililimute
-  changes:
-  - message: Plants can process nutrition again
-    type: Fix
-  - message: Plants can process robust harvest again
-    type: Fix
-  id: 8582
-  time: '2025-05-28T22:51:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37912
 - author: mhamster
   changes:
   - message: Chameleon clothes are now affected by any kind of EMP explosion, which

From 9877b77ffff017a3d2a4858ea9ea8bd73ea669ce Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 12 Oct 2025 21:45:17 +0200
Subject: [PATCH 210/216] Remove nocture changelog from stable

---
 Resources/Changelog/Changelog.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index deabf58db0..917d2c1f78 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -3930,14 +3930,6 @@
   id: 9059
   time: '2025-10-08T23:45:56.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40786
-- author: SlamBamActionman
-  changes:
-  - message: Nocturine now slows the target down, with a longer duration and shorter
-      delay before activating.
-    type: Tweak
-  id: 9060
-  time: '2025-10-09T13:32:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40797
 - author: Princess-Cheeseballs
   changes:
   - message: Dying while asleep shouldn't permanently blind you anymore.

From 36b59bddc4108a00978aa7cd719330a8ddf59493 Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 12 Oct 2025 21:46:54 +0200
Subject: [PATCH 211/216] Add experimental to noc changelog

---
 Resources/Changelog/Changelog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6b64a31d64..903930e634 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -3754,7 +3754,7 @@
   url: https://github.com/space-wizards/space-station-14/pull/40786
 - author: SlamBamActionman
   changes:
-  - message: Nocturine now slows the target down, with a longer duration and shorter
+  - message: EXPERIMENTAL Nocturine now slows the target down, with a longer duration and shorter
       delay before activating.
     type: Tweak
   id: 9060

From dd278ab81551095c2a07aec9e298c897e98dd724 Mon Sep 17 00:00:00 2001
From: Ps3Moira <113228053+ps3moira@users.noreply.github.com>
Date: Sun, 12 Oct 2025 12:49:11 -0700
Subject: [PATCH 212/216] Resprite Maint Hatch + New Syndicate Hatch (#38076)

* Resprite + New Syndicate Hatch

* Add trailing line

* Update airlocks.yml

* Update base_structureairlocks.yml

* Remove Wall IconSmooth for material doors and shutters

* revert iconsmoothing removing lol

* Update shutters.yml

* Update shutters.yml

* Revert Regular Hatch
---
 .../Structures/Doors/Airlocks/access.yml      |  13 +-
 .../Structures/Doors/Airlocks/airlocks.yml    |   9 +
 .../Standard/hatch.rsi/bolted_unlit.png       | Bin 324 -> 105 bytes
 .../Standard/hatch.rsi/closed_unlit.png       | Bin 339 -> 106 bytes
 .../Airlocks/Standard/hatch.rsi/closing.png   | Bin 2938 -> 2575 bytes
 .../Standard/hatch.rsi/closing_unlit.png      | Bin 1163 -> 193 bytes
 .../Standard/hatch.rsi/deny_unlit.png         | Bin 925 -> 250 bytes
 .../Standard/hatch.rsi/emergency_unlit.png    | Bin 340 -> 110 bytes
 .../Airlocks/Standard/hatch.rsi/meta.json     | 390 +++++++++---------
 .../Airlocks/Standard/hatch.rsi/open.png      | Bin 586 -> 313 bytes
 .../Airlocks/Standard/hatch.rsi/opening.png   | Bin 3052 -> 2513 bytes
 .../Standard/hatch.rsi/opening_unlit.png      | Bin 1162 -> 197 bytes
 .../Standard/hatch_maint.rsi/assembly.png     | Bin 752 -> 895 bytes
 .../Standard/hatch_maint.rsi/bolted_unlit.png | Bin 324 -> 105 bytes
 .../Standard/hatch_maint.rsi/closed.png       | Bin 775 -> 1011 bytes
 .../Standard/hatch_maint.rsi/closed_unlit.png | Bin 339 -> 106 bytes
 .../Standard/hatch_maint.rsi/closing.png      | Bin 1643 -> 2738 bytes
 .../hatch_maint.rsi/closing_unlit.png         | Bin 1163 -> 193 bytes
 .../Standard/hatch_maint.rsi/deny_unlit.png   | Bin 925 -> 250 bytes
 .../hatch_maint.rsi/emergency_unlit.png       | Bin 340 -> 110 bytes
 .../Standard/hatch_maint.rsi/meta.json        | 390 +++++++++---------
 .../Standard/hatch_maint.rsi/open.png         | Bin 593 -> 562 bytes
 .../Standard/hatch_maint.rsi/opening.png      | Bin 1639 -> 2686 bytes
 .../hatch_maint.rsi/opening_unlit.png         | Bin 1162 -> 197 bytes
 .../Standard/hatch_maint.rsi/panel_open.png   | Bin 514 -> 184 bytes
 .../Standard/hatch_syndicate.rsi/assembly.png | Bin 0 -> 871 bytes
 .../hatch_syndicate.rsi/bolted_unlit.png      | Bin 0 -> 105 bytes
 .../Standard/hatch_syndicate.rsi/closed.png   | Bin 0 -> 400 bytes
 .../hatch_syndicate.rsi/closed_unlit.png      | Bin 0 -> 106 bytes
 .../Standard/hatch_syndicate.rsi/closing.png  | Bin 0 -> 2613 bytes
 .../hatch_syndicate.rsi/closing_unlit.png     | Bin 0 -> 193 bytes
 .../hatch_syndicate.rsi/deny_unlit.png        | Bin 0 -> 250 bytes
 .../hatch_syndicate.rsi/emergency_unlit.png   | Bin 0 -> 110 bytes
 .../Standard/hatch_syndicate.rsi/meta.json    | 198 +++++++++
 .../Standard/hatch_syndicate.rsi/open.png     | Bin 0 -> 528 bytes
 .../Standard/hatch_syndicate.rsi/opening.png  | Bin 0 -> 2547 bytes
 .../hatch_syndicate.rsi/opening_unlit.png     | Bin 0 -> 197 bytes
 .../hatch_syndicate.rsi/panel_closing.png     | Bin 0 -> 451 bytes
 .../hatch_syndicate.rsi/panel_open.png        | Bin 0 -> 184 bytes
 .../hatch_syndicate.rsi/panel_opening.png     | Bin 0 -> 432 bytes
 .../Standard/hatch_syndicate.rsi/sparks.png   | Bin 0 -> 697 bytes
 .../hatch_syndicate.rsi/sparks_broken.png     | Bin 0 -> 315 bytes
 .../hatch_syndicate.rsi/sparks_damaged.png    | Bin 0 -> 184 bytes
 .../hatch_syndicate.rsi/sparks_open.png       | Bin 0 -> 281 bytes
 .../Standard/hatch_syndicate.rsi/welded.png   | Bin 0 -> 341 bytes
 45 files changed, 608 insertions(+), 392 deletions(-)
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/assembly.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/bolted_unlit.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed_unlit.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing_unlit.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/deny_unlit.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/emergency_unlit.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/open.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening_unlit.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_closing.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_open.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_opening.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_broken.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_damaged.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_open.png
 create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/welded.png

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 879018d038..3da6805db2 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -1286,10 +1286,19 @@
 #Airtight hatch
 
 - type: entity
-  parent: AirlockHatch
-  id: AirlockHatchSyndicate
+  parent: AirlockHatchSyndicate
+  id: AirlockHatchSyndicateLocked
   suffix: Syndicate, Locked
   components:
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsSyndicateAgent ]
+
+- type: entity
+  parent: AirlockHatchMaintenance
+  id: AirlockHatchMaintenanceLocked
+  suffix: Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMaintenance ]
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
index 76d98f96d2..52747a3f27 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -180,6 +180,15 @@
   - type: Paintable
     group: null
 
+- type: entity
+  parent: Airlock
+  id: AirlockHatchSyndicate
+  name: airtight hatch
+  suffix: Syndicate
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi
+
 # Glass
 - type: entity
   parent: AirlockGlass
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png
index 57f172d54fe8403a0e397a59d128e37d7f10d53a..b65261aea9709cf43c27ba1f88b1d1bfeb85e924 100644
GIT binary patch
delta 75
zcmX@YlsQ4gm9aR;-HBn{IhmIX3=GPiE{-7)t#8j7@-i@RFmL#|{S2eov<p%hml7uZ
fEns3`a9GZKRg3wnM}<)eP&tFAtDnm{r-UW|+9?^u

delta 296
zcmV+@0oVR%!~&2ce+h6%S#tmY4#WTe4#WYKD-Ig~008z$L_t(|ob8i64#F@Dg&&f|
z3A!P5Vd*Wpa1X8q_h9KQvanQQ;{+_whK9P-O_QR~#ZQW4<;U-fEz|R`JK?cEVtYLU
zFwLsF)#{F3Jhs|gZg#K9kzuS%i1Th0&Xa6VRX|xfh#F~Ce{fH-roFjAdKvCXpN+o!
zsrB~gJPE^|1A+YyQ2QqPird^d_jCaN)WDB~3rl_*BA0hCF%)1Zp1Tor@x&<dHi-G8
z3e1{EN`mkLq-X)p8Qp@Bc=`F>L>qiCvn@!jXaMQ={4B5v@c=$!>0T&^7a-Jh?yV1o
uelb}BGXlWMB2oYaPyhu`00mHh)d60fV`$m*fbTc}0000<MNUMnLSTY9Plf*g

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png
index fdf7952dd871fb4979d05e775229ece70449e714..116926929f4840945a9685c49cfbd3418b430e24 100644
GIT binary patch
delta 63
zcmcc2lr_Q7QpMB7F(jh(?O8`&1_ln61+V9y3fi}|ZFWGzlcsfN+JzYy81kZYnprbV
S<`o0k3=E#GelF{r5}E)5Oct>K

delta 298
zcmV+_0oDF$(*lq&e*|YiO+f$vv5yP<VFdsH010qNS#tmY4#NNd4#NS*Z>VGd008Jo
zL_t(oN9~ib5yCJGMHLo+f|{CXU<6hpBS6U{)YKF(0r)FcaB{Na_+l!(JDrUZ^uMLJ
z`CQg#B09NfUEEzfe1NB4LAYm{<C}A?#+DO9!kp}PKK3qHe{;o~!^<t4z=PU!;$9O5
zTDorVLpo3!X!M#e&?SEDuMISMO&CDp=2wt4{|vPMhZ?LY2EwS#Ko17Sz-`Hir%>zS
z8cu!rsu{V0LgXrfSf0^35VAxkk~LBzSVCNg*2D;sEz%gbUnr?HHG=BQHV`{KNIi>@
wJ%YK#v+Jf_BrG|RM#;Bf7=~dOhVdtezR$>4DS5Xd!vFvP07*qoM6N<$g6cYfg8%>k

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing.png
index 3f88010d627ae7ab4d5ed648ec53fe75500d1daa..d4d288e299f25d8251afa00f76a933a43813f283 100644
GIT binary patch
delta 2553
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
P00000NkvXXu0mjfb|CD@

literal 2938
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

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png
index a2f351482b5147599893d422d32e7422d8dbd24c..f74a94b60a5a896e245d74d1ddae82535fa9681b 100644
GIT binary patch
delta 152
zcmeC?Jjgh~u)f;U#WAE}&f8mxd<_mfEDi@ga{l{o&BDaVceXRxJMS5D?xiJZ<+C&%
zM67>t=Hhc^1_<blV|jmCyqYK5U!S3Wk?owqxC!M93;}+-<n4deK$QIGKelAGzp<X=
x_N9yW9b=1|&#aQ&@RI9M*|~?jKotu%NbibP7c5=<{Q7l}22WQ%mvv4FO#tCdJ1+nL

delta 1129
zcmV-v1eW{30gDNcF@FSSK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#000Ca
zNkl<ZcwX(Bv2xom42I>5J&*00*=yg#dxkzhr@l<?y0t@h&v}Wio-=p!bxrj%f)1id
z3Zww?D(So9k&+qw6hJ~&OdZZ|pMP9#*DvSe>1Wq<*S@?C1%Lb*YQWo$%i*^>*W38$
zPE6tFsQoyU6VvRrtp9+<+wrd(1U^77W1Ki?Ze9NYQ8?T_bZiD#bLE;_*MFcBsQW@o
z&k|^G%}whg066h7)PU+_{u2=Td#*v6ybY+{ggym;7i)YyzgQE}<i(na9s=NlXq7~K
z4yoNu>EmnY+<%=vI2ig0Mnt}ff!KK|tJV*#08UUmlO;A*ub)am8sbEb&78hca%|@G
zl@hgy6qLP0{pClL*eYR7`g190$C&H@#G(&UpJ}l+eQ^rPHLjfw)~cTjKuJVHlse;o
z))xn0sCSgeozQy#6p_q&KM0!$0C$X5TJs4wpC3;&`F|Kz9e~_)umn#lq&w<uA^;`n
zpp=O7`8m?L3qth=F$|W<a7vwkZ5&e>F&qQg#qYl$s#7fhA*Wjgf#GXdYI56;m)rFh
z>i0v(opzM~RC2V#)1o$NDuDOV2DY8^hacW42tiHr00f+mV=6Tuo!NAt&2#sCXvL|0
z5AZME(tjD;wkRDaft%~=`FMKzdi#c*4^KEA&fj4g0AV_?1RCOWpa6HW3j*r*L&seZ
zTCD(@iNRT6fg~L$Lf1vkk6vf30Pq<{>ENpUFcbjxqv=3P-?Kw))KtLOhxf0!0>*UE
zJK|F%=M#77px4JnEGztLi(YH(6ogq=!}%Q28h_J)h4TZ~gkvfre!rRlfbfg8^F902
zM(v7)^NG1@3w>_-zaak^z}opl<k<uImT6}KA4BT8_xA&OTI%ob2Q=2--w$Z4kDGAQ
z{qbIVbNUDXPHc96zSjm+SJ9^c@M4Xx=ND^2n!H#u(F;8XAX+66pF?VQQ~LY+0rQyZ
z&wo7$2gNg4Vq^9CsT8CkPUP6k=_@72W=>xzQJeew0R?F4&!wOpW3mGfi#|wwrbP{n
z6d`@g{L<B@_I`l%@=xhoYlE2nQf-y@1FRe%(YJJd!KCBIBHu0kJs@Wg(tt{7sSP}R
ze=J~DQ~M^Ia)>omwIj|)O$G2iK^6rdcYhFp8Cy(C?FeKaKezyqp4AG-8iW$9w7E`l
z2OiR(U$g=s9)tlcwFziA?ctX$@eVxA6;M0~1zKuP$lZaboq`;dw*gLQq>XPo;tjbR
z%>Wb+LV?!W#N7_Op5z#`0<dTh3u&p%Asx~d>1wB-qCqH8RU6-6h9;mkYARst<6`w6
zSrh=RL6p!^JA!Xtq-V7P2<waHRM!p!6~|OYQo&c*8!CCqw3>k}wTaXi=Csu|=Pnt<
vQd(+r_&B7x>bs*$2BAeu?VX*Se7f!*0Gio$g{V1q00000NkvXXu0mjf`ZgA4

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png
index ba26f190cb16705c846d33568e6f6898b8e77769..f4851a0ea0dd0d8e5f1d981157ba3ce9151cf5d7 100644
GIT binary patch
delta 209
zcmV;?051QX2l@e!F@Lm4L_t(|obB6D3WG2V0MKUlzv~V#q5B%h5Uit;Y2G`4F-=-Q
z($>iLYOQC+tR5c#0002EqTXx&<U5*woE<!3YKXtLUW1X`A7{P{`=%A3`qA^N({{iT
z(W@OlYfHpXM@}igR`)+=Jov&!^PkqD-$kg}{hxJ6&A<Bhph|lF00026BYQr+dVBx?
z004mFt~L~PyZOPR^ZD7_4@jl}$!=SK(fRyrw=F>R`w0L5000}_6Td`$ke9?s00000
LNkvXXu0mjfMnGi&

delta 889
zcmV-<1BU$i0i6esF@FSSK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#0009r
zNkl<ZcwX(BJ96AG42HQ|_yp-P<Hk*H;U>3mkz2Wrixj>>CXH|5#*Jsv<pgdL|B~Qf
zIi&aypa;lrhC?k^%bx&5ELU2d{(k-Z-M!s>b5}19&bjCJ@_#xN@Mo$4KOQ*!`aQJ0
z_wi|HxP-US@%2=`FiqF8{&_ffdKw3TH}o0BNwabN^AP#lTgR>dZJsYQ8`nR7G>qaj
z^)!J7*KArJ0YJmgsRmTf=D!R=pXVB+$&UfmP3Thqc+tk!^NThiO<uIQ&_e)x5UrYs
zr^xNMDSa$MQ-9z5!NJfHjEF47K&(9%)B2$qzzK>MvZN35`g18rLYye+v*g@dO8P80
zH<xIiNI}I@)SrGtO<y%w(odzJjxxmoh(&)b=JeMXo3uuD3Q7rUPybTGrN^UX|7-wq
zjSlp|Usqo-Qde8Gb5^kbG}Vjn1`skfItVEzZ^;t-7k_^VN5oN60sI_OEVW-_6+~iq
z@BpIXMk%siG5}oY+P&TU80!CgypOa)WooiOmHpB)03xIK_{4_>!3SrVV*52x(8&G$
zbkHc7_Dcr<Ddp8&z1+FSM?7-78(uG1iXMz&`y~UwMaDsl;)L}eRN1eQf=GzOtvlYQ
z$o|!Th<_Pd`3x+vUvmZ!<{X}&$bOL-0KBUph{da)sI^}#0AOwqmYq-3*e@CYf)Atx
z$NRKyf2Y$q41Iq9*igUk57=10?+@5mAHRe*{eQf7+?+lFfQDxOpYI(5s#npc0Pv!X
zujdzSLYlm2bD<Zy8HZ@qL_9@qzfI}){Q+rI^?y^hql4mwEa}6%{#*)@5GP9dEIBuq
zl0Hk$%_Z7r-ycwcq<$&|b(AR%KrH%T?ma2i(3nHoezE-lKGNwRrLUcSwCoqzACRKf
zIl20Q{`u=_8`iL2<&ostcm{@yjXF}w$+aB*OE}_u)KmaJXIEHU1(CDy-~;T|`M^>D
zxN@Tpvp>Pw41kjlwLigP3K}`c{se0QKuS5({sc<_;7&fw{sfCDh#XDM-|f{8n)@NP
zhm{Y<@(dvQ3|ND?`z^%Yu6|%90ATi}*AATzOa*}8f!M3#JDpBvbDaAJbDi81@om6V
P00000NkvXXu0mjf<BhHx

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png
index 6a122fbcfd02a8c3420543f52be2cbcde5bc5779..ea36a649ace2f70a6f379ee2d75743ef2ea75099 100644
GIT binary patch
delta 80
zcmcb@ls7@ei?KM!-HBn{IhmIX3=A5cE{-7?jc?C7@-i@Ruq=2z|5VVvt!=Xd8lE(*
gJJT)<R00BdQF(h<Gpk?E{|n-Iy85}Sb4q9e0FK-o(f|Me

delta 312
zcmd11!Zbmpp0mIsvY3H^?+6GpPSxg<W?*1s^K@|xshIP2vMt{s1D@92C$eql=2lBt
zFoicOU$|WI?hJ!^gUPCu-giwjxnl24)`|T2@pqE;pIvYDT}sLdOE2!o`2C_}xuezh
zTXW~toxQ4&vFgx?({@@PQ|8OayL@$2h&r{}t9p~U>>26$Q|sNTKcy#T)aP}!e@~G*
zA0y9k&fe+n+(+8)v!>q)X85;qqP#TwwLNBTLFHePEe>6{GhJWf=b7*;$p)_@Wg|@d
zr?3jLoG@gHHLhe4e);Y7)|rMa31aROVox$$d;K*oMf?(@)3IwiBPJ*~ta*9qt^m*f
qq)lvTOb*iA3?N_xCb1GZd>`04ETVPZtlV1;QsC+8=d#Wzp$P!hM0`2`

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json
index 394df8c221..09b1c5c0b5 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json
@@ -1,198 +1,198 @@
 {
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Paradise Station 13 at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d. assembly, closed, closing, open, opening, panel_open modified by K-Dynamic (github).",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise Station 13 at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d. assembly, closed, closing, open, opening, panel_open modified by K-Dynamic (github).",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
     },
-    "states": [
-        {
-            "name": "assembly"
-        },
-        {
-            "name": "bolted_unlit"
-        },
-        {
-            "name": "closed"
-        },
-        {
-            "name": "closed_unlit"
-        },
-        {
-            "name": "closing",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "closing_unlit",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "deny_unlit",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "open",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "opening",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "opening_unlit",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "panel_closing",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "panel_open",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "panel_opening",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "sparks",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "sparks_broken",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "sparks_damaged",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    1.7
-                ]
-            ]
-        },
-        {
-            "name": "sparks_open",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "welded"
-        },
-        {
-            "name": "emergency_unlit",
-            "delays": [
-                [
-                    0.4,
-                    0.4
-                ]
-            ]
-        }
-    ]
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_broken",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_damaged",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.7
+        ]
+      ]
+    },
+    {
+      "name": "sparks_open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
 }
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open.png
index 9e38a33a3d9e2cf9896cfd159459a38fdef054d5..0228b8af4cca67aa457f030c36d9bf2eaff2fc6c 100644
GIT binary patch
delta 187
zcmV;s07U=F1i1o`F_A%7f161}K~y-6?UPXs!Y~X&?PYD6GT8lZi;_*61cnPhKAYDj
zmHYsJTnzhbVIh&VwoY>a7<*d*w9cV{U~d3BXQ&BgG1&=n&QK4y#hkgu7$GOPSwz&D
z?rKDqd0hqG`xo`0buoY7r+}|%Il^m@ROKzJLaRdQF*39jdo9jwF}steI0}gEk>aF!
p+N{`0y+d9Fj8ooRLw=&p@dV9dG3CY;`(ywB002ovPDHLkV1lVfRO$c#

delta 460
zcmdnVbc$tyAumh1qpu?a!^VE@KZ&dp^`h%J3p^r=85sBufiR<}hF1dv1A|0~YeY$K
zep*R+Vo@qXKw@TIiJqTph=Qq}p`L|w=BpJzHQQ1nJkvZqwHP>n999M?Mpgz!Aj=Dg
zrJ?K~AX|fx87$5OWE(OvF$e(ZC?L*kX90=VGh_idAn>V-k>Le1f=08I0Vp+roq+|Y
z(!j{rfN=rDSdf*h3&2J(OaZb%fC*?Y6If-Cr3H`$)n#a40FphECsyMX{6YrET<Gai
z?-*j?|8{bq&>;g3mxWstkF5B<f342T>9Kno-npv_$2FdL<K<OqT)EHNEHot5e%37E
z16yRPnIhlIbf|2qzbu&36xpNmj47EV`vE7<nv2yJIOpjqW%-tyF&V9o|GY&{pQ%L7
z{uRH@U#<^Vb$`r~T%a9V*L-TrnJIFz%XDvleqeIvnQiX=ro#<0_*vL5K0etMc`^E7
ks)POEZqpaa1^S<u&L$f^_1S3zj2;FCPgg&ebxsLQ0HWf6=l}o!

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening.png
index f5ffa5ca8d8a3769123c5da1f27c25857c4f9524..1181882743b4272087a807015357829b64563996 100644
GIT binary patch
delta 2491
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
FV1hk`#mxW!

literal 3052
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

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png
index 051f78f757d23fb2a2f8326c572427004c038296..05add9c5dc5c58f6126e5dca3c6ac04a02ecddf5 100644
GIT binary patch
delta 156
zcmeC;Jjyu1u)f~Y#WAE}&fD9Dd<_O13<q94Q~&e-y^M@Z>Dwe8&Sets<rq{{b*5a?
zNQghT(DMI0c?J+@(BJrybLM5`yqAK>S|$z)+WxRd^lRFt9eKf)vDS?jq@>*KfB*mL
zIuH{GI5t<*O{rJBT&&3yDk9tdzHfn7k2Ax9a#2RtXX>T?arr7BRi3VXF6*2UngE+V
BITHW?

delta 1128
zcmV-u1eg280g4HbF@FSSK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#000CZ
zNkl<ZcwX(Bv2vU+5QaII8J9`x+HKy%y^B0Rs=SP6(j`TD*M5n#SG#t3lh)yv`I$u)
zAc<WG1K*5Bg5&hBc2_#?IGyfZzy5l>oWI>&-~Miz=G>O&u77}+t_HI0cs%`e=h{9#
zyAwm?Iks=Qaw{~OJ?meg@p}Ew8G#pYl`&47ntRv3LKIGyPmRa`YtB-0@A_9ffx0c6
zdX_*#YVKMe0l<l;t_G|p*S`ot@0S|Xlx@Iz7y1l<EY|pXez7K`DT_4&Jp{l9(aMSV
z9I^fGN*}kObAO-wL1TCeMn-PMz}Wd%Hmx6;0g|A2B1`(%y#CY@q#;gH`b@btmXtnI
zu8n21Pb@*nQ`Db+B&V+&wxmC|1RWTY9Dq>t5&7ELSBfe99NVIoAkAr)!_?qP*f8hZ
zTpK0>kRd9Mle57mCZjB!AEOVJ*l_CVEIi?m5win`9e-qqlmu9!GsRLHvOk1JoR69X
z$ZM?ewMuG}WE(W^f+&Uu4#3m_sR<Cs)WvAnpb-Gs>CNNi{0H^hp`(8tQ_wHnOBzt8
zNCJ$IY=hPefRJ;3_oRnGDB%RDF_{2{WZR&*1UVj>pIxgc7+|dgAXzqO1prIQ^WF9B
z{rAfcJb!At$8mSQD3uamK#C0-0gz61K|uX>=qM3{H6%cm4Vp_3h3NcJgO@rr6M!Vy
zkR1T;4u);iETF$e`Hm+9`!AgUl4Kh!W&kmDz#0-j!-hox2y{r{!Fh|p2MF0xnq(Um
z{T4)~zGYfFKjs_mnr%=C0Fj0i%6do51R%LKsDB2aHnkE!vIZLt4n7XY{(zR6`p5o&
z%KFFtfXe##B3AYP@m_m(`Un6{?DqfpUK_A3qR#-xVvVoo7i&VAvRE_F3;h;^XyrtF
zj@W*8rGM-Xn8#Fq?$^+ucp^*s*u4JK5~LwcQu<7}HkOn=Q?89=w9jLIKn9xnb4$>H
zF@MPc7>hobdQFS1=`Y?NFoyPWuvPs<`va!XaKI9MNv<s=^wpn;Sp{^fm^~97;|RhK
zwEzU1FOLUKFC7GF+u9PqDgdFG&=0(n6F$Ons1kq?=gV^(Y_T9rIiIW{2v%RjICwn&
z1hdZ2B;b4;v-HFSNgHUg;8;5VazM3qtAF_Tnl)_b9p4=~aBMLHAX06&iZ@8MQL_Mf
zjXA#KC8oaxtzoxH3kSc-<<KGk_+YEOTLs90uXZ`q4uEuWt=%dT40zScq16&ZN7MPG
z9siD%E{88F0r2jp*+$I*`fCc_e?w<<IV@-g9S^u1o}q6&14yZXN~Gqy<**$*{$Yq!
z5(L3HzqREHgRd5VKsMo+rKe!l5$g5JVFl;+Naq9988GME63+KD*hcM2Mdw5R$@hW!
u^8h0607^JsGIH+?JBm8rx8uDZn&v+mwA<oScj0sZ0000<MNUMnLSTaGx)con

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/assembly.png
index 9e8954bfee9459faf822c81bc3110820c7ba80be..953f60ef69bd021a749b7dbc69f38338b5963418 100644
GIT binary patch
delta 883
zcmV-(1C0Fe1^)(+8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00TKmL_t(oh3%KWixX)W
z$3Iyj11~YVL>Mm7L9@zQ#36W@?sdvV%Uf8E0l~t?)=mVmwYBqKNFjK|6$`m54tI-#
zM8S|Ei!wztITp6K+}sOc!C1`BWM-0VChA&<Ul`tb-XG8NoqzZJz7Nl248s_cfDnSa
zzm`IKXBSM<#Pd8FjRw75FOytj7{*vii4cNZE=RlFj*a*GeUwtkWvl?`x=yuP#kOq<
zg#uDa%=M%20njuJ0LO8dMY`APW%l;=VnNE~a`;FoDHICWwoSEKMc4HSfnu>pKA)%4
z>G0(K*(sJ$jDJR>6UR?NtyZJc>5$LoDHe+p0%?PP4uTyC+9-*Tz-a{sxO4M8;Oh!t
z+ujdJ0IUchsMTtx5<I}Ry&r4A-w7cEE2UCt-ntmR<m{in++f?@=lRQxSbwQh@{izK
zAQ?Q+L}~)TH4NI%LG+3Sn#eBeAWb5Ql8k=25MpX4vVQ=s>(V}dChSbw;A<dA9`g`n
z!Kj}_$eN}}<>DKzUHCWb?0&e;jccz%du?r%xBqAhg{YK5DTS`<Se6yekM2m)NA}?0
zfEO>`C0sRVG$xjmSApJ%!H-jMEJZtx!)P>`NnF!3>h(Gq!!X9P&NPZ>?q4)_-nx0D
z)B5^>?|&B=__|_QMzDrqjI)MejJLM7xOM$iII#2j=a_x(F*7TmSq?WhHvvB<B(G%>
zQcAKy2r3ufuqytK4My!p_b>BzXC0*!LI@hsB#}TcN7r=%GV_qj<@{7!|2@O48*AY}
zyWQse>crmJ1<N`Y23Q2wb+Iff)~9J2&1Q3IZhsd1;?Z266bs!C8!>xl_srD7c@RQi
zSr&(fhy3<SoePhy@Sxk}&)c`d$~sDPse0h}T<4y@<2W(rAG`khUq?r{t{V%!bUly;
z$(&z!_7k4x@yDf0vHn0OutYtuOi9*kHnA)V(=@}rKm+A+IW{*nfn_Qo(=?}od7c;A
z!ED#}`+ZiFQnXsF)Xu*aTCEmJDPIGXN`;3{|NExFE0qdxEW+V%cxoh)c_Rou91bT0
z27|#u5@|#@ODDm3CxZ_L0|37wnzd-&@A;x!Af-gt_0+%Tp8!Q^h{YYMBOL$$002ov
JPDHLkV1kaUst^DG

literal 752
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCik_0(?STWo2dc_4VcC<T`5|fgmq0FDWT0A|k@r*x1L%CnO|f+kBhS($bl|
z4o6oS3T@)j)6-kZ&Mwf+mBz%Rq@)BiMrUmW&{PJok|4j}|JVQn<D~;nfGRi(JR*x3
z82Ao=Fk{xWPEMepM2TxeNpOBzNqJ&XDnmeGW?qS&pKFMMsh**pg>>et6+kuHQX@Rm
zJUz7-IDi~h1}R2X21X#u3y7tmY>@9Y7@5K1OhC3FBNKxFkd6Z4%yt&AcovWi0{hDt
z8D0Pb2}Yw?$^ev_z|Oz|RB2#jY{0kxVk*c+)&&rgrU2O>zyvgx39K^6(gMhW>M}Gi
z0Ll7fEcz*Xj_WBf8uUF~978Pp_fCF2>5u_OYbWmlw$-n%eXqZ2`y^>{-m&@f{N_sR
z3#wvbX)TDFrn>3EX;&?og~1$hOFuuAQduhEyGBrkmFxOxNrp!&nQWN+6zm@vI}|o@
zXfPb)oG?MLbNa)Bk`HDpx$M(nkT?3F`jPp;`U`Rr_QDNvMl-hUi1_Kl;ZP#JdGcG{
zL(lxg1n*xf6}@9#J$*sWnY14VooD@R3%RWwW68mFdJku*w?^=V)%WMT(so$;EFdxV
z=cI>=?pwPSSpIL`B5^cN#A*ps#;I2(=kmAT`Vhmq=y%8;Ils+}Nk#R4o|s&|d}QbG
z=Z~-Zm%M3bGib=Y&G6zzpmjj@35V-jtQ-1PecJh(Wx?Cs2Y>Sacu=y~oMFalqpIH@
t_H`d&dCF5-v6n~d@qLahd#gKY7ujzU(Uf)-Jy{3}Mo(8imvv4FO#m+5{8#`0

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png
index 57f172d54fe8403a0e397a59d128e37d7f10d53a..b65261aea9709cf43c27ba1f88b1d1bfeb85e924 100644
GIT binary patch
delta 75
zcmX@YlsQ4gm9aR;-HBn{IhmIX3=GPiE{-7)t#8j7@-i@RFmL#|{S2eov<p%hml7uZ
fEns3`a9GZKRg3wnM}<)eP&tFAtDnm{r-UW|+9?^u

delta 296
zcmV+@0oVR%!~&2ce+h6%S#tmY4#WTe4#WYKD-Ig~008z$L_t(|ob8i64#F@Dg&&f|
z3A!P5Vd*Wpa1X8q_h9KQvanQQ;{+_whK9P-O_QR~#ZQW4<;U-fEz|R`JK?cEVtYLU
zFwLsF)#{F3Jhs|gZg#K9kzuS%i1Th0&Xa6VRX|xfh#F~Ce{fH-roFjAdKvCXpN+o!
zsrB~gJPE^|1A+YyQ2QqPird^d_jCaN)WDB~3rl_*BA0hCF%)1Zp1Tor@x&<dHi-G8
z3e1{EN`mkLq-X)p8Qp@Bc=`F>L>qiCvn@!jXaMQ={4B5v@c=$!>0T&^7a-Jh?yV1o
uelb}BGXlWMB2oYaPyhu`00mHh)d60fV`$m*fbTc}0000<MNUMnLSTY9Plf*g

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed.png
index bbcd9f09adc2ddb5ae376f977352f9cacbb6cc1b..3a55b68a2faecc49346d2ff8a4aad8be463028af 100644
GIT binary patch
delta 1000
zcmV<E0~h><2J;7y8Gix*008_L?V|ty00DDSM?wIu&K&6g00XT_L_t(YiM3Y0Ya2-v
zep*W`jMm=e0^@9Kb6F+WD61(FHl&bTq%cX5;))atforc#cTKqV{)FqVQjy|{13NfZ
z9QG1SL;{(tjY7y06Qi(TVsFL+!f?Lg`NrdsEX$C42=QiT=70O%uX!`2xw$#egb)H}
zi<ENo0$igH%K$(r^?iS8YAQ|BUms86#P82$f4uie>Bzmhy4q|u5kfI3L_&y^a%*cV
z48x)*dc9tr=Vbs;==FLX;1dA2<bYD@k}mGNd;9Z7T0<b^gyT3ks}vywA*5cfr)e67
zApjf`D0JNEl7EBsw;tzw#`SRL$~rLS=#D#%!#OvC!x$UnumE5Xoz)J5AYipa`~iS%
z+W-*9agrn|Cc$apoTE320{|=>Ao`u~1EQamz<$4f))ev?9E1={_qzROX$1OEQHdGk
zK(Q1$=R6343!wu5RvHH2;o>`;13y}$_m3lpi~mY&+kZy4EI99Qp^S+B)3y1Bi|?MU
z%@3XZ1|A@X(v6dB4SpIbSf=<tRP^(#E9LRclu}}=AcQC;Wji56_oLtMBV}3V%(9Hn
zR0eh2Kq<w=stU6#JJ+nT@{TbUe*dO1yN?syotv%3Yt%i@egE0UJWDC1l$6paitvl_
zMlS>*1b-@}g@pyxAd@5+YDKfzM8#MT$MIlw*|yzox7Dzu-v@CV-@Wky^_ADR?%#Zc
z`cJ=n)FGCZme7^a1`$G%Bq<X@&;v^8^~*0^a-h~J{mJ8N*sk$PK!s9@OoQS$ju7G`
z$%xK5=e%^kb=;zjb{$2RK&!<p%c3aK!_w(=bbk)U7%HdAGzbD#J3jH<oq46NtXK49
zgpeqTc6WFG_@O=f<oeIu?q81{;boxcZQIWC94>T{G3ap|E0lk_004g<9%fml(1)Dl
z3yEGf-~D!32=V;tRow`qvyFR_jdJXCI#Cp<Kw}P!Zhx^>VRRwJn2sofKwUTgq+S0X
zqJKQLlnIQnaeB+Sl4Y4*Q70Y<A>s!|{6po8jl;#L83P>vEPRXMx{b8fYU~Z=P%azE
z(1Wg{E7%Fwb)zWS+}!j$uTrU8yYh8@=4+>0?Y!BWnw-eLOyplC-fzS7^z_luk?;G<
z%ges+SF6=L&-YG?fgXn8_V#ue0E(gr!(s5hrz7mkYOArgv%lDCtf6V1=We7zw-<9}
zcxj*)MFCi*y<QIhkOS^bB1fL*`?88VRi{(WUc43bK&her_ywa~!x%4&b6@aA+W!R#
W-!mv{a3Q7u0000<MNUMnLSTY8bMi$1

literal 775
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCik_0(?STWo2dc_4VcC<hISXiHL|uN=h;|HumxH2?+@~y3#N&FK=eALuaic
z5R{gdCPzmLZQ|0?(_6~UF3`=D#>Awgq;%`<tdBs`I14-?iy0XB4uUY_j)~cCfr1hx
zt`Q}{`DrEPiAAXl0g0J;C3=3YAqu8?hI$s#nXgs=)oe?R@J#dc)MDTOa#$Ip7+Dz@
zfh;c|mWHxHe$!xN28%NR*@lcv3<5wp3Wzh?S-|31KsE^6EMsJN0Sp2djb<qWP-+4@
z0}D{4fswHR;{u4OARAd1KunqfWP<<`&|D_4${<S%APcI?(7*sB`?NN*H7RiFK42hc
zc)B=-SoqgY?k+o|z~kU3v~}ZyJJ0_Af0f6yb=zw({;ej{_jr1oTOPDzgUjSk0dk9$
z&xxIVZhCgvQhnA4)p-4MhA$fGvzNVGHmN~}#aQ5m`})*buWim>6*-XQp>D)jkT$FP
z(IT^4&oyn$egbUox9`+x*xR6BqPjC#_$iw}o#P!_4ZAmuO|zbw{bQ)%zTnZlChS0*
z*q`tE5A;+T=626hYbfFVE%C=eI@4{!UDpsptxV6gU%hr&JlMMbBKy}k6DNV}w6z~Q
z>Jl7Pc6D8N@`GPBBqv7dU$3aNz3CD6!`~k!ZLwY?XZXw8|FdYyli0h?{a+SbVY&L{
z@khxtJ}%YHsH^LbZ@>O%#iU6*4}R7#ooHk&PB?O*@&3|f@!2c;WA`w6ue?6-Hp4ts
z*T=cCw-|r8w9Q+1x5w7esPwMWob)&4;_UNxcW>TXWxIC5h2pQ%PQTVGc=k6wB_@tv
m`Ri@p0tO$}+BB0N^DgnPRg$zUnyRV|3V%;mKbLh*2~7Y2zXLe{

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png
index fdf7952dd871fb4979d05e775229ece70449e714..116926929f4840945a9685c49cfbd3418b430e24 100644
GIT binary patch
delta 63
zcmcc2lr_Q7QpMB7F(jh(?O8`&1_ln61+V9y3fi}|ZFWGzlcsfN+JzYy81kZYnprbV
S<`o0k3=E#GelF{r5}E)5Oct>K

delta 298
zcmV+_0oDF$(*lq&e*|YiO+f$vv5yP<VFdsH010qNS#tmY4#NNd4#NS*Z>VGd008Jo
zL_t(oN9~ib5yCJGMHLo+f|{CXU<6hpBS6U{)YKF(0r)FcaB{Na_+l!(JDrUZ^uMLJ
z`CQg#B09NfUEEzfe1NB4LAYm{<C}A?#+DO9!kp}PKK3qHe{;o~!^<t4z=PU!;$9O5
zTDorVLpo3!X!M#e&?SEDuMISMO&CDp=2wt4{|vPMhZ?LY2EwS#Ko17Sz-`Hir%>zS
z8cu!rsu{V0LgXrfSf0^35VAxkk~LBzSVCNg*2D;sEz%gbUnr?HHG=BQHV`{KNIi>@
wJ%YK#v+Jf_BrG|RM#;Bf7=~dOhVdtezR$>4DS5Xd!vFvP07*qoM6N<$g6cYfg8%>k

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing.png
index 11aa3300fad3bec0ddea3c77647a890d5d2d6349..8f654457325c9d337e2cfda1ce9c61e241828d70 100644
GIT binary patch
literal 2738
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

literal 1643
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

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png
index a2f351482b5147599893d422d32e7422d8dbd24c..f74a94b60a5a896e245d74d1ddae82535fa9681b 100644
GIT binary patch
delta 152
zcmeC?Jjgh~u)f;U#WAE}&f8mxd<_mfEDi@ga{l{o&BDaVceXRxJMS5D?xiJZ<+C&%
zM67>t=Hhc^1_<blV|jmCyqYK5U!S3Wk?owqxC!M93;}+-<n4deK$QIGKelAGzp<X=
x_N9yW9b=1|&#aQ&@RI9M*|~?jKotu%NbibP7c5=<{Q7l}22WQ%mvv4FO#tCdJ1+nL

delta 1129
zcmV-v1eW{30gDNcF@FSSK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#000Ca
zNkl<ZcwX(Bv2xom42I>5J&*00*=yg#dxkzhr@l<?y0t@h&v}Wio-=p!bxrj%f)1id
z3Zww?D(So9k&+qw6hJ~&OdZZ|pMP9#*DvSe>1Wq<*S@?C1%Lb*YQWo$%i*^>*W38$
zPE6tFsQoyU6VvRrtp9+<+wrd(1U^77W1Ki?Ze9NYQ8?T_bZiD#bLE;_*MFcBsQW@o
z&k|^G%}whg066h7)PU+_{u2=Td#*v6ybY+{ggym;7i)YyzgQE}<i(na9s=NlXq7~K
z4yoNu>EmnY+<%=vI2ig0Mnt}ff!KK|tJV*#08UUmlO;A*ub)am8sbEb&78hca%|@G
zl@hgy6qLP0{pClL*eYR7`g190$C&H@#G(&UpJ}l+eQ^rPHLjfw)~cTjKuJVHlse;o
z))xn0sCSgeozQy#6p_q&KM0!$0C$X5TJs4wpC3;&`F|Kz9e~_)umn#lq&w<uA^;`n
zpp=O7`8m?L3qth=F$|W<a7vwkZ5&e>F&qQg#qYl$s#7fhA*Wjgf#GXdYI56;m)rFh
z>i0v(opzM~RC2V#)1o$NDuDOV2DY8^hacW42tiHr00f+mV=6Tuo!NAt&2#sCXvL|0
z5AZME(tjD;wkRDaft%~=`FMKzdi#c*4^KEA&fj4g0AV_?1RCOWpa6HW3j*r*L&seZ
zTCD(@iNRT6fg~L$Lf1vkk6vf30Pq<{>ENpUFcbjxqv=3P-?Kw))KtLOhxf0!0>*UE
zJK|F%=M#77px4JnEGztLi(YH(6ogq=!}%Q28h_J)h4TZ~gkvfre!rRlfbfg8^F902
zM(v7)^NG1@3w>_-zaak^z}opl<k<uImT6}KA4BT8_xA&OTI%ob2Q=2--w$Z4kDGAQ
z{qbIVbNUDXPHc96zSjm+SJ9^c@M4Xx=ND^2n!H#u(F;8XAX+66pF?VQQ~LY+0rQyZ
z&wo7$2gNg4Vq^9CsT8CkPUP6k=_@72W=>xzQJeew0R?F4&!wOpW3mGfi#|wwrbP{n
z6d`@g{L<B@_I`l%@=xhoYlE2nQf-y@1FRe%(YJJd!KCBIBHu0kJs@Wg(tt{7sSP}R
ze=J~DQ~M^Ia)>omwIj|)O$G2iK^6rdcYhFp8Cy(C?FeKaKezyqp4AG-8iW$9w7E`l
z2OiR(U$g=s9)tlcwFziA?ctX$@eVxA6;M0~1zKuP$lZaboq`;dw*gLQq>XPo;tjbR
z%>Wb+LV?!W#N7_Op5z#`0<dTh3u&p%Asx~d>1wB-qCqH8RU6-6h9;mkYARst<6`w6
zSrh=RL6p!^JA!Xtq-V7P2<waHRM!p!6~|OYQo&c*8!CCqw3>k}wTaXi=Csu|=Pnt<
vQd(+r_&B7x>bs*$2BAeu?VX*Se7f!*0Gio$g{V1q00000NkvXXu0mjf`ZgA4

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png
index ba26f190cb16705c846d33568e6f6898b8e77769..f4851a0ea0dd0d8e5f1d981157ba3ce9151cf5d7 100644
GIT binary patch
delta 209
zcmV;?051QX2l@e!F@Lm4L_t(|obB6D3WG2V0MKUlzv~V#q5B%h5Uit;Y2G`4F-=-Q
z($>iLYOQC+tR5c#0002EqTXx&<U5*woE<!3YKXtLUW1X`A7{P{`=%A3`qA^N({{iT
z(W@OlYfHpXM@}igR`)+=Jov&!^PkqD-$kg}{hxJ6&A<Bhph|lF00026BYQr+dVBx?
z004mFt~L~PyZOPR^ZD7_4@jl}$!=SK(fRyrw=F>R`w0L5000}_6Td`$ke9?s00000
LNkvXXu0mjfMnGi&

delta 889
zcmV-<1BU$i0i6esF@FSSK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#0009r
zNkl<ZcwX(BJ96AG42HQ|_yp-P<Hk*H;U>3mkz2Wrixj>>CXH|5#*Jsv<pgdL|B~Qf
zIi&aypa;lrhC?k^%bx&5ELU2d{(k-Z-M!s>b5}19&bjCJ@_#xN@Mo$4KOQ*!`aQJ0
z_wi|HxP-US@%2=`FiqF8{&_ffdKw3TH}o0BNwabN^AP#lTgR>dZJsYQ8`nR7G>qaj
z^)!J7*KArJ0YJmgsRmTf=D!R=pXVB+$&UfmP3Thqc+tk!^NThiO<uIQ&_e)x5UrYs
zr^xNMDSa$MQ-9z5!NJfHjEF47K&(9%)B2$qzzK>MvZN35`g18rLYye+v*g@dO8P80
zH<xIiNI}I@)SrGtO<y%w(odzJjxxmoh(&)b=JeMXo3uuD3Q7rUPybTGrN^UX|7-wq
zjSlp|Usqo-Qde8Gb5^kbG}Vjn1`skfItVEzZ^;t-7k_^VN5oN60sI_OEVW-_6+~iq
z@BpIXMk%siG5}oY+P&TU80!CgypOa)WooiOmHpB)03xIK_{4_>!3SrVV*52x(8&G$
zbkHc7_Dcr<Ddp8&z1+FSM?7-78(uG1iXMz&`y~UwMaDsl;)L}eRN1eQf=GzOtvlYQ
z$o|!Th<_Pd`3x+vUvmZ!<{X}&$bOL-0KBUph{da)sI^}#0AOwqmYq-3*e@CYf)Atx
z$NRKyf2Y$q41Iq9*igUk57=10?+@5mAHRe*{eQf7+?+lFfQDxOpYI(5s#npc0Pv!X
zujdzSLYlm2bD<Zy8HZ@qL_9@qzfI}){Q+rI^?y^hql4mwEa}6%{#*)@5GP9dEIBuq
zl0Hk$%_Z7r-ycwcq<$&|b(AR%KrH%T?ma2i(3nHoezE-lKGNwRrLUcSwCoqzACRKf
zIl20Q{`u=_8`iL2<&ostcm{@yjXF}w$+aB*OE}_u)KmaJXIEHU1(CDy-~;T|`M^>D
zxN@Tpvp>Pw41kjlwLigP3K}`c{se0QKuS5({sc<_;7&fw{sfCDh#XDM-|f{8n)@NP
zhm{Y<@(dvQ3|ND?`z^%Yu6|%90ATi}*AATzOa*}8f!M3#JDpBvbDaAJbDi81@om6V
P00000NkvXXu0mjf<BhHx

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png
index 6a122fbcfd02a8c3420543f52be2cbcde5bc5779..ea36a649ace2f70a6f379ee2d75743ef2ea75099 100644
GIT binary patch
delta 80
zcmcb@ls7@ei?KM!-HBn{IhmIX3=A5cE{-7?jc?C7@-i@Ruq=2z|5VVvt!=Xd8lE(*
gJJT)<R00BdQF(h<Gpk?E{|n-Iy85}Sb4q9e0FK-o(f|Me

delta 312
zcmd11!Zbmpp0mIsvY3H^?+6GpPSxg<W?*1s^K@|xshIP2vMt{s1D@92C$eql=2lBt
zFoicOU$|WI?hJ!^gUPCu-giwjxnl24)`|T2@pqE;pIvYDT}sLdOE2!o`2C_}xuezh
zTXW~toxQ4&vFgx?({@@PQ|8OayL@$2h&r{}t9p~U>>26$Q|sNTKcy#T)aP}!e@~G*
zA0y9k&fe+n+(+8)v!>q)X85;qqP#TwwLNBTLFHePEe>6{GhJWf=b7*;$p)_@Wg|@d
zr?3jLoG@gHHLhe4e);Y7)|rMa31aROVox$$d;K*oMf?(@)3IwiBPJ*~ta*9qt^m*f
qq)lvTOb*iA3?N_xCb1GZd>`04ETVPZtlV1;QsC+8=d#Wzp$P!hM0`2`

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json
index 394df8c221..de3724e657 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json
@@ -1,198 +1,198 @@
 {
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Paradise Station 13 at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d. assembly, closed, closing, open, opening, panel_open modified by K-Dynamic (github).",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d. Modified by Hyenh",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
     },
-    "states": [
-        {
-            "name": "assembly"
-        },
-        {
-            "name": "bolted_unlit"
-        },
-        {
-            "name": "closed"
-        },
-        {
-            "name": "closed_unlit"
-        },
-        {
-            "name": "closing",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "closing_unlit",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "deny_unlit",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "open",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "opening",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "opening_unlit",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "panel_closing",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "panel_open",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "panel_opening",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "sparks",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "sparks_broken",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "sparks_damaged",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    1.7
-                ]
-            ]
-        },
-        {
-            "name": "sparks_open",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "welded"
-        },
-        {
-            "name": "emergency_unlit",
-            "delays": [
-                [
-                    0.4,
-                    0.4
-                ]
-            ]
-        }
-    ]
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_broken",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_damaged",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.7
+        ]
+      ]
+    },
+    {
+      "name": "sparks_open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
 }
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open.png
index 8a5b20078cfca4d502b4fc367a624445ecdb7f00..16e4017e9ce327f0bad7e9a45b17c092d7f848b2 100644
GIT binary patch
delta 548
zcmV+<0^9x31hNE>8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00HbtL_t(oh3%IytJ+W)
zhM!!7z#-&Hgg}N+=;ClD(Jh0Mx^)iy1BLq&I&`>0e?p;4$KocGF6tyULkDrW!KL6}
zAtj&`kpo$3hv-4CTxc=Sp?S71=bXGR=i|Wl8ouxEd4v#xUVpF0U@%~{S{aYm{}$i(
z_d*DiQWt9#0M~W#JP+HpiQ|}Nvw5xN1&v07#bSY!lI?a&k|d;Q$_;QP-tBe)Fio>?
z6YX}JIF7Mx8_)9qasx+k$8i8qO40B43%mXx2oOSGnkJ6pXcO8%9LKzTk&9<phU>c5
z>YgElz_Kh|AAd~%RD=+`dwm1^q*}e@+Ygg0%L+B1ltL+m>$<dBE&c!DaENjG3W6Ze
zhoUGdqy><-;j|9JP@6EG+E|qMpBO4BDJdx_Dfz!K{>2b-s#AG?|4eUs^@fW{rKric
z)9C>Dd>BQM)-me!`u@Yc0N~;KEnnm3D5VfWFdmN!AAij)%VM|N0r}i{qm<(A?JvGO
zROx><sMTsb6{D_Yxm;qJCYEI}o6S&4<+(sg$;VHd!UazeLeOfpSg+SiCKIHTz#*7y
zw_Bu?Y&N-xL!Sz}{xA%6J)6yRKGX)1B+({DqtUgR7aTLdXf!$tr*KHeX_}IzsXj2D
m&kHvZMI8}JDW=ou+4tX1ec+Hk<Z1T+0000<MNUMnLSTaDKn1D*

literal 593
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijK0(?STWo2dc_4VcC<nr?JjE#+be0)MeLXwh_A|fJ6OG_Oc9Xo3skFGSF
z+3T=vz70^5-UZi*KuVw_$S?RmDqwh^94iTw<1FxqEM{QfI|#yzJ0@no1qw=(xJHx&
z=ckpFCl;kL1SDqWmFW4ohA5co8R}U`XTDkiRI@EL!ZXd&Q;UHE$YEuWVq|4t1hTw<
zSQ^R(`BH<C87$5OWE(OvF$e(ZC?L*kX90_60ofpMvy7491u!sRG@7LhK&c7r3@kvE
z21dpPj0+&9f^1}605NF_kPQM%Ky#VEDuXO7fGnskLjwbl?9<xJ)}+9x`+&?9o-U3d
z7XEK12l5>@;BZddVtQfS?*F;zm%Jv2ZR5`Q*P--hk^m?7(kkQ1J>Ge%o}Mz%@8T<n
zeb&kF*P*0g;)B24X%)|vC#gwCT;3&~FflSW=eF%Fu{%xb-tX=TFIDRM8@Ol1g5uwS
z^$#wrXNX_E^jhtG?p;AlKME|i6qqy|Za8&!mg6^_{VMYkWqu3J5p!73WW4D5&ohrZ
o?s4R^OPufj5GH+Bea$N+|70#B;{$&~bU^O+boFyt=akR{05USO&;S4c

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening.png
index bbfed3b3a45fcb568ff764e1ac6f69a461709369..2509cf1a3be092c3783f74174851381f1994bad4 100644
GIT binary patch
literal 2686
zcmV-^3W4>BP)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*00001b5ch_0Itp)
z=>Px<I7vi7RCt{2Tu*2l*%|*yC<rEsZ4^4JortWxON=WI#+6DBV`KK9cn_x35Q^x+
z9(pPCl)x_AEun`Vy18{vExqKhhcbtNOWDJ&-4cR5lu)aJRZMVbGZby?MO&NL9S;?T
zRS(L0dh_PZ=*=I=3-J$xXGWv<`{sM!`)1~Qzvon;Q0RbzqA2_!Asok%K9`&?14U8r
z+h2SK0PxA@SMl!hm-M?&KEF!O+1S`XrBb2ovbL~XilV?Y&CvY)xSP#ps!%9&WNfI{
z>q7nv0H~^p@$qqtjErDsX9pkMy5u4aGD6pNDF--?gC|d(pja&8`1lz6`}=6MS_tAF
zRZgI)Dn^xE+SXg&{|b+GrfB<Y5ae<>dLFxN+ctDvN3B+q=9l4SueF~Ie*75#F7la~
z8311<?f^wmFf%iQot+&Ni$wsS4q*99r4oRr7*$TN^>_@8Mgvzy$7oxhZ2_9rYn$b3
zG#Z}c0HA3aY}-buRH9Ds<0sA!!!2urh(80s<$U7IK{!Cv2`qot`8{rJ>J+=ruS1)9
z%J5%6Hk*ZQ+o)EnFbo5_uG0>moSgLVHyRD!PT=`Rm3kQNPP5renWov1wSnhP1Mqde
zHg$^0$w_Ear}P5=*=!a7P_0%yxpi`K((`FF8q_$p69`!6|DgDca`!{K-R^r1v5B>z
zR4NJi2f;0}f#pvVhY;rv!vQQO*#^3!$oMoR#T^7TJ^I<e@|Q}b#JFW`D3wZ36s0=?
z2!`nZ9wdc{hHqGqhXxW<Hy59JY#`sw&(9~y9mWP-*LxjsRt^{x2q*c=BAd-hKavjG
zhP3CKA(9h>?F^aJcYpIbZZ1B>{mtuv=M928j1B2Q86oR{L4xNVM%0J3VPGRbhP>Z#
zKai&|@;3;6BaLhil3T`x3^~E?=ICdHZQF@BASxWkp>N`fqPT2fJ6=%~Paw40?O3CM
zaFbF*92+umjYz@)Y-d=Og~pW&zWe0&s;bi8vcY3nR;cTU!_Br4)rL%5BjP#$=#3Ih
z(@?zj1!k`v(eHMj&tqY>PWQ*gM)A+Dvh+UWI1U`gfvTz~m&^1x8xZ_G%eL)AxY;(M
z+CWp#Svdgc73&<w!P?rt;Kl|vHhO!yJ`JEr_f6Auon5U~(Qdbe4+`0A7KUNCc;j#b
z04YU8wIMY<J>6j|n*0Uv&~=?|i_RtFBJkwo0@#vxv)N1q@%KAdR9@%#!n7CV+%Ptz
z_>-&ED&G3;-{}5l_3z>B`G3&;pZ)6Jo(3zG3V`ltknKQHqu<@#^>s);<3+!T<HRW3
zac#&bib8Aps;c76*Zz)C<;3*^cK^<;H)uJU%n6WfRaI$c_#v0e!M1HW;-;skJM0a4
zb#>L%;obm%$4OiO1UiumfY{vZq)ZeW=siGHRWuq6G#V+qz0fN^i^|dE@?}a!U|AN*
z<+6(?o6TZ-d)s4xrfIHyGNYubDvH;>7-|5-<tB(~gXb}{TYm194@5O_9*Ux%TrT6_
z-~fO6k%6ms-oyvHyZGxn@6b9tfn{09X0voMgcyHT0gwcD92;W22biXbYPE`kg9B>7
zH!mm89-f}UvMg6|Pv+(4ECL`7cU&7{mm>Hlp8W4$gKgXR%j>VZj)$GV?*}#j2t)xO
zdgf1xo8<pEHbfc$qQ}hb?QN9HW!LZ~!%tM=PO3A60f24*Tw{(W9RNw$5UB%1H6TsX
zJkGXlo9^?(aiZ}o10bjp9L0vn_kcJEJD<wqECV2@02#%GG<%|^X_0C<val@6b3-}{
z#0`KXZE)R$ZQDk5rGv&Z|GT{m{2tMQoPSmUP_NgA!Y#6)Uauof6l=t3k9MZ8F#95~
z6W9n64M~2e@fXf=l5JqP0l@OtYPH0;Wo@X{YP}RxEEZjzaO7O1onToO8qY4!4*@A*
z7>40_A>uzG=d;47VzG!?tp;E?0l*8h2!B}as5Y?t82~swK1Q)vWTc6`PI!K_h=tir
z+R)h8C?4(D9uhK)MG!gv`1qK9Pxx!K8cL-S<=%QcCY+BT+#~>4RhlS`h@9`oe{=DY
zG`DG*oo2I{G7O_5YXi@p0f7DeeE^`HfaR_@_Q<)2R;z_0=OS&0t%b0nTr!+_L)l}z
zIG2FsCr%hd0Px~i5&wrDclDuRxMgh+@q5bAevSJf%nMEu^7Q+g*IfZ%nx;#l&bLF3
z`^m$D_+_|75_ORce*C^2@Y5ep(EY9;w>yN$WHkR9c5+%I)ZN?L3*~@`i3wU;$>nlb
zTU+Z}XBXK+3T<KemzS4Aa|YSMX9I#X(ACG!&COwPaS{1^9=fgv3UWoA_Ht^@SE#G&
zI`a8E78e&WH#g^+*yj03^e2fh{Oqh>Qkb8g7xJe8uRcBqab9AGDtKgM1mol5^mrKl
zIQZz+rM~<(ZrlJ6PWK~=rKKege;U9*FP<0bvYkNS$3KWS)*$|TK2L2m3?s4h!%BDZ
z`Mistt`8Vg<cWm3e){}jLB#))A9kHD(*48*FWn)X0K8luFzAaH33Z7+UQra^&W|Dk
zlm)v!;CH`FV`26Msw<s=a5;{HR;z_}yG^U5OG``LYUsqoME@2LFCDN#UA7Y@CMNLy
zyTNM_SQ(%!pR8O^*L7@cY@qsHH$94UKXDPH8(Lmo9$q=xPpC^?`(<T-vXE8mu^r1g
zDvA8>*Op-zJz0uuBVh!&eh}$F7iM1oke305;gV78J$Ued?kDN=Ah0~4MnF(Hh^i8<
zzW1M(Tm5B#vIr{|JWFJN=&E2IQG~jFQ5QEI1P%Ld6EbmB!91b}b=efaBI$H6tn?BV
znO3V6Nfpc^u1fe-MXFFJbdpj92mMZjZ);SZ;~eKW$2rb145WZ$Z<b+KioEJK;!L4X
z=tNx^!XJyWQsh;C6wR!zuEts!!XxZTkyjm=Bvyv-2(wbeFa0Go8<k{xgFps|w=#rB
z*p(uG_;pu7A2sdyK{g$pb;pFRh7v6d{~cK=5_Y)~o9d#by&!x0rNevo?uBkQNhCTU
z6J@2y*5hufi<|cR&@UYhD^2<FNOwS(I(nFuB1Cr-C++z`CLOX<qH)unAA-_hdT(z}
zs*x}=VPvI<ZQJy7aB$#RDYCb>hue3*4s0tZ?fF4=;hbrjxPA9)j4CG>RZei{)*Gl)
zD$sSk?-N{DkWoz1VWm>({?k69j~_OOKHhO0eE9Ky6K}uY>P?pa=fC*|TaU+Je44`L
z%a=W(;-o;9r{;1w@A`m2IKdBo`g|TqOdpbTxU#ZBKZl2h9{xZ6`7kzD5ZHA1@Zm%E
zKW-)Z_(606A4x&_e4alEjSim<$;FHK4-XHi&0*7?ANX|0Uw<0t>f`%$f=o2_TPYHx
z&mUwEgyCObUr(Hu_-=iD-NT;&y8lF)UAk|YCZ?}=1zY^e5ca!%D@BMrd~<UXJb3=w
scmD@j!I&(Fa$APKUax!385IBj0nSl<7tlCKLI3~&07*qoM6N<$g7LB+cmMzZ

literal 1639
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

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png
index 051f78f757d23fb2a2f8326c572427004c038296..05add9c5dc5c58f6126e5dca3c6ac04a02ecddf5 100644
GIT binary patch
delta 156
zcmeC;Jjyu1u)f~Y#WAE}&fD9Dd<_O13<q94Q~&e-y^M@Z>Dwe8&Sets<rq{{b*5a?
zNQghT(DMI0c?J+@(BJrybLM5`yqAK>S|$z)+WxRd^lRFt9eKf)vDS?jq@>*KfB*mL
zIuH{GI5t<*O{rJBT&&3yDk9tdzHfn7k2Ax9a#2RtXX>T?arr7BRi3VXF6*2UngE+V
BITHW?

delta 1128
zcmV-u1eg280g4HbF@FSSK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#000CZ
zNkl<ZcwX(Bv2vU+5QaII8J9`x+HKy%y^B0Rs=SP6(j`TD*M5n#SG#t3lh)yv`I$u)
zAc<WG1K*5Bg5&hBc2_#?IGyfZzy5l>oWI>&-~Miz=G>O&u77}+t_HI0cs%`e=h{9#
zyAwm?Iks=Qaw{~OJ?meg@p}Ew8G#pYl`&47ntRv3LKIGyPmRa`YtB-0@A_9ffx0c6
zdX_*#YVKMe0l<l;t_G|p*S`ot@0S|Xlx@Iz7y1l<EY|pXez7K`DT_4&Jp{l9(aMSV
z9I^fGN*}kObAO-wL1TCeMn-PMz}Wd%Hmx6;0g|A2B1`(%y#CY@q#;gH`b@btmXtnI
zu8n21Pb@*nQ`Db+B&V+&wxmC|1RWTY9Dq>t5&7ELSBfe99NVIoAkAr)!_?qP*f8hZ
zTpK0>kRd9Mle57mCZjB!AEOVJ*l_CVEIi?m5win`9e-qqlmu9!GsRLHvOk1JoR69X
z$ZM?ewMuG}WE(W^f+&Uu4#3m_sR<Cs)WvAnpb-Gs>CNNi{0H^hp`(8tQ_wHnOBzt8
zNCJ$IY=hPefRJ;3_oRnGDB%RDF_{2{WZR&*1UVj>pIxgc7+|dgAXzqO1prIQ^WF9B
z{rAfcJb!At$8mSQD3uamK#C0-0gz61K|uX>=qM3{H6%cm4Vp_3h3NcJgO@rr6M!Vy
zkR1T;4u);iETF$e`Hm+9`!AgUl4Kh!W&kmDz#0-j!-hox2y{r{!Fh|p2MF0xnq(Um
z{T4)~zGYfFKjs_mnr%=C0Fj0i%6do51R%LKsDB2aHnkE!vIZLt4n7XY{(zR6`p5o&
z%KFFtfXe##B3AYP@m_m(`Un6{?DqfpUK_A3qR#-xVvVoo7i&VAvRE_F3;h;^XyrtF
zj@W*8rGM-Xn8#Fq?$^+ucp^*s*u4JK5~LwcQu<7}HkOn=Q?89=w9jLIKn9xnb4$>H
zF@MPc7>hobdQFS1=`Y?NFoyPWuvPs<`va!XaKI9MNv<s=^wpn;Sp{^fm^~97;|RhK
zwEzU1FOLUKFC7GF+u9PqDgdFG&=0(n6F$Ons1kq?=gV^(Y_T9rIiIW{2v%RjICwn&
z1hdZ2B;b4;v-HFSNgHUg;8;5VazM3qtAF_Tnl)_b9p4=~aBMLHAX06&iZ@8MQL_Mf
zjXA#KC8oaxtzoxH3kSc-<<KGk_+YEOTLs90uXZ`q4uEuWt=%dT40zScq16&ZN7MPG
z9siD%E{88F0r2jp*+$I*`fCc_e?w<<IV@-g9S^u1o}q6&14yZXN~Gqy<**$*{$Yq!
z5(L3HzqREHgRd5VKsMo+rKe!l5$g5JVFl;+Naq9988GME63+KD*hcM2Mdw5R$@hW!
u^8h0607^JsGIH+?JBm8rx8uDZn&v+mwA<oScj0sZ0000<MNUMnLSTaGx)con

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_open.png
index cf917e3e00e5b6c8d45be78914722a22c26db50c..bd90e262c86787feb40809704fb7d22a2e538ef2 100644
GIT binary patch
delta 138
zcmZo-*}*tLl7o$bfuXpn>dQn$g>udUkH}&M2EHR8%s5q>PZ}uc>*?Yc65;;#{6^jb
z1{^MdlWOlMF8vnZb1-G4E$>ui#k2#O|FZj5`*8r(GCbI_dehN4#jCUKy}P$-?wK6>
o<TtBcuFDY={Iu@s|DXMxHNJazeLWs|-vKH1boFyt=akR{08$1wT>t<8

literal 514
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCilo1AIbU9UUD@OH0jlb@TG_R&8L{H)OGtlQT9pwq{|8h=}mx;Yna;2db6n
z?e_svyd^<?!T*r}gY65YHlPG&fk$L90|Va?5N4dJ%_j{MlqhkHC<)F_D=AMbN@WO0
z%*-p%^K%VRFx4~EvyjewwF0PSTWW-7ny0500|$`9${@wa%D@O@c>%FBlnwHk1|u_A
zoC(M_WMpCx0Mb!FoY~F-7S95*L4c>6k>Ld}0AMtlr3^r+3G56kK$QkY#s-WFAf|$B
zWL*F;X$p`H0!%=2nZPQ8EG>X6s4hbT1CZ>R{lARkJ3<10%v4Vo#}Etuw|(Ax2NXD1
z|2l~Nepi1l>&P<hEuNF#$%uV8)bilNAu+4y7d3)&@_Skpe_Z%5i$^g?VVU#f(ne-u
zb>D0JPhPd!O!~&IdEJYfae`6=*M#7%zHJwH=BhCrtJAvkM~^}LvzlJhk{g90Aj>^n
L{an^LB{Ts5D-D5>

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/assembly.png
new file mode 100644
index 0000000000000000000000000000000000000000..65ca749e5c94a406a2bd7cc628f63aeec00ccd73
GIT binary patch
literal 871
zcmV-t1DO1YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&AxT6*R9J=WSI=t`K@|R){gE;>WXU3pwGUcii69Xd7QFQ6q5p{givNNXJ$m!#
zB?l=LJO<hbh3=&h<{)AwZrHGpU7Pi=o#|%X{HU$D=m!ItnfK;>GxPT4n>8Xzkb`Ae
z*#F|G{?XPhhzR|DA3_Ll&e!rjM3mUJ4aOK4W8j>_G|ed+-}m!w&}G0%rJ@`)O#?Fx
zWh56e3<Hki06>x_an(-@!%#k&rcDK7jDd&{h9QC=fbaV$fo$->V1T{7Jyet54h8@a
zhGF5jL>$Lc0rLbn=O7|=BBkuaU@(}w_-$}-eu{(hQ`oi*&bcC|16WD$_M@j$zd7ds
zfRbfdux<OV1<ykgv27ccWu;fJilFie@>mH0NkS626@h$a=OI7CEQ)q6q2DBU9LG30
zIhk9CiU?$PE^|N;h@uEV5FiKwH5dc|zQ#XQKZ>HI2xf!JbtT?CXvoE<Y;+<*x7)?`
z_O_bX+}y;I;WyR4|DB^fV|Q7^ajXgv5uscz&$S<q$I!zt#QOR=#^bS?@H`JMaqUcx
z9xkkavJ?Y=5CQ<uY&Pfmc%BEHb6$9-IjFik&$eK$xSlVu)_?pvSOd}`GSBEH$&y`b
zkslEyIuRv}MgwPOXKKQ69PD>Kss8H%f{SF?73OY?h@dx{O?10mRI61rF_}zoZ(~FC
zUyKCaHy#5>i;euwi(nXrBCx0q07&aVy<W$~#f2KI)oS?s<61x-ZS8`p)rG}K61=>;
zgzLIf#jRW}qtof2-|wrjD2h;$;?Xb+)uJc@GY!?U>NczSX2Eq`2qEzH`5PP`ALH5K
zA%qZUwOY_LO*PXruQg$o0Amc*BvDNw48ysy+;JTBf6?ppFu79pALAIkUJs+uNXd42
zO?N6t@>f)QRmW&F!iSxmnLant1Iwb*>A-bev|24SCUamV1T;-UyWK{mQdwxL`@X-l
z;J8Z&ArOXPngc|HTCKLy;PQ1;0@CDJ6$u$!CaexXX*bF0Pr(?&a5!8lxQwX-=_4`w
xbT&=1P?TnC{H)ipd}ZZDDUhDD=Xq0OzW|jCkxXOfNe=)3002ovPDHLkV1j?-keC1f

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/bolted_unlit.png
new file mode 100644
index 0000000000000000000000000000000000000000..b65261aea9709cf43c27ba1f88b1d1bfeb85e924
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}%APKcArY-_
z&l>VFFmNz$___TIquI0zQW=*LCjBj7VqkDs&U{si`Kw2TQ3_BwgQu&X%Q~loCIB9<
B9U}k$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b67f2ac91f5024a4f88aed57503447805cda64fd
GIT binary patch
literal 400
zcmV;B0dM|^P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw00001b5ch_0Itp)
z=>Px#JWxzjMF0Q*Gcz+xOiWr@T0=ugOG{ByR9Y}FHd<O>5fK+bK|ytOb#88MVq#(v
zvI;IPE~N(t5Q_?C0s<l;BCvqK+yDRp0!c(cR5*=|lgk#vAP7VyJ4jM&{QrOLpd|6p
z*v{#~$~{702y9AUl|zA*#EueUBqF9;Nk{=8PI$wBSOCc?1OUW|Q_$l$>;mzmra}NH
zaV7w`T=1gi1cl&`?9IST$bdV!04EF(<pHpIj4%Kf0}%5M|0e)Vft+FrJf>KF)nJVp
zQX~yw>?D-L`(V?oXR)}%0b<vA6qgwx<Wc*$8>$?K6v!dBs49|5kp`^Wwykm(>7QA~
z4Pf108u#s?lf2L>Z#`sx0tA4SGy%MZ381H~{{<S$)xc@F#<UgSroC)`eP(C-ZgH%W
u-Qu*XmkrUbo-Z$zc)h*8yxsb9xBefTCL{_Y4^$NZ0000<MNUMnLSTaBJDf8B

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed_unlit.png
new file mode 100644
index 0000000000000000000000000000000000000000..116926929f4840945a9685c49cfbd3418b430e24
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}DxNNmArY-_
z&pPrlFmSLecs>7A(7vs0vjZBQG_5<+E(}zX7p2q8nrSkx7|3Q|@O1TaS?83{1OQky
B9nJs%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7e02df93fe790fbf716ab117b9702727684346b
GIT binary patch
literal 2613
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
XOAUXgW98o800000NkvXXu0mjfsr>x~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing_unlit.png
new file mode 100644
index 0000000000000000000000000000000000000000..f74a94b60a5a896e245d74d1ddae82535fa9681b
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTN?DaPU;cPEB*=VV?2In|ynjv*Cu
z-riE=YjEIUaX9di^WT4K7A8)<vz^J_dC!=0FD*$cpQZ62V*QIV7oRf&wSYix9LxLD
z;?+Fa{`w64i)`l<#!V<^U<mNrC2#+$2BPFg|FI>j{f+e`w=Z41?-*O$d}fvGhL>EA
h%FaFH1*%xEL3&rTdg<!t*RO-rd%F6$taD0e0s#F-L3{uJ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/deny_unlit.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4851a0ea0dd0d8e5f1d981157ba3ce9151cf5d7
GIT binary patch
literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTN?DaPU;cPEB*=VV?2Ia@qk978JR
zyuBUB)oj4Sa3Ssc{?~j43x7+U5LmN#QszDD21DN{$4l2ve9u~&er%1LJWvnAjz#yf
z|39&wRX<18CMm09|Ms}%iFf4F_woE*Cc5C)#m}oRmmLtgxLVde+xtj>yPxKPu<!Qi
zHa`xzeV%`9(S6qyxBkvA^*Fo#*Y^cg|A5AAP_DMyS5*Ttx#96TGm+BWKMyYc{PX4=
uevf4gC-b5kF8=(Jvt8HW>u*kw8tHq&`(5fLOh4iY;(5CIxvX<aXaWFi?P|;b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/emergency_unlit.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea36a649ace2f70a6f379ee2d75743ef2ea75099
GIT binary patch
literal 110
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2IU1fWjv*P1
zZ_hgNGB9wkEO<TtRM5VyZL<R!o;0mH(=H5D0s?tad3#tht6$Im3*vdY`njxgN@xNA
D*!3U>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/meta.json
new file mode 100644
index 0000000000..aff7c8e57a
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/meta.json
@@ -0,0 +1,198 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Hyenh",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
+    },
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_broken",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_damaged",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.7
+        ]
+      ]
+    },
+    {
+      "name": "sparks_open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..c56c1f88908ce40084bc41f8a1dd598c46bdf815
GIT binary patch
literal 528
zcmV+r0`L8aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$%1J~)R9J=WmqBXVKoo{Q7fHrLj9l!38+eP*f(u<4bO4ikc$rJ&0J%hO;clu;
z@WyMewaQ{3n<9`=JH--4T{s#`i4Aol=%V^|(wou$YaRpd?}$jjGsfdFzV8!75nAic
z^ZL1nNHH7^iR1W1%>ft;2K4)Vlu~G|U#oW#r4%B9F@`ivNs?r5peimRY&IK|QfGa9
zxm=z+srh`4>$;3aBdY-%43y%Y=K+xCIqUWMtmB`}W-nR^hvRo$7XZ)mY9`(QXsx+^
zd?3rRKh-;nQXC-5GHU|Bx$SJ>*B0Imc>i7Vt>U&R@;oQca{xqyZntY|&RubMkWU{m
z#xyGa)W!m^w_q}v*m|wU)hpS=^*hC}tKZVn($dn>^8eEL7eh!@$GQ1=2n%11Oe#$V
zlgg-Xb)0t>7k1&zkC?9?J_Gwf@>r7jTU^(*2C6fmb60dxN^$-8!2RVF;`@ycrm+8^
z-EKz^1Z=lk!Z5@bv(E)0!u{oy4JPG=rU`<8IF1R!upUf|F^Gr_CdL@zIBu-})9KV^
zjn!&p^C3Ki(=<)X#b~YR^?I+>tx<|C7K>UqwFZ(TAxRRup=kqEBT*F9-u(u3G|`9w
S$zNsw0000<MNUMnLSTZA74wMz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening.png
new file mode 100644
index 0000000000000000000000000000000000000000..2932611c4e16d1b2a8f5e17e44bf18fb04e83f12
GIT binary patch
literal 2547
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
JPDHLkV1jVT-qZj9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening_unlit.png
new file mode 100644
index 0000000000000000000000000000000000000000..05add9c5dc5c58f6126e5dca3c6ac04a02ecddf5
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTN?DaPU;cPEB*=VV?2IrW|{jv*Cu
z-rhFkYcSwoIPmJ3`k(*rWn^SZ-zM>JE|YjK$DpFBGv%5_Lj1XfmjCC;1NAU4H0W=9
z$vN|~a^6e9WGxei1#N%WBl<OM(~i7g%UJ8i3sO?<_P_ssbsdNa1RR?y>Za5yUM|*T
l3KfxUf8V#jtH+sPK{=!AGxbvcxO^3mB2QO8mvv4FO#sinKUn|(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_closing.png
new file mode 100644
index 0000000000000000000000000000000000000000..c53b5a692ba4c3cd0f814351fc4b8b8a22df2471
GIT binary patch
literal 451
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3-oXy=t-nQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`)dPG&Tpb-9OG``5b#?Rd@>XqN*EeLbl#??yHnwJAiHL~s<KanQX9ud4
z>FxIcQoJQWe!>5d0E6udr8b}hXMsm#F#`kNVGw3Kp1&dmXgQCki(^QH``c-^`I;33
zTo@O|o%&y&FYf$C$bH$xUkRI*^XJ4o=Da+;@MoHjgCXNl77^h95aa1Wrsv$Rx4#$s
z5%3{(kGsJUf#8~{AD2llnGhs(x*}>p(!IxvCQJLg-eG6a*j0Jn;$;3FwE#oqXQ}5x
z6g01JE=X!S^S)9u-T#5JtbkTpkHo2q!aQGFR?Og!*kAw8KESYir^1b-cSWurgw+<z
zXh>q};?w{#7%r6ADZH5G)cE%HIre+6p$wKKBA04!|GdEKp_%e~+h;~b?be+8K!piQ
zCxFzk>=C(iX@!-%$b}#e@8q@Dn8a3y8|1{V-ddpWV_yNo?R*)|f5$GfTGli4Xi3B;
TE`2Ek3@ipuS3j3^P6<r_PFb(-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd90e262c86787feb40809704fb7d22a2e538ef2
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DinK$vl=HlH+5(AU$&F(ktM?fH$o2Mjn|0w>kpQC#{hz~^Af
zN?YEk%8F?RH2-Dyt@h&ps%3bvW%Z_`bBb4I-FtU$*W5EX_Q`Kny<C?gDEMjJ)&D>H
ZJ8OLR@cMc@^1cI7?CI*~vd$@?2>>n0KL7v#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_opening.png
new file mode 100644
index 0000000000000000000000000000000000000000..02b488b9c921c2f2794c7111b8458de2894eb889
GIT binary patch
literal 432
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3-oXy=t-nQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`)dPG&Tpb-9OG``5b#?Rd@>XqN*EeLbl#??yHnwJAiHL~s<KanQX9ud4
z>FxIcQoJQWe!>5d0E6udr8b}hXMsm#F#`kNVGw3Kp1&dmDEQOU#W5tp{q6MIT!$3|
zSc@;JE&Kidel)L>@;j@ATl7=a1(f9G^ya5el7Gx}gtdcPKwLr3;a`x!+1C7-Q;VN1
zHMkzi&v$`k${nd`0*4o`tIB9FTkzL0CaEVn_Ui?PTn9m)#8bbkq3oRMI<sg8<}Hk_
z3X}R&zA>6ONC&V^n)h<We5uEbM$;SgG}?YGWnzwDZgXgR{+MBUgQ~)VKjjaC59Y=+
z>|iKle1znL2#3)3dE%zRAzwFeh50as+OBC5{msANRida(exbsGRqdf0?j+UCWLj0V
vWq#!8(;`p$m_qqiKRD^o0HhXloZx=9P$IKXbY3Sg5EwjN{an^LB{Ts57%ZQ{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd67e88a315f674a061fb3b27660b8c761c88f38
GIT binary patch
literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*0007jNkl<Zc%1E<
zO-sW-5QZmK!CnfUs`L+d5CqR2s=wQVKS6r(EEKdCp<V>7E0M--(oM3v-T6o|50rvB
z?(X|$_9K~q!b>Jme`5^XKVF&j%`2QtMsN-@c!MQ;uYX{&xPXV-MV4h*a7^*H)mTo%
z^duKBlw8QrI7#Az6a!+!k42gRM*{jVXw(2^)BtAG0A@rO5W6r+TTo*dR0c>itn&u=
ziYhf*#29dhKzXbye)sb`x`T#9jF|@skRQx^J~1)&r}u;k?=m8#VH_qLszE1c7I|*U
z-vi17+kNaSp<Z~tEGWiY{U(RPh_)<%k1<OIw2im>Cz%9yQ#rS&sN2x0`#dRVZ$Zo3
z(YozxD(tDJ*Nd^#9ngM11*`#hZL|qqUX-aA#5S}G^!n=WLLU@GQ4~c{6dSK|xP5Tx
z!-H@vnhtn%y49-Lc3NyR!WG{&^FjpmIbAy+o5nPrx)V}}E%fz`bB+BtcI@^)8^rTf
zBx((Ky3EXU1aLM2IGxVm^KA+58-UdY;QHA(FXNaPN!aD?zV8}<6&DioA6qwm%&S`B
zG(?rf)v;@BC^IYu=$f%ZGhhqXw5SF!qXsa;V!%*uXSl{qZh&O*G5ePMUQntINQ83i
z$upoRb}H)fv5TKDu*ZP$-hvmY3!Atq6ENBh(WYFFM67|7l05p#?E1nmayZKasmvEs
z4%uF#@2=U$hCc&#<3^>qaoRUjD5t(Q@!@5>eLn%YPa&y@Wk6F&Jf;Amr=S&p`TF~H
zKQmyzZBbK@-3j_NfaCqFrZteLVgLD`ViBgsl+FQ!832*%0DhkaTq4i015y-4Q4~c{
f6h%=KHvsSpwHV1KmpgiI00000NkvXXu0mjf++aJ5

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_broken.png
new file mode 100644
index 0000000000000000000000000000000000000000..c41fa18ca1a5201b580b0194415c120f2980ad94
GIT binary patch
literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB-~~??$B>G+x3?U*4jBlrUYO^z=YQuNR}pT-
zBWy>`xct87wfm=W{jN74OBfgq^lLtiinBjCrM4q_XUp^LGankKO#7F2v&Y%y%Ff{Q
z3~%|r^L0N9BrdH_`lfiRRhipD%PysF@10#wUYOUjy0=@j2J7*HO#%`BwVxio(s#yR
z<n@~=mY3L9xIFDI3aY+wIGxY%REO4rbCPGjgzkNyv3Jjjr?-1v{GDIL{e9lqDVu&A
q=rZ;dudRsa-!2a~3&coRm%E#}EB}=G#r$v$kbtMFpUXO@geCxFwRX(_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_damaged.png
new file mode 100644
index 0000000000000000000000000000000000000000..f16a028dee5bbe41a7f4e35f686043e8a112ce4e
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0Z<#e`9lQK{p_au_VYZ
zn8D%MjWi%9!PCVtL_+fI!HvAl4m=D8Hh=XH6ZQR;XyVo{y01gP^_0k+pXD$8l*-N4
z&iUk!V5<=?maE{?*yyS)-udN6;H*Pi5*L(-Fs)pAdDY$x8SUGCM{GTG-~v<Ug|=>&
dN}IerjGt7Q1>7HnEC$-e;OXk;vd$@?2>`@EK-2&L

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..40d559f7a3312504e49f41ccd899850ca59b3980
GIT binary patch
literal 281
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3-oXy=t-nQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`IRkt`T>t-f`0?Kk$m_OstpifbB|(0{|Nk>wKgA1F%fMOS5n0T@z;_sg
z8IR|$NC66VdAc};M7Y15X2^BGK;UrE&;N_7IVHPIx5Rc$QDkj)wW>VRAK0MbAfmt}
zz}ms&!nlax=iUc9=Syj<FTNkVxrp&fd9_%HoK~2L$Hy0}$@3kqt2-`d-T#6WNdrWG
z<b>mInTllg8=T*qkh)`CG2`A1pH*)B{#SE<!|!Cf^sB5nG5Uu+xvh=>UB%$(>gTe~
HDWM4fZCPKD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..f19a0b8caf237d0020b9a06d1f0ab1160dfd9481
GIT binary patch
literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCil&0(?STWo2beO-&;rB1}w7+}zx3Y;00eQUU`5!^6XYO6uNlp9E4|B|(0{
z|6zb((;1!fKvB*DkH}&M2EM}}%y>M1MG8=Gm8Xkih=u>u$+!6qEATisw%q>z|AT~S
z#*JA4e<zvDQEQua!T;lC5v50B%$$YYjLvtG4#=LIG~-l<H<N@QQ-vc_CcDu>*>w)C
zOnbittY~ET?=N&O;{eMY+ugILMztM{deeAm#Zn2Uj<ZtV%*5EQyskKU=abGR_W!dq
zm?Jk!2nh4UY(M$>7Gq&|<86I&^TH0sUpK5CaoHUIuKe=C1Rc%;dhz8GZfhTieDRlg
Y;SMFcnyprxKvy$(y85}Sb4q9e0EDN1yZ`_I

literal 0
HcmV?d00001


From b9254d9ebf79ff28e27f1c54205e89fece209ad4 Mon Sep 17 00:00:00 2001
From: opl- <opl-@users.noreply.github.com>
Date: Sun, 12 Oct 2025 21:49:41 +0200
Subject: [PATCH 213/216] Replace all usages of /bin/bash shebang with
 /usr/bin/env (#40756)

Replace all usages of /bin/bash with /usr/bin/env

/usr/bin/env is nearly guaranteed to always exist at that location, which can't be said about /bin/bash and /bin/sh.

Co-authored-by: opl <4833621+opl@users.noreply.github.com>
---
 BuildChecker/git_helper.py       | 2 +-
 BuildChecker/hooks/post-checkout | 2 +-
 BuildChecker/hooks/post-merge    | 2 +-
 Content.Tools/test/run.sh        | 2 +-
 Tools/mapping-merge-driver.sh    | 2 +-
 runclient-Tools.sh               | 2 +-
 runclient.sh                     | 2 +-
 runserver-Tools.sh               | 2 +-
 runserver.sh                     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py
index 66d2463669..bd6603bd34 100644
--- a/BuildChecker/git_helper.py
+++ b/BuildChecker/git_helper.py
@@ -13,7 +13,7 @@ from typing import List
 
 SOLUTION_PATH = Path("..") / "SpaceStation14.sln"
 # If this doesn't match the saved version we overwrite them all.
-CURRENT_HOOKS_VERSION = "3"
+CURRENT_HOOKS_VERSION = "4"
 QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"
 
 
diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout
index ee4309de1d..1b91112ff0 100755
--- a/BuildChecker/hooks/post-checkout
+++ b/BuildChecker/hooks/post-checkout
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 gitroot=$(git rev-parse --show-toplevel)
 
diff --git a/BuildChecker/hooks/post-merge b/BuildChecker/hooks/post-merge
index 5cf3d91120..864a9cff50 100755
--- a/BuildChecker/hooks/post-merge
+++ b/BuildChecker/hooks/post-merge
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Just call post-checkout since it does the same thing.
 gitroot=$(git rev-parse --git-path hooks)
diff --git a/Content.Tools/test/run.sh b/Content.Tools/test/run.sh
index 7809b4dc92..876325ba56 100755
--- a/Content.Tools/test/run.sh
+++ b/Content.Tools/test/run.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 cp 0A.yml out.yml
 ../bin/Debug/net5.0/Content.Tools out.yml 0B.yml 0C.yml
diff --git a/Tools/mapping-merge-driver.sh b/Tools/mapping-merge-driver.sh
index 0421278f31..fe114ac9cd 100755
--- a/Tools/mapping-merge-driver.sh
+++ b/Tools/mapping-merge-driver.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Add this to .git/config:
 # [merge "mapping-merge-driver"]
diff --git a/runclient-Tools.sh b/runclient-Tools.sh
index cc0c958b86..b564c35438 100755
--- a/runclient-Tools.sh
+++ b/runclient-Tools.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 dotnet run --project Content.Client --configuration Tools
 read -p "Press enter to continue"
diff --git a/runclient.sh b/runclient.sh
index 9417cc9218..5df80bb08e 100755
--- a/runclient.sh
+++ b/runclient.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 dotnet run --project Content.Client
 read -p "Press enter to continue"
diff --git a/runserver-Tools.sh b/runserver-Tools.sh
index 6280dc4279..3a786920a7 100755
--- a/runserver-Tools.sh
+++ b/runserver-Tools.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 dotnet run --project Content.Server --configuration Tools
 read -p "Press enter to continue"
diff --git a/runserver.sh b/runserver.sh
index 33258e3190..33638d6bb5 100755
--- a/runserver.sh
+++ b/runserver.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 dotnet run --project Content.Server
 read -p "Press enter to continue"

From 4059c29ebc760b9200db768d313b5a41f511b915 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sun, 12 Oct 2025 14:23:42 -0700
Subject: [PATCH 214/216] Entity effects ECS refactor (#40580)

* LOCKED THE FUCK IN

* Forgot this little fella

* Crying

* All entity effects ported, needs cleanup still

* Commit

* HEHEHEHAW

* Shelve for now

* fixe

* Big

* First big chunk of changes

* Big if true

* Commit

* IT BUILDS!!!

* Fix LINTER fails

* Cleanup

* Scale working, cut down on some evil code

* Delete old Entity Effects

* Accidentally breaking shit by fixing bugs

* Fix a bunch of effects not working

* Fix reagent thresholds

* Update damage

* Wait don't change the gas metabolisms A

* Cleanup

* more fixes

* Eh

* Misc fixes and jank

* Remove two things, add bullshit, change condition to inverted

* Remove unused "Shared" system structure

* Namespace fix

* merge conflicts/cleanup

* More fixes

* Guidebook text begins

* Shelve

* Push

* More shit to push

* Fix

* Fix merg conflicts

* BLOOD FOR THE BLOOD GOD!!!

* Mild cleanup and lists

* Fix localization and comments

* Shuffle localization around a bit.

* All done?

* Nearly everything

* Is this the end?

* Whoops forgot to remove that TODO

* Get rid of some warnings for good measure...

* It's done

* Should make those virtual in case we want to override them tbqh...

* Update Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>

* Fix test fails real

* Add to codeowners

* Documentation to everything

* Forgot to push whoops

* Standardize Condition names

* Fix up metabolism a little as a treat

* review

* add IsServer checks

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
---
 .github/CODEOWNERS                            |   1 +
 .../Temperature/Systems/TemperatureSystem.cs  |   8 +
 .../Atmos/EntitySystems/FlammableSystem.cs    |   2 +-
 Content.Server/Atmos/Rotting/RottingSystem.cs |   2 +-
 .../Body/Components/MetabolizerComponent.cs   |   4 +-
 .../Body/Systems/MetabolizerSystem.cs         | 450 ++++----
 .../Body/Systems/RespiratorSystem.cs          |  15 +-
 .../Body/Systems/ThermalRegulatorSystem.cs    |   2 +-
 Content.Server/Botany/SeedPrototype.cs        |  11 +-
 .../Botany/Systems/BotanySystem.Produce.cs    |   7 +-
 .../Botany/Systems/MutationSystem.cs          |   7 +-
 .../Botany/Systems/PlantHolderSystem.cs       |   5 +-
 .../Commands/DumpReagentGuideText.cs          |   2 +-
 .../ConstructionSystem.Interactions.cs        |   1 +
 .../BreathingEntityConditionSystem.cs         |  19 +
 .../MetabolizerTypesEntityConditionSystem.cs  |  21 +
 .../Atmos/CreateGasEntityEffectSystem.cs      |  22 +
 .../Atmos/FlammableEntityEffectSystem.cs      |  25 +
 .../Effects/Atmos/IgniteEntityEffectSystem.cs |  23 +
 .../Body/OxygenateEntityEffectsSystem.cs      |  20 +
 .../PlantAdjustHealthEntityEffectSystem.cs    |  20 +
 ...ntAdjustMutationLevelEntityEffectSystem.cs |  20 +
 ...lantAdjustMutationModEntityEffectSystem.cs |  16 +
 .../PlantAdjustNutritionEntityEffectSystem.cs |  16 +
 .../PlantAdjustPestsEntityEffectSystem.cs     |  16 +
 .../PlantAdjustPotencyEntityEffectSystem.cs   |  19 +
 .../PlantAdjustToxinsEntityEffectSystem.cs    |  16 +
 .../PlantAdjustWaterEntityEffectSystem.cs     |  16 +
 .../PlantAdjustWeedsEntityEffectSystem.cs     |  16 +
 .../PlantAffectGrowthEntityEffectSystem.cs    |  19 +
 .../PlantChangeStatEntityEffectSystem.cs      | 122 +++
 .../PlantCryoxadoneEntityEffectSystem.cs      |  30 +
 .../PlantDestroySeedsEntityEffectSystem.cs    |  31 +
 .../PlantDiethylamineEntityEffectSystem.cs    |  31 +
 .../PlantPhalanximineEntityEffectSystem.cs    |  16 +
 .../PlantRestoreSeedsEntityEffectSystem.cs    |  26 +
 .../RobustHarvestEntityEffectSystem.cs        |  41 +
 .../PlantMutateChemicalsEntityEffectSystem.cs |  43 +
 .../PlantMutateGasesEntityEffectSystem.cs     |  53 +
 .../PlantMutateHarvestEntityEffectSystem.cs   |  25 +
 ...ntMutateSpeciesChangeEntityEffectSystem.cs |  31 +
 .../Effects/EmoteEntityEffectSystem.cs        |  22 +
 .../Effects/MakeSentientEntityEffectSystem.cs |  42 +
 .../Effects/PolymorphEntityEffectSystem.cs    |  19 +
 .../AreaReactionEntityEffectSystem.cs         |  51 +
 .../Transform/ExplosionEntityEffectSystem.cs  |  28 +
 .../EntityEffects/EntityEffectSystem.cs       | 976 ------------------
 .../Fluids/EntitySystems/SmokeSystem.cs       |   7 +-
 .../GuideGenerator/ChemistryJsonGenerator.cs  |   3 +-
 Content.Server/GuideGenerator/ReagentEntry.cs |   2 +-
 .../Kitchen/EntitySystems/MicrowaveSystem.cs  |   1 +
 Content.Server/Medical/CryoPodSystem.cs       |   2 +-
 .../Medical/HealthAnalyzerSystem.cs           |   2 +-
 .../NPC/Systems/NPCUtilitySystem.cs           |   2 +-
 .../Temperature/Systems/TemperatureSystem.cs  |  19 +-
 .../Tiles/TileEntityEffectComponent.cs        |   2 +-
 .../Tiles/TileEntityEffectSystem.cs           |  10 +-
 .../Zombies/ZombieSystem.Transform.cs         |   2 +-
 Content.Shared.Database/LogType.cs            |   4 +-
 .../Body/Components/LungComponent.cs          |   2 +-
 Content.Shared/Body/Systems/LungSystem.cs     |  12 +-
 .../Body/Systems/SharedBloodstreamSystem.cs   |   7 +-
 .../SharedSolutionContainerSystem.cs          |  21 +
 .../Reaction/ChemicalReactionSystem.cs        |  18 +-
 .../Chemistry/Reaction/ReactionPrototype.cs   |   2 +-
 .../Chemistry/Reaction/ReactiveComponent.cs   |   2 +-
 Content.Shared/Chemistry/ReactiveSystem.cs    | 100 +-
 .../Chemistry/Reagent/ReagentPrototype.cs     |  73 +-
 .../Body/BreathingEntityCondition.cs          |  10 +
 .../Body/HungerEntityConditionSystem.cs       |  33 +
 .../Body/InternalsEntityConditionSystem.cs    |  23 +
 .../Body/MetabolizerTypeEntityCondition.cs    |  31 +
 .../Body/MobStateEntityConditionSystem.cs     |  28 +
 .../Conditions/JobEntityConditionSystem.cs    |  59 ++
 .../ReagentEntityConditionSystem.cs           |  44 +
 .../Tags/HasAllTagsEntityConditionSystem.cs   |  43 +
 .../Tags/HasAnyTagEntityConditionSystem.cs    |  43 +
 .../Tags/HasTagEntityConditionSystem.cs       |  28 +
 .../TemperatureEntityConditionSystem.cs       |  52 +
 .../TemplateEntityConditionSystem.cs          |  20 +
 .../TotalDamageEntityConditionSystem.cs       |  33 +
 .../SharedEntityConditionsSystem.cs           | 152 +++
 .../EffectConditions/BodyTemperature.cs       |  23 -
 .../EffectConditions/BreathingCondition.cs    |  21 -
 .../EffectConditions/HasTagCondition.cs       |  28 -
 .../EffectConditions/InternalsCondition.cs    |  30 -
 .../EffectConditions/JobCondition.cs          |  52 -
 .../EffectConditions/MobStateCondition.cs     |  28 -
 .../EffectConditions/OrganType.cs             |  28 -
 .../EffectConditions/ReagentThreshold.cs      |  56 -
 .../EffectConditions/SolutionTemperature.cs   |  36 -
 .../EffectConditions/TotalDamage.cs           |  33 -
 .../EffectConditions/TotalHunger.cs           |  33 -
 .../Effects/AddToSolutionReaction.cs          |  35 -
 .../EntityEffects/Effects/AdjustAlert.cs      |  58 --
 .../Effects/AdjustAlertEntityEffectSystem.cs  |  65 ++
 .../EntityEffects/Effects/AdjustReagent.cs    |  90 --
 .../Effects/AdjustTemperature.cs              |  15 -
 .../AdjustTemperatureEntityEffectsSystem.cs   |  30 +
 .../Effects/AreaReactionEffect.cs             |  43 -
 .../Effects/ArtifactDurabilityRestore.cs      |  36 -
 .../Effects/ArtifactEntityEffectsSystem.cs    |  72 ++
 .../EntityEffects/Effects/ArtifactUnlock.cs   |  44 -
 .../Effects/Atmos/CreateGasEntityEffect.cs    |  35 +
 .../Atmos/ExtinguishEntityEffectSystem.cs     |  36 +
 .../Effects/Atmos/FlammableEntityEffect.cs    |  28 +
 .../Effects/Atmos/IgniteEntityEffect.cs       |  18 +
 .../CleanBloodstreamEntityEffectSystem.cs     |  43 +
 .../Body/EyeDamageEntityEffectSystem.cs       |  32 +
 .../Body/ModifyBleedEntityEffectSystem.cs     |  32 +
 .../ModifyBloodLevelEntityEffectSystem.cs     |  34 +
 .../Body/ModifyLungGasEntityEffectSystem.cs   |  33 +
 .../Effects/Body/OxygenateEntityEffect.cs     |  14 +
 .../Body/ReduceRottingEntityEffectSystem.cs   |  36 +
 .../Effects/Body/SatiateEntityEffectSystem.cs |  63 ++
 .../Effects/Body/VomitEntityEffectSystem.cs   |  37 +
 .../BasePlantAdjustAttributeEntityEffect.cs   |  37 +
 .../PlantAttributes/PlantAdjustHealth.cs      |   7 +
 .../PlantAdjustMutationLevel.cs               |   7 +
 .../PlantAttributes/PlantAdjustMutationMod.cs |   7 +
 .../PlantAttributes/PlantAdjustNutrition.cs   |   6 +
 .../PlantAttributes}/PlantAdjustPests.cs      |   4 +-
 .../PlantAttributes/PlantAdjustPotency.cs     |   9 +
 .../PlantAttributes}/PlantAdjustToxins.cs     |   5 +-
 .../PlantAttributes/PlantAdjustWater.cs       |   7 +
 .../PlantAttributes}/PlantAdjustWeeds.cs      |   4 +-
 .../PlantAttributes/PlantAffectGrowth.cs      |   7 +
 .../Botany/PlantAttributes/PlantChangeStat.cs |  21 +
 .../Botany/PlantAttributes/PlantCryoxadone.cs |   9 +
 .../PlantAttributes/PlantDestroySeeds.cs      |  12 +
 .../PlantAttributes/PlantDiethylamine.cs      |  11 +
 .../PlantAttributes/PlantPhalanximine.cs      |  10 +
 .../PlantAttributes/PlantRestoreSeeds.cs      |  12 +
 .../Botany/PlantAttributes/RobustHarvest.cs   |  22 +
 .../PlantMutateChemicalsEntityEffect.cs       |  16 +
 .../Botany/PlantMutateGasesEntityEffect.cs    |  22 +
 .../Botany/PlantMutateHarvestEntityEffect.cs  |   6 +
 .../PlantMutateSpeciesChangeEntityEffect.cs   |   6 +
 .../Effects/CauseZombieInfection.cs           |   9 -
 .../Effects/ChemCleanBloodstream.cs           |  15 -
 .../Effects/ChemHealEyeDamage.cs              |  28 -
 .../EntityEffects/Effects/ChemVomit.cs        |  19 -
 .../Effects/CreateEntityReactionEffect.cs     |  26 -
 .../EntityEffects/Effects/CreateGas.cs        |  32 -
 .../Effects/CureZombieInfection.cs            |  18 -
 Content.Shared/EntityEffects/Effects/Drunk.cs |  27 -
 .../EntityEffects/Effects/Electrocute.cs      |  37 -
 Content.Shared/EntityEffects/Effects/Emote.cs |  44 -
 .../Effects/EmoteEntityEffect.cs              |  40 +
 .../Effects/EmpReactionEffect.cs              |  34 -
 .../BaseSpawnEntityEntityEffect.cs            |  36 +
 .../SpawnEntityEntityEffectSystem.cs          |  37 +
 ...pawnEntityInContainerEntityEffectSystem.cs |  51 +
 ...tityInContainerOrDropEntityEffectSystem.cs |  49 +
 ...pawnEntityInInventoryEntityEffectSystem.cs |  35 +
 .../EntityEffects/Effects/EvenHealthChange.cs | 139 ---
 .../EvenHealthChangeEntityEffectSystem.cs     | 114 ++
 .../Effects/ExtinguishReaction.cs             |  32 -
 .../Effects/FlammableReaction.cs              |  21 -
 .../Effects/FlashReactionEffect.cs            |  48 -
 Content.Shared/EntityEffects/Effects/Glow.cs  |  48 -
 .../Effects/GlowEntityEffectSystem.cs         |  55 +
 .../EntityEffects/Effects/HealthChange.cs     | 126 ---
 .../Effects/HealthChangeEntityEffectSystem.cs |  91 ++
 .../EntityEffects/Effects/Ignite.cs           |  18 -
 .../EntityEffects/Effects/MakeSentient.cs     |  10 -
 .../Effects/MakeSentientEntityEffect.cs       |  22 +
 .../Effects/ModifyBleedAmount.cs              |  16 -
 .../EntityEffects/Effects/ModifyBloodLevel.cs |  17 -
 .../EntityEffects/Effects/ModifyLungGas.cs    |  14 -
 .../Effects/MovespeedModifier.cs              |  78 --
 .../EntityEffects/Effects/Oxygenate.cs        |  13 -
 .../EntityEffects/Effects/Paralyze.cs         |  37 -
 .../PlantMetabolism/PlantAdjustAttribute.cs   |  39 -
 .../PlantMetabolism/PlantAdjustHealth.cs      |   7 -
 .../PlantAdjustMutationLevel.cs               |   6 -
 .../PlantMetabolism/PlantAdjustMutationMod.cs |   6 -
 .../PlantMetabolism/PlantAdjustNutrition.cs   |   6 -
 .../PlantMetabolism/PlantAdjustPotency.cs     |  12 -
 .../PlantMetabolism/PlantAdjustWater.cs       |   7 -
 .../PlantMetabolism/PlantAffectGrowth.cs      |   7 -
 .../PlantMetabolism/PlantChangeStat.cs        |  24 -
 .../PlantMetabolism/PlantCryoxadone.cs        |   8 -
 .../PlantMetabolism/PlantDestroySeeds.cs      |  13 -
 .../PlantMetabolism/PlantDiethylamine.cs      |   9 -
 .../PlantMetabolism/PlantPhalanximine.cs      |   8 -
 .../PlantMetabolism/PlantRestoreSeeds.cs      |  12 -
 .../Effects/PlantMetabolism/RobustHarvest.cs  |  18 -
 .../Effects/PlantMutateChemicals.cs           |  16 -
 .../EntityEffects/Effects/PlantMutateGases.cs |  39 -
 .../Effects/PlantMutateHarvest.cs             |  14 -
 .../Effects/PlantSpeciesChange.cs             |  14 -
 .../EntityEffects/Effects/Polymorph.cs        |  19 -
 .../Effects/PolymorphEntityEffect.cs          |  19 +
 .../EntityEffects/Effects/PopupMessage.cs     |  54 -
 .../EntityEffects/Effects/ReduceRotting.cs    |  32 -
 .../EntityEffects/Effects/ResetNarcolepsy.cs  |  19 -
 .../ResetNarcolepsyEntityEffectSystem.cs      |  34 +
 .../EntityEffects/Effects/SatiateHunger.cs    |  40 -
 .../EntityEffects/Effects/SatiateThirst.cs    |  31 -
 .../EntityEffects/Effects/Slipify.cs          |  37 -
 .../Effects/SlipifyEntityEffectSystem.cs      |  44 +
 .../AddReagentToSolutionEntityEffectSystem.cs |  59 ++
 .../AdjustReagentEntityEffectSystem.cs        |  52 +
 ...AdjustReagentsByGroupEntityEffectSystem.cs |  52 +
 .../Solution/AreaReactionEntityEffect.cs      |  39 +
 .../SolutionTemperatureEntityEffectsSystem.cs | 145 +++
 .../Effects/SolutionTemperatureEffects.cs     | 143 ---
 .../BaseStatusEffectEntityEffect.cs           |  35 +
 .../StatusEffects/DrunkEntityEffectSystem.cs  |  34 +
 .../ElectrocuteEntityEffectSystem.cs          |  51 +
 .../StatusEffects/GenericStatusEffect.cs      |  76 --
 .../GenericStatusEffectEntityEffectSystem.cs  |  64 ++
 .../Effects/StatusEffects/Jitter.cs           |  41 -
 .../StatusEffects/JitterEntityEffectSystem.cs |  45 +
 .../Effects/StatusEffects/ModifyKnockdown.cs  |  99 --
 .../ModifyKnockdownEntityEffectSystem.cs      |  72 ++
 .../ModifyParalysisEntityEffectSystem.cs      |  51 +
 .../StatusEffects/ModifyStatusEffect.cs       |  78 --
 .../ModifyStatusEffectEntityEffectSystem.cs   |  66 ++
 ...MovementSpeedModifierEntityEffectSystem.cs |  92 ++
 .../Effects/TemplateEntityEffectSystem.cs     |  21 +
 .../Transform/EmpEntityEffectSystem.cs        |  58 ++
 .../ExplosionEntityEffect.cs}                 |  19 +-
 .../Transform/FlashEntityEffectSystem.cs      |  81 ++
 .../PopupMessageEntityEffectSystem.cs         |  64 ++
 .../Effects/WashCreamPieEntityEffectSystem.cs |  27 +
 .../Effects/WashCreamPieReaction.cs           |  19 -
 .../EntityEffects/Effects/WearableReaction.cs |  47 -
 .../Effects/ZombieEntityEffectsSystem.cs      |  67 ++
 Content.Shared/EntityEffects/EntityEffect.cs  | 145 ---
 .../EntityEffects/EntityEffectCondition.cs    |  29 -
 .../EntityEffects/EventEntityEffect.cs        |  12 -
 .../EventEntityEffectCondition.cs             |  14 -
 .../SharedEntityEffectsSystem.cs              | 251 +++++
 .../Systems/MovementModStatusSystem.cs        |   1 +
 .../EntitySystems/IngestionSystem.API.cs      |   9 +-
 .../StatusEffectNew/StatusEffectSystem.API.cs |  18 +
 .../Stunnable/SharedStunSystem.Knockdown.cs   |   9 +-
 Content.Shared/Stunnable/SharedStunSystem.cs  |   7 +-
 .../Components/TemperatureComponent.cs        |   2 +-
 .../Systems/SharedTemperatureSystem.cs        |  19 +-
 .../Zombies/IncurableZombieComponent.cs       |   3 +-
 .../Locale/en-US/guidebook/chemistry/core.ftl |   5 +-
 .../guidebook/chemistry/statuseffects.ftl     |  16 -
 .../conditions.ftl                            |   0
 .../{chemistry => entity-effects}/effects.ftl | 166 +--
 .../healthchange.ftl                          |   0
 .../entity-effects/statuseffects.ftl          |  16 +
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |   2 +-
 .../Entities/Mobs/NPCs/miscellaneous.yml      |  20 +-
 .../Prototypes/Entities/Mobs/NPCs/slimes.yml  |   6 +-
 .../Prototypes/Entities/Mobs/NPCs/space.yml   |   2 +-
 .../Entities/Mobs/Species/arachnid.yml        |   6 +-
 .../Prototypes/Entities/Mobs/Species/base.yml |   2 +-
 .../Entities/Mobs/Species/diona.yml           |  14 +-
 .../Entities/Mobs/Species/skeleton.yml        |   8 +-
 .../Entities/Mobs/Species/slime.yml           |   6 +-
 .../Entities/Objects/Fun/plushies.yml         |   3 +-
 .../Entities/Objects/Misc/kudzu.yml           |   2 +-
 .../Objects/Specific/rehydrateable.yml        |   6 +-
 .../Entities/StatusEffects/movement.yml       |  21 +
 .../Prototypes/Entities/Structures/soil.yml   |   3 +-
 Resources/Prototypes/Entities/Tiles/lava.yml  |   2 +-
 .../Entities/Tiles/liquid_plasma.yml          |   2 +-
 Resources/Prototypes/Entities/Tiles/water.yml |   4 +-
 .../Hydroponics/randomMutations.yml           |   6 +-
 .../Reagents/Consumable/Drink/alcohol.yml     |  70 +-
 .../Reagents/Consumable/Drink/base_drink.yml  |   4 +-
 .../Reagents/Consumable/Drink/drinks.yml      |   7 +-
 .../Reagents/Consumable/Drink/soda.yml        |   6 +-
 .../Reagents/Consumable/Food/food.yml         |   4 +-
 .../Reagents/Consumable/Food/ingredients.yml  |  19 +-
 Resources/Prototypes/Reagents/biological.yml  |  14 +-
 Resources/Prototypes/Reagents/botany.yml      |  81 +-
 Resources/Prototypes/Reagents/chemicals.yml   |  16 +-
 Resources/Prototypes/Reagents/cleaning.yml    |  14 +-
 Resources/Prototypes/Reagents/elements.yml    |  22 +-
 Resources/Prototypes/Reagents/fun.yml         |  93 +-
 Resources/Prototypes/Reagents/gases.yml       | 282 ++---
 Resources/Prototypes/Reagents/medicine.yml    | 224 ++--
 Resources/Prototypes/Reagents/narcotics.yml   |  72 +-
 Resources/Prototypes/Reagents/pyrotechnic.yml |  26 +-
 Resources/Prototypes/Reagents/toxins.yml      | 127 ++-
 .../Recipes/Reactions/chemicals.yml           |   8 +-
 .../Prototypes/Recipes/Reactions/food.yml     |  26 +-
 .../Prototypes/Recipes/Reactions/fun.yml      |  14 +-
 .../Recipes/Reactions/pyrotechnic.yml         |   4 +-
 .../Prototypes/Recipes/Reactions/soap.yml     |  12 +-
 289 files changed, 5635 insertions(+), 4918 deletions(-)
 create mode 100644 Content.Client/Temperature/Systems/TemperatureSystem.cs
 create mode 100644 Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs
 create mode 100644 Content.Server/EntityConditions/Conditions/MetabolizerTypesEntityConditionSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationModEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/EmoteEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/EntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs
 create mode 100644 Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs
 create mode 100644 Content.Shared/EntityConditions/SharedEntityConditionsSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/EffectConditions/BodyTemperature.cs
 delete mode 100644 Content.Shared/EntityEffects/EffectConditions/BreathingCondition.cs
 delete mode 100644 Content.Shared/EntityEffects/EffectConditions/HasTagCondition.cs
 delete mode 100644 Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
 delete mode 100644 Content.Shared/EntityEffects/EffectConditions/JobCondition.cs
 delete mode 100644 Content.Shared/EntityEffects/EffectConditions/MobStateCondition.cs
 delete mode 100644 Content.Shared/EntityEffects/EffectConditions/OrganType.cs
 delete mode 100644 Content.Shared/EntityEffects/EffectConditions/ReagentThreshold.cs
 delete mode 100644 Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
 delete mode 100644 Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
 delete mode 100644 Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/AddToSolutionReaction.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/AdjustAlert.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/AdjustReagent.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/AdjustTemperature.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/AreaReactionEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ArtifactUnlock.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/BasePlantAdjustAttributeEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealth.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevel.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationMod.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutrition.cs
 rename Content.Shared/EntityEffects/Effects/{PlantMetabolism => Botany/PlantAttributes}/PlantAdjustPests.cs (53%)
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotency.cs
 rename Content.Shared/EntityEffects/Effects/{PlantMetabolism => Botany/PlantAttributes}/PlantAdjustToxins.cs (53%)
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWater.cs
 rename Content.Shared/EntityEffects/Effects/{PlantMetabolism => Botany/PlantAttributes}/PlantAdjustWeeds.cs (53%)
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowth.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStat.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadone.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamine.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximine.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeeds.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvest.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/CauseZombieInfection.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ChemCleanBloodstream.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ChemHealEyeDamage.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ChemVomit.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/CreateEntityReactionEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/CreateGas.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/CureZombieInfection.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Drunk.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Electrocute.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Emote.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/EmoteEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/EvenHealthChange.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ExtinguishReaction.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/FlammableReaction.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Glow.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/HealthChange.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Ignite.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/MakeSentient.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ModifyBleedAmount.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ModifyBloodLevel.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ModifyLungGas.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/MovespeedModifier.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Oxygenate.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Paralyze.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantChangeStat.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMutateChemicals.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMutateGases.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantMutateHarvest.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PlantSpeciesChange.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Polymorph.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PopupMessage.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ReduceRotting.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ResetNarcolepsy.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/SatiateHunger.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/SatiateThirst.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Slipify.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Solution/AdjustReagentsByGroupEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/SolutionTemperatureEffects.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/Jitter.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs
 rename Content.Shared/EntityEffects/Effects/{ExplosionReactionEffect.cs => Transform/ExplosionEntityEffect.cs} (69%)
 create mode 100644 Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/WashCreamPieReaction.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/WearableReaction.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/EntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/EntityEffectCondition.cs
 delete mode 100644 Content.Shared/EntityEffects/EventEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/EventEntityEffectCondition.cs
 create mode 100644 Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs
 rename {Content.Server => Content.Shared}/Temperature/Components/TemperatureComponent.cs (98%)
 rename {Content.Server => Content.Shared}/Zombies/IncurableZombieComponent.cs (77%)
 delete mode 100644 Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
 rename Resources/Locale/en-US/guidebook/{chemistry => entity-effects}/conditions.ftl (100%)
 rename Resources/Locale/en-US/guidebook/{chemistry => entity-effects}/effects.ftl (71%)
 rename Resources/Locale/en-US/guidebook/{chemistry => entity-effects}/healthchange.ftl (100%)
 create mode 100644 Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 14f591ec87..defe08ef23 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -28,6 +28,7 @@
 
 /Content.*/Stunnable/ @Princess-Cheeseballs
 /Content.*/Nutrition/ @Princess-Cheeseballs
+/Content.*/EntityEffects @Princess-Cheeseballs @sowelipililimute
 
 # SKREEEE
 /Content.*.Database/ @PJB3005 @DrSmugleaf
diff --git a/Content.Client/Temperature/Systems/TemperatureSystem.cs b/Content.Client/Temperature/Systems/TemperatureSystem.cs
new file mode 100644
index 0000000000..94a1e836e8
--- /dev/null
+++ b/Content.Client/Temperature/Systems/TemperatureSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Temperature.Systems;
+
+namespace Content.Client.Temperature.Systems;
+
+/// <summary>
+/// This exists so <see cref="SharedTemperatureSystem"/> runs on client/>
+/// </summary>
+public sealed class TemperatureSystem : SharedTemperatureSystem;
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 424f52ed58..81bd4e5c6c 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.Components;
 using Content.Server.Stunnable;
-using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
 using Content.Server.Damage.Components;
 using Content.Shared.ActionBlocker;
@@ -24,6 +23,7 @@ using Content.Shared.Toggleable;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands;
+using Content.Shared.Temperature.Components;
 using Robust.Server.Audio;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index 6f14debc3d..57c1504b16 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Temperature.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Rotting;
 using Content.Shared.Body.Events;
 using Content.Shared.Damage;
+using Content.Shared.Temperature.Components;
 using Robust.Server.Containers;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs
index 5821b0d944..46d2fdd8e8 100644
--- a/Content.Server/Body/Components/MetabolizerComponent.cs
+++ b/Content.Server/Body/Components/MetabolizerComponent.cs
@@ -10,13 +10,13 @@ namespace Content.Server.Body.Components
     /// <summary>
     ///     Handles metabolizing various reagents with given effects.
     /// </summary>
-    [RegisterComponent, Access(typeof(MetabolizerSystem))]
+    [RegisterComponent, AutoGenerateComponentPause, Access(typeof(MetabolizerSystem))]
     public sealed partial class MetabolizerComponent : Component
     {
         /// <summary>
         ///     The next time that reagents will be metabolized.
         /// </summary>
-        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+        [DataField, AutoPausedField]
         public TimeSpan NextUpdate;
 
         /// <summary>
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index c59f87f576..6679bfea54 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -1,14 +1,18 @@
 using Content.Server.Body.Components;
-using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
+using Content.Shared.Body.Prototypes;
 using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
+using Content.Shared.EntityConditions;
+using Content.Shared.EntityConditions.Conditions;
+using Content.Shared.EntityConditions.Conditions.Body;
 using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Body;
+using Content.Shared.EntityEffects.Effects.Solution;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
@@ -17,210 +21,258 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Body.Systems
+namespace Content.Server.Body.Systems;
+
+/// <inheritdoc/>
+public sealed class MetabolizerSystem : SharedMetabolizerSystem
 {
-    /// <inheritdoc/>
-    public sealed class MetabolizerSystem : SharedMetabolizerSystem
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
+    [Dependency] private readonly SharedEntityConditionsSystem _entityConditions = default!;
+    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+
+    private EntityQuery<OrganComponent> _organQuery;
+    private EntityQuery<SolutionContainerManagerComponent> _solutionQuery;
+    private static readonly ProtoId<MetabolismGroupPrototype> Gas = "Gas";
+
+    public override void Initialize()
     {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-        [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+        base.Initialize();
 
-        private EntityQuery<OrganComponent> _organQuery;
-        private EntityQuery<SolutionContainerManagerComponent> _solutionQuery;
+        _organQuery = GetEntityQuery<OrganComponent>();
+        _solutionQuery = GetEntityQuery<SolutionContainerManagerComponent>();
 
-        public override void Initialize()
+        SubscribeLocalEvent<MetabolizerComponent, ComponentInit>(OnMetabolizerInit);
+        SubscribeLocalEvent<MetabolizerComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<MetabolizerComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
+    }
+
+    private void OnMapInit(Entity<MetabolizerComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
+    }
+
+    private void OnMetabolizerInit(Entity<MetabolizerComponent> entity, ref ComponentInit args)
+    {
+        if (!entity.Comp.SolutionOnBody)
         {
-            base.Initialize();
-
-            _organQuery = GetEntityQuery<OrganComponent>();
-            _solutionQuery = GetEntityQuery<SolutionContainerManagerComponent>();
-
-            SubscribeLocalEvent<MetabolizerComponent, ComponentInit>(OnMetabolizerInit);
-            SubscribeLocalEvent<MetabolizerComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<MetabolizerComponent, EntityUnpausedEvent>(OnUnpaused);
-            SubscribeLocalEvent<MetabolizerComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
+            _solutionContainerSystem.EnsureSolution(entity.Owner, entity.Comp.SolutionName, out _);
         }
-
-        private void OnMapInit(Entity<MetabolizerComponent> ent, ref MapInitEvent args)
+        else if (_organQuery.CompOrNull(entity)?.Body is { } body)
         {
-            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
-        }
-
-        private void OnUnpaused(Entity<MetabolizerComponent> ent, ref EntityUnpausedEvent args)
-        {
-            ent.Comp.NextUpdate += args.PausedTime;
-        }
-
-        private void OnMetabolizerInit(Entity<MetabolizerComponent> entity, ref ComponentInit args)
-        {
-            if (!entity.Comp.SolutionOnBody)
-            {
-                _solutionContainerSystem.EnsureSolution(entity.Owner, entity.Comp.SolutionName, out _);
-            }
-            else if (_organQuery.CompOrNull(entity)?.Body is { } body)
-            {
-                _solutionContainerSystem.EnsureSolution(body, entity.Comp.SolutionName, out _);
-            }
-        }
-
-        private void OnApplyMetabolicMultiplier(Entity<MetabolizerComponent> ent, ref ApplyMetabolicMultiplierEvent args)
-        {
-            ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            var metabolizers = new ValueList<(EntityUid Uid, MetabolizerComponent Component)>(Count<MetabolizerComponent>());
-            var query = EntityQueryEnumerator<MetabolizerComponent>();
-
-            while (query.MoveNext(out var uid, out var comp))
-            {
-                metabolizers.Add((uid, comp));
-            }
-
-            foreach (var (uid, metab) in metabolizers)
-            {
-                // Only update as frequently as it should
-                if (_gameTiming.CurTime < metab.NextUpdate)
-                    continue;
-
-                metab.NextUpdate += metab.AdjustedUpdateInterval;
-                TryMetabolize((uid, metab));
-            }
-        }
-
-        private void TryMetabolize(Entity<MetabolizerComponent, OrganComponent?, SolutionContainerManagerComponent?> ent)
-        {
-            _organQuery.Resolve(ent, ref ent.Comp2, logMissing: false);
-
-            // First step is get the solution we actually care about
-            var solutionName = ent.Comp1.SolutionName;
-            Solution? solution = null;
-            Entity<SolutionComponent>? soln = default!;
-            EntityUid? solutionEntityUid = null;
-
-            if (ent.Comp1.SolutionOnBody)
-            {
-                if (ent.Comp2?.Body is { } body)
-                {
-                    if (!_solutionQuery.Resolve(body, ref ent.Comp3, logMissing: false))
-                        return;
-
-                    _solutionContainerSystem.TryGetSolution((body, ent.Comp3), solutionName, out soln, out solution);
-                    solutionEntityUid = body;
-                }
-            }
-            else
-            {
-                if (!_solutionQuery.Resolve(ent, ref ent.Comp3, logMissing: false))
-                    return;
-
-                _solutionContainerSystem.TryGetSolution((ent, ent), solutionName, out soln, out solution);
-                solutionEntityUid = ent;
-            }
-
-            if (solutionEntityUid is null
-                || soln is null
-                || solution is null
-                || solution.Contents.Count == 0)
-            {
-                return;
-            }
-
-            // randomize the reagent list so we don't have any weird quirks
-            // like alphabetical order or insertion order mattering for processing
-            var list = solution.Contents.ToArray();
-            _random.Shuffle(list);
-
-            int reagents = 0;
-            foreach (var (reagent, quantity) in list)
-            {
-                if (!_prototypeManager.TryIndex<ReagentPrototype>(reagent.Prototype, out var proto))
-                    continue;
-
-                var mostToRemove = FixedPoint2.Zero;
-                if (proto.Metabolisms is null)
-                {
-                    if (ent.Comp1.RemoveEmpty)
-                    {
-                        solution.RemoveReagent(reagent, FixedPoint2.New(1));
-                    }
-
-                    continue;
-                }
-
-                // we're done here entirely if this is true
-                if (reagents >= ent.Comp1.MaxReagentsProcessable)
-                    return;
-
-
-                // loop over all our groups and see which ones apply
-                if (ent.Comp1.MetabolismGroups is null)
-                    continue;
-
-                foreach (var group in ent.Comp1.MetabolismGroups)
-                {
-                    if (!proto.Metabolisms.TryGetValue(group.Id, out var entry))
-                        continue;
-
-                    var rate = entry.MetabolismRate * group.MetabolismRateModifier;
-
-                    // Remove $rate, as long as there's enough reagent there to actually remove that much
-                    mostToRemove = FixedPoint2.Clamp(rate, 0, quantity);
-
-                    float scale = (float) mostToRemove / (float) rate;
-
-                    // if it's possible for them to be dead, and they are,
-                    // then we shouldn't process any effects, but should probably
-                    // still remove reagents
-                    if (TryComp<MobStateComponent>(solutionEntityUid.Value, out var state))
-                    {
-                        if (!proto.WorksOnTheDead && _mobStateSystem.IsDead(solutionEntityUid.Value, state))
-                            continue;
-                    }
-
-                    var actualEntity = ent.Comp2?.Body ?? solutionEntityUid.Value;
-                    var args = new EntityEffectReagentArgs(actualEntity, EntityManager, ent, solution, mostToRemove, proto, null, scale);
-
-                    // do all effects, if conditions apply
-                    foreach (var effect in entry.Effects)
-                    {
-                        if (!effect.ShouldApply(args, _random))
-                            continue;
-
-                        if (effect.ShouldLog)
-                        {
-                            _adminLogger.Add(
-                                LogType.ReagentEffect,
-                                effect.LogImpact,
-                                $"Metabolism effect {effect.GetType().Name:effect}"
-                                + $" of reagent {proto.LocalizedName:reagent}"
-                                + $" applied on entity {actualEntity:entity}"
-                                + $" at {Transform(actualEntity).Coordinates:coordinates}"
-                            );
-                        }
-
-                        effect.Effect(args);
-                    }
-                }
-
-                // remove a certain amount of reagent
-                if (mostToRemove > FixedPoint2.Zero)
-                {
-                    solution.RemoveReagent(reagent, mostToRemove);
-
-                    // We have processed a reagant, so count it towards the cap
-                    reagents += 1;
-                }
-            }
-
-            _solutionContainerSystem.UpdateChemicals(soln.Value);
+            _solutionContainerSystem.EnsureSolution(body, entity.Comp.SolutionName, out _);
         }
     }
+
+    private void OnApplyMetabolicMultiplier(Entity<MetabolizerComponent> ent, ref ApplyMetabolicMultiplierEvent args)
+    {
+        ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var metabolizers = new ValueList<(EntityUid Uid, MetabolizerComponent Component)>(Count<MetabolizerComponent>());
+        var query = EntityQueryEnumerator<MetabolizerComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            metabolizers.Add((uid, comp));
+        }
+
+        foreach (var (uid, metab) in metabolizers)
+        {
+            // Only update as frequently as it should
+            if (_gameTiming.CurTime < metab.NextUpdate)
+                continue;
+
+            metab.NextUpdate += metab.AdjustedUpdateInterval;
+            TryMetabolize((uid, metab));
+        }
+    }
+
+    private void TryMetabolize(Entity<MetabolizerComponent, OrganComponent?, SolutionContainerManagerComponent?> ent)
+    {
+        _organQuery.Resolve(ent, ref ent.Comp2, logMissing: false);
+
+        // First step is get the solution we actually care about
+        var solutionName = ent.Comp1.SolutionName;
+        Solution? solution = null;
+        Entity<SolutionComponent>? soln = default!;
+        EntityUid? solutionEntityUid = null;
+
+        if (ent.Comp1.SolutionOnBody)
+        {
+            if (ent.Comp2?.Body is { } body)
+            {
+                if (!_solutionQuery.Resolve(body, ref ent.Comp3, logMissing: false))
+                    return;
+
+                _solutionContainerSystem.TryGetSolution((body, ent.Comp3), solutionName, out soln, out solution);
+                solutionEntityUid = body;
+            }
+        }
+        else
+        {
+            if (!_solutionQuery.Resolve(ent, ref ent.Comp3, logMissing: false))
+                return;
+
+            _solutionContainerSystem.TryGetSolution((ent, ent), solutionName, out soln, out solution);
+            solutionEntityUid = ent;
+        }
+
+        if (solutionEntityUid is null
+            || soln is null
+            || solution is null
+            || solution.Contents.Count == 0)
+        {
+            return;
+        }
+
+        // randomize the reagent list so we don't have any weird quirks
+        // like alphabetical order or insertion order mattering for processing
+        var list = solution.Contents.ToArray();
+        _random.Shuffle(list);
+
+        int reagents = 0;
+        foreach (var (reagent, quantity) in list)
+        {
+            if (!_prototypeManager.TryIndex<ReagentPrototype>(reagent.Prototype, out var proto))
+                continue;
+
+            var mostToRemove = FixedPoint2.Zero;
+            if (proto.Metabolisms is null)
+            {
+                if (ent.Comp1.RemoveEmpty)
+                {
+                    solution.RemoveReagent(reagent, FixedPoint2.New(1));
+                }
+
+                continue;
+            }
+
+            // we're done here entirely if this is true
+            if (reagents >= ent.Comp1.MaxReagentsProcessable)
+                return;
+
+
+            // loop over all our groups and see which ones apply
+            if (ent.Comp1.MetabolismGroups is null)
+                continue;
+
+            // TODO: Kill MetabolismGroups!
+            foreach (var group in ent.Comp1.MetabolismGroups)
+            {
+                if (!proto.Metabolisms.TryGetValue(group.Id, out var entry))
+                    continue;
+
+                var rate = entry.MetabolismRate * group.MetabolismRateModifier;
+
+                // Remove $rate, as long as there's enough reagent there to actually remove that much
+                mostToRemove = FixedPoint2.Clamp(rate, 0, quantity);
+
+                var scale = (float) mostToRemove;
+
+                // TODO: This is a very stupid workaround to lungs heavily relying on scale = reagent quantity. Needs lung and metabolism refactors to remove.
+                // TODO: Lungs just need to have their scale be equal to the mols consumed, scale needs to be not hardcoded either and configurable per metabolizer...
+                if (group.Id != Gas)
+                    scale /= (float) entry.MetabolismRate;
+
+                // if it's possible for them to be dead, and they are,
+                // then we shouldn't process any effects, but should probably
+                // still remove reagents
+                if (TryComp<MobStateComponent>(solutionEntityUid.Value, out var state))
+                {
+                    if (!proto.WorksOnTheDead && _mobStateSystem.IsDead(solutionEntityUid.Value, state))
+                        continue;
+                }
+
+                var actualEntity = ent.Comp2?.Body ?? solutionEntityUid.Value;
+
+                // do all effects, if conditions apply
+                foreach (var effect in entry.Effects)
+                {
+                    if (scale < effect.MinScale)
+                        continue;
+
+                    // See if conditions apply
+                    if (effect.Conditions != null && !CanMetabolizeEffect(actualEntity, ent, soln.Value, effect.Conditions))
+                        continue;
+
+                    ApplyEffect(effect);
+
+                }
+
+                // TODO: We should have to do this with metabolism. ReagentEffect struct needs refactoring and so does metabolism!
+                void ApplyEffect(EntityEffect effect)
+                {
+                    switch (effect)
+                    {
+                        case ModifyLungGas:
+                            _entityEffects.ApplyEffect(ent, effect, scale);
+                            break;
+                        case AdjustReagent:
+                            _entityEffects.ApplyEffect(soln.Value, effect, scale);
+                            break;
+                        default:
+                            _entityEffects.ApplyEffect(actualEntity, effect, scale);
+                            break;
+                    }
+                }
+            }
+
+            // remove a certain amount of reagent
+            if (mostToRemove > FixedPoint2.Zero)
+            {
+                solution.RemoveReagent(reagent, mostToRemove);
+
+                // We have processed a reagant, so count it towards the cap
+                reagents += 1;
+            }
+        }
+
+        _solutionContainerSystem.UpdateChemicals(soln.Value);
+    }
+
+    /// <summary>
+    /// Public API to check if a certain metabolism effect can be applied to an entity.
+    /// TODO: With metabolism refactor make this logic smarter and unhardcode the old hardcoding entity effects used to have for metabolism!
+    /// </summary>
+    /// <param name="body">The body metabolizing the effects</param>
+    /// <param name="organ">The organ doing the metabolizing</param>
+    /// <param name="solution">The solution we are metabolizing from</param>
+    /// <param name="conditions">The conditions that need to be met to metabolize</param>
+    /// <returns>True if we can metabolize! False if we cannot!</returns>
+    public bool CanMetabolizeEffect(EntityUid body, EntityUid organ, Entity<SolutionComponent> solution, EntityCondition[] conditions)
+    {
+        foreach (var condition in conditions)
+        {
+            switch (condition)
+            {
+                // Need specific handling of specific conditions since Metabolism is funny like that.
+                // TODO: MetabolizerTypes should be handled well before this stage by metabolism itself.
+                case MetabolizerTypeCondition:
+                    if (_entityConditions.TryCondition(organ, condition))
+                        continue;
+                    break;
+                case ReagentCondition:
+                    if (_entityConditions.TryCondition(solution, condition))
+                        continue;
+                    break;
+                default:
+                    if (_entityConditions.TryCondition(body, condition))
+                        continue;
+                    break;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
 }
+
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 63b04adc6a..2af7b24f26 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -2,7 +2,6 @@ using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Chat.Systems;
-using Content.Server.EntityEffects;
 using Content.Shared.Body.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
@@ -14,9 +13,11 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Database;
+using Content.Shared.EntityConditions;
+using Content.Shared.EntityConditions.Conditions.Body;
 using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.EffectConditions;
 using Content.Shared.EntityEffects.Effects;
+using Content.Shared.EntityEffects.Effects.Body;
 using Content.Shared.Mobs.Systems;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
@@ -29,16 +30,16 @@ public sealed class RespiratorSystem : EntitySystem
 {
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly AlertsSystem _alertsSystem = default!;
     [Dependency] private readonly AtmosphereSystem _atmosSys = default!;
     [Dependency] private readonly BodySystem _bodySystem = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly DamageableSystem _damageableSys = default!;
     [Dependency] private readonly LungSystem _lungSystem = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly IPrototypeManager _protoMan = default!;
+    [Dependency] private readonly SharedEntityConditionsSystem _entityConditions = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly EntityEffectSystem _entityEffect = default!;
 
     private static readonly ProtoId<MetabolismGroupPrototype> GasId = new("Gas");
 
@@ -340,7 +341,6 @@ public sealed class RespiratorSystem : EntitySystem
             }
         }
 
-        // TODO generalize condition checks
         // this is pretty janky, but I just want to bodge a method that checks if an entity can breathe a gas mixture
         // Applying actual reaction effects require a full ReagentEffectArgs struct.
         bool CanMetabolize(EntityEffect effect)
@@ -348,9 +348,10 @@ public sealed class RespiratorSystem : EntitySystem
             if (effect.Conditions == null)
                 return true;
 
+            // TODO: Use Metabolism Public API to do this instead, once that API has been built.
             foreach (var cond in effect.Conditions)
             {
-                if (cond is OrganType organ && !_entityEffect.OrganCondition(organ, lung))
+                if (cond is MetabolizerTypeCondition organ && !_entityConditions.TryCondition(lung, organ))
                     return false;
             }
 
diff --git a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
index 3ba9e6af31..af7b17643e 100644
--- a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
+++ b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Body.Components;
-using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Temperature.Components;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems;
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index ee7ca4f584..253eea2df9 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -1,8 +1,9 @@
 using Content.Server.Botany.Components;
 using Content.Server.Botany.Systems;
-using Content.Server.EntityEffects;
+using Content.Server.EntityEffects.Effects.Botany;
 using Content.Shared.Atmos;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.Random;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -79,9 +80,13 @@ public partial struct SeedChemQuantity
     [DataField("Inherent")] public bool Inherent = true;
 }
 
-// TODO reduce the number of friends to a reasonable level. Requires ECS-ing things like plant holder component.
+// TODO Make Botany ECS and give it a proper API. I removed the limited access of this class because it's egregious how many systems needed access to it due to a lack of an actual API.
+/// <remarks>
+/// SeedData is no longer restricted because the number of friends is absolutely unreasonable.
+/// This entire data definition is unreasonable. I felt genuine fear looking at this, this is horrific. Send help.
+/// </remarks>
+// TODO: Hit Botany with hammers
 [Virtual, DataDefinition]
-[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent), typeof(EntityEffectSystem), typeof(MutationSystem))]
 public partial class SeedData
 {
     #region Tracking
diff --git a/Content.Server/Botany/Systems/BotanySystem.Produce.cs b/Content.Server/Botany/Systems/BotanySystem.Produce.cs
index f6f3f99c09..7d8f8652c7 100644
--- a/Content.Server/Botany/Systems/BotanySystem.Produce.cs
+++ b/Content.Server/Botany/Systems/BotanySystem.Produce.cs
@@ -7,6 +7,8 @@ namespace Content.Server.Botany.Systems;
 
 public sealed partial class BotanySystem
 {
+    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
+
     public void ProduceGrown(EntityUid uid, ProduceComponent produce)
     {
         if (!TryGetSeed(produce, out var seed))
@@ -15,10 +17,7 @@ public sealed partial class BotanySystem
         foreach (var mutation in seed.Mutations)
         {
             if (mutation.AppliesToProduce)
-            {
-                var args = new EntityEffectBaseArgs(uid, EntityManager);
-                mutation.Effect.Effect(args);
-            }
+                _entityEffects.TryApplyEffect(uid, mutation.Effect);
         }
 
         if (!_solutionContainerSystem.EnsureSolution(uid,
diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs
index ee35db48e3..834fd9e8ef 100644
--- a/Content.Server/Botany/Systems/MutationSystem.cs
+++ b/Content.Server/Botany/Systems/MutationSystem.cs
@@ -13,6 +13,7 @@ public sealed class MutationSystem : EntitySystem
 
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
     private RandomPlantMutationListPrototype _randomMutations = default!;
 
     public override void Initialize()
@@ -32,10 +33,8 @@ public sealed class MutationSystem : EntitySystem
             if (Random(Math.Min(mutation.BaseOdds * severity, 1.0f)))
             {
                 if (mutation.AppliesToPlant)
-                {
-                    var args = new EntityEffectBaseArgs(plantHolder, EntityManager);
-                    mutation.Effect.Effect(args);
-                }
+                    _entityEffects.TryApplyEffect(plantHolder, mutation.Effect);
+
                 // Stat adjustments do not persist by being an attached effect, they just change the stat.
                 if (mutation.Persists && !seed.Mutations.Any(m => m.Name == mutation.Name))
                     seed.Mutations.Add(mutation);
diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index caa796efe2..2554f95455 100644
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -24,8 +24,10 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Content.Shared.Administration.Logs;
+using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.Kitchen.Components;
 using Content.Shared.Labels.Components;
 
@@ -48,6 +50,7 @@ public sealed class PlantHolderSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
 
     public const float HydroponicsSpeedMultiplier = 1f;
     public const float HydroponicsConsumptionMultiplier = 2f;
@@ -887,7 +890,7 @@ public sealed class PlantHolderSystem : EntitySystem
             foreach (var entry in _solutionContainerSystem.RemoveEachReagent(component.SoilSolution.Value, amt))
             {
                 var reagentProto = _prototype.Index<ReagentPrototype>(entry.Reagent.Prototype);
-                reagentProto.ReactionPlant(uid, entry, solution, EntityManager, _random, _adminLogger);
+                _entityEffects.ApplyEffects(uid, reagentProto.PlantMetabolisms.ToArray());
             }
         }
 
diff --git a/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs b/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
index a70c2196ab..58c86f058a 100644
--- a/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
+++ b/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
@@ -39,7 +39,7 @@ public sealed class DumpReagentGuideText : LocalizedEntityCommands
         {
             foreach (var effect in entry.Effects)
             {
-                shell.WriteLine(effect.GuidebookEffectDescription(_prototype, EntityManager.EntitySysManager) ??
+                shell.WriteLine(reagent.GuidebookReagentEffectDescription(_prototype, EntityManager.EntitySysManager, effect, entry.MetabolismRate) ??
                                 Loc.GetString($"cmd-dumpreagentguidetext-skipped", ("effect", effect.GetType())));
             }
         }
diff --git a/Content.Server/Construction/ConstructionSystem.Interactions.cs b/Content.Server/Construction/ConstructionSystem.Interactions.cs
index 3dd5a5b794..77a1a63e02 100644
--- a/Content.Server/Construction/ConstructionSystem.Interactions.cs
+++ b/Content.Server/Construction/ConstructionSystem.Interactions.cs
@@ -13,6 +13,7 @@ using Content.Shared.Prying.Systems;
 using Content.Shared.Radio.EntitySystems;
 using Content.Shared.Stacks;
 using Content.Shared.Temperature;
+using Content.Shared.Temperature.Components;
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Utility;
diff --git a/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs b/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs
new file mode 100644
index 0000000000..e7b8aaf22b
--- /dev/null
+++ b/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs
@@ -0,0 +1,19 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.EntityConditions;
+using Content.Shared.EntityConditions.Conditions.Body;
+
+namespace Content.Server.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this entity is both able to breathe and is currently breathing.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class IsBreathingEntityConditionSystem : EntityConditionSystem<RespiratorComponent, BreathingCondition>
+{
+    [Dependency] private readonly RespiratorSystem _respirator = default!;
+    protected override void Condition(Entity<RespiratorComponent> entity, ref EntityConditionEvent<BreathingCondition> args)
+    {
+        args.Result = _respirator.IsBreathing(entity.AsNullable());
+    }
+}
diff --git a/Content.Server/EntityConditions/Conditions/MetabolizerTypesEntityConditionSystem.cs b/Content.Server/EntityConditions/Conditions/MetabolizerTypesEntityConditionSystem.cs
new file mode 100644
index 0000000000..3b4fb5292b
--- /dev/null
+++ b/Content.Server/EntityConditions/Conditions/MetabolizerTypesEntityConditionSystem.cs
@@ -0,0 +1,21 @@
+using System.Linq;
+using Content.Server.Body.Components;
+using Content.Shared.EntityConditions;
+using Content.Shared.EntityConditions.Conditions.Body;
+
+namespace Content.Server.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this entity has any of the listed metabolizer types.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class MetabolizerTypeEntityConditionSystem : EntityConditionSystem<MetabolizerComponent, MetabolizerTypeCondition>
+{
+    protected override void Condition(Entity<MetabolizerComponent> entity, ref EntityConditionEvent<MetabolizerTypeCondition> args)
+    {
+        if (entity.Comp.MetabolizerTypes == null)
+            return;
+
+        args.Result = entity.Comp.MetabolizerTypes.Overlaps(args.Condition.Type);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs
new file mode 100644
index 0000000000..033704ffcd
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs
@@ -0,0 +1,22 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Atmos;
+
+namespace Content.Server.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// This effect adjusts a gas at the tile this entity is currently on.
+/// The amount changed is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class CreateGasEntityEffectSystem : EntityEffectSystem<TransformComponent, CreateGas>
+{
+    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<CreateGas> args)
+    {
+        var tileMix = _atmosphere.GetContainingMixture(entity.AsNullable(), false, true);
+
+        tileMix?.AdjustMoles(args.Effect.Gas, args.Scale * args.Effect.Moles);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs
new file mode 100644
index 0000000000..65c818f143
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs
@@ -0,0 +1,25 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Atmos;
+
+namespace Content.Server.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// Adds a number of FireStacks modified by scale to this entity.
+/// The amount of FireStacks added is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class FlammableEntityEffectSystem : EntityEffectSystem<FlammableComponent, Flammable>
+{
+    [Dependency] private readonly FlammableSystem _flammable = default!;
+
+    protected override void Effect(Entity<FlammableComponent> entity, ref EntityEffectEvent<Flammable> args)
+    {
+        // The multiplier is determined by if the entity is already on fire, and if the multiplier for existing FireStacks has a value.
+        // If both of these are true, we use the MultiplierOnExisting value, otherwise we use the standard Multiplier.
+        var multiplier = entity.Comp.FireStacks == 0f || args.Effect.MultiplierOnExisting == null ? args.Effect.Multiplier : args.Effect.MultiplierOnExisting.Value;
+
+        _flammable.AdjustFireStacks(entity, args.Scale * multiplier, entity.Comp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs
new file mode 100644
index 0000000000..de90656c66
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs
@@ -0,0 +1,23 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Atmos;
+
+namespace Content.Server.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// Sets this entity on fire.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class IngiteEntityEffectSystem : EntityEffectSystem<FlammableComponent, Ignite>
+{
+    [Dependency] private readonly FlammableSystem _flammable = default!;
+
+    protected override void Effect(Entity<FlammableComponent> entity, ref EntityEffectEvent<Ignite> args)
+    {
+        // TODO: Proper BodySystem Metabolism Effect relay...
+        // TODO: If this fucks over downstream shitmed, I give you full approval to use whatever shitcode method you need to fix it. Metabolism is awful.
+        _flammable.Ignite(entity, entity, flammable: entity.Comp);
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs b/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs
new file mode 100644
index 0000000000..0cbf0b3864
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs
@@ -0,0 +1,20 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Body;
+
+namespace Content.Server.EntityEffects.Effects.Body;
+
+/// <summary>
+/// This effect adjusts a respirator's saturation value.
+/// The saturation adjustment is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class OxygenateEntityEffectsSystem : EntityEffectSystem<RespiratorComponent, Oxygenate>
+{
+    [Dependency] private readonly RespiratorSystem _respirator = default!;
+    protected override void Effect(Entity<RespiratorComponent> entity, ref EntityEffectEvent<Oxygenate> args)
+    {
+        _respirator.UpdateSaturation(entity, args.Scale * args.Effect.Factor, entity.Comp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs
new file mode 100644
index 0000000000..64f61f5b11
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs
@@ -0,0 +1,20 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustHealthEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustHealth>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustHealth> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        entity.Comp.MutationLevel += args.Effect.Amount * entity.Comp.MutationMod;
+        _plantHolder.CheckHealth(entity, entity.Comp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs
new file mode 100644
index 0000000000..f35ff25b25
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs
@@ -0,0 +1,20 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustMutationLevelEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustMutationLevel>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustMutationLevel> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        entity.Comp.Health += args.Effect.Amount;
+        _plantHolder.CheckHealth(entity, entity.Comp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationModEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationModEntityEffectSystem.cs
new file mode 100644
index 0000000000..3163ee374c
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationModEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustMutationModEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustMutationMod>
+{
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustMutationMod> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        entity.Comp.MutationMod += args.Effect.Amount;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs
new file mode 100644
index 0000000000..56c016700d
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustNutritionEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustNutrition>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustNutrition> args)
+    {
+        _plantHolder.AdjustNutrient(entity, args.Effect.Amount, entity);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs
new file mode 100644
index 0000000000..0495034b38
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustPestsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustPests>
+{
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustPests> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        entity.Comp.PestLevel += args.Effect.Amount;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs
new file mode 100644
index 0000000000..ebe5c83181
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs
@@ -0,0 +1,19 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustPotencyEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustPotency>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustPotency> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
+        entity.Comp.Seed.Potency = Math.Max(entity.Comp.Seed.Potency + args.Effect.Amount, 1);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs
new file mode 100644
index 0000000000..31dc328977
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustToxinsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustToxins>
+{
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustToxins> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        entity.Comp.Toxins += args.Effect.Amount;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs
new file mode 100644
index 0000000000..706eeb2ffe
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustWaterEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustWater>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustWater> args)
+    {
+        _plantHolder.AdjustWater(entity, args.Effect.Amount, entity.Comp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs
new file mode 100644
index 0000000000..34aa51e4ff
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustWeedsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustWeeds>
+{
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustWeeds> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        entity.Comp.WeedLevel += args.Effect.Amount;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs
new file mode 100644
index 0000000000..b0faa6255e
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs
@@ -0,0 +1,19 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAffectGrowthEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAffectGrowth>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAffectGrowth> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        _plantHolder.AffectGrowth(entity, (int)args.Effect.Amount, entity);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs
new file mode 100644
index 0000000000..3d82f74b11
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs
@@ -0,0 +1,122 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+/// <summary>
+/// This system mutates an inputted stat for a PlantHolder, only works for floats, integers, and bools.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class PlantChangeStatEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantChangeStat>
+{
+    // TODO: This is awful. I do not have the strength to refactor this. I want it gone.
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantChangeStat> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        var effect = args.Effect;
+        var member = entity.Comp.Seed.GetType().GetField(args.Effect.TargetValue);
+
+        if (member == null)
+        {
+            Log.Error($"{ effect.GetType().Name } Error: Member { args.Effect.TargetValue} not found on { entity.Comp.Seed.GetType().Name }. Did you misspell it?");
+            return;
+        }
+
+        var currentValObj = member.GetValue(entity.Comp.Seed);
+        if (currentValObj == null)
+            return;
+
+        if (member.FieldType == typeof(float))
+        {
+            var floatVal = (float)currentValObj;
+            MutateFloat(ref floatVal, args.Effect.MinValue, args.Effect.MaxValue, args.Effect.Steps);
+            member.SetValue(entity.Comp.Seed, floatVal);
+        }
+        else if (member.FieldType == typeof(int))
+        {
+            var intVal = (int)currentValObj;
+            MutateInt(ref intVal, (int)args.Effect.MinValue, (int)args.Effect.MaxValue, args.Effect.Steps);
+            member.SetValue(entity.Comp.Seed, intVal);
+        }
+        else if (member.FieldType == typeof(bool))
+        {
+            var boolVal = (bool)currentValObj;
+            boolVal = !boolVal;
+            member.SetValue(entity.Comp.Seed, boolVal);
+        }
+    }
+
+    // Mutate reference 'val' between 'min' and 'max' by pretending the value
+    // is representable by a thermometer code with 'bits' number of bits and
+    // randomly flipping some of them.
+    private void MutateFloat(ref float val, float min, float max, int bits)
+    {
+        if (min == max)
+        {
+            val = min;
+            return;
+        }
+
+        // Starting number of bits that are high, between 0 and bits.
+        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
+        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
+        // val may be outside the range of min/max due to starting prototype values, so clamp.
+        valInt = Math.Clamp(valInt, 0, bits);
+
+        // Probability that the bit flip increases n.
+        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasive it it.
+        // In other words, it tends to go to the middle.
+        float probIncrease = 1 - (float)valInt / bits;
+        int valIntMutated;
+        if (_random.Prob(probIncrease))
+        {
+            valIntMutated = valInt + 1;
+        }
+        else
+        {
+            valIntMutated = valInt - 1;
+        }
+
+        // Set value based on mutated thermometer code.
+        float valMutated = Math.Clamp((float)valIntMutated / bits * (max - min) + min, min, max);
+        val = valMutated;
+    }
+
+    private void MutateInt(ref int val, int min, int max, int bits)
+    {
+        if (min == max)
+        {
+            val = min;
+            return;
+        }
+
+        // Starting number of bits that are high, between 0 and bits.
+        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
+        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
+        // val may be outside the range of min/max due to starting prototype values, so clamp.
+        valInt = Math.Clamp(valInt, 0, bits);
+
+        // Probability that the bit flip increases n.
+        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasing it.
+        // In other words, it tends to go to the middle.
+        float probIncrease = 1 - (float)valInt / bits;
+        int valMutated;
+        if (_random.Prob(probIncrease))
+        {
+            valMutated = val + 1;
+        }
+        else
+        {
+            valMutated = val - 1;
+        }
+
+        valMutated = Math.Clamp(valMutated, min, max);
+        val = valMutated;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs
new file mode 100644
index 0000000000..710bce24dd
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs
@@ -0,0 +1,30 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantCryoxadoneEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantCryoxadone>
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantCryoxadone> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        var deviation = 0;
+        var seed = entity.Comp.Seed;
+        if (seed == null)
+            return;
+        if (entity.Comp.Age > seed.Maturation)
+            deviation = (int) Math.Max(seed.Maturation - 1, entity.Comp.Age - _random.Next(7, 10));
+        else
+            deviation = (int) (seed.Maturation / seed.GrowthStages);
+        entity.Comp.Age -= deviation;
+        entity.Comp.LastProduce = entity.Comp.Age;
+        entity.Comp.SkipAging++;
+        entity.Comp.ForceUpdate = true;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs
new file mode 100644
index 0000000000..1661c501be
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Server.Popups;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+using Content.Shared.Popups;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantDestroySeedsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantDestroySeeds>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantDestroySeeds> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead || entity.Comp.Seed.Immutable)
+            return;
+
+        if (entity.Comp.Seed.Seedless)
+            return;
+
+        _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
+        _popup.PopupEntity(
+            Loc.GetString("botany-plant-seedsdestroyed"),
+            entity,
+            PopupType.SmallCaution
+        );
+        entity.Comp.Seed.Seedless = true;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs
new file mode 100644
index 0000000000..f6aebde465
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantDiethylamineEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantDiethylamine>
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantDiethylamine> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead || entity.Comp.Seed.Immutable)
+            return;
+
+        if (_random.Prob(0.1f))
+        {
+            _plantHolder.EnsureUniqueSeed(entity, entity);
+            entity.Comp.Seed!.Lifespan++;
+        }
+
+        if (_random.Prob(0.1f))
+        {
+            _plantHolder.EnsureUniqueSeed(entity, entity);
+            entity.Comp.Seed!.Endurance++;
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs
new file mode 100644
index 0000000000..8a073392e1
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantPhalanximineEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantPhalanximine>
+{
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantPhalanximine> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead || entity.Comp.Seed.Immutable)
+            return;
+
+        entity.Comp.Seed.Viable = true;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs
new file mode 100644
index 0000000000..4d724be244
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs
@@ -0,0 +1,26 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Server.Popups;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantRestoreSeedsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantRestoreSeeds>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantRestoreSeeds> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead || entity.Comp.Seed.Immutable)
+            return;
+
+        if (!entity.Comp.Seed.Seedless)
+            return;
+
+        _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
+        _popup.PopupEntity(Loc.GetString("botany-plant-seedsrestored"), entity);
+        entity.Comp.Seed.Seedless = false;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs
new file mode 100644
index 0000000000..68ea3319ef
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs
@@ -0,0 +1,41 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+/// <summary>
+/// This effect directly increases the potency of a PlantHolder's plant provided it exists and isn't dead.
+/// Potency directly correlates to the size of the plant's produce.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class RobustHarvestEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, RobustHarvest>
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<RobustHarvest> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        if (entity.Comp.Seed.Potency < args.Effect.PotencyLimit)
+        {
+            _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
+            entity.Comp.Seed.Potency = Math.Min(entity.Comp.Seed.Potency + args.Effect.PotencyIncrease, args.Effect.PotencyLimit);
+
+            if (entity.Comp.Seed.Potency > args.Effect.PotencySeedlessThreshold)
+            {
+                entity.Comp.Seed.Seedless = true;
+            }
+        }
+        else if (entity.Comp.Seed.Yield > 1 && _random.Prob(0.1f))
+        {
+            // Too much of a good thing reduces yield
+            _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
+            entity.Comp.Seed.Yield--;
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
new file mode 100644
index 0000000000..120ae6e881
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
@@ -0,0 +1,43 @@
+using Content.Server.Botany;
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany;
+
+public sealed partial class PlantMutateChemicalsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateChemicals>
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateChemicals> args)
+    {
+        if (entity.Comp.Seed == null)
+            return;
+
+        var chemicals = entity.Comp.Seed.Chemicals;
+        var randomChems = _proto.Index(args.Effect.RandomPickBotanyReagent).Fills;
+
+        // Add a random amount of a random chemical to this set of chemicals
+        var pick = _random.Pick(randomChems);
+        var chemicalId = _random.Pick(pick.Reagents);
+        var amount = _random.Next(1, (int)pick.Quantity);
+        var seedChemQuantity = new SeedChemQuantity();
+        if (chemicals.ContainsKey(chemicalId))
+        {
+            seedChemQuantity.Min = chemicals[chemicalId].Min;
+            seedChemQuantity.Max = chemicals[chemicalId].Max + amount;
+        }
+        else
+        {
+            seedChemQuantity.Min = 1;
+            seedChemQuantity.Max = 1 + amount;
+            seedChemQuantity.Inherent = false;
+        }
+        var potencyDivisor = (int)Math.Ceiling(100.0f / seedChemQuantity.Max);
+        seedChemQuantity.PotencyDivisor = potencyDivisor;
+        chemicals[chemicalId] = seedChemQuantity;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs
new file mode 100644
index 0000000000..e2376ba186
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs
@@ -0,0 +1,53 @@
+using System.Linq;
+using Content.Server.Botany.Components;
+using Content.Shared.Atmos;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany;
+
+public sealed partial class PlantMutateExudeGasesEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateExudeGases>
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateExudeGases> args)
+    {
+        if (entity.Comp.Seed == null)
+            return;
+
+        var gasses = entity.Comp.Seed.ExudeGasses;
+
+        // Add a random amount of a random gas to this gas dictionary
+        float amount = _random.NextFloat(args.Effect.MinValue, args.Effect.MaxValue);
+        var gas = _random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
+
+        if (!gasses.TryAdd(gas, amount))
+        {
+            gasses[gas] += amount;
+        }
+    }
+}
+
+public sealed partial class PlantMutateConsumeGasesEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateConsumeGases>
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateConsumeGases> args)
+    {
+        if (entity.Comp.Seed == null)
+            return;
+
+        var gasses = entity.Comp.Seed.ConsumeGasses;
+
+        // Add a random amount of a random gas to this gas dictionary
+        var amount = _random.NextFloat(args.Effect.MinValue, args.Effect.MaxValue);
+        var gas = _random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
+
+        if (!gasses.TryAdd(gas, amount))
+        {
+            gasses[gas] += amount;
+        }
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs
new file mode 100644
index 0000000000..95d7f97bbe
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs
@@ -0,0 +1,25 @@
+using Content.Server.Botany;
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany;
+
+namespace Content.Server.EntityEffects.Effects.Botany;
+
+public sealed partial class PlantMutateHarvestEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateHarvest>
+{
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateHarvest> args)
+    {
+        if (entity.Comp.Seed == null)
+            return;
+
+        switch (entity.Comp.Seed.HarvestRepeat)
+        {
+            case HarvestType.NoRepeat:
+                entity.Comp.Seed.HarvestRepeat = HarvestType.Repeat;
+                break;
+            case HarvestType.Repeat:
+                entity.Comp.Seed.HarvestRepeat = HarvestType.SelfHarvest;
+                break;
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs
new file mode 100644
index 0000000000..c26e1e08cf
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Botany;
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany;
+
+public sealed partial class PlantMutateSpeciesChangeEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateSpeciesChange>
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateSpeciesChange> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Seed.MutationPrototypes.Count == 0)
+            return;
+
+        var targetProto = _random.Pick(entity.Comp.Seed.MutationPrototypes);
+        _proto.TryIndex(targetProto, out SeedPrototype? protoSeed);
+
+        if (protoSeed == null)
+        {
+            Log.Error($"Seed prototype could not be found: {targetProto}!");
+            return;
+        }
+
+        entity.Comp.Seed = entity.Comp.Seed.SpeciesChange(protoSeed);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/EmoteEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/EmoteEntityEffectSystem.cs
new file mode 100644
index 0000000000..05ab857267
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/EmoteEntityEffectSystem.cs
@@ -0,0 +1,22 @@
+using Content.Server.Chat.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Makes this entity emote.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class EmoteEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Emote>
+{
+    [Dependency] private readonly ChatSystem _chat = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Emote> args)
+    {
+        if (args.Effect.ShowInChat)
+            _chat.TryEmoteWithChat(entity, args.Effect.EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: args.Effect.Force);
+        else
+            _chat.TryEmoteWithoutChat(entity, args.Effect.EmoteId);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
new file mode 100644
index 0000000000..c623b25857
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
@@ -0,0 +1,42 @@
+using Content.Server.Ghost.Roles.Components;
+using Content.Server.Speech.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects;
+using Content.Shared.Mind.Components;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Makes this entity sentient. Allows ghost to take it over if it's not already occupied.
+/// Optionally also allows this entity to speak.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class MakeSentientEntityEffectSystem : EntityEffectSystem<MetaDataComponent, MakeSentient>
+{
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<MakeSentient> args)
+    {
+        // Let affected entities speak normally to make this effect different from, say, the "random sentience" event
+        // This also works on entities that already have a mind
+        // We call this before the mind check to allow things like player-controlled mice to be able to benefit from the effect
+        if (args.Effect.AllowSpeech)
+        {
+            RemComp<ReplacementAccentComponent>(entity);
+            // TODO: Make MonkeyAccent a replacement accent and remove MonkeyAccent code-smell.
+            RemComp<MonkeyAccentComponent>(entity);
+        }
+
+        // Stops from adding a ghost role to things like people who already have a mind
+        if (TryComp<MindContainerComponent>(entity, out var mindContainer) && mindContainer.HasMind)
+            return;
+
+        // Don't add a ghost role to things that already have ghost roles
+        if (TryComp(entity, out GhostRoleComponent? ghostRole))
+            return;
+
+        ghostRole = AddComp<GhostRoleComponent>(entity);
+        EnsureComp<GhostTakeoverAvailableComponent>(entity);
+
+        ghostRole.RoleName = entity.Comp.EntityName;
+        ghostRole.RoleDescription = Loc.GetString("ghost-role-information-cognizine-description");
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs
new file mode 100644
index 0000000000..5f19bcc50b
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs
@@ -0,0 +1,19 @@
+using Content.Server.Polymorph.Components;
+using Content.Server.Polymorph.Systems;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Polymorphs this entity into another entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class PolymorphEntityEffectSystem : EntityEffectSystem<PolymorphableComponent, Shared.EntityEffects.Effects.Polymorph>
+{
+    [Dependency] private readonly PolymorphSystem _polymorph = default!;
+
+    protected override void Effect(Entity<PolymorphableComponent> entity, ref EntityEffectEvent<Shared.EntityEffects.Effects.Polymorph> args)
+    {
+        _polymorph.PolymorphEntity(entity, args.Effect.Prototype);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs
new file mode 100644
index 0000000000..e5ef488de8
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs
@@ -0,0 +1,51 @@
+using Content.Server.Fluids.EntitySystems;
+using Content.Server.Spreader;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Solution;
+using Content.Shared.Maps;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Map;
+
+namespace Content.Server.EntityEffects.Effects.Solution;
+
+/// <summary>
+/// This effect creates smoke at this solution's position.
+/// The amount of smoke created is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class AreaReactionEntityEffectsSystem : EntityEffectSystem<SolutionComponent, AreaReactionEffect>
+{
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly SmokeSystem _smoke = default!;
+    [Dependency] private readonly SpreaderSystem _spreader = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
+
+    // TODO: A sane way to make Smoke without a solution.
+    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AreaReactionEffect> args)
+    {
+        var xform = Transform(entity);
+        var mapCoords = _xform.GetMapCoordinates(entity);
+        var spreadAmount = (int) Math.Max(0, Math.Ceiling(args.Scale / args.Effect.OverflowThreshold));
+        var effect = args.Effect;
+
+        if (!_mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
+            !_map.TryGetTileRef(gridUid, grid, xform.Coordinates, out var tileRef))
+            return;
+
+        if (_spreader.RequiresFloorToSpread(effect.PrototypeId.ToString()) && _turf.IsSpace(tileRef))
+            return;
+
+        var coords = _map.MapToGrid(gridUid, mapCoords);
+        var ent = Spawn(args.Effect.PrototypeId, coords.SnapToGrid());
+
+        _smoke.StartSmoke(ent, entity.Comp.Solution, args.Effect.Duration, spreadAmount);
+
+        _audio.PlayPvs(args.Effect.Sound, entity, AudioParams.Default.WithVariation(0.25f));
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
new file mode 100644
index 0000000000..55fc120051
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
@@ -0,0 +1,28 @@
+using Content.Server.Explosion.EntitySystems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Transform;
+
+namespace Content.Server.EntityEffects.Effects.Transform;
+
+/// <summary>
+/// Creates an explosion at this entity's position.
+/// Intensity is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ExplosionEntityEffectSystem : EntityEffectSystem<TransformComponent, ExplosionEffect>
+{
+    [Dependency] private readonly ExplosionSystem _explosion = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<ExplosionEffect> args)
+    {
+        var intensity = MathF.Min(args.Effect.IntensityPerUnit * args.Scale, args.Effect.MaxTotalIntensity);
+
+        _explosion.QueueExplosion(
+            entity,
+            args.Effect.ExplosionType,
+            intensity,
+            args.Effect.IntensitySlope,
+            args.Effect.MaxIntensity,
+            args.Effect.TileBreakScale);
+    }
+}
diff --git a/Content.Server/EntityEffects/EntityEffectSystem.cs b/Content.Server/EntityEffects/EntityEffectSystem.cs
deleted file mode 100644
index 238ef4849d..0000000000
--- a/Content.Server/EntityEffects/EntityEffectSystem.cs
+++ /dev/null
@@ -1,976 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Server.Botany;
-using Content.Server.Chat.Systems;
-using Content.Server.Emp;
-using Content.Server.Explosion.EntitySystems;
-using Content.Server.Fluids.EntitySystems;
-using Content.Server.Ghost.Roles.Components;
-using Content.Server.Polymorph.Components;
-using Content.Server.Polymorph.Systems;
-using Content.Server.Speech.Components;
-using Content.Server.Spreader;
-using Content.Server.Temperature.Components;
-using Content.Server.Temperature.Systems;
-using Content.Server.Zombies;
-using Content.Shared.Atmos;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Body.Components;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.EntityEffects.EffectConditions;
-using Content.Shared.EntityEffects.Effects.PlantMetabolism;
-using Content.Shared.EntityEffects.Effects;
-using Content.Shared.EntityEffects;
-using Content.Shared.Flash;
-using Content.Shared.Maps;
-using Content.Shared.Medical;
-using Content.Shared.Mind.Components;
-using Content.Shared.Popups;
-using Content.Shared.Random;
-using Content.Shared.Traits.Assorted;
-using Content.Shared.Zombies;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-using TemperatureCondition = Content.Shared.EntityEffects.EffectConditions.Temperature; // disambiguate the namespace
-using PolymorphEffect = Content.Shared.EntityEffects.Effects.Polymorph;
-
-namespace Content.Server.EntityEffects;
-
-public sealed class EntityEffectSystem : EntitySystem
-{
-    private static readonly ProtoId<WeightedRandomFillSolutionPrototype> RandomPickBotanyReagent = "RandomPickBotanyReagent";
-
-    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
-    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly EmpSystem _emp = default!;
-    [Dependency] private readonly ExplosionSystem _explosion = default!;
-    [Dependency] private readonly FlammableSystem _flammable = default!;
-    [Dependency] private readonly SharedFlashSystem _flash = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
-    [Dependency] private readonly IPrototypeManager _protoManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly SharedMapSystem _map = default!;
-    [Dependency] private readonly MutationSystem _mutation = default!;
-    [Dependency] private readonly NarcolepsySystem _narcolepsy = default!;
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
-    [Dependency] private readonly PolymorphSystem _polymorph = default!;
-    [Dependency] private readonly RespiratorSystem _respirator = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SmokeSystem _smoke = default!;
-    [Dependency] private readonly SpreaderSystem _spreader = default!;
-    [Dependency] private readonly TemperatureSystem _temperature = default!;
-    [Dependency] private readonly SharedTransformSystem _xform = default!;
-    [Dependency] private readonly VomitSystem _vomit = default!;
-    [Dependency] private readonly TurfSystem _turf = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<CheckEntityEffectConditionEvent<TemperatureCondition>>(OnCheckTemperature);
-        SubscribeLocalEvent<CheckEntityEffectConditionEvent<Breathing>>(OnCheckBreathing);
-        SubscribeLocalEvent<CheckEntityEffectConditionEvent<OrganType>>(OnCheckOrganType);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustHealth>>(OnExecutePlantAdjustHealth);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustMutationLevel>>(OnExecutePlantAdjustMutationLevel);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustMutationMod>>(OnExecutePlantAdjustMutationMod);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustNutrition>>(OnExecutePlantAdjustNutrition);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustPests>>(OnExecutePlantAdjustPests);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustPotency>>(OnExecutePlantAdjustPotency);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustToxins>>(OnExecutePlantAdjustToxins);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustWater>>(OnExecutePlantAdjustWater);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustWeeds>>(OnExecutePlantAdjustWeeds);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAffectGrowth>>(OnExecutePlantAffectGrowth);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantChangeStat>>(OnExecutePlantChangeStat);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantCryoxadone>>(OnExecutePlantCryoxadone);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantDestroySeeds>>(OnExecutePlantDestroySeeds);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantDiethylamine>>(OnExecutePlantDiethylamine);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantPhalanximine>>(OnExecutePlantPhalanximine);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantRestoreSeeds>>(OnExecutePlantRestoreSeeds);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<RobustHarvest>>(OnExecuteRobustHarvest);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<AdjustTemperature>>(OnExecuteAdjustTemperature);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<AreaReactionEffect>>(OnExecuteAreaReactionEffect);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<CauseZombieInfection>>(OnExecuteCauseZombieInfection);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ChemCleanBloodstream>>(OnExecuteChemCleanBloodstream);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ChemVomit>>(OnExecuteChemVomit);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<CreateEntityReactionEffect>>(OnExecuteCreateEntityReactionEffect);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<CreateGas>>(OnExecuteCreateGas);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<CureZombieInfection>>(OnExecuteCureZombieInfection);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<Emote>>(OnExecuteEmote);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<EmpReactionEffect>>(OnExecuteEmpReactionEffect);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ExplosionReactionEffect>>(OnExecuteExplosionReactionEffect);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<FlammableReaction>>(OnExecuteFlammableReaction);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<FlashReactionEffect>>(OnExecuteFlashReactionEffect);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<Ignite>>(OnExecuteIgnite);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<MakeSentient>>(OnExecuteMakeSentient);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ModifyBleedAmount>>(OnExecuteModifyBleedAmount);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ModifyBloodLevel>>(OnExecuteModifyBloodLevel);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ModifyLungGas>>(OnExecuteModifyLungGas);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<Oxygenate>>(OnExecuteOxygenate);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantMutateChemicals>>(OnExecutePlantMutateChemicals);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantMutateConsumeGasses>>(OnExecutePlantMutateConsumeGasses);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantMutateExudeGasses>>(OnExecutePlantMutateExudeGasses);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantMutateHarvest>>(OnExecutePlantMutateHarvest);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantSpeciesChange>>(OnExecutePlantSpeciesChange);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PolymorphEffect>>(OnExecutePolymorph);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ResetNarcolepsy>>(OnExecuteResetNarcolepsy);
-    }
-
-    private void OnCheckTemperature(ref CheckEntityEffectConditionEvent<TemperatureCondition> args)
-    {
-        args.Result = false;
-        if (TryComp(args.Args.TargetEntity, out TemperatureComponent? temp))
-        {
-            if (temp.CurrentTemperature >= args.Condition.Min && temp.CurrentTemperature <= args.Condition.Max)
-                args.Result = true;
-        }
-    }
-
-    private void OnCheckBreathing(ref CheckEntityEffectConditionEvent<Breathing> args)
-    {
-        if (!TryComp(args.Args.TargetEntity, out RespiratorComponent? respiratorComp))
-        {
-            args.Result = !args.Condition.IsBreathing;
-            return;
-        }
-
-        var breathingState = _respirator.IsBreathing((args.Args.TargetEntity, respiratorComp));
-        args.Result = args.Condition.IsBreathing == breathingState;
-    }
-
-    private void OnCheckOrganType(ref CheckEntityEffectConditionEvent<OrganType> args)
-    {
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (reagentArgs.OrganEntity == null)
-            {
-                args.Result = false;
-                return;
-            }
-
-            args.Result = OrganCondition(args.Condition, reagentArgs.OrganEntity.Value);
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    public bool OrganCondition(OrganType condition, Entity<MetabolizerComponent?> metabolizer)
-    {
-        metabolizer.Comp ??= EntityManager.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
-        if (metabolizer.Comp != null
-            && metabolizer.Comp.MetabolizerTypes != null
-            && metabolizer.Comp.MetabolizerTypes.Contains(condition.Type))
-            return condition.ShouldHave;
-        return !condition.ShouldHave;
-    }
-
-    /// <summary>
-    ///     Checks if the plant holder can metabolize the reagent or not. Checks if it has an alive plant by default.
-    /// </summary>
-    /// <param name="plantHolder">The entity holding the plant</param>
-    /// <param name="plantHolderComponent">The plant holder component</param>
-    /// <param name="entityManager">The entity manager</param>
-    /// <param name="mustHaveAlivePlant">Whether to check if it has an alive plant or not</param>
-    /// <returns></returns>
-    private bool CanMetabolizePlant(EntityUid plantHolder, [NotNullWhen(true)] out PlantHolderComponent? plantHolderComponent,
-        bool mustHaveAlivePlant = true, bool mustHaveMutableSeed = false)
-    {
-        plantHolderComponent = null;
-
-        if (!TryComp(plantHolder, out plantHolderComponent))
-            return false;
-
-        if (mustHaveAlivePlant && (plantHolderComponent.Seed == null || plantHolderComponent.Dead))
-            return false;
-
-        if (mustHaveMutableSeed && (plantHolderComponent.Seed == null || plantHolderComponent.Seed.Immutable))
-            return false;
-
-        return true;
-    }
-
-    private void OnExecutePlantAdjustHealth(ref ExecuteEntityEffectEvent<PlantAdjustHealth> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        plantHolderComp.Health += args.Effect.Amount;
-        _plantHolder.CheckHealth(args.Args.TargetEntity, plantHolderComp);
-    }
-
-    private void OnExecutePlantAdjustMutationLevel(ref ExecuteEntityEffectEvent<PlantAdjustMutationLevel> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        plantHolderComp.MutationLevel += args.Effect.Amount * plantHolderComp.MutationMod;
-    }
-
-    private void OnExecutePlantAdjustMutationMod(ref ExecuteEntityEffectEvent<PlantAdjustMutationMod> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        plantHolderComp.MutationMod += args.Effect.Amount;
-    }
-
-    private void OnExecutePlantAdjustNutrition(ref ExecuteEntityEffectEvent<PlantAdjustNutrition> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveAlivePlant: false))
-            return;
-
-        _plantHolder.AdjustNutrient(args.Args.TargetEntity, args.Effect.Amount, plantHolderComp);
-    }
-
-    private void OnExecutePlantAdjustPests(ref ExecuteEntityEffectEvent<PlantAdjustPests> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        plantHolderComp.PestLevel += args.Effect.Amount;
-    }
-
-    private void OnExecutePlantAdjustPotency(ref ExecuteEntityEffectEvent<PlantAdjustPotency> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        if (plantHolderComp.Seed == null)
-            return;
-
-        _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-        plantHolderComp.Seed.Potency = Math.Max(plantHolderComp.Seed.Potency + args.Effect.Amount, 1);
-    }
-
-    private void OnExecutePlantAdjustToxins(ref ExecuteEntityEffectEvent<PlantAdjustToxins> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        plantHolderComp.Toxins += args.Effect.Amount;
-    }
-
-    private void OnExecutePlantAdjustWater(ref ExecuteEntityEffectEvent<PlantAdjustWater> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveAlivePlant: false))
-            return;
-
-        _plantHolder.AdjustWater(args.Args.TargetEntity, args.Effect.Amount, plantHolderComp);
-    }
-
-    private void OnExecutePlantAdjustWeeds(ref ExecuteEntityEffectEvent<PlantAdjustWeeds> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        plantHolderComp.WeedLevel += args.Effect.Amount;
-    }
-
-    private void OnExecutePlantAffectGrowth(ref ExecuteEntityEffectEvent<PlantAffectGrowth> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        _plantHolder.AffectGrowth(args.Args.TargetEntity, (int) args.Effect.Amount, plantHolderComp);
-    }
-
-    // Mutate reference 'val' between 'min' and 'max' by pretending the value
-    // is representable by a thermometer code with 'bits' number of bits and
-    // randomly flipping some of them.
-    private void MutateFloat(ref float val, float min, float max, int bits)
-    {
-        if (min == max)
-        {
-            val = min;
-            return;
-        }
-
-        // Starting number of bits that are high, between 0 and bits.
-        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
-        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
-        // val may be outside the range of min/max due to starting prototype values, so clamp.
-        valInt = Math.Clamp(valInt, 0, bits);
-
-        // Probability that the bit flip increases n.
-        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasive it it.
-        // In other words, it tends to go to the middle.
-        float probIncrease = 1 - (float)valInt / bits;
-        int valIntMutated;
-        if (_random.Prob(probIncrease))
-        {
-            valIntMutated = valInt + 1;
-        }
-        else
-        {
-            valIntMutated = valInt - 1;
-        }
-
-        // Set value based on mutated thermometer code.
-        float valMutated = Math.Clamp((float)valIntMutated / bits * (max - min) + min, min, max);
-        val = valMutated;
-    }
-
-    private void MutateInt(ref int val, int min, int max, int bits)
-    {
-        if (min == max)
-        {
-            val = min;
-            return;
-        }
-
-        // Starting number of bits that are high, between 0 and bits.
-        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
-        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
-        // val may be outside the range of min/max due to starting prototype values, so clamp.
-        valInt = Math.Clamp(valInt, 0, bits);
-
-        // Probability that the bit flip increases n.
-        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasing it.
-        // In other words, it tends to go to the middle.
-        float probIncrease = 1 - (float)valInt / bits;
-        int valMutated;
-        if (_random.Prob(probIncrease))
-        {
-            valMutated = val + 1;
-        }
-        else
-        {
-            valMutated = val - 1;
-        }
-
-        valMutated = Math.Clamp(valMutated, min, max);
-        val = valMutated;
-    }
-
-    private void OnExecutePlantChangeStat(ref ExecuteEntityEffectEvent<PlantChangeStat> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        if (plantHolderComp.Seed == null)
-            return;
-
-        var member = plantHolderComp.Seed.GetType().GetField(args.Effect.TargetValue);
-
-        if (member == null)
-        {
-            _mutation.Log.Error(args.Effect.GetType().Name + " Error: Member " + args.Effect.TargetValue + " not found on " + plantHolderComp.Seed.GetType().Name + ". Did you misspell it?");
-            return;
-        }
-
-        var currentValObj = member.GetValue(plantHolderComp.Seed);
-        if (currentValObj == null)
-            return;
-
-        if (member.FieldType == typeof(float))
-        {
-            var floatVal = (float)currentValObj;
-            MutateFloat(ref floatVal, args.Effect.MinValue, args.Effect.MaxValue, args.Effect.Steps);
-            member.SetValue(plantHolderComp.Seed, floatVal);
-        }
-        else if (member.FieldType == typeof(int))
-        {
-            var intVal = (int)currentValObj;
-            MutateInt(ref intVal, (int)args.Effect.MinValue, (int)args.Effect.MaxValue, args.Effect.Steps);
-            member.SetValue(plantHolderComp.Seed, intVal);
-        }
-        else if (member.FieldType == typeof(bool))
-        {
-            var boolVal = (bool)currentValObj;
-            boolVal = !boolVal;
-            member.SetValue(plantHolderComp.Seed, boolVal);
-        }
-    }
-
-    private void OnExecutePlantCryoxadone(ref ExecuteEntityEffectEvent<PlantCryoxadone> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        var deviation = 0;
-        var seed = plantHolderComp.Seed;
-        if (seed == null)
-            return;
-        if (plantHolderComp.Age > seed.Maturation)
-            deviation = (int) Math.Max(seed.Maturation - 1, plantHolderComp.Age - _random.Next(7, 10));
-        else
-            deviation = (int) (seed.Maturation / seed.GrowthStages);
-        plantHolderComp.Age -= deviation;
-        plantHolderComp.LastProduce = plantHolderComp.Age;
-        plantHolderComp.SkipAging++;
-        plantHolderComp.ForceUpdate = true;
-    }
-
-    private void OnExecutePlantDestroySeeds(ref ExecuteEntityEffectEvent<PlantDestroySeeds> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveMutableSeed: true))
-            return;
-
-        if (plantHolderComp.Seed!.Seedless == false)
-        {
-            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-            _popup.PopupEntity(
-                Loc.GetString("botany-plant-seedsdestroyed"),
-                args.Args.TargetEntity,
-                PopupType.SmallCaution
-            );
-            plantHolderComp.Seed.Seedless = true;
-        }
-    }
-
-    private void OnExecutePlantDiethylamine(ref ExecuteEntityEffectEvent<PlantDiethylamine> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveMutableSeed: true))
-            return;
-
-        if (_random.Prob(0.1f))
-        {
-            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-            plantHolderComp.Seed!.Lifespan++;
-        }
-
-        if (_random.Prob(0.1f))
-        {
-            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-            plantHolderComp.Seed!.Endurance++;
-        }
-    }
-
-    private void OnExecutePlantPhalanximine(ref ExecuteEntityEffectEvent<PlantPhalanximine> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveMutableSeed: true))
-            return;
-
-        plantHolderComp.Seed!.Viable = true;
-    }
-
-    private void OnExecutePlantRestoreSeeds(ref ExecuteEntityEffectEvent<PlantRestoreSeeds> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveMutableSeed: true))
-            return;
-
-        if (plantHolderComp.Seed!.Seedless)
-        {
-            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-            _popup.PopupEntity(Loc.GetString("botany-plant-seedsrestored"), args.Args.TargetEntity);
-            plantHolderComp.Seed.Seedless = false;
-        }
-    }
-
-    private void OnExecuteRobustHarvest(ref ExecuteEntityEffectEvent<RobustHarvest> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        if (plantHolderComp.Seed == null)
-            return;
-
-        if (plantHolderComp.Seed.Potency < args.Effect.PotencyLimit)
-        {
-            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-            plantHolderComp.Seed.Potency = Math.Min(plantHolderComp.Seed.Potency + args.Effect.PotencyIncrease, args.Effect.PotencyLimit);
-
-            if (plantHolderComp.Seed.Potency > args.Effect.PotencySeedlessThreshold)
-            {
-                plantHolderComp.Seed.Seedless = true;
-            }
-        }
-        else if (plantHolderComp.Seed.Yield > 1 && _random.Prob(0.1f))
-        {
-            // Too much of a good thing reduces yield
-            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-            plantHolderComp.Seed.Yield--;
-        }
-    }
-
-    private void OnExecuteAdjustTemperature(ref ExecuteEntityEffectEvent<AdjustTemperature> args)
-    {
-        if (TryComp(args.Args.TargetEntity, out TemperatureComponent? temp))
-        {
-            var amount = args.Effect.Amount;
-
-            if (args.Args is EntityEffectReagentArgs reagentArgs)
-            {
-                amount *= reagentArgs.Scale.Float();
-            }
-
-            _temperature.ChangeHeat(args.Args.TargetEntity, amount, true, temp);
-        }
-    }
-
-    private void OnExecuteAreaReactionEffect(ref ExecuteEntityEffectEvent<AreaReactionEffect> args)
-    {
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (reagentArgs.Source == null)
-                return;
-
-            var spreadAmount = (int) Math.Max(0, Math.Ceiling((reagentArgs.Quantity / args.Effect.OverflowThreshold).Float()));
-            var splitSolution = reagentArgs.Source.SplitSolution(reagentArgs.Source.Volume);
-            var transform = Comp<TransformComponent>(reagentArgs.TargetEntity);
-            var mapCoords = _xform.GetMapCoordinates(reagentArgs.TargetEntity, xform: transform);
-
-            if (!_mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
-                !_map.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef))
-            {
-                return;
-            }
-
-            if (_spreader.RequiresFloorToSpread(args.Effect.PrototypeId) && _turf.IsSpace(tileRef))
-                return;
-
-            var coords = _map.MapToGrid(gridUid, mapCoords);
-            var ent = Spawn(args.Effect.PrototypeId, coords.SnapToGrid());
-
-            _smoke.StartSmoke(ent, splitSolution, args.Effect.Duration, spreadAmount);
-
-            _audio.PlayPvs(args.Effect.Sound, reagentArgs.TargetEntity, AudioParams.Default.WithVariation(0.25f));
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    private void OnExecuteCauseZombieInfection(ref ExecuteEntityEffectEvent<CauseZombieInfection> args)
-    {
-        EnsureComp<ZombifyOnDeathComponent>(args.Args.TargetEntity);
-        EnsureComp<PendingZombieComponent>(args.Args.TargetEntity);
-    }
-
-    private void OnExecuteChemCleanBloodstream(ref ExecuteEntityEffectEvent<ChemCleanBloodstream> args)
-    {
-        var cleanseRate = args.Effect.CleanseRate;
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (reagentArgs.Source == null || reagentArgs.Reagent == null)
-                return;
-
-            cleanseRate *= reagentArgs.Scale.Float();
-            _bloodstream.FlushChemicals(args.Args.TargetEntity, reagentArgs.Reagent, cleanseRate);
-        }
-        else
-        {
-            _bloodstream.FlushChemicals(args.Args.TargetEntity, null, cleanseRate);
-        }
-    }
-
-    private void OnExecuteChemVomit(ref ExecuteEntityEffectEvent<ChemVomit> args)
-    {
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-            if (reagentArgs.Scale != 1f)
-                return;
-
-        _vomit.Vomit(args.Args.TargetEntity, args.Effect.ThirstAmount, args.Effect.HungerAmount);
-    }
-
-    private void OnExecuteCreateEntityReactionEffect(ref ExecuteEntityEffectEvent<CreateEntityReactionEffect> args)
-    {
-        var transform = Comp<TransformComponent>(args.Args.TargetEntity);
-        var quantity = (int)args.Effect.Number;
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-            quantity *= reagentArgs.Quantity.Int();
-
-        for (var i = 0; i < quantity; i++)
-        {
-            var uid = Spawn(args.Effect.Entity, _xform.GetMapCoordinates(args.Args.TargetEntity, xform: transform));
-            _xform.AttachToGridOrMap(uid);
-
-            // TODO figure out how to properly spawn inside of containers
-            // e.g. cheese:
-            // if the user is holding a bowl milk & enzyme, should drop to floor, not attached to the user.
-            // if reaction happens in a backpack, should insert cheese into backpack.
-            // --> if it doesn't fit, iterate through parent storage until it attaches to the grid (again, DON'T attach to players).
-            // if the reaction happens INSIDE a stomach? the bloodstream? I have no idea how to handle that.
-            // presumably having cheese materialize inside of your blood would have "disadvantages".
-        }
-    }
-
-    private void OnExecuteCreateGas(ref ExecuteEntityEffectEvent<CreateGas> args)
-    {
-        var tileMix = _atmosphere.GetContainingMixture(args.Args.TargetEntity, false, true);
-
-        if (tileMix != null)
-        {
-            if (args.Args is EntityEffectReagentArgs reagentArgs)
-            {
-                tileMix.AdjustMoles(args.Effect.Gas, reagentArgs.Quantity.Float() * args.Effect.Multiplier);
-            }
-            else
-            {
-                tileMix.AdjustMoles(args.Effect.Gas, args.Effect.Multiplier);
-            }
-        }
-    }
-
-    private void OnExecuteCureZombieInfection(ref ExecuteEntityEffectEvent<CureZombieInfection> args)
-    {
-        if (HasComp<IncurableZombieComponent>(args.Args.TargetEntity))
-            return;
-
-        RemComp<ZombifyOnDeathComponent>(args.Args.TargetEntity);
-        RemComp<PendingZombieComponent>(args.Args.TargetEntity);
-
-        if (args.Effect.Innoculate)
-        {
-            EnsureComp<ZombieImmuneComponent>(args.Args.TargetEntity);
-        }
-    }
-
-    private void OnExecuteEmote(ref ExecuteEntityEffectEvent<Emote> args)
-    {
-        if (args.Effect.EmoteId == null)
-            return;
-
-        if (args.Effect.ShowInChat)
-            _chat.TryEmoteWithChat(args.Args.TargetEntity, args.Effect.EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: args.Effect.Force);
-        else
-            _chat.TryEmoteWithoutChat(args.Args.TargetEntity, args.Effect.EmoteId);
-    }
-
-    private void OnExecuteEmpReactionEffect(ref ExecuteEntityEffectEvent<EmpReactionEffect> args)
-    {
-        var transform = Comp<TransformComponent>(args.Args.TargetEntity);
-
-        var range = args.Effect.EmpRangePerUnit;
-
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            range = MathF.Min((float) (reagentArgs.Quantity * args.Effect.EmpRangePerUnit), args.Effect.EmpMaxRange);
-        }
-
-        _emp.EmpPulse(_xform.GetMapCoordinates(args.Args.TargetEntity, xform: transform),
-            range,
-            args.Effect.EnergyConsumption,
-            args.Effect.DisableDuration);
-    }
-
-    private void OnExecuteExplosionReactionEffect(ref ExecuteEntityEffectEvent<ExplosionReactionEffect> args)
-    {
-        var intensity = args.Effect.IntensityPerUnit;
-
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            intensity = MathF.Min((float) reagentArgs.Quantity * args.Effect.IntensityPerUnit, args.Effect.MaxTotalIntensity);
-        }
-
-        _explosion.QueueExplosion(
-            args.Args.TargetEntity,
-            args.Effect.ExplosionType,
-            intensity,
-            args.Effect.IntensitySlope,
-            args.Effect.MaxIntensity,
-            args.Effect.TileBreakScale);
-    }
-
-    private void OnExecuteFlammableReaction(ref ExecuteEntityEffectEvent<FlammableReaction> args)
-    {
-        if (!TryComp(args.Args.TargetEntity, out FlammableComponent? flammable))
-            return;
-
-        // Sets the multiplier for FireStacks to MultiplierOnExisting is 0 or greater and target already has FireStacks
-        var multiplier = flammable.FireStacks != 0f && args.Effect.MultiplierOnExisting >= 0 ? args.Effect.MultiplierOnExisting : args.Effect.Multiplier;
-        var quantity = 1f;
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            quantity = reagentArgs.Quantity.Float();
-            _flammable.AdjustFireStacks(args.Args.TargetEntity, quantity * multiplier, flammable);
-            if (reagentArgs.Reagent != null)
-                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
-        }
-        else
-        {
-            _flammable.AdjustFireStacks(args.Args.TargetEntity, multiplier, flammable);
-        }
-    }
-
-    private void OnExecuteFlashReactionEffect(ref ExecuteEntityEffectEvent<FlashReactionEffect> args)
-    {
-        var transform = Comp<TransformComponent>(args.Args.TargetEntity);
-
-        var range = 1f;
-
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-            range = MathF.Min((float)(reagentArgs.Quantity * args.Effect.RangePerUnit), args.Effect.MaxRange);
-
-        _flash.FlashArea(
-            args.Args.TargetEntity,
-            null,
-            range,
-            args.Effect.Duration,
-            slowTo: args.Effect.SlowTo,
-            sound: args.Effect.Sound);
-
-        if (args.Effect.FlashEffectPrototype == null)
-            return;
-
-        var uid = EntityManager.SpawnEntity(args.Effect.FlashEffectPrototype, _xform.GetMapCoordinates(transform));
-        _xform.AttachToGridOrMap(uid);
-
-        if (!TryComp<PointLightComponent>(uid, out var pointLightComp))
-            return;
-
-        _pointLight.SetRadius(uid, MathF.Max(1.1f, range), pointLightComp);
-    }
-
-    private void OnExecuteIgnite(ref ExecuteEntityEffectEvent<Ignite> args)
-    {
-        if (!TryComp(args.Args.TargetEntity, out FlammableComponent? flammable))
-            return;
-
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            _flammable.Ignite(reagentArgs.TargetEntity, reagentArgs.OrganEntity ?? reagentArgs.TargetEntity, flammable: flammable);
-        }
-        else
-        {
-            _flammable.Ignite(args.Args.TargetEntity, args.Args.TargetEntity, flammable: flammable);
-        }
-    }
-
-    private void OnExecuteMakeSentient(ref ExecuteEntityEffectEvent<MakeSentient> args)
-    {
-        var uid = args.Args.TargetEntity;
-
-        // Let affected entities speak normally to make this effect different from, say, the "random sentience" event
-        // This also works on entities that already have a mind
-        // We call this before the mind check to allow things like player-controlled mice to be able to benefit from the effect
-        RemComp<ReplacementAccentComponent>(uid);
-        RemComp<MonkeyAccentComponent>(uid);
-
-        // Stops from adding a ghost role to things like people who already have a mind
-        if (TryComp<MindContainerComponent>(uid, out var mindContainer) && mindContainer.HasMind)
-        {
-            return;
-        }
-
-        // Don't add a ghost role to things that already have ghost roles
-        if (TryComp(uid, out GhostRoleComponent? ghostRole))
-        {
-            return;
-        }
-
-        ghostRole = AddComp<GhostRoleComponent>(uid);
-        EnsureComp<GhostTakeoverAvailableComponent>(uid);
-
-        var entityData = Comp<MetaDataComponent>(uid);
-        ghostRole.RoleName = entityData.EntityName;
-        ghostRole.RoleDescription = Loc.GetString("ghost-role-information-cognizine-description");
-    }
-
-    private void OnExecuteModifyBleedAmount(ref ExecuteEntityEffectEvent<ModifyBleedAmount> args)
-    {
-        if (TryComp<BloodstreamComponent>(args.Args.TargetEntity, out var blood))
-        {
-            var amt = args.Effect.Amount;
-            if (args.Args is EntityEffectReagentArgs reagentArgs) {
-                if (args.Effect.Scaled)
-                    amt *= reagentArgs.Quantity.Float();
-                amt *= reagentArgs.Scale.Float();
-            }
-
-            _bloodstream.TryModifyBleedAmount((args.Args.TargetEntity, blood), amt);
-        }
-    }
-
-    private void OnExecuteModifyBloodLevel(ref ExecuteEntityEffectEvent<ModifyBloodLevel> args)
-    {
-        if (TryComp<BloodstreamComponent>(args.Args.TargetEntity, out var blood))
-        {
-            var amt = args.Effect.Amount;
-            if (args.Args is EntityEffectReagentArgs reagentArgs)
-            {
-                if (args.Effect.Scaled)
-                    amt *= reagentArgs.Quantity;
-                amt *= reagentArgs.Scale;
-            }
-
-            _bloodstream.TryModifyBloodLevel((args.Args.TargetEntity, blood), amt);
-        }
-    }
-
-    private void OnExecuteModifyLungGas(ref ExecuteEntityEffectEvent<ModifyLungGas> args)
-    {
-        LungComponent? lung;
-        float amount = 1f;
-
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (!TryComp<LungComponent>(reagentArgs.OrganEntity, out var organLung))
-                return;
-            lung = organLung;
-            amount = reagentArgs.Quantity.Float();
-        }
-        else
-        {
-            if (!TryComp<LungComponent>(args.Args.TargetEntity, out var organLung)) //Likely needs to be modified to ensure it works correctly
-                return;
-            lung = organLung;
-        }
-
-        if (lung != null)
-        {
-            foreach (var (gas, ratio) in args.Effect.Ratios)
-            {
-                var quantity = ratio * amount / Atmospherics.BreathMolesToReagentMultiplier;
-                if (quantity < 0)
-                    quantity = Math.Max(quantity, -lung.Air[(int) gas]);
-                lung.Air.AdjustMoles(gas, quantity);
-            }
-        }
-    }
-
-    private void OnExecuteOxygenate(ref ExecuteEntityEffectEvent<Oxygenate> args)
-    {
-        var multiplier = 1f;
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            multiplier = reagentArgs.Quantity.Float();
-        }
-
-        if (TryComp<RespiratorComponent>(args.Args.TargetEntity, out var resp))
-        {
-            _respirator.UpdateSaturation(args.Args.TargetEntity, multiplier * args.Effect.Factor, resp);
-        }
-    }
-
-    private void OnExecutePlantMutateChemicals(ref ExecuteEntityEffectEvent<PlantMutateChemicals> args)
-    {
-        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
-
-        if (plantholder.Seed == null)
-            return;
-
-        var chemicals = plantholder.Seed.Chemicals;
-        var randomChems = _protoManager.Index(RandomPickBotanyReagent).Fills;
-
-        // Add a random amount of a random chemical to this set of chemicals
-        if (randomChems != null)
-        {
-            var pick = _random.Pick<RandomFillSolution>(randomChems);
-            var chemicalId = _random.Pick(pick.Reagents);
-            var amount = _random.Next(1, (int)pick.Quantity);
-            var seedChemQuantity = new SeedChemQuantity();
-            if (chemicals.ContainsKey(chemicalId))
-            {
-                seedChemQuantity.Min = chemicals[chemicalId].Min;
-                seedChemQuantity.Max = chemicals[chemicalId].Max + amount;
-            }
-            else
-            {
-                seedChemQuantity.Min = 1;
-                seedChemQuantity.Max = 1 + amount;
-                seedChemQuantity.Inherent = false;
-            }
-            var potencyDivisor = (int)Math.Ceiling(100.0f / seedChemQuantity.Max);
-            seedChemQuantity.PotencyDivisor = potencyDivisor;
-            chemicals[chemicalId] = seedChemQuantity;
-        }
-    }
-
-    private void OnExecutePlantMutateConsumeGasses(ref ExecuteEntityEffectEvent<PlantMutateConsumeGasses> args)
-    {
-        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
-
-        if (plantholder.Seed == null)
-            return;
-
-        var gasses = plantholder.Seed.ConsumeGasses;
-
-        // Add a random amount of a random gas to this gas dictionary
-        float amount = _random.NextFloat(args.Effect.MinValue, args.Effect.MaxValue);
-        Gas gas = _random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
-        if (gasses.ContainsKey(gas))
-        {
-            gasses[gas] += amount;
-        }
-        else
-        {
-            gasses.Add(gas, amount);
-        }
-    }
-
-    private void OnExecutePlantMutateExudeGasses(ref ExecuteEntityEffectEvent<PlantMutateExudeGasses> args)
-    {
-        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
-
-        if (plantholder.Seed == null)
-            return;
-
-        var gasses = plantholder.Seed.ExudeGasses;
-
-        // Add a random amount of a random gas to this gas dictionary
-        float amount = _random.NextFloat(args.Effect.MinValue, args.Effect.MaxValue);
-        Gas gas = _random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
-        if (gasses.ContainsKey(gas))
-        {
-            gasses[gas] += amount;
-        }
-        else
-        {
-            gasses.Add(gas, amount);
-        }
-    }
-
-    private void OnExecutePlantMutateHarvest(ref ExecuteEntityEffectEvent<PlantMutateHarvest> args)
-    {
-        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
-
-        if (plantholder.Seed == null)
-            return;
-
-        if (plantholder.Seed.HarvestRepeat == HarvestType.NoRepeat)
-            plantholder.Seed.HarvestRepeat = HarvestType.Repeat;
-        else if (plantholder.Seed.HarvestRepeat == HarvestType.Repeat)
-            plantholder.Seed.HarvestRepeat = HarvestType.SelfHarvest;
-    }
-
-    private void OnExecutePlantSpeciesChange(ref ExecuteEntityEffectEvent<PlantSpeciesChange> args)
-    {
-        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
-        if (plantholder.Seed == null)
-            return;
-
-        if (plantholder.Seed.MutationPrototypes.Count == 0)
-            return;
-
-        var targetProto = _random.Pick(plantholder.Seed.MutationPrototypes);
-        if (!_protoManager.TryIndex(targetProto, out SeedPrototype? protoSeed))
-        {
-            Log.Error($"Seed prototype could not be found: {targetProto}!");
-            return;
-        }
-
-        plantholder.Seed = plantholder.Seed.SpeciesChange(protoSeed);
-    }
-
-    private void OnExecutePolymorph(ref ExecuteEntityEffectEvent<PolymorphEffect> args)
-    {
-        // Make it into a prototype
-        EnsureComp<PolymorphableComponent>(args.Args.TargetEntity);
-        _polymorph.PolymorphEntity(args.Args.TargetEntity, args.Effect.PolymorphPrototype);
-    }
-
-    private void OnExecuteResetNarcolepsy(ref ExecuteEntityEffectEvent<ResetNarcolepsy> args)
-    {
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-            if (reagentArgs.Scale != 1f)
-                return;
-
-        _narcolepsy.AdjustNarcolepsyTimer(args.Args.TargetEntity, args.Effect.TimerReset);
-    }
-}
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index 13695caff1..7c9d02c561 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -21,7 +21,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using System.Linq;
-
+using Content.Shared.EntityEffects.Effects.Solution;
 using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
 
 namespace Content.Server.Fluids.EntitySystems;
@@ -278,11 +278,10 @@ public sealed class SmokeSystem : EntitySystem
         {
             if (reagentQuantity.Quantity == FixedPoint2.Zero)
                 continue;
-            var reagentProto = _prototype.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
 
-            _reactive.ReactionEntity(entity, ReactionMethod.Touch, reagentProto, reagentQuantity, transferSolution);
+            _reactive.ReactionEntity(entity, ReactionMethod.Touch, reagentQuantity);
             if (!blockIngestion)
-                _reactive.ReactionEntity(entity, ReactionMethod.Ingestion, reagentProto, reagentQuantity, transferSolution);
+                _reactive.ReactionEntity(entity, ReactionMethod.Ingestion, reagentQuantity);
         }
 
         if (blockIngestion)
diff --git a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
index 8fd088408c..930368255c 100644
--- a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
+++ b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
@@ -5,6 +5,7 @@ using System.Text.Json.Serialization;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
+using Content.Shared.EntityConditions;
 using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
@@ -42,7 +43,7 @@ public sealed class ChemistryJsonGenerator
             Converters =
             {
                 new UniversalJsonConverter<EntityEffect>(),
-                new UniversalJsonConverter<EntityEffectCondition>(),
+                new UniversalJsonConverter<EntityCondition>(),
                 new UniversalJsonConverter<ReagentEffectsEntry>(),
                 new UniversalJsonConverter<DamageSpecifier>(),
                 new FixedPointJsonConverter()
diff --git a/Content.Server/GuideGenerator/ReagentEntry.cs b/Content.Server/GuideGenerator/ReagentEntry.cs
index 8b597ad61b..59a212dbd2 100644
--- a/Content.Server/GuideGenerator/ReagentEntry.cs
+++ b/Content.Server/GuideGenerator/ReagentEntry.cs
@@ -76,7 +76,7 @@ public sealed class ReactionEntry
             proto.Products
                 .Select(x => KeyValuePair.Create(x.Key, x.Value.Float()))
                 .ToDictionary(x => x.Key, x => x.Value);
-        Effects = proto.Effects;
+        Effects = proto.Effects.ToList();
     }
 }
 
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index c2d2614a0a..1430f53cdd 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -41,6 +41,7 @@ using Content.Shared.Stacks;
 using Content.Server.Construction.Components;
 using Content.Shared.Chat;
 using Content.Shared.Damage;
+using Content.Shared.Temperature.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Kitchen.EntitySystems
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 20dc114918..8dab21902d 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -5,12 +5,12 @@ using Content.Server.Medical.Components;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.NodeContainer.Nodes;
-using Content.Server.Temperature.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Medical.Cryogenics;
 using Content.Shared.MedicalScanner;
+using Content.Shared.Temperature.Components;
 using Content.Shared.UserInterface;
 using Robust.Shared.Containers;
 
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 11e4ed4fcf..657ac3e636 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Medical.Components;
 using Content.Server.PowerCell;
-using Content.Server.Temperature.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
@@ -13,6 +12,7 @@ using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
+using Content.Shared.Temperature.Components;
 using Content.Shared.Traits.Assorted;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 81f9415121..e8fe9e4c39 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -5,7 +5,6 @@ using Content.Server.NPC.Queries.Considerations;
 using Content.Server.NPC.Queries.Curves;
 using Content.Server.NPC.Queries.Queries;
 using Content.Server.Nutrition.Components;
-using Content.Server.Temperature.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
 using Content.Shared.Examine;
@@ -30,6 +29,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using Content.Shared.Atmos.Components;
 using System.Linq;
+using Content.Shared.Temperature.Components;
 
 namespace Content.Server.NPC.Systems;
 
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index 6290e8231a..f6a7536994 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -10,14 +10,14 @@ using Content.Shared.Database;
 using Content.Shared.Inventory;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Temperature;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Physics.Events;
 using Content.Shared.Projectiles;
+using Content.Shared.Temperature.Components;
+using Content.Shared.Temperature.Systems;
 
 namespace Content.Server.Temperature.Systems;
 
-public sealed class TemperatureSystem : EntitySystem
+public sealed class TemperatureSystem : SharedTemperatureSystem
 {
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
@@ -125,8 +125,7 @@ public sealed class TemperatureSystem : EntitySystem
             true);
     }
 
-    public void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false,
-        TemperatureComponent? temperature = null)
+    public override void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false, TemperatureComponent? temperature = null)
     {
         if (!Resolve(uid, ref temperature, false))
             return;
@@ -161,16 +160,6 @@ public sealed class TemperatureSystem : EntitySystem
         ChangeHeat(uid, heat * temperature.AtmosTemperatureTransferEfficiency, temperature: temperature);
     }
 
-    public float GetHeatCapacity(EntityUid uid, TemperatureComponent? comp = null, PhysicsComponent? physics = null)
-    {
-        if (!Resolve(uid, ref comp) || !Resolve(uid, ref physics, false) || physics.FixturesMass <= 0)
-        {
-            return Atmospherics.MinimumHeatCapacity;
-        }
-
-        return comp.SpecificHeat * physics.FixturesMass;
-    }
-
     private void OnInit(EntityUid uid, InternalTemperatureComponent comp, MapInitEvent args)
     {
         if (!TryComp<TemperatureComponent>(uid, out var temp))
diff --git a/Content.Server/Tiles/TileEntityEffectComponent.cs b/Content.Server/Tiles/TileEntityEffectComponent.cs
index 4201af47f9..70f11bb060 100644
--- a/Content.Server/Tiles/TileEntityEffectComponent.cs
+++ b/Content.Server/Tiles/TileEntityEffectComponent.cs
@@ -14,6 +14,6 @@ public sealed partial class TileEntityEffectComponent : Component
     /// <summary>
     /// List of effects that should be applied.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public List<EntityEffect> Effects = default!;
 }
diff --git a/Content.Server/Tiles/TileEntityEffectSystem.cs b/Content.Server/Tiles/TileEntityEffectSystem.cs
index 4d866cb254..bd4aa789c2 100644
--- a/Content.Server/Tiles/TileEntityEffectSystem.cs
+++ b/Content.Server/Tiles/TileEntityEffectSystem.cs
@@ -1,13 +1,11 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
 using Content.Shared.StepTrigger.Systems;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.EntityEffects;
 
 namespace Content.Server.Tiles;
 
 public sealed class TileEntityEffectSystem : EntitySystem
 {
+    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
 
     public override void Initialize()
     {
@@ -23,11 +21,7 @@ public sealed class TileEntityEffectSystem : EntitySystem
     private void OnTileStepTriggered(Entity<TileEntityEffectComponent> ent, ref StepTriggeredOffEvent args)
     {
         var otherUid = args.Tripper;
-        var effectArgs = new EntityEffectBaseArgs(otherUid, EntityManager);
 
-        foreach (var effect in ent.Comp.Effects)
-        {
-            effect.Effect(effectArgs);
-        }
+        _entityEffects.ApplyEffects(otherUid, ent.Comp.Effects.ToArray());
     }
 }
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 7cdcec78c2..720fec490a 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -13,7 +13,6 @@ using Content.Server.NPC.HTN;
 using Content.Server.NPC.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Server.Speech.Components;
-using Content.Server.Temperature.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Chat;
 using Content.Shared.CombatMode;
@@ -44,6 +43,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Content.Shared.NPC.Prototypes;
 using Content.Shared.Roles;
+using Content.Shared.Temperature.Components;
 
 namespace Content.Server.Zombies;
 
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index 58a41a5f7a..d905cc03ae 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -81,9 +81,9 @@ public enum LogType
     ChemicalReaction = 17,
 
     /// <summary>
-    /// Reagent effects related interactions.
+    /// EntityEffect related interactions.
     /// </summary>
-    ReagentEffect = 18,
+    EntityEffect = 18,
 
     /// <summary>
     /// Canister valve was opened or closed.
diff --git a/Content.Shared/Body/Components/LungComponent.cs b/Content.Shared/Body/Components/LungComponent.cs
index dd31de7722..ab1869f8b1 100644
--- a/Content.Shared/Body/Components/LungComponent.cs
+++ b/Content.Shared/Body/Components/LungComponent.cs
@@ -22,7 +22,7 @@ public sealed partial class LungComponent : Component
     /// The name/key of the solution on this entity which these lungs act on.
     /// </summary>
     [DataField]
-    public string SolutionName = LungSystem.LungSolutionName;
+    public string SolutionName = "Lung";
 
     /// <summary>
     /// The solution on this entity that these lungs act on.
diff --git a/Content.Shared/Body/Systems/LungSystem.cs b/Content.Shared/Body/Systems/LungSystem.cs
index 5f4c1ee4ef..a097a7752a 100644
--- a/Content.Shared/Body/Systems/LungSystem.cs
+++ b/Content.Shared/Body/Systems/LungSystem.cs
@@ -1,11 +1,14 @@
+using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Body.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Atmos;
+using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Clothing;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Inventory.Events;
+using Robust.Shared.Prototypes;
+using BreathToolComponent = Content.Shared.Atmos.Components.BreathToolComponent;
+using InternalsComponent = Content.Shared.Body.Components.InternalsComponent;
 
 namespace Content.Shared.Body.Systems;
 
@@ -15,8 +18,6 @@ public sealed class LungSystem : EntitySystem
     [Dependency] private readonly SharedInternalsSystem _internals = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
 
-    public static string LungSolutionName = "Lung";
-
     public override void Initialize()
     {
         base.Initialize();
@@ -53,6 +54,7 @@ public sealed class LungSystem : EntitySystem
         }
     }
 
+    // TODO: JUST METABOLIZE GASES DIRECTLY DON'T CONVERT TO REAGENTS!!! (Needs Metabolism refactor :B)
     public void GasToReagent(EntityUid uid, LungComponent lung)
     {
         if (!_solutionContainerSystem.ResolveSolution(uid, lung.SolutionName, ref lung.Solution, out var solution))
diff --git a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
index 3b46d3913c..ee85fe65b7 100644
--- a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
+++ b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
@@ -6,7 +6,8 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
-using Content.Shared.EntityEffects.Effects;
+using Content.Shared.EntityEffects.Effects.Solution;
+using Content.Shared.EntityEffects.Effects.Transform;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids;
 using Content.Shared.Forensics.Components;
@@ -149,7 +150,9 @@ public abstract class SharedBloodstreamSystem : EntitySystem
         {
             switch (effect)
             {
-                case CreateEntityReactionEffect: // Prevent entities from spawning in the bloodstream
+                // TODO: Rather than this, ReactionAttempt should allow systems to remove effects from the list before the reaction.
+                // TODO: I think there's a PR up on the repo for this and if there isn't I'll make one -Princess
+                case EntityEffects.Effects.EntitySpawning.SpawnEntity: // Prevent entities from spawning in the bloodstream
                 case AreaReactionEffect: // No spontaneous smoke or foam leaking out of blood vessels.
                     args.Cancelled = true;
                     return;
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 54210cf195..671a30dec4 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -707,6 +707,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     }
 
     // Thermal energy and temperature management.
+    // TODO: ENERGY CONSERVATION!!! Nuke this once we have HeatContainers and use methods which properly conserve energy and model heat transfer correctly!
 
     #region Thermal Energy and Temperature
 
@@ -763,6 +764,26 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         UpdateChemicals(soln);
     }
 
+    /// <summary>
+    /// Same as <see cref="AddThermalEnergy"/> but clamps the value between two temperature values.
+    /// </summary>
+    /// <param name="soln">Solution we're adjusting the energy of</param>
+    /// <param name="thermalEnergy">Thermal energy we're adding or removing</param>
+    /// <param name="min">Min desired temperature</param>
+    /// <param name="max">Max desired temperature</param>
+    public void AddThermalEnergyClamped(Entity<SolutionComponent> soln, float thermalEnergy, float min, float max)
+    {
+        var solution = soln.Comp.Solution;
+
+        if (thermalEnergy == 0.0f)
+            return;
+
+        var heatCap = solution.GetHeatCapacity(PrototypeManager);
+        var deltaT = thermalEnergy / heatCap;
+        solution.Temperature = Math.Clamp(solution.Temperature + deltaT, min, max);
+        UpdateChemicals(soln);
+    }
+
     #endregion Thermal Energy and Temperature
 
     #region Event Handlers
diff --git a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
index 351a51ecc1..a995ef90f4 100644
--- a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
@@ -31,6 +31,7 @@ namespace Content.Shared.Chemistry.Reaction
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+        [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
 
         /// <summary>
         /// A cache of all reactions indexed by at most ONE of their required reactants.
@@ -205,27 +206,12 @@ namespace Content.Shared.Chemistry.Reaction
 
         private void OnReaction(Entity<SolutionComponent> soln, ReactionPrototype reaction, ReagentPrototype? reagent, FixedPoint2 unitReactions)
         {
-            var args = new EntityEffectReagentArgs(soln, EntityManager, null, soln.Comp.Solution, unitReactions, reagent, null, 1f);
-
             var posFound = _transformSystem.TryGetMapOrGridCoordinates(soln, out var gridPos);
 
             _adminLogger.Add(LogType.ChemicalReaction, reaction.Impact,
                 $"Chemical reaction {reaction.ID:reaction} occurred with strength {unitReactions:strength} on entity {ToPrettyString(soln):metabolizer} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found]")}");
 
-            foreach (var effect in reaction.Effects)
-            {
-                if (!effect.ShouldApply(args))
-                    continue;
-
-                if (effect.ShouldLog)
-                {
-                    var entity = args.TargetEntity;
-                    _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                        $"Reaction effect {effect.GetType().Name:effect} of reaction {reaction.ID:reaction} applied on entity {ToPrettyString(entity):entity} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found")}");
-                }
-
-                effect.Effect(args);
-            }
+            _entityEffects.ApplyEffects(soln, reaction.Effects, unitReactions.Float());
 
             // Someday, some brave soul will thread through an optional actor
             // argument in from every call of OnReaction up, all just to pass
diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
index 4bbb972572..c9a24ec550 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
@@ -60,7 +60,7 @@ namespace Content.Shared.Chemistry.Reaction
         /// <summary>
         /// Effects to be triggered when the reaction occurs.
         /// </summary>
-        [DataField("effects")] public List<EntityEffect> Effects = new();
+        [DataField("effects")] public EntityEffect[] Effects = [];
 
         /// <summary>
         /// How dangerous is this effect? Stuff like bicaridine should be low, while things like methamphetamine
diff --git a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
index cabdee93c1..89fcca900e 100644
--- a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
@@ -34,7 +34,7 @@ public sealed partial class ReactiveReagentEffectEntry
     public HashSet<string>? Reagents = null;
 
     [DataField("effects", required: true)]
-    public List<EntityEffect> Effects = default!;
+    public EntityEffect[] Effects = default!;
 
     [DataField("groups", readOnly: true, serverOnly: true,
         customTypeSerializer:typeof(PrototypeIdDictionarySerializer<HashSet<ReactionMethod>, ReactiveGroupPrototype>))]
diff --git a/Content.Shared/Chemistry/ReactiveSystem.cs b/Content.Shared/Chemistry/ReactiveSystem.cs
index 6306537324..2ffb848f8a 100644
--- a/Content.Shared/Chemistry/ReactiveSystem.cs
+++ b/Content.Shared/Chemistry/ReactiveSystem.cs
@@ -1,108 +1,35 @@
-using Content.Shared.Administration.Logs;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 
 namespace Content.Shared.Chemistry;
 
 [UsedImplicitly]
 public sealed class ReactiveSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _robustRandom = default!;
-    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
 
     public void DoEntityReaction(EntityUid uid, Solution solution, ReactionMethod method)
     {
         foreach (var reagent in solution.Contents.ToArray())
         {
-            ReactionEntity(uid, method, reagent, solution);
+            ReactionEntity(uid, method, reagent);
         }
     }
 
-    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity, Solution? source)
+    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity)
     {
-        // We throw if the reagent specified doesn't exist.
-        var proto = _prototypeManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
-        ReactionEntity(uid, method, proto, reagentQuantity, source);
-    }
-
-    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentPrototype proto,
-        ReagentQuantity reagentQuantity, Solution? source)
-    {
-        if (!TryComp(uid, out ReactiveComponent? reactive))
+        if (reagentQuantity.Quantity == FixedPoint2.Zero)
             return;
 
-        // custom event for bypassing reactivecomponent stuff
-        var ev = new ReactionEntityEvent(method, proto, reagentQuantity, source);
+        // We throw if the reagent specified doesn't exist.
+        if (!_proto.Resolve<ReagentPrototype>(reagentQuantity.Reagent.Prototype, out var proto))
+            return;
+
+        var ev = new ReactionEntityEvent(method, reagentQuantity, proto);
         RaiseLocalEvent(uid, ref ev);
-
-        // If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
-        var args = new EntityEffectReagentArgs(uid, EntityManager, null, source, source?.GetReagentQuantity(reagentQuantity.Reagent) ?? reagentQuantity.Quantity, proto, method, 1f);
-
-        // First, check if the reagent wants to apply any effects.
-        if (proto.ReactiveEffects != null && reactive.ReactiveGroups != null)
-        {
-            foreach (var (key, val) in proto.ReactiveEffects)
-            {
-                if (!val.Methods.Contains(method))
-                    continue;
-
-                if (!reactive.ReactiveGroups.ContainsKey(key))
-                    continue;
-
-                if (!reactive.ReactiveGroups[key].Contains(method))
-                    continue;
-
-                foreach (var effect in val.Effects)
-                {
-                    if (!effect.ShouldApply(args, _robustRandom))
-                        continue;
-
-                    if (effect.ShouldLog)
-                    {
-                        var entity = args.TargetEntity;
-                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                            $"Reactive effect {effect.GetType().Name:effect} of reagent {proto.ID:reagent} with method {method} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
-                    }
-
-                    effect.Effect(args);
-                }
-            }
-        }
-
-        // Then, check if the prototype has any effects it can apply as well.
-        if (reactive.Reactions != null)
-        {
-            foreach (var entry in reactive.Reactions)
-            {
-                if (!entry.Methods.Contains(method))
-                    continue;
-
-                if (entry.Reagents != null && !entry.Reagents.Contains(proto.ID))
-                    continue;
-
-                foreach (var effect in entry.Effects)
-                {
-                    if (!effect.ShouldApply(args, _robustRandom))
-                        continue;
-
-                    if (effect.ShouldLog)
-                    {
-                        var entity = args.TargetEntity;
-                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                            $"Reactive effect {effect.GetType().Name:effect} of {ToPrettyString(entity):entity} using reagent {proto.ID:reagent} with method {method} at {Transform(entity).Coordinates:coordinates}");
-                    }
-
-                    effect.Effect(args);
-                }
-            }
-        }
     }
 }
 public enum ReactionMethod
@@ -113,9 +40,4 @@ Ingestion,
 }
 
 [ByRefEvent]
-public readonly record struct ReactionEntityEvent(
-    ReactionMethod Method,
-    ReagentPrototype Reagent,
-    ReagentQuantity ReagentQuantity,
-    Solution? Source
-);
+public readonly record struct ReactionEntityEvent(ReactionMethod Method, ReagentQuantity ReagentQuantity, ReagentPrototype Reagent);
diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index b999d8df61..3b16b577cb 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -2,21 +2,17 @@ using System.Collections.Frozen;
 using System.Linq;
 using Content.Shared.FixedPoint;
 using System.Text.Json.Serialization;
-using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Prototypes;
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Contraband;
 using Content.Shared.EntityEffects;
-using Content.Shared.Database;
+using Content.Shared.Localizations;
 using Content.Shared.Nutrition;
-using Content.Shared.Prototypes;
 using Content.Shared.Roles;
 using Content.Shared.Slippery;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
@@ -190,6 +186,7 @@ namespace Content.Shared.Chemistry.Reagent
         [DataField]
         public SoundSpecifier FootstepSound = new SoundCollectionSpecifier("FootstepPuddle");
 
+        // TODO: Reaction tile doesn't work properly and destroys reagents way too quickly
         public FixedPoint2 ReactionTile(TileRef tile, FixedPoint2 reactVolume, IEntityManager entityManager, List<ReagentData>? data)
         {
             var removed = FixedPoint2.Zero;
@@ -211,33 +208,32 @@ namespace Content.Shared.Chemistry.Reagent
             return removed;
         }
 
-        public void ReactionPlant(EntityUid? plantHolder,
-            ReagentQuantity amount,
-            Solution solution,
-            EntityManager entityManager,
-            IRobustRandom random,
-            ISharedAdminLogManager logger)
+        public IEnumerable<string> GuidebookReagentEffectsDescription(IPrototypeManager prototype, IEntitySystemManager entSys, IEnumerable<EntityEffect> effects, FixedPoint2? metabolism = null)
         {
-            if (plantHolder == null)
-                return;
+            return effects.Select(x => GuidebookReagentEffectDescription(prototype, entSys, x, metabolism))
+                .Where(x => x is not null)
+                .Select(x => x!)
+                .ToArray();
+        }
 
-            var args = new EntityEffectReagentArgs(plantHolder.Value, entityManager, null, solution, amount.Quantity, this, null, 1f);
-            foreach (var plantMetabolizable in PlantMetabolisms)
-            {
-                if (!plantMetabolizable.ShouldApply(args, random))
-                    continue;
+        public string? GuidebookReagentEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys, EntityEffect effect, FixedPoint2? metabolism)
+        {
+            if (effect.EntityEffectGuidebookText(prototype, entSys) is not { } description)
+                return null;
 
-                if (plantMetabolizable.ShouldLog)
-                {
-                    var entity = args.TargetEntity;
-                    logger.Add(
-                        LogType.ReagentEffect,
-                        plantMetabolizable.LogImpact,
-                        $"Plant metabolism effect {plantMetabolizable.GetType().Name:effect} of reagent {ID} applied on entity {entity}");
-                }
+            var quantity = metabolism == null ? 0f : (double) (effect.MinScale * metabolism);
 
-                plantMetabolizable.Effect(args);
-            }
+            return Loc.GetString(
+                "guidebook-reagent-effect-description",
+                ("reagent", LocalizedName),
+                ("quantity", quantity),
+                ("effect", description),
+                ("chance", effect.Probability),
+                ("conditionCount", effect.Conditions?.Length ?? 0),
+                ("conditions",
+                    ContentLocalizationManager.FormatList(
+                        effect.Conditions?.Select(x => x.EntityConditionGuidebookText(prototype)).ToList() ?? new List<string>()
+                    )));
         }
     }
 
@@ -246,6 +242,7 @@ namespace Content.Shared.Chemistry.Reagent
     {
         public string ReagentPrototype;
 
+        // TODO: Kill Metabolism groups!
         public Dictionary<ProtoId<MetabolismGroupPrototype>, ReagentEffectsGuideEntry>? GuideEntries;
 
         public List<string>? PlantMetabolisms = null;
@@ -254,15 +251,12 @@ namespace Content.Shared.Chemistry.Reagent
         {
             ReagentPrototype = proto.ID;
             GuideEntries = proto.Metabolisms?
-                .Select(x => (x.Key, x.Value.MakeGuideEntry(prototype, entSys)))
+                .Select(x => (x.Key, x.Value.MakeGuideEntry(prototype, entSys, proto)))
                 .ToDictionary(x => x.Key, x => x.Item2);
             if (proto.PlantMetabolisms.Count > 0)
             {
-                PlantMetabolisms = new List<string>(proto.PlantMetabolisms
-                    .Select(x => x.GuidebookEffectDescription(prototype, entSys))
-                    .Where(x => x is not null)
-                    .Select(x => x!)
-                    .ToArray());
+                PlantMetabolisms =
+                    new List<string>(proto.GuidebookReagentEffectsDescription(prototype, entSys, proto.PlantMetabolisms));
             }
         }
     }
@@ -285,14 +279,11 @@ namespace Content.Shared.Chemistry.Reagent
         [DataField("effects", required: true)]
         public EntityEffect[] Effects = default!;
 
-        public ReagentEffectsGuideEntry MakeGuideEntry(IPrototypeManager prototype, IEntitySystemManager entSys)
+        public string EntityEffectFormat => "guidebook-reagent-effect-description";
+
+        public ReagentEffectsGuideEntry MakeGuideEntry(IPrototypeManager prototype, IEntitySystemManager entSys, ReagentPrototype proto)
         {
-            return new ReagentEffectsGuideEntry(MetabolismRate,
-                Effects
-                    .Select(x => x.GuidebookEffectDescription(prototype, entSys)) // hate.
-                    .Where(x => x is not null)
-                    .Select(x => x!)
-                    .ToArray());
+            return new ReagentEffectsGuideEntry(MetabolismRate, proto.GuidebookReagentEffectsDescription(prototype, entSys, Effects, MetabolismRate).ToArray());
         }
     }
 
diff --git a/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs b/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
new file mode 100644
index 0000000000..d19d326e26
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Body;
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class BreathingCondition : EntityConditionBase<BreathingCondition>
+{
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("reagent-effect-condition-guidebook-breathing", ("isBreathing", !Inverted));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs
new file mode 100644
index 0000000000..f9867b28b0
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Body;
+
+/// <summary>
+/// Returns true if this entity's hunger is within a specified minimum and maximum.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class TotalHungerEntityConditionSystem : EntityConditionSystem<HungerComponent, HungerCondition>
+{
+    [Dependency] private readonly HungerSystem _hunger = default!;
+
+    protected override void Condition(Entity<HungerComponent> entity, ref EntityConditionEvent<HungerCondition> args)
+    {
+        var total = _hunger.GetHunger(entity.Comp);
+        args.Result = total >= args.Condition.Min && total <= args.Condition.Max;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class HungerCondition : EntityConditionBase<HungerCondition>
+{
+    [DataField]
+    public float Min;
+
+    [DataField]
+    public float Max = float.PositiveInfinity;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("reagent-effect-condition-guidebook-total-hunger", ("max", float.IsPositiveInfinity(Max) ? int.MaxValue : Max), ("min", Min));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
new file mode 100644
index 0000000000..e87c54a761
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Body.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Body;
+
+/// <summary>
+/// Returns true if this entity is using internals. False if they are not or cannot use internals.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class InternalsOnEntityConditionSystem : EntityConditionSystem<InternalsComponent, InternalsCondition>
+{
+    protected override void Condition(Entity<InternalsComponent> entity, ref EntityConditionEvent<InternalsCondition> args)
+    {
+        args.Result = entity.Comp.GasTankEntity != null;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class InternalsCondition : EntityConditionBase<InternalsCondition>
+{
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("reagent-effect-condition-guidebook-internals", ("usingInternals", !Inverted));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs b/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs
new file mode 100644
index 0000000000..2196d271ff
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Body.Prototypes;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Body;
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class MetabolizerTypeCondition : EntityConditionBase<MetabolizerTypeCondition>
+{
+    [DataField(required: true)]
+    public ProtoId<MetabolizerTypePrototype>[] Type = default!;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
+    {
+        var typeList = new List<string>();
+
+        foreach (var type in Type)
+        {
+            if (!prototype.Resolve(type, out var proto))
+                continue;
+
+            typeList.Add(proto.LocalizedName);
+        }
+
+        var names = ContentLocalizationManager.FormatListToOr(typeList);
+
+        return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
+            ("name", names),
+            ("shouldhave", !Inverted));
+    }
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
new file mode 100644
index 0000000000..d00481d3e1
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Body;
+
+/// <summary>
+/// Returns true if this entity's current mob state matches the condition's specified mob state.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class MobStateEntityConditionSystem : EntityConditionSystem<MobStateComponent, MobStateCondition>
+{
+    protected override void Condition(Entity<MobStateComponent> entity, ref EntityConditionEvent<MobStateCondition> args)
+    {
+        if (entity.Comp.CurrentState == args.Condition.Mobstate)
+            args.Result = true;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class MobStateCondition : EntityConditionBase<MobStateCondition>
+{
+    [DataField]
+    public MobState Mobstate = MobState.Alive;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs
new file mode 100644
index 0000000000..e07989da36
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs
@@ -0,0 +1,59 @@
+using System.Linq;
+using Content.Shared.Localizations;
+using Content.Shared.Mind;
+using Content.Shared.Mind.Components;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this entity has any of the specified jobs. False if the entity has no mind, none of the specified jobs, or is jobless.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class HasJobEntityConditionSystem : EntityConditionSystem<MindContainerComponent, JobCondition>
+{
+    protected override void Condition(Entity<MindContainerComponent> entity, ref EntityConditionEvent<JobCondition> args)
+    {
+        // We need a mind in our mind container...
+        if (!TryComp<MindComponent>(entity.Comp.Mind, out var mind))
+            return;
+
+        foreach (var roleId in mind.MindRoleContainer.ContainedEntities)
+        {
+            if (!HasComp<JobRoleComponent>(roleId))
+                continue;
+
+            if (!TryComp<MindRoleComponent>(roleId, out var mindRole))
+            {
+                Log.Error($"Encountered job mind role entity {roleId} without a {nameof(MindRoleComponent)}");
+                continue;
+            }
+
+            if (mindRole.JobPrototype == null)
+            {
+                Log.Error($"Encountered job mind role entity {roleId} without a {nameof(JobPrototype)}");
+                continue;
+            }
+
+            if (!args.Condition.Jobs.Contains(mindRole.JobPrototype.Value))
+                continue;
+
+            args.Result = true;
+            return;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class JobCondition : EntityConditionBase<JobCondition>
+{
+    [DataField(required: true)] public List<ProtoId<JobPrototype>> Jobs = [];
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
+    {
+        var localizedNames = Jobs.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
+        return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
+    }
+}
diff --git a/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
new file mode 100644
index 0000000000..c49c9a3d02
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this solution entity has an amount of reagent in it within a specified minimum and maximum.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class ReagentThresholdEntityConditionSystem : EntityConditionSystem<SolutionComponent, ReagentCondition>
+{
+    protected override void Condition(Entity<SolutionComponent> entity, ref EntityConditionEvent<ReagentCondition> args)
+    {
+        var quant = entity.Comp.Solution.GetTotalPrototypeQuantity(args.Condition.Reagent);
+
+        args.Result = quant >= args.Condition.Min && quant <= args.Condition.Max;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class ReagentCondition : EntityConditionBase<ReagentCondition>
+{
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    [DataField(required: true)]
+    public ProtoId<ReagentPrototype> Reagent;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
+    {
+        if (!prototype.Resolve(Reagent, out var reagentProto))
+            return String.Empty;
+
+        return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
+            ("reagent", reagentProto.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
+            ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()),
+            ("min", Min.Float()));
+    }
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
new file mode 100644
index 0000000000..99d7206c0a
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Localizations;
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Tags;
+
+/// <summary>
+/// Returns true if this entity has all the listed tags.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class HasAllTagsEntityConditionSystem : EntityConditionSystem<TagComponent, AllTagsCondition>
+{
+    [Dependency] private readonly TagSystem _tag = default!;
+
+    protected override void Condition(Entity<TagComponent> entity, ref EntityConditionEvent<AllTagsCondition> args)
+    {
+        args.Result = _tag.HasAllTags(entity.Comp, args.Condition.Tags);
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class AllTagsCondition : EntityConditionBase<AllTagsCondition>
+{
+    [DataField(required: true)]
+    public ProtoId<TagPrototype>[] Tags = [];
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
+    {
+        var tagList = new List<string>();
+
+        foreach (var type in Tags)
+        {
+            if (!prototype.Resolve(type, out var proto))
+                continue;
+
+            tagList.Add(proto.ID);
+        }
+
+        var names = ContentLocalizationManager.FormatList(tagList);
+
+        return Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", names), ("invert", Inverted));
+    }
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
new file mode 100644
index 0000000000..3513353125
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Localizations;
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Tags;
+
+/// <summary>
+/// Returns true if this entity have any of the listed tags.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class HasAnyTagEntityConditionSystem : EntityConditionSystem<TagComponent, AnyTagCondition>
+{
+    [Dependency] private readonly TagSystem _tag = default!;
+
+    protected override void Condition(Entity<TagComponent> entity, ref EntityConditionEvent<AnyTagCondition> args)
+    {
+        args.Result = _tag.HasAnyTag(entity.Comp, args.Condition.Tags);
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class AnyTagCondition : EntityConditionBase<AnyTagCondition>
+{
+    [DataField(required: true)]
+    public ProtoId<TagPrototype>[] Tags = [];
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
+    {
+        var tagList = new List<string>();
+
+        foreach (var type in Tags)
+        {
+            if (!prototype.Resolve(type, out var proto))
+                continue;
+
+            tagList.Add(proto.ID);
+        }
+
+        var names = ContentLocalizationManager.FormatListToOr(tagList);
+
+        return Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", names), ("invert", Inverted));
+    }
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
new file mode 100644
index 0000000000..9b67f38282
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Tags;
+
+/// <summary>
+/// Returns true if this entity has the listed tag.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class HasTagEntityConditionSystem : EntityConditionSystem<TagComponent, TagCondition>
+{
+    [Dependency] private readonly TagSystem _tag = default!;
+
+    protected override void Condition(Entity<TagComponent> entity, ref EntityConditionEvent<TagCondition> args)
+    {
+        args.Result = _tag.HasTag(entity.Comp, args.Condition.Tag);
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class TagCondition : EntityConditionBase<TagCondition>
+{
+    [DataField(required: true)]
+    public ProtoId<TagPrototype> Tag;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", Tag), ("invert", Inverted));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
new file mode 100644
index 0000000000..6585f3bf44
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
@@ -0,0 +1,52 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Temperature.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this entity has an amount of reagent in it within a specified minimum and maximum.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class TemperatureEntityConditionSystem : EntityConditionSystem<TemperatureComponent, TemperatureCondition>
+{
+    protected override void Condition(Entity<TemperatureComponent> entity, ref EntityConditionEvent<TemperatureCondition> args)
+    {
+        if (entity.Comp.CurrentTemperature >= args.Condition.Min && entity.Comp.CurrentTemperature <= args.Condition.Max)
+            args.Result = true;
+    }
+}
+
+/// <summary>
+/// Returns true if this solution entity has an amount of reagent in it within a specified minimum and maximum.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class SolutionTemperatureEntityConditionSystem : EntityConditionSystem<SolutionComponent, TemperatureCondition>
+{
+    protected override void Condition(Entity<SolutionComponent> entity, ref EntityConditionEvent<TemperatureCondition> args)
+    {
+        if (entity.Comp.Solution.Temperature >= args.Condition.Min && entity.Comp.Solution.Temperature <= args.Condition.Max)
+            args.Result = true;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class TemperatureCondition : EntityConditionBase<TemperatureCondition>
+{
+    /// <summary>
+    /// Minimum allowed temperature
+    /// </summary>
+    [DataField]
+    public float Min = 0;
+
+    /// <summary>
+    /// Maximum allowed temperature
+    /// </summary>
+    [DataField]
+    public float Max = float.PositiveInfinity;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs
new file mode 100644
index 0000000000..fbb659b54f
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions;
+///<summary>
+/// A basic summary of this condition.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class TemplateEntityConditionSystem : EntityConditionSystem<MetaDataComponent, TemplateCondition>
+{
+    protected override void Condition(Entity<MetaDataComponent> entity, ref EntityConditionEvent<TemplateCondition> args)
+    {
+        // Condition goes here.
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class TemplateCondition : EntityConditionBase<TemplateCondition>
+{
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) => String.Empty;
+}
diff --git a/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs
new file mode 100644
index 0000000000..e710e07b17
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this entity can take damage and if its total damage is within a specified minimum and maximum.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class TotalDamageEntityConditionSystem : EntityConditionSystem<DamageableComponent, TotalDamageCondition>
+{
+    protected override void Condition(Entity<DamageableComponent> entity, ref EntityConditionEvent<TotalDamageCondition> args)
+    {
+        var total = entity.Comp.TotalDamage;
+        args.Result = total >= args.Condition.Min && total <= args.Condition.Max;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class TotalDamageCondition : EntityConditionBase<TotalDamageCondition>
+{
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("reagent-effect-condition-guidebook-total-damage",
+            ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()),
+            ("min", Min.Float()));
+}
diff --git a/Content.Shared/EntityConditions/SharedEntityConditionsSystem.cs b/Content.Shared/EntityConditions/SharedEntityConditionsSystem.cs
new file mode 100644
index 0000000000..090a422641
--- /dev/null
+++ b/Content.Shared/EntityConditions/SharedEntityConditionsSystem.cs
@@ -0,0 +1,152 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions;
+
+/// <summary>
+/// This handles entity effects.
+/// Specifically it handles the receiving of events for causing entity effects, and provides
+/// public API for other systems to take advantage of entity effects.
+/// </summary>
+public sealed partial class SharedEntityConditionsSystem : EntitySystem, IEntityConditionRaiser
+{
+    /// <summary>
+    /// Checks a list of conditions to verify that they all return true.
+    /// </summary>
+    /// <param name="target">Target entity we're checking conditions on</param>
+    /// <param name="conditions">Conditions we're checking</param>
+    /// <returns>Returns true if all conditions return true, false if any fail</returns>
+    public bool TryConditions(EntityUid target, EntityCondition[]? conditions)
+    {
+        // If there's no conditions we can't fail any of them...
+        if (conditions == null)
+            return true;
+
+        foreach (var condition in conditions)
+        {
+            if (!TryCondition(target, condition))
+                return false;
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Checks a list of conditions to see if any are true.
+    /// </summary>
+    /// <param name="target">Target entity we're checking conditions on</param>
+    /// <param name="conditions">Conditions we're checking</param>
+    /// <returns>Returns true if any conditions return true</returns>
+    public bool TryAnyCondition(EntityUid target, EntityCondition[]? conditions)
+    {
+        // If there's no conditions we can't meet any of them...
+        if (conditions == null)
+            return false;
+
+        foreach (var condition in conditions)
+        {
+            if (TryCondition(target, condition))
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Checks a single <see cref="EntityCondition"/> on an entity.
+    /// </summary>
+    /// <param name="target">Target entity we're checking conditions on</param>
+    /// <param name="condition">Condition we're checking</param>
+    /// <returns>Returns true if we meet the condition and false otherwise</returns>
+    public bool TryCondition(EntityUid target, EntityCondition condition)
+    {
+        return condition.Inverted != condition.RaiseEvent(target, this);
+    }
+
+    /// <summary>
+    /// Raises a condition to an entity. You should not be calling this unless you know what you're doing.
+    /// </summary>
+    public bool RaiseConditionEvent<T>(EntityUid target, T effect) where T : EntityConditionBase<T>
+    {
+        var effectEv = new EntityConditionEvent<T>(effect);
+        RaiseLocalEvent(target, ref effectEv);
+        return effectEv.Result;
+    }
+}
+
+/// <summary>
+/// This is a basic abstract entity effect containing all the data an entity effect needs to affect entities with effects...
+/// </summary>
+/// <typeparam name="T">The Component that is required for the effect</typeparam>
+/// <typeparam name="TCon">The Condition we're testing</typeparam>
+public abstract partial class EntityConditionSystem<T, TCon> : EntitySystem where T : Component where TCon : EntityConditionBase<TCon>
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<T, EntityConditionEvent<TCon>>(Condition);
+    }
+    protected abstract void Condition(Entity<T> entity, ref EntityConditionEvent<TCon> args);
+}
+
+/// <summary>
+/// Used to raise an EntityCondition without losing the type of condition.
+/// </summary>
+public interface IEntityConditionRaiser
+{
+    bool RaiseConditionEvent<T>(EntityUid target, T effect) where T : EntityConditionBase<T>;
+}
+
+/// <summary>
+/// Used to store an <see cref="EntityCondition"/> so it can be raised without losing the type of the condition.
+/// </summary>
+/// <typeparam name="T">The Condition wer are raising.</typeparam>
+public abstract partial class EntityConditionBase<T> : EntityCondition where T : EntityConditionBase<T>
+{
+    public override bool RaiseEvent(EntityUid target, IEntityConditionRaiser raiser)
+    {
+        if (this is not T type)
+            return false;
+
+        // If the result of the event matches the result we're looking for then we pass.
+        return raiser.RaiseConditionEvent(target, type);
+    }
+}
+
+/// <summary>
+/// A basic condition which can be checked for on an entity via events.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+public abstract partial class EntityCondition
+{
+    public abstract bool RaiseEvent(EntityUid target, IEntityConditionRaiser raiser);
+
+    /// <summary>
+    /// If true, invert the result. So false returns true and true returns false!
+    /// </summary>
+    [DataField]
+    public bool Inverted;
+
+    /// <summary>
+    /// A basic description of this condition, which displays in the guidebook.
+    /// </summary>
+    public abstract string EntityConditionGuidebookText(IPrototypeManager prototype);
+}
+
+/// <summary>
+/// An Event carrying an entity effect.
+/// </summary>
+/// <param name="Condition">The Condition we're checking</param>
+[ByRefEvent]
+public record struct EntityConditionEvent<T>(T Condition) where T : EntityConditionBase<T>
+{
+    /// <summary>
+    /// The result of our check, defaults to false if nothing handles it.
+    /// </summary>
+    [DataField]
+    public bool Result;
+
+    /// <summary>
+    /// The Condition being raised in this event
+    /// </summary>
+    public readonly T Condition = Condition;
+}
diff --git a/Content.Shared/EntityEffects/EffectConditions/BodyTemperature.cs b/Content.Shared/EntityEffects/EffectConditions/BodyTemperature.cs
deleted file mode 100644
index 351e4ee12c..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/BodyTemperature.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Requires the target entity to be above or below a certain temperature.
-///     Used for things like cryoxadone and pyroxadone.
-/// </summary>
-public sealed partial class Temperature : EventEntityEffectCondition<Temperature>
-{
-    [DataField]
-    public float Min = 0;
-
-    [DataField]
-    public float Max = float.PositiveInfinity;
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
-            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-            ("min", Min));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/BreathingCondition.cs b/Content.Shared/EntityEffects/EffectConditions/BreathingCondition.cs
deleted file mode 100644
index 9de1bfdbf6..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/BreathingCondition.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Condition for if the entity is successfully breathing.
-/// </summary>
-public sealed partial class Breathing : EventEntityEffectCondition<Breathing>
-{
-    /// <summary>
-    ///     If true, the entity must not have trouble breathing to pass.
-    /// </summary>
-    [DataField]
-    public bool IsBreathing = true;
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-breathing",
-                            ("isBreathing", IsBreathing));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/HasTagCondition.cs b/Content.Shared/EntityEffects/EffectConditions/HasTagCondition.cs
deleted file mode 100644
index 379a248027..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/HasTagCondition.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Tag;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-public sealed partial class HasTag : EntityEffectCondition
-{
-    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<TagPrototype>))]
-    public string Tag = default!;
-
-    [DataField]
-    public bool Invert = false;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent<TagComponent>(args.TargetEntity, out var tag))
-            return args.EntityManager.System<TagSystem>().HasTag(tag, Tag) ^ Invert;
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        // this should somehow be made (much) nicer.
-        return Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", Tag), ("invert", Invert));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs b/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
deleted file mode 100644
index cb30ef70c7..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Shared.Body.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Condition for if the entity is or isn't wearing internals.
-/// </summary>
-public sealed partial class Internals : EntityEffectCondition
-{
-    /// <summary>
-    ///     To pass, the entity's internals must have this same state.
-    /// </summary>
-    [DataField]
-    public bool UsingInternals = true;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out InternalsComponent? internalsComp))
-            return !UsingInternals; // They have no internals to wear.
-
-        var internalsState = internalsComp.GasTankEntity != null; // If gas tank is not null, they are wearing internals
-        return UsingInternals == internalsState;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-internals", ("usingInternals", UsingInternals));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/JobCondition.cs b/Content.Shared/EntityEffects/EffectConditions/JobCondition.cs
deleted file mode 100644
index 96f3be64c6..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/JobCondition.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.Linq;
-using Content.Shared.Localizations;
-using Content.Shared.Mind;
-using Content.Shared.Mind.Components;
-using Content.Shared.Roles;
-using Content.Shared.Roles.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-public sealed partial class JobCondition : EntityEffectCondition
-{
-    [DataField(required: true)] public List<ProtoId<JobPrototype>> Job;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        args.EntityManager.TryGetComponent<MindContainerComponent>(args.TargetEntity, out var mindContainer);
-
-        if (mindContainer is null
-            || !args.EntityManager.TryGetComponent<MindComponent>(mindContainer.Mind, out var mind))
-            return false;
-
-        foreach (var roleId in mind.MindRoleContainer.ContainedEntities)
-        {
-            if (!args.EntityManager.HasComponent<JobRoleComponent>(roleId))
-                continue;
-
-            if (!args.EntityManager.TryGetComponent<MindRoleComponent>(roleId, out var mindRole))
-            {
-                Logger.Error($"Encountered job mind role entity {roleId} without a {nameof(MindRoleComponent)}");
-                continue;
-            }
-
-            if (mindRole.JobPrototype == null)
-            {
-                Logger.Error($"Encountered job mind role entity {roleId} without a {nameof(JobPrototype)}");
-                continue;
-            }
-
-            if (Job.Contains(mindRole.JobPrototype.Value))
-                return true;
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        var localizedNames = Job.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
-        return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/MobStateCondition.cs b/Content.Shared/EntityEffects/EffectConditions/MobStateCondition.cs
deleted file mode 100644
index efe7246b2a..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/MobStateCondition.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-public sealed partial class MobStateCondition : EntityEffectCondition
-{
-    [DataField]
-    public MobState Mobstate = MobState.Alive;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent(args.TargetEntity, out MobStateComponent? mobState))
-        {
-            if (mobState.CurrentState == Mobstate)
-                return true;
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
-    }
-}
-
diff --git a/Content.Shared/EntityEffects/EffectConditions/OrganType.cs b/Content.Shared/EntityEffects/EffectConditions/OrganType.cs
deleted file mode 100644
index f99eb5cc77..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/OrganType.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// using Content.Server.Body.Components;
-using Content.Shared.Body.Prototypes;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Requires that the metabolizing organ is or is not tagged with a certain MetabolizerType
-/// </summary>
-public sealed partial class OrganType : EventEntityEffectCondition<OrganType>
-{
-    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MetabolizerTypePrototype>))]
-    public string Type = default!;
-
-    /// <summary>
-    ///     Does this condition pass when the organ has the type, or when it doesn't have the type?
-    /// </summary>
-    [DataField]
-    public bool ShouldHave = true;
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
-            ("name", prototype.Index<MetabolizerTypePrototype>(Type).LocalizedName),
-            ("shouldhave", ShouldHave));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/ReagentThreshold.cs b/Content.Shared/EntityEffects/EffectConditions/ReagentThreshold.cs
deleted file mode 100644
index af71f20c8e..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/ReagentThreshold.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Used for implementing reagent effects that require a certain amount of reagent before it should be applied.
-///     For instance, overdoses.
-///
-///     This can also trigger on -other- reagents, not just the one metabolizing. By default, it uses the
-///     one being metabolized.
-/// </summary>
-public sealed partial class ReagentThreshold : EntityEffectCondition
-{
-    [DataField]
-    public FixedPoint2 Min = FixedPoint2.Zero;
-
-    [DataField]
-    public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-    // TODO use ReagentId
-    [DataField]
-    public string? Reagent;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            var reagent = Reagent ?? reagentArgs.Reagent?.ID;
-            if (reagent == null)
-                return true; // No condition to apply.
-
-            var quant = FixedPoint2.Zero;
-            if (reagentArgs.Source != null)
-                quant = reagentArgs.Source.GetTotalPrototypeQuantity(reagent);
-
-            return quant >= Min && quant <= Max;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        ReagentPrototype? reagentProto = null;
-        if (Reagent is not null)
-            prototype.TryIndex(Reagent, out reagentProto);
-
-        return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
-            ("reagent", reagentProto?.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
-            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
-            ("min", Min.Float()));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs b/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
deleted file mode 100644
index e2febd8f48..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Requires the solution to be above or below a certain temperature.
-///     Used for things like explosives.
-/// </summary>
-public sealed partial class SolutionTemperature : EntityEffectCondition
-{
-    [DataField]
-    public float Min = 0.0f;
-
-    [DataField]
-    public float Max = float.PositiveInfinity;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            return reagentArgs?.Source != null &&
-                   reagentArgs.Source.Temperature >= Min &&
-                   reagentArgs.Source.Temperature <= Max;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-solution-temperature",
-            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-            ("min", Min));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs b/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
deleted file mode 100644
index a4baeb634a..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Shared.EntityEffects;
-using Content.Shared.Damage;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-public sealed partial class TotalDamage : EntityEffectCondition
-{
-    [DataField]
-    public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-    [DataField]
-    public FixedPoint2 Min = FixedPoint2.Zero;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage))
-        {
-            var total = damage.TotalDamage;
-            return total >= Min && total <= Max;
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-total-damage",
-            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
-            ("min", Min.Float()));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs b/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
deleted file mode 100644
index cbeb334c47..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Shared.EntityEffects;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-public sealed partial class Hunger : EntityEffectCondition
-{
-    [DataField]
-    public float Max = float.PositiveInfinity;
-
-    [DataField]
-    public float Min = 0;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
-        {
-            var total = args.EntityManager.System<HungerSystem>().GetHunger(hunger);
-            return total >= Min && total <= Max;
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-total-hunger",
-            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-            ("min", Min));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/AddToSolutionReaction.cs b/Content.Shared/EntityEffects/Effects/AddToSolutionReaction.cs
deleted file mode 100644
index 0f2d35d369..0000000000
--- a/Content.Shared/EntityEffects/Effects/AddToSolutionReaction.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Chemistry.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects
-{
-    public sealed partial class AddToSolutionReaction : EntityEffect
-    {
-        [DataField("solution")]
-        private string _solution = "reagents";
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            if (args is EntityEffectReagentArgs reagentArgs) {
-                if (reagentArgs.Reagent == null)
-                    return;
-
-                // TODO see if this is correct
-                var solutionContainerSystem = reagentArgs.EntityManager.System<SharedSolutionContainerSystem>();
-                if (!solutionContainerSystem.TryGetSolution(reagentArgs.TargetEntity, _solution, out var solutionContainer))
-                    return;
-
-                if (solutionContainerSystem.TryAddReagent(solutionContainer.Value, reagentArgs.Reagent.ID, reagentArgs.Quantity, out var accepted))
-                    reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, accepted);
-
-                return;
-            }
-
-            // TODO: Someone needs to figure out how to do this for non-reagent effects.
-            throw new NotImplementedException();
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-            Loc.GetString("reagent-effect-guidebook-add-to-solution-reaction", ("chance", Probability));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustAlert.cs b/Content.Shared/EntityEffects/Effects/AdjustAlert.cs
deleted file mode 100644
index 282de0a06c..0000000000
--- a/Content.Shared/EntityEffects/Effects/AdjustAlert.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Content.Shared.Alert;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class AdjustAlert : EntityEffect
-{
-    /// <summary>
-    /// The specific Alert that will be adjusted
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<AlertPrototype> AlertType;
-
-    /// <summary>
-    /// If true, the alert is removed after Time seconds. If Time was not specified the alert is removed immediately.
-    /// </summary>
-    [DataField]
-    public bool Clear;
-
-    /// <summary>
-    /// Visually display cooldown progress over the alert icon.
-    /// </summary>
-    [DataField]
-    public bool ShowCooldown;
-
-    /// <summary>
-    /// The length of the cooldown or delay before removing the alert (in seconds).
-    /// </summary>
-    [DataField]
-    public float Time;
-
-    //JUSTIFICATION: This just changes some visuals, doesn't need to be documented.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var alertSys = args.EntityManager.EntitySysManager.GetEntitySystem<AlertsSystem>();
-        if (!args.EntityManager.HasComponent<AlertsComponent>(args.TargetEntity))
-            return;
-
-        if (Clear && Time <= 0)
-        {
-            alertSys.ClearAlert(args.TargetEntity, AlertType);
-        }
-        else
-        {
-            var timing = IoCManager.Resolve<IGameTiming>();
-            (TimeSpan, TimeSpan)? cooldown = null;
-
-            if ((ShowCooldown || Clear) && Time > 0)
-                cooldown = (timing.CurTime, timing.CurTime + TimeSpan.FromSeconds(Time));
-
-            alertSys.ShowAlert(args.TargetEntity, AlertType, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
-        }
-
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs
new file mode 100644
index 0000000000..633cde0877
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs
@@ -0,0 +1,65 @@
+using Content.Shared.Alert;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Adjusts a given alert on this entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class AdjustAlertEntityEffectSysten : EntityEffectSystem<AlertsComponent, AdjustAlert>
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+
+    protected override void Effect(Entity<AlertsComponent> entity, ref EntityEffectEvent<AdjustAlert> args)
+    {
+        var time = args.Effect.Time;
+        var clear = args.Effect.Clear;
+        var type = args.Effect.AlertType;
+
+        if (clear && time <= TimeSpan.Zero)
+        {
+            _alerts.ClearAlert(entity.AsNullable(), type);
+        }
+        else
+        {
+            (TimeSpan, TimeSpan)? cooldown = null;
+
+            if ((args.Effect.ShowCooldown || clear) && args.Effect.Time >= TimeSpan.Zero)
+                cooldown = (_timing.CurTime, _timing.CurTime + time);
+
+            _alerts.ShowAlert(entity.AsNullable(), type, cooldown: cooldown, autoRemove: clear, showCooldown: args.Effect.ShowCooldown);
+        }
+
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AdjustAlert : EntityEffectBase<AdjustAlert>
+{
+    /// <summary>
+    /// The specific Alert that will be adjusted
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<AlertPrototype> AlertType;
+
+    /// <summary>
+    /// If true, the alert is removed after Time seconds. If Time was not specified the alert is removed immediately.
+    /// </summary>
+    [DataField]
+    public bool Clear;
+
+    /// <summary>
+    /// Visually display cooldown progress over the alert icon.
+    /// </summary>
+    [DataField]
+    public bool ShowCooldown;
+
+    /// <summary>
+    /// The length of the cooldown or delay before removing the alert (in seconds).
+    /// </summary>
+    [DataField]
+    public TimeSpan Time;
+}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustReagent.cs b/Content.Shared/EntityEffects/Effects/AdjustReagent.cs
deleted file mode 100644
index bb655b46bc..0000000000
--- a/Content.Shared/EntityEffects/Effects/AdjustReagent.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using Content.Shared.Body.Prototypes;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.Effects
-{
-    public sealed partial class AdjustReagent : EntityEffect
-    {
-        /// <summary>
-        ///     The reagent ID to remove. Only one of this and <see cref="Group"/> should be active.
-        /// </summary>
-        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<ReagentPrototype>))]
-        public string? Reagent = null;
-        // TODO use ReagentId
-
-        /// <summary>
-        ///     The metabolism group to remove, if the reagent satisfies any.
-        ///     Only one of this and <see cref="Reagent"/> should be active.
-        /// </summary>
-        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MetabolismGroupPrototype>))]
-        public string? Group = null;
-
-        [DataField(required: true)]
-        public FixedPoint2 Amount = default!;
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                if (reagentArgs.Source == null)
-                    return;
-
-                var amount = Amount;
-                amount *= reagentArgs.Scale;
-
-                if (Reagent != null)
-                {
-                    if (amount < 0 && reagentArgs.Source.ContainsPrototype(Reagent))
-                        reagentArgs.Source.RemoveReagent(Reagent, -amount);
-                    if (amount > 0)
-                        reagentArgs.Source.AddReagent(Reagent, amount);
-                }
-                else if (Group != null)
-                {
-                    var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
-                    foreach (var quant in reagentArgs.Source.Contents.ToArray())
-                    {
-                        var proto = prototypeMan.Index<ReagentPrototype>(quant.Reagent.Prototype);
-                        if (proto.Metabolisms != null && proto.Metabolisms.ContainsKey(Group))
-                        {
-                            if (amount < 0)
-                                reagentArgs.Source.RemoveReagent(quant.Reagent, amount);
-                            if (amount > 0)
-                                reagentArgs.Source.AddReagent(quant.Reagent, amount);
-                        }
-                    }
-                }
-                return;
-            }
-
-            // TODO: Someone needs to figure out how to do this for non-reagent effects.
-            throw new NotImplementedException();
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        {
-            if (Reagent is not null && prototype.TryIndex(Reagent, out ReagentPrototype? reagentProto))
-            {
-                return Loc.GetString("reagent-effect-guidebook-adjust-reagent-reagent",
-                    ("chance", Probability),
-                    ("deltasign", MathF.Sign(Amount.Float())),
-                    ("reagent", reagentProto.LocalizedName),
-                    ("amount", MathF.Abs(Amount.Float())));
-            }
-            else if (Group is not null && prototype.TryIndex(Group, out MetabolismGroupPrototype? groupProto))
-            {
-                return Loc.GetString("reagent-effect-guidebook-adjust-reagent-group",
-                    ("chance", Probability),
-                    ("deltasign", MathF.Sign(Amount.Float())),
-                    ("group", groupProto.LocalizedName),
-                    ("amount", MathF.Abs(Amount.Float())));
-            }
-
-            throw new NotImplementedException();
-        }
-    }
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/AdjustTemperature.cs b/Content.Shared/EntityEffects/Effects/AdjustTemperature.cs
deleted file mode 100644
index 03dc226e93..0000000000
--- a/Content.Shared/EntityEffects/Effects/AdjustTemperature.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class AdjustTemperature : EventEntityEffect<AdjustTemperature>
-{
-    [DataField]
-    public float Amount;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-adjust-temperature",
-            ("chance", Probability),
-            ("deltasign", MathF.Sign(Amount)),
-            ("amount", MathF.Abs(Amount)));
-}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
new file mode 100644
index 0000000000..adc465f341
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Temperature.Components;
+using Content.Shared.Temperature.Systems;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+// TODO: When we get a proper temperature/energy struct combine this with the solution temperature effect!!!
+/// <summary>
+/// Adjusts the temperature of this entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class AdjustTemperatureEntityEffectSystem : EntityEffectSystem<TemperatureComponent, AdjustTemperature>
+{
+    [Dependency] private readonly SharedTemperatureSystem _temperature = default!;
+    protected override void Effect(Entity<TemperatureComponent> entity, ref EntityEffectEvent<AdjustTemperature> args)
+    {
+        var amount = args.Effect.Amount * args.Scale;
+
+        _temperature.ChangeHeat(entity, amount, true, entity.Comp);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AdjustTemperature : EntityEffectBase<AdjustTemperature>
+{
+    /// <summary>
+    ///     Amount we're adjusting temperature by.
+    /// </summary>
+    [DataField]
+    public float Amount;
+}
diff --git a/Content.Shared/EntityEffects/Effects/AreaReactionEffect.cs b/Content.Shared/EntityEffects/Effects/AreaReactionEffect.cs
deleted file mode 100644
index 45ed261a35..0000000000
--- a/Content.Shared/EntityEffects/Effects/AreaReactionEffect.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Basically smoke and foam reactions.
-/// </summary>
-public sealed partial class AreaReactionEffect : EventEntityEffect<AreaReactionEffect>
-{
-    /// <summary>
-    /// How many seconds will the effect stay, counting after fully spreading.
-    /// </summary>
-    [DataField("duration")] public float Duration = 10;
-
-    /// <summary>
-    /// How many units of reaction for 1 smoke entity.
-    /// </summary>
-    [DataField] public FixedPoint2 OverflowThreshold = FixedPoint2.New(2.5);
-
-    /// <summary>
-    /// The entity prototype that will be spawned as the effect.
-    /// </summary>
-    [DataField("prototypeId", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string PrototypeId = default!;
-
-    /// <summary>
-    /// Sound that will get played when this reaction effect occurs.
-    /// </summary>
-    [DataField("sound", required: true)] public SoundSpecifier Sound = default!;
-
-    public override bool ShouldLog => true;
-
-    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-area-reaction",
-                    ("duration", Duration)
-                );
-
-    public override LogImpact LogImpact => LogImpact.High;
-}
diff --git a/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs b/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs
deleted file mode 100644
index 45ca740363..0000000000
--- a/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Xenoarchaeology.Artifact.Components;
-using Content.Shared.Xenoarchaeology.Artifact;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Restores durability in active artefact nodes.
-/// </summary>
-public sealed partial class ArtifactDurabilityRestore : EntityEffect
-{
-    /// <summary>
-    ///     Amount of durability that will be restored per effect interaction.
-    /// </summary>
-    [DataField]
-    public int RestoredDurability = 1;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var entMan = args.EntityManager;
-        var xenoArtifactSys = entMan.System<SharedXenoArtifactSystem>();
-
-        if (!entMan.TryGetComponent<XenoArtifactComponent>(args.TargetEntity, out var xenoArtifact))
-            return;
-
-        foreach (var node in xenoArtifactSys.GetActiveNodes((args.TargetEntity, xenoArtifact)))
-        {
-            xenoArtifactSys.AdjustNodeDurability(node.Owner, RestoredDurability);
-        }
-    }
-
-    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return Loc.GetString("reagent-effect-guidebook-artifact-durability-restore", ("restored", RestoredDurability));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs
new file mode 100644
index 0000000000..563c053b36
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs
@@ -0,0 +1,72 @@
+using Content.Shared.Popups;
+using Content.Shared.Xenoarchaeology.Artifact;
+using Content.Shared.Xenoarchaeology.Artifact.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Restores durability on this artifact
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ArtifactDurabilityRestoreEntityEffectsSystem : EntityEffectSystem<XenoArtifactComponent, ArtifactDurabilityRestore>
+{
+    [Dependency] private readonly SharedXenoArtifactSystem _xenoArtifact = default!;
+
+    protected override void Effect(Entity<XenoArtifactComponent> entity, ref EntityEffectEvent<ArtifactDurabilityRestore> args)
+    {
+        var durability = args.Effect.RestoredDurability;
+
+        foreach (var node in _xenoArtifact.GetActiveNodes(entity))
+        {
+            _xenoArtifact.AdjustNodeDurability(node.Owner, durability);
+        }
+    }
+}
+
+/// <summary>
+/// Unlocks a node on this artifact. Only works this effect hasn't been applied before.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ArtifactUnlockEntityEffectSystem : EntityEffectSystem<XenoArtifactComponent, ArtifactUnlock>
+{
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedXenoArtifactSystem _xenoArtifact = default!;
+
+    protected override void Effect(Entity<XenoArtifactComponent> entity, ref EntityEffectEvent<ArtifactUnlock> args)
+    {
+        if (EnsureComp<XenoArtifactUnlockingComponent>(entity, out var unlocking))
+        {
+            if (unlocking.ArtifexiumApplied)
+                return;
+
+            _popup.PopupEntity(Loc.GetString("artifact-activation-artifexium"), entity, PopupType.Medium);
+        }
+        else
+        {
+            _xenoArtifact.TriggerXenoArtifact(entity, null, force: true);
+        }
+
+        _xenoArtifact.SetArtifexiumApplied((entity, unlocking), true);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ArtifactDurabilityRestore : EntityEffectBase<ArtifactDurabilityRestore>
+{
+    /// <summary>
+    ///     Amount of durability that will be restored per effect interaction.
+    /// </summary>
+    [DataField]
+    public int RestoredDurability = 1;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-artifact-durability-restore", ("restored", RestoredDurability));
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ArtifactUnlock : EntityEffectBase<ArtifactUnlock>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-artifact-unlock", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/ArtifactUnlock.cs b/Content.Shared/EntityEffects/Effects/ArtifactUnlock.cs
deleted file mode 100644
index 077e1ebfd2..0000000000
--- a/Content.Shared/EntityEffects/Effects/ArtifactUnlock.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Content.Shared.Xenoarchaeology.Artifact;
-using Content.Shared.EntityEffects;
-using Content.Shared.Popups;
-using Content.Shared.Xenoarchaeology.Artifact.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Sets an artifact into the unlocking state and marks the artifexium effect as true.
-/// This is a very specific behavior intended for a specific chem.
-/// </summary>
-public sealed partial class ArtifactUnlock : EntityEffect
-{
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var entMan = args.EntityManager;
-        var xenoArtifactSys = entMan.System<SharedXenoArtifactSystem>();
-        var popupSys = entMan.System<SharedPopupSystem>();
-
-        if (!entMan.TryGetComponent<XenoArtifactComponent>(args.TargetEntity, out var xenoArtifact))
-            return;
-
-        if (!entMan.TryGetComponent<XenoArtifactUnlockingComponent>(args.TargetEntity, out var unlocking))
-        {
-            xenoArtifactSys.TriggerXenoArtifact((args.TargetEntity, xenoArtifact), null, force: true);
-            unlocking = entMan.EnsureComponent<XenoArtifactUnlockingComponent>(args.TargetEntity);
-        }
-        else if (!unlocking.ArtifexiumApplied)
-        {
-            popupSys.PopupEntity(Loc.GetString("artifact-activation-artifexium"), args.TargetEntity, PopupType.Medium);
-        }
-
-        if (unlocking.ArtifexiumApplied)
-            return;
-
-        xenoArtifactSys.SetArtifexiumApplied((args.TargetEntity, unlocking), true);
-    }
-
-    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return Loc.GetString("reagent-effect-guidebook-artifact-unlock", ("chance", Probability));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs
new file mode 100644
index 0000000000..aa5132e596
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class CreateGas : EntityEffectBase<CreateGas>
+{
+    /// <summary>
+    ///     The gas we're creating
+    /// </summary>
+    [DataField]
+    public Gas Gas;
+
+    /// <summary>
+    ///     Amount of moles we're creating
+    /// </summary>
+    [DataField]
+    public float Moles = 3f;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var atmos = entSys.GetEntitySystem<SharedAtmosphereSystem>();
+        var gasProto = atmos.GetGas(Gas);
+
+        return Loc.GetString("entity-effect-guidebook-create-gas",
+            ("chance", Probability),
+            ("moles", Moles),
+            ("gas", gasProto.Name));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs
new file mode 100644
index 0000000000..b4b475ec59
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// This raises an extinguish event on a given entity, reducing FireStacks.
+/// The amount of FireStacks reduced is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ExtinguishEntityEffectSystem : EntityEffectSystem<FlammableComponent, Extinguish>
+{
+    protected override void Effect(Entity<FlammableComponent> entity, ref EntityEffectEvent<Extinguish> args)
+    {
+        var ev = new ExtinguishEvent
+        {
+            FireStacksAdjustment = args.Effect.FireStacksAdjustment * args.Scale,
+        };
+
+        RaiseLocalEvent(entity, ref ev);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Extinguish : EntityEffectBase<Extinguish>
+{
+    /// <summary>
+    ///     Amount of FireStacks reduced.
+    /// </summary>
+    [DataField]
+    public float FireStacksAdjustment = -1.5f;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-extinguish-reaction", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs
new file mode 100644
index 0000000000..f08b609407
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs
@@ -0,0 +1,28 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Flammable : EntityEffectBase<Flammable>
+{
+    /// <summary>
+    /// Fire stack multiplier applied on an entity,
+    /// unless that entity is already on fire and <see cref="MultiplierOnExisting"/> is not null.
+    /// </summary>
+    [DataField]
+    public float Multiplier = 0.05f;
+
+    /// <summary>
+    /// Fire stack multiplier applied if the entity is already on fire. Defaults to <see cref="Multiplier"/> if null.
+    /// </summary>
+    [DataField]
+    public float? MultiplierOnExisting;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-flammable-reaction", ("chance", Probability));
+
+    public override bool ShouldLog => true;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs
new file mode 100644
index 0000000000..e10aaf3cd1
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Database;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// See serverside system
+/// </summary>
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Ignite : EntityEffectBase<Ignite>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-ignite", ("chance", Probability));
+
+    public override bool ShouldLog => true;
+
+    public override LogImpact LogImpact => LogImpact.Medium;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
new file mode 100644
index 0000000000..402a50538a
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Removes a given amount of chemicals from the bloodstream modified by scale.
+/// Optionally ignores a given chemical.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class CleanBloodstreamEntityEffectSystem : EntityEffectSystem<BloodstreamComponent, CleanBloodstream>
+{
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
+
+    protected override void Effect(Entity<BloodstreamComponent> entity, ref EntityEffectEvent<CleanBloodstream> args)
+    {
+        var scale = args.Scale * args.Effect.CleanseRate;
+
+        _bloodstream.FlushChemicals((entity, entity), args.Effect.Excluded, scale);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class CleanBloodstream : EntityEffectBase<CleanBloodstream>
+{
+    /// <summary>
+    ///     Amount of reagent we're cleaning out of our bloodstream.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 CleanseRate = 3.0f;
+
+    /// <summary>
+    ///     An optional chemical to ignore when doing removal.
+    /// </summary>
+    [DataField]
+    public ProtoId<ReagentPrototype>? Excluded;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-clean-bloodstream", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs
new file mode 100644
index 0000000000..29fd994e8c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Eye.Blinding.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Modifies eye damage by a given amount, modified by scale, floored to an integer.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class EyeDamageEntityEffectSystem : EntityEffectSystem<MetaDataComponent, EyeDamage>
+{
+    [Dependency] private readonly BlindableSystem _blindable = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<EyeDamage> args)
+    {
+        var amount = (int) Math.Floor(args.Effect.Amount * args.Scale);
+        _blindable.AdjustEyeDamage(entity.Owner, amount);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class EyeDamage : EntityEffectBase<EyeDamage>
+{
+    /// <summary>
+    /// The amount of eye damage we're adding or removing
+    /// </summary>
+    [DataField]
+    public int Amount = -1;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs
new file mode 100644
index 0000000000..c684ffcdf2
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Modifies bleed by a given amount multiplied by scale. This can increase or decrease bleed.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ModifyBleedEntityEffectSystem : EntityEffectSystem<BloodstreamComponent, ModifyBleed>
+{
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
+
+    protected override void Effect(Entity<BloodstreamComponent> entity, ref EntityEffectEvent<ModifyBleed> args)
+    {
+        _bloodstream.TryModifyBleedAmount(entity.AsNullable(), args.Effect.Amount * args.Scale);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ModifyBleed : EntityEffectBase<ModifyBleed>
+{
+    /// <summary>
+    /// Amount of bleed we're applying or removing if negative.
+    /// </summary>
+    [DataField]
+    public float Amount = -1.0f;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-modify-bleed-amount", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs
new file mode 100644
index 0000000000..43098c9ddd
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Modifies the amount of blood in this entity's bloodstream by a given amount multiplied by scale.
+/// This effect can increase or decrease blood level.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ModifyBloodLevelEntityEffectSystem : EntityEffectSystem<BloodstreamComponent, ModifyBloodLevel>
+{
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
+
+    protected override void Effect(Entity<BloodstreamComponent> entity, ref EntityEffectEvent<ModifyBloodLevel> args)
+    {
+        _bloodstream.TryModifyBloodLevel(entity.AsNullable(), args.Effect.Amount * args.Scale);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ModifyBloodLevel : EntityEffectBase<ModifyBloodLevel>
+{
+    /// <summary>
+    /// Amount of bleed we're applying or removing if negative.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 Amount = 1.0f;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-modify-blood-level", ("chance", Probability), ("deltasign", MathF.Sign(Amount.Float())));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs
new file mode 100644
index 0000000000..29fa1de98d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Atmos;
+using Content.Shared.Body.Components;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Adjust the amount of Moles stored in this set of lungs based on a given dictionary of gasses and ratios.
+/// The amount of gas adjusted is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ModifyLungGasEntityEffectSystem : EntityEffectSystem<LungComponent, ModifyLungGas>
+{
+    // TODO: This shouldn't be an entity effect, gasses should just metabolize and make a byproduct by default...
+    protected override void Effect(Entity<LungComponent> entity, ref EntityEffectEvent<ModifyLungGas> args)
+    {
+        var amount = args.Scale;
+
+        foreach (var (gas, ratio) in args.Effect.Ratios)
+        {
+            var quantity = ratio * amount / Atmospherics.BreathMolesToReagentMultiplier;
+            if (quantity < 0)
+                quantity = Math.Max(quantity, -entity.Comp.Air[(int) gas]);
+            entity.Comp.Air.AdjustMoles(gas, quantity);
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ModifyLungGas : EntityEffectBase<ModifyLungGas>
+{
+    [DataField(required: true)]
+    public Dictionary<Gas, float> Ratios = default!;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs
new file mode 100644
index 0000000000..9790fced4e
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs
@@ -0,0 +1,14 @@
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Oxygenate : EntityEffectBase<Oxygenate>
+{
+    /// <summary>
+    /// Factor of oxygenation per metabolized quantity. Lungs metabolize at about 50u per tick so we need an equal multiplier to cancel that out!
+    /// </summary>
+    [DataField]
+    public float Factor = 1f;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs
new file mode 100644
index 0000000000..4fb41bd010
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Atmos.Rotting;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Reduces the rotting timer on an entity by a number of seconds, modified by scale.
+/// This cannot increase the amount of seconds a body has rotted.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ReduceRottingEntityEffectSystem : EntityEffectSystem<PerishableComponent, ReduceRotting>
+{
+    [Dependency] private readonly SharedRottingSystem _rotting = default!;
+
+    protected override void Effect(Entity<PerishableComponent> entity, ref EntityEffectEvent<ReduceRotting> args)
+    {
+        var amount = args.Effect.Seconds * args.Scale;
+
+        _rotting.ReduceAccumulator(entity, amount);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ReduceRotting : EntityEffectBase<ReduceRotting>
+{
+    /// <summary>
+    /// Number of seconds removed from the rotting timer.
+    /// </summary>
+    [DataField]
+    public TimeSpan Seconds = TimeSpan.FromSeconds(10);
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-reduce-rotting",
+            ("chance", Probability),
+            ("time", Seconds.TotalSeconds));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs
new file mode 100644
index 0000000000..796084206d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs
@@ -0,0 +1,63 @@
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+// TODO: These systems are in the same file since satiation should be one system instead of two. Combine these when that happens.
+// TODO: Arguably oxygen saturation should also be added here...
+/// <summary>
+/// Modifies the thirst level of a given entity, multiplied by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SatiateThirstEntityEffectsSystem : EntityEffectSystem<ThirstComponent, SatiateThirst>
+{
+    [Dependency] private readonly ThirstSystem _thirst = default!;
+    protected override void Effect(Entity<ThirstComponent> entity, ref EntityEffectEvent<SatiateThirst> args)
+    {
+        _thirst.ModifyThirst(entity, entity.Comp, args.Effect.Factor * args.Scale);
+    }
+}
+
+/// <summary>
+/// Modifies the hunger level of a given entity, multiplied by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SatiateHungerEntityEffectsSystem : EntityEffectSystem<HungerComponent, SatiateHunger>
+{
+    [Dependency] private readonly HungerSystem _hunger = default!;
+    protected override void Effect(Entity<HungerComponent> entity, ref EntityEffectEvent<SatiateHunger> args)
+    {
+        _hunger.ModifyHunger(entity, args.Effect.Factor * args.Scale, entity.Comp);
+    }
+}
+
+/// <summary>
+/// A type of <see cref="EntityEffectBase{T}"/> made for satiation effects.
+/// </summary>
+/// <typeparam name="T">The effect inheriting this BaseEffect</typeparam>
+/// <inheritdoc cref="EntityEffect"/>
+public abstract partial class Satiate<T> : EntityEffectBase<T> where T : EntityEffectBase<T>
+{
+    public const float AverageSatiation = 3f; // Magic number. Not sure how it was calculated since I didn't make it.
+
+    /// <summary>
+    ///     Change in satiation.
+    /// </summary>
+    [DataField]
+    public float Factor = -1.5f;
+}
+
+/// <inheritdoc cref="Satiate{T}"/>
+public sealed partial class SatiateThirst : Satiate<SatiateThirst>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  Factor / AverageSatiation));
+}
+
+/// <inheritdoc cref="Satiate{T}"/>
+public sealed partial class SatiateHunger : Satiate<SatiateHunger>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-satiate-hunger", ("chance", Probability), ("relative", Factor / AverageSatiation));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs
new file mode 100644
index 0000000000..02747057c5
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Medical;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Makes an entity vomit and reduces hunger and thirst by a given amount, modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class VomitEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Vomit>
+{
+    [Dependency] private readonly VomitSystem _vomit = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Vomit> args)
+    {
+        _vomit.Vomit(entity.Owner, args.Effect.ThirstAmount * args.Scale, args.Effect.HungerAmount * args.Scale);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Vomit : EntityEffectBase<Vomit>
+{
+    /// <summary>
+    /// How much we adjust our thirst after vomiting.
+    /// </summary>
+    [DataField]
+    public float ThirstAmount = -8f;
+
+    /// <summary>
+    /// How much we adjust our hunger after vomiting.
+    /// </summary>
+    [DataField]
+    public float HungerAmount = -8f;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-vomit", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/BasePlantAdjustAttributeEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/BasePlantAdjustAttributeEntityEffect.cs
new file mode 100644
index 0000000000..9b235e68d4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/BasePlantAdjustAttributeEntityEffect.cs
@@ -0,0 +1,37 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+/// <summary>
+/// A type of <see cref="EntityEffectBase{T}"/> which modifies the attribute of a Seed in a PlantHolder.
+/// These are not modified by scale as botany has no concept of scale.
+/// </summary>
+/// <typeparam name="T">The effect inheriting this BaseEffect</typeparam>
+/// <inheritdoc cref="EntityEffect"/>
+public abstract partial class BasePlantAdjustAttribute<T> : EntityEffectBase<T> where T : BasePlantAdjustAttribute<T>
+{
+    /// <summary>
+    /// How much we're adjusting the given attribute by.
+    /// </summary>
+    [DataField]
+    public float Amount { get; protected set; } = 1;
+
+    /// <summary>
+    /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
+    /// </summary>
+    [DataField]
+    public abstract string GuidebookAttributeName { get; set; }
+
+    /// <summary>
+    /// Whether the attribute in question is a good thing. Used for guidebook descriptions to determine the color of the number.
+    /// </summary>
+    [DataField]
+    public virtual bool GuidebookIsAttributePositive { get; protected set; } = true;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-attribute",
+        ("attribute", Loc.GetString(GuidebookAttributeName)),
+        ("amount", Amount.ToString("0.00")),
+        ("positive", GuidebookIsAttributePositive),
+        ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealth.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealth.cs
new file mode 100644
index 0000000000..069cb320a9
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealth.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustHealth : BasePlantAdjustAttribute<PlantAdjustHealth>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-health";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevel.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevel.cs
new file mode 100644
index 0000000000..32e419e291
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevel.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustMutationLevel : BasePlantAdjustAttribute<PlantAdjustMutationLevel>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-level";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationMod.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationMod.cs
new file mode 100644
index 0000000000..4ea695d135
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationMod.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustMutationMod : BasePlantAdjustAttribute<PlantAdjustMutationMod>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-mod";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutrition.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutrition.cs
new file mode 100644
index 0000000000..6f53076fb3
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutrition.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustNutrition : BasePlantAdjustAttribute<PlantAdjustNutrition>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-nutrition";
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPests.cs
similarity index 53%
rename from Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
rename to Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPests.cs
index 18c00550d5..c1661ec89e 100644
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPests.cs
@@ -1,6 +1,6 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
 
-public sealed partial class PlantAdjustPests : PlantAdjustAttribute<PlantAdjustPests>
+public sealed partial class PlantAdjustPests : BasePlantAdjustAttribute<PlantAdjustPests>
 {
     public override string GuidebookAttributeName { get; set; } = "plant-attribute-pests";
     public override bool GuidebookIsAttributePositive { get; protected set; } = false;
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotency.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotency.cs
new file mode 100644
index 0000000000..4f42adf3e6
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotency.cs
@@ -0,0 +1,9 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+/// <summary>
+///     Handles increase or decrease of plant potency.
+/// </summary>
+public sealed partial class PlantAdjustPotency : BasePlantAdjustAttribute<PlantAdjustPotency>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-potency";
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxins.cs
similarity index 53%
rename from Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
rename to Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxins.cs
index 9123b5847d..04eccb03ec 100644
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxins.cs
@@ -1,8 +1,9 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
 
-public sealed partial class PlantAdjustToxins : PlantAdjustAttribute<PlantAdjustToxins>
+public sealed partial class PlantAdjustToxins : BasePlantAdjustAttribute<PlantAdjustToxins>
 {
     public override string GuidebookAttributeName { get; set; } = "plant-attribute-toxins";
+
     public override bool GuidebookIsAttributePositive { get; protected set; } = false;
 }
 
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWater.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWater.cs
new file mode 100644
index 0000000000..1d6ef8ea09
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWater.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustWater : BasePlantAdjustAttribute<PlantAdjustWater>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-water";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeeds.cs
similarity index 53%
rename from Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
rename to Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeeds.cs
index 70ff0747dd..e6be25d8c9 100644
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeeds.cs
@@ -1,6 +1,6 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
 
-public sealed partial class PlantAdjustWeeds : PlantAdjustAttribute<PlantAdjustWeeds>
+public sealed partial class PlantAdjustWeeds : BasePlantAdjustAttribute<PlantAdjustWeeds>
 {
     public override string GuidebookAttributeName { get; set; } = "plant-attribute-weeds";
     public override bool GuidebookIsAttributePositive { get; protected set; } = false;
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowth.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowth.cs
new file mode 100644
index 0000000000..76466f544d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowth.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAffectGrowth : BasePlantAdjustAttribute<PlantAffectGrowth>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-growth";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStat.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStat.cs
new file mode 100644
index 0000000000..dcea56baad
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStat.cs
@@ -0,0 +1,21 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantChangeStat : EntityEffectBase<PlantChangeStat>
+{
+    /// <remarks>
+    /// This is the worst thing in the code base.
+    /// It's meant to be generic and expandable I guess? But it's looking for a specific datafield and then
+    /// sending it into an if else if else if statement that filters by object type and randomly flips bits.
+    /// </remarks>
+    [DataField (required: true)]
+    public string TargetValue = string.Empty;
+
+    [DataField]
+    public float MinValue;
+
+    [DataField]
+    public float MaxValue;
+
+    [DataField]
+    public int Steps;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadone.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadone.cs
new file mode 100644
index 0000000000..7dcea240a6
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadone.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantCryoxadone : EntityEffectBase<PlantCryoxadone>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-cryoxadone", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs
new file mode 100644
index 0000000000..d45c0369f7
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+/// <summary>
+///     Handles removal of seeds on a plant.
+/// </summary>
+public sealed partial class PlantDestroySeeds : EntityEffectBase<PlantDestroySeeds>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-seeds-remove", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamine.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamine.cs
new file mode 100644
index 0000000000..4355a44593
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamine.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantDiethylamine : EntityEffectBase<PlantDiethylamine>
+{
+    /// <inheritdoc/>
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-diethylamine", ("chance", Probability));
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximine.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximine.cs
new file mode 100644
index 0000000000..b56b99038b
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximine.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantPhalanximine : EntityEffectBase<PlantPhalanximine>
+{
+    /// <inheritdoc/>
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-phalanximine", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeeds.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeeds.cs
new file mode 100644
index 0000000000..63b06b0ad1
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeeds.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+/// <summary>
+///     Handles restoral of seeds on a plant.
+/// </summary>
+public sealed partial class PlantRestoreSeeds : EntityEffectBase<PlantRestoreSeeds>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-seeds-add", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvest.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvest.cs
new file mode 100644
index 0000000000..77bde39b12
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvest.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class RobustHarvest : EntityEffectBase<RobustHarvest>
+{
+    [DataField]
+    public int PotencyLimit = 50;
+
+    [DataField]
+    public int PotencyIncrease = 3;
+
+    [DataField]
+    public int PotencySeedlessThreshold = 30;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-robust-harvest",
+            ("seedlesstreshold", PotencySeedlessThreshold),
+            ("limit", PotencyLimit),
+            ("increase", PotencyIncrease),
+            ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs
new file mode 100644
index 0000000000..6a3d13e0c6
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Random;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+public sealed partial class PlantMutateChemicals : EntityEffectBase<PlantMutateChemicals>
+{
+    /// <summary>
+    /// The Reagent list this mutation draws from.
+    /// </summary>
+    [DataField]
+    public ProtoId<WeightedRandomFillSolutionPrototype> RandomPickBotanyReagent = "RandomPickBotanyReagent";
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs
new file mode 100644
index 0000000000..c617c05b33
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs
@@ -0,0 +1,22 @@
+namespace Content.Shared.EntityEffects.Effects.Botany;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+public sealed partial class PlantMutateConsumeGases : EntityEffectBase<PlantMutateConsumeGases>
+{
+    [DataField]
+    public float MinValue = 0.01f;
+
+    [DataField]
+    public float MaxValue = 0.5f;
+}
+
+public sealed partial class PlantMutateExudeGases : EntityEffectBase<PlantMutateExudeGases>
+{
+    [DataField]
+    public float MinValue = 0.01f;
+
+    [DataField]
+    public float MaxValue = 0.5f;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffect.cs
new file mode 100644
index 0000000000..3602453b16
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffect.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.EntityEffects.Effects.Botany;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+public sealed partial class PlantMutateHarvest : EntityEffectBase<PlantMutateHarvest>;
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffect.cs
new file mode 100644
index 0000000000..91e8947044
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffect.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.EntityEffects.Effects.Botany;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+public sealed partial class PlantMutateSpeciesChange : EntityEffectBase<PlantMutateSpeciesChange>;
diff --git a/Content.Shared/EntityEffects/Effects/CauseZombieInfection.cs b/Content.Shared/EntityEffects/Effects/CauseZombieInfection.cs
deleted file mode 100644
index 3f8c58b74c..0000000000
--- a/Content.Shared/EntityEffects/Effects/CauseZombieInfection.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class CauseZombieInfection : EventEntityEffect<CauseZombieInfection>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-cause-zombie-infection", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/ChemCleanBloodstream.cs b/Content.Shared/EntityEffects/Effects/ChemCleanBloodstream.cs
deleted file mode 100644
index 98181b8667..0000000000
--- a/Content.Shared/EntityEffects/Effects/ChemCleanBloodstream.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Basically smoke and foam reactions.
-/// </summary>
-public sealed partial class ChemCleanBloodstream : EventEntityEffect<ChemCleanBloodstream>
-{
-    [DataField]
-    public float CleanseRate = 3.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-chem-clean-bloodstream", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/ChemHealEyeDamage.cs b/Content.Shared/EntityEffects/Effects/ChemHealEyeDamage.cs
deleted file mode 100644
index 83b2aa96e5..0000000000
--- a/Content.Shared/EntityEffects/Effects/ChemHealEyeDamage.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Eye.Blinding.Systems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Heal or apply eye damage
-/// </summary>
-public sealed partial class ChemHealEyeDamage : EntityEffect
-{
-    /// <summary>
-    /// How much eye damage to add.
-    /// </summary>
-    [DataField]
-    public int Amount = -1;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-cure-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-            if (reagentArgs.Scale != 1f) // huh?
-                return;
-
-        args.EntityManager.EntitySysManager.GetEntitySystem<BlindableSystem>().AdjustEyeDamage(args.TargetEntity, Amount);
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/ChemVomit.cs b/Content.Shared/EntityEffects/Effects/ChemVomit.cs
deleted file mode 100644
index 1cd6b2552c..0000000000
--- a/Content.Shared/EntityEffects/Effects/ChemVomit.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Forces you to vomit.
-/// </summary>
-public sealed partial class ChemVomit : EventEntityEffect<ChemVomit>
-{
-    /// How many units of thirst to add each time we vomit
-    [DataField]
-    public float ThirstAmount = -8f;
-    /// How many units of hunger to add each time we vomit
-    [DataField]
-    public float HungerAmount = -8f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-chem-vomit", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/CreateEntityReactionEffect.cs b/Content.Shared/EntityEffects/Effects/CreateEntityReactionEffect.cs
deleted file mode 100644
index 33173b1737..0000000000
--- a/Content.Shared/EntityEffects/Effects/CreateEntityReactionEffect.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-[DataDefinition]
-public sealed partial class CreateEntityReactionEffect : EventEntityEffect<CreateEntityReactionEffect>
-{
-    /// <summary>
-    ///     What entity to create.
-    /// </summary>
-    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string Entity = default!;
-
-    /// <summary>
-    ///     How many entities to create per unit reaction.
-    /// </summary>
-    [DataField]
-    public uint Number = 1;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-create-entity-reaction-effect",
-            ("chance", Probability),
-            ("entname", IoCManager.Resolve<IPrototypeManager>().Index<EntityPrototype>(Entity).Name),
-            ("amount", Number));
-}
diff --git a/Content.Shared/EntityEffects/Effects/CreateGas.cs b/Content.Shared/EntityEffects/Effects/CreateGas.cs
deleted file mode 100644
index 75d554cdb3..0000000000
--- a/Content.Shared/EntityEffects/Effects/CreateGas.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Atmos;
-using Content.Shared.Atmos.EntitySystems;
-using Content.Shared.Database;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class CreateGas : EventEntityEffect<CreateGas>
-{
-    [DataField(required: true)]
-    public Gas Gas = default!;
-
-    /// <summary>
-    ///     For each unit consumed, how many moles of gas should be created?
-    /// </summary>
-    [DataField]
-    public float Multiplier = 3f;
-
-    public override bool ShouldLog => true;
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        var atmos = entSys.GetEntitySystem<SharedAtmosphereSystem>();
-        var gasProto = atmos.GetGas(Gas);
-
-        return Loc.GetString("reagent-effect-guidebook-create-gas",
-            ("chance", Probability),
-            ("moles", Multiplier),
-            ("gas", gasProto.Name));
-    }
-
-    public override LogImpact LogImpact => LogImpact.High;
-}
diff --git a/Content.Shared/EntityEffects/Effects/CureZombieInfection.cs b/Content.Shared/EntityEffects/Effects/CureZombieInfection.cs
deleted file mode 100644
index dd2d21854c..0000000000
--- a/Content.Shared/EntityEffects/Effects/CureZombieInfection.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class CureZombieInfection : EventEntityEffect<CureZombieInfection>
-{
-    [DataField]
-    public bool Innoculate;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        if(Innoculate)
-            return Loc.GetString("reagent-effect-guidebook-innoculate-zombie-infection", ("chance", Probability));
-
-        return Loc.GetString("reagent-effect-guidebook-cure-zombie-infection", ("chance", Probability));
-    }
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/Drunk.cs b/Content.Shared/EntityEffects/Effects/Drunk.cs
deleted file mode 100644
index aa15df8f3d..0000000000
--- a/Content.Shared/EntityEffects/Effects/Drunk.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Shared.Drunk;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class Drunk : EntityEffect
-{
-    /// <summary>
-    ///     BoozePower is how long each metabolism cycle will make the drunk effect last for.
-    /// </summary>
-    [DataField]
-    public TimeSpan BoozePower = TimeSpan.FromSeconds(3f);
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-drunk", ("chance", Probability));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var boozePower = BoozePower;
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-            boozePower *= reagentArgs.Scale.Float();
-
-        var drunkSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedDrunkSystem>();
-        drunkSys.TryApplyDrunkenness(args.TargetEntity, boozePower);
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Electrocute.cs b/Content.Shared/EntityEffects/Effects/Electrocute.cs
deleted file mode 100644
index 32e0ff1172..0000000000
--- a/Content.Shared/EntityEffects/Effects/Electrocute.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Shared.Electrocution;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class Electrocute : EntityEffect
-{
-    [DataField] public int ElectrocuteTime = 2;
-
-    [DataField] public int ElectrocuteDamageScale = 5;
-
-    /// <remarks>
-    ///     true - refresh electrocute time,  false - accumulate electrocute time
-    /// </remarks>
-    [DataField] public bool Refresh = true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime));
-
-    public override bool ShouldLog => true;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            reagentArgs.EntityManager.System<SharedElectrocutionSystem>().TryDoElectrocution(reagentArgs.TargetEntity, null,
-                Math.Max((reagentArgs.Quantity * ElectrocuteDamageScale).Int(), 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
-
-            if (reagentArgs.Reagent != null)
-                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
-        } else
-        {
-            args.EntityManager.System<SharedElectrocutionSystem>().TryDoElectrocution(args.TargetEntity, null,
-                Math.Max(ElectrocuteDamageScale, 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
-        }
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Emote.cs b/Content.Shared/EntityEffects/Effects/Emote.cs
deleted file mode 100644
index 494dc502f5..0000000000
--- a/Content.Shared/EntityEffects/Effects/Emote.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Content.Shared.Chat.Prototypes;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Tries to force someone to emote (scream, laugh, etc). Still respects whitelists/blacklists and other limits unless specially forced.
-/// </summary>
-public sealed partial class Emote : EventEntityEffect<Emote>
-{
-    /// <summary>
-    ///     The emote the entity will preform.
-    /// </summary>
-    [DataField("emote", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
-    public string EmoteId;
-
-    /// <summary>
-    ///     If the emote should be recorded in chat.
-    /// </summary>
-    [DataField]
-    public bool ShowInChat;
-
-    /// <summary>
-    ///     If the forced emote will be listed in the guidebook.
-    /// </summary>
-    [DataField]
-    public bool ShowInGuidebook;
-
-    /// <summary>
-    ///     If true, the entity will preform the emote even if they normally can't.
-    /// </summary>
-    [DataField]
-    public bool Force = false;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        if (!ShowInGuidebook)
-            return null; // JUSTIFICATION: Emoting is mostly flavor, so same reason popup messages are not in here.
-
-        var emotePrototype = prototype.Index<EmotePrototype>(EmoteId);
-        return Loc.GetString("reagent-effect-guidebook-emote", ("chance", Probability), ("emote", Loc.GetString(emotePrototype.Name)));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/EmoteEntityEffect.cs b/Content.Shared/EntityEffects/Effects/EmoteEntityEffect.cs
new file mode 100644
index 0000000000..1fcfc703ce
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EmoteEntityEffect.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Chat.Prototypes;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Emote : EntityEffectBase<Emote>
+{
+    /// <summary>
+    ///     The emote the entity will preform.
+    /// </summary>
+    [DataField("emote", required: true)]
+    public ProtoId<EmotePrototype> EmoteId;
+
+    /// <summary>
+    ///     If the emote should be recorded in chat.
+    /// </summary>
+    [DataField]
+    public bool ShowInChat;
+
+    /// <summary>
+    ///     If the forced emote will be listed in the guidebook.
+    /// </summary>
+    [DataField]
+    public bool ShowInGuidebook;
+
+    /// <summary>
+    ///     If true, the entity will preform the emote even if they normally can't.
+    /// </summary>
+    [DataField]
+    public bool Force;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        if (!ShowInGuidebook || !prototype.Resolve(EmoteId, out var emote))
+            return null; // JUSTIFICATION: Emoting is mostly flavor, so same reason popup messages are not in here.
+
+        return Loc.GetString("entity-effect-guidebook-emote", ("chance", Probability), ("emote", Loc.GetString(emote.Name)));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs b/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs
deleted file mode 100644
index 0f9eacc58d..0000000000
--- a/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-[DataDefinition]
-public sealed partial class EmpReactionEffect : EventEntityEffect<EmpReactionEffect>
-{
-    /// <summary>
-    ///     Impulse range per unit of quantity
-    /// </summary>
-    [DataField("rangePerUnit")]
-    public float EmpRangePerUnit = 0.5f;
-
-    /// <summary>
-    ///     Maximum impulse range
-    /// </summary>
-    [DataField("maxRange")]
-    public float EmpMaxRange = 10;
-
-    /// <summary>
-    ///     How much energy will be drain from sources
-    /// </summary>
-    [DataField]
-    public float EnergyConsumption = 12500;
-
-    /// <summary>
-    ///     Amount of time entities will be disabled
-    /// </summary>
-    [DataField("duration")]
-    public TimeSpan DisableDuration = TimeSpan.FromSeconds(15);
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-emp-reaction-effect", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs
new file mode 100644
index 0000000000..3f5d5b3b57
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs
@@ -0,0 +1,36 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
+
+/// <summary>
+/// A type of <see cref="EntityEffectBase{T}"/> for effects that spawn entities by prototype.
+/// </summary>
+/// <typeparam name="T">The entity effect inheriting this BaseEffect</typeparam>
+/// <inheritdoc cref="EntityEffect"/>
+public abstract partial class BaseSpawnEntityEntityEffect<T> : EntityEffectBase<T> where T : BaseSpawnEntityEntityEffect<T>
+{
+    /// <summary>
+    /// Amount of entities we're spawning
+    /// </summary>
+    [DataField]
+    public int Number = 1;
+
+    /// <summary>
+    /// Prototype of the entity we're spawning
+    /// </summary>
+    [DataField (required: true)]
+    public EntProtoId Entity;
+
+    /// <summary>
+    /// Whether this spawning is predicted. Set false to not predict the spawn.
+    /// Entities with animations or that have random elements when spawned should set this to false.
+    /// </summary>
+    [DataField]
+    public bool Predicted = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-spawn-entity",
+            ("chance", Probability),
+            ("entname", IoCManager.Resolve<IPrototypeManager>().Index<EntityPrototype>(Entity).Name),
+            ("amount", Number));
+}
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs
new file mode 100644
index 0000000000..9887ecdc60
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs
@@ -0,0 +1,37 @@
+using Robust.Shared.Network;
+
+namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
+
+/// <summary>
+/// Spawns a number of entities of a given prototype at the coordinates of this entity.
+/// Amount is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SpawnEntityEntityEffectSystem : EntityEffectSystem<TransformComponent, SpawnEntity>
+{
+    [Dependency] private readonly INetManager _net = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<SpawnEntity> args)
+    {
+        var quantity = args.Effect.Number * (int)Math.Floor(args.Scale);
+        var proto = args.Effect.Entity;
+
+        if (args.Effect.Predicted)
+        {
+            for (var i = 0; i < quantity; i++)
+            {
+                PredictedSpawnNextToOrDrop(proto, entity, entity.Comp);
+            }
+        }
+        else if (_net.IsServer)
+        {
+            for (var i = 0; i < quantity; i++)
+            {
+                SpawnNextToOrDrop(proto, entity, entity.Comp);
+            }
+        }
+    }
+}
+
+/// <inheritdoc cref="BaseSpawnEntityEntityEffect{T}"/>
+public sealed partial class SpawnEntity : BaseSpawnEntityEntityEffect<SpawnEntity>;
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs
new file mode 100644
index 0000000000..6909d503df
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs
@@ -0,0 +1,51 @@
+using Robust.Shared.Containers;
+using Robust.Shared.Network;
+
+namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
+
+/// <summary>
+/// Spawns a given number of entities of a given prototype in a specified container owned by this entity.
+/// Returns if the prototype cannot spawn in the specified container.
+/// Amount is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SpawnEntityInContainerEntityEffectSystem : EntityEffectSystem<ContainerManagerComponent, SpawnEntityInContainer>
+{
+    [Dependency] private readonly INetManager _net = default!;
+
+    protected override void Effect(Entity<ContainerManagerComponent> entity, ref EntityEffectEvent<SpawnEntityInContainer> args)
+    {
+        var quantity = args.Effect.Number * (int)Math.Floor(args.Scale);
+        var proto = args.Effect.Entity;
+        var container = args.Effect.ContainerName;
+
+        if (args.Effect.Predicted)
+        {
+            for (var i = 0; i < quantity; i++)
+            {
+                // Stop trying to spawn if it fails
+                if (!PredictedTrySpawnInContainer(proto, entity, container, out _, entity.Comp))
+                    return;
+            }
+        }
+        else if (_net.IsServer)
+        {
+            for (var i = 0; i < quantity; i++)
+            {
+                // Stop trying to spawn if it fails
+                if (!TrySpawnInContainer(proto, entity, container, out _, entity.Comp))
+                    return;
+            }
+        }
+    }
+}
+
+/// <inheritdoc cref="BaseSpawnEntityEntityEffect{T}"/>
+public sealed partial class SpawnEntityInContainer : BaseSpawnEntityEntityEffect<SpawnEntityInContainer>
+{
+    /// <summary>
+    /// Name of the container we're trying to spawn into.
+    /// </summary>
+    [DataField(required: true)]
+    public string ContainerName;
+}
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs
new file mode 100644
index 0000000000..e5b1e119c1
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs
@@ -0,0 +1,49 @@
+using Robust.Shared.Containers;
+using Robust.Shared.Network;
+
+namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
+
+/// <summary>
+/// Spawns a given number of entities of a given prototype in a specified container owned by this entity.
+/// Acts like <see cref="SpawnEntityEntityEffectSystem"/> if it cannot spawn the prototype in the specified container.
+/// Amount is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SpawnEntityInContainerOrDropEntityEffectSystem : EntityEffectSystem<ContainerManagerComponent, SpawnEntityInContainerOrDrop>
+{
+    [Dependency] private readonly INetManager _net = default!;
+
+    protected override void Effect(Entity<ContainerManagerComponent> entity, ref EntityEffectEvent<SpawnEntityInContainerOrDrop> args)
+    {
+        var quantity = args.Effect.Number * (int)Math.Floor(args.Scale);
+        var proto = args.Effect.Entity;
+        var container = args.Effect.ContainerName;
+
+        var xform = Transform(entity);
+
+        if (args.Effect.Predicted)
+        {
+            for (var i = 0; i < quantity; i++)
+            {
+                PredictedSpawnInContainerOrDrop(proto, entity, container, xform, entity.Comp);
+            }
+        }
+        else if (_net.IsServer)
+        {
+            for (var i = 0; i < quantity; i++)
+            {
+                SpawnInContainerOrDrop(proto, entity, container, xform, entity.Comp);
+            }
+        }
+    }
+}
+
+/// <inheritdoc cref="BaseSpawnEntityEntityEffect{T}"/>
+public sealed partial class SpawnEntityInContainerOrDrop : BaseSpawnEntityEntityEffect<SpawnEntityInContainerOrDrop>
+{
+    /// <summary>
+    /// Name of the container we're trying to spawn into.
+    /// </summary>
+    [DataField(required: true)]
+    public string ContainerName;
+}
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs
new file mode 100644
index 0000000000..7514dae4e9
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Inventory;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
+
+/// <summary>
+/// Spawns an entity of a given prototype in a specified inventory slot owned by this entity.
+/// Fails if it cannot spawn the entity in the given slot.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SpawnEntityInInventoryEntityEffectSystem : EntityEffectSystem<InventoryComponent, SpawnEntityInInventory>
+{
+    [Dependency] private readonly InventorySystem _inventory = default!;
+
+    protected override void Effect(Entity<InventoryComponent> entity, ref EntityEffectEvent<SpawnEntityInInventory> args)
+    {
+        _inventory.SpawnItemInSlot(entity, args.Effect.Slot, args.Effect.Entity);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class SpawnEntityInInventory : EntityEffectBase<SpawnEntityInInventory>
+{
+    /// <summary>
+    /// Name of the slot we're spawning the item into.
+    /// </summary>
+    [DataField(required: true)]
+    public string Slot = string.Empty; // Rider is drunk and keeps yelling at me to fill this out or make required: true but, it is required true so it's just being an asshole.
+
+    /// <summary>
+    /// Prototype ID of item to spawn.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Entity;
+}
diff --git a/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs b/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs
deleted file mode 100644
index 968d559939..0000000000
--- a/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.EntityEffects;
-using Content.Shared.FixedPoint;
-using Content.Shared.Localizations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Version of <see cref="HealthChange"/> that distributes the healing to groups
-/// </summary>
-public sealed partial class EvenHealthChange : EntityEffect
-{
-    /// <summary>
-    /// Damage to heal, collected into entire damage groups.
-    /// </summary>
-    [DataField(required: true)]
-    public Dictionary<ProtoId<DamageGroupPrototype>, FixedPoint2> Damage = new();
-
-    /// <summary>
-    /// Should this effect scale the damage by the amount of chemical in the solution?
-    /// Useful for touch reactions, like styptic powder or acid.
-    /// Only usable if the EntityEffectBaseArgs is an EntityEffectReagentArgs.
-    /// </summary>
-    [DataField]
-    public bool ScaleByQuantity;
-
-    /// <summary>
-    /// Should this effect ignore damage modifiers?
-    /// </summary>
-    [DataField]
-    public bool IgnoreResistances = true;
-
-    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        var damages = new List<string>();
-        var heals = false;
-        var deals = false;
-
-        var damagableSystem = entSys.GetEntitySystem<DamageableSystem>();
-        var universalReagentDamageModifier = damagableSystem.UniversalReagentDamageModifier;
-        var universalReagentHealModifier = damagableSystem.UniversalReagentHealModifier;
-
-        foreach (var (group, amount) in Damage)
-        {
-            var groupProto = prototype.Index(group);
-
-            var sign = FixedPoint2.Sign(amount);
-            var mod = 1f;
-
-            if (sign < 0)
-            {
-                heals = true;
-                mod = universalReagentHealModifier;
-            }
-            else if (sign > 0)
-            {
-                deals = true;
-                mod = universalReagentDamageModifier;
-            }
-
-            damages.Add(
-                Loc.GetString("health-change-display",
-                    ("kind", groupProto.LocalizedName),
-                    ("amount", MathF.Abs(amount.Float() * mod)),
-                    ("deltasign", sign)
-                ));
-        }
-
-        var healsordeals = heals ? (deals ? "both" : "heals") : (deals ? "deals" : "none");
-        return Loc.GetString("reagent-effect-guidebook-even-health-change",
-            ("chance", Probability),
-            ("changes", ContentLocalizationManager.FormatList(damages)),
-            ("healsordeals", healsordeals));
-    }
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent<DamageableComponent>(args.TargetEntity, out var damageable))
-            return;
-
-        var protoMan = IoCManager.Resolve<IPrototypeManager>();
-
-        var scale = FixedPoint2.New(1);
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            scale = ScaleByQuantity ? reagentArgs.Quantity * reagentArgs.Scale : reagentArgs.Scale;
-        }
-
-        var damagableSystem = args.EntityManager.System<DamageableSystem>();
-        var universalReagentDamageModifier = damagableSystem.UniversalReagentDamageModifier;
-        var universalReagentHealModifier = damagableSystem.UniversalReagentHealModifier;
-
-        var dspec = new DamageSpecifier();
-
-        foreach (var (group, amount) in Damage)
-        {
-            var groupProto = protoMan.Index(group);
-            var groupDamage = new Dictionary<string, FixedPoint2>();
-            foreach (var damageId in groupProto.DamageTypes)
-            {
-                var damageAmount = damageable.Damage.DamageDict.GetValueOrDefault(damageId);
-                if (damageAmount != FixedPoint2.Zero)
-                    groupDamage.Add(damageId, damageAmount);
-            }
-
-            var sum = groupDamage.Values.Sum();
-            foreach (var (damageId, damageAmount) in groupDamage)
-            {
-                var existing = dspec.DamageDict.GetOrNew(damageId);
-                dspec.DamageDict[damageId] = existing + damageAmount / sum * amount;
-            }
-        }
-
-        if (universalReagentDamageModifier != 1 || universalReagentHealModifier != 1)
-        {
-            foreach (var (type, val) in dspec.DamageDict)
-            {
-                if (val < 0f)
-                {
-                    dspec.DamageDict[type] = val * universalReagentHealModifier;
-                }
-                if (val > 0f)
-                {
-                    dspec.DamageDict[type] = val * universalReagentDamageModifier;
-                }
-            }
-        }
-
-        damagableSystem.TryChangeDamage(
-            args.TargetEntity,
-            dspec * scale,
-            IgnoreResistances,
-            interruptsDoAfters: false);
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs
new file mode 100644
index 0000000000..33b2041b37
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs
@@ -0,0 +1,114 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Evenly adjust the damage types in a damage group by up to a specified total on this entity.
+/// Total adjustment is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class EvenHealthChangeEntityEffectSystem : EntityEffectSystem<DamageableComponent, EvenHealthChange>
+{
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+
+    protected override void Effect(Entity<DamageableComponent> entity, ref EntityEffectEvent<EvenHealthChange> args)
+    {
+        var damageSpec = new DamageSpecifier();
+
+        foreach (var (group, amount) in args.Effect.Damage)
+        {
+            var groupProto = _proto.Index(group);
+            var groupDamage = new Dictionary<string, FixedPoint2>();
+            foreach (var damageId in groupProto.DamageTypes)
+            {
+                var damageAmount = entity.Comp.Damage.DamageDict.GetValueOrDefault(damageId);
+                if (damageAmount != FixedPoint2.Zero)
+                    groupDamage.Add(damageId, damageAmount);
+            }
+
+            var sum = groupDamage.Values.Sum();
+            foreach (var (damageId, damageAmount) in groupDamage)
+            {
+                var existing = damageSpec.DamageDict.GetOrNew(damageId);
+                damageSpec.DamageDict[damageId] = existing + damageAmount / sum * amount;
+            }
+        }
+
+        damageSpec *= args.Scale;
+
+        _damageable.TryChangeDamage(
+            entity,
+            damageSpec,
+            args.Effect.IgnoreResistances,
+            interruptsDoAfters: false,
+            damageable: entity.Comp);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class EvenHealthChange : EntityEffectBase<EvenHealthChange>
+{
+    /// <summary>
+    /// Damage to heal, collected into entire damage groups.
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<ProtoId<DamageGroupPrototype>, FixedPoint2> Damage = new();
+
+    /// <summary>
+    /// Should this effect ignore damage modifiers?
+    /// </summary>
+    [DataField]
+    public bool IgnoreResistances = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var damages = new List<string>();
+        var heals = false;
+        var deals = false;
+
+        var damagableSystem = entSys.GetEntitySystem<DamageableSystem>();
+        var universalReagentDamageModifier = damagableSystem.UniversalReagentDamageModifier;
+        var universalReagentHealModifier = damagableSystem.UniversalReagentHealModifier;
+
+        foreach (var (group, amount) in Damage)
+        {
+            var groupProto = prototype.Index(group);
+
+            var sign = FixedPoint2.Sign(amount);
+            float mod;
+
+            switch (sign)
+            {
+                case < 0:
+                    heals = true;
+                    mod = universalReagentHealModifier;
+                    break;
+                case > 0:
+                    deals = true;
+                    mod = universalReagentDamageModifier;
+                    break;
+                default:
+                    continue; // Don't need to show damage types of 0...
+            }
+
+            damages.Add(
+                Loc.GetString("health-change-display",
+                    ("kind", groupProto.LocalizedName),
+                    ("amount", MathF.Abs(amount.Float() * mod)),
+                    ("deltasign", sign)
+                ));
+        }
+
+        var healsordeals = heals ? deals ? "both" : "heals" : deals ? "deals" : "none";
+        return Loc.GetString("entity-effect-guidebook-even-health-change",
+            ("chance", Probability),
+            ("changes", ContentLocalizationManager.FormatList(damages)),
+            ("healsordeals", healsordeals));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/ExtinguishReaction.cs b/Content.Shared/EntityEffects/Effects/ExtinguishReaction.cs
deleted file mode 100644
index 11e776ac90..0000000000
--- a/Content.Shared/EntityEffects/Effects/ExtinguishReaction.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Atmos;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects
-{
-    public sealed partial class ExtinguishReaction : EntityEffect
-    {
-        /// <summary>
-        ///     Amount of firestacks reduced.
-        /// </summary>
-        [DataField]
-        public float FireStacksAdjustment = -1.5f;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-extinguish-reaction", ("chance", Probability));
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            var ev = new ExtinguishEvent
-            {
-                FireStacksAdjustment = FireStacksAdjustment,
-            };
-
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                ev.FireStacksAdjustment *= (float)reagentArgs.Quantity;
-            }
-
-            args.EntityManager.EventBus.RaiseLocalEvent(args.TargetEntity, ref ev);
-        }
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/FlammableReaction.cs b/Content.Shared/EntityEffects/Effects/FlammableReaction.cs
deleted file mode 100644
index 9f7d504f4e..0000000000
--- a/Content.Shared/EntityEffects/Effects/FlammableReaction.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Database;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class FlammableReaction : EventEntityEffect<FlammableReaction>
-{
-    [DataField]
-    public float Multiplier = 0.05f;
-
-    // The fire stack multiplier if fire stacks already exist on target, only works if 0 or greater
-    [DataField]
-    public float MultiplierOnExisting = -1f;
-
-    public override bool ShouldLog => true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-flammable-reaction", ("chance", Probability));
-
-    public override LogImpact LogImpact => LogImpact.Medium;
-}
diff --git a/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs b/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs
deleted file mode 100644
index c238e94010..0000000000
--- a/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-[DataDefinition]
-public sealed partial class FlashReactionEffect : EventEntityEffect<FlashReactionEffect>
-{
-    /// <summary>
-    ///     Flash range per unit of reagent.
-    /// </summary>
-    [DataField]
-    public float RangePerUnit = 0.2f;
-
-    /// <summary>
-    ///     Maximum flash range.
-    /// </summary>
-    [DataField]
-    public float MaxRange = 10f;
-
-    /// <summary>
-    ///     How much to entities are slowed down.
-    /// </summary>
-    [DataField]
-    public float SlowTo = 0.5f;
-
-    /// <summary>
-    ///     The time entities will be flashed.
-    ///     The default is chosen to be better than the hand flash so it is worth using it for grenades etc.
-    /// </summary>
-    [DataField]
-    public TimeSpan Duration = TimeSpan.FromSeconds(4);
-
-    /// <summary>
-    ///     The prototype ID used for the visual effect.
-    /// </summary>
-    [DataField]
-    public EntProtoId? FlashEffectPrototype = "ReactionFlash";
-
-    /// <summary>
-    ///     The sound the flash creates.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Weapons/flash.ogg");
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-flash-reaction-effect", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Glow.cs b/Content.Shared/EntityEffects/Effects/Glow.cs
deleted file mode 100644
index 394d406700..0000000000
--- a/Content.Shared/EntityEffects/Effects/Glow.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Makes a mob glow.
-/// </summary>
-public sealed partial class Glow : EntityEffect
-{
-    [DataField]
-    public float Radius = 2f;
-
-    [DataField]
-    public Color Color = Color.Black;
-
-    private static readonly List<Color> Colors = new()
-    {
-        Color.White,
-        Color.Red,
-        Color.Yellow,
-        Color.Green,
-        Color.Blue,
-        Color.Purple,
-        Color.Pink
-    };
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (Color == Color.Black)
-        {
-            var random = IoCManager.Resolve<IRobustRandom>();
-            Color = random.Pick(Colors);
-        }
-
-        var lightSystem = args.EntityManager.System<SharedPointLightSystem>();
-        var light = lightSystem.EnsureLight(args.TargetEntity);
-        lightSystem.SetRadius(args.TargetEntity, Radius, light);
-        lightSystem.SetColor(args.TargetEntity, Color, light);
-        lightSystem.SetCastShadows(args.TargetEntity, false, light); // this is expensive, and botanists make lots of plants
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return "TODO";
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs
new file mode 100644
index 0000000000..05e4fe29ca
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs
@@ -0,0 +1,55 @@
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Causes this entity to glow.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class GlowEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Glow>
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedPointLightSystem _lightSystem = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Glow> args)
+    {
+        var color = args.Effect.Color;
+
+        if (color == Color.Black)
+        {
+            // TODO: When we get proper predicted RNG remove this check...
+            if (_net.IsClient)
+                return;
+
+            color = _random.Pick(Colors);
+        }
+
+        var light = _lightSystem.EnsureLight(entity);
+        _lightSystem.SetRadius(entity, args.Effect.Radius, light);
+        _lightSystem.SetColor(entity, color, light);
+        _lightSystem.SetCastShadows(entity, false, light); // this is expensive, and botanists make lots of plants
+    }
+
+    public static readonly List<Color> Colors = new()
+    {
+        Color.White,
+        Color.Red,
+        Color.Yellow,
+        Color.Green,
+        Color.Blue,
+        Color.Purple,
+        Color.Pink
+    };
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Glow : EntityEffectBase<Glow>
+{
+    [DataField]
+    public float Radius = 2f;
+
+    [DataField]
+    public Color Color = Color.Black;
+}
diff --git a/Content.Shared/EntityEffects/Effects/HealthChange.cs b/Content.Shared/EntityEffects/Effects/HealthChange.cs
deleted file mode 100644
index 17c24f6b5a..0000000000
--- a/Content.Shared/EntityEffects/Effects/HealthChange.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.EntityEffects;
-using Content.Shared.FixedPoint;
-using Content.Shared.Localizations;
-using Robust.Shared.Prototypes;
-using System.Linq;
-using System.Text.Json.Serialization;
-
-namespace Content.Shared.EntityEffects.Effects
-{
-    /// <summary>
-    /// Default metabolism used for medicine reagents.
-    /// </summary>
-    public sealed partial class HealthChange : EntityEffect
-    {
-        /// <summary>
-        /// Damage to apply every cycle. Damage Ignores resistances.
-        /// </summary>
-        [DataField(required: true)]
-        [JsonPropertyName("damage")]
-        public DamageSpecifier Damage = default!;
-
-        /// <summary>
-        ///     Should this effect scale the damage by the amount of chemical in the solution?
-        ///     Useful for touch reactions, like styptic powder or acid.
-        ///     Only usable if the EntityEffectBaseArgs is an EntityEffectReagentArgs.
-        /// </summary>
-        [DataField]
-        [JsonPropertyName("scaleByQuantity")]
-        public bool ScaleByQuantity;
-
-        [DataField]
-        [JsonPropertyName("ignoreResistances")]
-        public bool IgnoreResistances = true;
-
-        protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        {
-            var damages = new List<string>();
-            var heals = false;
-            var deals = false;
-
-            var damageSpec = new DamageSpecifier(Damage);
-
-            var universalReagentDamageModifier = entSys.GetEntitySystem<DamageableSystem>().UniversalReagentDamageModifier;
-            var universalReagentHealModifier = entSys.GetEntitySystem<DamageableSystem>().UniversalReagentHealModifier;
-
-            if (universalReagentDamageModifier != 1 || universalReagentHealModifier != 1)
-            {
-                foreach (var (type, val) in damageSpec.DamageDict)
-                {
-                    if (val < 0f)
-                    {
-                        damageSpec.DamageDict[type] = val * universalReagentHealModifier;
-                    }
-                    if (val > 0f)
-                    {
-                        damageSpec.DamageDict[type] = val * universalReagentDamageModifier;
-                    }
-                }
-            }
-
-            damageSpec = entSys.GetEntitySystem<DamageableSystem>().ApplyUniversalAllModifiers(damageSpec);
-
-            foreach (var (kind, amount) in damageSpec.DamageDict)
-            {
-                var sign = FixedPoint2.Sign(amount);
-
-                if (sign < 0)
-                    heals = true;
-                if (sign > 0)
-                    deals = true;
-
-                damages.Add(
-                    Loc.GetString("health-change-display",
-                        ("kind", prototype.Index<DamageTypePrototype>(kind).LocalizedName),
-                        ("amount", MathF.Abs(amount.Float())),
-                        ("deltasign", sign)
-                    ));
-            }
-
-            var healsordeals = heals ? (deals ? "both" : "heals") : (deals ? "deals" : "none");
-
-            return Loc.GetString("reagent-effect-guidebook-health-change",
-                ("chance", Probability),
-                ("changes", ContentLocalizationManager.FormatList(damages)),
-                ("healsordeals", healsordeals));
-        }
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            var scale = FixedPoint2.New(1);
-            var damageSpec = new DamageSpecifier(Damage);
-
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                scale = ScaleByQuantity ? reagentArgs.Quantity * reagentArgs.Scale : reagentArgs.Scale;
-            }
-
-            var universalReagentDamageModifier = args.EntityManager.System<DamageableSystem>().UniversalReagentDamageModifier;
-            var universalReagentHealModifier = args.EntityManager.System<DamageableSystem>().UniversalReagentHealModifier;
-
-            if (universalReagentDamageModifier != 1 || universalReagentHealModifier != 1)
-            {
-                foreach (var (type, val) in damageSpec.DamageDict)
-                {
-                    if (val < 0f)
-                    {
-                        damageSpec.DamageDict[type] = val * universalReagentHealModifier;
-                    }
-                    if (val > 0f)
-                    {
-                        damageSpec.DamageDict[type] = val * universalReagentDamageModifier;
-                    }
-                }
-            }
-
-            args.EntityManager.System<DamageableSystem>()
-                .TryChangeDamage(
-                    args.TargetEntity,
-                    damageSpec * scale,
-                    IgnoreResistances,
-                    interruptsDoAfters: false);
-        }
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs
new file mode 100644
index 0000000000..89948cd2e4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs
@@ -0,0 +1,91 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Adjust the damages on this entity by specified amounts.
+/// Amounts are modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class HealthChangeEntityEffectSystem : EntityEffectSystem<DamageableComponent, HealthChange>
+{
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+
+    protected override void Effect(Entity<DamageableComponent> entity, ref EntityEffectEvent<HealthChange> args)
+    {
+        var damageSpec = new DamageSpecifier(args.Effect.Damage);
+
+        damageSpec *= args.Scale;
+
+        _damageable.TryChangeDamage(
+                entity,
+                damageSpec,
+                args.Effect.IgnoreResistances,
+                interruptsDoAfters: false);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class HealthChange : EntityEffectBase<HealthChange>
+{
+    /// <summary>
+    /// Damage to apply every cycle. Damage Ignores resistances.
+    /// </summary>
+    [DataField(required: true)]
+    public DamageSpecifier Damage = default!;
+
+    [DataField]
+    public bool IgnoreResistances = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        {
+            var damages = new List<string>();
+            var heals = false;
+            var deals = false;
+
+            var damageSpec = new DamageSpecifier(Damage);
+
+            var universalReagentDamageModifier = entSys.GetEntitySystem<DamageableSystem>().UniversalReagentDamageModifier;
+            var universalReagentHealModifier = entSys.GetEntitySystem<DamageableSystem>().UniversalReagentHealModifier;
+
+            damageSpec = entSys.GetEntitySystem<DamageableSystem>().ApplyUniversalAllModifiers(damageSpec);
+
+            foreach (var (kind, amount) in damageSpec.DamageDict)
+            {
+                var sign = FixedPoint2.Sign(amount);
+                float mod;
+
+                switch (sign)
+                {
+                    case < 0:
+                        heals = true;
+                        mod = universalReagentHealModifier;
+                        break;
+                    case > 0:
+                        deals = true;
+                        mod = universalReagentDamageModifier;
+                        break;
+                    default:
+                        continue; // Don't need to show damage types of 0...
+                }
+
+                damages.Add(
+                    Loc.GetString("health-change-display",
+                        ("kind", prototype.Index<DamageTypePrototype>(kind).LocalizedName),
+                        ("amount", MathF.Abs(amount.Float() * mod)),
+                        ("deltasign", sign)
+                    ));
+            }
+
+            var healsordeals = heals ? (deals ? "both" : "heals") : (deals ? "deals" : "none");
+
+            return Loc.GetString("entity-effect-guidebook-health-change",
+                ("chance", Probability),
+                ("changes", ContentLocalizationManager.FormatList(damages)),
+                ("healsordeals", healsordeals));
+        }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Ignite.cs b/Content.Shared/EntityEffects/Effects/Ignite.cs
deleted file mode 100644
index 707ecc3208..0000000000
--- a/Content.Shared/EntityEffects/Effects/Ignite.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Database;
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Ignites a mob.
-/// </summary>
-public sealed partial class Ignite : EventEntityEffect<Ignite>
-{
-    public override bool ShouldLog => true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-ignite", ("chance", Probability));
-
-    public override LogImpact LogImpact => LogImpact.Medium;
-}
diff --git a/Content.Shared/EntityEffects/Effects/MakeSentient.cs b/Content.Shared/EntityEffects/Effects/MakeSentient.cs
deleted file mode 100644
index 9c70eb452b..0000000000
--- a/Content.Shared/EntityEffects/Effects/MakeSentient.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Shared.Mind.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class MakeSentient : EventEntityEffect<MakeSentient>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-make-sentient", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs b/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs
new file mode 100644
index 0000000000..4beb21454c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class MakeSentient : EntityEffectBase<MakeSentient>
+{
+    /// <summary>
+    /// Description for the ghost role created by this effect.
+    /// </summary>
+    [DataField]
+    public LocId RoleDescription = "ghost-role-information-cognizine-description";
+
+    /// <summary>
+    /// Whether we give the target the ability to speak coherently.
+    /// </summary>
+    [DataField]
+    public bool AllowSpeech = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-make-sentient", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/ModifyBleedAmount.cs b/Content.Shared/EntityEffects/Effects/ModifyBleedAmount.cs
deleted file mode 100644
index 9f15652095..0000000000
--- a/Content.Shared/EntityEffects/Effects/ModifyBleedAmount.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class ModifyBleedAmount : EventEntityEffect<ModifyBleedAmount>
-{
-    [DataField]
-    public bool Scaled = false;
-
-    [DataField]
-    public float Amount = -1.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-modify-bleed-amount", ("chance", Probability),
-            ("deltasign", MathF.Sign(Amount)));
-}
diff --git a/Content.Shared/EntityEffects/Effects/ModifyBloodLevel.cs b/Content.Shared/EntityEffects/Effects/ModifyBloodLevel.cs
deleted file mode 100644
index 06c026f128..0000000000
--- a/Content.Shared/EntityEffects/Effects/ModifyBloodLevel.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class ModifyBloodLevel : EventEntityEffect<ModifyBloodLevel>
-{
-    [DataField]
-    public bool Scaled = false;
-
-    [DataField]
-    public FixedPoint2 Amount = 1.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-modify-blood-level", ("chance", Probability),
-            ("deltasign", MathF.Sign(Amount.Float())));
-}
diff --git a/Content.Shared/EntityEffects/Effects/ModifyLungGas.cs b/Content.Shared/EntityEffects/Effects/ModifyLungGas.cs
deleted file mode 100644
index 45dc8c84c6..0000000000
--- a/Content.Shared/EntityEffects/Effects/ModifyLungGas.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Shared.Atmos;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class ModifyLungGas : EventEntityEffect<ModifyLungGas>
-{
-    [DataField("ratios", required: true)]
-    public Dictionary<Gas, float> Ratios = default!;
-
-    // JUSTIFICATION: This is internal magic that players never directly interact with.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => null;
-}
diff --git a/Content.Shared/EntityEffects/Effects/MovespeedModifier.cs b/Content.Shared/EntityEffects/Effects/MovespeedModifier.cs
deleted file mode 100644
index 5e72746e32..0000000000
--- a/Content.Shared/EntityEffects/Effects/MovespeedModifier.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Default metabolism for stimulants and tranqs. Attempts to find a MovementSpeedModifier on the target,
-/// adding one if not there and to change the movespeed
-/// </summary>
-public sealed partial class MovespeedModifier : EntityEffect
-{
-    /// <summary>
-    /// How much the entities' walk speed is multiplied by.
-    /// </summary>
-    [DataField]
-    public float WalkSpeedModifier { get; set; } = 1;
-
-    /// <summary>
-    /// How much the entities' run speed is multiplied by.
-    /// </summary>
-    [DataField]
-    public float SprintSpeedModifier { get; set; } = 1;
-
-    /// <summary>
-    /// How long the modifier applies (in seconds).
-    /// Is scaled by reagent amount if used with an EntityEffectReagentArgs.
-    /// </summary>
-    [DataField]
-    public float StatusLifetime = 2f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return Loc.GetString("reagent-effect-guidebook-movespeed-modifier",
-            ("chance", Probability),
-            ("walkspeed", WalkSpeedModifier),
-            ("time", StatusLifetime));
-    }
-
-    /// <summary>
-    /// Remove reagent at set rate, changes the movespeed modifiers and adds a MovespeedModifierMetabolismComponent if not already there.
-    /// </summary>
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var status = args.EntityManager.EnsureComponent<MovespeedModifierMetabolismComponent>(args.TargetEntity);
-
-        // Only refresh movement if we need to.
-        var modified = !status.WalkSpeedModifier.Equals(WalkSpeedModifier) ||
-                       !status.SprintSpeedModifier.Equals(SprintSpeedModifier);
-
-        status.WalkSpeedModifier = WalkSpeedModifier;
-        status.SprintSpeedModifier = SprintSpeedModifier;
-
-        // only going to scale application time
-        var statusLifetime = StatusLifetime;
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            statusLifetime *= reagentArgs.Scale.Float();
-        }
-
-        IncreaseTimer(status, statusLifetime, args.EntityManager, args.TargetEntity);
-
-        if (modified)
-            args.EntityManager.System<MovementSpeedModifierSystem>().RefreshMovementSpeedModifiers(args.TargetEntity);
-    }
-    private void IncreaseTimer(MovespeedModifierMetabolismComponent status, float time, IEntityManager entityManager, EntityUid uid)
-    {
-        var gameTiming = IoCManager.Resolve<IGameTiming>();
-
-        var offsetTime = Math.Max(status.ModifierTimer.TotalSeconds, gameTiming.CurTime.TotalSeconds);
-
-        status.ModifierTimer = TimeSpan.FromSeconds(offsetTime + time);
-
-        entityManager.Dirty(uid, status);
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Oxygenate.cs b/Content.Shared/EntityEffects/Effects/Oxygenate.cs
deleted file mode 100644
index e990a3fec6..0000000000
--- a/Content.Shared/EntityEffects/Effects/Oxygenate.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class Oxygenate : EventEntityEffect<Oxygenate>
-{
-    [DataField]
-    public float Factor = 1f;
-
-    // JUSTIFICATION: This is internal magic that players never directly interact with.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => null;
-}
diff --git a/Content.Shared/EntityEffects/Effects/Paralyze.cs b/Content.Shared/EntityEffects/Effects/Paralyze.cs
deleted file mode 100644
index 2a2270016b..0000000000
--- a/Content.Shared/EntityEffects/Effects/Paralyze.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Shared.Stunnable;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class Paralyze : EntityEffect
-{
-    [DataField] public double ParalyzeTime = 2;
-
-    /// <remarks>
-    ///     true - refresh paralyze time,  false - accumulate paralyze time
-    /// </remarks>
-    [DataField] public bool Refresh = true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString(
-            "reagent-effect-guidebook-paralyze",
-            ("chance", Probability),
-            ("time", ParalyzeTime)
-        );
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var paralyzeTime = ParalyzeTime;
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            paralyzeTime *= (double)reagentArgs.Scale;
-        }
-
-        var stunSystem = args.EntityManager.System<SharedStunSystem>();
-        _ = Refresh
-            ? stunSystem.TryUpdateParalyzeDuration(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime))
-            : stunSystem.TryAddParalyzeDuration(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime));
-    }
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
deleted file mode 100644
index 2c8046452b..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-[ImplicitDataDefinitionForInheritors]
-public abstract partial class PlantAdjustAttribute<T> : EventEntityEffect<T> where T : PlantAdjustAttribute<T>
-{
-    [DataField]
-    public float Amount { get; protected set; } = 1;
-
-    /// <summary>
-    /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
-    /// </summary>
-    [DataField]
-    public abstract string GuidebookAttributeName { get; set; }
-
-    /// <summary>
-    /// Whether the attribute in question is a good thing. Used for guidebook descriptions to determine the color of the number.
-    /// </summary>
-    [DataField]
-    public virtual bool GuidebookIsAttributePositive { get; protected set; } = true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        string color;
-        if (GuidebookIsAttributePositive ^ Amount < 0.0)
-        {
-            color = "green";
-        }
-        else
-        {
-            color = "red";
-        }
-        return Loc.GetString("reagent-effect-guidebook-plant-attribute", ("attribute", Loc.GetString(GuidebookAttributeName)), ("amount", Amount.ToString("0.00")), ("colorName", color), ("chance", Probability));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
deleted file mode 100644
index c1e71894e5..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAdjustHealth : PlantAdjustAttribute<PlantAdjustHealth>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-health";
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
deleted file mode 100644
index 6610adf708..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAdjustMutationLevel : PlantAdjustAttribute<PlantAdjustMutationLevel>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-level";
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
deleted file mode 100644
index 91be222807..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAdjustMutationMod : PlantAdjustAttribute<PlantAdjustMutationMod>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-mod";
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
deleted file mode 100644
index db01d5d060..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAdjustNutrition : PlantAdjustAttribute<PlantAdjustNutrition>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-nutrition";
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs
deleted file mode 100644
index 971f05f32d..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// using Content.Server.Botany.Systems;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-/// <summary>
-///     Handles increase or decrease of plant potency.
-/// </summary>
-
-public sealed partial class PlantAdjustPotency : PlantAdjustAttribute<PlantAdjustPotency>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-potency";
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
deleted file mode 100644
index 610d02231b..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAdjustWater : PlantAdjustAttribute<PlantAdjustWater>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-water";
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
deleted file mode 100644
index 36b8f57d08..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAffectGrowth : PlantAdjustAttribute<PlantAffectGrowth>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-growth";
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantChangeStat.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantChangeStat.cs
deleted file mode 100644
index 66cfb66d4b..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantChangeStat.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantChangeStat : EventEntityEffect<PlantChangeStat>
-{
-    [DataField]
-    public string TargetValue;
-
-    [DataField]
-    public float MinValue;
-
-    [DataField]
-    public float MaxValue;
-
-    [DataField]
-    public int Steps;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        throw new NotImplementedException();
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
deleted file mode 100644
index 0dabf1f22b..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantCryoxadone : EventEntityEffect<PlantCryoxadone>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-cryoxadone", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs
deleted file mode 100644
index 9f16c35402..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-/// <summary>
-///     Handles removal of seeds on a plant.
-/// </summary>
-
-public sealed partial class PlantDestroySeeds : EventEntityEffect<PlantDestroySeeds>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("reagent-effect-guidebook-plant-seeds-remove", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
deleted file mode 100644
index 9feccbf224..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantDiethylamine : EventEntityEffect<PlantDiethylamine>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-diethylamine", ("chance", Probability));
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
deleted file mode 100644
index 9dc5140063..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantPhalanximine : EventEntityEffect<PlantPhalanximine>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-phalanximine", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs
deleted file mode 100644
index 51ce353dbb..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-/// <summary>
-///     Handles restoral of seeds on a plant.
-/// </summary>
-public sealed partial class PlantRestoreSeeds : EventEntityEffect<PlantRestoreSeeds>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("reagent-effect-guidebook-plant-seeds-add", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
deleted file mode 100644
index 6ba37c9be0..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class RobustHarvest : EventEntityEffect<RobustHarvest>
-{
-    [DataField]
-    public int PotencyLimit = 50;
-
-    [DataField]
-    public int PotencyIncrease = 3;
-
-    [DataField]
-    public int PotencySeedlessThreshold = 30;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-robust-harvest", ("seedlesstreshold", PotencySeedlessThreshold), ("limit", PotencyLimit), ("increase", PotencyIncrease), ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMutateChemicals.cs b/Content.Shared/EntityEffects/Effects/PlantMutateChemicals.cs
deleted file mode 100644
index 9a3408bb8e..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMutateChemicals.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.Random;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     changes the chemicals available in a plant's produce
-/// </summary>
-public sealed partial class PlantMutateChemicals : EventEntityEffect<PlantMutateChemicals>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return "TODO";
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMutateGases.cs b/Content.Shared/EntityEffects/Effects/PlantMutateGases.cs
deleted file mode 100644
index 5eb5b1d07c..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMutateGases.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using System.Linq;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     changes the gases that a plant or produce create.
-/// </summary>
-public sealed partial class PlantMutateExudeGasses : EventEntityEffect<PlantMutateExudeGasses>
-{
-    [DataField]
-    public float MinValue = 0.01f;
-
-    [DataField]
-    public float MaxValue = 0.5f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return "TODO";
-    }
-}
-
-/// <summary>
-///     changes the gases that a plant or produce consumes.
-/// </summary>
-public sealed partial class PlantMutateConsumeGasses : EventEntityEffect<PlantMutateConsumeGasses>
-{
-    [DataField]
-    public float MinValue = 0.01f;
-
-    [DataField]
-    public float MaxValue = 0.5f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return "TODO";
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMutateHarvest.cs b/Content.Shared/EntityEffects/Effects/PlantMutateHarvest.cs
deleted file mode 100644
index 84d6293185..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMutateHarvest.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Upgrades a plant's harvest type.
-/// </summary>
-public sealed partial class PlantMutateHarvest : EventEntityEffect<PlantMutateHarvest>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return "TODO";
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantSpeciesChange.cs b/Content.Shared/EntityEffects/Effects/PlantSpeciesChange.cs
deleted file mode 100644
index e2acc4cb7c..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantSpeciesChange.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Changes a plant into one of the species its able to mutate into.
-/// </summary>
-public sealed partial class PlantSpeciesChange : EventEntityEffect<PlantSpeciesChange>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return "TODO";
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Polymorph.cs b/Content.Shared/EntityEffects/Effects/Polymorph.cs
deleted file mode 100644
index 65711ff99a..0000000000
--- a/Content.Shared/EntityEffects/Effects/Polymorph.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Polymorph;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class Polymorph : EventEntityEffect<Polymorph>
-{
-    /// <summary>
-    ///     What polymorph prototype is used on effect
-    /// </summary>
-    [DataField("prototype", customTypeSerializer:typeof(PrototypeIdSerializer<PolymorphPrototype>))]
-    public string PolymorphPrototype { get; set; }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    => Loc.GetString("reagent-effect-guidebook-make-polymorph",
-            ("chance", Probability), ("entityname",
-                prototype.Index<EntityPrototype>(prototype.Index<PolymorphPrototype>(PolymorphPrototype).Configuration.Entity).Name));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs b/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs
new file mode 100644
index 0000000000..c0d80dffaa
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Polymorph;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Polymorph : EntityEffectBase<Polymorph>
+{
+    /// <summary>
+    ///     What polymorph prototype is used on effect
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<PolymorphPrototype> Prototype;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-make-polymorph",
+            ("chance", Probability),
+            ("entityname", prototype.Index<EntityPrototype>(prototype.Index(Prototype).Configuration.Entity).Name));
+}
diff --git a/Content.Shared/EntityEffects/Effects/PopupMessage.cs b/Content.Shared/EntityEffects/Effects/PopupMessage.cs
deleted file mode 100644
index a837f816e4..0000000000
--- a/Content.Shared/EntityEffects/Effects/PopupMessage.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Content.Shared.Popups;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.EntityEffects.Effects
-{
-    public sealed partial class PopupMessage : EntityEffect
-    {
-        [DataField(required: true)]
-        public string[] Messages = default!;
-
-        [DataField]
-        public PopupRecipients Type = PopupRecipients.Local;
-
-        [DataField]
-        public PopupType VisualType = PopupType.Small;
-
-        // JUSTIFICATION: This is purely cosmetic.
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => null;
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            var popupSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedPopupSystem>();
-            var random = IoCManager.Resolve<IRobustRandom>();
-
-            var msg = random.Pick(Messages);
-            var msgArgs = new (string, object)[]
-            {
-                ("entity", args.TargetEntity),
-            };
-
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                msgArgs = new (string, object)[]
-                {
-                    ("entity", reagentArgs.TargetEntity),
-                    ("organ", reagentArgs.OrganEntity.GetValueOrDefault()),
-                };
-            }
-
-            if (Type == PopupRecipients.Local)
-                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, args.TargetEntity, VisualType);
-            else if (Type == PopupRecipients.Pvs)
-                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, VisualType);
-        }
-    }
-
-    public enum PopupRecipients
-    {
-        Pvs,
-        Local
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/ReduceRotting.cs b/Content.Shared/EntityEffects/Effects/ReduceRotting.cs
deleted file mode 100644
index b5f2a7ae7e..0000000000
--- a/Content.Shared/EntityEffects/Effects/ReduceRotting.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-using Content.Shared.Atmos.Rotting;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Reduces the rotting accumulator on the patient, making them revivable.
-/// </summary>
-public sealed partial class ReduceRotting : EntityEffect
-{
-    [DataField("seconds")]
-    public double RottingAmount = 10;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-reduce-rotting",
-            ("chance", Probability),
-            ("time", RottingAmount));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (reagentArgs.Scale != 1f)
-                return;
-        }
-
-        var rottingSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedRottingSystem>();
-
-        rottingSys.ReduceAccumulator(args.TargetEntity, TimeSpan.FromSeconds(RottingAmount));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/ResetNarcolepsy.cs b/Content.Shared/EntityEffects/Effects/ResetNarcolepsy.cs
deleted file mode 100644
index 009cf914d5..0000000000
--- a/Content.Shared/EntityEffects/Effects/ResetNarcolepsy.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Reset narcolepsy timer
-/// </summary>
-public sealed partial class ResetNarcolepsy : EventEntityEffect<ResetNarcolepsy>
-{
-    /// <summary>
-    /// The # of seconds the effect resets the narcolepsy timer to
-    /// </summary>
-    [DataField("TimerReset")]
-    public TimeSpan TimerReset = TimeSpan.FromSeconds(600);
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-reset-narcolepsy", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs
new file mode 100644
index 0000000000..973b139fa4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Traits.Assorted;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Resets the narcolepsy timer on a given entity.
+/// The new duration of the timer is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ResetNarcolepsyEntityEffectSystem : EntityEffectSystem<NarcolepsyComponent, ResetNarcolepsy>
+{
+    [Dependency] private readonly NarcolepsySystem _narcolepsy = default!;
+
+    protected override void Effect(Entity<NarcolepsyComponent> entity, ref EntityEffectEvent<ResetNarcolepsy> args)
+    {
+        var timer = args.Effect.TimerReset * args.Scale;
+
+        _narcolepsy.AdjustNarcolepsyTimer(entity.AsNullable(), timer);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ResetNarcolepsy : EntityEffectBase<ResetNarcolepsy>
+{
+    /// <summary>
+    /// The time we set our narcolepsy timer to.
+    /// </summary>
+    [DataField("TimerReset")]
+    public TimeSpan TimerReset = TimeSpan.FromSeconds(600);
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-reset-narcolepsy", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/SatiateHunger.cs b/Content.Shared/EntityEffects/Effects/SatiateHunger.cs
deleted file mode 100644
index 3e7af8833c..0000000000
--- a/Content.Shared/EntityEffects/Effects/SatiateHunger.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Attempts to find a HungerComponent on the target,
-/// and to update it's hunger values.
-/// </summary>
-public sealed partial class SatiateHunger : EntityEffect
-{
-    private const float DefaultNutritionFactor = 3.0f;
-
-    /// <summary>
-    ///     How much hunger is satiated.
-    ///     Is multiplied by quantity if used with EntityEffectReagentArgs.
-    /// </summary>
-    [DataField("factor")] public float NutritionFactor { get; set; } = DefaultNutritionFactor;
-
-    //Remove reagent at set rate, satiate hunger if a HungerComponent can be found
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var entman = args.EntityManager;
-        if (!entman.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
-            return;
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            entman.System<HungerSystem>().ModifyHunger(reagentArgs.TargetEntity, NutritionFactor * (float) reagentArgs.Quantity, hunger);
-        }
-        else
-        {
-            entman.System<HungerSystem>().ModifyHunger(args.TargetEntity, NutritionFactor, hunger);
-        }
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-satiate-hunger", ("chance", Probability), ("relative", NutritionFactor / DefaultNutritionFactor));
-}
diff --git a/Content.Shared/EntityEffects/Effects/SatiateThirst.cs b/Content.Shared/EntityEffects/Effects/SatiateThirst.cs
deleted file mode 100644
index 21a055b528..0000000000
--- a/Content.Shared/EntityEffects/Effects/SatiateThirst.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
-/// and to update it's thirst values.
-/// </summary>
-public sealed partial class SatiateThirst : EntityEffect
-{
-    private const float DefaultHydrationFactor = 3.0f;
-
-    /// How much thirst is satiated each tick. Not currently tied to
-    /// rate or anything.
-    [DataField("factor")]
-    public float HydrationFactor { get; set; } = DefaultHydrationFactor;
-
-    /// Satiate thirst if a ThirstComponent can be found
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var uid = args.TargetEntity;
-        if (args.EntityManager.TryGetComponent(uid, out ThirstComponent? thirst))
-            args.EntityManager.System<ThirstSystem>().ModifyThirst(uid, thirst, HydrationFactor);
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  HydrationFactor / DefaultHydrationFactor));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Slipify.cs b/Content.Shared/EntityEffects/Effects/Slipify.cs
deleted file mode 100644
index c152b8b010..0000000000
--- a/Content.Shared/EntityEffects/Effects/Slipify.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Shared.Physics;
-using Content.Shared.Slippery;
-using Content.Shared.StepTrigger.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Makes a mob slippery.
-/// </summary>
-public sealed partial class Slipify : EntityEffect
-{
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var fixtureSystem = args.EntityManager.System<FixtureSystem>();
-        var colWakeSystem = args.EntityManager.System<CollisionWakeSystem>();
-        var slippery = args.EntityManager.EnsureComponent<SlipperyComponent>(args.TargetEntity);
-        args.EntityManager.Dirty(args.TargetEntity, slippery);
-        args.EntityManager.EnsureComponent<StepTriggerComponent>(args.TargetEntity);
-        // Need a fixture with a slip layer in order to actually do the slipping
-        var fixtures = args.EntityManager.EnsureComponent<FixturesComponent>(args.TargetEntity);
-        var body = args.EntityManager.EnsureComponent<PhysicsComponent>(args.TargetEntity);
-        var shape = fixtures.Fixtures["fix1"].Shape;
-        fixtureSystem.TryCreateFixture(args.TargetEntity, shape, "slips", 1, false, (int)CollisionGroup.SlipLayer, manager: fixtures, body: body);
-        // Need to disable collision wake so that mobs can collide with and slip on it
-        var collisionWake = args.EntityManager.EnsureComponent<CollisionWakeComponent>(args.TargetEntity);
-        colWakeSystem.SetEnabled(args.TargetEntity, false, collisionWake);
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        throw new NotImplementedException();
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs
new file mode 100644
index 0000000000..602e5e923a
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs
@@ -0,0 +1,44 @@
+using System.Linq;
+using Content.Shared.Physics;
+using Content.Shared.Slippery;
+using Content.Shared.StepTrigger.Components;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Systems;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// This effect permanently creates a slippery fixture for this entity and then makes this entity slippery like soap.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SlipifyEntityEffectSystem : EntityEffectSystem<FixturesComponent, Slipify>
+{
+    [Dependency] private readonly CollisionWakeSystem _collisionWake = default!;
+    [Dependency] private readonly FixtureSystem _fixture = default!;
+
+    protected override void Effect(Entity<FixturesComponent> entity, ref EntityEffectEvent<Slipify> args)
+    {
+        EnsureComp<SlipperyComponent>(entity, out var slippery);
+        slippery.SlipData = args.Effect.Slippery;
+
+        Dirty(entity, slippery);
+
+        EnsureComp<StepTriggerComponent>(entity);
+
+        if (entity.Comp.Fixtures.FirstOrDefault(x => x.Value.Hard).Value.Shape is not { } shape)
+            return;
+
+        _fixture.TryCreateFixture(entity, shape, "slips", 1, false, (int)CollisionGroup.SlipLayer, manager: entity.Comp);
+
+        // Need to disable collision wake so that mobs can collide with and slip on it
+        EnsureComp<CollisionWakeComponent>(entity, out var collisionWake);
+        _collisionWake.SetEnabled(entity, false, collisionWake);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Slipify : EntityEffectBase<Slipify>
+{
+    [DataField]
+    public SlipperyEffectEntry Slippery = new();
+}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs
new file mode 100644
index 0000000000..ef96723cff
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs
@@ -0,0 +1,59 @@
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Solution;
+
+// TODO: This should be removed and changed to an "AbsorbentSolutionComponent"
+/// <summary>
+/// Creates a reagent in a specified solution owned by this entity.
+/// Quantity is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed class AddReagentToSolutionEntityEffectSystem : EntityEffectSystem<SolutionContainerManagerComponent, AddReagentToSolution>
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void Effect(Entity<SolutionContainerManagerComponent> entity, ref EntityEffectEvent<AddReagentToSolution> args)
+    {
+        var solution = args.Effect.Solution;
+        var reagent = args.Effect.Reagent;
+
+        if (!_solutionContainer.TryGetSolution((entity, entity), solution, out var solutionContainer))
+            return;
+
+        _solutionContainer.TryAddReagent(solutionContainer.Value, reagent, args.Scale * args.Effect.StrengthModifier);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AddReagentToSolution : EntityEffectBase<AddReagentToSolution>
+{
+    /// <summary>
+    ///     Prototype of the reagent we're adding.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<ReagentPrototype> Reagent;
+
+    ///<summary>
+    ///     Solution we're looking for
+    /// </summary>
+    [DataField(required: true)]
+    public string? Solution = "reagents";
+
+    ///<summary>
+    ///     A modifier for how much reagent we're creating.
+    /// </summary>
+    [DataField]
+    public float StrengthModifier = 1.0f;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return prototype.Resolve(Reagent, out ReagentPrototype? proto)
+            ? Loc.GetString("entity-effect-guidebook-add-to-solution-reaction",
+                ("chance", Probability),
+                ("reagent", proto.LocalizedName))
+            : null;
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs
new file mode 100644
index 0000000000..334a63a95a
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs
@@ -0,0 +1,52 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Solution;
+
+/// <summary>
+/// Adjust a reagent in this solution by an amount modified by scale.
+/// Quantity is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class AdjustReagentEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustReagent>
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AdjustReagent> args)
+    {
+        var quantity = args.Effect.Amount * args.Scale;
+        var reagent = args.Effect.Reagent;
+
+        if (quantity > 0)
+            _solutionContainer.TryAddReagent(entity, reagent, quantity);
+        else
+            _solutionContainer.RemoveReagent(entity, reagent, -quantity);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AdjustReagent : EntityEffectBase<AdjustReagent>
+{
+    /// <summary>
+    ///     The reagent ID to add or remove.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<ReagentPrototype> Reagent;
+
+    [DataField(required: true)]
+    public FixedPoint2 Amount;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return prototype.Resolve(Reagent, out ReagentPrototype? proto)
+            ? Loc.GetString("entity-effect-guidebook-adjust-reagent-reagent",
+                ("chance", Probability),
+                ("deltasign", MathF.Sign(Amount.Float())),
+                ("reagent", proto.LocalizedName),
+                ("amount", MathF.Abs(Amount.Float())))
+            : null;
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentsByGroupEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentsByGroupEntityEffectSystem.cs
new file mode 100644
index 0000000000..51259956d8
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentsByGroupEntityEffectSystem.cs
@@ -0,0 +1,52 @@
+using Content.Shared.Body.Prototypes;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Solution;
+
+/// <summary>
+/// Adjust all reagents in this solution which are metabolized by a given metabolism group.
+/// Quantity is modified by scale, quantity is per reagent and not a total.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class AdjustReagentsByGroupEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustReagentsByGroup>
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AdjustReagentsByGroup> args)
+    {
+        var quantity = args.Effect.Amount * args.Scale;
+        var group = args.Effect.Group;
+        var solution = entity.Comp.Solution;
+
+        foreach (var quant in solution.Contents.ToArray())
+        {
+            var proto = _proto.Index<ReagentPrototype>(quant.Reagent.Prototype);
+            if (proto.Metabolisms == null || !proto.Metabolisms.ContainsKey(group))
+                continue;
+
+            if (quantity > 0)
+                _solutionContainer.TryAddReagent(entity, proto.ID, quantity);
+            else
+                _solutionContainer.RemoveReagent(entity, proto.ID, -quantity);
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AdjustReagentsByGroup : EntityEffectBase<AdjustReagentsByGroup>
+{
+
+    /// <summary>
+    ///     The metabolism group being adjusted. All reagents in an affected solution with this group will be adjusted.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<MetabolismGroupPrototype> Group;
+
+    [DataField(required: true)]
+    public FixedPoint2 Amount;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs
new file mode 100644
index 0000000000..5fbe948360
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Database;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Solution;
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AreaReactionEffect : EntityEffectBase<AreaReactionEffect>
+{
+    /// <summary>
+    /// How many seconds will the effect stay, counting after fully spreading.
+    /// </summary>
+    [DataField("duration")] public float Duration = 10;
+
+    /// <summary>
+    /// How big of a reaction scale we need for 1 smoke entity.
+    /// </summary>
+    [DataField] public float OverflowThreshold = 2.5f;
+
+    /// <summary>
+    /// The entity prototype that is being spread over an area.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId PrototypeId;
+
+    /// <summary>
+    /// Sound that will get played when this reaction effect occurs.
+    /// </summary>
+    [DataField(required: true)] public SoundSpecifier Sound = default!;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-area-reaction",
+            ("duration", Duration)
+        );
+
+    public override bool ShouldLog => true;
+
+    public override LogImpact LogImpact => LogImpact.High;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs
new file mode 100644
index 0000000000..c0188fdfb4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs
@@ -0,0 +1,145 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Solution;
+
+// TODO: Energy conservation!!! Once HeatContainers are merged nuke this and everything in SolutionContainerSystem to respect energy conservation!
+/// <summary>
+/// Sets the temperature of this solution to a fixed value.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed class SetSolutionTemperatureEntityEffectSystem : EntityEffectSystem<SolutionComponent, SetSolutionTemperature>
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<SetSolutionTemperature> args)
+    {
+        _solutionContainer.SetTemperature(entity, args.Effect.Temperature);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class SetSolutionTemperature : EntityEffectBase<SetSolutionTemperature>
+{
+    /// <summary>
+    ///     The temperature to set the solution to.
+    /// </summary>
+    [DataField(required: true)]
+    public float Temperature;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-set-solution-temperature-effect",
+            ("chance", Probability),
+            ("temperature", Temperature));
+}
+
+/// <summary>
+/// Adjusts the temperature of this solution by a given amount.
+/// The temperature adjustment is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed class AdjustSolutionTemperatureEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustSolutionTemperature>
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AdjustSolutionTemperature> args)
+    {
+        var solution = entity.Comp.Solution;
+        var temperature = Math.Clamp(solution.Temperature + args.Scale * args.Effect.Delta, args.Effect.MinTemp, args.Effect.MaxTemp);
+
+        _solutionContainer.SetTemperature(entity, temperature);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AdjustSolutionTemperature : EntityEffectBase<AdjustSolutionTemperature>
+{
+    /// <summary>
+    ///     The change in temperature.
+    /// </summary>
+    [DataField(required: true)]
+    public float Delta;
+
+    /// <summary>
+    ///     The minimum temperature this effect can reach.
+    /// </summary>
+    [DataField]
+    public float MinTemp;
+
+    /// <summary>
+    ///     The maximum temperature this effect can reach.
+    /// </summary>
+    [DataField]
+    public float MaxTemp = float.PositiveInfinity;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-adjust-solution-temperature-effect",
+            ("chance", Probability),
+            ("deltasign", MathF.Sign(Delta)),
+            ("mintemp", MinTemp),
+            ("maxtemp", MaxTemp));
+}
+
+/// <summary>
+/// Adjusts the thermal energy of this solution by a given amount.
+/// The energy adjustment is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed class AdjustSolutionThermalEnergyEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustSolutionThermalEnergy>
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AdjustSolutionThermalEnergy> args)
+    {
+        var solution = entity.Comp.Solution;
+
+        var delta = args.Scale * args.Effect.Delta;
+
+        // Don't adjust thermal energy if we're already at or above max temperature.
+        switch (delta)
+        {
+            case > 0:
+                if (solution.Temperature >= args.Effect.MaxTemp)
+                    return;
+                break;
+            case < 0:
+                if (solution.Temperature <= args.Effect.MinTemp)
+                    return;
+                break;
+            default:
+                return;
+        }
+
+        _solutionContainer.AddThermalEnergyClamped(entity, delta, args.Effect.MinTemp, args.Effect.MaxTemp);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AdjustSolutionThermalEnergy : EntityEffectBase<AdjustSolutionThermalEnergy>
+{
+    /// <summary>
+    ///     The change in thermal energy.
+    /// </summary>
+    [DataField(required: true)]
+    public float Delta;
+
+    /// <summary>
+    ///     The minimum temperature this effect can reach.
+    /// </summary>
+    [DataField]
+    public float MinTemp;
+
+    /// <summary>
+    ///     The maximum temperature this effect can reach.
+    /// </summary>
+    [DataField]
+    public float MaxTemp = float.PositiveInfinity;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-adjust-solution-temperature-effect",
+            ("chance", Probability),
+            ("deltasign", MathF.Sign(Delta)),
+            ("mintemp", MinTemp),
+            ("maxtemp", MaxTemp));
+}
diff --git a/Content.Shared/EntityEffects/Effects/SolutionTemperatureEffects.cs b/Content.Shared/EntityEffects/Effects/SolutionTemperatureEffects.cs
deleted file mode 100644
index 30ac6c3d77..0000000000
--- a/Content.Shared/EntityEffects/Effects/SolutionTemperatureEffects.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Sets the temperature of the solution involved with the reaction to a new value.
-/// </summary>
-[DataDefinition]
-public sealed partial class SetSolutionTemperatureEffect : EntityEffect
-{
-    /// <summary>
-    ///     The temperature to set the solution to.
-    /// </summary>
-    [DataField("temperature", required: true)] private float _temperature;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-set-solution-temperature-effect",
-            ("chance", Probability), ("temperature", _temperature));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            var solution = reagentArgs.Source;
-            if (solution == null)
-                return;
-
-            solution.Temperature = _temperature;
-
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-}
-
-/// <summary>
-///     Adjusts the temperature of the solution involved in the reaction.
-/// </summary>
-[DataDefinition]
-public sealed partial class AdjustSolutionTemperatureEffect : EntityEffect
-{
-    /// <summary>
-    ///     The change in temperature.
-    /// </summary>
-    [DataField("delta", required: true)] private float _delta;
-
-    /// <summary>
-    ///     The minimum temperature this effect can reach.
-    /// </summary>
-    [DataField("minTemp")] private float _minTemp = 0.0f;
-
-    /// <summary>
-    ///     The maximum temperature this effect can reach.
-    /// </summary>
-    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
-
-    /// <summary>
-    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
-    /// </summary>
-    [DataField("scaled")] private bool _scaled;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
-            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            var solution = reagentArgs.Source;
-            if (solution == null || solution.Volume == 0)
-                return;
-
-            var deltaT = _scaled ? _delta * (float) reagentArgs.Quantity : _delta;
-            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
-
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-}
-
-/// <summary>
-///     Adjusts the thermal energy of the solution involved in the reaction.
-/// </summary>
-public sealed partial class AdjustSolutionThermalEnergyEffect : EntityEffect
-{
-    /// <summary>
-    ///     The change in energy.
-    /// </summary>
-    [DataField("delta", required: true)] private float _delta;
-
-    /// <summary>
-    ///     The minimum temperature this effect can reach.
-    /// </summary>
-    [DataField("minTemp")] private float _minTemp = 0.0f;
-
-    /// <summary>
-    ///     The maximum temperature this effect can reach.
-    /// </summary>
-    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
-
-    /// <summary>
-    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
-    /// </summary>
-    [DataField("scaled")] private bool _scaled;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            var solution = reagentArgs.Source;
-            if (solution == null || solution.Volume == 0)
-                return;
-
-            if (_delta > 0 && solution.Temperature >= _maxTemp)
-                return;
-            if (_delta < 0 && solution.Temperature <= _minTemp)
-                return;
-
-            var heatCap = solution.GetHeatCapacity(null);
-            var deltaT = _scaled
-                ? _delta / heatCap * (float) reagentArgs.Quantity
-                : _delta / heatCap;
-
-            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
-
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
-            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs
new file mode 100644
index 0000000000..b028da1595
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs
@@ -0,0 +1,35 @@
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Entity effect that specifically deals with new status effects.
+/// </summary>
+/// <typeparam name="T">The entity effect type, typically for status effects which need systems to pass arguments</typeparam>
+public abstract partial class BaseStatusEntityEffect<T> : EntityEffectBase<T> where T : BaseStatusEntityEffect<T>
+{
+    /// <summary>
+    /// How long the modifier applies (in seconds).
+    /// Is scaled by reagent amount if used with an EntityEffectReagentArgs.
+    /// </summary>
+    [DataField]
+    public TimeSpan? Time = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    /// Should this effect add the status effect, remove time from it, or set its cooldown?
+    /// </summary>
+    [DataField]
+    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Update;
+
+    /// <summary>
+    /// Delay before the effect starts. If another effect is added with a shorter delay, it takes precedence.
+    /// </summary>
+    [DataField]
+    public TimeSpan Delay;
+}
+
+public enum StatusEffectMetabolismType
+{
+    Update,
+    Add,
+    Remove,
+    Set,
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs
new file mode 100644
index 0000000000..553300be72
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Drunk;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Applies the drunk status effect to this entity.
+/// The duration of the effect is equal to <see cref="Drunk.BoozePower"/> modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class DrunkEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Drunk>
+{
+    [Dependency] private readonly SharedDrunkSystem _drunk = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Drunk> args)
+    {
+        var boozePower = args.Effect.BoozePower * args.Scale;
+
+        _drunk.TryApplyDrunkenness(entity, boozePower);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Drunk : EntityEffectBase<Drunk>
+{
+    /// <summary>
+    ///     BoozePower is how long each metabolism cycle will make the drunk effect last for.
+    /// </summary>
+    [DataField]
+    public TimeSpan BoozePower = TimeSpan.FromSeconds(3f);
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-drunk", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs
new file mode 100644
index 0000000000..b5a208f2c7
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs
@@ -0,0 +1,51 @@
+using Content.Shared.Electrocution;
+using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+// TODO: When Electrocution is moved to new Status, make this use StatusEffectsContainerComponent.
+/// <summary>
+/// Electrocutes this entity for a given amount of damage and time.
+/// The shock damage applied by this effect is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ElectrocuteEntityEffectSystem : EntityEffectSystem<StatusEffectsComponent, Electrocute>
+{
+    [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!;
+
+    // TODO: When electrocution is new status, change this to new status
+    protected override void Effect(Entity<StatusEffectsComponent> entity, ref EntityEffectEvent<Electrocute> args)
+    {
+        var effect = args.Effect;
+
+        _electrocution.TryDoElectrocution(entity, null, (int)(args.Scale * effect.ShockDamage), effect.ElectrocuteTime, effect.Refresh, ignoreInsulation: effect.BypassInsulation);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Electrocute : EntityEffectBase<Electrocute>
+{
+    /// <summary>
+    /// Time we electrocute this entity
+    /// </summary>
+    [DataField] public TimeSpan ElectrocuteTime = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    /// Shock damage we apply to the entity.
+    /// </summary>
+    [DataField] public int ShockDamage = 5;
+
+    /// <summary>
+    /// Do we refresh the duration? Or add more duration if it already exists.
+    /// </summary>
+    [DataField] public bool Refresh = true;
+
+    /// <summary>
+    /// Should we by bypassing insulation?
+    /// </summary>
+    [DataField] public bool BypassInsulation = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime.TotalSeconds));
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
deleted file mode 100644
index 652c1b90a1..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.StatusEffect;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-///     Adds a generic status effect to the entity,
-///     not worrying about things like how to affect the time it lasts for
-///     or component fields or anything. Just adds a component to an entity
-///     for a given time. Easy.
-/// </summary>
-/// <remarks>
-///     Can be used for things like adding accents or something. I don't know. Go wild.
-/// </remarks>
-[Obsolete("Use ModifyStatusEffect with StatusEffectNewSystem instead")]
-public sealed partial class GenericStatusEffect : EntityEffect
-{
-    [DataField(required: true)]
-    public string Key = default!;
-
-    [DataField]
-    public string Component = String.Empty;
-
-    [DataField]
-    public float Time = 2.0f;
-
-    /// <remarks>
-    ///     true - refresh status effect time,  false - accumulate status effect time
-    /// </remarks>
-    [DataField]
-    public bool Refresh = true;
-
-    /// <summary>
-    ///     Should this effect add the status effect, remove time from it, or set its cooldown?
-    /// </summary>
-    [DataField]
-    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
-
-        var time = Time;
-        if (args is EntityEffectReagentArgs reagentArgs)
-            time *= reagentArgs.Scale.Float();
-
-        if (Type == StatusEffectMetabolismType.Add && Component != String.Empty)
-        {
-            statusSys.TryAddStatusEffect(args.TargetEntity, Key, TimeSpan.FromSeconds(time), Refresh, Component);
-        }
-        else if (Type == StatusEffectMetabolismType.Remove)
-        {
-            statusSys.TryRemoveTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
-        }
-        else if (Type == StatusEffectMetabolismType.Set)
-        {
-            statusSys.TrySetTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
-        }
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
-        "reagent-effect-guidebook-status-effect",
-        ("chance", Probability),
-        ("type", Type),
-        ("time", Time),
-        ("key", $"reagent-effect-status-effect-{Key}"));
-}
-
-public enum StatusEffectMetabolismType
-{
-    Update,
-    Add,
-    Remove,
-    Set
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs
new file mode 100644
index 0000000000..2d870a433c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs
@@ -0,0 +1,64 @@
+using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Applies a Generic Status Effect to this entity, which is a timed Component.
+/// The amount of time the Component is applied is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+[Obsolete("Use ModifyStatusEffect instead")]
+public sealed partial class GenericStatusEffectEntityEffectSystem : EntityEffectSystem<MetaDataComponent, GenericStatusEffect>
+{
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<GenericStatusEffect> args)
+    {
+        var time = args.Effect.Time * args.Scale;
+
+        switch (args.Effect.Type)
+        {
+            case StatusEffectMetabolismType.Update:
+                if (args.Effect.Component != String.Empty)
+                    _status.TryAddStatusEffect(entity, args.Effect.Key, time, true, args.Effect.Component);
+                break;
+            case StatusEffectMetabolismType.Add:
+                if (args.Effect.Component != String.Empty)
+                    _status.TryAddStatusEffect(entity, args.Effect.Key, time, false, args.Effect.Component);
+                break;
+            case StatusEffectMetabolismType.Remove:
+                _status.TryRemoveTime(entity, args.Effect.Key, time);
+                break;
+            case StatusEffectMetabolismType.Set:
+                _status.TrySetTime(entity, args.Effect.Key, time);
+                break;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class GenericStatusEffect : EntityEffectBase<GenericStatusEffect>
+{
+    [DataField(required: true)]
+    public string Key = default!;
+
+    [DataField]
+    public string Component = String.Empty;
+
+    [DataField]
+    public TimeSpan Time = TimeSpan.FromSeconds(2f);
+
+    /// <summary>
+    ///     Should this effect add the status effect, remove time from it, or set its cooldown?
+    /// </summary>
+    [DataField]
+    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Update;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
+        "entity-effect-guidebook-status-effect-old",
+        ("chance", Probability),
+        ("type", Type),
+        ("time", Time.TotalSeconds),
+        ("key", $"entity-effect-status-effect-{Key}"));
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/Jitter.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/Jitter.cs
deleted file mode 100644
index 891c791b07..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/Jitter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Jittering;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-///     Adds the jitter status effect to a mob.
-///     This doesn't use generic status effects because it needs to
-///     take in some parameters that JitterSystem needs.
-/// </summary>
-public sealed partial class Jitter : EntityEffect
-{
-    [DataField]
-    public float Amplitude = 10.0f;
-
-    [DataField]
-    public float Frequency = 4.0f;
-
-    [DataField]
-    public float Time = 2.0f;
-
-    /// <remarks>
-    ///     true - refresh jitter time,  false - accumulate jitter time
-    /// </remarks>
-    [DataField]
-    public bool Refresh = true;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var time = Time;
-        if (args is EntityEffectReagentArgs reagentArgs)
-            time *= reagentArgs.Scale.Float();
-
-        args.EntityManager.EntitySysManager.GetEntitySystem<SharedJitteringSystem>()
-            .DoJitter(args.TargetEntity, TimeSpan.FromSeconds(time), Refresh, Amplitude, Frequency);
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("reagent-effect-guidebook-jittering", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs
new file mode 100644
index 0000000000..3b445da747
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs
@@ -0,0 +1,45 @@
+using Content.Shared.Jittering;
+using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+// TODO: When Jittering is moved to new Status, make this use StatusEffectsContainerComponent.
+/// <summary>
+/// Applies the Jittering Status Effect to this entity.
+/// The amount of time the Jittering is applied is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class JitterEntityEffectSystem : EntityEffectSystem<StatusEffectsComponent, Jitter>
+{
+    [Dependency] private readonly SharedJitteringSystem _jittering = default!;
+
+    protected override void Effect(Entity<StatusEffectsComponent> entity, ref EntityEffectEvent<Jitter> args)
+    {
+        var time = args.Effect.Time * args.Scale;
+
+        _jittering.DoJitter(entity, TimeSpan.FromSeconds(time), args.Effect.Refresh, args.Effect.Amplitude, args.Effect.Frequency);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Jitter : EntityEffectBase<Jitter>
+{
+    [DataField]
+    public float Amplitude = 10.0f;
+
+    [DataField]
+    public float Frequency = 4.0f;
+
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <remarks>
+    ///     true - refresh jitter time,  false - accumulate jitter time
+    /// </remarks>
+    [DataField]
+    public bool Refresh = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-jittering", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs
deleted file mode 100644
index 59ca5da0f7..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using Content.Shared.Stunnable;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-/// Changes the knockdown timer on an entity or causes knockdown.
-/// </summary>
-[UsedImplicitly]
-public sealed partial class ModifyKnockdown : EntityEffect
-{
-    /// <summary>
-    /// Should we only affect those with crawler component? Note if this is false, it will paralyze non-crawler's instead.
-    /// </summary>
-    [DataField]
-    public bool Crawling;
-
-    /// <summary>
-    /// Should we drop items when we fall?
-    /// </summary>
-    [DataField]
-    public bool Drop;
-
-    /// <summary>
-    /// Time for which knockdown should be applied. Behaviour changes according to <see cref="StatusEffectMetabolismType"/>.
-    /// </summary>
-    [DataField]
-    public TimeSpan Time = TimeSpan.FromSeconds(0.5);
-
-    /// <summary>
-    /// Should this effect add the status effect, remove time from it, or set its cooldown?
-    /// </summary>
-    [DataField]
-    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
-
-    /// <summary>
-    /// Should this effect add knockdown?, remove time from it?, or set its cooldown?
-    /// </summary>
-    [DataField]
-    public bool Refresh = true;
-
-    /// <inheritdoc />
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var stunSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedStunSystem>();
-
-        var time = Time;
-        if (args is EntityEffectReagentArgs reagentArgs)
-            time *= reagentArgs.Scale.Float();
-
-        switch (Type)
-        {
-            case StatusEffectMetabolismType.Update:
-                if (Crawling)
-                {
-                    stunSys.TryCrawling(args.TargetEntity, time, drop: Drop);
-                }
-                else
-                {
-                    stunSys.TryKnockdown(args.TargetEntity, time, drop: Drop);
-                }
-                break;
-            case StatusEffectMetabolismType.Add:
-                if (Crawling)
-                {
-                    stunSys.TryCrawling(args.TargetEntity, time, false, drop: Drop);
-                }
-                else
-                {
-                    stunSys.TryKnockdown(args.TargetEntity, time, false, drop: Drop);
-                }
-                break;
-            case StatusEffectMetabolismType.Remove:
-                    stunSys.AddKnockdownTime(args.TargetEntity, -time);
-                break;
-            case StatusEffectMetabolismType.Set:
-                if (Crawling)
-                {
-                    stunSys.TryCrawling(args.TargetEntity, time, drop: Drop);
-                }
-                else
-                {
-                    stunSys.TryKnockdown(args.TargetEntity, time, drop: Drop);
-                }
-                stunSys.SetKnockdownTime(args.TargetEntity, time);
-                break;
-        }
-    }
-
-    /// <inheritdoc />
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString(
-            "reagent-effect-guidebook-knockdown",
-            ("chance", Probability),
-            ("type", Type),
-            ("time", Time.TotalSeconds)
-        );
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs
new file mode 100644
index 0000000000..5e01774ce4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs
@@ -0,0 +1,72 @@
+using Content.Shared.Standing;
+using Content.Shared.Stunnable;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Applies knockdown to this entity.
+/// Duration is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ModifyKnockdownEntityEffectSystem : EntityEffectSystem<StandingStateComponent, ModifyKnockdown>
+{
+    [Dependency] private readonly SharedStunSystem _stun = default!;
+
+    protected override void Effect(Entity<StandingStateComponent> entity, ref EntityEffectEvent<ModifyKnockdown> args)
+    {
+        var time = args.Effect.Time * args.Scale;
+
+        switch (args.Effect.Type)
+        {
+            case StatusEffectMetabolismType.Update:
+                if (args.Effect.Crawling)
+                    _stun.TryCrawling(entity.Owner, time, drop: args.Effect.Drop);
+                else
+                    _stun.TryKnockdown(entity.Owner, time, drop: args.Effect.Drop);
+                break;
+            case StatusEffectMetabolismType.Add:
+                if (args.Effect.Crawling)
+                    _stun.TryCrawling(entity.Owner, time, false, drop: args.Effect.Drop);
+                else
+                    _stun.TryKnockdown(entity.Owner, time, false, drop: args.Effect.Drop);
+                break;
+            case StatusEffectMetabolismType.Remove:
+                _stun.AddKnockdownTime(entity.Owner, - time ?? TimeSpan.Zero);
+                break;
+            case StatusEffectMetabolismType.Set:
+                if (args.Effect.Crawling)
+                    _stun.TryCrawling(entity.Owner, drop: args.Effect.Drop);
+                else
+                    _stun.TryKnockdown(entity.Owner, time, drop: args.Effect.Drop);
+                _stun.SetKnockdownTime(entity.Owner, time ?? TimeSpan.Zero);
+                break;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ModifyKnockdown : BaseStatusEntityEffect<ModifyKnockdown>
+{
+    /// <summary>
+    /// Should we only affect those with crawler component? Note if this is false, it will paralyze non-crawler's instead.
+    /// </summary>
+    [DataField]
+    public bool Crawling;
+
+    /// <summary>
+    /// Should we drop items when we fall?
+    /// </summary>
+    [DataField]
+    public bool Drop;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Time == null
+        ? null
+        : Loc.GetString(
+            "entity-effect-guidebook-knockdown",
+            ("chance", Probability),
+            ("type", Type),
+            ("time", Time.Value.TotalSeconds)
+        );
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs
new file mode 100644
index 0000000000..318c8ad30b
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs
@@ -0,0 +1,51 @@
+using Content.Shared.StatusEffectNew;
+using Content.Shared.StatusEffectNew.Components;
+using Content.Shared.Stunnable;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Applies the paralysis status effect to this entity.
+/// Duration is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ModifyParalysisEntityEffectSystem : EntityEffectSystem<StatusEffectContainerComponent, ModifyParalysis>
+{
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
+    [Dependency] private readonly SharedStunSystem _stun = default!;
+
+    protected override void Effect(Entity<StatusEffectContainerComponent> entity, ref EntityEffectEvent<ModifyParalysis> args)
+    {
+        var time = args.Effect.Time * args.Scale;
+
+        switch (args.Effect.Type)
+        {
+            case StatusEffectMetabolismType.Update:
+                _stun.TryUpdateParalyzeDuration(entity, time);
+                break;
+            case StatusEffectMetabolismType.Add:
+                _stun.TryAddParalyzeDuration(entity, time);
+                break;
+            case StatusEffectMetabolismType.Remove:
+                _status.TryRemoveTime(entity, SharedStunSystem.StunId, time);
+                break;
+            case StatusEffectMetabolismType.Set:
+                _status.TrySetStatusEffectDuration(entity, SharedStunSystem.StunId, time);
+                break;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ModifyParalysis : BaseStatusEntityEffect<ModifyParalysis>
+{
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Time == null
+            ? null // Not gonna make a whole new looc for something that shouldn't ever exist.
+            : Loc.GetString(
+            "entity-effect-guidebook-paralyze",
+            ("chance", Probability),
+            ("time", Time.Value.TotalSeconds)
+        );
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
deleted file mode 100644
index d7bf6482bd..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using Content.Shared.StatusEffectNew;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-/// Changes status effects on entities: Adds, removes or sets time.
-/// </summary>
-[UsedImplicitly]
-public sealed partial class ModifyStatusEffect : EntityEffect
-{
-    [DataField(required: true)]
-    public EntProtoId EffectProto;
-
-    /// <summary>
-    /// Time for which status effect should be applied. Behaviour changes according to <see cref="Refresh" />.
-    /// </summary>
-    [DataField]
-    public float Time = 2.0f;
-
-    /// <summary>
-    /// Delay before the effect starts. If another effect is added with a shorter delay, it takes precedence.
-    /// </summary>
-    [DataField]
-    public float Delay = 0f;
-
-    /// <summary>
-    /// Should this effect add the status effect, remove time from it, or set its cooldown?
-    /// </summary>
-    [DataField]
-    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
-
-    /// <inheritdoc />
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
-
-        var time = Time;
-        if (args is EntityEffectReagentArgs reagentArgs)
-            time *= reagentArgs.Scale.Float();
-
-        var duration = TimeSpan.FromSeconds(time);
-        switch (Type)
-        {
-            case StatusEffectMetabolismType.Update:
-                statusSys.TryUpdateStatusEffectDuration(args.TargetEntity, EffectProto, duration, Delay > 0 ? TimeSpan.FromSeconds(Delay) : null);
-                break;
-            case StatusEffectMetabolismType.Add:
-                statusSys.TryAddStatusEffectDuration(args.TargetEntity, EffectProto, duration, Delay > 0 ? TimeSpan.FromSeconds(Delay) : null);
-                break;
-            case StatusEffectMetabolismType.Remove:
-                statusSys.TryAddTime(args.TargetEntity, EffectProto, -duration);
-                break;
-            case StatusEffectMetabolismType.Set:
-                statusSys.TrySetStatusEffectDuration(args.TargetEntity, EffectProto, duration, TimeSpan.FromSeconds(Delay));
-                break;
-        }
-    }
-
-    /// <inheritdoc />
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Delay > 0
-        ? Loc.GetString(
-            "reagent-effect-guidebook-status-effect-delay",
-            ("chance", Probability),
-            ("type", Type),
-            ("time", Time),
-            ("key", prototype.Index(EffectProto).Name),
-            ("delay", Delay))
-        : Loc.GetString(
-            "reagent-effect-guidebook-status-effect",
-            ("chance", Probability),
-            ("type", Type),
-            ("time", Time),
-            ("key", prototype.Index(EffectProto).Name)
-        );
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs
new file mode 100644
index 0000000000..d7e4b634f3
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs
@@ -0,0 +1,66 @@
+using Content.Shared.StatusEffectNew;
+using Content.Shared.StatusEffectNew.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Applies a given status effect to this entity.
+/// Duration is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ModifyStatusEffectEntityEffectSystem : EntityEffectSystem<StatusEffectContainerComponent, ModifyStatusEffect>
+{
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
+
+    protected override void Effect(Entity<StatusEffectContainerComponent> entity, ref EntityEffectEvent<ModifyStatusEffect> args)
+    {
+        var time = args.Effect.Time * args.Scale;
+        var delay = args.Effect.Delay;
+
+        switch (args.Effect.Type)
+        {
+            case StatusEffectMetabolismType.Update:
+                _status.TryUpdateStatusEffectDuration(entity, args.Effect.EffectProto, time, delay);
+                break;
+            case StatusEffectMetabolismType.Add:
+                if (time != null)
+                    _status.TryAddStatusEffectDuration(entity, args.Effect.EffectProto, time.Value, delay);
+                else
+                    _status.TryUpdateStatusEffectDuration(entity, args.Effect.EffectProto, time, delay);
+                break;
+            case StatusEffectMetabolismType.Remove:
+                _status.TryRemoveTime(entity, args.Effect.EffectProto, time);
+                break;
+            case StatusEffectMetabolismType.Set:
+                _status.TrySetStatusEffectDuration(entity, args.Effect.EffectProto, time, delay);
+                break;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ModifyStatusEffect : BaseStatusEntityEffect<ModifyStatusEffect>
+{
+    /// <summary>
+    /// Prototype of the status effect we're modifying.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId EffectProto;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Time == null
+            ? Loc.GetString(
+                "entity-effect-guidebook-status-effect-indef",
+                ("chance", Probability),
+                ("type", Type),
+                ("key", prototype.Index(EffectProto).Name),
+                ("delay", Delay.TotalSeconds))
+            : Loc.GetString(
+                "entity-effect-guidebook-status-effect",
+                ("chance", Probability),
+                ("type", Type),
+                ("time", Time.Value.TotalSeconds),
+                ("key", prototype.Index(EffectProto).Name),
+                ("delay", Delay.TotalSeconds));
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs
new file mode 100644
index 0000000000..ed9923f856
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs
@@ -0,0 +1,92 @@
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
+using Content.Shared.StatusEffectNew;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Applies a given movement speed modifier status effect to this entity.
+/// Duration is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class MovementSpeedModifierEntityEffectSystem : EntityEffectSystem<MovementSpeedModifierComponent, MovementSpeedModifier>
+{
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
+    [Dependency] private readonly MovementModStatusSystem _movementModStatus = default!;
+
+    protected override void Effect(Entity<MovementSpeedModifierComponent> entity, ref EntityEffectEvent<MovementSpeedModifier> args)
+    {
+        var proto = args.Effect.EffectProto;
+        var sprintMod = args.Effect.SprintSpeedModifier;
+        var walkMod = args.Effect.WalkSpeedModifier;
+
+        switch (args.Effect.Type)
+        {
+            case StatusEffectMetabolismType.Update:
+                _movementModStatus.TryUpdateMovementSpeedModDuration(
+                    entity,
+                    proto,
+                    args.Effect.Time * args.Scale,
+                    sprintMod,
+                    walkMod);
+                break;
+            case StatusEffectMetabolismType.Add:
+                if (args.Effect.Time != null)
+                {
+                    _movementModStatus.TryAddMovementSpeedModDuration(
+                        entity,
+                        proto,
+                        args.Effect.Time.Value * args.Scale,
+                        sprintMod,
+                        walkMod);
+                }
+                else
+                {
+                    _movementModStatus.TryUpdateMovementSpeedModDuration(
+                        entity,
+                        proto,
+                        args.Effect.Time * args.Scale,
+                        sprintMod,
+                        walkMod);
+                }
+                break;
+            case StatusEffectMetabolismType.Remove:
+                _status.TryRemoveTime(entity, args.Effect.EffectProto, args.Effect.Time * args.Scale);
+                break;
+            case StatusEffectMetabolismType.Set:
+                _status.TrySetStatusEffectDuration(entity, proto, args.Effect.Time * args.Scale);
+                break;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class MovementSpeedModifier : BaseStatusEntityEffect<MovementSpeedModifier>
+{
+    /// <summary>
+    /// How much the entities' walk speed is multiplied by.
+    /// </summary>
+    [DataField]
+    public float WalkSpeedModifier = 1f;
+
+    /// <summary>
+    /// How much the entities' run speed is multiplied by.
+    /// </summary>
+    [DataField]
+    public float SprintSpeedModifier = 1f;
+
+    /// <summary>
+    /// Movement speed modifier prototype we're adding. Adding in case we ever want more than one prototype that boosts speed.
+    /// </summary>
+    [DataField]
+    public EntProtoId EffectProto = MovementModStatusSystem.ReagentSpeed;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+    Time == null
+        ? null // Not gonna make a whole new looc for something that shouldn't ever exist.
+        : Loc.GetString("entity-effect-guidebook-movespeed-modifier",
+            ("chance", Probability),
+            ("sprintspeed", SprintSpeedModifier),
+            ("time", Time.Value.TotalSeconds));
+}
diff --git a/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs
new file mode 100644
index 0000000000..ea7c2dc8d4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs
@@ -0,0 +1,21 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// A brief summary of the effect.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class TemplateEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Template>
+{
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Template> args)
+    {
+        // Effect goes here.
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Template : EntityEffectBase<Template>
+{
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs
new file mode 100644
index 0000000000..c4768dcd11
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Database;
+using Content.Shared.Emp;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Transform;
+
+/// <summary>
+/// Creates an EMP at this entity's coordinates.
+/// Range is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class EmpEntityEffectSystem : EntityEffectSystem<TransformComponent, Emp>
+{
+    [Dependency] private readonly SharedEmpSystem _emp = default!;
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<Emp> args)
+    {
+        var range = MathF.Min(args.Effect.RangeModifier * args.Scale, args.Effect.MaxRange);
+
+        _emp.EmpPulse(_xform.GetMapCoordinates(entity, xform: entity.Comp), range, args.Effect.EnergyConsumption, args.Effect.Duration);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Emp : EntityEffectBase<Emp>
+{
+    /// <summary>
+    ///     Impulse range per unit of quantity
+    /// </summary>
+    [DataField]
+    public float RangeModifier = 0.5f;
+
+    /// <summary>
+    ///     Maximum impulse range
+    /// </summary>
+    [DataField]
+    public float MaxRange = 10;
+
+    /// <summary>
+    ///     How much energy will be drain from sources
+    /// </summary>
+    [DataField]
+    public float EnergyConsumption = 12500;
+
+    /// <summary>
+    ///     Amount of time entities will be disabled
+    /// </summary>
+    [DataField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(15);
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-emp-reaction-effect", ("chance", Probability));
+
+    public override bool ShouldLog => true;
+
+    public override LogImpact LogImpact => LogImpact.Medium;
+}
diff --git a/Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
similarity index 69%
rename from Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
rename to Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
index bc9af15092..762ef24141 100644
--- a/Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
@@ -1,19 +1,17 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Content.Shared.Explosion;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using System.Text.Json.Serialization;
 
-namespace Content.Shared.EntityEffects.Effects;
+namespace Content.Shared.EntityEffects.Effects.Transform;
 
-[DataDefinition]
-public sealed partial class ExplosionReactionEffect : EventEntityEffect<ExplosionReactionEffect>
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ExplosionEffect : EntityEffectBase<ExplosionEffect>
 {
     /// <summary>
     ///     The type of explosion. Determines damage types and tile break chance scaling.
     /// </summary>
-    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
-    public string ExplosionType = default!;
+    [DataField(required: true)]
+    public ProtoId<ExplosionPrototype> ExplosionType;
 
     /// <summary>
     ///     The max intensity the explosion can have at a given tile. Places an upper limit of damage and tile break
@@ -51,9 +49,10 @@ public sealed partial class ExplosionReactionEffect : EventEntityEffect<Explosio
     [DataField]
     public float TileBreakScale = 1f;
 
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
+
     public override bool ShouldLog => true;
 
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
     public override LogImpact LogImpact => LogImpact.High;
 }
diff --git a/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs
new file mode 100644
index 0000000000..df788e94d6
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs
@@ -0,0 +1,81 @@
+using Content.Shared.Flash;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Transform;
+
+/// <summary>
+/// Creates a Flash at this entity's coordinates.
+/// Range is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class FlashEntityEffectSystem : EntityEffectSystem<TransformComponent, Flash>
+{
+    [Dependency] private readonly SharedFlashSystem _flash = default!;
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<Flash> args)
+    {
+        var range = MathF.Min(args.Scale * args.Effect.RangePerUnit, args.Effect.MaxRange);
+
+        _flash.FlashArea(
+            entity,
+            null,
+            range,
+            args.Effect.Duration,
+            slowTo: args.Effect.SlowTo,
+            sound: args.Effect.Sound);
+
+        if (args.Effect.FlashEffectPrototype == null)
+            return;
+
+        var uid = PredictedSpawnAtPosition(args.Effect.FlashEffectPrototype, _xform.GetMoverCoordinates(entity));
+
+        _pointLight.SetRadius(uid, MathF.Max(1.1f, range));
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Flash : EntityEffectBase<Flash>
+{
+    /// <summary>
+    ///     Flash range per unit of reagent.
+    /// </summary>
+    [DataField]
+    public float RangePerUnit = 0.2f;
+
+    /// <summary>
+    ///     Maximum flash range.
+    /// </summary>
+    [DataField]
+    public float MaxRange = 10f;
+
+    /// <summary>
+    ///     How much to entities are slowed down.
+    /// </summary>
+    [DataField]
+    public float SlowTo = 0.5f;
+
+    /// <summary>
+    ///     The time entities will be flashed.
+    ///     The default is chosen to be better than the hand flash so it is worth using it for grenades etc.
+    /// </summary>
+    [DataField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(4);
+
+    /// <summary>
+    ///     The prototype ID used for the visual effect.
+    /// </summary>
+    [DataField]
+    public EntProtoId? FlashEffectPrototype = "ReactionFlash";
+
+    /// <summary>
+    ///     The sound the flash creates.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Weapons/flash.ogg");
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-flash-reaction-effect", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs
new file mode 100644
index 0000000000..53d9acd2c9
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs
@@ -0,0 +1,64 @@
+using Content.Shared.Popups;
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+
+namespace Content.Shared.EntityEffects.Effects.Transform;
+
+/// <summary>
+/// Creates a text popup to appear at this entity's coordinates.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class PopupMessageEntityEffectSystem : EntityEffectSystem<TransformComponent, PopupMessage>
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<PopupMessage> args)
+    {
+        // TODO: When we get proper random prediction remove this check.
+        if (_net.IsClient)
+            return;
+
+        var msg = _random.Pick(args.Effect.Messages);
+
+        switch (args.Effect.Type)
+        {
+            case PopupRecipients.Local:
+                _popup.PopupEntity(Loc.GetString(msg, ("entity", entity)), entity, entity, args.Effect.VisualType);
+                break;
+            case PopupRecipients.Pvs:
+                _popup.PopupEntity(Loc.GetString(msg, ("entity", entity)), entity, args.Effect.VisualType);
+                break;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class PopupMessage : EntityEffectBase<PopupMessage>
+{
+    /// <summary>
+    /// Array of messages that can popup.
+    /// Only one is chosen when the effect is applied.
+    /// </summary>
+    [DataField(required: true)]
+    public string[] Messages = default!;
+
+    /// <summary>
+    /// Whether to just the entity we're affecting, or everyone around them.
+    /// </summary>
+    [DataField]
+    public PopupRecipients Type = PopupRecipients.Local;
+
+    /// <summary>
+    /// Size of the popup.
+    /// </summary>
+    [DataField]
+    public PopupType VisualType = PopupType.Small;
+}
+
+public enum PopupRecipients
+{
+    Pvs,
+    Local
+}
diff --git a/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs
new file mode 100644
index 0000000000..c54912191e
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Washes the cream pie off of this entity face.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+/// TODO: This can probably be made into a generic "CleanEntityEffect" which multiple components listen to...
+public sealed partial class WashCreamPieEntityEffectSystem : EntityEffectSystem<CreamPiedComponent, WashCreamPie>
+{
+    [Dependency] private readonly SharedCreamPieSystem _creamPie = default!;
+
+    protected override void Effect(Entity<CreamPiedComponent> entity, ref EntityEffectEvent<WashCreamPie> args)
+    {
+        _creamPie.SetCreamPied(entity, entity.Comp, false);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class WashCreamPie : EntityEffectBase<WashCreamPie>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/WashCreamPieReaction.cs b/Content.Shared/EntityEffects/Effects/WashCreamPieReaction.cs
deleted file mode 100644
index e6992a3ec8..0000000000
--- a/Content.Shared/EntityEffects/Effects/WashCreamPieReaction.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class WashCreamPieReaction : EntityEffect
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out CreamPiedComponent? creamPied)) return;
-
-        args.EntityManager.System<SharedCreamPieSystem>().SetCreamPied(args.TargetEntity, creamPied, false);
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/WearableReaction.cs b/Content.Shared/EntityEffects/Effects/WearableReaction.cs
deleted file mode 100644
index 08c28f9821..0000000000
--- a/Content.Shared/EntityEffects/Effects/WearableReaction.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Content.Shared.Inventory;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// A reaction effect that spawns a PrototypeID in the entity's Slot, and attempts to consume the reagent if EntityEffectReagentArgs.
-/// Used to implement the water droplet effect for arachnids.
-/// </summary>
-public sealed partial class WearableReaction : EntityEffect
-{
-    /// <summary>
-    /// Minimum quantity of reagent required to trigger this effect.
-    /// Only used with EntityEffectReagentArgs.
-    /// </summary>
-    [DataField]
-    public float AmountThreshold = 1f;
-
-    /// <summary>
-    /// Slot to spawn the item into.
-    /// </summary>
-    [DataField(required: true)]
-    public string Slot;
-
-    /// <summary>
-    /// Prototype ID of item to spawn.
-    /// </summary>
-    [DataField(required: true)]
-    public string PrototypeID;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        // SpawnItemInSlot returns false if slot is already occupied
-        if (args.EntityManager.System<InventorySystem>().SpawnItemInSlot(args.TargetEntity, Slot, PrototypeID))
-        {
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                if (reagentArgs.Reagent == null || reagentArgs.Quantity < AmountThreshold)
-                    return;
-                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, AmountThreshold);
-            }
-        }
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs
new file mode 100644
index 0000000000..ea0e6f0e34
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs
@@ -0,0 +1,67 @@
+using Content.Shared.Mobs.Components;
+using Content.Shared.Zombies;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Causes the zombie infection on this entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class CauseZombieInfectionEntityEffectsSystem : EntityEffectSystem<MobStateComponent, CauseZombieInfection>
+{
+    // MobState because you have to die to become a zombie...
+    protected override void Effect(Entity<MobStateComponent> entity, ref EntityEffectEvent<CauseZombieInfection> args)
+    {
+        if (HasComp<ZombieImmuneComponent>(entity) || HasComp<IncurableZombieComponent>(entity))
+            return;
+
+        EnsureComp<ZombifyOnDeathComponent>(entity);
+        EnsureComp<PendingZombieComponent>(entity);
+    }
+}
+
+/// <summary>
+/// Cures the Zombie infection on this entity and optionally inoculates them against future infection.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class CureZombieInfectionEntityEffectsSystem : EntityEffectSystem<MobStateComponent, CureZombieInfection>
+{
+    // MobState because you have to die to become a zombie...
+    protected override void Effect(Entity<MobStateComponent> entity, ref EntityEffectEvent<CureZombieInfection> args)
+    {
+        if (HasComp<IncurableZombieComponent>(entity))
+            return;
+
+        RemComp<ZombifyOnDeathComponent>(entity);
+        RemComp<PendingZombieComponent>(entity);
+
+        if (args.Effect.Innoculate)
+            EnsureComp<ZombieImmuneComponent>(entity);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class CauseZombieInfection : EntityEffectBase<CauseZombieInfection>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-cause-zombie-infection", ("chance", Probability));
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class CureZombieInfection : EntityEffectBase<CureZombieInfection>
+{
+    /// <summary>
+    /// Do we also protect against future infections?
+    /// </summary>
+    [DataField]
+    public bool Innoculate;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        if (Innoculate)
+            return Loc.GetString("entity-effect-guidebook-innoculate-zombie-infection", ("chance", Probability));
+
+        return Loc.GetString("entity-effect-guidebook-cure-zombie-infection", ("chance", Probability));
+    }
+}
diff --git a/Content.Shared/EntityEffects/EntityEffect.cs b/Content.Shared/EntityEffects/EntityEffect.cs
deleted file mode 100644
index 998759006f..0000000000
--- a/Content.Shared/EntityEffects/EntityEffect.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-using System.Linq;
-using System.Text.Json.Serialization;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Localizations;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Toolshed.TypeParsers;
-
-namespace Content.Shared.EntityEffects;
-
-/// <summary>
-///     Entity effects describe behavior that occurs on different kinds of triggers, e.g. when a reagent is ingested and metabolized by some
-///     organ. They only trigger when all of <see cref="Conditions"/> are satisfied.
-/// </summary>
-[ImplicitDataDefinitionForInheritors]
-[MeansImplicitUse]
-public abstract partial class EntityEffect
-{
-    private protected string _id => this.GetType().Name;
-    /// <summary>
-    ///     The list of conditions required for the effect to activate. Not required.
-    /// </summary>
-    [DataField("conditions")]
-    public EntityEffectCondition[]? Conditions;
-
-    public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description";
-
-    protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys);
-
-    /// <summary>
-    ///     What's the chance, from 0 to 1, that this effect will occur?
-    /// </summary>
-    [DataField("probability")]
-    public float Probability = 1.0f;
-
-    public virtual LogImpact LogImpact { get; private set; } = LogImpact.Low;
-
-    /// <summary>
-    ///     Should this entity effect log at all?
-    /// </summary>
-    public virtual bool ShouldLog { get; private set; } = false;
-
-    public abstract void Effect(EntityEffectBaseArgs args);
-
-    /// <summary>
-    /// Produces a localized, bbcode'd guidebook description for this effect.
-    /// </summary>
-    /// <returns></returns>
-    public string? GuidebookEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        var effect = ReagentEffectGuidebookText(prototype, entSys);
-        if (effect is null)
-            return null;
-
-        return Loc.GetString(ReagentEffectFormat, ("effect", effect), ("chance", Probability),
-            ("conditionCount", Conditions?.Length ?? 0),
-            ("conditions",
-                ContentLocalizationManager.FormatList(Conditions?.Select(x => x.GuidebookExplanation(prototype)).ToList() ??
-                                                        new List<string>())));
-    }
-}
-
-public static class EntityEffectExt
-{
-    public static bool ShouldApply(this EntityEffect effect, EntityEffectBaseArgs args,
-        IRobustRandom? random = null)
-    {
-        if (random == null)
-            random = IoCManager.Resolve<IRobustRandom>();
-
-        if (effect.Probability < 1.0f && !random.Prob(effect.Probability))
-            return false;
-
-        if (effect.Conditions != null)
-        {
-            foreach (var cond in effect.Conditions)
-            {
-                if (!cond.Condition(args))
-                    return false;
-            }
-        }
-
-        return true;
-    }
-}
-
-[ByRefEvent]
-public struct ExecuteEntityEffectEvent<T> where T : EntityEffect
-{
-    public T Effect;
-    public EntityEffectBaseArgs Args;
-
-    public ExecuteEntityEffectEvent(T effect, EntityEffectBaseArgs args)
-    {
-        Effect = effect;
-        Args = args;
-    }
-}
-
-/// <summary>
-///     EntityEffectBaseArgs only contains the target of an effect.
-///     If a trigger wants to include more info (e.g. the quantity of the chemical triggering the effect), it can be extended (see EntityEffectReagentArgs).
-/// </summary>
-public record class EntityEffectBaseArgs
-{
-    public EntityUid TargetEntity;
-
-    public IEntityManager EntityManager = default!;
-
-    public EntityEffectBaseArgs(EntityUid targetEntity, IEntityManager entityManager)
-    {
-        TargetEntity = targetEntity;
-        EntityManager = entityManager;
-    }
-}
-
-public record class EntityEffectReagentArgs : EntityEffectBaseArgs
-{
-    public EntityUid? OrganEntity;
-
-    public Solution? Source;
-
-    public FixedPoint2 Quantity;
-
-    public ReagentPrototype? Reagent;
-
-    public ReactionMethod? Method;
-
-    public FixedPoint2 Scale;
-
-    public EntityEffectReagentArgs(EntityUid targetEntity, IEntityManager entityManager, EntityUid? organEntity, Solution? source, FixedPoint2 quantity, ReagentPrototype? reagent, ReactionMethod? method, FixedPoint2 scale) : base(targetEntity, entityManager)
-    {
-        OrganEntity = organEntity;
-        Source = source;
-        Quantity = quantity;
-        Reagent = reagent;
-        Method = method;
-        Scale = scale;
-    }
-}
diff --git a/Content.Shared/EntityEffects/EntityEffectCondition.cs b/Content.Shared/EntityEffects/EntityEffectCondition.cs
deleted file mode 100644
index 4c27b1e6ed..0000000000
--- a/Content.Shared/EntityEffects/EntityEffectCondition.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Text.Json.Serialization;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects;
-
-[ImplicitDataDefinitionForInheritors]
-[MeansImplicitUse]
-public abstract partial class EntityEffectCondition
-{
-    [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
-
-    public abstract bool Condition(EntityEffectBaseArgs args);
-
-    /// <summary>
-    /// Effect explanations are of the form "[chance to] [action] when [condition] and [condition]"
-    /// </summary>
-    /// <param name="prototype"></param>
-    /// <returns></returns>
-    public abstract string GuidebookExplanation(IPrototypeManager prototype);
-}
-
-[ByRefEvent]
-public struct CheckEntityEffectConditionEvent<T> where T : EntityEffectCondition
-{
-    public T Condition;
-    public EntityEffectBaseArgs Args;
-    public bool Result;
-}
diff --git a/Content.Shared/EntityEffects/EventEntityEffect.cs b/Content.Shared/EntityEffects/EventEntityEffect.cs
deleted file mode 100644
index 22cd035867..0000000000
--- a/Content.Shared/EntityEffects/EventEntityEffect.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Content.Shared.EntityEffects;
-
-public abstract partial class EventEntityEffect<T> : EntityEffect where T : EntityEffect
-{
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (this is not T type)
-            return;
-        var ev = new ExecuteEntityEffectEvent<T>(type, args);
-        args.EntityManager.EventBus.RaiseEvent(EventSource.Local, ref ev);
-    }
-}
diff --git a/Content.Shared/EntityEffects/EventEntityEffectCondition.cs b/Content.Shared/EntityEffects/EventEntityEffectCondition.cs
deleted file mode 100644
index f36b1771b2..0000000000
--- a/Content.Shared/EntityEffects/EventEntityEffectCondition.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Content.Shared.EntityEffects;
-
-public abstract partial class EventEntityEffectCondition<T> : EntityEffectCondition where T : EventEntityEffectCondition<T>
-{
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (this is not T type)
-            return false;
-
-        var evt = new CheckEntityEffectConditionEvent<T> { Condition = type, Args = args };
-        args.EntityManager.EventBus.RaiseEvent(EventSource.Local, ref evt);
-        return evt.Result;
-    }
-}
diff --git a/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs
new file mode 100644
index 0000000000..6245fc0827
--- /dev/null
+++ b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs
@@ -0,0 +1,251 @@
+using System.Linq;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Database;
+using Content.Shared.EntityConditions;
+using Content.Shared.Localizations;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.EntityEffects;
+
+/// <summary>
+/// This handles entity effects.
+/// Specifically it handles the receiving of events for causing entity effects, and provides
+/// public API for other systems to take advantage of entity effects.
+/// </summary>
+public sealed partial class SharedEntityEffectsSystem : EntitySystem, IEntityEffectRaiser
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
+    [Dependency] private readonly SharedEntityConditionsSystem _condition = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ReactiveComponent, ReactionEntityEvent>(OnReactive);
+    }
+
+    private void OnReactive(Entity<ReactiveComponent> entity, ref ReactionEntityEvent args)
+    {
+        if (args.Reagent.ReactiveEffects == null || entity.Comp.ReactiveGroups == null)
+            return;
+
+        var scale = args.ReagentQuantity.Quantity.Float();
+
+        foreach (var (key, val) in args.Reagent.ReactiveEffects)
+        {
+            if (!val.Methods.Contains(args.Method))
+                continue;
+
+            if (!entity.Comp.ReactiveGroups.TryGetValue(key, out var group))
+                continue;
+
+            if (!group.Contains(args.Method))
+                continue;
+
+            ApplyEffects(entity, val.Effects, scale);
+        }
+
+        if (entity.Comp.Reactions == null)
+            return;
+
+        foreach (var entry in entity.Comp.Reactions)
+        {
+            if (!entry.Methods.Contains(args.Method))
+                continue;
+
+            if (entry.Reagents == null || entry.Reagents.Contains(args.Reagent.ID))
+                ApplyEffects(entity, entry.Effects, scale);
+        }
+    }
+
+    /// <summary>
+    /// Applies a list of entity effects to a target entity.
+    /// </summary>
+    /// <param name="target">Entity being targeted by the effects</param>
+    /// <param name="effects">Effects we're applying to the entity</param>
+    /// <param name="scale">Optional scale multiplier for the effects</param>
+    public void ApplyEffects(EntityUid target, EntityEffect[] effects, float scale = 1f)
+    {
+        // do all effects, if conditions apply
+        foreach (var effect in effects)
+        {
+            TryApplyEffect(target, effect, scale);
+        }
+    }
+
+    /// <summary>
+    /// Applies an entity effect to a target if all conditions pass.
+    /// </summary>
+    /// <param name="target">Target we're applying an effect to</param>
+    /// <param name="effect">Effect we're applying</param>
+    /// <param name="scale">Optional scale multiplier for the effect. Not all </param>
+    /// <returns>True if all conditions pass!</returns>
+    public bool TryApplyEffect(EntityUid target, EntityEffect effect, float scale = 1f)
+    {
+        if (scale < effect.MinScale)
+            return false;
+
+        // TODO: Replace with proper random prediciton when it exists.
+        if (effect.Probability <= 1f)
+        {
+            var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(target).Id, 0 });
+            var rand = new System.Random(seed);
+            if (!rand.Prob(effect.Probability))
+                return false;
+        }
+
+        // See if conditions apply
+        if (!_condition.TryConditions(target, effect.Conditions))
+            return false;
+
+        ApplyEffect(target, effect, scale);
+        return true;
+    }
+
+    /// <summary>
+    /// Applies an <see cref="EntityEffect"/> to a given target.
+    /// This doesn't check conditions so you should only call this if you know what you're doing!
+    /// </summary>
+    /// <param name="target">Target we're applying an effect to</param>
+    /// <param name="effect">Effect we're applying</param>
+    /// <param name="scale">Optional scale multiplier for the effect. Not all </param>
+    public void ApplyEffect(EntityUid target, EntityEffect effect, float scale = 1f)
+    {
+        // Clamp the scale if the effect doesn't allow scaling.
+        if (!effect.Scaling)
+            scale = Math.Min(scale, 1f);
+
+        if (effect.ShouldLog)
+        {
+            _adminLog.Add(
+                LogType.EntityEffect,
+                effect.LogImpact,
+                $"Entity effect {effect.GetType().Name:effect}"
+                + $" applied on entity {target:entity}"
+                + $" at {Transform(target).Coordinates:coordinates}"
+                + $" with a scale multiplier of {scale}"
+            );
+        }
+
+        effect.RaiseEvent(target, this, scale);
+    }
+
+    /// <summary>
+    /// Raises an effect to an entity. You should not be calling this unless you know what you're doing.
+    /// </summary>
+    public void RaiseEffectEvent<T>(EntityUid target, T effect, float scale) where T : EntityEffectBase<T>
+    {
+        var effectEv = new EntityEffectEvent<T>(effect, scale);
+        RaiseLocalEvent(target, ref effectEv);
+    }
+}
+
+/// <summary>
+/// This is a basic abstract entity effect containing all the data an entity effect needs to affect entities with effects...
+/// </summary>
+/// <typeparam name="T">The Component that is required for the effect</typeparam>
+/// <typeparam name="TEffect">The Entity Effect itself</typeparam>
+public abstract partial class EntityEffectSystem<T, TEffect> : EntitySystem where T : Component where TEffect : EntityEffectBase<TEffect>
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<T, EntityEffectEvent<TEffect>>(Effect);
+    }
+
+    protected abstract void Effect(Entity<T> entity, ref EntityEffectEvent<TEffect> args);
+}
+
+/// <summary>
+/// Used to raise an EntityEffect without losing the type of effect.
+/// </summary>
+public interface IEntityEffectRaiser
+{
+    void RaiseEffectEvent<T>(EntityUid target, T effect, float scale) where T : EntityEffectBase<T>;
+}
+
+/// <summary>
+/// Used to store an <see cref="EntityEffect"/> so it can be raised without losing the type of the condition.
+/// </summary>
+/// <typeparam name="T">The Condition wer are raising.</typeparam>
+public abstract partial class EntityEffectBase<T> : EntityEffect where T : EntityEffectBase<T>
+{
+    public override void RaiseEvent(EntityUid target, IEntityEffectRaiser raiser, float scale)
+    {
+        if (this is not T type)
+            return;
+
+        raiser.RaiseEffectEvent(target, type, scale);
+    }
+}
+
+/// <summary>
+/// A basic instantaneous effect which can be applied to an entity via events.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+public abstract partial class EntityEffect
+{
+    public abstract void RaiseEvent(EntityUid target, IEntityEffectRaiser raiser, float scale);
+
+    [DataField]
+    public EntityCondition[]? Conditions;
+
+    /// <summary>
+    /// If our scale is less than this value, the effect fails.
+    /// </summary>
+    [DataField]
+    public virtual float MinScale { get; private set; }
+
+    /// <summary>
+    /// If true, then it allows the scale multiplier to go above 1.
+    /// </summary>
+    [DataField]
+    public virtual bool Scaling { get; private set; }
+
+    // TODO: This should be an entity condition but guidebook relies on it heavily for formatting...
+    /// <summary>
+    /// Probability of the effect occuring.
+    /// </summary>
+    [DataField]
+    public float Probability = 1.0f;
+
+    /// <summary>
+    /// The description of this entity effect that shows in guidebooks.
+    /// </summary>
+    public virtual string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
+
+    /// <summary>
+    /// Whether this effect should be logged in admin logs.
+    /// </summary>
+    [ViewVariables]
+    public virtual bool ShouldLog => true;
+
+    /// <summary>
+    /// If this effect is logged, how important is the log?
+    /// </summary>
+    [ViewVariables]
+    public virtual LogImpact LogImpact => LogImpact.Low;
+}
+
+/// <summary>
+/// An Event carrying an entity effect.
+/// </summary>
+/// <param name="Effect">The Effect</param>
+/// <param name="Scale">A strength scalar for the effect, defaults to 1 and typically only goes under for incomplete reactions.</param>
+[ByRefEvent, Access(typeof(SharedEntityEffectsSystem))]
+public readonly record struct EntityEffectEvent<T>(T Effect, float Scale) where T : EntityEffectBase<T>
+{
+    /// <summary>
+    /// The Condition being raised in this event
+    /// </summary>
+    public readonly T Effect = Effect;
+
+    /// <summary>
+    /// The Scale modifier of this Effect.
+    /// </summary>
+    public readonly float Scale = Scale;
+}
diff --git a/Content.Shared/Movement/Systems/MovementModStatusSystem.cs b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
index 99ac22e330..a56ff9e683 100644
--- a/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
+++ b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
@@ -19,6 +19,7 @@ namespace Content.Shared.Movement.Systems;
 /// </remarks>
 public sealed class MovementModStatusSystem : EntitySystem
 {
+    public static readonly EntProtoId ReagentSpeed = "ReagentSpeedStatusEffect";
     public static readonly EntProtoId VomitingSlowdown = "VomitingSlowdownStatusEffect";
     public static readonly EntProtoId TaserSlowdown = "TaserSlowdownStatusEffect";
     public static readonly EntProtoId FlashSlowdown = "FlashSlowdownStatusEffect";
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
index 990c8105c5..086349454c 100644
--- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
@@ -1,9 +1,8 @@
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects.Effects;
+using Content.Shared.EntityEffects.Effects.Body;
 using Content.Shared.FixedPoint;
 using Content.Shared.Inventory;
 using Content.Shared.Nutrition.Components;
@@ -228,7 +227,7 @@ public sealed partial class IngestionSystem
                     // ignores any effect conditions, just cares about how much it can hydrate
                     if (effect is SatiateHunger hunger)
                     {
-                        total += hunger.NutritionFactor * quantity.Quantity.Float();
+                        total += hunger.Factor * quantity.Quantity.Float();
                     }
                 }
             }
@@ -279,7 +278,7 @@ public sealed partial class IngestionSystem
                     // ignores any effect conditions, just cares about how much it can hydrate
                     if (effect is SatiateThirst thirst)
                     {
-                        total += thirst.HydrationFactor * quantity.Quantity.Float();
+                        total += thirst.Factor * quantity.Quantity.Float();
                     }
                 }
             }
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
index 905ad98c6c..0d153ecfaa 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
@@ -1,6 +1,9 @@
+using System.ComponentModel.Design;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.StatusEffectNew.Components;
 using Robust.Shared.Prototypes;
+using YamlDotNet.Core.Tokens;
 
 namespace Content.Shared.StatusEffectNew;
 
@@ -291,6 +294,21 @@ public sealed partial class StatusEffectsSystem
         return false;
     }
 
+    /// <summary>
+    /// A method which specifically removes time from a status effect, or removes the status effect if time is null.
+    /// </summary>
+    /// <param name="uid">The target entity on which the effect is applied.</param>
+    /// <param name="effectProto">The prototype ID of the status effect to modify.</param>
+    /// <param name="time">
+    /// The time adjustment to apply to the status effect. Positive values extend the duration,
+    /// while negative values reduce it.
+    /// </param>
+    /// <returns> True if duration was edited successfully, false otherwise.</returns>
+    public bool TryRemoveTime(EntityUid uid, EntProtoId effectProto, TimeSpan? time)
+    {
+        return time == null ? TryRemoveStatusEffect(uid, effectProto) : TryAddTime(uid, effectProto, time.Value);
+    }
+
     /// <summary>
     /// Attempts to set the remaining time for a status effect on an entity.
     /// </summary>
diff --git a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
index f484bd012e..ae8f970623 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
@@ -95,7 +95,7 @@ public abstract partial class SharedStunSystem
 
     private void OnRejuvenate(Entity<KnockedDownComponent> entity, ref RejuvenateEvent args)
     {
-        SetKnockdownNextUpdate((entity, entity), GameTiming.CurTime);
+        SetKnockdownNextUpdate(entity, GameTiming.CurTime);
 
         if (entity.Comp.AutoStand)
             RemComp<KnockedDownComponent>(entity);
@@ -166,7 +166,7 @@ public abstract partial class SharedStunSystem
         if (!Resolve(entity, ref entity.Comp, false))
             return;
 
-        SetKnockdownNextUpdate(entity, GameTiming.CurTime + time);
+        SetKnockdownNextUpdate((entity, entity.Comp), GameTiming.CurTime + time);
     }
 
     /// <summary>
@@ -227,11 +227,8 @@ public abstract partial class SharedStunSystem
     /// </summary>
     /// <param name="entity">Entity whose timer we're updating</param>
     /// <param name="time">The exact time we're setting the next update to.</param>
-    private void SetKnockdownNextUpdate(Entity<KnockedDownComponent?> entity, TimeSpan time)
+    private void SetKnockdownNextUpdate(Entity<KnockedDownComponent> entity, TimeSpan time)
     {
-        if (!Resolve(entity, ref entity.Comp, false))
-            return;
-
         if (GameTiming.CurTime > time)
             time = GameTiming.CurTime;
 
diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index dcf9ee4f60..8bb5949c23 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -288,9 +288,12 @@ public abstract partial class SharedStunSystem : EntitySystem
         }
     }
 
-    public bool TryAddParalyzeDuration(EntityUid uid, TimeSpan duration)
+    public bool TryAddParalyzeDuration(EntityUid uid, TimeSpan? duration)
     {
-        if (!_status.TryAddStatusEffectDuration(uid, StunId, duration))
+        if (duration == null)
+            return TryUpdateParalyzeDuration(uid, duration);
+
+        if (!_status.TryAddStatusEffectDuration(uid, StunId, duration.Value))
             return false;
 
         // We can't exit knockdown when we're stunned, so this prevents knockdown lasting longer than the stun.
diff --git a/Content.Server/Temperature/Components/TemperatureComponent.cs b/Content.Shared/Temperature/Components/TemperatureComponent.cs
similarity index 98%
rename from Content.Server/Temperature/Components/TemperatureComponent.cs
rename to Content.Shared/Temperature/Components/TemperatureComponent.cs
index ae2c373b14..b73d1f77d1 100644
--- a/Content.Server/Temperature/Components/TemperatureComponent.cs
+++ b/Content.Shared/Temperature/Components/TemperatureComponent.cs
@@ -4,7 +4,7 @@ using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Temperature.Components;
+namespace Content.Shared.Temperature.Components;
 
 /// <summary>
 /// Handles changing temperature,
diff --git a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
index efea2df5af..9561c6dfe1 100644
--- a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
+++ b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
@@ -1,7 +1,9 @@
 using System.Linq;
+using Content.Shared.Atmos;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Temperature.Components;
+using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Temperature.Systems;
@@ -9,7 +11,7 @@ namespace Content.Shared.Temperature.Systems;
 /// <summary>
 /// This handles predicting temperature based speedup.
 /// </summary>
-public sealed class SharedTemperatureSystem : EntitySystem
+public abstract class SharedTemperatureSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
@@ -77,4 +79,19 @@ public sealed class SharedTemperatureSystem : EntitySystem
             Dirty(uid, temp);
         }
     }
+
+    public virtual void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false, TemperatureComponent? temperature = null)
+    {
+
+    }
+
+    public float GetHeatCapacity(EntityUid uid, TemperatureComponent? comp = null, PhysicsComponent? physics = null)
+    {
+        if (!Resolve(uid, ref comp) || !Resolve(uid, ref physics, false) || physics.FixturesMass <= 0)
+        {
+            return Atmospherics.MinimumHeatCapacity;
+        }
+
+        return comp.SpecificHeat * physics.FixturesMass;
+    }
 }
diff --git a/Content.Server/Zombies/IncurableZombieComponent.cs b/Content.Shared/Zombies/IncurableZombieComponent.cs
similarity index 77%
rename from Content.Server/Zombies/IncurableZombieComponent.cs
rename to Content.Shared/Zombies/IncurableZombieComponent.cs
index 375b814b51..2d54950291 100644
--- a/Content.Server/Zombies/IncurableZombieComponent.cs
+++ b/Content.Shared/Zombies/IncurableZombieComponent.cs
@@ -1,10 +1,11 @@
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Zombies;
+namespace Content.Shared.Zombies;
 
 /// <summary>
 /// This is used for a zombie that cannot be cured by any methods. Gives a succumb to zombie infection action.
 /// </summary>
+/// <remarks> We don't network this component for anti-cheat purposes.</remarks>
 [RegisterComponent]
 public sealed partial class IncurableZombieComponent : Component
 {
diff --git a/Resources/Locale/en-US/guidebook/chemistry/core.ftl b/Resources/Locale/en-US/guidebook/chemistry/core.ftl
index 2ffb0b2be2..bcb3250db6 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/core.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/core.ftl
@@ -1,5 +1,8 @@
 guidebook-reagent-effect-description =
-    {$chance ->
+    {$quantity ->
+        [0] {""}
+        *[other] If there is at least {$quantity}u {$reagent},{" "}
+    }{$chance ->
         [1] { $effect }
         *[other] Has a { NATURALPERCENT($chance, 2) } chance to { $effect }
     }{ $conditionCount ->
diff --git a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl b/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
deleted file mode 100644
index 33793048c6..0000000000
--- a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-reagent-effect-status-effect-Stun = stunning
-reagent-effect-status-effect-KnockedDown = knockdown
-reagent-effect-status-effect-Jitter = jittering
-reagent-effect-status-effect-TemporaryBlindness = blindness
-reagent-effect-status-effect-SeeingRainbows = hallucinations
-reagent-effect-status-effect-Muted = inability to speak
-reagent-effect-status-effect-Stutter = stuttering
-reagent-effect-status-effect-ForcedSleep = unconsciousness
-reagent-effect-status-effect-Drunk = drunkenness
-reagent-effect-status-effect-PressureImmunity = pressure immunity
-reagent-effect-status-effect-Pacified = combat pacification
-reagent-effect-status-effect-RatvarianLanguage = ratvarian language patterns
-reagent-effect-status-effect-StaminaModifier = modified stamina
-reagent-effect-status-effect-RadiationProtection = radiation protection
-reagent-effect-status-effect-Drowsiness = drowsiness
-reagent-effect-status-effect-Adrenaline = adrenaline
diff --git a/Resources/Locale/en-US/guidebook/chemistry/conditions.ftl b/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
similarity index 100%
rename from Resources/Locale/en-US/guidebook/chemistry/conditions.ftl
rename to Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
similarity index 71%
rename from Resources/Locale/en-US/guidebook/chemistry/effects.ftl
rename to Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
index 07c908c035..0de71133ca 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
@@ -16,7 +16,7 @@
         *[other] satiate
     }
 
-reagent-effect-guidebook-create-entity-reaction-effect =
+entity-effect-guidebook-spawn-entity =
     { $chance ->
         [1] Creates
         *[other] create
@@ -25,37 +25,37 @@ reagent-effect-guidebook-create-entity-reaction-effect =
         *[other] {$amount} {MAKEPLURAL($entname)}
     }
 
-reagent-effect-guidebook-explosion-reaction-effect =
+entity-effect-guidebook-explosion =
     { $chance ->
         [1] Causes
         *[other] cause
     } an explosion
 
-reagent-effect-guidebook-emp-reaction-effect =
+entity-effect-guidebook-emp =
     { $chance ->
         [1] Causes
         *[other] cause
     } an electromagnetic pulse
 
-reagent-effect-guidebook-flash-reaction-effect =
+entity-effect-guidebook-flash =
     { $chance ->
         [1] Causes
         *[other] cause
     } a blinding flash
 
-reagent-effect-guidebook-foam-area-reaction-effect =
+entity-effect-guidebook-foam-area =
     { $chance ->
         [1] Creates
         *[other] create
     } large quantities of foam
 
-reagent-effect-guidebook-smoke-area-reaction-effect =
+entity-effect-guidebook-smoke-area =
     { $chance ->
         [1] Creates
         *[other] create
     } large quantities of smoke
 
-reagent-effect-guidebook-satiate-thirst =
+entity-effect-guidebook-satiate-thirst =
     { $chance ->
         [1] Satiates
         *[other] satiate
@@ -64,7 +64,7 @@ reagent-effect-guidebook-satiate-thirst =
         *[other] thirst at {NATURALFIXED($relative, 3)}x the average rate
     }
 
-reagent-effect-guidebook-satiate-hunger =
+entity-effect-guidebook-satiate-hunger =
     { $chance ->
         [1] Satiates
         *[other] satiate
@@ -73,7 +73,7 @@ reagent-effect-guidebook-satiate-hunger =
         *[other] hunger at {NATURALFIXED($relative, 3)}x the average rate
     }
 
-reagent-effect-guidebook-health-change =
+entity-effect-guidebook-health-change =
     { $chance ->
         [1] { $healsordeals ->
                 [heals] Heals
@@ -87,7 +87,7 @@ reagent-effect-guidebook-health-change =
                  }
     } { $changes }
 
-reagent-effect-guidebook-even-health-change =
+entity-effect-guidebook-even-health-change =
     { $chance ->
         [1] { $healsordeals ->
             [heals] Evenly heals
@@ -101,44 +101,73 @@ reagent-effect-guidebook-even-health-change =
         }
     } { $changes }
 
-
-reagent-effect-guidebook-status-effect =
+entity-effect-guidebook-status-effect-old =
     { $type ->
         [update]{ $chance ->
                     [1] Causes
-                    *[other] cause
-                } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
+                     *[other] cause
+                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
         [add]   { $chance ->
                     [1] Causes
                     *[other] cause
                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} with accumulation
-        *[set]  { $chance ->
+        [set]  { $chance ->
                     [1] Causes
                     *[other] cause
-                } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
-        [remove]{ $chance ->
+                } {LOC($key)} for {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
+        *[remove]{ $chance ->
                     [1] Removes
                     *[other] remove
                 } {NATURALFIXED($time, 3)} {MANY("second", $time)} of {LOC($key)}
     }
 
-reagent-effect-guidebook-status-effect-delay =
+entity-effect-guidebook-status-effect =
     { $type ->
+        [update]{ $chance ->
+                    [1] Causes
+                    *[other] cause
+                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
         [add]   { $chance ->
                     [1] Causes
                     *[other] cause
                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} with accumulation
-        *[set]  { $chance ->
+        [set]  { $chance ->
                     [1] Causes
                     *[other] cause
                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
-        [remove]{ $chance ->
+        *[remove]{ $chance ->
                     [1] Removes
                     *[other] remove
                 } {NATURALFIXED($time, 3)} {MANY("second", $time)} of {LOC($key)}
-    } after a {NATURALFIXED($delay, 3)} second delay
+    } { $delay ->
+        [0] immediately
+        *[other] after a {NATURALFIXED($delay, 3)} second delay
+    }
 
-reagent-effect-guidebook-knockdown =
+entity-effect-guidebook-status-effect-indef =
+    { $type ->
+        [update]{ $chance ->
+                    [1] Causes
+                    *[other] cause
+                 } permanent {LOC($key)}
+        [add]   { $chance ->
+                    [1] Causes
+                    *[other] cause
+                } permanent {LOC($key)}
+        [set]  { $chance ->
+                    [1] Causes
+                    *[other] cause
+                } permanent {LOC($key)}
+        *[remove]{ $chance ->
+                    [1] Removes
+                    *[other] remove
+                } {LOC($key)}
+    } { $delay ->
+        [0] immediately
+        *[other] after a {NATURALFIXED($delay, 3)} second delay
+    }
+
+entity-effect-guidebook-knockdown =
     { $type ->
         [update]{ $chance ->
                     [1] Causes
@@ -158,13 +187,13 @@ reagent-effect-guidebook-knockdown =
                 } {NATURALFIXED($time, 3)} {MANY("second", $time)} of knockdown
     }
 
-reagent-effect-guidebook-set-solution-temperature-effect =
+entity-effect-guidebook-set-solution-temperature-effect =
     { $chance ->
         [1] Sets
         *[other] set
     } the solution temperature to exactly {NATURALFIXED($temperature, 2)}k
 
-reagent-effect-guidebook-adjust-solution-temperature-effect =
+entity-effect-guidebook-adjust-solution-temperature-effect =
     { $chance ->
         [1] { $deltasign ->
                 [1] Adds
@@ -180,7 +209,7 @@ reagent-effect-guidebook-adjust-solution-temperature-effect =
                 *[-1] at least {NATURALFIXED($mintemp, 2)}k
             }
 
-reagent-effect-guidebook-adjust-reagent-reagent =
+entity-effect-guidebook-adjust-reagent-reagent =
     { $chance ->
         [1] { $deltasign ->
                 [1] Adds
@@ -196,7 +225,7 @@ reagent-effect-guidebook-adjust-reagent-reagent =
         *[-1] from
     } the solution
 
-reagent-effect-guidebook-adjust-reagent-group =
+entity-effect-guidebook-adjust-reagent-group =
     { $chance ->
         [1] { $deltasign ->
                 [1] Adds
@@ -212,7 +241,7 @@ reagent-effect-guidebook-adjust-reagent-group =
             *[-1] from
         } the solution
 
-reagent-effect-guidebook-adjust-temperature =
+entity-effect-guidebook-adjust-temperature =
     { $chance ->
         [1] { $deltasign ->
                 [1] Adds
@@ -228,37 +257,37 @@ reagent-effect-guidebook-adjust-temperature =
             *[-1] from
         } the body it's in
 
-reagent-effect-guidebook-chem-cause-disease =
+entity-effect-guidebook-chem-cause-disease =
     { $chance ->
         [1] Causes
         *[other] cause
     } the disease { $disease }
 
-reagent-effect-guidebook-chem-cause-random-disease =
+entity-effect-guidebook-chem-cause-random-disease =
     { $chance ->
         [1] Causes
         *[other] cause
     } the diseases { $diseases }
 
-reagent-effect-guidebook-jittering =
+entity-effect-guidebook-jittering =
     { $chance ->
         [1] Causes
         *[other] cause
     } jittering
 
-reagent-effect-guidebook-chem-clean-bloodstream =
+entity-effect-guidebook-clean-bloodstream =
     { $chance ->
         [1] Cleanses
         *[other] cleanse
     } the bloodstream of other chemicals
 
-reagent-effect-guidebook-cure-disease =
+entity-effect-guidebook-cure-disease =
     { $chance ->
         [1] Cures
         *[other] cure
     } diseases
 
-reagent-effect-guidebook-cure-eye-damage =
+entity-effect-guidebook-eye-damage =
     { $chance ->
         [1] { $deltasign ->
                 [1] Deals
@@ -271,13 +300,13 @@ reagent-effect-guidebook-cure-eye-damage =
             }
     } eye damage
 
-reagent-effect-guidebook-chem-vomit =
+entity-effect-guidebook-vomit =
     { $chance ->
         [1] Causes
         *[other] cause
     } vomiting
 
-reagent-effect-guidebook-create-gas =
+entity-effect-guidebook-create-gas =
     { $chance ->
         [1] Creates
         *[other] create
@@ -286,55 +315,55 @@ reagent-effect-guidebook-create-gas =
         *[other] moles
     } of { $gas }
 
-reagent-effect-guidebook-drunk =
+entity-effect-guidebook-drunk =
     { $chance ->
         [1] Causes
         *[other] cause
     } drunkness
 
-reagent-effect-guidebook-electrocute =
+entity-effect-guidebook-electrocute =
     { $chance ->
         [1] Electrocutes
         *[other] electrocute
     } the metabolizer for {NATURALFIXED($time, 3)} {MANY("second", $time)}
 
-reagent-effect-guidebook-emote =
+entity-effect-guidebook-emote =
     { $chance ->
         [1] Will force
         *[other] force
     } the metabolizer to [bold][color=white]{$emote}[/color][/bold]
 
-reagent-effect-guidebook-extinguish-reaction =
+entity-effect-guidebook-extinguish-reaction =
     { $chance ->
         [1] Extinguishes
         *[other] extinguish
     } fire
 
-reagent-effect-guidebook-flammable-reaction =
+entity-effect-guidebook-flammable-reaction =
     { $chance ->
         [1] Increases
         *[other] increase
     } flammability
 
-reagent-effect-guidebook-ignite =
+entity-effect-guidebook-ignite =
     { $chance ->
         [1] Ignites
         *[other] ignite
     } the metabolizer
 
-reagent-effect-guidebook-make-sentient =
+entity-effect-guidebook-make-sentient =
     { $chance ->
         [1] Makes
         *[other] make
     } the metabolizer sentient
 
-reagent-effect-guidebook-make-polymorph =
+entity-effect-guidebook-make-polymorph =
     { $chance ->
         [1] Polymorphs
         *[other] polymorph
     } the metabolizer into a { $entityname }
 
-reagent-effect-guidebook-modify-bleed-amount =
+entity-effect-guidebook-modify-bleed-amount =
     { $chance ->
         [1] { $deltasign ->
                 [1] Induces
@@ -346,7 +375,7 @@ reagent-effect-guidebook-modify-bleed-amount =
                  }
     } bleeding
 
-reagent-effect-guidebook-modify-blood-level =
+entity-effect-guidebook-modify-blood-level =
     { $chance ->
         [1] { $deltasign ->
                 [1] Increases
@@ -358,112 +387,115 @@ reagent-effect-guidebook-modify-blood-level =
                  }
     } blood level
 
-reagent-effect-guidebook-paralyze =
+entity-effect-guidebook-paralyze =
     { $chance ->
         [1] Paralyzes
         *[other] paralyze
     } the metabolizer for at least {NATURALFIXED($time, 3)} {MANY("second", $time)}
 
-reagent-effect-guidebook-movespeed-modifier =
+entity-effect-guidebook-movespeed-modifier =
     { $chance ->
         [1] Modifies
         *[other] modify
-    } movement speed by {NATURALFIXED($walkspeed, 3)}x for at least {NATURALFIXED($time, 3)} {MANY("second", $time)}
+    } movement speed by {NATURALFIXED($sprintspeed, 3)}x for at least {NATURALFIXED($time, 3)} {MANY("second", $time)}
 
-reagent-effect-guidebook-reset-narcolepsy =
+entity-effect-guidebook-reset-narcolepsy =
     { $chance ->
         [1] Temporarily staves
         *[other] temporarily stave
     } off narcolepsy
 
-reagent-effect-guidebook-wash-cream-pie-reaction =
+entity-effect-guidebook-wash-cream-pie-reaction =
     { $chance ->
         [1] Washes
         *[other] wash
     } off cream pie from one's face
 
-reagent-effect-guidebook-cure-zombie-infection =
+entity-effect-guidebook-cure-zombie-infection =
     { $chance ->
         [1] Cures
         *[other] cure
     } an ongoing zombie infection
 
-reagent-effect-guidebook-cause-zombie-infection =
+entity-effect-guidebook-cause-zombie-infection =
     { $chance ->
         [1] Gives
         *[other] give
     } an individual the zombie infection
 
-reagent-effect-guidebook-innoculate-zombie-infection =
+entity-effect-guidebook-innoculate-zombie-infection =
     { $chance ->
         [1] Cures
         *[other] cure
     } an ongoing zombie infection, and provides immunity to future infections
 
-reagent-effect-guidebook-reduce-rotting =
+entity-effect-guidebook-reduce-rotting =
     { $chance ->
         [1] Regenerates
         *[other] regenerate
     } {NATURALFIXED($time, 3)} {MANY("second", $time)} of rotting
 
-reagent-effect-guidebook-area-reaction =
+entity-effect-guidebook-area-reaction =
     { $chance ->
         [1] Causes
         *[other] cause
     } a smoke or foam reaction for {NATURALFIXED($duration, 3)} {MANY("second", $duration)}
 
-reagent-effect-guidebook-add-to-solution-reaction =
+entity-effect-guidebook-add-to-solution-reaction =
     { $chance ->
         [1] Causes
         *[other] cause
-    } chemicals applied to an object to be added to its internal solution container
+    } {$reagent} to be added to its internal solution container
 
-reagent-effect-guidebook-artifact-unlock =
+entity-effect-guidebook-artifact-unlock =
     { $chance ->
         [1] Helps
         *[other] help
         } unlock an alien artifact.
 
-reagent-effect-guidebook-artifact-durability-restore =
+entity-effect-guidebook-artifact-durability-restore =
     Restores {$restored} durability in active alien artifact nodes.
 
-reagent-effect-guidebook-plant-attribute =
+entity-effect-guidebook-plant-attribute =
     { $chance ->
         [1] Adjusts
         *[other] adjust
-    } {$attribute} by [color={$colorName}]{$amount}[/color]
+    } {$attribute} by {$positive ->
+    [true] [color=red]{$amount}[/color]
+    *[false] [color=green]{$amount}[/color]
+    }
 
-reagent-effect-guidebook-plant-cryoxadone =
+entity-effect-guidebook-plant-cryoxadone =
     { $chance ->
         [1] Ages back
         *[other] age back
     } the plant, depending on the plant's age and time to grow
 
-reagent-effect-guidebook-plant-phalanximine =
+entity-effect-guidebook-plant-phalanximine =
     { $chance ->
         [1] Restores
         *[other] restore
     } viability to a plant rendered nonviable by a mutation
 
-reagent-effect-guidebook-plant-diethylamine =
+entity-effect-guidebook-plant-diethylamine =
     { $chance ->
         [1] Increases
         *[other] increase
     } the plant's lifespan and/or base health with 10% chance for each
 
-reagent-effect-guidebook-plant-robust-harvest =
+entity-effect-guidebook-plant-robust-harvest =
     { $chance ->
         [1] Increases
         *[other] increase
     } the plant's potency by {$increase} up to a maximum of {$limit}. Causes the plant to lose its seeds once the potency reaches {$seedlesstreshold}. Trying to add potency over {$limit} may cause decrease in yield at a 10% chance
 
-reagent-effect-guidebook-plant-seeds-add =
+entity-effect-guidebook-plant-seeds-add =
     { $chance ->
         [1] Restores the
         *[other] restore the
     } seeds of the plant
 
-reagent-effect-guidebook-plant-seeds-remove =
+entity-effect-guidebook-plant-seeds-remove =
     { $chance ->
         [1] Removes the
         *[other] remove the
diff --git a/Resources/Locale/en-US/guidebook/chemistry/healthchange.ftl b/Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl
similarity index 100%
rename from Resources/Locale/en-US/guidebook/chemistry/healthchange.ftl
rename to Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl
diff --git a/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl b/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl
new file mode 100644
index 0000000000..435041dc68
--- /dev/null
+++ b/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl
@@ -0,0 +1,16 @@
+entity-effect-status-effect-Stun = stunning
+entity-effect-status-effect-KnockedDown = knockdown
+entity-effect-status-effect-Jitter = jittering
+entity-effect-status-effect-TemporaryBlindness = blindness
+entity-effect-status-effect-SeeingRainbows = hallucinations
+entity-effect-status-effect-Muted = inability to speak
+entity-effect-status-effect-Stutter = stuttering
+entity-effect-status-effect-ForcedSleep = unconsciousness
+entity-effect-status-effect-Drunk = drunkenness
+entity-effect-status-effect-PressureImmunity = pressure immunity
+entity-effect-status-effect-Pacified = combat pacification
+entity-effect-status-effect-RatvarianLanguage = ratvarian language patterns
+entity-effect-status-effect-StaminaModifier = modified stamina
+entity-effect-status-effect-RadiationProtection = radiation protection
+entity-effect-status-effect-Drowsiness = drowsiness
+entity-effect-status-effect-Adrenaline = adrenaline
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index c812140812..ebe8134d1b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1438,7 +1438,7 @@
     - reagents: [ Water, SpaceCleaner ]
       methods: [ Touch ]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
   - type: Crawler
 
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index e5f900b209..dd3fd5d430 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -104,36 +104,36 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           groups:
-            Brute: -0.25
+            Brute: -0.15
     - reagents: [ Blood ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           groups:
-            Brute: -0.5
-            Burn: -0.5
+            Brute: -0.25
+            Burn: -0.25
     - reagents: [ RobustHarvest ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           groups:
-            Brute: -2
-            Burn: -2
+            Brute: -1
+            Burn: -1
     - reagents: [ WeedKiller, PlantBGone ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           types:
-            Heat: 2
+            Heat: 1
   - type: ReplacementAccent
     accent: tomatoKiller
   - type: Item
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index 0eef52266b..a239ede7b0 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -74,15 +74,15 @@
     - reagents: [ Water, SpaceCleaner ]
       methods: [ Touch ]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
     - reagents: [ Water ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           types:
-            Heat: 0.15
+            Heat: 0.05 #Same as slime species
       - !type:PopupMessage
         type: Local
         messages: [ "slime-hurt-by-water-popup" ]
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 039cac3358..785c8939ed 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -512,7 +512,7 @@
       methods: [Touch, Ingestion, Injection]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           types:
             Caustic: 1
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
index 92d118cb26..0624e9670a 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -33,13 +33,13 @@
     - reagents: [Water]
       methods: [Touch]
       effects:
-      - !type:WearableReaction
+      - !type:SpawnEntityInInventory
         slot: head
-        prototypeID: WaterDropletHat
+        entity: WaterDropletHat
     - reagents: [Water, SpaceCleaner]
       methods: [Touch]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
   # Damage (Self)
   - type: Bloodstream
     bloodReagent: CopperBlood
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index d4fecee2ca..d2a8b21a0b 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -118,7 +118,7 @@
     - reagents: [Water, SpaceCleaner]
       methods: [Touch]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
   - type: StatusEffects
     allowed:
     - Electrocution
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index c2939347a8..fa992ded0b 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -43,17 +43,17 @@
     - reagents: [Water, SpaceCleaner]
       methods: [Touch]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
     - reagents: [ PlantBGone ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           types:
-            Blunt: 0.1
-            Slash: 0.1
-            Piercing: 0.15
+            Blunt: 0.05
+            Slash: 0.05
+            Piercing: 0.075
       - !type:PopupMessage
         type: Local
         visualType: Large
@@ -63,10 +63,10 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           types:
-            Poison: 0.25
+            Poison: 0.125
       - !type:PopupMessage
         type: Local
         visualType: Large
diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index d223293862..ca6301b0a4 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -73,7 +73,7 @@
     - reagents: [ Water, SpaceCleaner ]
       methods: [ Touch ]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
     - reagents: [ Milk, MilkGoat, MilkSoy, MilkSpoiled ]
       # add new types of milk to reagents as they appear, oat milk isn't on the list
       # because turns out oat milk has 1/30th the amount of calcium in it compared to the rest
@@ -81,11 +81,11 @@
       methods: [ Touch ]
       effects: # TODO: when magic is around - make a milk transformation to a skeleton monster
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           groups:
-            Burn: -2 # healing obviously up to discussion
-            Brute: -1.5 # these groups are the only 2 possible ways to damage a skeleton
+            Burn: -1 # healing obviously up to discussion
+            Brute: -0.75 # these groups are the only 2 possible ways to damage a skeleton
       - !type:PopupMessage
         type: Local
         visualType: Large
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index 56acf52fb7..9526b490e3 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -82,15 +82,15 @@
     - reagents: [ Water, SpaceCleaner ]
       methods: [ Touch ]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
     - reagents: [ Water ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           types:
-            Heat: 0.1
+            Heat: 0.05
       - !type:PopupMessage
         type: Local
         visualType: Large
diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
index 48670291e6..2e9f231e90 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
@@ -617,7 +617,8 @@
     - reagents: [ Water ]
       methods: [ Touch ]
       effects:
-      - !type:AddToSolutionReaction
+      - !type:AddReagentToSolution
+        reagent: Water
         solution: plushie
   - type: Fixtures
     fixtures:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index 1afe45e5ef..65d507daa5 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -75,7 +75,7 @@
         methods: [Touch]
         effects:
         - !type:HealthChange
-          scaleByQuantity: true
+          scaling: true
           damage:
             types:
               Heat: 0.5
diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
index dd2c73e005..c9a8c2c89b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -16,7 +16,8 @@
     - reagents: [Water]
       methods: [Touch, Ingestion, Injection]
       effects:
-      - !type:AddToSolutionReaction
+      - !type:AddReagentToSolution
+        reagent: Water
         solution: cube
   - type: Rehydratable
   - type: CollisionWake
@@ -186,7 +187,8 @@
     - reagents: [Blood]
       methods: [Touch, Ingestion, Injection]
       effects:
-      - !type:AddToSolutionReaction
+      - !type:AddReagentToSolution
+        reagent: Blood
         solution: cube
   - type: Rehydratable
     catalyst: Blood # blood is fuel
diff --git a/Resources/Prototypes/Entities/StatusEffects/movement.yml b/Resources/Prototypes/Entities/StatusEffects/movement.yml
index 71142af434..07d4faed9c 100644
--- a/Resources/Prototypes/Entities/StatusEffects/movement.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/movement.yml
@@ -8,11 +8,32 @@
     whitelist:
       components:
       - MobState
+      - MovementSpeedModifier
+      requireAll: true
     blacklist:
       tags:
       - SlowImmune
   - type: MovementModStatusEffect
 
+- type: entity
+  parent: MobStatusEffectBase
+  id: StatusEffectSpeed
+  abstract: true
+  name: speed
+  components:
+  - type: StatusEffect
+    whitelist:
+      components:
+      - MobState
+      - MovementSpeedModifier
+      requireAll: true
+  - type: MovementModStatusEffect
+
+- type: entity
+  parent: StatusEffectSpeed
+  id: ReagentSpeedStatusEffect
+  name: reagent speed
+
 - type: entity
   parent: StatusEffectSlowdown
   id: VomitingSlowdownStatusEffect
diff --git a/Resources/Prototypes/Entities/Structures/soil.yml b/Resources/Prototypes/Entities/Structures/soil.yml
index 725ab0c6ff..276b053157 100644
--- a/Resources/Prototypes/Entities/Structures/soil.yml
+++ b/Resources/Prototypes/Entities/Structures/soil.yml
@@ -52,7 +52,8 @@
     - reagents: [Water]
       methods: [Touch, Ingestion, Injection]
       effects:
-      - !type:AddToSolutionReaction
+      - !type:AddReagentToSolution
+        reagent: Water
         solution: soil
   - type: Appearance
   - type: PlantHolderVisuals
diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml
index 10a09116ad..84907318de 100644
--- a/Resources/Prototypes/Entities/Tiles/lava.yml
+++ b/Resources/Prototypes/Entities/Tiles/lava.yml
@@ -17,7 +17,7 @@
         - Catwalk
   - type: TileEntityEffect
     effects:
-    - !type:FlammableReaction
+    - !type:Flammable
       multiplier: 3.75
       multiplierOnExisting: 0.75
     - !type:Ignite
diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
index ade23b6f71..8d1881375b 100644
--- a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
+++ b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
@@ -17,7 +17,7 @@
       - Catwalk
   - type: TileEntityEffect
     effects:
-    - !type:FlammableReaction
+    - !type:Flammable
       multiplier: 3.75
       multiplierOnExisting: 0.75
     - !type:Ignite
diff --git a/Resources/Prototypes/Entities/Tiles/water.yml b/Resources/Prototypes/Entities/Tiles/water.yml
index c488df231b..a4478b5e58 100644
--- a/Resources/Prototypes/Entities/Tiles/water.yml
+++ b/Resources/Prototypes/Entities/Tiles/water.yml
@@ -20,7 +20,7 @@
   - type: SolutionContainerManager
     solutions:
       pool:
-        maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. 
+        maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable.
         reagents:
         - ReagentId: Water
           Quantity: 9999999
@@ -62,4 +62,4 @@
         - Catwalk
   - type: TileEntityEffect
     effects:
-    - !type:ExtinguishReaction
+    - !type:Extinguish
diff --git a/Resources/Prototypes/Hydroponics/randomMutations.yml b/Resources/Prototypes/Hydroponics/randomMutations.yml
index 1120c38f31..2d45601da9 100644
--- a/Resources/Prototypes/Hydroponics/randomMutations.yml
+++ b/Resources/Prototypes/Hydroponics/randomMutations.yml
@@ -21,7 +21,7 @@
     - name: ChangeSpecies
       baseOdds: 0.036
       appliesToProduce: false
-      effect: !type:PlantSpeciesChange
+      effect: !type:PlantMutateSpeciesChange
       persists: false
     - name: Unviable
       baseOdds: 0.109
@@ -175,11 +175,11 @@
     - name: ChangeExudeGasses
       baseOdds: 0.0145
       persists: false
-      effect: !type:PlantMutateExudeGasses
+      effect: !type:PlantMutateExudeGases
     - name: ChangeConsumeGasses
       baseOdds: 0.0036
       persists: false
-      effect: !type:PlantMutateConsumeGasses
+      effect: !type:PlantMutateConsumeGases
     - name: ChangeHarvest
       baseOdds: 0.036
       persists: false
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 9bd5bb195f..f294b5438b 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -30,7 +30,8 @@
       - !type:ModifyStatusEffect
         effectProto: StatusEffectSeeingRainbow
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Absinthe
           min: 10
         type: Add
         time: 5
@@ -41,7 +42,8 @@
         - absinthe-effect-feel-tulips
         probability: 0.02
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Absinthe
           min: 10
 
 - type: reagent
@@ -163,43 +165,46 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ethanol
           min: 15
-        - !type:OrganType
-          type: Dwarf
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Dwarf ]
+          inverted: true
         damage:
           types:
             Poison: 1
       # dwarves take less toxin damage and heal a marginal amount of brute
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ethanol
           min: 15
-        - !type:OrganType
-          type: Dwarf
+        - !type:MetabolizerTypeCondition
+          type: [ Dwarf ]
         damage:
           types:
             Poison: 0.2
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ethanol
           min: 15
-        - !type:OrganType
-          type: Dwarf
+        - !type:MetabolizerTypeCondition
+          type: [ Dwarf ]
         damage:
           groups:
             Brute: -1
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.04
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Ethanol
           min: 12
         # dwarves immune to vomiting from alcohol
-        - !type:OrganType
-          type: Dwarf
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Dwarf ]
+          inverted: true
       - !type:Drunk
         boozePower: 2
 
@@ -2315,9 +2320,10 @@
   metabolisms:
     Drink:
       effects:
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Mayojito
           min: 5
         probability: 0.5
       - !type:HealthChange
@@ -2519,29 +2525,31 @@
         boozePower: 10
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: BacchusBlessing
           min: 6
-        - !type:OrganType
-          type: Dwarf
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Dwarf]
+          inverted: true
         damage:
           types:
             Poison: 2 # TODO: Figure out poison amount. Ethanol does 1, this does 2 but also metabolises almost 3 to 4 times as fast as ethanol. This would be more Liver damage when that time arrives.
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: BacchusBlessing
           min: 6
-        - !type:OrganType
-          type: Dwarf
+        - !type:MetabolizerTypeCondition
+          type: [Dwarf]
         damage:
           types:
             Poison: 0.4 # TODO: Might increase this, even though it's just double of ethanol from 0.2 to 0.4
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.1 #TODO: Tweak vomit probability, maybe make this more violent and poisonous but the body aggressively purges it...
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: BacchusBlessing
           min: 8
-        - !type:OrganType
-          type: Dwarf
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Dwarf]
+          inverted: true
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml b/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
index 6c050a6ca6..1311042949 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
@@ -13,7 +13,7 @@
     Extinguish:
       methods: [ Touch ]
       effects:
-      - !type:ExtinguishReaction
+      - !type:Extinguish
   plantMetabolism:
   - !type:PlantAdjustWater
     amount: 1
@@ -60,7 +60,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:FlammableReaction
+      - !type:Flammable
   tileReactions:
   - !type:FlammableTileReaction
     temperatureMultiplier: 1.35
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 464aa93dbb..6fac8606d9 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -453,12 +453,11 @@
     Gas:
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         conditions:
-        - !type:OrganType
-          type: Slime
-          shouldHave: true
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
         damage:
           types:
             Heat: 3
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index 5ac667ec18..67c0bf1615 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -274,9 +274,9 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Slime]
+          inverted: true
         damage:
           types:
             Poison: 1
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
index c9625c663c..45c826eff9 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
@@ -36,7 +36,7 @@
             Brute: -0.5
             Burn: -0.5
       # Helps you stop bleeding to an extent.
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -0.25
       - !type:SatiateHunger #Numbers are balanced with this in mind + it helps limit how much healing you can get from food
   # Lets plants benefit too
@@ -82,7 +82,7 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:ReagentThreshold #Only satiates when eaten with nutriment
+        - !type:ReagentCondition #Only satiates when eaten with nutriment
           reagent: Nutriment
           min: 0.1
         factor: 1
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
index 6e4114cecf..8813b5bb66 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
@@ -120,9 +120,9 @@
         emote: Cough
         showInGuidebook: true
         conditions:
-        - !type:Breathing
-        - !type:Internals
-          usingInternals: false
+        - !type:BreathingCondition
+        - !type:InternalsCondition
+          inverted: true
 
 - type: reagent
   id: Vinegar
@@ -142,10 +142,11 @@
       - !type:AdjustReagent
         reagent: Vitamin
         amount: 0.1
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.1
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: Vinegar
             min: 6
 
 - type: reagent
@@ -223,7 +224,8 @@
           amount: 250 # thermal energy, not temp
         - !type:HealthChange
           conditions:
-            - !type:ReagentThreshold
+            - !type:ReagentCondition
+              reagent: CapsaicinOil
               min: 5
           damage:
             types:
@@ -247,7 +249,7 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:ReagentThreshold #Only satiates when eaten with nutriment
+        - !type:ReagentCondition #Only satiates when eaten with nutriment
           reagent: Nutriment
           min: 0.1
         factor: 1
@@ -314,7 +316,8 @@
         amount: -250 # thermal energy, not temp
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: FrostOil
           min: 5
         damage:
           types:
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index ca46881a83..dd76a34ee2 100644
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -20,9 +20,9 @@
       - !type:SatiateThirst
         factor: 1.0
         conditions:
-          - !type:OrganType
-            type: Human
-            shouldHave: false
+          - !type:MetabolizerTypeCondition
+            type: [ Human ]
+            inverted: true
     Food:
       effects:
         - !type:AdjustReagent
@@ -32,8 +32,8 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Bloodsucker
+        - !type:MetabolizerTypeCondition
+          type: [ Bloodsucker ]
         damage:
           groups:
             Brute: -3
@@ -148,7 +148,7 @@
         damage:
           types:
             Poison: 4
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.25
 
 - type: reagent
@@ -177,7 +177,7 @@
         damage:
           types:
             Bloodloss: -3
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -1.5
   # Just in case you REALLY want to water your plants
   plantMetabolism:
diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index e96d5be30c..eb5ceba470 100644
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -14,8 +14,8 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
 
 - type: reagent
   id: Left4Zed
@@ -38,15 +38,15 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
       - !type:HealthChange
         damage:
           types:
             Poison: 1
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
 
 - type: reagent
   id: PestKiller
@@ -69,8 +69,8 @@
           types:
             Poison: 3
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
 
 - type: reagent
   id: PlantBGone
@@ -100,8 +100,8 @@
             Slash: 1
             Piercing: 1
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
 
 - type: reagent
   id: RobustHarvest
@@ -132,13 +132,14 @@
             Slash: -3
             Piercing: -3
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Plant
-        - !type:ReagentThreshold
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
+        - !type:ReagentCondition
+          reagent: RobustHarvest
           min: 30
         damage:
           types:
@@ -150,9 +151,10 @@
       - !type:Polymorph
         prototype: TreeMorph
         conditions:
-          - !type:OrganType
-            type: Plant
-          - !type:ReagentThreshold
+          - !type:MetabolizerTypeCondition
+            type: [Plant]
+          - !type:ReagentCondition
+            reagent: RobustHarvest
             min: 80
 
 - type: reagent
@@ -192,8 +194,8 @@
           types:
             Poison: 4
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
 
 - type: reagent
   id: Ammonia
@@ -221,26 +223,23 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Rat
-          shouldHave: false
-        - !type:ReagentThreshold
+        - !type:MetabolizerTypeCondition
+          type: [ Rat ]
+          inverted: true
+        - !type:ReagentCondition
           reagent: Ammonia
           min: 1
         ignoreResistances: true
         damage:
           types:
             Poison: 0.25
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.12
         conditions:
-        - !type:OrganType
-          type: Rat
-          shouldHave: false
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
-        - !type:ReagentThreshold
+        - !type:MetabolizerTypeCondition
+          type: [ Rat, Vox ]
+          inverted: true
+        - !type:ReagentCondition
           reagent: Ammonia
           min: 0.8
       - !type:PopupMessage
@@ -249,28 +248,28 @@
         messages: [ "ammonia-smell" ]
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Ammonia
           min: 0.25
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Rat
-        - !type:ReagentThreshold
+        - !type:MetabolizerTypeCondition
+          type: [ Rat ]
+        - !type:ReagentCondition
           reagent: Ammonia
           min: 1
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         damage:
           groups:
-            Brute: -5
-            Burn: -5
+            Brute: -2.5
+            Burn: -2.5
           types:
             Bloodloss: -5
       - !type:Oxygenate # ammonia displaces nitrogen in vox blood
         conditions:
-        - !type:OrganType
-          type: Vox
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
         factor: -4
 
 
diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml
index 81f4e421bf..7c0f1c8f09 100644
--- a/Resources/Prototypes/Reagents/chemicals.yml
+++ b/Resources/Prototypes/Reagents/chemicals.yml
@@ -41,7 +41,8 @@
         damage:
           types:
             Poison: -1
-      - !type:ChemCleanBloodstream
+      - !type:CleanBloodstream
+        excluded: Charcoal
         cleanseRate: 3
 
 - type: reagent
@@ -94,9 +95,7 @@
       methods: [ Touch ]
       effects:
       - !type:ArtifactUnlock
-        conditions:
-        - !type:ReagentThreshold
-          min: 5
+        minScale: 5
 
 - type: reagent
   parent: Artifexium
@@ -111,9 +110,7 @@
       methods: [ Touch ]
       effects:
       - !type:ArtifactDurabilityRestore
-        conditions:
-        - !type:ReagentThreshold
-          min: 5
+        minScale: 5
 
 - type: reagent
   id: Benzene
@@ -159,9 +156,10 @@
             Heat: 1.5
     Medicine:
       effects:
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: SodiumHydroxide
           min: 5
         probability: 0.1
 
diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml
index 2ebd213fec..c5fe0e4da9 100644
--- a/Resources/Prototypes/Reagents/cleaning.yml
+++ b/Resources/Prototypes/Reagents/cleaning.yml
@@ -57,16 +57,18 @@
   metabolisms:
     Food:
       effects:
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: SoapReagent
           min: 6
         probability: 0.20
     Drink:
       effects:
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: SoapReagent
           min: 6
         probability: 0.20
 
@@ -105,7 +107,7 @@
       methods: [ Touch ]
       effects:
       # pva glue? no, antibiotic glue for sealing wounds
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -1.5
   metabolisms:
     Narcotic:
@@ -119,8 +121,6 @@
       - !type:GenericStatusEffect
         key: Muted
         component: Muted
-        type: Add
         time: 5
-        refresh: false
   footstepSound:
     collection: FootstepSlime
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index 8d317102c1..27e27be503 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -63,9 +63,9 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Arachnid ]
+          inverted: true
         damage:
           types:
             Poison: 0.1
@@ -73,9 +73,8 @@
       effects:
       - !type:ModifyBloodLevel
         conditions:
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: true
+        - !type:MetabolizerTypeCondition
+          type: [ Arachnid ]
         amount: 0.4
 
 - type: reagent
@@ -154,9 +153,8 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: true
+        - !type:MetabolizerTypeCondition
+          type: [ Arachnid ]
         damage:
           types:
             Poison: 0.1
@@ -164,9 +162,9 @@
       effects:
       - !type:ModifyBloodLevel
         conditions:
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Arachnid ]
+          inverted: true
         amount: 0.4
 
 - type: reagent
diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index 2ed57f73b0..0ad3e9af61 100644
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -21,7 +21,7 @@
       # Hail the madman logic, if it has CARP, means it helps against CARPs
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: CarpoToxin
           min: 1
         reagent: CarpoToxin
@@ -39,8 +39,8 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:OrganType
-          type: Moth
+        - !type:MetabolizerTypeCondition
+          type: [ Moth ]
 
 - type: reagent
   id: BuzzochloricBees
@@ -75,11 +75,11 @@
         - "buzzochloricbees-effect-squeaky-clean"
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           max: 0
           reagent: Histamine
-        - !type:HasTag
-          invert: true
+        - !type:TagCondition
+          inverted: true
           tag: Bee
       - !type:PopupMessage
         type: Local
@@ -92,11 +92,11 @@
           - "buzzochloricbees-effect-squeaky-clean"
         probability: 0.05
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           min: 0.01
           reagent: Histamine
-        - !type:HasTag
-          invert: true
+        - !type:TagCondition
+          inverted: true
           tag: Bee
       - !type:PopupMessage
         type: Local
@@ -108,10 +108,10 @@
           - "buzzochloricbees-effect-licoxide-buzzes"
         probability: 0.05
         conditions:
-        - !type:HasTag
-          invert: true
+        - !type:TagCondition
+          inverted: true
           tag: Bee
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           min: 0.01
           reagent: Licoxide
       - !type:PopupMessage
@@ -121,10 +121,10 @@
           - "buzzochloricbees-effect-fiber-soft"
         probability: 0.05
         conditions:
-        - !type:HasTag
-          invert: true
+        - !type:TagCondition
+          inverted: true
           tag: Bee
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           min: 0.01
           reagent: Fiber
       - !type:HealthChange
@@ -133,8 +133,8 @@
             Poison: 2
             Piercing: 2
         conditions:
-        - !type:HasTag
-          invert: true
+        - !type:TagCondition
+          inverted: true
           tag: Bee
 
 - type: reagent
@@ -183,11 +183,11 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: false
         damage:
           types:
-            Slash: 0.5
+            Slash: 0.25
       - !type:Emote
         emote: Scream
         probability: 0.7
@@ -233,20 +233,20 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: false
         damage:
           types:
             Cold: 0.05
       - !type:AdjustTemperature
         conditions:
-        - !type:Temperature
+        - !type:TemperatureCondition
           min: 160.15
         amount: -30000
     Extinguish:
       methods: [ Touch ]
       effects:
-      - !type:ExtinguishReaction # cold
+      - !type:Extinguish # cold
   metabolisms:
     Poison:
       metabolismRate : 0.45
@@ -258,7 +258,7 @@
              Heat: -3 # ghetto burn chem. i don't think anyone would use this intentionally but it's funny
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Fresium
           max: 35
         type: Local
@@ -267,7 +267,7 @@
         probability: 0.05
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Fresium
           max: 35
         type: Local
@@ -276,26 +276,26 @@
         probability: 0.2
       - !type:AdjustTemperature
         conditions:
-        - !type:Temperature
+        - !type:TemperatureCondition
           min: 160.15 # not quite enough for cryo, but can speed it up if you wanna take the risk
         amount: -10000
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Fresium
           max: 40 # slows when less than 40
         walkSpeedModifier: 0.6
         sprintSpeedModifier: 0.6
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Fresium
           min: 40 # your legs stop working when above 40
         walkSpeedModifier: 0.00
         sprintSpeedModifier: 0.00
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Fresium
           min: 40
         type: Local
@@ -347,16 +347,18 @@
       - !type:Polymorph
         prototype: ArtifactLizard # Does the same thing as the original YML I made for this reagent.
         conditions:
-        - !type:OrganType
-          type: Animal
-          shouldHave: false
-        - !type:ReagentThreshold
+        - !type:MetabolizerTypeCondition
+          type: [Animal]
+          inverted: true
+        - !type:ReagentCondition
+          reagent: JuiceThatMakesYouWeh
           min: 50
       - !type:AdjustReagent
         reagent: JuiceThatMakesYouWeh
         amount: -20
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: JuiceThatMakesYouWeh
           min: 50
 
 - type: reagent
@@ -380,16 +382,18 @@
       - !type:Polymorph
         prototype: ArtifactLizard
         conditions:
-        - !type:OrganType
-          type: Animal
-          shouldHave: false
-        - !type:ReagentThreshold
+        - !type:MetabolizerTypeCondition
+          type: [ Animal ]
+          inverted: true
+        - !type:ReagentCondition
+          reagent: JuiceThatMakesYouHew
           min: 50
       - !type:AdjustReagent
         reagent: JuiceThatMakesYouHew
         amount: -20
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: JuiceThatMakesYouHew
           min: 50
 
 - type: reagent
@@ -406,7 +410,8 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: CorgiJuice
           min: 15
         damage:
           types:
@@ -414,11 +419,13 @@
       - !type:Polymorph
         prototype: SmartCorgiMorph
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: CorgiJuice
           min: 50
       - !type:AdjustReagent
         reagent: CorgiJuice
         amount: -20
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: CorgiJuice
           min: 50
diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
index 3d65931f19..6a0b257877 100644
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -11,93 +11,69 @@
     Poison:
       effects:
       - !type:Oxygenate
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Human
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Animal
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Rat
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [ Human, Animal, Rat, Plant ]
       # Convert Oxygen into CO2.
       - !type:ModifyLungGas
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
+          inverted: true
         ratios:
           CarbonDioxide: 1.0
           Oxygen: -1.0
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Vox
-        scaleByQuantity: true
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
+        scaling: true
         ignoreResistances: true
         damage:
           types:
-            Poison:
-              3
+            Poison: 1.5
       - !type:AdjustAlert
         alertType: Toxins
+        minScale: 1
         conditions:
-          - !type:ReagentThreshold
-            min: 0.5
-          - !type:OrganType
-            type: Vox
+          - !type:MetabolizerTypeCondition
+            type: [ Vox ]
         clear: true
         time: 5
     Gas:
       effects:
       - !type:Oxygenate
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Human
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Animal
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Rat
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [ Human, Animal, Rat, Plant ]
       # Convert Oxygen into CO2.
       - !type:ModifyLungGas
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
+          inverted: true
         ratios:
           CarbonDioxide: 1.0
           Oxygen: -1.0
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Vox
-        scaleByQuantity: true
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
+        scaling: true
         ignoreResistances: true
         damage:
           types:
-            Poison:
-              7
+            Poison: 0.7
       - !type:AdjustAlert
         alertType: Toxins
+        minScale: 1
         conditions:
-          - !type:ReagentThreshold
-            min: 0.5
-          - !type:OrganType
-            type: Vox
+          - !type:MetabolizerTypeCondition
+            type: [ Vox ]
         clear: true
         time: 5
 
@@ -120,32 +96,30 @@
       - !type:HealthChange
         damage:
           types:
-            Poison: 3
+            Poison: 1.5
       - !type:AdjustReagent
         reagent: Inaprovaline
         amount: -2.0
     Gas:
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         damage:
           types:
             Poison:
-              1
+              0.1
       # We need a metabolism effect on reagent removal
       - !type:AdjustAlert
         alertType: Toxins
-        conditions:
-          - !type:ReagentThreshold
-            min: 1.5
+        minScale: 3
         clear: True
         time: 5
   reactiveEffects:
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:FlammableReaction
+      - !type:Flammable
 
 - type: reagent
   id: Tritium
@@ -163,7 +137,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.8
   metabolisms:
     Poison:
@@ -171,11 +145,11 @@
       - !type:HealthChange
         damage:
           types:
-            Radiation: 3
+            Radiation: 1.5
     Gas:
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         damage:
           types:
@@ -184,9 +158,7 @@
       # We need a metabolism effect on reagent removal
       - !type:AdjustAlert
         alertType: Toxins
-        conditions:
-          - !type:ReagentThreshold
-            min: 1.5
+        minScale: 3
         clear: True
         time: 5
 
@@ -201,58 +173,55 @@
     Poison:
       effects:
       - !type:Oxygenate
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [ Plant ]
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Plant
-          shouldHave: false
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
-        scaleByQuantity: true
+        - !type:MetabolizerTypeCondition
+          type: [ Plant, Vox ]
+          inverted: true
+        scaling: true
         ignoreResistances: true
         damage:
           types:
             Poison:
-              0.8
+              0.4
       - !type:Oxygenate
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Plant
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Plant ]
+          inverted: true
         factor: -4
     Gas:
       effects:
       - !type:Oxygenate
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [ Plant ]
       - !type:HealthChange
+        minScale: 1
         conditions:
-        - !type:OrganType
-          type: Plant
-          shouldHave: false
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Plant, Vox ]
+          inverted: true
         # Don't want people to get toxin damage from the gas they just
         # exhaled, right?
-        - !type:ReagentThreshold
-          min: 0.5
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         damage:
           types:
             Poison:
               0.8
       - !type:Oxygenate # carbon dioxide displaces oxygen from the bloodstream, causing asphyxiation
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Plant
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Plant ]
+          inverted: true
         factor: -4
       # We need a metabolism effect on reagent removal
       #- !type:AdjustAlert
@@ -273,29 +242,28 @@
       - !type:HealthChange
         damage:
           types:
-            Cold: 1 # liquid nitrogen is cold
+            Cold: 0.5 # liquid nitrogen is cold
     Gas:
       effects:
       - !type:Oxygenate
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Vox
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Slime
-      # Converts Nitrogen into CO2
+        - !type:MetabolizerTypeCondition
+          type: [ Vox, Slime ]
+      # Converts Nitrogen into Ammonia
       - !type:ModifyLungGas
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Vox
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
         ratios:
           Ammonia: 1.0
           Nitrogen: -1.0
       - !type:ModifyLungGas
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Slime
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
         ratios:
           NitrousOxide: 1.0
           Nitrogen: -1.0
@@ -315,72 +283,60 @@
       - !type:HealthChange
         damage:
           types:
-            Poison: 2
+            Poison: 1
     Gas:
       effects:
       - !type:Emote
+        minScale: 1
         conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 0.2
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
         emote: Laugh
         showInChat: true
         probability: 0.1
       - !type:Emote
+        minScale: 0.4
         conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 0.2
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
         emote: Scream
         showInChat: true
         probability: 0.01
       - !type:PopupMessage
+        minScale: 1
         conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 0.5
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
         type: Local
         visualType: Medium
         messages: [ "effect-sleepy" ]
         probability: 0.1
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
+        minScale: 2
         conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 1
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:ModifyStatusEffect
+        minScale: 3.6
         conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 1.8
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
         effectProto: StatusEffectForcedSleeping
         time: 3
         type: Update
       - !type:HealthChange
+        minScale: 7
         conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 3.5
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
         ignoreResistances: true
         damage:
           types:
@@ -403,11 +359,11 @@
     Narcotic:
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         damage:
           types:
-            Cellular: 1
+            Cellular: 0.5
       - !type:ModifyStatusEffect
         effectProto: StatusEffectSeeingRainbow
         type: Add
@@ -418,59 +374,39 @@
         type: Local
         messages: [ "frezon-lungs-cold" ]
         probability: 0.1
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 0.5
+        minScale: 1
       - !type:PopupMessage
         type: Local
         visualType: Medium
         messages: [ "frezon-euphoric" ]
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 1
+        minScale: 2
     Gas:
       effects:
       - !type:HealthChange
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 0.5
-        scaleByQuantity: true
+        minScale: 1
+        scaling: true
         ignoreResistances: true
         damage:
           types:
-            Cellular: 0.5
+            Cellular: 0.05
       - !type:ModifyStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 1
+        minScale: 2
         effectProto: StatusEffectSeeingRainbow
         type: Add
         time: 500
       - !type:Drunk
         boozePower: 500
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 1
+        minScale: 2
       - !type:PopupMessage
         type: Local
         messages: [ "frezon-lungs-cold" ]
         probability: 0.1
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 0.5
+        minScale: 2
       - !type:PopupMessage
         type: Local
         visualType: Medium
         messages: [ "frezon-euphoric" ]
         probability: 0.1
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 1
+        minScale: 2
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 71ae11dad9..d81ec12b3d 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -35,31 +35,36 @@
             Poison: -1
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dylovene
           min: 20
         damage:
           groups:
             Brute: 2
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dylovene
           min: 20
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dylovene
           min: 20
         type: Local
         visualType: Medium
         messages: [ "generic-reagent-effect-nauseous" ]
         probability: 0.2
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dylovene
           min: 20
         probability: 0.02
       - !type:Drunk
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dylovene
           min: 15
   plantMetabolism:
   - !type:PlantAdjustToxins
@@ -148,20 +153,23 @@
           Brute: -1.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Bicaridine
           min: 15
         damage:
           types:
             Asphyxiation: 0.5
             Poison: 1.5
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Bicaridine
           min: 30
         probability: 0.02
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Bicaridine
           min: 15
       - !type:Drunk
 
@@ -184,7 +192,7 @@
       effects:
         - !type:HealthChange
           conditions:
-          - !type:Temperature
+          - !type:TemperatureCondition
             # this is a little arbitrary but they gotta be pretty cold
             max: 213.0
           damage:
@@ -208,7 +216,7 @@
       effects:
         - !type:HealthChange
           conditions:
-          - !type:Temperature
+          - !type:TemperatureCondition
             max: 213.0
           damage:
             types:
@@ -233,7 +241,8 @@
             Cold: -1.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dermaline
           min: 10
         damage:
           types:
@@ -243,7 +252,8 @@
             Brute: 0.5
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dermaline
           min: 10
 
 - type: reagent
@@ -264,7 +274,8 @@
             Bloodloss: -0.5
       - !type:HealthChange
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: Dexalin
             min: 20
         damage:
           types:
@@ -289,14 +300,15 @@
             Bloodloss: -3
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: HeartbreakerToxin
           min: 1
         reagent: HeartbreakerToxin
         amount: -3
       - !type:HealthChange
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: DexalinPlus
             min: 25
         damage:
           types:
@@ -317,7 +329,7 @@
       effects:
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Histamine
           min: 45
         reagent: Histamine
@@ -327,8 +339,8 @@
           # they gotta be in crit first
         - !type:MobStateCondition
           mobstate: Critical
-        - !type:ReagentThreshold
-          min: 0
+        - !type:ReagentCondition
+          reagent: Epinephrine
           max: 20
         damage:
           types:
@@ -339,7 +351,8 @@
             Burn: -0.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Epinephrine
           min: 20
         damage:
           types:
@@ -350,7 +363,7 @@
         amount: -2
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: HeartbreakerToxin
           min: 1
         reagent: Epinephrine
@@ -358,7 +371,7 @@
       - !type:AdjustReagent
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: HeartbreakerToxin
           min: 1
         reagent: Histamine
@@ -390,18 +403,20 @@
         damage:
           types:
             Radiation: -1
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.02
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Hyronalin
           min: 30
         damage:
           types:
            Heat: 2
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Hyronalin
           min: 30
 
 - type: reagent
@@ -417,9 +432,10 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ipecac
           min: 4
         probability: 0.3
 
@@ -443,7 +459,7 @@
         damage:
           types:
             Asphyxiation: -2
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -0.25
 
 - type: reagent
@@ -466,7 +482,8 @@
       - !type:SatiateThirst
         factor: -10
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Kelotane
           min: 30
       - !type:PopupMessage
         type: Local
@@ -476,7 +493,8 @@
         - generic-reagent-effect-parched
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Kelotane
           min: 25
 
 - type: reagent
@@ -496,12 +514,12 @@
             Cold: -4
       - !type:AdjustTemperature
         conditions:
-        - !type:Temperature
+        - !type:TemperatureCondition
           max: 293.15
         amount: 100000 # thermal energy, not temperature!
       - !type:AdjustTemperature
         conditions:
-        - !type:Temperature
+        - !type:TemperatureCondition
           min: 293.15
         amount: -10000
       - !type:PopupMessage
@@ -531,15 +549,17 @@
             Heat: 0.5
       - !type:HealthChange
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: Barozine
             min: 30
         damage:
           types:
             Poison: 3
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.15
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: Barozine
             min: 30
       - !type:GenericStatusEffect
         key: PressureImmunity
@@ -570,7 +590,8 @@
       amount: 6
     - !type:PlantPhalanximine
       conditions:
-      - !type:ReagentThreshold
+      - !type:ReagentCondition
+        reagent: Phalanximine
         min: 4
   metabolisms:
     Medicine:
@@ -584,14 +605,15 @@
             Caustic: 0.15
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Phalanximine
           min: 11
         damage:
           types:
             Radiation: 0.2
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Arithrazine
           min: 1
         damage:
@@ -617,12 +639,13 @@
             Asphyxiation: -2.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: PolypyryliumOligomers
           min: 30
         damage:
           types:
             Asphyxiation: 3.5
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -0.25
 
 - type: reagent
@@ -638,7 +661,8 @@
       effects:
         - !type:CureZombieInfection
           conditions:
-            - !type:ReagentThreshold
+            - !type:ReagentCondition
+              reagent: Ambuzol
               min: 10
 
 - type: reagent
@@ -655,7 +679,8 @@
         - !type:CureZombieInfection
           innoculate: true
           conditions:
-            - !type:ReagentThreshold
+            - !type:ReagentCondition
+              reagent: AmbuzolPlus
               min: 5
 
 - type: reagent
@@ -669,7 +694,7 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -0.5
 
 - type: reagent
@@ -721,7 +746,7 @@
             Poison: -4
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Amatoxin
           min: 1
         reagent: Amatoxin
@@ -767,11 +792,12 @@
       effects:
       # Medium-large quantities can hurt you instead,
       # but still technically stop your bleeding.
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -1.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: TranexamicAcid
           min: 15
         damage:
           types:
@@ -790,7 +816,7 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:TotalDamage
+        - !type:TotalDamageCondition
           max: 50
         damage:
           groups:
@@ -850,14 +876,16 @@
       effects:
       - !type:EvenHealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ultravasculine
           min: 0
           max: 20
         damage:
           Toxin: -6
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ultravasculine
           min: 0
           max: 20
         damage:
@@ -865,27 +893,29 @@
             Brute: 1.5
       - !type:EvenHealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ultravasculine
           min: 20
         damage:
           Toxin: -2
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ultravasculine
           min: 20
         damage:
           groups:
             Brute: 6
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Histamine
           min: 1
         reagent: Histamine
         amount: -1
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Histamine
           min: 1
         reagent: Ultravasculine
@@ -902,7 +932,7 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:ChemHealEyeDamage
+      - !type:EyeDamage
 
 - type: reagent
   id: Cognizine
@@ -917,7 +947,8 @@
       effects:
       - !type:MakeSentient
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Cognizine
           min: 5
 
 - type: reagent
@@ -941,7 +972,8 @@
         type: Remove
       - !type:ResetNarcolepsy
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ethyloxyephedrine
           min: 10
       - !type:PopupMessage
         visualType: Medium
@@ -966,7 +998,8 @@
         type: Remove
       - !type:ResetNarcolepsy
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Diphenylmethylamine
           min: 5
       - !type:PopupMessage
         visualType: Medium
@@ -992,37 +1025,41 @@
             Caustic: -1.25 # 5 per u
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Sigynate
           min: 16
         damage:
           types:
             Heat: 1 # 4 per u
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Sigynate
           min: 20
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Sigynate
           min: 20
         type: Local
         visualType: Medium
         messages: [ "generic-reagent-effect-nauseous" ]
         probability: 0.2
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Sigynate
           min: 30
         probability: 0.02
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Arithrazine
           min: 1
         probability: 0.1
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Arithrazine
           min: 1
         type: Local
@@ -1049,7 +1086,8 @@
             Heat: 0.2 # 0.8 per u
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Lacerinol
           min: 12
         damage:
           types:
@@ -1074,7 +1112,8 @@
             Radiation: 0.05 # 0.2 per u, 3 for 15u
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Puncturase
           min: 12
         damage:
           types:
@@ -1100,7 +1139,8 @@
         factor: -1
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Bruizine
           min: 10.5
         damage:
           types:
@@ -1122,7 +1162,7 @@
         factor: 3
       - !type:HealthChange
         conditions:
-        - !type:TotalDamage
+        - !type:TotalDamageCondition
           max: 50
         damage:
           types:
@@ -1131,17 +1171,16 @@
             Heat: -0.2
             Shock: -0.2
             Cold: -0.2
-
   reactiveEffects:
     Extinguish:
       methods: [ Touch ]
       effects:
-      - !type:ExtinguishReaction
+      - !type:Extinguish
     Acidic:
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: false
         damage:
           types:
@@ -1171,20 +1210,23 @@
       # od causes massive bleeding
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Pyrazine
           min: 20
         damage:
           types:
             Slash: 0.5
             Piercing: 0.5
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Pyrazine
           min: 15
         probability: 0.1
       - !type:Emote
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Pyrazine
           min: 20
         emote: Scream
         probability: 0.2
@@ -1218,19 +1260,22 @@
       # od makes you freeze to death
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Insuzine
           min: 12
         damage:
           types:
             Cold: 1 # 4 per u
       - !type:AdjustTemperature
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Insuzine
           min: 12
         amount: -30000
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Insuzine
           min: 12
 
 - type: reagent
@@ -1249,7 +1294,7 @@
           seconds: 20
           conditions:
           #Patient must be dead and in a cryo tube (or something cold)
-          - !type:Temperature
+          - !type:TemperatureCondition
             max: 150.0
           - !type:MobStateCondition
             mobstate: Dead
@@ -1274,7 +1319,7 @@
       effects:
         - !type:HealthChange
           conditions:
-          - !type:Temperature
+          - !type:TemperatureCondition
             max: 213.0
           damage:
             groups:
@@ -1297,7 +1342,7 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:Temperature
+        - !type:TemperatureCondition
           max: 213.0
         damage:
           types:
@@ -1319,7 +1364,8 @@
       effects:
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Mannitol
           min: 15
         type: Local
         visualType: Medium
@@ -1339,7 +1385,8 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Psicodine
           min: 30
         damage:
           types:
@@ -1347,7 +1394,8 @@
       - !type:ModifyStatusEffect
         effectProto: StatusEffectSeeingRainbow
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Psicodine
           min: 30
         type: Add
         time: 8
@@ -1384,10 +1432,10 @@
         component: RadiationProtection
         time: 2
         type: Add
-        refresh: false
       - !type:HealthChange
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: PotassiumIodide
             min: 20
         damage:
           types:
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index 92236d746c..48fc618857 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -18,7 +18,8 @@
             Poison: 0.75
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Desoxyephedrine
           min: 30
         damage:
           types:
@@ -26,7 +27,7 @@
             Asphyxiation: 2
     Narcotic:
       effects:
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 1.35
         sprintSpeedModifier: 1.35
       - !type:GenericStatusEffect
@@ -42,7 +43,7 @@
         type: Remove
       - !type:ModifyStatusEffect
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Haloperidol
           max: 0.01
         effectProto: StatusEffectDrowsiness
@@ -52,7 +53,8 @@
       effects:
       - !type:ResetNarcolepsy
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Desoxyephedrine
           min: 20
 
 - type: reagent
@@ -69,12 +71,13 @@
   metabolisms:
     Narcotic:
       effects:
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 1.25
         sprintSpeedModifier: 1.25
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ephedrine
           min: 20
         damage:
           types:
@@ -90,7 +93,7 @@
         type: Remove
       - !type:ModifyStatusEffect
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Haloperidol
           max: 0.01
         effectProto: StatusEffectDrowsiness
@@ -105,7 +108,8 @@
       effects:
       - !type:ResetNarcolepsy
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ephedrine
           min: 30
 
 - type: reagent
@@ -123,19 +127,20 @@
     Narcotic:
       metabolismRate: 1.0
       effects:
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 1.3
         sprintSpeedModifier: 1.3
       - !type:HealthChange
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: Stimulants
             min: 80 #please wait 3 minutes before using another stimpack
         damage:
           types:
             Poison: 1
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: ChloralHydrate
           min: 1
         reagent: ChloralHydrate
@@ -151,14 +156,13 @@
         key: StaminaModifier
         component: StaminaModifier
         time: 3
-        type: Add
       - !type:ModifyStatusEffect
         effectProto: StatusEffectForcedSleeping
         time: 3
         type: Remove
       - !type:ModifyStatusEffect
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Haloperidol
           max: 0.01
         effectProto: StatusEffectDrowsiness
@@ -174,7 +178,7 @@
           factor: 1
         - !type:HealthChange
           conditions:
-          - !type:TotalDamage
+          - !type:TotalDamageCondition
             min: 70 # only heals when you're more dead than alive
           damage: # heals at the same rate as tricordrazine, doesn't heal poison because if you OD'd I'm not giving you a safety net
             groups:
@@ -228,7 +232,7 @@
   metabolisms:
     Narcotic:
       effects:
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:HealthChange
@@ -239,7 +243,7 @@
         effectProto: StatusEffectSeeingRainbow
         time: 10
         type: Add
-      - !type:ChemVomit # Vomiting is a symptom of brain damage
+      - !type:Vomit # Vomiting is a symptom of brain damage
         probability: 0.05
       - !type:Drunk # Headaches and slurring are major symptoms of brain damage, this is close enough
         boozePower: 5
@@ -290,18 +294,17 @@
   metabolisms:
     Narcotic:
       effects: # It would be nice to have speech slurred or mumbly, but accents are a bit iffy atm. Same for distortion effects.
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:ModifyStatusEffect
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Nocturine
           min: 8
         effectProto: StatusEffectForcedSleeping
         time: 6
         delay: 5
-        type: Update
 
 - type: reagent
   id: MuteToxin
@@ -356,7 +359,8 @@
         - norepinephricacid-effect-darkness
         - norepinephricacid-effect-blindness
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: NorepinephricAcid
           min: 20
         probability: 0.03
         #If anyone wants to add a light dimming or grayscale effect when under 20u, be my guest
@@ -364,7 +368,8 @@
         key: TemporaryBlindness
         component: TemporaryBlindness
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: NorepinephricAcid
           min: 20
 
 - type: reagent
@@ -406,7 +411,8 @@
         emote: Scream
         probability: 0.08
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: TearGas
           min: 4
       - !type:Emote
         emote: Cough
@@ -415,14 +421,16 @@
         key: TemporaryBlindness
         component: TemporaryBlindness
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: TearGas
           min: 4
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
-        statusLifetime: 1.5
+        time: 1.5
         conditions: # because of the remainding after effect, threshold is given so the effects ends simultaniously
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: TearGas
           min: 4
 
 - type: reagent
@@ -441,21 +449,24 @@
         showInChat: true
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Happiness
           max: 20
       - !type:Emote
         emote: Whistle
         showInChat: true
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Happiness
           max: 20
       - !type:Emote
         emote: Crying
         showInChat: true
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Happiness
           min: 20
       - !type:PopupMessage # we dont have sanity/mood so this will have to do
         type: Local
@@ -466,7 +477,8 @@
         - "psicodine-effect-at-peace"
         probability: 0.2
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Happiness
           max: 20
       - !type:ModifyStatusEffect
         effectProto: StatusEffectSeeingRainbow
diff --git a/Resources/Prototypes/Reagents/pyrotechnic.yml b/Resources/Prototypes/Reagents/pyrotechnic.yml
index aa5ebe5145..16dfc69286 100644
--- a/Resources/Prototypes/Reagents/pyrotechnic.yml
+++ b/Resources/Prototypes/Reagents/pyrotechnic.yml
@@ -6,7 +6,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-        - !type:FlammableReaction
+        - !type:Flammable
   plantMetabolism:
     - !type:PlantAdjustWeeds
       amount: -2
@@ -52,7 +52,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.4
   metabolisms:
     Poison:
@@ -63,7 +63,7 @@
             Heat: 2
             Poison: 1
             Caustic: 0.5 # based off napalm being an irritant
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.4
 
 - type: reagent
@@ -83,7 +83,7 @@
           types:
             Heat: 3
             Poison: 1
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.1
       - !type:AdjustTemperature
         amount: 6000
@@ -92,7 +92,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.2
       - !type:Ignite
 
@@ -116,7 +116,7 @@
             Heat: 2
             Poison: 1
             Caustic: 0.5 # CLF3 is corrosive
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.2
       - !type:AdjustTemperature
         amount: 6000
@@ -124,7 +124,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.3
       - !type:Ignite
       - !type:Emote
@@ -170,19 +170,19 @@
       - !type:SatiateThirst
         factor: 1
         conditions:
-        - !type:OrganType
-          type: Vox
+        - !type:MetabolizerTypeCondition
+          type: [Vox]
     Poison:
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Vox]
+          inverted: true
         damage:
           types:
             Poison: 1
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.4
 
 - type: reagent
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 33a94c0792..ea7437aa7b 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -67,16 +67,16 @@
         emote: Yawn
         showInChat: true
         probability: 0.1
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:ModifyStatusEffect
         effectProto: StatusEffectDrowsiness
         time: 4
-        type: Add
+        type: Update
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: ChloralHydrate
           min: 20
         damage:
@@ -98,9 +98,10 @@
           damage:
             types:
               Poison: 2
-        - !type:ChemVomit
+        - !type:Vomit
           conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: GastroToxin
             min: 2
           probability: 0.2
 
@@ -144,7 +145,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: false
         damage:
           types:
@@ -183,7 +184,7 @@
       - !type:SatiateThirst
         factor: -1.5
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         damage:
           types:
@@ -206,7 +207,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: false
         damage:
           types:
@@ -256,7 +257,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: false
         damage:
           types:
@@ -378,7 +379,8 @@
       # todo: cough, sneeze
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Histamine
           min: 45
         damage:
           groups:
@@ -392,7 +394,8 @@
         probability: 0.1
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Histamine
           min: 45
         type: Local
         visualType: Medium
@@ -414,16 +417,16 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Animal # Applying damage to the mobs with lower metabolism capabilities
+        - !type:MetabolizerTypeCondition
+          type: [Animal] # Applying damage to the mobs with lower metabolism capabilities
         damage:
           types:
             Poison: 0.4
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.04 #Scaled for time, not metabolismrate.
         conditions:
-          - !type:OrganType
-            type: Animal
+          - !type:MetabolizerTypeCondition
+            type: [Animal]
 
 - type: reagent
   id: Amatoxin
@@ -473,7 +476,8 @@
       effects:
         - !type:CauseZombieInfection
           conditions:
-            - !type:ReagentThreshold
+            - !type:ReagentCondition
+              reagent: Romerol
               min: 5
 
 - type: reagent
@@ -489,46 +493,37 @@
       effects:
       - !type:PopupMessage
         conditions:
-          - !type:OrganType
-            type: Animal
-            shouldHave: false
-          - !type:OrganType
-            type: Vox
-            shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Animal, Vox ]
+          inverted: true
         type: Local
         visualType: MediumCaution
         messages: [ "generic-reagent-effect-sick" ]
         probability: 0.5
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.1
         conditions:
-          - !type:OrganType
-            type: Animal
-            shouldHave: false
-          - !type:OrganType
-            type: Vox
-            shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Animal, Vox ]
+          inverted: true
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Animal
-          shouldHave: false
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Animal, Vox ]
+          inverted: true
         damage:
           types:
             Poison: 1
       - !type:AdjustReagent
         conditions:
-        - !type:OrganType
-          type: Animal
+        - !type:MetabolizerTypeCondition
+          type: [ Animal ]
         reagent: Protein
         amount: 0.5
       - !type:AdjustReagent
         conditions:
-        - !type:OrganType
-          type: Vox
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
         reagent: Protein
         amount: 0.25
 
@@ -546,10 +541,11 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Allicin
           min: 1
-        - !type:OrganType
-          type: Animal
+        - !type:MetabolizerTypeCondition
+          type: [Animal]
         damage:
           types:
             Poison: 0.06
@@ -572,7 +568,6 @@
       - !type:GenericStatusEffect
         key: Pacified
         component: Pacified
-        type: Add
         time: 4
 
 - type: reagent
@@ -595,10 +590,11 @@
         probability: 0.2
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Honk
           min: 1
-        - !type:OrganType
-          type: Animal
+        - !type:MetabolizerTypeCondition
+          type: [ Animal ]
         damage:
           types:
             Poison: 0.06
@@ -652,9 +648,10 @@
       effects:
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Vestine
           min: 5
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 0.8
         sprintSpeedModifier: 0.8
       - !type:HealthChange
@@ -692,7 +689,7 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:Hunger
+        - !type:HungerCondition
           max: 50
         damage:
           types:
@@ -716,30 +713,30 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Arachnid]
+          inverted: true
         damage:
           types:
             Poison: 1.6
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Mechanotoxin
           min: 2
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Arachnid]
+          inverted: true
         walkSpeedModifier: 0.8
         sprintSpeedModifier: 0.8
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Mechanotoxin
           min: 4
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Arachnid]
+          inverted: true
         walkSpeedModifier: 0.4
         sprintSpeedModifier: 0.4
 
@@ -756,5 +753,5 @@
       - !type:SatiateHunger
         factor: 1
         conditions:
-        - !type:OrganType
-          type: Vox
+        - !type:MetabolizerTypeCondition
+          type: [Vox]
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index fef96df5cf..b2a09a1b7f 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -111,7 +111,7 @@
     Potassium:
       amount: 1
   effects:
-    - !type:ExplosionReactionEffect
+    - !type:ExplosionEffect
       explosionType: Default
       intensityPerUnit: 0.25
       maxTotalIntensity: 100
@@ -205,8 +205,8 @@
     Aluminium:
       amount: 1
   effects:
-    - !type:EmpReactionEffect
-      rangePerUnit: 0.2
+    - !type:Emp
+      rangeModifier: 0.2
       maxRange: 6
       energyConsumption: 12500
       duration: 15
@@ -224,7 +224,7 @@
     Sulfur:
       amount: 1
   effects:
-    - !type:FlashReactionEffect
+    - !type:Flash
 
 - type: reaction
   id: TableSalt
diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml
index e98d49c521..f9b819e43e 100644
--- a/Resources/Prototypes/Recipes/Reactions/food.yml
+++ b/Resources/Prototypes/Recipes/Reactions/food.yml
@@ -10,7 +10,7 @@
       amount: 5
       catalyst: true
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodCheese
 
 - type: reaction
@@ -25,7 +25,7 @@
       amount: 5
       catalyst: true
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodChevre
 
 - type: reaction
@@ -39,7 +39,7 @@
     Water:
       amount: 10
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodDough
 
 - type: reaction
@@ -55,7 +55,7 @@
     Egg:
       amount: 6
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodDoughCornmeal
 
 - type: reaction
@@ -69,7 +69,7 @@
     Water:
       amount: 10
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodDoughTortilla
 
 - type: reaction
@@ -85,7 +85,7 @@
     Water:
       amount: 10
   effects:
-  - !type:CreateEntityReactionEffect
+  - !type:SpawnEntity
     entity: FoodDoughCotton
 
 - type: reaction
@@ -103,7 +103,7 @@
     Milk:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodCakeBatter
 
 - type: reaction
@@ -118,7 +118,7 @@
       amount: 5
       catalyst: true
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodButter
 
 - type: reaction
@@ -134,7 +134,7 @@
     TableSalt:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodDoughPie
 
 # TG has a cake recipe that uses soy milk instead of eggs.
@@ -153,7 +153,7 @@
     Sugar:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodCakeBatter
 
 - type: reaction
@@ -168,7 +168,7 @@
       amount: 5
       catalyst: true
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodTofu
 
 - type: reaction
@@ -184,7 +184,7 @@
     Egg:
       amount: 6
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodMeatMeatball
 
 - type: reaction
@@ -200,7 +200,7 @@
     Sugar:
       amount: 2
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodSnackChocolateBar
 
 # Condiments
diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml
index 35987b6be5..9b335a2aca 100644
--- a/Resources/Prototypes/Recipes/Reactions/fun.yml
+++ b/Resources/Prototypes/Recipes/Reactions/fun.yml
@@ -38,7 +38,7 @@
     Carbon:
       amount: 10
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodMeat
 
 - type: reaction
@@ -75,7 +75,7 @@
     SulfuricAcid:
       amount: 2
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: SheetPlastic1
 
 - type: reaction
@@ -153,7 +153,7 @@
     Ethanol:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: ShardCrystalRandom
 
 - type: reaction
@@ -169,7 +169,7 @@
     Charcoal:
       amount: 2
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: MaterialGunpowder
 
 - type: reaction
@@ -182,7 +182,7 @@
     FrostOil:
       amount: 5
   effects:
-  - !type:CreateEntityReactionEffect
+  - !type:SpawnEntity
     entity: IngotGold1
 
 - type: reaction
@@ -195,7 +195,7 @@
     FrostOil:
       amount: 5
   effects:
-  - !type:CreateEntityReactionEffect
+  - !type:SpawnEntity
     entity: IngotSilver1
 
 - type: reaction
@@ -208,7 +208,7 @@
     JuiceThatMakesYouHew:
       amount: 1
   effects:
-  - !type:ExplosionReactionEffect
+  - !type:ExplosionEffect
     explosionType: Radioactive
     maxIntensity: 200
     intensityPerUnit: 2
diff --git a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
index 3591ce7008..21bea1ff2b 100644
--- a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
+++ b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
@@ -39,7 +39,7 @@
     Fluorine:
       amount: 3
   effects:
-  - !type:ExplosionReactionEffect
+  - !type:ExplosionEffect
     explosionType: Default # 15 damage per intensity.
     maxIntensity: 200
     intensityPerUnit: 5
@@ -72,4 +72,4 @@
   products:
     Ethanol: 5
     Hydrogen: 3
-    Sulfur: 2
\ No newline at end of file
+    Sulfur: 2
diff --git a/Resources/Prototypes/Recipes/Reactions/soap.yml b/Resources/Prototypes/Recipes/Reactions/soap.yml
index d07c582f8b..6fddf1e479 100644
--- a/Resources/Prototypes/Recipes/Reactions/soap.yml
+++ b/Resources/Prototypes/Recipes/Reactions/soap.yml
@@ -11,7 +11,7 @@
     TableSalt:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: Soap
 
 - type: reaction
@@ -29,7 +29,7 @@
     Plasma:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: SoapNT
 
 - type: reaction
@@ -47,7 +47,7 @@
     JuiceBerry:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: SoapDeluxe
 
 - type: reaction
@@ -65,7 +65,7 @@
     Blood:
       amount: 10
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: SoapHomemade
 
 - type: reaction
@@ -83,7 +83,7 @@
     Stimulants:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: SoapSyndie
 
 - type: reaction
@@ -115,5 +115,5 @@
     Amatoxin:
       amount: 1
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: SoapOmega

From e917c8e067e70fa369bf8f1f393a465dc51caee8 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sun, 12 Oct 2025 14:52:26 -0700
Subject: [PATCH 215/216] [PRIORITY NEGATIVE ONE/STABLE HOTFIX] ADMIN NOTES
 CANNOT BE ACCESSED (#40863)

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Fix logger obsolete warnings (#40553)"
---
 .../Administration/UI/Notes/AdminNotesLine.xaml.cs   |  7 +------
 .../Construction/UI/ConstructionMenuPresenter.cs     |  8 ++------
 Content.Client/Guidebook/DocumentParsingManager.cs   |  9 +++++----
 Content.Client/Guidebook/Richtext/Table.cs           |  7 +------
 Content.Client/Guidebook/Richtext/TextLinkTag.cs     |  9 ++-------
 Content.Client/Launcher/LauncherConnecting.cs        |  8 ++------
 .../Systems/Alerts/Widgets/AlertsUI.xaml.cs          | 12 +++---------
 Content.Replay/Menu/ReplayMainMenu.cs                |  6 +-----
 Content.Server/Chat/Managers/ChatManager.cs          | 12 ++++--------
 .../GameTicking/Commands/JoinGameCommand.cs          |  7 +------
 10 files changed, 22 insertions(+), 63 deletions(-)

diff --git a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs
index 24e5cfdfab..97ddc15000 100644
--- a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs
+++ b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs
@@ -14,9 +14,6 @@ namespace Content.Client.Administration.UI.Notes;
 [GenerateTypedNameReferences]
 public sealed partial class AdminNotesLine : BoxContainer
 {
-    [Dependency] private readonly ILogManager _logManager = default!;
-
-    private readonly ISawmill _sawmill = default!;
     private readonly SpriteSystem _sprites;
 
     private const string AdminNotesTextureBase = "/Textures/Interface/AdminNotes/";
@@ -36,8 +33,6 @@ public sealed partial class AdminNotesLine : BoxContainer
     public AdminNotesLine(SpriteSystem sprites, SharedAdminNote note)
     {
         RobustXamlLoader.Load(this);
-
-        _sawmill = _logManager.GetSawmill("admin.notes");
         _sprites = sprites;
 
         Note = note;
@@ -66,7 +61,7 @@ public sealed partial class AdminNotesLine : BoxContainer
         if (iconPath is null)
         {
             SeverityRect.Visible = false;
-            _sawmill.Warning($"Could not find an icon for note ID {Note.Id}");
+            Logger.WarningS("admin.notes", $"Could not find an icon for note ID {Note.Id}");
         }
         else
         {
diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index d640de7b68..d5fee2bdda 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -30,10 +30,8 @@ namespace Content.Client.Construction.UI
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
-        [Dependency] private readonly ILogManager _logManager = default!;
-
-        private readonly ISawmill _sawmill = default!;
         private readonly SpriteSystem _spriteSystem;
+
         private readonly IConstructionMenuView _constructionView;
         private readonly EntityWhitelistSystem _whitelistSystem;
 
@@ -89,8 +87,6 @@ namespace Content.Client.Construction.UI
         {
             // This is a lot easier than a factory
             IoCManager.InjectDependencies(this);
-            _sawmill = _logManager.GetSawmill("construction.menu");
-
             _constructionView = new ConstructionMenu();
             _whitelistSystem = _entManager.System<EntityWhitelistSystem>();
             _spriteSystem = _entManager.System<SpriteSystem>();
@@ -288,7 +284,7 @@ namespace Content.Client.Construction.UI
 
                 if (!_constructionSystem!.TryGetRecipePrototype(recipe.ID, out var targetProtoId))
                 {
-                    _sawmill.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.",
+                    Logger.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.",
                         recipe.ID,
                         nameof(ConstructionPrototype));
                     continue;
diff --git a/Content.Client/Guidebook/DocumentParsingManager.cs b/Content.Client/Guidebook/DocumentParsingManager.cs
index 37ec1ac2de..1727ae0de0 100644
--- a/Content.Client/Guidebook/DocumentParsingManager.cs
+++ b/Content.Client/Guidebook/DocumentParsingManager.cs
@@ -7,6 +7,7 @@ using Robust.Client.UserInterface;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Reflection;
+using Robust.Shared.Sandboxing;
 using Robust.Shared.Utility;
 using static Pidgin.Parser;
 
@@ -20,7 +21,7 @@ public sealed partial class DocumentParsingManager
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IReflectionManager _reflectionManager = default!;
     [Dependency] private readonly IResourceManager _resourceManager = default!;
-    [Dependency] private readonly IDynamicTypeFactory _dynamicTypeFactory = default!;
+    [Dependency] private readonly ISandboxHelper _sandboxHelper = default!;
 
     private readonly Dictionary<string, Parser<char, Control>> _tagControlParsers = new();
     private Parser<char, Control> _controlParser = default!;
@@ -42,7 +43,7 @@ public sealed partial class DocumentParsingManager
 
         foreach (var typ in _reflectionManager.GetAllChildren<IDocumentTag>())
         {
-            _tagControlParsers.Add(typ.Name, CreateTagControlParser(typ.Name, typ, _dynamicTypeFactory));
+            _tagControlParsers.Add(typ.Name, CreateTagControlParser(typ.Name, typ, _sandboxHelper));
         }
 
         ControlParser = whitespaceAndCommentParser.Then(_controlParser.Many());
@@ -86,14 +87,14 @@ public sealed partial class DocumentParsingManager
         return true;
     }
 
-    private Parser<char, Control> CreateTagControlParser(string tagId, Type tagType, IDynamicTypeFactory typeFactory)
+    private Parser<char, Control> CreateTagControlParser(string tagId, Type tagType, ISandboxHelper sandbox)
     {
         return Map(
                 (args, controls) =>
                 {
                     try
                     {
-                        var tag = (IDocumentTag) typeFactory.CreateInstance(tagType);
+                        var tag = (IDocumentTag) sandbox.CreateInstance(tagType);
                         if (!tag.TryParseTag(args, out var control))
                         {
                             _sawmill.Error($"Failed to parse {tagId} args");
diff --git a/Content.Client/Guidebook/Richtext/Table.cs b/Content.Client/Guidebook/Richtext/Table.cs
index 82b884aa96..b6923c3698 100644
--- a/Content.Client/Guidebook/Richtext/Table.cs
+++ b/Content.Client/Guidebook/Richtext/Table.cs
@@ -8,11 +8,6 @@ namespace Content.Client.Guidebook.Richtext;
 [UsedImplicitly]
 public sealed class Table : TableContainer, IDocumentTag
 {
-    [Dependency] private readonly ILogManager _logManager = default!;
-
-    private ISawmill Sawmill => _sawmill ??= _logManager.GetSawmill("table");
-    private ISawmill? _sawmill;
-
     public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
     {
         HorizontalExpand = true;
@@ -20,7 +15,7 @@ public sealed class Table : TableContainer, IDocumentTag
 
         if (!args.TryGetValue("Columns", out var columns) || !int.TryParse(columns, out var columnsCount))
         {
-            Sawmill.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\"");
+            Logger.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\"");
             control = null;
             return false;
         }
diff --git a/Content.Client/Guidebook/Richtext/TextLinkTag.cs b/Content.Client/Guidebook/Richtext/TextLinkTag.cs
index 5c0098d5b5..a551b18473 100644
--- a/Content.Client/Guidebook/Richtext/TextLinkTag.cs
+++ b/Content.Client/Guidebook/Richtext/TextLinkTag.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -12,11 +12,6 @@ namespace Content.Client.Guidebook.RichText;
 [UsedImplicitly]
 public sealed class TextLinkTag : IMarkupTagHandler
 {
-    [Dependency] private readonly ILogManager _logManager = default!;
-
-    private ISawmill Sawmill => _sawmill ??= _logManager.GetSawmill(Name);
-    private ISawmill? _sawmill;
-
     public static Color LinkColor => Color.CornflowerBlue;
 
     public string Name => "textlink";
@@ -58,7 +53,7 @@ public sealed class TextLinkTag : IMarkupTagHandler
         if (control.TryGetParentHandler<ILinkClickHandler>(out var handler))
             handler.HandleClick(link);
         else
-            Sawmill.Warning("Warning! No valid ILinkClickHandler found.");
+            Logger.Warning("Warning! No valid ILinkClickHandler found.");
     }
 }
 
diff --git a/Content.Client/Launcher/LauncherConnecting.cs b/Content.Client/Launcher/LauncherConnecting.cs
index 3496c92aba..33d31cc52d 100644
--- a/Content.Client/Launcher/LauncherConnecting.cs
+++ b/Content.Client/Launcher/LauncherConnecting.cs
@@ -20,9 +20,7 @@ namespace Content.Client.Launcher
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IClipboardManager _clipboard = default!;
-        [Dependency] private readonly ILogManager _logManager = default!;
 
-        private ISawmill _sawmill = default!;
         private LauncherConnectingGui? _control;
 
         private Page _currentPage;
@@ -61,8 +59,6 @@ namespace Content.Client.Launcher
 
         protected override void Startup()
         {
-            _sawmill = _logManager.GetSawmill("launcher-ui");
-
             _control = new LauncherConnectingGui(this, _random, _prototypeManager, _cfg, _clipboard);
 
             _userInterfaceManager.StateRoot.AddChild(_control);
@@ -119,12 +115,12 @@ namespace Content.Client.Launcher
                 }
                 else
                 {
-                    _sawmill.Info($"Redial not possible, no Ss14Address");
+                    Logger.InfoS("launcher-ui", $"Redial not possible, no Ss14Address");
                 }
             }
             catch (Exception ex)
             {
-                _sawmill.Error($"Redial exception: {ex}");
+                Logger.ErrorS("launcher-ui", $"Redial exception: {ex}");
             }
             return false;
         }
diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
index 9d62f0c9be..d6a79a81c4 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
@@ -14,18 +14,12 @@ namespace Content.Client.UserInterface.Systems.Alerts.Widgets;
 [GenerateTypedNameReferences]
 public sealed partial class AlertsUI : UIWidget
 {
-    [Dependency] private readonly ILogManager _logManager = default!;
-
-    private readonly ISawmill _sawmill = default!;
-
     // also known as Control.Children?
     private readonly Dictionary<AlertKey, AlertControl> _alertControls = new();
 
     public AlertsUI()
     {
         RobustXamlLoader.Load(this);
-
-        _sawmill = _logManager.GetSawmill("alertsui");
     }
 
     public void SyncControls(AlertsSystem alertsSystem,
@@ -84,15 +78,15 @@ public sealed partial class AlertsUI : UIWidget
         {
             if (!alertKey.AlertType.HasValue)
             {
-                _sawmill.Warning("found alertkey without alerttype," +
-                                 " alert keys should never be stored without an alerttype set: {0}", alertKey);
+                Logger.WarningS("alert", "found alertkey without alerttype," +
+                                         " alert keys should never be stored without an alerttype set: {0}", alertKey);
                 continue;
             }
 
             var alertType = alertKey.AlertType.Value;
             if (!alertsSystem.TryGet(alertType, out var newAlert))
             {
-                _sawmill.Error("Unrecognized alertType {0}", alertType);
+                Logger.ErrorS("alert", "Unrecognized alertType {0}", alertType);
                 continue;
             }
 
diff --git a/Content.Replay/Menu/ReplayMainMenu.cs b/Content.Replay/Menu/ReplayMainMenu.cs
index 5adb769942..85c39c59da 100644
--- a/Content.Replay/Menu/ReplayMainMenu.cs
+++ b/Content.Replay/Menu/ReplayMainMenu.cs
@@ -33,9 +33,7 @@ public sealed class ReplayMainScreen : State
     [Dependency] private readonly IClientRobustSerializer _serializer = default!;
     [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
     [Dependency] private readonly ContentReplayPlaybackManager _replayMan = default!;
-    [Dependency] private readonly ILogManager _logManager = default!;
 
-    private ISawmill _sawmill = default!;
     private ReplayMainMenuControl _mainMenuControl = default!;
     private SelectReplayWindow? _selectWindow;
     private ResPath _directory;
@@ -44,8 +42,6 @@ public sealed class ReplayMainScreen : State
 
     protected override void Startup()
     {
-        _sawmill = _logManager.GetSawmill("replay.screen");
-
         _mainMenuControl = new(_resourceCache);
         _userInterfaceManager.StateRoot.AddChild(_mainMenuControl);
 
@@ -267,7 +263,7 @@ public sealed class ReplayMainScreen : State
         }
         catch (Exception ex)
         {
-            _sawmill.Error($"Failed to load replay info. Exception: {ex}");
+            Logger.Error($"Failed to load replay info. Exception: {ex}");
             SelectReplay(null);
             return;
         }
diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index a37c05336f..c62a10ada3 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -1,3 +1,6 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.InteropServices;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Administration.Systems;
@@ -15,9 +18,6 @@ using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Replays;
 using Robust.Shared.Utility;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Runtime.InteropServices;
 
 namespace Content.Server.Chat.Managers;
 
@@ -45,7 +45,6 @@ internal sealed partial class ChatManager : IChatManager
     [Dependency] private readonly PlayerRateLimitManager _rateLimitManager = default!;
     [Dependency] private readonly ISharedPlayerManager _player = default!;
     [Dependency] private readonly DiscordChatLink _discordLink = default!;
-    [Dependency] private readonly ILogManager _logManager = default!;
 
     /// <summary>
     /// The maximum length a player-sent message can be sent
@@ -55,7 +54,6 @@ internal sealed partial class ChatManager : IChatManager
     private bool _oocEnabled = true;
     private bool _adminOocEnabled = true;
 
-    private ISawmill _sawmill = default!;
     private readonly Dictionary<NetUserId, ChatUser> _players = new();
 
     public void Initialize()
@@ -66,8 +64,6 @@ internal sealed partial class ChatManager : IChatManager
         _configurationManager.OnValueChanged(CCVars.OocEnabled, OnOocEnabledChanged, true);
         _configurationManager.OnValueChanged(CCVars.AdminOocEnabled, OnAdminOocEnabledChanged, true);
 
-        _sawmill = _logManager.GetSawmill("SERVER");
-
         RegisterRateLimits();
     }
 
@@ -115,7 +111,7 @@ internal sealed partial class ChatManager : IChatManager
     {
         var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", FormattedMessage.EscapeText(message)));
         ChatMessageToAll(ChatChannel.Server, message, wrappedMessage, EntityUid.Invalid, hideChat: false, recordReplay: true, colorOverride: colorOverride);
-        _sawmill.Info(message);
+        Logger.InfoS("SERVER", message);
 
         _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Server announcement: {message}");
     }
diff --git a/Content.Server/GameTicking/Commands/JoinGameCommand.cs b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
index bfb3d91464..a32a2f9495 100644
--- a/Content.Server/GameTicking/Commands/JoinGameCommand.cs
+++ b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
@@ -13,14 +13,11 @@ namespace Content.Server.GameTicking.Commands
     [AnyCommand]
     sealed class JoinGameCommand : IConsoleCommand
     {
-        [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
 
-        private readonly ISawmill _sawmill = default!;
-
         public string Command => "joingame";
         public string Description => "";
         public string Help => "";
@@ -28,8 +25,6 @@ namespace Content.Server.GameTicking.Commands
         public JoinGameCommand()
         {
             IoCManager.InjectDependencies(this);
-
-            _sawmill = _logManager.GetSawmill("security");
         }
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
@@ -51,7 +46,7 @@ namespace Content.Server.GameTicking.Commands
 
             if (ticker.PlayerGameStatuses.TryGetValue(player.UserId, out var status) && status == PlayerGameStatus.JoinedGame)
             {
-                _sawmill.Info($"{player.Name} ({player.UserId}) attempted to latejoin while in-game.");
+                Logger.InfoS("security", $"{player.Name} ({player.UserId}) attempted to latejoin while in-game.");
                 shell.WriteError($"{player.Name} is not in the lobby.   This incident will be reported.");
                 return;
             }

From be78d230689147a84ca1366fea783bc45b739ac6 Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Mon, 13 Oct 2025 00:27:04 +0200
Subject: [PATCH 216/216] Revert "Merge branch 'master' into stable"

This reverts commit 3a7c18c3949d8ba28adc9a90ec9dc207b89dd182, reversing
changes made to e917c8e067e70fa369bf8f1f393a465dc51caee8.
---
 .github/CODEOWNERS                            |    1 -
 BuildChecker/git_helper.py                    |    2 +-
 BuildChecker/hooks/post-checkout              |    2 +-
 BuildChecker/hooks/post-merge                 |    2 +-
 .../Access/UI/IdCardConsoleWindow.xaml        |   19 +-
 .../Access/UI/IdCardConsoleWindow.xaml.cs     |   23 +-
 .../UI/BanPanel/BanPanel.xaml.cs              |    4 +-
 .../Administration/UI/Logs/AdminLogsEui.cs    |    2 +-
 Content.Client/Crayon/CrayonComponent.cs      |   14 +
 Content.Client/Crayon/CrayonSystem.cs         |   49 +-
 Content.Client/Credits/CreditsWindow.xaml.cs  |    4 +-
 .../CriminalRecordsConsoleWindow.xaml         |    2 +-
 .../Damage/Systems/DamageOtherOnHitSystem.cs  |    5 -
 .../HumanoidMarkingModifierWindow.xaml        |    6 +-
 .../HumanoidMarkingModifierWindow.xaml.cs     |    6 +-
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    |    1 -
 .../CrewMonitoringNavMapControl.cs            |    2 +-
 .../CrewMonitoring/CrewMonitoringWindow.xaml  |   12 +-
 .../CrewMonitoringWindow.xaml.cs              |    2 +-
 Content.Client/NPC/NPCWindow.xaml             |   18 +-
 Content.Client/PAI/PAISystem.cs               |    8 +
 Content.Client/Physics/JointVisualsOverlay.cs |    6 +-
 .../Pinpointer/UI/StationMapWindow.xaml       |    2 +-
 .../Borgs/BorgSwitchableTypeSystem.cs         |   19 +
 Content.Client/Silicons/Bots/HugBotSystem.cs  |    5 -
 .../Temperature/Systems/TemperatureSystem.cs  |    8 -
 Content.Client/UserInterface/StatValuesEui.cs |    2 +-
 .../Systems/Bwoink/AHelpUIController.cs       |    2 +-
 .../Controls/Roles/MakeGhostRoleWindow.xaml   |   22 +-
 .../Roles/MakeGhostRoleWindow.xaml.cs         |    8 +-
 .../Systems/Storage/Controls/StorageWindow.cs |    2 +-
 .../Tests/MaterialArbitrageTest.cs            |    2 +-
 .../Systems/AdminVerbSystem.Tools.cs          |   82 +-
 .../Atmos/EntitySystems/FlammableSystem.cs    |    2 +-
 Content.Server/Atmos/Rotting/RottingSystem.cs |    2 +-
 .../Body/Components/MetabolizerComponent.cs   |    4 +-
 .../Body/Systems/MetabolizerSystem.cs         |  382 ++-
 .../Body/Systems/RespiratorSystem.cs          |   15 +-
 .../Body/Systems/ThermalRegulatorSystem.cs    |    2 +-
 Content.Server/Botany/SeedPrototype.cs        |   11 +-
 .../Botany/Systems/BotanySystem.Produce.cs    |    7 +-
 .../Botany/Systems/MutationSystem.cs          |    7 +-
 .../Botany/Systems/PlantHolderSystem.cs       |    5 +-
 .../Chat/Systems/AutoEmoteSystem.cs           |    6 +-
 .../Commands/DumpReagentGuideText.cs          |    2 +-
 .../Clothing/Systems/OutfitSystem.cs          |    5 +-
 Content.Server/Cluwne/CluwneSystem.cs         |   68 +-
 .../ConstructionSystem.Interactions.cs        |    1 -
 Content.Server/Crayon/CrayonComponent.cs      |   28 +
 Content.Server/Crayon/CrayonSystem.cs         |   48 +-
 .../Components/DamageOtherOnHitComponent.cs   |   19 +
 .../Damage/Systems/DamageOtherOnHitSystem.cs  |   82 +-
 .../BreathingEntityConditionSystem.cs         |   19 -
 .../MetabolizerTypesEntityConditionSystem.cs  |   21 -
 .../Atmos/CreateGasEntityEffectSystem.cs      |   22 -
 .../Atmos/FlammableEntityEffectSystem.cs      |   25 -
 .../Effects/Atmos/IgniteEntityEffectSystem.cs |   23 -
 .../Body/OxygenateEntityEffectsSystem.cs      |   20 -
 .../PlantAdjustHealthEntityEffectSystem.cs    |   20 -
 ...ntAdjustMutationLevelEntityEffectSystem.cs |   20 -
 ...lantAdjustMutationModEntityEffectSystem.cs |   16 -
 .../PlantAdjustNutritionEntityEffectSystem.cs |   16 -
 .../PlantAdjustPestsEntityEffectSystem.cs     |   16 -
 .../PlantAdjustPotencyEntityEffectSystem.cs   |   19 -
 .../PlantAdjustToxinsEntityEffectSystem.cs    |   16 -
 .../PlantAdjustWaterEntityEffectSystem.cs     |   16 -
 .../PlantAdjustWeedsEntityEffectSystem.cs     |   16 -
 .../PlantAffectGrowthEntityEffectSystem.cs    |   19 -
 .../PlantChangeStatEntityEffectSystem.cs      |  122 -
 .../PlantCryoxadoneEntityEffectSystem.cs      |   30 -
 .../PlantDestroySeedsEntityEffectSystem.cs    |   31 -
 .../PlantDiethylamineEntityEffectSystem.cs    |   31 -
 .../PlantPhalanximineEntityEffectSystem.cs    |   16 -
 .../PlantRestoreSeedsEntityEffectSystem.cs    |   26 -
 .../RobustHarvestEntityEffectSystem.cs        |   41 -
 .../PlantMutateChemicalsEntityEffectSystem.cs |   43 -
 .../PlantMutateGasesEntityEffectSystem.cs     |   53 -
 .../PlantMutateHarvestEntityEffectSystem.cs   |   25 -
 ...ntMutateSpeciesChangeEntityEffectSystem.cs |   31 -
 .../Effects/EmoteEntityEffectSystem.cs        |   22 -
 .../Effects/MakeSentientEntityEffectSystem.cs |   42 -
 .../Effects/PolymorphEntityEffectSystem.cs    |   19 -
 .../AreaReactionEntityEffectSystem.cs         |   51 -
 .../Transform/ExplosionEntityEffectSystem.cs  |   28 -
 .../EntityEffects/EntityEffectSystem.cs       |  976 +++++++
 .../Fluids/EntitySystems/SmokeSystem.cs       |    7 +-
 .../GuideGenerator/ChemistryJsonGenerator.cs  |    3 +-
 Content.Server/GuideGenerator/ReagentEntry.cs |    2 +-
 Content.Server/Holopad/HolopadSystem.cs       |    3 -
 .../Kitchen/EntitySystems/MicrowaveSystem.cs  |    1 -
 Content.Server/Medical/CryoPodSystem.cs       |    2 +-
 .../Medical/HealthAnalyzerSystem.cs           |    2 +-
 .../Preconditions/IsEmaggedPrecondition.cs    |   31 -
 .../Combat/Melee/MeleeAttackOperator.cs       |   70 -
 .../PrimitiveTasks/Operators/SpeakOperator.cs |   50 +-
 .../Specific/RaiseEventForOwnerOperator.cs    |   47 -
 .../NPC/Queries/Queries/ComponentFilter.cs    |    7 -
 .../NPC/Systems/NPCUtilitySystem.cs           |   13 +-
 .../SpiderChargeConditionComponent.cs         |    8 -
 .../Systems/NinjaConditionsSystem.cs          |   12 +-
 Content.Server/PAI/PAISystem.cs               |   18 +-
 .../Power/EntitySystems/BatterySystem.cs      |    2 +-
 Content.Server/PowerSink/PowerSinkSystem.cs   |    2 +-
 .../Revenant/EntitySystems/RevenantSystem.cs  |   19 +
 Content.Server/Silicons/Bots/HugBotSystem.cs  |   65 -
 .../Bots/RecentlyHuggedByHugBotComponent.cs   |   15 -
 .../SingularityGeneratorSystem.cs             |    5 +-
 Content.Server/Store/Systems/StoreSystem.cs   |   16 +-
 .../Stunnable/Systems/StunOnCollideSystem.cs  |    1 -
 .../Components/TemperatureComponent.cs        |    2 +-
 .../Temperature/Systems/TemperatureSystem.cs  |   19 +-
 .../Tiles/TileEntityEffectComponent.cs        |    2 +-
 .../Tiles/TileEntityEffectSystem.cs           |   10 +-
 .../Weapons/Melee/MeleeWeaponSystem.cs        |   18 +-
 .../Ranged/Systems/GunSystem.Battery.cs       |   51 +
 .../Systems/ArtifactCrusherSystem.cs          |   94 +-
 .../Zombies/IncurableZombieComponent.cs       |    3 +-
 .../Zombies/ZombieSystem.Transform.cs         |    2 +-
 Content.Shared.Database/LogType.cs            |    4 +-
 .../Body/Components/LungComponent.cs          |    2 +-
 Content.Shared/Body/Systems/LungSystem.cs     |   12 +-
 .../Body/Systems/SharedBloodstreamSystem.cs   |    7 +-
 .../Chat/Prototypes/AutoEmotePrototype.cs     |   30 +-
 .../SharedSolutionContainerSystem.cs          |   21 -
 .../Reaction/ChemicalReactionSystem.cs        |   18 +-
 .../Chemistry/Reaction/ReactionPrototype.cs   |    2 +-
 .../Chemistry/Reaction/ReactiveComponent.cs   |    2 +-
 Content.Shared/Chemistry/ReactiveSystem.cs    |   98 +-
 .../Chemistry/Reagent/ReagentPrototype.cs     |   73 +-
 .../Clothing/EntitySystems/MaskSystem.cs      |   22 +-
 Content.Shared/Cluwne/CluwneComponent.cs      |   84 +-
 Content.Shared/Crayon/CrayonComponent.cs      |  119 -
 .../Crayon/SharedCrayonComponent.cs           |  113 +
 .../Components/DamageExaminableComponent.cs   |    7 +-
 .../Components/DamageOtherOnHitComponent.cs   |   24 -
 .../Damage/Events/DamageExamineEvent.cs       |    4 -
 .../Systems/SharedDamageOtherOnHitSystem.cs   |   32 -
 .../Destructible/SharedDestructibleSystem.cs  |   14 +-
 .../DeviceLinking/SharedDeviceLinkSystem.cs   |   11 -
 .../Body/BreathingEntityCondition.cs          |   10 -
 .../Body/HungerEntityConditionSystem.cs       |   33 -
 .../Body/InternalsEntityConditionSystem.cs    |   23 -
 .../Body/MetabolizerTypeEntityCondition.cs    |   31 -
 .../Body/MobStateEntityConditionSystem.cs     |   28 -
 .../Conditions/JobEntityConditionSystem.cs    |   59 -
 .../ReagentEntityConditionSystem.cs           |   44 -
 .../Tags/HasAllTagsEntityConditionSystem.cs   |   43 -
 .../Tags/HasAnyTagEntityConditionSystem.cs    |   43 -
 .../Tags/HasTagEntityConditionSystem.cs       |   28 -
 .../TemperatureEntityConditionSystem.cs       |   52 -
 .../TemplateEntityConditionSystem.cs          |   20 -
 .../TotalDamageEntityConditionSystem.cs       |   33 -
 .../SharedEntityConditionsSystem.cs           |  152 --
 .../EffectConditions/BodyTemperature.cs       |   23 +
 .../EffectConditions/BreathingCondition.cs    |   21 +
 .../EffectConditions/HasTagCondition.cs       |   28 +
 .../EffectConditions/InternalsCondition.cs    |   30 +
 .../EffectConditions/JobCondition.cs          |   52 +
 .../EffectConditions/MobStateCondition.cs     |   28 +
 .../EffectConditions/OrganType.cs             |   28 +
 .../EffectConditions/ReagentThreshold.cs      |   56 +
 .../EffectConditions/SolutionTemperature.cs   |   36 +
 .../EffectConditions/TotalDamage.cs           |   33 +
 .../EffectConditions/TotalHunger.cs           |   33 +
 .../Effects/AddToSolutionReaction.cs          |   35 +
 .../EntityEffects/Effects/AdjustAlert.cs      |   58 +
 .../Effects/AdjustAlertEntityEffectSystem.cs  |   65 -
 .../EntityEffects/Effects/AdjustReagent.cs    |   90 +
 .../Effects/AdjustTemperature.cs              |   15 +
 .../AdjustTemperatureEntityEffectsSystem.cs   |   30 -
 .../Effects/AreaReactionEffect.cs             |   43 +
 .../Effects/ArtifactDurabilityRestore.cs      |   36 +
 .../Effects/ArtifactEntityEffectsSystem.cs    |   72 -
 .../EntityEffects/Effects/ArtifactUnlock.cs   |   44 +
 .../Effects/Atmos/CreateGasEntityEffect.cs    |   35 -
 .../Atmos/ExtinguishEntityEffectSystem.cs     |   36 -
 .../Effects/Atmos/FlammableEntityEffect.cs    |   28 -
 .../Effects/Atmos/IgniteEntityEffect.cs       |   18 -
 .../CleanBloodstreamEntityEffectSystem.cs     |   43 -
 .../Body/EyeDamageEntityEffectSystem.cs       |   32 -
 .../Body/ModifyBleedEntityEffectSystem.cs     |   32 -
 .../ModifyBloodLevelEntityEffectSystem.cs     |   34 -
 .../Body/ModifyLungGasEntityEffectSystem.cs   |   33 -
 .../Effects/Body/OxygenateEntityEffect.cs     |   14 -
 .../Body/ReduceRottingEntityEffectSystem.cs   |   36 -
 .../Effects/Body/SatiateEntityEffectSystem.cs |   63 -
 .../Effects/Body/VomitEntityEffectSystem.cs   |   37 -
 .../BasePlantAdjustAttributeEntityEffect.cs   |   37 -
 .../PlantAttributes/PlantAdjustHealth.cs      |    7 -
 .../PlantAdjustMutationLevel.cs               |    7 -
 .../PlantAttributes/PlantAdjustMutationMod.cs |    7 -
 .../PlantAttributes/PlantAdjustNutrition.cs   |    6 -
 .../PlantAttributes/PlantAdjustPotency.cs     |    9 -
 .../PlantAttributes/PlantAdjustWater.cs       |    7 -
 .../PlantAttributes/PlantAffectGrowth.cs      |    7 -
 .../Botany/PlantAttributes/PlantChangeStat.cs |   21 -
 .../Botany/PlantAttributes/PlantCryoxadone.cs |    9 -
 .../PlantAttributes/PlantDestroySeeds.cs      |   12 -
 .../PlantAttributes/PlantDiethylamine.cs      |   11 -
 .../PlantAttributes/PlantPhalanximine.cs      |   10 -
 .../PlantAttributes/PlantRestoreSeeds.cs      |   12 -
 .../Botany/PlantAttributes/RobustHarvest.cs   |   22 -
 .../PlantMutateChemicalsEntityEffect.cs       |   16 -
 .../Botany/PlantMutateGasesEntityEffect.cs    |   22 -
 .../Botany/PlantMutateHarvestEntityEffect.cs  |    6 -
 .../PlantMutateSpeciesChangeEntityEffect.cs   |    6 -
 .../Effects/CauseZombieInfection.cs           |    9 +
 .../Effects/ChemCleanBloodstream.cs           |   15 +
 .../Effects/ChemHealEyeDamage.cs              |   28 +
 .../EntityEffects/Effects/ChemVomit.cs        |   19 +
 .../Effects/CreateEntityReactionEffect.cs     |   26 +
 .../EntityEffects/Effects/CreateGas.cs        |   32 +
 .../Effects/CureZombieInfection.cs            |   18 +
 Content.Shared/EntityEffects/Effects/Drunk.cs |   27 +
 .../EntityEffects/Effects/Electrocute.cs      |   37 +
 Content.Shared/EntityEffects/Effects/Emote.cs |   44 +
 .../Effects/EmoteEntityEffect.cs              |   40 -
 .../Effects/EmpReactionEffect.cs              |   34 +
 .../BaseSpawnEntityEntityEffect.cs            |   36 -
 .../SpawnEntityEntityEffectSystem.cs          |   37 -
 ...pawnEntityInContainerEntityEffectSystem.cs |   51 -
 ...tityInContainerOrDropEntityEffectSystem.cs |   49 -
 ...pawnEntityInInventoryEntityEffectSystem.cs |   35 -
 .../EntityEffects/Effects/EvenHealthChange.cs |  139 +
 .../EvenHealthChangeEntityEffectSystem.cs     |  114 -
 ...tyEffect.cs => ExplosionReactionEffect.cs} |   19 +-
 .../Effects/ExtinguishReaction.cs             |   32 +
 .../Effects/FlammableReaction.cs              |   21 +
 .../Effects/FlashReactionEffect.cs            |   48 +
 Content.Shared/EntityEffects/Effects/Glow.cs  |   48 +
 .../Effects/GlowEntityEffectSystem.cs         |   55 -
 .../EntityEffects/Effects/HealthChange.cs     |  126 +
 .../Effects/HealthChangeEntityEffectSystem.cs |   91 -
 .../EntityEffects/Effects/Ignite.cs           |   18 +
 .../EntityEffects/Effects/MakeSentient.cs     |   10 +
 .../Effects/MakeSentientEntityEffect.cs       |   22 -
 .../Effects/ModifyBleedAmount.cs              |   16 +
 .../EntityEffects/Effects/ModifyBloodLevel.cs |   17 +
 .../EntityEffects/Effects/ModifyLungGas.cs    |   14 +
 .../Effects/MovespeedModifier.cs              |   78 +
 .../EntityEffects/Effects/Oxygenate.cs        |   13 +
 .../EntityEffects/Effects/Paralyze.cs         |   37 +
 .../PlantMetabolism/PlantAdjustAttribute.cs   |   39 +
 .../PlantMetabolism/PlantAdjustHealth.cs      |    7 +
 .../PlantAdjustMutationLevel.cs               |    6 +
 .../PlantMetabolism/PlantAdjustMutationMod.cs |    6 +
 .../PlantMetabolism/PlantAdjustNutrition.cs   |    6 +
 .../PlantAdjustPests.cs                       |    4 +-
 .../PlantMetabolism/PlantAdjustPotency.cs     |   12 +
 .../PlantAdjustToxins.cs                      |    5 +-
 .../PlantMetabolism/PlantAdjustWater.cs       |    7 +
 .../PlantAdjustWeeds.cs                       |    4 +-
 .../PlantMetabolism/PlantAffectGrowth.cs      |    7 +
 .../PlantMetabolism/PlantChangeStat.cs        |   24 +
 .../PlantMetabolism/PlantCryoxadone.cs        |    8 +
 .../PlantMetabolism/PlantDestroySeeds.cs      |   13 +
 .../PlantMetabolism/PlantDiethylamine.cs      |    9 +
 .../PlantMetabolism/PlantPhalanximine.cs      |    8 +
 .../PlantMetabolism/PlantRestoreSeeds.cs      |   12 +
 .../Effects/PlantMetabolism/RobustHarvest.cs  |   18 +
 .../Effects/PlantMutateChemicals.cs           |   16 +
 .../EntityEffects/Effects/PlantMutateGases.cs |   39 +
 .../Effects/PlantMutateHarvest.cs             |   14 +
 .../Effects/PlantSpeciesChange.cs             |   14 +
 .../EntityEffects/Effects/Polymorph.cs        |   19 +
 .../Effects/PolymorphEntityEffect.cs          |   19 -
 .../EntityEffects/Effects/PopupMessage.cs     |   54 +
 .../EntityEffects/Effects/ReduceRotting.cs    |   32 +
 .../EntityEffects/Effects/ResetNarcolepsy.cs  |   19 +
 .../ResetNarcolepsyEntityEffectSystem.cs      |   34 -
 .../EntityEffects/Effects/SatiateHunger.cs    |   40 +
 .../EntityEffects/Effects/SatiateThirst.cs    |   31 +
 .../EntityEffects/Effects/Slipify.cs          |   37 +
 .../Effects/SlipifyEntityEffectSystem.cs      |   44 -
 .../AddReagentToSolutionEntityEffectSystem.cs |   59 -
 .../AdjustReagentEntityEffectSystem.cs        |   52 -
 ...AdjustReagentsByGroupEntityEffectSystem.cs |   52 -
 .../Solution/AreaReactionEntityEffect.cs      |   39 -
 .../SolutionTemperatureEntityEffectsSystem.cs |  145 --
 .../Effects/SolutionTemperatureEffects.cs     |  143 ++
 .../BaseStatusEffectEntityEffect.cs           |   35 -
 .../StatusEffects/DrunkEntityEffectSystem.cs  |   34 -
 .../ElectrocuteEntityEffectSystem.cs          |   51 -
 .../StatusEffects/GenericStatusEffect.cs      |   76 +
 .../GenericStatusEffectEntityEffectSystem.cs  |   64 -
 .../Effects/StatusEffects/Jitter.cs           |   41 +
 .../StatusEffects/JitterEntityEffectSystem.cs |   45 -
 .../Effects/StatusEffects/ModifyKnockdown.cs  |   99 +
 .../ModifyKnockdownEntityEffectSystem.cs      |   72 -
 .../ModifyParalysisEntityEffectSystem.cs      |   51 -
 .../StatusEffects/ModifyStatusEffect.cs       |   78 +
 .../ModifyStatusEffectEntityEffectSystem.cs   |   66 -
 ...MovementSpeedModifierEntityEffectSystem.cs |   92 -
 .../Effects/TemplateEntityEffectSystem.cs     |   21 -
 .../Transform/EmpEntityEffectSystem.cs        |   58 -
 .../Transform/FlashEntityEffectSystem.cs      |   81 -
 .../PopupMessageEntityEffectSystem.cs         |   64 -
 .../Effects/WashCreamPieEntityEffectSystem.cs |   27 -
 .../Effects/WashCreamPieReaction.cs           |   19 +
 .../EntityEffects/Effects/WearableReaction.cs |   47 +
 .../Effects/ZombieEntityEffectsSystem.cs      |   67 -
 Content.Shared/EntityEffects/EntityEffect.cs  |  145 ++
 .../EntityEffects/EntityEffectCondition.cs    |   29 +
 .../EntityEffects/EventEntityEffect.cs        |   12 +
 .../EventEntityEffectCondition.cs             |   14 +
 .../SharedEntityEffectsSystem.cs              |  251 --
 .../Components/FlashImmunityComponent.cs      |    6 -
 Content.Shared/Flash/SharedFlashSystem.cs     |    3 +-
 .../Systems/MovementModStatusSystem.cs        |    1 -
 .../Components/BombingTargetComponent.cs      |    7 +
 .../EntitySystems/IngestionSystem.API.cs      |    9 +-
 Content.Shared/PAI/PAIComponent.cs            |   12 +-
 Content.Shared/PAI/SharedPAISystem.cs         |   38 +
 .../ParcelWrappingSystem.WrappedParcel.cs     |    5 +-
 .../Physics/JointVisualsComponent.cs          |   19 +-
 .../Revenant/Components/RevenantComponent.cs  |    2 +
 Content.Shared/Revenant/SharedRevenant.cs     |    4 +
 Content.Shared/Roles/JobPrototype.cs          |   34 +-
 Content.Shared/Roles/SharedRoleSystem.cs      |    3 +-
 .../Borgs/SharedBorgSwitchableTypeSystem.cs   |   19 -
 .../Silicons/Bots/HugBotComponent.cs          |   12 -
 .../Silicons/Bots/SharedHugBotSystem.cs       |   38 -
 Content.Shared/Stacks/StackPrototype.cs       |   14 +-
 .../StatusEffectNew/StatusEffectSystem.API.cs |   18 -
 .../EntitySystems/SharedStorageSystem.cs      |    4 +-
 .../Store/Events/IntrinsicStoreActionEvent.cs |   11 -
 .../Stunnable/SharedStunSystem.Knockdown.cs   |    9 +-
 Content.Shared/Stunnable/SharedStunSystem.cs  |    7 +-
 .../Systems/SharedTemperatureSystem.cs        |   19 +-
 .../MindRoleTriggerConditionComponent.cs      |   27 -
 .../WhitelistTriggerConditionComponent.cs     |    6 +-
 .../Systems/DnaScrambleOnTriggerSystem.cs     |   12 -
 .../Systems/TriggerSystem.Condition.cs        |   81 +-
 .../Trigger/Systems/TriggerSystem.cs          |    4 -
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  |   18 +-
 .../Weapons/Misc/SharedGrapplingGunSystem.cs  |    2 +-
 .../Ranged/Components/AmmoComponent.cs        |    6 -
 .../Ranged/Systems/SharedGunSystem.Battery.cs |   51 -
 .../Weapons/Ranged/Systems/SharedGunSystem.cs |   10 -
 .../Components/AnalysisConsoleComponent.cs    |    4 +-
 .../Components/ArtifactAnalyzerComponent.cs   |    9 +-
 .../Components/ArtifactCrusherComponent.cs    |   22 +-
 .../Equipment/SharedArtifactAnalyzerSystem.cs |   82 +-
 .../Equipment/SharedArtifactCrusherSystem.cs  |  106 +-
 Content.Tools/test/run.sh                     |    2 +-
 Resources/Changelog/Changelog.yml             |  382 ++-
 Resources/Changelog/Maps.yml                  |   21 -
 Resources/Credits/GitHub.txt                  |    2 +-
 Resources/Credits/Patrons.yml                 | 2242 +++++++++-------
 .../components/id-card-console-component.ftl  |    4 +-
 .../Locale/en-US/accessories/human-hair.ftl   |    1 -
 .../en-US/administration/admin-verbs.ftl      |   45 -
 .../Locale/en-US/administration/bwoink.ftl    |    1 -
 Resources/Locale/en-US/cluwne/cluwne.ftl      |    2 -
 .../en-US/components/storage-component.ftl    |    1 -
 .../Locale/en-US/credits/credits-window.ftl   |    2 -
 .../Locale/en-US/ghost/make-ghost-gui.ftl     |   21 -
 .../conditions.ftl                            |    0
 .../Locale/en-US/guidebook/chemistry/core.ftl |    5 +-
 .../{entity-effects => chemistry}/effects.ftl |  188 +-
 .../healthchange.ftl                          |    0
 .../guidebook/chemistry/statuseffects.ftl     |   16 +
 .../entity-effects/statuseffects.ftl          |   16 -
 Resources/Locale/en-US/guidebook/guides.ftl   |    2 -
 Resources/Locale/en-US/info/ban.ftl           |    1 -
 .../Locale/en-US/job/job-supervisors.ftl      |    3 +-
 .../Locale/en-US/materials/materials.ftl      |    2 -
 .../components/crew-monitoring-component.ftl  |   23 +-
 .../en-US/navmap-beacons/station_map.ftl      |    1 -
 Resources/Locale/en-US/npc/hugbot.ftl         |   26 -
 Resources/Locale/en-US/npc/npc-debug.ftl      |   11 -
 .../en-US/preferences/ui/markings-picker.ftl  |    6 -
 Resources/Locale/en-US/recipes/tags.ftl       |    1 -
 Resources/Locale/en-US/station-laws/laws.ftl  |    9 +-
 .../Locale/en-US/store/uplink-catalog.ftl     |    3 -
 Resources/Locale/en-US/ui/navmap.ftl          |    1 -
 Resources/Locale/en-US/ui/stat-values.ftl     |    1 -
 Resources/Maps/exo.yml                        |   13 +
 Resources/Maps/packed.yml                     |  104 +-
 Resources/Maps/plasma.yml                     | 2248 ++++-------------
 Resources/Maps/saltern.yml                    |  107 +
 Resources/Prototypes/Actions/revenant.yml     |    7 +-
 Resources/Prototypes/Actions/types.yml        |   11 -
 Resources/Prototypes/Body/Prototypes/bot.yml  |   16 -
 .../Catalog/Fills/Lockers/heads.yml           |    1 -
 .../Catalog/Fills/Lockers/security.yml        |    3 -
 Resources/Prototypes/Catalog/hugbot.yml       |   17 -
 .../Prototypes/Catalog/uplink_catalog.yml     |   11 +-
 .../Entities/Clothing/Hands/colored.yml       |    2 +
 .../Markers/Spawners/Random/maintenance.yml   |    1 -
 .../Entities/Markers/warp_point.yml           |   21 +
 .../Customization/Markings/human_hair.yml     |    7 -
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |    2 +-
 .../Entities/Mobs/NPCs/elemental.yml          |   28 +-
 .../Entities/Mobs/NPCs/miscellaneous.yml      |   20 +-
 .../Entities/Mobs/NPCs/revenant.yml           |    3 -
 .../Prototypes/Entities/Mobs/NPCs/silicon.yml |   37 -
 .../Prototypes/Entities/Mobs/NPCs/slimes.yml  |    6 +-
 .../Prototypes/Entities/Mobs/NPCs/space.yml   |    2 +-
 .../Entities/Mobs/Species/arachnid.yml        |    6 +-
 .../Prototypes/Entities/Mobs/Species/base.yml |    2 +-
 .../Entities/Mobs/Species/diona.yml           |   14 +-
 .../Entities/Mobs/Species/skeleton.yml        |    9 +-
 .../Entities/Mobs/Species/slime.yml           |    6 +-
 .../Objects/Deliveries/deliveries_tables.yml  |    6 -
 .../Objects/Devices/station_beacon.yml        |    9 -
 .../Entities/Objects/Fun/crayons.yml          |   17 +-
 .../Prototypes/Entities/Objects/Fun/pai.yml   |   10 +-
 .../Entities/Objects/Fun/plushies.yml         |    3 +-
 .../Entities/Objects/Misc/kudzu.yml           |   12 +-
 .../Entities/Objects/Misc/paper.yml           |    3 +
 .../Entities/Objects/Misc/space_cash.yml      |    6 +
 .../Entities/Objects/Power/powersink.yml      |    4 +-
 .../Specific/Xenoarchaeology/node_scanner.yml |    2 +-
 .../Objects/Specific/rehydrateable.yml        |    6 +-
 .../Guns/Ammunition/Cartridges/pistol.yml     |    4 -
 .../Weapons/Guns/Battery/battery_guns.yml     |    1 -
 .../Weapons/Guns/Projectiles/projectiles.yml  |    4 +-
 .../Entities/StatusEffects/movement.yml       |   21 -
 .../Structures/Doors/Airlocks/access.yml      |   13 +-
 .../Structures/Doors/Airlocks/airlocks.yml    |    9 -
 .../Machines/Computers/computers.yml          |    2 +-
 .../Entities/Structures/Machines/lathe.yml    |    4 -
 .../Specific/Anomaly/anomaly_injectors.yml    |   60 -
 .../Entities/Structures/Storage/glass_box.yml |   24 +-
 .../Prototypes/Entities/Structures/soil.yml   |    3 +-
 Resources/Prototypes/Entities/Tiles/lava.yml  |    2 +-
 .../Entities/Tiles/liquid_plasma.yml          |    2 +-
 Resources/Prototypes/Entities/Tiles/water.yml |    4 +-
 Resources/Prototypes/Guidebook/science.yml    |   18 +-
 .../Hydroponics/randomMutations.yml           |    6 +-
 Resources/Prototypes/NPCs/debug.yml           |    7 +-
 Resources/Prototypes/NPCs/firebot.yml         |    9 +-
 Resources/Prototypes/NPCs/hugbot.yml          |  134 -
 Resources/Prototypes/NPCs/medibot.yml         |    3 +-
 Resources/Prototypes/Objectives/ninja.yml     |    4 -
 Resources/Prototypes/Objectives/thief.yml     |    1 +
 Resources/Prototypes/Parallaxes/train.yml     |   30 +
 .../Reagents/Consumable/Drink/alcohol.yml     |   70 +-
 .../Reagents/Consumable/Drink/base_drink.yml  |    4 +-
 .../Reagents/Consumable/Drink/drinks.yml      |   17 +-
 .../Reagents/Consumable/Drink/soda.yml        |    6 +-
 .../Reagents/Consumable/Food/food.yml         |    4 +-
 .../Reagents/Consumable/Food/ingredients.yml  |   19 +-
 .../Prototypes/Reagents/Materials/ores.yml    |    2 +-
 Resources/Prototypes/Reagents/biological.yml  |   14 +-
 Resources/Prototypes/Reagents/botany.yml      |   81 +-
 Resources/Prototypes/Reagents/chemicals.yml   |   16 +-
 Resources/Prototypes/Reagents/cleaning.yml    |   14 +-
 Resources/Prototypes/Reagents/elements.yml    |   22 +-
 Resources/Prototypes/Reagents/fun.yml         |   93 +-
 Resources/Prototypes/Reagents/gases.yml       |  282 ++-
 Resources/Prototypes/Reagents/medicine.yml    |  224 +-
 Resources/Prototypes/Reagents/narcotics.yml   |   79 +-
 Resources/Prototypes/Reagents/pyrotechnic.yml |   26 +-
 Resources/Prototypes/Reagents/toxins.yml      |  127 +-
 .../Recipes/Crafting/Graphs/bots/hugbot.yml   |   33 -
 .../Prototypes/Recipes/Crafting/bots.yml      |    8 -
 .../Recipes/Lathes/Packs/biogen.yml           |    6 -
 .../Recipes/Lathes/Packs/medical.yml          |    1 -
 .../Recipes/Lathes/Packs/shared.yml           |    1 -
 .../Recipes/Lathes/Packs/syndicate.yml        |    2 -
 Resources/Prototypes/Recipes/Lathes/ammo.yml  |   16 -
 .../Prototypes/Recipes/Lathes/biogen.yml      |   21 +-
 .../Prototypes/Recipes/Lathes/chemistry.yml   |    4 +-
 Resources/Prototypes/Recipes/Lathes/sheet.yml |   10 -
 .../Recipes/Reactions/chemicals.yml           |    8 +-
 .../Prototypes/Recipes/Reactions/food.yml     |   26 +-
 .../Prototypes/Recipes/Reactions/fun.yml      |   14 +-
 .../Recipes/Reactions/pyrotechnic.yml         |    4 +-
 .../Prototypes/Recipes/Reactions/soap.yml     |   12 +-
 .../Stacks/{ => Materials}/Sheets/glass.yml   |   14 +-
 .../Stacks/{ => Materials}/Sheets/metal.yml   |    6 +-
 .../Stacks/{ => Materials}/Sheets/other.yml   |   13 +-
 .../Prototypes/Stacks/Materials/crystals.yml  |    5 +
 .../Prototypes/Stacks/Materials/ingots.yml    |   13 +
 .../Prototypes/Stacks/Materials/materials.yml |  111 +
 .../Prototypes/Stacks/{ => Materials}/ore.yml |   22 +-
 .../Prototypes/Stacks/Materials/parts.yml     |    6 +
 .../Prototypes/Stacks/Sheets/organic.yml      |   13 -
 .../Stacks/Specific/engineering.yml           |   36 -
 .../Prototypes/Stacks/Specific/security.yml   |    6 -
 Resources/Prototypes/Stacks/Tiles/alien.yml   |   38 -
 Resources/Prototypes/Stacks/Tiles/brass.yml   |   13 -
 Resources/Prototypes/Stacks/Tiles/carpet.yml  |   84 -
 .../Prototypes/Stacks/Tiles/concrete.yml      |   55 -
 .../Prototypes/Stacks/Tiles/electronic.yml    |   19 -
 Resources/Prototypes/Stacks/Tiles/fancy.yml   |   37 -
 Resources/Prototypes/Stacks/Tiles/faux.yml    |   55 -
 .../Prototypes/Stacks/Tiles/four_square.yml   |  112 -
 Resources/Prototypes/Stacks/Tiles/maints.yml  |   25 -
 Resources/Prototypes/Stacks/Tiles/organic.yml |   13 -
 Resources/Prototypes/Stacks/Tiles/other.yml   |   25 -
 Resources/Prototypes/Stacks/Tiles/planet.yml  |   19 -
 Resources/Prototypes/Stacks/Tiles/retro.yml   |   31 -
 Resources/Prototypes/Stacks/Tiles/shuttle.yml |   43 -
 Resources/Prototypes/Stacks/Tiles/steel.yml   |   55 -
 .../Prototypes/Stacks/Tiles/steel_dark.yml    |   55 -
 .../Prototypes/Stacks/Tiles/steel_white.yml   |   55 -
 Resources/Prototypes/Stacks/Tiles/wood.yml    |   19 -
 Resources/Prototypes/Stacks/base_stacks.yml   |   42 -
 Resources/Prototypes/Stacks/cloth.yml         |   27 -
 .../{consumable.yml => consumable_stacks.yml} |   27 +-
 Resources/Prototypes/Stacks/currency.yml      |   11 -
 .../Prototypes/Stacks/engineering_stacks.yml  |   12 +
 .../Prototypes/Stacks/floor_tile_stacks.yml   |  720 ++++++
 .../medical.yml => medical_stacks.yml}        |   16 +-
 Resources/Prototypes/Stacks/ore_refined.yml   |   30 -
 Resources/Prototypes/Stacks/organic.yml       |   59 -
 Resources/Prototypes/Stacks/other.yml         |   15 -
 Resources/Prototypes/Stacks/power_stacks.yml  |   30 +
 .../science.yml => science_stacks.yml}        |    6 +-
 Resources/Prototypes/Voice/auto_emotes.yml    |    9 -
 Resources/Prototypes/silicon-laws.yml         |    6 +
 Resources/Prototypes/tags.yml                 |    2 -
 .../Guidebook/Science/AnalysisConsole.xml     |   22 -
 .../Guidebook/Science/ArtifactReports.xml     |   24 +
 .../Guidebook/Science/UnlockingNodes.xml      |   48 -
 .../Guidebook/Science/Xenoarchaeology.xml     |   90 +-
 .../Gloves/Color/black.rsi/equipped-HAND.png  |  Bin 362 -> 381 bytes
 .../Gloves/Color/black.rsi/inhand-left.png    |  Bin 262 -> 16598 bytes
 .../Gloves/Color/black.rsi/inhand-right.png   |  Bin 276 -> 16598 bytes
 .../Hands/Gloves/Color/black.rsi/meta.json    |    2 +-
 .../Customization/human_hair.rsi/meta.json    |    6 +-
 .../human_hair.rsi/overeyepigtail.png         |  Bin 810 -> 0 bytes
 .../Mobs/Silicon/Bots/hugbot.rsi/hugbot.png   |  Bin 342 -> 0 bytes
 .../Mobs/Silicon/Bots/hugbot.rsi/meta.json    |   14 -
 .../Mobs/Species/Human/organs.rsi/meta.json   |    2 +-
 .../Mobs/Species/Human/organs.rsi/stomach.png |  Bin 384 -> 191 bytes
 .../Standard/hatch.rsi/bolted_unlit.png       |  Bin 105 -> 324 bytes
 .../Standard/hatch.rsi/closed_unlit.png       |  Bin 106 -> 339 bytes
 .../Airlocks/Standard/hatch.rsi/closing.png   |  Bin 2575 -> 2938 bytes
 .../Standard/hatch.rsi/closing_unlit.png      |  Bin 193 -> 1163 bytes
 .../Standard/hatch.rsi/deny_unlit.png         |  Bin 250 -> 925 bytes
 .../Standard/hatch.rsi/emergency_unlit.png    |  Bin 110 -> 340 bytes
 .../Airlocks/Standard/hatch.rsi/meta.json     |  390 +--
 .../Airlocks/Standard/hatch.rsi/open.png      |  Bin 313 -> 586 bytes
 .../Airlocks/Standard/hatch.rsi/opening.png   |  Bin 2513 -> 3052 bytes
 .../Standard/hatch.rsi/opening_unlit.png      |  Bin 197 -> 1162 bytes
 .../Standard/hatch_maint.rsi/assembly.png     |  Bin 895 -> 752 bytes
 .../Standard/hatch_maint.rsi/bolted_unlit.png |  Bin 105 -> 324 bytes
 .../Standard/hatch_maint.rsi/closed.png       |  Bin 1011 -> 775 bytes
 .../Standard/hatch_maint.rsi/closed_unlit.png |  Bin 106 -> 339 bytes
 .../Standard/hatch_maint.rsi/closing.png      |  Bin 2738 -> 1643 bytes
 .../hatch_maint.rsi/closing_unlit.png         |  Bin 193 -> 1163 bytes
 .../Standard/hatch_maint.rsi/deny_unlit.png   |  Bin 250 -> 925 bytes
 .../hatch_maint.rsi/emergency_unlit.png       |  Bin 110 -> 340 bytes
 .../Standard/hatch_maint.rsi/meta.json        |  390 +--
 .../Standard/hatch_maint.rsi/open.png         |  Bin 562 -> 593 bytes
 .../Standard/hatch_maint.rsi/opening.png      |  Bin 2686 -> 1639 bytes
 .../hatch_maint.rsi/opening_unlit.png         |  Bin 197 -> 1162 bytes
 .../Standard/hatch_maint.rsi/panel_open.png   |  Bin 184 -> 514 bytes
 .../Standard/hatch_syndicate.rsi/assembly.png |  Bin 871 -> 0 bytes
 .../hatch_syndicate.rsi/bolted_unlit.png      |  Bin 105 -> 0 bytes
 .../Standard/hatch_syndicate.rsi/closed.png   |  Bin 400 -> 0 bytes
 .../hatch_syndicate.rsi/closed_unlit.png      |  Bin 106 -> 0 bytes
 .../Standard/hatch_syndicate.rsi/closing.png  |  Bin 2613 -> 0 bytes
 .../hatch_syndicate.rsi/closing_unlit.png     |  Bin 193 -> 0 bytes
 .../hatch_syndicate.rsi/deny_unlit.png        |  Bin 250 -> 0 bytes
 .../hatch_syndicate.rsi/emergency_unlit.png   |  Bin 110 -> 0 bytes
 .../Standard/hatch_syndicate.rsi/meta.json    |  198 --
 .../Standard/hatch_syndicate.rsi/open.png     |  Bin 528 -> 0 bytes
 .../Standard/hatch_syndicate.rsi/opening.png  |  Bin 2547 -> 0 bytes
 .../hatch_syndicate.rsi/opening_unlit.png     |  Bin 197 -> 0 bytes
 .../hatch_syndicate.rsi/panel_closing.png     |  Bin 451 -> 0 bytes
 .../hatch_syndicate.rsi/panel_open.png        |  Bin 184 -> 0 bytes
 .../hatch_syndicate.rsi/panel_opening.png     |  Bin 432 -> 0 bytes
 .../Standard/hatch_syndicate.rsi/sparks.png   |  Bin 697 -> 0 bytes
 .../hatch_syndicate.rsi/sparks_broken.png     |  Bin 315 -> 0 bytes
 .../hatch_syndicate.rsi/sparks_damaged.png    |  Bin 184 -> 0 bytes
 .../hatch_syndicate.rsi/sparks_open.png       |  Bin 281 -> 0 bytes
 .../Standard/hatch_syndicate.rsi/welded.png   |  Bin 341 -> 0 bytes
 .../bluespace_ARACHNID.png                    |  Bin 3858 -> 0 bytes
 .../inner_anom_layer.rsi/bluespace_MOTH.png   |  Bin 3775 -> 0 bytes
 .../inner_anom_layer.rsi/fire_ARACHNID.png    |  Bin 3567 -> 0 bytes
 .../inner_anom_layer.rsi/fire_MOTH.png        |  Bin 3541 -> 0 bytes
 .../inner_anom_layer.rsi/flesh_ARACHNID.png   |  Bin 4232 -> 0 bytes
 .../inner_anom_layer.rsi/flesh_MOTH.png       |  Bin 4127 -> 0 bytes
 .../inner_anom_layer.rsi/flora_ARACHNID.png   |  Bin 4776 -> 0 bytes
 .../inner_anom_layer.rsi/flora_MOTH.png       |  Bin 4692 -> 0 bytes
 .../inner_anom_layer.rsi/frost_ARACHNID.png   |  Bin 5145 -> 0 bytes
 .../inner_anom_layer.rsi/frost_MOTH.png       |  Bin 5018 -> 0 bytes
 .../inner_anom_layer.rsi/grav_ARACHNID.png    |  Bin 5253 -> 0 bytes
 .../inner_anom_layer.rsi/grav_MOTH.png        |  Bin 5304 -> 0 bytes
 .../Anomalies/inner_anom_layer.rsi/meta.json  | 1938 +++++---------
 .../inner_anom_layer.rsi/rock_ARACHNID.png    |  Bin 4456 -> 0 bytes
 .../inner_anom_layer.rsi/rock_MOTH.png        |  Bin 4454 -> 0 bytes
 .../inner_anom_layer.rsi/shadow_ARACHNID.png  |  Bin 3807 -> 0 bytes
 .../inner_anom_layer.rsi/shadow_MOTH.png      |  Bin 3749 -> 0 bytes
 .../inner_anom_layer.rsi/shock_ARACHNID.png   |  Bin 3795 -> 0 bytes
 .../inner_anom_layer.rsi/shock_MOTH.png       |  Bin 3615 -> 0 bytes
 .../inner_anom_layer.rsi/tech_ARACHNID.png    |  Bin 4136 -> 0 bytes
 .../inner_anom_layer.rsi/tech_MOTH.png        |  Bin 4073 -> 0 bytes
 Resources/migration.yml                       |    4 +-
 Tools/dump_patrons.ps1                        |    2 +-
 Tools/mapping-merge-driver.sh                 |    2 +-
 runclient-Tools.sh                            |    2 +-
 runclient.sh                                  |    2 +-
 runserver-Tools.sh                            |    2 +-
 runserver.sh                                  |    2 +-
 600 files changed, 10184 insertions(+), 13707 deletions(-)
 create mode 100644 Content.Client/Crayon/CrayonComponent.cs
 delete mode 100644 Content.Client/Damage/Systems/DamageOtherOnHitSystem.cs
 create mode 100644 Content.Client/PAI/PAISystem.cs
 delete mode 100644 Content.Client/Silicons/Bots/HugBotSystem.cs
 delete mode 100644 Content.Client/Temperature/Systems/TemperatureSystem.cs
 create mode 100644 Content.Server/Crayon/CrayonComponent.cs
 create mode 100644 Content.Server/Damage/Components/DamageOtherOnHitComponent.cs
 delete mode 100644 Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs
 delete mode 100644 Content.Server/EntityConditions/Conditions/MetabolizerTypesEntityConditionSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationModEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/EmoteEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs
 delete mode 100644 Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
 create mode 100644 Content.Server/EntityEffects/EntityEffectSystem.cs
 delete mode 100644 Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs
 delete mode 100644 Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs
 delete mode 100644 Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs
 delete mode 100644 Content.Server/Silicons/Bots/HugBotSystem.cs
 delete mode 100644 Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs
 rename {Content.Shared => Content.Server}/Temperature/Components/TemperatureComponent.cs (98%)
 rename {Content.Shared => Content.Server}/Zombies/IncurableZombieComponent.cs (77%)
 delete mode 100644 Content.Shared/Crayon/CrayonComponent.cs
 create mode 100644 Content.Shared/Crayon/SharedCrayonComponent.cs
 delete mode 100644 Content.Shared/Damage/Components/DamageOtherOnHitComponent.cs
 delete mode 100644 Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs
 delete mode 100644 Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs
 delete mode 100644 Content.Shared/EntityConditions/SharedEntityConditionsSystem.cs
 create mode 100644 Content.Shared/EntityEffects/EffectConditions/BodyTemperature.cs
 create mode 100644 Content.Shared/EntityEffects/EffectConditions/BreathingCondition.cs
 create mode 100644 Content.Shared/EntityEffects/EffectConditions/HasTagCondition.cs
 create mode 100644 Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
 create mode 100644 Content.Shared/EntityEffects/EffectConditions/JobCondition.cs
 create mode 100644 Content.Shared/EntityEffects/EffectConditions/MobStateCondition.cs
 create mode 100644 Content.Shared/EntityEffects/EffectConditions/OrganType.cs
 create mode 100644 Content.Shared/EntityEffects/EffectConditions/ReagentThreshold.cs
 create mode 100644 Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
 create mode 100644 Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
 create mode 100644 Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/AddToSolutionReaction.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/AdjustAlert.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/AdjustReagent.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/AdjustTemperature.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/AreaReactionEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ArtifactUnlock.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/BasePlantAdjustAttributeEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealth.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevel.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationMod.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutrition.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotency.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWater.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowth.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStat.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadone.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamine.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximine.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeeds.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvest.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/CauseZombieInfection.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ChemCleanBloodstream.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ChemHealEyeDamage.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ChemVomit.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/CreateEntityReactionEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/CreateGas.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/CureZombieInfection.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Drunk.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Electrocute.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Emote.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/EmoteEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/EvenHealthChange.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs
 rename Content.Shared/EntityEffects/Effects/{Transform/ExplosionEntityEffect.cs => ExplosionReactionEffect.cs} (69%)
 create mode 100644 Content.Shared/EntityEffects/Effects/ExtinguishReaction.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/FlammableReaction.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Glow.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/HealthChange.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Ignite.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/MakeSentient.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ModifyBleedAmount.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ModifyBloodLevel.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ModifyLungGas.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/MovespeedModifier.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Oxygenate.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Paralyze.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
 rename Content.Shared/EntityEffects/Effects/{Botany/PlantAttributes => PlantMetabolism}/PlantAdjustPests.cs (53%)
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs
 rename Content.Shared/EntityEffects/Effects/{Botany/PlantAttributes => PlantMetabolism}/PlantAdjustToxins.cs (53%)
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
 rename Content.Shared/EntityEffects/Effects/{Botany/PlantAttributes => PlantMetabolism}/PlantAdjustWeeds.cs (53%)
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantChangeStat.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMutateChemicals.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMutateGases.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantMutateHarvest.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PlantSpeciesChange.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Polymorph.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/PopupMessage.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ReduceRotting.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/ResetNarcolepsy.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/SatiateHunger.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/SatiateThirst.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/Slipify.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Solution/AdjustReagentsByGroupEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/SolutionTemperatureEffects.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/Jitter.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/WashCreamPieReaction.cs
 create mode 100644 Content.Shared/EntityEffects/Effects/WearableReaction.cs
 delete mode 100644 Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs
 create mode 100644 Content.Shared/EntityEffects/EntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/EntityEffectCondition.cs
 create mode 100644 Content.Shared/EntityEffects/EventEntityEffect.cs
 create mode 100644 Content.Shared/EntityEffects/EventEntityEffectCondition.cs
 delete mode 100644 Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs
 create mode 100644 Content.Shared/Ninja/Components/BombingTargetComponent.cs
 create mode 100644 Content.Shared/PAI/SharedPAISystem.cs
 delete mode 100644 Content.Shared/Silicons/Bots/HugBotComponent.cs
 delete mode 100644 Content.Shared/Silicons/Bots/SharedHugBotSystem.cs
 delete mode 100644 Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs
 delete mode 100644 Content.Shared/Trigger/Components/Conditions/MindRoleTriggerConditionComponent.cs
 delete mode 100644 Resources/Locale/en-US/ghost/make-ghost-gui.ftl
 rename Resources/Locale/en-US/guidebook/{entity-effects => chemistry}/conditions.ftl (100%)
 rename Resources/Locale/en-US/guidebook/{entity-effects => chemistry}/effects.ftl (71%)
 rename Resources/Locale/en-US/guidebook/{entity-effects => chemistry}/healthchange.ftl (100%)
 create mode 100644 Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
 delete mode 100644 Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl
 delete mode 100644 Resources/Locale/en-US/npc/hugbot.ftl
 delete mode 100644 Resources/Locale/en-US/npc/npc-debug.ftl
 delete mode 100644 Resources/Locale/en-US/ui/stat-values.ftl
 delete mode 100644 Resources/Prototypes/Catalog/hugbot.yml
 delete mode 100644 Resources/Prototypes/NPCs/hugbot.yml
 delete mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml
 rename Resources/Prototypes/Stacks/{ => Materials}/Sheets/glass.yml (87%)
 rename Resources/Prototypes/Stacks/{ => Materials}/Sheets/metal.yml (85%)
 rename Resources/Prototypes/Stacks/{ => Materials}/Sheets/other.yml (68%)
 create mode 100644 Resources/Prototypes/Stacks/Materials/crystals.yml
 create mode 100644 Resources/Prototypes/Stacks/Materials/ingots.yml
 create mode 100644 Resources/Prototypes/Stacks/Materials/materials.yml
 rename Resources/Prototypes/Stacks/{ => Materials}/ore.yml (83%)
 create mode 100644 Resources/Prototypes/Stacks/Materials/parts.yml
 delete mode 100644 Resources/Prototypes/Stacks/Sheets/organic.yml
 delete mode 100644 Resources/Prototypes/Stacks/Specific/engineering.yml
 delete mode 100644 Resources/Prototypes/Stacks/Specific/security.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/alien.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/brass.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/carpet.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/concrete.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/electronic.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/fancy.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/faux.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/four_square.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/maints.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/organic.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/other.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/planet.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/retro.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/shuttle.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/steel.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/steel_dark.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/steel_white.yml
 delete mode 100644 Resources/Prototypes/Stacks/Tiles/wood.yml
 delete mode 100644 Resources/Prototypes/Stacks/base_stacks.yml
 delete mode 100644 Resources/Prototypes/Stacks/cloth.yml
 rename Resources/Prototypes/Stacks/{consumable.yml => consumable_stacks.yml} (78%)
 delete mode 100644 Resources/Prototypes/Stacks/currency.yml
 create mode 100644 Resources/Prototypes/Stacks/engineering_stacks.yml
 create mode 100644 Resources/Prototypes/Stacks/floor_tile_stacks.yml
 rename Resources/Prototypes/Stacks/{Specific/medical.yml => medical_stacks.yml} (85%)
 delete mode 100644 Resources/Prototypes/Stacks/ore_refined.yml
 delete mode 100644 Resources/Prototypes/Stacks/organic.yml
 delete mode 100644 Resources/Prototypes/Stacks/other.yml
 create mode 100644 Resources/Prototypes/Stacks/power_stacks.yml
 rename Resources/Prototypes/Stacks/{Specific/science.yml => science_stacks.yml} (63%)
 delete mode 100644 Resources/ServerInfo/Guidebook/Science/AnalysisConsole.xml
 create mode 100644 Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
 delete mode 100644 Resources/ServerInfo/Guidebook/Science/UnlockingNodes.xml
 delete mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/hugbot.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/meta.json
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/assembly.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/bolted_unlit.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed_unlit.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing_unlit.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/deny_unlit.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/emergency_unlit.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/meta.json
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/open.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening_unlit.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_closing.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_open.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_opening.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_broken.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_damaged.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_open.png
 delete mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/welded.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_ARACHNID.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_MOTH.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_ARACHNID.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_MOTH.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_ARACHNID.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_MOTH.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_ARACHNID.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_MOTH.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_ARACHNID.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_MOTH.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_ARACHNID.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_MOTH.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_ARACHNID.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_MOTH.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_ARACHNID.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_MOTH.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_ARACHNID.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_MOTH.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_ARACHNID.png
 delete mode 100644 Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_MOTH.png

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index defe08ef23..14f591ec87 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -28,7 +28,6 @@
 
 /Content.*/Stunnable/ @Princess-Cheeseballs
 /Content.*/Nutrition/ @Princess-Cheeseballs
-/Content.*/EntityEffects @Princess-Cheeseballs @sowelipililimute
 
 # SKREEEE
 /Content.*.Database/ @PJB3005 @DrSmugleaf
diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py
index bd6603bd34..66d2463669 100644
--- a/BuildChecker/git_helper.py
+++ b/BuildChecker/git_helper.py
@@ -13,7 +13,7 @@ from typing import List
 
 SOLUTION_PATH = Path("..") / "SpaceStation14.sln"
 # If this doesn't match the saved version we overwrite them all.
-CURRENT_HOOKS_VERSION = "4"
+CURRENT_HOOKS_VERSION = "3"
 QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"
 
 
diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout
index 1b91112ff0..ee4309de1d 100755
--- a/BuildChecker/hooks/post-checkout
+++ b/BuildChecker/hooks/post-checkout
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 gitroot=$(git rev-parse --show-toplevel)
 
diff --git a/BuildChecker/hooks/post-merge b/BuildChecker/hooks/post-merge
index 864a9cff50..5cf3d91120 100755
--- a/BuildChecker/hooks/post-merge
+++ b/BuildChecker/hooks/post-merge
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Just call post-checkout since it does the same thing.
 gitroot=$(git rev-parse --git-path hooks)
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
index 0a695a3dce..a2f5f3382b 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
@@ -1,7 +1,6 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             MinSize="650 290">
     <BoxContainer Orientation="Vertical">
-        <!-- Privileged and target IDs, crew manifest button. -->
         <GridContainer Columns="2">
             <GridContainer Columns="3" HorizontalExpand="True">
                 <Label Text="{Loc 'id-card-console-window-privileged-id'}" />
@@ -17,7 +16,6 @@
             </BoxContainer>
         </GridContainer>
         <Control MinSize="0 8" />
-        <!-- Full name and job title editing. -->
         <GridContainer Columns="3" HSeparationOverride="4">
             <Label Name="FullNameLabel" Text="{Loc 'id-card-console-window-full-name-label'}" />
             <LineEdit Name="FullNameLineEdit" HorizontalExpand="True" />
@@ -28,19 +26,10 @@
             <Button Name="JobTitleSaveButton" Text="{Loc 'id-card-console-window-save-button'}" Disabled="True" />
         </GridContainer>
         <Control MinSize="0 8" />
-        <!-- Job preset selection, grant/revoke all access buttons. -->
-        <BoxContainer Margin="0 8 0 4">
-            <BoxContainer>
-                <Label Text="{Loc 'id-card-console-window-job-selection-label'}" />
-                <OptionButton Name="JobPresetOptionButton" />
-            </BoxContainer>
-            <Control HorizontalExpand="True"/>
-            <BoxContainer>
-                <Button Name="SelectAllButton" Text="{Loc 'id-card-console-window-select-all-button'}" />
-                <Button Name="DeselectAllButton" Text="{Loc 'id-card-console-window-deselect-all-button'}" />
-            </BoxContainer>
-        </BoxContainer>
-        <!-- Individual access buttons -->
+        <GridContainer Columns="2">
+            <Label Text="{Loc 'id-card-console-window-job-selection-label'}" />
+            <OptionButton Name="JobPresetOptionButton" />
+        </GridContainer>
         <Control Name="AccessLevelControlContainer" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
index 30a7d969b6..202653f700 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
@@ -79,18 +79,6 @@ namespace Content.Client.Access.UI
                 JobPresetOptionButton.AddItem(Loc.GetString(job.Name), _jobPrototypeIds.Count - 1);
             }
 
-            SelectAllButton.OnPressed += _ =>
-            {
-                SetAllAccess(true);
-                SubmitData();
-            };
-
-            DeselectAllButton.OnPressed += _ =>
-            {
-                SetAllAccess(false);
-                SubmitData();
-            };
-
             JobPresetOptionButton.OnItemSelected += SelectJobPreset;
             _accessButtons.Populate(accessLevels, prototypeManager);
             AccessLevelControlContainer.AddChild(_accessButtons);
@@ -101,13 +89,14 @@ namespace Content.Client.Access.UI
             }
         }
 
-        /// <param name="enabled">If true, every individual access button will be pressed. If false, each will be depressed.</param>
-        private void SetAllAccess(bool enabled)
+        private void ClearAllAccess()
         {
             foreach (var button in _accessButtons.ButtonsList.Values)
             {
-                if (!button.Disabled && button.Pressed != enabled)
-                    button.Pressed = enabled;
+                if (button.Pressed)
+                {
+                    button.Pressed = false;
+                }
             }
         }
 
@@ -121,7 +110,7 @@ namespace Content.Client.Access.UI
             JobTitleLineEdit.Text = Loc.GetString(job.Name);
             args.Button.SelectId(args.Id);
 
-            SetAllAccess(false);
+            ClearAllAccess();
 
             // this is a sussy way to do this
             foreach (var access in job.Access)
diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
index 7566942506..d20c741673 100644
--- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
+++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
@@ -226,7 +226,7 @@ public sealed partial class BanPanel : DefaultWindow
         var roleGroupCheckbox = new Button
         {
             Name = $"{groupName}GroupCheckbox",
-            Text = Loc.GetString("role-bans-ban-group"),
+            Text = "Ban all",
             Margin = new Thickness(0, 0, 5, 0),
             ToggleMode = true,
         };
@@ -391,7 +391,7 @@ public sealed partial class BanPanel : DefaultWindow
         TimeLine.Text = args.Text;
         if (!double.TryParse(args.Text, out var result))
         {
-            ExpiresLabel.Text = Loc.GetString("ban-panel-expiry-error");
+            ExpiresLabel.Text = "err";
             ErrorLevel |= ErrorLevelEnum.Minutes;
             TimeLine.ModulateSelfOverride = Color.Red;
             UpdateSubmitEnabled();
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
index 28aca23f75..1544b827ae 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
@@ -166,7 +166,7 @@ public sealed class AdminLogsEui : BaseEui
         ClydeWindow = _clyde.CreateWindow(new WindowCreateParameters
         {
             Maximized = false,
-            Title = Loc.GetString("admin-logs-title"),
+            Title = "Admin Logs",
             Monitor = monitor,
             Width = 1100,
             Height = 400
diff --git a/Content.Client/Crayon/CrayonComponent.cs b/Content.Client/Crayon/CrayonComponent.cs
new file mode 100644
index 0000000000..5729c616c2
--- /dev/null
+++ b/Content.Client/Crayon/CrayonComponent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.Crayon;
+using Robust.Shared.GameObjects;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Client.Crayon
+{
+    [RegisterComponent]
+    public sealed partial class CrayonComponent : SharedCrayonComponent
+    {
+        [ViewVariables(VVAccess.ReadWrite)] public bool UIUpdateNeeded;
+        [ViewVariables] public int Charges { get; set; }
+        [ViewVariables] public int Capacity { get; set; }
+    }
+}
diff --git a/Content.Client/Crayon/CrayonSystem.cs b/Content.Client/Crayon/CrayonSystem.cs
index e990263bf3..dc03979481 100644
--- a/Content.Client/Crayon/CrayonSystem.cs
+++ b/Content.Client/Crayon/CrayonSystem.cs
@@ -1,52 +1,67 @@
 using Content.Client.Items;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
-using Content.Shared.Charges.Components;
-using Content.Shared.Charges.Systems;
 using Content.Shared.Crayon;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
+using Robust.Shared.Localization;
 using Robust.Shared.Timing;
 
 namespace Content.Client.Crayon;
 
 public sealed class CrayonSystem : SharedCrayonSystem
 {
-    [Dependency] private readonly SharedChargesSystem _charges = default!;
-    [Dependency] private readonly EntityManager _entityManager = default!;
-
+    // Didn't do in shared because I don't think most of the server stuff can be predicted.
     public override void Initialize()
     {
         base.Initialize();
+        SubscribeLocalEvent<CrayonComponent, ComponentHandleState>(OnCrayonHandleState);
+        Subs.ItemStatus<CrayonComponent>(ent => new StatusControl(ent));
+    }
 
-        Subs.ItemStatus<CrayonComponent>(ent => new StatusControl(ent, _charges, _entityManager));
+    private static void OnCrayonHandleState(EntityUid uid, CrayonComponent component, ref ComponentHandleState args)
+    {
+        if (args.Current is not CrayonComponentState state) return;
+
+        component.Color = state.Color;
+        component.SelectedState = state.State;
+        component.Charges = state.Charges;
+        component.Capacity = state.Capacity;
+
+        component.UIUpdateNeeded = true;
     }
 
     private sealed class StatusControl : Control
     {
-        private readonly Entity<CrayonComponent> _crayon;
-        private readonly SharedChargesSystem _charges;
+        private readonly CrayonComponent _parent;
         private readonly RichTextLabel _label;
-        private readonly int _capacity;
 
-        public StatusControl(Entity<CrayonComponent> crayon, SharedChargesSystem charges, EntityManager entityManage)
+        public StatusControl(CrayonComponent parent)
         {
-            _crayon = crayon;
-            _charges = charges;
-            _capacity = entityManage.GetComponent<LimitedChargesComponent>(_crayon.Owner).MaxCharges;
+            _parent = parent;
             _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
             AddChild(_label);
+
+            parent.UIUpdateNeeded = true;
         }
 
         protected override void FrameUpdate(FrameEventArgs args)
         {
             base.FrameUpdate(args);
 
+            if (!_parent.UIUpdateNeeded)
+            {
+                return;
+            }
+
+            _parent.UIUpdateNeeded = false;
             _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label",
-                ("color",_crayon.Comp.Color),
-                ("state",_crayon.Comp.SelectedState),
-                ("charges", _charges.GetCurrentCharges(_crayon.Owner)),
-                ("capacity", _capacity)));
+                ("color",_parent.Color),
+                ("state",_parent.SelectedState),
+                ("charges", _parent.Charges),
+                ("capacity",_parent.Capacity)));
         }
     }
 }
diff --git a/Content.Client/Credits/CreditsWindow.xaml.cs b/Content.Client/Credits/CreditsWindow.xaml.cs
index 6035bcc2bd..050d801170 100644
--- a/Content.Client/Credits/CreditsWindow.xaml.cs
+++ b/Content.Client/Credits/CreditsWindow.xaml.cs
@@ -100,11 +100,11 @@ public sealed partial class CreditsWindow : DefaultWindow
 
         var container = new BoxContainer { Orientation = LayoutOrientation.Horizontal };
 
-        var previousPageButton = new Button { Text = Loc.GetString("credits-window-previous-page-button") };
+        var previousPageButton = new Button { Text = "Previous Page" };
         previousPageButton.OnPressed +=
             _ => PopulateAttributions(attributionsContainer, count - AttributionsSourcesPerPage);
 
-        var nextPageButton = new Button { Text = Loc.GetString("credits-window-next-page-button") };
+        var nextPageButton = new Button { Text = "Next Page" };
         nextPageButton.OnPressed +=
             _ => PopulateAttributions(attributionsContainer, count + AttributionsSourcesPerPage);
 
diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
index f88fa07f5a..179304a978 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
@@ -58,7 +58,7 @@
                            StyleClasses="LabelBig" />
                     <BoxContainer Orientation="Horizontal"
                                   Margin="0 0 0 5">
-                        <Label Text="{Loc 'crew-monitoring-ui-job-label'}"
+                        <Label Text="{Loc 'crew-monitoring-user-interface-job'}"
                                FontColorOverride="DarkGray" />
                         <TextureRect Name="PersonJobIcon"
                                      TextureScale="2 2"
diff --git a/Content.Client/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Client/Damage/Systems/DamageOtherOnHitSystem.cs
deleted file mode 100644
index a78603c22c..0000000000
--- a/Content.Client/Damage/Systems/DamageOtherOnHitSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using Content.Shared.Damage.Systems;
-
-namespace Content.Client.Damage.Systems;
-
-public sealed class DamageOtherOnHitSystem : SharedDamageOtherOnHitSystem;
diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
index 1f543cf402..78e65db2a3 100644
--- a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
+++ b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
@@ -4,11 +4,11 @@
         <BoxContainer Orientation="Vertical" HorizontalExpand="True">
             <humanoid:MarkingPicker Name="MarkingPickerWidget" />
             <BoxContainer>
-                <CheckBox Name="MarkingForced" Text="{Loc humanoid-marking-modifier-force}" Pressed="True" />
-                <CheckBox Name="MarkingIgnoreSpecies" Text="{Loc humanoid-marking-modifier-ignore-species}" Pressed="True" />
+                <CheckBox Name="MarkingForced" Text="Force" Pressed="True" />
+                <CheckBox Name="MarkingIgnoreSpecies" Text="Ignore Species" Pressed="True" />
             </BoxContainer>
             <Collapsible HorizontalExpand="True">
-                <CollapsibleHeading Title="{Loc humanoid-marking-modifier-base-layers}" />
+                <CollapsibleHeading Title="Base layers" />
                 <CollapsibleBody HorizontalExpand="True">
                     <BoxContainer Name="BaseLayersContainer" Orientation="Vertical" HorizontalExpand="True" />
                 </CollapsibleBody>
diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
index 4d9d6a90ba..4cde587c58 100644
--- a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
+++ b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
@@ -118,7 +118,7 @@ public sealed partial class HumanoidMarkingModifierWindow : DefaultWindow
             });
             _enable = new CheckBox
             {
-                Text = Loc.GetString("humanoid-marking-modifier-enable"),
+                Text = "Enable",
                 HorizontalAlignment = HAlignment.Right
             };
 
@@ -134,8 +134,8 @@ public sealed partial class HumanoidMarkingModifierWindow : DefaultWindow
                 OnStateChanged!();
             };
 
-            var lineEditBox = new BoxContainer { SeparationOverride = 4 };
-            lineEditBox.AddChild(new Label { Text = Loc.GetString("humanoid-marking-modifier-prototype-id") });
+            var lineEditBox = new BoxContainer();
+            lineEditBox.AddChild(new Label { Text = "Prototype id: "});
 
             // TODO: This line edit should really be an options / dropdown selector, not text.
             _lineEdit = new() { MinWidth = 200 };
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index b568491b67..821722ec35 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -607,7 +607,6 @@ namespace Content.Client.Lobby.UI
             _species.Clear();
 
             _species.AddRange(_prototypeManager.EnumeratePrototypes<SpeciesPrototype>().Where(o => o.RoundStart));
-            _species.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.CurrentCultureIgnoreCase));
             var speciesIds = _species.Select(o => o.ID).ToList();
 
             for (var i = 0; i < _species.Count; i++)
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
index 1a68099de0..651c76e61f 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
@@ -62,7 +62,7 @@ public sealed partial class CrewMonitoringNavMapControl : NavMapControl
                 continue;
 
             if (!LocalizedNames.TryGetValue(netEntity, out var name))
-                name = Loc.GetString("navmap-unknown-entity");
+                name = "Unknown";
 
             var message = name + "\n" + Loc.GetString("navmap-location",
                 ("x", MathF.Round(blip.Coordinates.X)),
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
index 86e1ce689a..dd40749d33 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
@@ -1,7 +1,7 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                xmlns:ui="clr-namespace:Content.Client.Medical.CrewMonitoring"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-               Title="{Loc crew-monitoring-ui-title}"
+               Title="{Loc 'crew-monitoring-user-interface-title'}"
                Resizable="False"
                SetSize="1210 700"
                MinSize="1210 700">
@@ -11,12 +11,12 @@
             <BoxContainer Orientation="Vertical" Margin="0 0 10 0">
                 <controls:StripeBack>
                     <PanelContainer>
-                        <Label Name="StationName" Text="{Loc crew-monitoring-ui-no-station-label}" Align="Center" Margin="0 5 0 3"/>
+                        <Label Name="StationName" Text="Unknown station" Align="Center" Margin="0 5 0 3"/>
                     </PanelContainer>
                 </controls:StripeBack>
 
                 <LineEdit Name="SearchLineEdit" HorizontalExpand="True"
-                          PlaceHolder="{Loc crew-monitoring-ui-filter-line-placeholder}" />
+                          PlaceHolder="{Loc crew-monitor-filter-line-placeholder}" />
 
                 <ScrollContainer Name="SensorScroller"
                                  VerticalExpand="True"
@@ -29,7 +29,7 @@
                         <!-- Table rows are filled by code -->
                     </BoxContainer>
                     <Label  Name="NoServerLabel"
-                            Text="{Loc crew-monitoring-ui-no-server-label}"
+                            Text="{Loc 'crew-monitoring-user-interface-no-server'}"
                             StyleClasses="LabelHeading"
                             FontColorOverride="Red"
                             HorizontalAlignment="Center"
@@ -42,8 +42,8 @@
         <BoxContainer Orientation="Vertical">
             <PanelContainer StyleClasses="LowDivider" />
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
-                <Label Text="{Loc crew-monitoring-ui-flavor-left-label}" StyleClasses="WindowFooterText" />
-                <Label Text="{Loc crew-monitoring-ui-flavor-right-label}" StyleClasses="WindowFooterText"
+                <Label Text="{Loc 'crew-monitoring-user-interface-flavor-left'}" StyleClasses="WindowFooterText" />
+                <Label Text="{Loc 'crew-monitoring-user-interface-flavor-right'}" StyleClasses="WindowFooterText"
                         HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
                 <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered"
                         VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
index 7b69d08267..b3b3508169 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -155,7 +155,7 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
                 HorizontalExpand = true,
             };
 
-            deparmentLabel.SetMessage(Loc.GetString("crew-monitoring-ui-no-department-label"));
+            deparmentLabel.SetMessage(Loc.GetString("crew-monitoring-user-interface-no-department"));
             deparmentLabel.StyleClasses.Add(StyleNano.StyleClassTooltipActionDescription);
 
             SensorsTable.AddChild(deparmentLabel);
diff --git a/Content.Client/NPC/NPCWindow.xaml b/Content.Client/NPC/NPCWindow.xaml
index bff05bc093..68e58eca46 100644
--- a/Content.Client/NPC/NPCWindow.xaml
+++ b/Content.Client/NPC/NPCWindow.xaml
@@ -1,24 +1,24 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-            Title="{Loc npc-debug-overlay-window-title}"
+            Title="NPC debug"
             MinSize="200 200">
     <BoxContainer Name="Options" Orientation="Vertical" Margin="8 8">
         <controls:StripeBack>
-            <Label Text="{Loc npc-debug-overlay-window-section-npc-label}" HorizontalAlignment="Center"/>
+            <Label Text="NPC" HorizontalAlignment="Center"/>
         </controls:StripeBack>
         <BoxContainer Name="NPCBox" Orientation="Vertical">
-            <CheckBox Name="NPCThonk" Text="{Loc npc-debug-overlay-window-show-htn-tree-checkbox}"/>
+            <CheckBox Name="NPCThonk" Text="Thonk"/>
         </BoxContainer>
         <controls:StripeBack>
-            <Label Text="{Loc npc-debug-overlay-window-section-pathfinder-label}" HorizontalAlignment="Center"/>
+            <Label Text="Pathfinder" HorizontalAlignment="Center"/>
         </controls:StripeBack>
         <BoxContainer Name="PathfinderBox" Orientation="Vertical">
-            <CheckBox Name="PathCrumbs" Text="{Loc npc-debug-overlay-window-path-breadcrumbs-checkbox}"/>
-            <CheckBox Name="PathPolys" Text="{Loc npc-debug-overlay-window-path-polygons-checkbox}"/>
-            <CheckBox Name="PathNeighbors" Text="{Loc npc-debug-overlay-window-path-neighbors-checkbox}"/>
-            <CheckBox Name="PathRouteCosts" Text="{Loc npc-debug-overlay-window-path-route-costs-checkbox}"/>
-            <CheckBox Name="PathRoutes" Text="{Loc npc-debug-overlay-window-path-routes-checkbox}"/>
+            <CheckBox Name="PathCrumbs" Text="Breadcrumbs"/>
+            <CheckBox Name="PathPolys" Text="Polygons"/>
+            <CheckBox Name="PathNeighbors" Text="Neighbors"/>
+            <CheckBox Name="PathRouteCosts" Text="Route costs"/>
+            <CheckBox Name="PathRoutes" Text="Routes"/>
         </BoxContainer>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/PAI/PAISystem.cs b/Content.Client/PAI/PAISystem.cs
new file mode 100644
index 0000000000..a28cf6a077
--- /dev/null
+++ b/Content.Client/PAI/PAISystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.PAI;
+
+namespace Content.Client.PAI
+{
+    public sealed class PAISystem : SharedPAISystem
+    {
+    }
+}
diff --git a/Content.Client/Physics/JointVisualsOverlay.cs b/Content.Client/Physics/JointVisualsOverlay.cs
index ddac71f4ea..9cc2831d21 100644
--- a/Content.Client/Physics/JointVisualsOverlay.cs
+++ b/Content.Client/Physics/JointVisualsOverlay.cs
@@ -36,7 +36,7 @@ public sealed class JointVisualsOverlay : Overlay
             if (xform.MapID != args.MapId)
                 continue;
 
-            var other = visuals.Target;
+            var other = _entManager.GetEntity(visuals.Target);
 
             if (!xformQuery.TryGetComponent(other, out var otherXform))
                 continue;
@@ -45,7 +45,7 @@ public sealed class JointVisualsOverlay : Overlay
                 continue;
 
             var texture = spriteSystem.Frame0(visuals.Sprite);
-            var width = texture.Width / (float)EyeManager.PixelsPerMeter;
+            var width = texture.Width / (float) EyeManager.PixelsPerMeter;
 
             var coordsA = xform.Coordinates;
             var coordsB = otherXform.Coordinates;
@@ -58,7 +58,7 @@ public sealed class JointVisualsOverlay : Overlay
 
             var posA = xformSystem.ToMapCoordinates(coordsA).Position;
             var posB = xformSystem.ToMapCoordinates(coordsB).Position;
-            var diff = posB - posA;
+            var diff = (posB - posA);
             var length = diff.Length();
 
             var midPoint = diff / 2f + posA;
diff --git a/Content.Client/Pinpointer/UI/StationMapWindow.xaml b/Content.Client/Pinpointer/UI/StationMapWindow.xaml
index cecd7e8479..c79fc8f9e7 100644
--- a/Content.Client/Pinpointer/UI/StationMapWindow.xaml
+++ b/Content.Client/Pinpointer/UI/StationMapWindow.xaml
@@ -9,7 +9,7 @@
         <!-- Station name -->
         <controls:StripeBack>
             <PanelContainer>
-                <Label Name="StationName" Text="{Loc 'station-map-unknown-station'}" StyleClasses="LabelBig" Align="Center"/>
+                <Label Name="StationName" Text="Unknown station" StyleClasses="LabelBig" Align="Center"/>
             </PanelContainer>
         </controls:StripeBack>
 
diff --git a/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs b/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
index 86ed7a8b77..b54da765b0 100644
--- a/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
+++ b/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
@@ -58,6 +58,25 @@ public sealed class BorgSwitchableTypeSystem : SharedBorgSwitchableTypeSystem
             }
         }
 
+        if (prototype.SpriteBodyMovementState is { } movementState)
+        {
+            var spriteMovement = EnsureComp<SpriteMovementComponent>(entity);
+            spriteMovement.NoMovementLayers.Clear();
+            spriteMovement.NoMovementLayers["movement"] = new PrototypeLayerData
+            {
+                State = prototype.SpriteBodyState,
+            };
+            spriteMovement.MovementLayers.Clear();
+            spriteMovement.MovementLayers["movement"] = new PrototypeLayerData
+            {
+                State = movementState,
+            };
+        }
+        else
+        {
+            RemComp<SpriteMovementComponent>(entity);
+        }
+
         base.UpdateEntityAppearance(entity, prototype);
     }
 }
diff --git a/Content.Client/Silicons/Bots/HugBotSystem.cs b/Content.Client/Silicons/Bots/HugBotSystem.cs
deleted file mode 100644
index b40fe51974..0000000000
--- a/Content.Client/Silicons/Bots/HugBotSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using Content.Shared.Silicons.Bots;
-
-namespace Content.Client.Silicons.Bots;
-
-public sealed partial class HugBotSystem : SharedHugBotSystem;
diff --git a/Content.Client/Temperature/Systems/TemperatureSystem.cs b/Content.Client/Temperature/Systems/TemperatureSystem.cs
deleted file mode 100644
index 94a1e836e8..0000000000
--- a/Content.Client/Temperature/Systems/TemperatureSystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.Temperature.Systems;
-
-namespace Content.Client.Temperature.Systems;
-
-/// <summary>
-/// This exists so <see cref="SharedTemperatureSystem"/> runs on client/>
-/// </summary>
-public sealed class TemperatureSystem : SharedTemperatureSystem;
diff --git a/Content.Client/UserInterface/StatValuesEui.cs b/Content.Client/UserInterface/StatValuesEui.cs
index 0e714817b2..33035940b5 100644
--- a/Content.Client/UserInterface/StatValuesEui.cs
+++ b/Content.Client/UserInterface/StatValuesEui.cs
@@ -11,7 +11,7 @@ public sealed class StatValuesEui : BaseEui
     public StatValuesEui()
     {
         _window = new StatsWindow();
-        _window.Title = Loc.GetString("stat-values-ui-title");
+        _window.Title = "Melee stats";
         _window.OpenCentered();
         _window.OnClose += Closed;
     }
diff --git a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
index 3f0afc2fab..17cbcc38ac 100644
--- a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
+++ b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
@@ -232,7 +232,7 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
         helper.ClydeWindow = _clyde.CreateWindow(new WindowCreateParameters
         {
             Maximized = false,
-            Title = Loc.GetString("bwoink-admin-title"),
+            Title = "Admin Help",
             Monitor = monitor,
             Width = 900,
             Height = 500
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
index 2cf3f89145..ff8e56f8fe 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
@@ -1,47 +1,47 @@
-<DefaultWindow Title="{Loc make-ghost-roles-window-title}"
+<DefaultWindow Title="{Loc Make Ghost Role}"
             xmlns="https://spacestation14.io">
 
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RoleEntityLabel" Text="{Loc make-ghost-roles-window-entity-label}" />
+            <Label Name="RoleEntityLabel" Text="Entity" />
             <Label Name="RoleEntity" Text="" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RoleNameLabel" Text="{Loc make-ghost-roles-window-role-name-label}" />
+            <Label Name="RoleNameLabel" Text="Role Name" />
             <LineEdit Name="RoleName" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RoleDescriptionLabel" Text="{Loc make-ghost-roles-window-role-description-label}" />
+            <Label Name="RoleDescriptionLabel" Text="Role Description" />
             <LineEdit Name="RoleDescription" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RoleRulesLabel" Text="{Loc make-ghost-roles-window-role-rules-label}" />
+            <Label Name="RoleRulesLabel" Text="Role Rules" />
             <LineEdit Name="RoleRules" HorizontalExpand="True" Text="{Loc ghost-role-component-default-rules}" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="MakeSentientLabel" Text="{Loc make-ghost-roles-window-make-sentient-label}" />
+            <Label Name="MakeSentientLabel" Text="Make Sentient" />
             <CheckBox Name="MakeSentientCheckbox" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RaffleLabel" Text="{Loc make-ghost-roles-window-raffle-role-label}" />
+            <Label Name="RaffleLabel" Text="Raffle Role?" />
             <OptionButton Name="RaffleButton" />
         </BoxContainer>
         <BoxContainer Name="RaffleCustomSettingsContainer" Orientation="Vertical" Visible="False">
             <BoxContainer Orientation="Horizontal">
-                <Label Name="RaffleInitialDurationLabel" Text="{Loc make-ghost-roles-window-initial-duration-label}" />
+                <Label Name="RaffleInitialDurationLabel" Text="Initial Duration (s)" />
                 <SpinBox Name="RaffleInitialDuration" HorizontalExpand="True" />
             </BoxContainer>
             <BoxContainer Orientation="Horizontal">
-                <Label Name="RaffleJoinExtendsDurationByLabel" Text="{Loc make-ghost-roles-window-join-extends-by-label}" />
+                <Label Name="RaffleJoinExtendsDurationByLabel" Text="Joins Extend By (s)" />
                 <SpinBox Name="RaffleJoinExtendsDurationBy" HorizontalExpand="True" />
             </BoxContainer>
             <BoxContainer Orientation="Horizontal">
-                <Label Name="RaffleMaxDurationLabel" Text="{Loc make-ghost-roles-window-max-duration-label}" />
+                <Label Name="RaffleMaxDurationLabel" Text="Max Duration (s)" />
                 <SpinBox Name="RaffleMaxDuration" HorizontalExpand="True" />
             </BoxContainer>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Button Name="MakeButton" Text="{Loc make-ghost-roles-window-make-button}" />
+            <Button Name="MakeButton" Text="Make" />
         </BoxContainer>
     </BoxContainer>
 
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
index 03a6b9da01..5480db1dcd 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
@@ -62,8 +62,8 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
             RaffleMaxDuration.ValueChanged += OnRaffleDurationChanged;
 
 
-            RaffleButton.AddItem(Loc.GetString("make-ghost-roles-window-raffle-not-button"), RaffleDontRaffleId);
-            RaffleButton.AddItem(Loc.GetString("make-ghost-roles-window-raffle-custom-settings-button"), RaffleCustomRaffleId);
+            RaffleButton.AddItem("Don't raffle", RaffleDontRaffleId);
+            RaffleButton.AddItem("Custom settings", RaffleCustomRaffleId);
 
             var raffleProtos =
                 _prototypeManager.EnumeratePrototypes<GhostRoleRaffleSettingsPrototype>();
@@ -74,7 +74,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
                 _rafflePrototypes.Add(raffleProto);
                 var s = raffleProto.Settings;
                 var label =
-                    Loc.GetString("make-ghost-roles-window-raffle-settings-label", ("id", raffleProto.ID), ("initialDuration", s.InitialDuration), ("maxDuration", s.MaxDuration), ("joinExtendsDurationBy", s.JoinExtendsDurationBy));
+                    $"{raffleProto.ID} (initial {s.InitialDuration}s, max {s.MaxDuration}s, join adds {s.JoinExtendsDurationBy}s)";
                 RaffleButton.AddItem(label, idx++);
             }
 
@@ -92,7 +92,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
             if (RaffleInitialDuration.Value > RaffleMaxDuration.Value)
             {
                 MakeButton.Disabled = true;
-                MakeButton.ToolTip = Loc.GetString("make-ghost-roles-window-raffle-warning-tooltip");
+                MakeButton.ToolTip = "The initial duration must not exceed the maximum duration.";
             }
             else
             {
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
index 291874b213..392532c7b7 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
@@ -111,7 +111,7 @@ public sealed class StorageWindow : BaseWindow
             HorizontalExpand = true,
             Name = "StorageLabel",
             ClipText = true,
-            Text = Loc.GetString("comp-storage-window-dummy"),
+            Text = "Dummy",
             StyleClasses =
             {
                 "FancyWindowTitle",
diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
index 5cf9831077..082baf7e64 100644
--- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
+++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
@@ -33,7 +33,7 @@ public sealed class MaterialArbitrageTest
     [
         "BaseChemistryEmptyVial", "DrinkShotGlass", "SodiumLightTube", "DrinkGlassCoupeShaped",
         "LedLightBulb", "ExteriorLightTube", "LightTube", "DrinkGlass", "DimLightBulb", "LightBulb", "LedLightTube",
-        "ChemistryEmptyBottle01", "WarmLightBulb",
+        "SheetRGlass1", "ChemistryEmptyBottle01", "WarmLightBulb",
     ];
 
     private readonly HashSet<string> _compositionArbitrageIgnore =
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 6563d7b452..176d4fd04c 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -69,7 +69,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb bolt = new()
             {
-                Text = Loc.GetString(bolts.BoltsDown ? "admin-verbs-unbolt" : "admin-verbs-bolt"),
+                Text = bolts.BoltsDown ? "Unbolt" : "Bolt",
                 Category = VerbCategory.Tricks,
                 Icon = bolts.BoltsDown
                     ? new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/unbolt.png"))
@@ -91,7 +91,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb emergencyAccess = new()
             {
-                Text = Loc.GetString(airlockComp.EmergencyAccess ? "admin-verbs-emergency-access-off" : "admin-verbs-emergency-access-on"),
+                Text = airlockComp.EmergencyAccess ? "Emergency Access Off" : "Emergency Access On",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/emergency_access.png")),
                 Act = () =>
@@ -111,7 +111,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb rejuvenate = new()
             {
-                Text = Loc.GetString("admin-verbs-rejuvenate"),
+                Text = "Rejuvenate",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/rejuvenate.png")),
                 Act = () =>
@@ -129,7 +129,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb makeIndestructible = new()
             {
-                Text = Loc.GetString("admin-verbs-make-indestructible"),
+                Text = "Make Indestructible",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/plus.svg.192dpi.png")),
                 Act = () =>
@@ -146,7 +146,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb makeVulnerable = new()
             {
-                Text = Loc.GetString("admin-verbs-make-vulnerable"),
+                Text = "Make Vulnerable",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/plus.svg.192dpi.png")),
                 Act = () =>
@@ -164,7 +164,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb refillBattery = new()
             {
-                Text = Loc.GetString("admin-verbs-refill-battery"),
+                Text = "Refill Battery",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/fill_battery.png")),
                 Act = () =>
@@ -179,7 +179,7 @@ public sealed partial class AdminVerbSystem
 
             Verb drainBattery = new()
             {
-                Text = Loc.GetString("admin-verbs-drain-battery"),
+                Text = "Drain Battery",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/drain_battery.png")),
                 Act = () =>
@@ -194,7 +194,7 @@ public sealed partial class AdminVerbSystem
 
             Verb infiniteBattery = new()
             {
-                Text = Loc.GetString("admin-verbs-infinite-battery"),
+                Text = "Infinite Battery",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/infinite_battery.png")),
                 Act = () =>
@@ -215,7 +215,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb blockUnanchor = new()
             {
-                Text = Loc.GetString("admin-verbs-block-unanchoring"),
+                Text = "Block Unanchoring",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/anchor.svg.192dpi.png")),
                 Act = () =>
@@ -233,7 +233,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb refillInternalsO2 = new()
             {
-                Text = Loc.GetString("admin-verbs-refill-internals-oxygen"),
+                Text = "Refill Internals Oxygen",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/oxygen.rsi"), "icon"),
                 Act = () =>
@@ -248,7 +248,7 @@ public sealed partial class AdminVerbSystem
 
             Verb refillInternalsN2 = new()
             {
-                Text = Loc.GetString("admin-verbs-refill-internals-nitrogen"),
+                Text = "Refill Internals Nitrogen",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/red.rsi"), "icon"),
                 Act = () =>
@@ -263,7 +263,7 @@ public sealed partial class AdminVerbSystem
 
             Verb refillInternalsPlasma = new()
             {
-                Text = Loc.GetString("admin-verbs-refill-internals-plasma"),
+                Text = "Refill Internals Plasma",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/plasma.rsi"), "icon"),
                 Act = () =>
@@ -281,7 +281,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb refillInternalsO2 = new()
             {
-                Text = Loc.GetString("admin-verbs-refill-internals-oxygen"),
+                Text = "Refill Internals Oxygen",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/oxygen.rsi"), "icon"),
                 Act = () => RefillEquippedTanks(args.User, Gas.Oxygen),
@@ -293,7 +293,7 @@ public sealed partial class AdminVerbSystem
 
             Verb refillInternalsN2 = new()
             {
-                Text = Loc.GetString("admin-verbs-refill-internals-nitrogen"),
+                Text = "Refill Internals Nitrogen",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/red.rsi"), "icon"),
                 Act = () => RefillEquippedTanks(args.User, Gas.Nitrogen),
@@ -305,7 +305,7 @@ public sealed partial class AdminVerbSystem
 
             Verb refillInternalsPlasma = new()
             {
-                Text = Loc.GetString("admin-verbs-refill-internals-plasma"),
+                Text = "Refill Internals Plasma",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/plasma.rsi"), "icon"),
                 Act = () => RefillEquippedTanks(args.User, Gas.Plasma),
@@ -318,7 +318,7 @@ public sealed partial class AdminVerbSystem
 
         Verb sendToTestArena = new()
         {
-            Text = Loc.GetString("admin-verbs-send-to-test-arena"),
+            Text = "Send to test arena",
             Category = VerbCategory.Tricks,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/eject.svg.192dpi.png")),
 
@@ -339,7 +339,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb grantAllAccess = new()
             {
-                Text = Loc.GetString("admin-verbs-grant-all-access"),
+                Text = "Grant All Access",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "centcom"),
                 Act = () =>
@@ -354,7 +354,7 @@ public sealed partial class AdminVerbSystem
 
             Verb revokeAllAccess = new()
             {
-                Text = Loc.GetString("admin-verbs-revoke-all-access"),
+                Text = "Revoke All Access",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "default"),
                 Act = () =>
@@ -372,7 +372,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb grantAllAccess = new()
             {
-                Text = Loc.GetString("admin-verbs-grant-all-access"),
+                Text = "Grant All Access",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "centcom"),
                 Act = () =>
@@ -387,7 +387,7 @@ public sealed partial class AdminVerbSystem
 
             Verb revokeAllAccess = new()
             {
-                Text = Loc.GetString("admin-verbs-revoke-all-access"),
+                Text = "Revoke All Access",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "default"),
                 Act = () =>
@@ -405,13 +405,13 @@ public sealed partial class AdminVerbSystem
         {
             Verb adjustStack = new()
             {
-                Text = Loc.GetString("admin-verbs-adjust-stack"),
+                Text = "Adjust Stack",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/adjust-stack.png")),
                 Act = () =>
                 {
                     // Unbounded intentionally.
-                    _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-adjust-stack"), Loc.GetString("admin-verbs-dialog-adjust-stack-amount", ("max", _stackSystem.GetMaxCount(stack))), (int newAmount) =>
+                    _quickDialog.OpenDialog(player, "Adjust stack", $"Amount (max {_stackSystem.GetMaxCount(stack)})", (int newAmount) =>
                     {
                         _stackSystem.SetCount(args.Target, newAmount, stack);
                     });
@@ -424,7 +424,7 @@ public sealed partial class AdminVerbSystem
 
             Verb fillStack = new()
             {
-                Text = Loc.GetString("admin-verbs-fill-stack"),
+                Text = "Fill Stack",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/fill-stack.png")),
                 Act = () =>
@@ -440,12 +440,12 @@ public sealed partial class AdminVerbSystem
 
         Verb rename = new()
         {
-            Text = Loc.GetString("admin-verbs-rename"),
+            Text = "Rename",
             Category = VerbCategory.Tricks,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/rename.png")),
             Act = () =>
             {
-                _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-dialog-rename-title"), Loc.GetString("admin-verbs-dialog-rename-name"), (string newName) =>
+                _quickDialog.OpenDialog(player, "Rename", "Name", (string newName) =>
                 {
                     _metaSystem.SetEntityName(args.Target, newName);
                 });
@@ -458,12 +458,12 @@ public sealed partial class AdminVerbSystem
 
         Verb redescribe = new()
         {
-            Text = Loc.GetString("admin-verbs-redescribe"),
+            Text = "Redescribe",
             Category = VerbCategory.Tricks,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/redescribe.png")),
             Act = () =>
             {
-                _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-dialog-redescribe-title"), Loc.GetString("admin-verbs-dialog-redescribe-description"), (LongString newDescription) =>
+                _quickDialog.OpenDialog(player, "Redescribe", "Description", (LongString newDescription) =>
                 {
                     _metaSystem.SetEntityDescription(args.Target, newDescription.String);
                 });
@@ -476,12 +476,12 @@ public sealed partial class AdminVerbSystem
 
         Verb renameAndRedescribe = new()
         {
-            Text = Loc.GetString("admin-verbs-rename-and-redescribe"),
+            Text = "Redescribe",
             Category = VerbCategory.Tricks,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/rename_and_redescribe.png")),
             Act = () =>
             {
-                _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-dialog-rename-and-redescribe-title"), Loc.GetString("admin-verbs-dialog-rename-name"), Loc.GetString("admin-verbs-dialog-redescribe-description"),
+                _quickDialog.OpenDialog(player, "Rename & Redescribe", "Name", "Description",
                     (string newName, LongString newDescription) =>
                     {
                         var meta = MetaData(args.Target);
@@ -501,7 +501,7 @@ public sealed partial class AdminVerbSystem
             {
                 Verb barJobSlots = new()
                 {
-                    Text = Loc.GetString("admin-verbs-bar-job-slots"),
+                    Text = "Bar job slots",
                     Category = VerbCategory.Tricks,
                     Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/bar_jobslots.png")),
                     Act = () =>
@@ -520,7 +520,7 @@ public sealed partial class AdminVerbSystem
 
             Verb locateCargoShuttle = new()
             {
-                Text = Loc.GetString("admin-verbs-locate-cargo-shuttle"),
+                Text = "Locate Cargo Shuttle",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Head/Soft/cargosoft.rsi"), "icon"),
                 Act = () =>
@@ -543,7 +543,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb refillBattery = new()
             {
-                Text = Loc.GetString("admin-verbs-refill-battery"),
+                Text = "Refill Battery",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/fill_battery.png")),
                 Act = () =>
@@ -564,7 +564,7 @@ public sealed partial class AdminVerbSystem
 
             Verb drainBattery = new()
             {
-                Text = Loc.GetString("admin-verbs-drain-battery"),
+                Text = "Drain Battery",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/drain_battery.png")),
                 Act = () =>
@@ -585,7 +585,7 @@ public sealed partial class AdminVerbSystem
 
             Verb infiniteBattery = new()
             {
-                Text = Loc.GetString("admin-verbs-infinite-battery"),
+                Text = "Infinite Battery",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/infinite_battery.png")),
                 Act = () =>
@@ -615,7 +615,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb haltMovement = new()
             {
-                Text = Loc.GetString("admin-verbs-halt-movement"),
+                Text = "Halt Movement",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/halt.png")),
                 Act = () =>
@@ -638,7 +638,7 @@ public sealed partial class AdminVerbSystem
                 {
                     Verb unpauseMap = new()
                     {
-                        Text = Loc.GetString("admin-verbs-unpause-map"),
+                        Text = "Unpause Map",
                         Category = VerbCategory.Tricks,
                         Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/play.png")),
                         Act = () =>
@@ -655,7 +655,7 @@ public sealed partial class AdminVerbSystem
                 {
                     Verb pauseMap = new()
                     {
-                        Text = Loc.GetString("admin-verbs-pause-map"),
+                        Text = "Pause Map",
                         Category = VerbCategory.Tricks,
                         Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/pause.png")),
                         Act = () =>
@@ -675,7 +675,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb snapJoints = new()
             {
-                Text = Loc.GetString("admin-verbs-snap-joints"),
+                Text = "Snap Joints",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/snap_joints.png")),
                 Act = () =>
@@ -693,7 +693,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb minigunFire = new()
             {
-                Text = Loc.GetString("admin-verbs-make-minigun"),
+                Text = "Make Minigun",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi"), "icon"),
                 Act = () =>
@@ -712,12 +712,12 @@ public sealed partial class AdminVerbSystem
         {
             Verb setCapacity = new()
             {
-                Text = Loc.GetString("admin-verbs-set-bullet-amount"),
+                Text = "Set Bullet Amount",
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Fun/caps.rsi"), "mag-6"),
                 Act = () =>
                 {
-                    _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-dialog-set-bullet-amount-title"), Loc.GetString("admin-verbs-dialog-set-bullet-amount-amount", ("cap", ballisticAmmo.Capacity)), (string amount) =>
+                    _quickDialog.OpenDialog(player, "Set Bullet Amount", $"Amount (standard {ballisticAmmo.Capacity}):", (string amount) =>
                     {
                         if (!int.TryParse(amount, out var result))
                             return;
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 81bd4e5c6c..424f52ed58 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.Components;
 using Content.Server.Stunnable;
+using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
 using Content.Server.Damage.Components;
 using Content.Shared.ActionBlocker;
@@ -23,7 +24,6 @@ using Content.Shared.Toggleable;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands;
-using Content.Shared.Temperature.Components;
 using Robust.Server.Audio;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index 57c1504b16..6f14debc3d 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Temperature.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Rotting;
 using Content.Shared.Body.Events;
 using Content.Shared.Damage;
-using Content.Shared.Temperature.Components;
 using Robust.Server.Containers;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs
index 46d2fdd8e8..5821b0d944 100644
--- a/Content.Server/Body/Components/MetabolizerComponent.cs
+++ b/Content.Server/Body/Components/MetabolizerComponent.cs
@@ -10,13 +10,13 @@ namespace Content.Server.Body.Components
     /// <summary>
     ///     Handles metabolizing various reagents with given effects.
     /// </summary>
-    [RegisterComponent, AutoGenerateComponentPause, Access(typeof(MetabolizerSystem))]
+    [RegisterComponent, Access(typeof(MetabolizerSystem))]
     public sealed partial class MetabolizerComponent : Component
     {
         /// <summary>
         ///     The next time that reagents will be metabolized.
         /// </summary>
-        [DataField, AutoPausedField]
+        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
         public TimeSpan NextUpdate;
 
         /// <summary>
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index 6679bfea54..c59f87f576 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -1,18 +1,14 @@
 using Content.Server.Body.Components;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
-using Content.Shared.Body.Prototypes;
 using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityConditions;
-using Content.Shared.EntityConditions.Conditions;
-using Content.Shared.EntityConditions.Conditions.Body;
+using Content.Shared.Database;
 using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Body;
-using Content.Shared.EntityEffects.Effects.Solution;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
@@ -21,258 +17,210 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Body.Systems;
-
-/// <inheritdoc/>
-public sealed class MetabolizerSystem : SharedMetabolizerSystem
+namespace Content.Server.Body.Systems
 {
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-    [Dependency] private readonly SharedEntityConditionsSystem _entityConditions = default!;
-    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-
-    private EntityQuery<OrganComponent> _organQuery;
-    private EntityQuery<SolutionContainerManagerComponent> _solutionQuery;
-    private static readonly ProtoId<MetabolismGroupPrototype> Gas = "Gas";
-
-    public override void Initialize()
+    /// <inheritdoc/>
+    public sealed class MetabolizerSystem : SharedMetabolizerSystem
     {
-        base.Initialize();
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
+        [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
 
-        _organQuery = GetEntityQuery<OrganComponent>();
-        _solutionQuery = GetEntityQuery<SolutionContainerManagerComponent>();
+        private EntityQuery<OrganComponent> _organQuery;
+        private EntityQuery<SolutionContainerManagerComponent> _solutionQuery;
 
-        SubscribeLocalEvent<MetabolizerComponent, ComponentInit>(OnMetabolizerInit);
-        SubscribeLocalEvent<MetabolizerComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<MetabolizerComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
-    }
-
-    private void OnMapInit(Entity<MetabolizerComponent> ent, ref MapInitEvent args)
-    {
-        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
-    }
-
-    private void OnMetabolizerInit(Entity<MetabolizerComponent> entity, ref ComponentInit args)
-    {
-        if (!entity.Comp.SolutionOnBody)
+        public override void Initialize()
         {
-            _solutionContainerSystem.EnsureSolution(entity.Owner, entity.Comp.SolutionName, out _);
-        }
-        else if (_organQuery.CompOrNull(entity)?.Body is { } body)
-        {
-            _solutionContainerSystem.EnsureSolution(body, entity.Comp.SolutionName, out _);
-        }
-    }
+            base.Initialize();
 
-    private void OnApplyMetabolicMultiplier(Entity<MetabolizerComponent> ent, ref ApplyMetabolicMultiplierEvent args)
-    {
-        ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
-    }
+            _organQuery = GetEntityQuery<OrganComponent>();
+            _solutionQuery = GetEntityQuery<SolutionContainerManagerComponent>();
 
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var metabolizers = new ValueList<(EntityUid Uid, MetabolizerComponent Component)>(Count<MetabolizerComponent>());
-        var query = EntityQueryEnumerator<MetabolizerComponent>();
-
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            metabolizers.Add((uid, comp));
+            SubscribeLocalEvent<MetabolizerComponent, ComponentInit>(OnMetabolizerInit);
+            SubscribeLocalEvent<MetabolizerComponent, MapInitEvent>(OnMapInit);
+            SubscribeLocalEvent<MetabolizerComponent, EntityUnpausedEvent>(OnUnpaused);
+            SubscribeLocalEvent<MetabolizerComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
         }
 
-        foreach (var (uid, metab) in metabolizers)
+        private void OnMapInit(Entity<MetabolizerComponent> ent, ref MapInitEvent args)
         {
-            // Only update as frequently as it should
-            if (_gameTiming.CurTime < metab.NextUpdate)
-                continue;
-
-            metab.NextUpdate += metab.AdjustedUpdateInterval;
-            TryMetabolize((uid, metab));
+            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
         }
-    }
 
-    private void TryMetabolize(Entity<MetabolizerComponent, OrganComponent?, SolutionContainerManagerComponent?> ent)
-    {
-        _organQuery.Resolve(ent, ref ent.Comp2, logMissing: false);
-
-        // First step is get the solution we actually care about
-        var solutionName = ent.Comp1.SolutionName;
-        Solution? solution = null;
-        Entity<SolutionComponent>? soln = default!;
-        EntityUid? solutionEntityUid = null;
-
-        if (ent.Comp1.SolutionOnBody)
+        private void OnUnpaused(Entity<MetabolizerComponent> ent, ref EntityUnpausedEvent args)
         {
-            if (ent.Comp2?.Body is { } body)
+            ent.Comp.NextUpdate += args.PausedTime;
+        }
+
+        private void OnMetabolizerInit(Entity<MetabolizerComponent> entity, ref ComponentInit args)
+        {
+            if (!entity.Comp.SolutionOnBody)
             {
-                if (!_solutionQuery.Resolve(body, ref ent.Comp3, logMissing: false))
-                    return;
-
-                _solutionContainerSystem.TryGetSolution((body, ent.Comp3), solutionName, out soln, out solution);
-                solutionEntityUid = body;
+                _solutionContainerSystem.EnsureSolution(entity.Owner, entity.Comp.SolutionName, out _);
+            }
+            else if (_organQuery.CompOrNull(entity)?.Body is { } body)
+            {
+                _solutionContainerSystem.EnsureSolution(body, entity.Comp.SolutionName, out _);
             }
         }
-        else
-        {
-            if (!_solutionQuery.Resolve(ent, ref ent.Comp3, logMissing: false))
-                return;
 
-            _solutionContainerSystem.TryGetSolution((ent, ent), solutionName, out soln, out solution);
-            solutionEntityUid = ent;
+        private void OnApplyMetabolicMultiplier(Entity<MetabolizerComponent> ent, ref ApplyMetabolicMultiplierEvent args)
+        {
+            ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
         }
 
-        if (solutionEntityUid is null
-            || soln is null
-            || solution is null
-            || solution.Contents.Count == 0)
+        public override void Update(float frameTime)
         {
-            return;
-        }
+            base.Update(frameTime);
 
-        // randomize the reagent list so we don't have any weird quirks
-        // like alphabetical order or insertion order mattering for processing
-        var list = solution.Contents.ToArray();
-        _random.Shuffle(list);
+            var metabolizers = new ValueList<(EntityUid Uid, MetabolizerComponent Component)>(Count<MetabolizerComponent>());
+            var query = EntityQueryEnumerator<MetabolizerComponent>();
 
-        int reagents = 0;
-        foreach (var (reagent, quantity) in list)
-        {
-            if (!_prototypeManager.TryIndex<ReagentPrototype>(reagent.Prototype, out var proto))
-                continue;
-
-            var mostToRemove = FixedPoint2.Zero;
-            if (proto.Metabolisms is null)
+            while (query.MoveNext(out var uid, out var comp))
             {
-                if (ent.Comp1.RemoveEmpty)
-                {
-                    solution.RemoveReagent(reagent, FixedPoint2.New(1));
-                }
-
-                continue;
+                metabolizers.Add((uid, comp));
             }
 
-            // we're done here entirely if this is true
-            if (reagents >= ent.Comp1.MaxReagentsProcessable)
-                return;
-
-
-            // loop over all our groups and see which ones apply
-            if (ent.Comp1.MetabolismGroups is null)
-                continue;
-
-            // TODO: Kill MetabolismGroups!
-            foreach (var group in ent.Comp1.MetabolismGroups)
+            foreach (var (uid, metab) in metabolizers)
             {
-                if (!proto.Metabolisms.TryGetValue(group.Id, out var entry))
+                // Only update as frequently as it should
+                if (_gameTiming.CurTime < metab.NextUpdate)
                     continue;
 
-                var rate = entry.MetabolismRate * group.MetabolismRateModifier;
+                metab.NextUpdate += metab.AdjustedUpdateInterval;
+                TryMetabolize((uid, metab));
+            }
+        }
 
-                // Remove $rate, as long as there's enough reagent there to actually remove that much
-                mostToRemove = FixedPoint2.Clamp(rate, 0, quantity);
+        private void TryMetabolize(Entity<MetabolizerComponent, OrganComponent?, SolutionContainerManagerComponent?> ent)
+        {
+            _organQuery.Resolve(ent, ref ent.Comp2, logMissing: false);
 
-                var scale = (float) mostToRemove;
+            // First step is get the solution we actually care about
+            var solutionName = ent.Comp1.SolutionName;
+            Solution? solution = null;
+            Entity<SolutionComponent>? soln = default!;
+            EntityUid? solutionEntityUid = null;
 
-                // TODO: This is a very stupid workaround to lungs heavily relying on scale = reagent quantity. Needs lung and metabolism refactors to remove.
-                // TODO: Lungs just need to have their scale be equal to the mols consumed, scale needs to be not hardcoded either and configurable per metabolizer...
-                if (group.Id != Gas)
-                    scale /= (float) entry.MetabolismRate;
-
-                // if it's possible for them to be dead, and they are,
-                // then we shouldn't process any effects, but should probably
-                // still remove reagents
-                if (TryComp<MobStateComponent>(solutionEntityUid.Value, out var state))
+            if (ent.Comp1.SolutionOnBody)
+            {
+                if (ent.Comp2?.Body is { } body)
                 {
-                    if (!proto.WorksOnTheDead && _mobStateSystem.IsDead(solutionEntityUid.Value, state))
-                        continue;
+                    if (!_solutionQuery.Resolve(body, ref ent.Comp3, logMissing: false))
+                        return;
+
+                    _solutionContainerSystem.TryGetSolution((body, ent.Comp3), solutionName, out soln, out solution);
+                    solutionEntityUid = body;
                 }
+            }
+            else
+            {
+                if (!_solutionQuery.Resolve(ent, ref ent.Comp3, logMissing: false))
+                    return;
 
-                var actualEntity = ent.Comp2?.Body ?? solutionEntityUid.Value;
+                _solutionContainerSystem.TryGetSolution((ent, ent), solutionName, out soln, out solution);
+                solutionEntityUid = ent;
+            }
 
-                // do all effects, if conditions apply
-                foreach (var effect in entry.Effects)
+            if (solutionEntityUid is null
+                || soln is null
+                || solution is null
+                || solution.Contents.Count == 0)
+            {
+                return;
+            }
+
+            // randomize the reagent list so we don't have any weird quirks
+            // like alphabetical order or insertion order mattering for processing
+            var list = solution.Contents.ToArray();
+            _random.Shuffle(list);
+
+            int reagents = 0;
+            foreach (var (reagent, quantity) in list)
+            {
+                if (!_prototypeManager.TryIndex<ReagentPrototype>(reagent.Prototype, out var proto))
+                    continue;
+
+                var mostToRemove = FixedPoint2.Zero;
+                if (proto.Metabolisms is null)
                 {
-                    if (scale < effect.MinScale)
-                        continue;
-
-                    // See if conditions apply
-                    if (effect.Conditions != null && !CanMetabolizeEffect(actualEntity, ent, soln.Value, effect.Conditions))
-                        continue;
-
-                    ApplyEffect(effect);
-
-                }
-
-                // TODO: We should have to do this with metabolism. ReagentEffect struct needs refactoring and so does metabolism!
-                void ApplyEffect(EntityEffect effect)
-                {
-                    switch (effect)
+                    if (ent.Comp1.RemoveEmpty)
                     {
-                        case ModifyLungGas:
-                            _entityEffects.ApplyEffect(ent, effect, scale);
-                            break;
-                        case AdjustReagent:
-                            _entityEffects.ApplyEffect(soln.Value, effect, scale);
-                            break;
-                        default:
-                            _entityEffects.ApplyEffect(actualEntity, effect, scale);
-                            break;
+                        solution.RemoveReagent(reagent, FixedPoint2.New(1));
+                    }
+
+                    continue;
+                }
+
+                // we're done here entirely if this is true
+                if (reagents >= ent.Comp1.MaxReagentsProcessable)
+                    return;
+
+
+                // loop over all our groups and see which ones apply
+                if (ent.Comp1.MetabolismGroups is null)
+                    continue;
+
+                foreach (var group in ent.Comp1.MetabolismGroups)
+                {
+                    if (!proto.Metabolisms.TryGetValue(group.Id, out var entry))
+                        continue;
+
+                    var rate = entry.MetabolismRate * group.MetabolismRateModifier;
+
+                    // Remove $rate, as long as there's enough reagent there to actually remove that much
+                    mostToRemove = FixedPoint2.Clamp(rate, 0, quantity);
+
+                    float scale = (float) mostToRemove / (float) rate;
+
+                    // if it's possible for them to be dead, and they are,
+                    // then we shouldn't process any effects, but should probably
+                    // still remove reagents
+                    if (TryComp<MobStateComponent>(solutionEntityUid.Value, out var state))
+                    {
+                        if (!proto.WorksOnTheDead && _mobStateSystem.IsDead(solutionEntityUid.Value, state))
+                            continue;
+                    }
+
+                    var actualEntity = ent.Comp2?.Body ?? solutionEntityUid.Value;
+                    var args = new EntityEffectReagentArgs(actualEntity, EntityManager, ent, solution, mostToRemove, proto, null, scale);
+
+                    // do all effects, if conditions apply
+                    foreach (var effect in entry.Effects)
+                    {
+                        if (!effect.ShouldApply(args, _random))
+                            continue;
+
+                        if (effect.ShouldLog)
+                        {
+                            _adminLogger.Add(
+                                LogType.ReagentEffect,
+                                effect.LogImpact,
+                                $"Metabolism effect {effect.GetType().Name:effect}"
+                                + $" of reagent {proto.LocalizedName:reagent}"
+                                + $" applied on entity {actualEntity:entity}"
+                                + $" at {Transform(actualEntity).Coordinates:coordinates}"
+                            );
+                        }
+
+                        effect.Effect(args);
                     }
                 }
+
+                // remove a certain amount of reagent
+                if (mostToRemove > FixedPoint2.Zero)
+                {
+                    solution.RemoveReagent(reagent, mostToRemove);
+
+                    // We have processed a reagant, so count it towards the cap
+                    reagents += 1;
+                }
             }
 
-            // remove a certain amount of reagent
-            if (mostToRemove > FixedPoint2.Zero)
-            {
-                solution.RemoveReagent(reagent, mostToRemove);
-
-                // We have processed a reagant, so count it towards the cap
-                reagents += 1;
-            }
+            _solutionContainerSystem.UpdateChemicals(soln.Value);
         }
-
-        _solutionContainerSystem.UpdateChemicals(soln.Value);
-    }
-
-    /// <summary>
-    /// Public API to check if a certain metabolism effect can be applied to an entity.
-    /// TODO: With metabolism refactor make this logic smarter and unhardcode the old hardcoding entity effects used to have for metabolism!
-    /// </summary>
-    /// <param name="body">The body metabolizing the effects</param>
-    /// <param name="organ">The organ doing the metabolizing</param>
-    /// <param name="solution">The solution we are metabolizing from</param>
-    /// <param name="conditions">The conditions that need to be met to metabolize</param>
-    /// <returns>True if we can metabolize! False if we cannot!</returns>
-    public bool CanMetabolizeEffect(EntityUid body, EntityUid organ, Entity<SolutionComponent> solution, EntityCondition[] conditions)
-    {
-        foreach (var condition in conditions)
-        {
-            switch (condition)
-            {
-                // Need specific handling of specific conditions since Metabolism is funny like that.
-                // TODO: MetabolizerTypes should be handled well before this stage by metabolism itself.
-                case MetabolizerTypeCondition:
-                    if (_entityConditions.TryCondition(organ, condition))
-                        continue;
-                    break;
-                case ReagentCondition:
-                    if (_entityConditions.TryCondition(solution, condition))
-                        continue;
-                    break;
-                default:
-                    if (_entityConditions.TryCondition(body, condition))
-                        continue;
-                    break;
-            }
-
-            return false;
-        }
-
-        return true;
     }
 }
-
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 2af7b24f26..63b04adc6a 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Chat.Systems;
+using Content.Server.EntityEffects;
 using Content.Shared.Body.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
@@ -13,11 +14,9 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Database;
-using Content.Shared.EntityConditions;
-using Content.Shared.EntityConditions.Conditions.Body;
 using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.EffectConditions;
 using Content.Shared.EntityEffects.Effects;
-using Content.Shared.EntityEffects.Effects.Body;
 using Content.Shared.Mobs.Systems;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
@@ -30,16 +29,16 @@ public sealed class RespiratorSystem : EntitySystem
 {
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly AlertsSystem _alertsSystem = default!;
     [Dependency] private readonly AtmosphereSystem _atmosSys = default!;
     [Dependency] private readonly BodySystem _bodySystem = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly DamageableSystem _damageableSys = default!;
     [Dependency] private readonly LungSystem _lungSystem = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly SharedEntityConditionsSystem _entityConditions = default!;
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly EntityEffectSystem _entityEffect = default!;
 
     private static readonly ProtoId<MetabolismGroupPrototype> GasId = new("Gas");
 
@@ -341,6 +340,7 @@ public sealed class RespiratorSystem : EntitySystem
             }
         }
 
+        // TODO generalize condition checks
         // this is pretty janky, but I just want to bodge a method that checks if an entity can breathe a gas mixture
         // Applying actual reaction effects require a full ReagentEffectArgs struct.
         bool CanMetabolize(EntityEffect effect)
@@ -348,10 +348,9 @@ public sealed class RespiratorSystem : EntitySystem
             if (effect.Conditions == null)
                 return true;
 
-            // TODO: Use Metabolism Public API to do this instead, once that API has been built.
             foreach (var cond in effect.Conditions)
             {
-                if (cond is MetabolizerTypeCondition organ && !_entityConditions.TryCondition(lung, organ))
+                if (cond is OrganType organ && !_entityEffect.OrganCondition(organ, lung))
                     return false;
             }
 
diff --git a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
index af7b17643e..3ba9e6af31 100644
--- a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
+++ b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Body.Components;
+using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
 using Content.Shared.ActionBlocker;
-using Content.Shared.Temperature.Components;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems;
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index 253eea2df9..ee7ca4f584 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -1,9 +1,8 @@
 using Content.Server.Botany.Components;
 using Content.Server.Botany.Systems;
-using Content.Server.EntityEffects.Effects.Botany;
+using Content.Server.EntityEffects;
 using Content.Shared.Atmos;
 using Content.Shared.Database;
-using Content.Shared.EntityEffects;
 using Content.Shared.Random;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -80,13 +79,9 @@ public partial struct SeedChemQuantity
     [DataField("Inherent")] public bool Inherent = true;
 }
 
-// TODO Make Botany ECS and give it a proper API. I removed the limited access of this class because it's egregious how many systems needed access to it due to a lack of an actual API.
-/// <remarks>
-/// SeedData is no longer restricted because the number of friends is absolutely unreasonable.
-/// This entire data definition is unreasonable. I felt genuine fear looking at this, this is horrific. Send help.
-/// </remarks>
-// TODO: Hit Botany with hammers
+// TODO reduce the number of friends to a reasonable level. Requires ECS-ing things like plant holder component.
 [Virtual, DataDefinition]
+[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent), typeof(EntityEffectSystem), typeof(MutationSystem))]
 public partial class SeedData
 {
     #region Tracking
diff --git a/Content.Server/Botany/Systems/BotanySystem.Produce.cs b/Content.Server/Botany/Systems/BotanySystem.Produce.cs
index 7d8f8652c7..f6f3f99c09 100644
--- a/Content.Server/Botany/Systems/BotanySystem.Produce.cs
+++ b/Content.Server/Botany/Systems/BotanySystem.Produce.cs
@@ -7,8 +7,6 @@ namespace Content.Server.Botany.Systems;
 
 public sealed partial class BotanySystem
 {
-    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
-
     public void ProduceGrown(EntityUid uid, ProduceComponent produce)
     {
         if (!TryGetSeed(produce, out var seed))
@@ -17,7 +15,10 @@ public sealed partial class BotanySystem
         foreach (var mutation in seed.Mutations)
         {
             if (mutation.AppliesToProduce)
-                _entityEffects.TryApplyEffect(uid, mutation.Effect);
+            {
+                var args = new EntityEffectBaseArgs(uid, EntityManager);
+                mutation.Effect.Effect(args);
+            }
         }
 
         if (!_solutionContainerSystem.EnsureSolution(uid,
diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs
index 834fd9e8ef..ee35db48e3 100644
--- a/Content.Server/Botany/Systems/MutationSystem.cs
+++ b/Content.Server/Botany/Systems/MutationSystem.cs
@@ -13,7 +13,6 @@ public sealed class MutationSystem : EntitySystem
 
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
     private RandomPlantMutationListPrototype _randomMutations = default!;
 
     public override void Initialize()
@@ -33,8 +32,10 @@ public sealed class MutationSystem : EntitySystem
             if (Random(Math.Min(mutation.BaseOdds * severity, 1.0f)))
             {
                 if (mutation.AppliesToPlant)
-                    _entityEffects.TryApplyEffect(plantHolder, mutation.Effect);
-
+                {
+                    var args = new EntityEffectBaseArgs(plantHolder, EntityManager);
+                    mutation.Effect.Effect(args);
+                }
                 // Stat adjustments do not persist by being an attached effect, they just change the stat.
                 if (mutation.Persists && !seed.Mutations.Any(m => m.Name == mutation.Name))
                     seed.Mutations.Add(mutation);
diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index 2554f95455..caa796efe2 100644
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -24,10 +24,8 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
-using Content.Shared.EntityEffects;
 using Content.Shared.Kitchen.Components;
 using Content.Shared.Labels.Components;
 
@@ -50,7 +48,6 @@ public sealed class PlantHolderSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
 
     public const float HydroponicsSpeedMultiplier = 1f;
     public const float HydroponicsConsumptionMultiplier = 2f;
@@ -890,7 +887,7 @@ public sealed class PlantHolderSystem : EntitySystem
             foreach (var entry in _solutionContainerSystem.RemoveEachReagent(component.SoilSolution.Value, amt))
             {
                 var reagentProto = _prototype.Index<ReagentPrototype>(entry.Reagent.Prototype);
-                _entityEffects.ApplyEffects(uid, reagentProto.PlantMetabolisms.ToArray());
+                reagentProto.ReactionPlant(uid, entry, solution, EntityManager, _random, _adminLogger);
             }
         }
 
diff --git a/Content.Server/Chat/Systems/AutoEmoteSystem.cs b/Content.Server/Chat/Systems/AutoEmoteSystem.cs
index 1e1b7b9034..3d6bd53540 100644
--- a/Content.Server/Chat/Systems/AutoEmoteSystem.cs
+++ b/Content.Server/Chat/Systems/AutoEmoteSystem.cs
@@ -46,11 +46,7 @@ public sealed class AutoEmoteSystem : EntitySystem
 
                 if (autoEmotePrototype.WithChat)
                 {
-                    _chatSystem.TryEmoteWithChat(uid,
-                        autoEmotePrototype.EmoteId,
-                        autoEmotePrototype.HiddenFromChatWindow ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal,
-                        ignoreActionBlocker: autoEmotePrototype.IgnoreActionBlocker,
-                        forceEmote: autoEmotePrototype.Force);
+                    _chatSystem.TryEmoteWithChat(uid, autoEmotePrototype.EmoteId, autoEmotePrototype.HiddenFromChatWindow ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal);
                 }
                 else
                 {
diff --git a/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs b/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
index 58c86f058a..a70c2196ab 100644
--- a/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
+++ b/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
@@ -39,7 +39,7 @@ public sealed class DumpReagentGuideText : LocalizedEntityCommands
         {
             foreach (var effect in entry.Effects)
             {
-                shell.WriteLine(reagent.GuidebookReagentEffectDescription(_prototype, EntityManager.EntitySysManager, effect, entry.MetabolismRate) ??
+                shell.WriteLine(effect.GuidebookEffectDescription(_prototype, EntityManager.EntitySysManager) ??
                                 Loc.GetString($"cmd-dumpreagentguidetext-skipped", ("effect", effect.GetType())));
             }
         }
diff --git a/Content.Server/Clothing/Systems/OutfitSystem.cs b/Content.Server/Clothing/Systems/OutfitSystem.cs
index c02a4f1a3b..c3fea28bcf 100644
--- a/Content.Server/Clothing/Systems/OutfitSystem.cs
+++ b/Content.Server/Clothing/Systems/OutfitSystem.cs
@@ -4,7 +4,6 @@ using Content.Shared.Access.Components;
 using Content.Shared.Clothing;
 using Content.Shared.Hands.Components;
 using Content.Shared.Humanoid;
-using Content.Shared.Interaction.Components;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
 using Content.Shared.Preferences;
@@ -24,7 +23,7 @@ public sealed class OutfitSystem : EntitySystem
     [Dependency] private readonly InventorySystem _invSystem = default!;
     [Dependency] private readonly SharedStationSpawningSystem _spawningSystem = default!;
 
-    public bool SetOutfit(EntityUid target, string gear, Action<EntityUid, EntityUid>? onEquipped = null, bool unremovable = false)
+    public bool SetOutfit(EntityUid target, string gear, Action<EntityUid, EntityUid>? onEquipped = null)
     {
         if (!EntityManager.TryGetComponent(target, out InventoryComponent? inventoryComponent))
             return false;
@@ -61,8 +60,6 @@ public sealed class OutfitSystem : EntitySystem
                 }
 
                 _invSystem.TryEquip(target, equipmentEntity, slot.Name, silent: true, force: true, inventory: inventoryComponent);
-                if (unremovable)
-                    EnsureComp<UnremoveableComponent>(equipmentEntity);
 
                 onEquipped?.Invoke(target, equipmentEntity);
             }
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index e51a01a1d4..21a15d812f 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -7,6 +7,7 @@ using Content.Server.Clothing.Systems;
 using Content.Shared.Chat.Prototypes;
 using Robust.Shared.Random;
 using Content.Shared.Stunnable;
+using Content.Shared.Damage.Prototypes;
 using Content.Shared.Damage;
 using Robust.Shared.Prototypes;
 using Content.Server.Emoting.Systems;
@@ -20,6 +21,7 @@ namespace Content.Server.Cluwne;
 
 public sealed class CluwneSystem : EntitySystem
 {
+    private static readonly ProtoId<DamageGroupPrototype> GeneticDamageGroup = "Genetic";
 
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -46,14 +48,15 @@ public sealed class CluwneSystem : EntitySystem
     /// <summary>
     /// On death removes active comps and gives genetic damage to prevent cloning, reduce this to allow cloning.
     /// </summary>
-    private void OnMobState(Entity<CluwneComponent> ent, ref MobStateChangedEvent args)
+    private void OnMobState(EntityUid uid, CluwneComponent component, MobStateChangedEvent args)
     {
         if (args.NewMobState == MobState.Dead)
         {
-            RemComp<CluwneComponent>(ent.Owner);
-            RemComp<ClumsyComponent>(ent.Owner);
-            RemComp<AutoEmoteComponent>(ent.Owner);
-            _damageableSystem.TryChangeDamage(ent.Owner, ent.Comp.RevertDamage);
+            RemComp<CluwneComponent>(uid);
+            RemComp<ClumsyComponent>(uid);
+            RemComp<AutoEmoteComponent>(uid);
+            var damageSpec = new DamageSpecifier(_prototypeManager.Index(GeneticDamageGroup), 300);
+            _damageableSystem.TryChangeDamage(uid, damageSpec);
         }
     }
 
@@ -62,65 +65,52 @@ public sealed class CluwneSystem : EntitySystem
     /// <summary>
     /// OnStartup gives the cluwne outfit, ensures clumsy, and makes sure emote sounds are laugh.
     /// </summary>
-    private void OnComponentStartup(Entity<CluwneComponent> ent, ref ComponentStartup args)
+    private void OnComponentStartup(EntityUid uid, CluwneComponent component, ComponentStartup args)
     {
-        if (ent.Comp.EmoteSoundsId == null)
+        if (component.EmoteSoundsId == null)
             return;
+        _prototypeManager.TryIndex(component.EmoteSoundsId, out EmoteSounds);
 
-        _prototypeManager.TryIndex(ent.Comp.EmoteSoundsId, out EmoteSounds);
+        EnsureComp<AutoEmoteComponent>(uid);
+        _autoEmote.AddEmote(uid, "CluwneGiggle");
+        EnsureComp<ClumsyComponent>(uid);
 
+        _popupSystem.PopupEntity(Loc.GetString("cluwne-transform", ("target", uid)), uid, PopupType.LargeCaution);
+        _audio.PlayPvs(component.SpawnSound, uid);
 
-        if (ent.Comp.RandomEmote && ent.Comp.AutoEmoteId != null)
-        {
-            EnsureComp<AutoEmoteComponent>(ent.Owner);
-            _autoEmote.AddEmote(ent.Owner, ent.Comp.AutoEmoteId);
-        }
-        
-        EnsureComp<ClumsyComponent>(ent.Owner);
+        _nameMod.RefreshNameModifiers(uid);
 
-        var transformMessage = Loc.GetString(ent.Comp.TransformMessage, ("target", ent.Owner));
-
-        _popupSystem.PopupEntity(transformMessage, ent.Owner, PopupType.LargeCaution);
-        _audio.PlayPvs(ent.Comp.SpawnSound, ent.Owner);
-
-        _nameMod.RefreshNameModifiers(ent.Owner);
-
-
-        _outfitSystem.SetOutfit(ent.Owner, ent.Comp.OutfitId, unremovable: true);
+        _outfitSystem.SetOutfit(uid, "CluwneGear");
     }
 
     /// <summary>
     /// Handles the timing on autoemote as well as falling over and honking.
     /// </summary>
-    private void OnEmote(Entity<CluwneComponent> ent, ref EmoteEvent args)
+    private void OnEmote(EntityUid uid, CluwneComponent component, ref EmoteEvent args)
     {
         if (args.Handled)
             return;
+        args.Handled = _chat.TryPlayEmoteSound(uid, EmoteSounds, args.Emote);
 
-        if (!ent.Comp.RandomEmote)
-            return;
-
-        args.Handled = _chat.TryPlayEmoteSound(ent.Owner, EmoteSounds, args.Emote);
-
-        if (_robustRandom.Prob(ent.Comp.GiggleRandomChance))
+        if (_robustRandom.Prob(component.GiggleRandomChance))
         {
-            _audio.PlayPvs(ent.Comp.SpawnSound, ent.Owner);
-            _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString(ent.Comp.GiggleEmote), InGameICChatType.Emote, ChatTransmitRange.Normal);
+            _audio.PlayPvs(component.SpawnSound, uid);
+            _chat.TrySendInGameICMessage(uid, "honks", InGameICChatType.Emote, ChatTransmitRange.Normal);
         }
 
-        else if (_robustRandom.Prob(ent.Comp.KnockChance))
+        else if (_robustRandom.Prob(component.KnockChance))
         {
-            _audio.PlayPvs(ent.Comp.KnockSound, ent.Owner);
-            _stunSystem.TryUpdateParalyzeDuration(ent.Owner, TimeSpan.FromSeconds(ent.Comp.ParalyzeTime));
-            _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString(ent.Comp.KnockEmote), InGameICChatType.Emote, ChatTransmitRange.Normal);
+            _audio.PlayPvs(component.KnockSound, uid);
+            _stunSystem.TryUpdateParalyzeDuration(uid, TimeSpan.FromSeconds(component.ParalyzeTime));
+            _chat.TrySendInGameICMessage(uid, "spasms", InGameICChatType.Emote, ChatTransmitRange.Normal);
         }
     }
 
     /// <summary>
     /// Applies "Cluwnified" prefix
     /// </summary>
-    private void OnRefreshNameModifiers(Entity<CluwneComponent> ent, ref RefreshNameModifiersEvent args)
+    private void OnRefreshNameModifiers(Entity<CluwneComponent> entity, ref RefreshNameModifiersEvent args)
     {
-        args.AddModifier(ent.Comp.NamePrefix);
+        args.AddModifier("cluwne-name-prefix");
     }
 }
diff --git a/Content.Server/Construction/ConstructionSystem.Interactions.cs b/Content.Server/Construction/ConstructionSystem.Interactions.cs
index 77a1a63e02..3dd5a5b794 100644
--- a/Content.Server/Construction/ConstructionSystem.Interactions.cs
+++ b/Content.Server/Construction/ConstructionSystem.Interactions.cs
@@ -13,7 +13,6 @@ using Content.Shared.Prying.Systems;
 using Content.Shared.Radio.EntitySystems;
 using Content.Shared.Stacks;
 using Content.Shared.Temperature;
-using Content.Shared.Temperature.Components;
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Crayon/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs
new file mode 100644
index 0000000000..df20681938
--- /dev/null
+++ b/Content.Server/Crayon/CrayonComponent.cs
@@ -0,0 +1,28 @@
+using Content.Server.UserInterface;
+using Content.Shared.Crayon;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+
+namespace Content.Server.Crayon
+{
+    [RegisterComponent]
+    public sealed partial class CrayonComponent : SharedCrayonComponent
+    {
+        [DataField("useSound")] public SoundSpecifier? UseSound;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("selectableColor")]
+        public bool SelectableColor { get; set; }
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public int Charges { get; set; }
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("capacity")]
+        public int Capacity { get; set; } = 30;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("deleteEmpty")]
+        public bool DeleteEmpty = true;
+    }
+}
diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs
index 07b580fba5..f3abc2bf7a 100644
--- a/Content.Server/Crayon/CrayonSystem.cs
+++ b/Content.Server/Crayon/CrayonSystem.cs
@@ -3,7 +3,6 @@ using System.Numerics;
 using Content.Server.Administration.Logs;
 using Content.Server.Decals;
 using Content.Server.Popups;
-using Content.Shared.Charges.Systems;
 using Content.Shared.Crayon;
 using Content.Shared.Database;
 using Content.Shared.Decals;
@@ -13,6 +12,7 @@ using Content.Shared.Nutrition.EntitySystems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Crayon;
@@ -24,27 +24,23 @@ public sealed class CrayonSystem : SharedCrayonSystem
     [Dependency] private readonly DecalSystem _decals = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedChargesSystem _charges = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
-
-        SubscribeLocalEvent<CrayonComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<CrayonComponent, ComponentInit>(OnCrayonInit);
         SubscribeLocalEvent<CrayonComponent, CrayonSelectMessage>(OnCrayonBoundUI);
         SubscribeLocalEvent<CrayonComponent, CrayonColorMessage>(OnCrayonBoundUIColor);
         SubscribeLocalEvent<CrayonComponent, UseInHandEvent>(OnCrayonUse, before: new[] { typeof(FoodSystem) });
         SubscribeLocalEvent<CrayonComponent, AfterInteractEvent>(OnCrayonAfterInteract, after: new[] { typeof(FoodSystem) });
         SubscribeLocalEvent<CrayonComponent, DroppedEvent>(OnCrayonDropped);
+        SubscribeLocalEvent<CrayonComponent, ComponentGetState>(OnCrayonGetState);
     }
 
-    private void OnMapInit(Entity<CrayonComponent> ent, ref MapInitEvent args)
+    private static void OnCrayonGetState(EntityUid uid, CrayonComponent component, ref ComponentGetState args)
     {
-        // Get the first one from the catalog and set it as default
-        var decal = _prototypeManager.EnumeratePrototypes<DecalPrototype>().FirstOrDefault(x => x.Tags.Contains("crayon"));
-        ent.Comp.SelectedState = decal?.ID ?? string.Empty;
-        Dirty(ent);
+        args.State = new CrayonComponentState(component.Color, component.SelectedState, component.Charges, component.Capacity);
     }
 
     private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, AfterInteractEvent args)
@@ -52,7 +48,7 @@ public sealed class CrayonSystem : SharedCrayonSystem
         if (args.Handled || !args.CanReach)
             return;
 
-        if (_charges.IsEmpty(uid))
+        if (component.Charges <= 0)
         {
             if (component.DeleteEmpty)
                 UseUpCrayon(uid, args.User);
@@ -76,15 +72,17 @@ public sealed class CrayonSystem : SharedCrayonSystem
         if (component.UseSound != null)
             _audio.PlayPvs(component.UseSound, uid, AudioParams.Default.WithVariation(0.125f));
 
-        _charges.TryUseCharge(uid);
+        // Decrease "Ammo"
+        component.Charges--;
+        Dirty(uid, component);
 
         _adminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{ToPrettyString(args.User):user} drew a {component.Color:color} {component.SelectedState}");
         args.Handled = true;
 
-        if (component.DeleteEmpty && _charges.IsEmpty(uid))
+        if (component.DeleteEmpty && component.Charges <= 0)
             UseUpCrayon(uid, args.User);
         else
-            _uiSystem.ServerSendUiMessage(uid, CrayonUiKey.Key, new CrayonUsedMessage(component.SelectedState));
+            _uiSystem.ServerSendUiMessage(uid, SharedCrayonComponent.CrayonUiKey.Key, new CrayonUsedMessage(component.SelectedState));
     }
 
     private void OnCrayonUse(EntityUid uid, CrayonComponent component, UseInHandEvent args)
@@ -93,12 +91,14 @@ public sealed class CrayonSystem : SharedCrayonSystem
         if (args.Handled)
             return;
 
-        if (!_uiSystem.HasUi(uid, CrayonUiKey.Key))
+        if (!_uiSystem.HasUi(uid, SharedCrayonComponent.CrayonUiKey.Key))
+        {
             return;
+        }
 
-        _uiSystem.TryToggleUi(uid, CrayonUiKey.Key, args.User);
+        _uiSystem.TryToggleUi(uid, SharedCrayonComponent.CrayonUiKey.Key, args.User);
 
-        _uiSystem.SetUiState(uid, CrayonUiKey.Key, new CrayonBoundUserInterfaceState(component.SelectedState, component.SelectableColor, component.Color));
+        _uiSystem.SetUiState(uid, SharedCrayonComponent.CrayonUiKey.Key, new CrayonBoundUserInterfaceState(component.SelectedState, component.SelectableColor, component.Color));
         args.Handled = true;
     }
 
@@ -109,23 +109,35 @@ public sealed class CrayonSystem : SharedCrayonSystem
             return;
 
         component.SelectedState = args.State;
+
         Dirty(uid, component);
     }
 
     private void OnCrayonBoundUIColor(EntityUid uid, CrayonComponent component, CrayonColorMessage args)
     {
-        // Ensure that the given color can be changed or already matches
+        // you still need to ensure that the given color is a valid color
         if (!component.SelectableColor || args.Color == component.Color)
             return;
 
         component.Color = args.Color;
         Dirty(uid, component);
+
+    }
+
+    private void OnCrayonInit(EntityUid uid, CrayonComponent component, ComponentInit args)
+    {
+        component.Charges = component.Capacity;
+
+        // Get the first one from the catalog and set it as default
+        var decal = _prototypeManager.EnumeratePrototypes<DecalPrototype>().FirstOrDefault(x => x.Tags.Contains("crayon"));
+        component.SelectedState = decal?.ID ?? string.Empty;
+        Dirty(uid, component);
     }
 
     private void OnCrayonDropped(EntityUid uid, CrayonComponent component, DroppedEvent args)
     {
         // TODO: Use the existing event.
-        _uiSystem.CloseUi(uid, CrayonUiKey.Key, args.User);
+        _uiSystem.CloseUi(uid, SharedCrayonComponent.CrayonUiKey.Key, args.User);
     }
 
     private void UseUpCrayon(EntityUid uid, EntityUid user)
diff --git a/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs b/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs
new file mode 100644
index 0000000000..3123e251af
--- /dev/null
+++ b/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs
@@ -0,0 +1,19 @@
+using Content.Server.Damage.Systems;
+using Content.Shared.Damage;
+
+namespace Content.Server.Damage.Components
+{
+    [Access(typeof(DamageOtherOnHitSystem))]
+    [RegisterComponent]
+    public sealed partial class DamageOtherOnHitComponent : Component
+    {
+        [DataField("ignoreResistances")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool IgnoreResistances = false;
+
+        [DataField("damage", required: true)]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public DamageSpecifier Damage = default!;
+
+    }
+}
diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
index 10930ca5c9..b1f5365b01 100644
--- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
@@ -1,54 +1,72 @@
 using Content.Server.Administration.Logs;
+using Content.Server.Damage.Components;
 using Content.Server.Weapons.Ranged.Systems;
+using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Camera;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Effects;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Throwing;
+using Content.Shared.Wires;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
 
-namespace Content.Server.Damage.Systems;
-
-public sealed class DamageOtherOnHitSystem : SharedDamageOtherOnHitSystem
+namespace Content.Server.Damage.Systems
 {
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly GunSystem _guns = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!;
-    [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
-
-    public override void Initialize()
+    public sealed class DamageOtherOnHitSystem : EntitySystem
     {
-        base.Initialize();
+        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly GunSystem _guns = default!;
+        [Dependency] private readonly DamageableSystem _damageable = default!;
+        [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
+        [Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!;
+        [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
 
-        SubscribeLocalEvent<DamageOtherOnHitComponent, ThrowDoHitEvent>(OnDoHit);
-    }
-
-    private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDoHitEvent args)
-    {
-        if (TerminatingOrDeleted(args.Target))
-            return;
-
-        var dmg = _damageable.TryChangeDamage(args.Target, component.Damage * _damageable.UniversalThrownDamageModifier, component.IgnoreResistances, origin: args.Component.Thrower);
-
-        // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
-        if (dmg != null && HasComp<MobStateComponent>(args.Target))
-            _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision");
-
-        if (dmg is { Empty: false })
+        public override void Initialize()
         {
-            _color.RaiseEffect(Color.Red, [args.Target], Filter.Pvs(args.Target, entityManager: EntityManager));
+            SubscribeLocalEvent<DamageOtherOnHitComponent, ThrowDoHitEvent>(OnDoHit);
+            SubscribeLocalEvent<DamageOtherOnHitComponent, DamageExamineEvent>(OnDamageExamine);
+            SubscribeLocalEvent<DamageOtherOnHitComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
         }
 
-        _guns.PlayImpactSound(args.Target, dmg, null, false);
-        if (TryComp<PhysicsComponent>(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f)
+        private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDoHitEvent args)
         {
-            var direction = body.LinearVelocity.Normalized();
-            _sharedCameraRecoil.KickCamera(args.Target, direction);
+            if (TerminatingOrDeleted(args.Target))
+                return;
+
+            var dmg = _damageable.TryChangeDamage(args.Target, component.Damage * _damageable.UniversalThrownDamageModifier, component.IgnoreResistances, origin: args.Component.Thrower);
+
+            // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
+            if (dmg != null && HasComp<MobStateComponent>(args.Target))
+                _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision");
+
+            if (dmg is { Empty: false })
+            {
+                _color.RaiseEffect(Color.Red, new List<EntityUid>() { args.Target }, Filter.Pvs(args.Target, entityManager: EntityManager));
+            }
+
+            _guns.PlayImpactSound(args.Target, dmg, null, false);
+            if (TryComp<PhysicsComponent>(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f)
+            {
+                var direction = body.LinearVelocity.Normalized();
+                _sharedCameraRecoil.KickCamera(args.Target, direction);
+            }
+        }
+
+        private void OnDamageExamine(EntityUid uid, DamageOtherOnHitComponent component, ref DamageExamineEvent args)
+        {
+            _damageExamine.AddDamageExamine(args.Message, _damageable.ApplyUniversalAllModifiers(component.Damage * _damageable.UniversalThrownDamageModifier), Loc.GetString("damage-throw"));
+        }
+
+        /// <summary>
+        /// Prevent players with the Pacified status effect from throwing things that deal damage.
+        /// </summary>
+        private void OnAttemptPacifiedThrow(Entity<DamageOtherOnHitComponent> ent, ref AttemptPacifiedThrowEvent args)
+        {
+            args.Cancel("pacified-cannot-throw");
         }
     }
 }
diff --git a/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs b/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs
deleted file mode 100644
index e7b8aaf22b..0000000000
--- a/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.EntityConditions;
-using Content.Shared.EntityConditions.Conditions.Body;
-
-namespace Content.Server.EntityConditions.Conditions;
-
-/// <summary>
-/// Returns true if this entity is both able to breathe and is currently breathing.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class IsBreathingEntityConditionSystem : EntityConditionSystem<RespiratorComponent, BreathingCondition>
-{
-    [Dependency] private readonly RespiratorSystem _respirator = default!;
-    protected override void Condition(Entity<RespiratorComponent> entity, ref EntityConditionEvent<BreathingCondition> args)
-    {
-        args.Result = _respirator.IsBreathing(entity.AsNullable());
-    }
-}
diff --git a/Content.Server/EntityConditions/Conditions/MetabolizerTypesEntityConditionSystem.cs b/Content.Server/EntityConditions/Conditions/MetabolizerTypesEntityConditionSystem.cs
deleted file mode 100644
index 3b4fb5292b..0000000000
--- a/Content.Server/EntityConditions/Conditions/MetabolizerTypesEntityConditionSystem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Linq;
-using Content.Server.Body.Components;
-using Content.Shared.EntityConditions;
-using Content.Shared.EntityConditions.Conditions.Body;
-
-namespace Content.Server.EntityConditions.Conditions;
-
-/// <summary>
-/// Returns true if this entity has any of the listed metabolizer types.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class MetabolizerTypeEntityConditionSystem : EntityConditionSystem<MetabolizerComponent, MetabolizerTypeCondition>
-{
-    protected override void Condition(Entity<MetabolizerComponent> entity, ref EntityConditionEvent<MetabolizerTypeCondition> args)
-    {
-        if (entity.Comp.MetabolizerTypes == null)
-            return;
-
-        args.Result = entity.Comp.MetabolizerTypes.Overlaps(args.Condition.Type);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs
deleted file mode 100644
index 033704ffcd..0000000000
--- a/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Atmos;
-
-namespace Content.Server.EntityEffects.Effects.Atmos;
-
-/// <summary>
-/// This effect adjusts a gas at the tile this entity is currently on.
-/// The amount changed is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class CreateGasEntityEffectSystem : EntityEffectSystem<TransformComponent, CreateGas>
-{
-    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
-
-    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<CreateGas> args)
-    {
-        var tileMix = _atmosphere.GetContainingMixture(entity.AsNullable(), false, true);
-
-        tileMix?.AdjustMoles(args.Effect.Gas, args.Scale * args.Effect.Moles);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs
deleted file mode 100644
index 65c818f143..0000000000
--- a/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Atmos.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Atmos;
-
-namespace Content.Server.EntityEffects.Effects.Atmos;
-
-/// <summary>
-/// Adds a number of FireStacks modified by scale to this entity.
-/// The amount of FireStacks added is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class FlammableEntityEffectSystem : EntityEffectSystem<FlammableComponent, Flammable>
-{
-    [Dependency] private readonly FlammableSystem _flammable = default!;
-
-    protected override void Effect(Entity<FlammableComponent> entity, ref EntityEffectEvent<Flammable> args)
-    {
-        // The multiplier is determined by if the entity is already on fire, and if the multiplier for existing FireStacks has a value.
-        // If both of these are true, we use the MultiplierOnExisting value, otherwise we use the standard Multiplier.
-        var multiplier = entity.Comp.FireStacks == 0f || args.Effect.MultiplierOnExisting == null ? args.Effect.Multiplier : args.Effect.MultiplierOnExisting.Value;
-
-        _flammable.AdjustFireStacks(entity, args.Scale * multiplier, entity.Comp);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs
deleted file mode 100644
index de90656c66..0000000000
--- a/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Atmos.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Atmos;
-
-namespace Content.Server.EntityEffects.Effects.Atmos;
-
-/// <summary>
-/// Sets this entity on fire.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class IngiteEntityEffectSystem : EntityEffectSystem<FlammableComponent, Ignite>
-{
-    [Dependency] private readonly FlammableSystem _flammable = default!;
-
-    protected override void Effect(Entity<FlammableComponent> entity, ref EntityEffectEvent<Ignite> args)
-    {
-        // TODO: Proper BodySystem Metabolism Effect relay...
-        // TODO: If this fucks over downstream shitmed, I give you full approval to use whatever shitcode method you need to fix it. Metabolism is awful.
-        _flammable.Ignite(entity, entity, flammable: entity.Comp);
-    }
-}
-
diff --git a/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs b/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs
deleted file mode 100644
index 0cbf0b3864..0000000000
--- a/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Body;
-
-namespace Content.Server.EntityEffects.Effects.Body;
-
-/// <summary>
-/// This effect adjusts a respirator's saturation value.
-/// The saturation adjustment is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class OxygenateEntityEffectsSystem : EntityEffectSystem<RespiratorComponent, Oxygenate>
-{
-    [Dependency] private readonly RespiratorSystem _respirator = default!;
-    protected override void Effect(Entity<RespiratorComponent> entity, ref EntityEffectEvent<Oxygenate> args)
-    {
-        _respirator.UpdateSaturation(entity, args.Scale * args.Effect.Factor, entity.Comp);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs
deleted file mode 100644
index 64f61f5b11..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustHealthEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustHealth>
-{
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustHealth> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead)
-            return;
-
-        entity.Comp.MutationLevel += args.Effect.Amount * entity.Comp.MutationMod;
-        _plantHolder.CheckHealth(entity, entity.Comp);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs
deleted file mode 100644
index f35ff25b25..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustMutationLevelEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustMutationLevel>
-{
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustMutationLevel> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead)
-            return;
-
-        entity.Comp.Health += args.Effect.Amount;
-        _plantHolder.CheckHealth(entity, entity.Comp);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationModEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationModEntityEffectSystem.cs
deleted file mode 100644
index 3163ee374c..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationModEntityEffectSystem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustMutationModEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustMutationMod>
-{
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustMutationMod> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead)
-            return;
-
-        entity.Comp.MutationMod += args.Effect.Amount;
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs
deleted file mode 100644
index 56c016700d..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustNutritionEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustNutrition>
-{
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustNutrition> args)
-    {
-        _plantHolder.AdjustNutrient(entity, args.Effect.Amount, entity);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs
deleted file mode 100644
index 0495034b38..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustPestsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustPests>
-{
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustPests> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead)
-            return;
-
-        entity.Comp.PestLevel += args.Effect.Amount;
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs
deleted file mode 100644
index ebe5c83181..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustPotencyEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustPotency>
-{
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustPotency> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead)
-            return;
-
-        _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
-        entity.Comp.Seed.Potency = Math.Max(entity.Comp.Seed.Potency + args.Effect.Amount, 1);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs
deleted file mode 100644
index 31dc328977..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustToxinsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustToxins>
-{
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustToxins> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead)
-            return;
-
-        entity.Comp.Toxins += args.Effect.Amount;
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs
deleted file mode 100644
index 706eeb2ffe..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustWaterEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustWater>
-{
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustWater> args)
-    {
-        _plantHolder.AdjustWater(entity, args.Effect.Amount, entity.Comp);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs
deleted file mode 100644
index 34aa51e4ff..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustWeedsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustWeeds>
-{
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustWeeds> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead)
-            return;
-
-        entity.Comp.WeedLevel += args.Effect.Amount;
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs
deleted file mode 100644
index b0faa6255e..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAffectGrowthEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAffectGrowth>
-{
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAffectGrowth> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead)
-            return;
-
-        _plantHolder.AffectGrowth(entity, (int)args.Effect.Amount, entity);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs
deleted file mode 100644
index 3d82f74b11..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-using Robust.Shared.Random;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-/// <summary>
-/// This system mutates an inputted stat for a PlantHolder, only works for floats, integers, and bools.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class PlantChangeStatEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantChangeStat>
-{
-    // TODO: This is awful. I do not have the strength to refactor this. I want it gone.
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantChangeStat> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead)
-            return;
-
-        var effect = args.Effect;
-        var member = entity.Comp.Seed.GetType().GetField(args.Effect.TargetValue);
-
-        if (member == null)
-        {
-            Log.Error($"{ effect.GetType().Name } Error: Member { args.Effect.TargetValue} not found on { entity.Comp.Seed.GetType().Name }. Did you misspell it?");
-            return;
-        }
-
-        var currentValObj = member.GetValue(entity.Comp.Seed);
-        if (currentValObj == null)
-            return;
-
-        if (member.FieldType == typeof(float))
-        {
-            var floatVal = (float)currentValObj;
-            MutateFloat(ref floatVal, args.Effect.MinValue, args.Effect.MaxValue, args.Effect.Steps);
-            member.SetValue(entity.Comp.Seed, floatVal);
-        }
-        else if (member.FieldType == typeof(int))
-        {
-            var intVal = (int)currentValObj;
-            MutateInt(ref intVal, (int)args.Effect.MinValue, (int)args.Effect.MaxValue, args.Effect.Steps);
-            member.SetValue(entity.Comp.Seed, intVal);
-        }
-        else if (member.FieldType == typeof(bool))
-        {
-            var boolVal = (bool)currentValObj;
-            boolVal = !boolVal;
-            member.SetValue(entity.Comp.Seed, boolVal);
-        }
-    }
-
-    // Mutate reference 'val' between 'min' and 'max' by pretending the value
-    // is representable by a thermometer code with 'bits' number of bits and
-    // randomly flipping some of them.
-    private void MutateFloat(ref float val, float min, float max, int bits)
-    {
-        if (min == max)
-        {
-            val = min;
-            return;
-        }
-
-        // Starting number of bits that are high, between 0 and bits.
-        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
-        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
-        // val may be outside the range of min/max due to starting prototype values, so clamp.
-        valInt = Math.Clamp(valInt, 0, bits);
-
-        // Probability that the bit flip increases n.
-        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasive it it.
-        // In other words, it tends to go to the middle.
-        float probIncrease = 1 - (float)valInt / bits;
-        int valIntMutated;
-        if (_random.Prob(probIncrease))
-        {
-            valIntMutated = valInt + 1;
-        }
-        else
-        {
-            valIntMutated = valInt - 1;
-        }
-
-        // Set value based on mutated thermometer code.
-        float valMutated = Math.Clamp((float)valIntMutated / bits * (max - min) + min, min, max);
-        val = valMutated;
-    }
-
-    private void MutateInt(ref int val, int min, int max, int bits)
-    {
-        if (min == max)
-        {
-            val = min;
-            return;
-        }
-
-        // Starting number of bits that are high, between 0 and bits.
-        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
-        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
-        // val may be outside the range of min/max due to starting prototype values, so clamp.
-        valInt = Math.Clamp(valInt, 0, bits);
-
-        // Probability that the bit flip increases n.
-        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasing it.
-        // In other words, it tends to go to the middle.
-        float probIncrease = 1 - (float)valInt / bits;
-        int valMutated;
-        if (_random.Prob(probIncrease))
-        {
-            valMutated = val + 1;
-        }
-        else
-        {
-            valMutated = val - 1;
-        }
-
-        valMutated = Math.Clamp(valMutated, min, max);
-        val = valMutated;
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs
deleted file mode 100644
index 710bce24dd..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-using Robust.Shared.Random;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantCryoxadoneEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantCryoxadone>
-{
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantCryoxadone> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead)
-            return;
-
-        var deviation = 0;
-        var seed = entity.Comp.Seed;
-        if (seed == null)
-            return;
-        if (entity.Comp.Age > seed.Maturation)
-            deviation = (int) Math.Max(seed.Maturation - 1, entity.Comp.Age - _random.Next(7, 10));
-        else
-            deviation = (int) (seed.Maturation / seed.GrowthStages);
-        entity.Comp.Age -= deviation;
-        entity.Comp.LastProduce = entity.Comp.Age;
-        entity.Comp.SkipAging++;
-        entity.Comp.ForceUpdate = true;
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs
deleted file mode 100644
index 1661c501be..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Server.Popups;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-using Content.Shared.Popups;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantDestroySeedsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantDestroySeeds>
-{
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantDestroySeeds> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead || entity.Comp.Seed.Immutable)
-            return;
-
-        if (entity.Comp.Seed.Seedless)
-            return;
-
-        _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
-        _popup.PopupEntity(
-            Loc.GetString("botany-plant-seedsdestroyed"),
-            entity,
-            PopupType.SmallCaution
-        );
-        entity.Comp.Seed.Seedless = true;
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs
deleted file mode 100644
index f6aebde465..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-using Robust.Shared.Random;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantDiethylamineEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantDiethylamine>
-{
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantDiethylamine> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead || entity.Comp.Seed.Immutable)
-            return;
-
-        if (_random.Prob(0.1f))
-        {
-            _plantHolder.EnsureUniqueSeed(entity, entity);
-            entity.Comp.Seed!.Lifespan++;
-        }
-
-        if (_random.Prob(0.1f))
-        {
-            _plantHolder.EnsureUniqueSeed(entity, entity);
-            entity.Comp.Seed!.Endurance++;
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs
deleted file mode 100644
index 8a073392e1..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantPhalanximineEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantPhalanximine>
-{
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantPhalanximine> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead || entity.Comp.Seed.Immutable)
-            return;
-
-        entity.Comp.Seed.Viable = true;
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs
deleted file mode 100644
index 4d724be244..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Server.Popups;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantRestoreSeedsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantRestoreSeeds>
-{
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantRestoreSeeds> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead || entity.Comp.Seed.Immutable)
-            return;
-
-        if (!entity.Comp.Seed.Seedless)
-            return;
-
-        _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
-        _popup.PopupEntity(Loc.GetString("botany-plant-seedsrestored"), entity);
-        entity.Comp.Seed.Seedless = false;
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs
deleted file mode 100644
index 68ea3319ef..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-using Robust.Shared.Random;
-
-namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
-
-/// <summary>
-/// This effect directly increases the potency of a PlantHolder's plant provided it exists and isn't dead.
-/// Potency directly correlates to the size of the plant's produce.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class RobustHarvestEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, RobustHarvest>
-{
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<RobustHarvest> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Dead)
-            return;
-
-        if (entity.Comp.Seed.Potency < args.Effect.PotencyLimit)
-        {
-            _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
-            entity.Comp.Seed.Potency = Math.Min(entity.Comp.Seed.Potency + args.Effect.PotencyIncrease, args.Effect.PotencyLimit);
-
-            if (entity.Comp.Seed.Potency > args.Effect.PotencySeedlessThreshold)
-            {
-                entity.Comp.Seed.Seedless = true;
-            }
-        }
-        else if (entity.Comp.Seed.Yield > 1 && _random.Prob(0.1f))
-        {
-            // Too much of a good thing reduces yield
-            _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
-            entity.Comp.Seed.Yield--;
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
deleted file mode 100644
index 120ae6e881..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Server.Botany;
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.EntityEffects.Effects.Botany;
-
-public sealed partial class PlantMutateChemicalsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateChemicals>
-{
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateChemicals> args)
-    {
-        if (entity.Comp.Seed == null)
-            return;
-
-        var chemicals = entity.Comp.Seed.Chemicals;
-        var randomChems = _proto.Index(args.Effect.RandomPickBotanyReagent).Fills;
-
-        // Add a random amount of a random chemical to this set of chemicals
-        var pick = _random.Pick(randomChems);
-        var chemicalId = _random.Pick(pick.Reagents);
-        var amount = _random.Next(1, (int)pick.Quantity);
-        var seedChemQuantity = new SeedChemQuantity();
-        if (chemicals.ContainsKey(chemicalId))
-        {
-            seedChemQuantity.Min = chemicals[chemicalId].Min;
-            seedChemQuantity.Max = chemicals[chemicalId].Max + amount;
-        }
-        else
-        {
-            seedChemQuantity.Min = 1;
-            seedChemQuantity.Max = 1 + amount;
-            seedChemQuantity.Inherent = false;
-        }
-        var potencyDivisor = (int)Math.Ceiling(100.0f / seedChemQuantity.Max);
-        seedChemQuantity.PotencyDivisor = potencyDivisor;
-        chemicals[chemicalId] = seedChemQuantity;
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs
deleted file mode 100644
index e2376ba186..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Linq;
-using Content.Server.Botany.Components;
-using Content.Shared.Atmos;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany;
-using Robust.Shared.Random;
-
-namespace Content.Server.EntityEffects.Effects.Botany;
-
-public sealed partial class PlantMutateExudeGasesEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateExudeGases>
-{
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateExudeGases> args)
-    {
-        if (entity.Comp.Seed == null)
-            return;
-
-        var gasses = entity.Comp.Seed.ExudeGasses;
-
-        // Add a random amount of a random gas to this gas dictionary
-        float amount = _random.NextFloat(args.Effect.MinValue, args.Effect.MaxValue);
-        var gas = _random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
-
-        if (!gasses.TryAdd(gas, amount))
-        {
-            gasses[gas] += amount;
-        }
-    }
-}
-
-public sealed partial class PlantMutateConsumeGasesEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateConsumeGases>
-{
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateConsumeGases> args)
-    {
-        if (entity.Comp.Seed == null)
-            return;
-
-        var gasses = entity.Comp.Seed.ConsumeGasses;
-
-        // Add a random amount of a random gas to this gas dictionary
-        var amount = _random.NextFloat(args.Effect.MinValue, args.Effect.MaxValue);
-        var gas = _random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
-
-        if (!gasses.TryAdd(gas, amount))
-        {
-            gasses[gas] += amount;
-        }
-    }
-}
-
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs
deleted file mode 100644
index 95d7f97bbe..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Server.Botany;
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany;
-
-namespace Content.Server.EntityEffects.Effects.Botany;
-
-public sealed partial class PlantMutateHarvestEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateHarvest>
-{
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateHarvest> args)
-    {
-        if (entity.Comp.Seed == null)
-            return;
-
-        switch (entity.Comp.Seed.HarvestRepeat)
-        {
-            case HarvestType.NoRepeat:
-                entity.Comp.Seed.HarvestRepeat = HarvestType.Repeat;
-                break;
-            case HarvestType.Repeat:
-                entity.Comp.Seed.HarvestRepeat = HarvestType.SelfHarvest;
-                break;
-        }
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs
deleted file mode 100644
index c26e1e08cf..0000000000
--- a/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Server.Botany;
-using Content.Server.Botany.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Botany;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.EntityEffects.Effects.Botany;
-
-public sealed partial class PlantMutateSpeciesChangeEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateSpeciesChange>
-{
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateSpeciesChange> args)
-    {
-        if (entity.Comp.Seed == null || entity.Comp.Seed.MutationPrototypes.Count == 0)
-            return;
-
-        var targetProto = _random.Pick(entity.Comp.Seed.MutationPrototypes);
-        _proto.TryIndex(targetProto, out SeedPrototype? protoSeed);
-
-        if (protoSeed == null)
-        {
-            Log.Error($"Seed prototype could not be found: {targetProto}!");
-            return;
-        }
-
-        entity.Comp.Seed = entity.Comp.Seed.SpeciesChange(protoSeed);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/EmoteEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/EmoteEntityEffectSystem.cs
deleted file mode 100644
index 05ab857267..0000000000
--- a/Content.Server/EntityEffects/Effects/EmoteEntityEffectSystem.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server.Chat.Systems;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects;
-
-namespace Content.Server.EntityEffects.Effects;
-
-/// <summary>
-/// Makes this entity emote.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class EmoteEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Emote>
-{
-    [Dependency] private readonly ChatSystem _chat = default!;
-
-    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Emote> args)
-    {
-        if (args.Effect.ShowInChat)
-            _chat.TryEmoteWithChat(entity, args.Effect.EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: args.Effect.Force);
-        else
-            _chat.TryEmoteWithoutChat(entity, args.Effect.EmoteId);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
deleted file mode 100644
index c623b25857..0000000000
--- a/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Content.Server.Ghost.Roles.Components;
-using Content.Server.Speech.Components;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects;
-using Content.Shared.Mind.Components;
-
-namespace Content.Server.EntityEffects.Effects;
-
-/// <summary>
-/// Makes this entity sentient. Allows ghost to take it over if it's not already occupied.
-/// Optionally also allows this entity to speak.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class MakeSentientEntityEffectSystem : EntityEffectSystem<MetaDataComponent, MakeSentient>
-{
-    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<MakeSentient> args)
-    {
-        // Let affected entities speak normally to make this effect different from, say, the "random sentience" event
-        // This also works on entities that already have a mind
-        // We call this before the mind check to allow things like player-controlled mice to be able to benefit from the effect
-        if (args.Effect.AllowSpeech)
-        {
-            RemComp<ReplacementAccentComponent>(entity);
-            // TODO: Make MonkeyAccent a replacement accent and remove MonkeyAccent code-smell.
-            RemComp<MonkeyAccentComponent>(entity);
-        }
-
-        // Stops from adding a ghost role to things like people who already have a mind
-        if (TryComp<MindContainerComponent>(entity, out var mindContainer) && mindContainer.HasMind)
-            return;
-
-        // Don't add a ghost role to things that already have ghost roles
-        if (TryComp(entity, out GhostRoleComponent? ghostRole))
-            return;
-
-        ghostRole = AddComp<GhostRoleComponent>(entity);
-        EnsureComp<GhostTakeoverAvailableComponent>(entity);
-
-        ghostRole.RoleName = entity.Comp.EntityName;
-        ghostRole.RoleDescription = Loc.GetString("ghost-role-information-cognizine-description");
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs
deleted file mode 100644
index 5f19bcc50b..0000000000
--- a/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Server.Polymorph.Components;
-using Content.Server.Polymorph.Systems;
-using Content.Shared.EntityEffects;
-
-namespace Content.Server.EntityEffects.Effects;
-
-/// <summary>
-/// Polymorphs this entity into another entity.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class PolymorphEntityEffectSystem : EntityEffectSystem<PolymorphableComponent, Shared.EntityEffects.Effects.Polymorph>
-{
-    [Dependency] private readonly PolymorphSystem _polymorph = default!;
-
-    protected override void Effect(Entity<PolymorphableComponent> entity, ref EntityEffectEvent<Shared.EntityEffects.Effects.Polymorph> args)
-    {
-        _polymorph.PolymorphEntity(entity, args.Effect.Prototype);
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs
deleted file mode 100644
index e5ef488de8..0000000000
--- a/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Content.Server.Fluids.EntitySystems;
-using Content.Server.Spreader;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Solution;
-using Content.Shared.Maps;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
-
-namespace Content.Server.EntityEffects.Effects.Solution;
-
-/// <summary>
-/// This effect creates smoke at this solution's position.
-/// The amount of smoke created is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class AreaReactionEntityEffectsSystem : EntityEffectSystem<SolutionComponent, AreaReactionEffect>
-{
-    [Dependency] private readonly IMapManager _mapManager = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedMapSystem _map = default!;
-    [Dependency] private readonly SharedTransformSystem _xform = default!;
-    [Dependency] private readonly SmokeSystem _smoke = default!;
-    [Dependency] private readonly SpreaderSystem _spreader = default!;
-    [Dependency] private readonly TurfSystem _turf = default!;
-
-    // TODO: A sane way to make Smoke without a solution.
-    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AreaReactionEffect> args)
-    {
-        var xform = Transform(entity);
-        var mapCoords = _xform.GetMapCoordinates(entity);
-        var spreadAmount = (int) Math.Max(0, Math.Ceiling(args.Scale / args.Effect.OverflowThreshold));
-        var effect = args.Effect;
-
-        if (!_mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
-            !_map.TryGetTileRef(gridUid, grid, xform.Coordinates, out var tileRef))
-            return;
-
-        if (_spreader.RequiresFloorToSpread(effect.PrototypeId.ToString()) && _turf.IsSpace(tileRef))
-            return;
-
-        var coords = _map.MapToGrid(gridUid, mapCoords);
-        var ent = Spawn(args.Effect.PrototypeId, coords.SnapToGrid());
-
-        _smoke.StartSmoke(ent, entity.Comp.Solution, args.Effect.Duration, spreadAmount);
-
-        _audio.PlayPvs(args.Effect.Sound, entity, AudioParams.Default.WithVariation(0.25f));
-    }
-}
diff --git a/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
deleted file mode 100644
index 55fc120051..0000000000
--- a/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Transform;
-
-namespace Content.Server.EntityEffects.Effects.Transform;
-
-/// <summary>
-/// Creates an explosion at this entity's position.
-/// Intensity is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ExplosionEntityEffectSystem : EntityEffectSystem<TransformComponent, ExplosionEffect>
-{
-    [Dependency] private readonly ExplosionSystem _explosion = default!;
-
-    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<ExplosionEffect> args)
-    {
-        var intensity = MathF.Min(args.Effect.IntensityPerUnit * args.Scale, args.Effect.MaxTotalIntensity);
-
-        _explosion.QueueExplosion(
-            entity,
-            args.Effect.ExplosionType,
-            intensity,
-            args.Effect.IntensitySlope,
-            args.Effect.MaxIntensity,
-            args.Effect.TileBreakScale);
-    }
-}
diff --git a/Content.Server/EntityEffects/EntityEffectSystem.cs b/Content.Server/EntityEffects/EntityEffectSystem.cs
new file mode 100644
index 0000000000..238ef4849d
--- /dev/null
+++ b/Content.Server/EntityEffects/EntityEffectSystem.cs
@@ -0,0 +1,976 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Server.Botany;
+using Content.Server.Chat.Systems;
+using Content.Server.Emp;
+using Content.Server.Explosion.EntitySystems;
+using Content.Server.Fluids.EntitySystems;
+using Content.Server.Ghost.Roles.Components;
+using Content.Server.Polymorph.Components;
+using Content.Server.Polymorph.Systems;
+using Content.Server.Speech.Components;
+using Content.Server.Spreader;
+using Content.Server.Temperature.Components;
+using Content.Server.Temperature.Systems;
+using Content.Server.Zombies;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.EntityEffects.EffectConditions;
+using Content.Shared.EntityEffects.Effects.PlantMetabolism;
+using Content.Shared.EntityEffects.Effects;
+using Content.Shared.EntityEffects;
+using Content.Shared.Flash;
+using Content.Shared.Maps;
+using Content.Shared.Medical;
+using Content.Shared.Mind.Components;
+using Content.Shared.Popups;
+using Content.Shared.Random;
+using Content.Shared.Traits.Assorted;
+using Content.Shared.Zombies;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+using TemperatureCondition = Content.Shared.EntityEffects.EffectConditions.Temperature; // disambiguate the namespace
+using PolymorphEffect = Content.Shared.EntityEffects.Effects.Polymorph;
+
+namespace Content.Server.EntityEffects;
+
+public sealed class EntityEffectSystem : EntitySystem
+{
+    private static readonly ProtoId<WeightedRandomFillSolutionPrototype> RandomPickBotanyReagent = "RandomPickBotanyReagent";
+
+    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
+    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly EmpSystem _emp = default!;
+    [Dependency] private readonly ExplosionSystem _explosion = default!;
+    [Dependency] private readonly FlammableSystem _flammable = default!;
+    [Dependency] private readonly SharedFlashSystem _flash = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly MutationSystem _mutation = default!;
+    [Dependency] private readonly NarcolepsySystem _narcolepsy = default!;
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+    [Dependency] private readonly PolymorphSystem _polymorph = default!;
+    [Dependency] private readonly RespiratorSystem _respirator = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SmokeSystem _smoke = default!;
+    [Dependency] private readonly SpreaderSystem _spreader = default!;
+    [Dependency] private readonly TemperatureSystem _temperature = default!;
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly VomitSystem _vomit = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CheckEntityEffectConditionEvent<TemperatureCondition>>(OnCheckTemperature);
+        SubscribeLocalEvent<CheckEntityEffectConditionEvent<Breathing>>(OnCheckBreathing);
+        SubscribeLocalEvent<CheckEntityEffectConditionEvent<OrganType>>(OnCheckOrganType);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustHealth>>(OnExecutePlantAdjustHealth);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustMutationLevel>>(OnExecutePlantAdjustMutationLevel);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustMutationMod>>(OnExecutePlantAdjustMutationMod);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustNutrition>>(OnExecutePlantAdjustNutrition);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustPests>>(OnExecutePlantAdjustPests);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustPotency>>(OnExecutePlantAdjustPotency);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustToxins>>(OnExecutePlantAdjustToxins);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustWater>>(OnExecutePlantAdjustWater);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustWeeds>>(OnExecutePlantAdjustWeeds);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAffectGrowth>>(OnExecutePlantAffectGrowth);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantChangeStat>>(OnExecutePlantChangeStat);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantCryoxadone>>(OnExecutePlantCryoxadone);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantDestroySeeds>>(OnExecutePlantDestroySeeds);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantDiethylamine>>(OnExecutePlantDiethylamine);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantPhalanximine>>(OnExecutePlantPhalanximine);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantRestoreSeeds>>(OnExecutePlantRestoreSeeds);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<RobustHarvest>>(OnExecuteRobustHarvest);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<AdjustTemperature>>(OnExecuteAdjustTemperature);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<AreaReactionEffect>>(OnExecuteAreaReactionEffect);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<CauseZombieInfection>>(OnExecuteCauseZombieInfection);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<ChemCleanBloodstream>>(OnExecuteChemCleanBloodstream);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<ChemVomit>>(OnExecuteChemVomit);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<CreateEntityReactionEffect>>(OnExecuteCreateEntityReactionEffect);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<CreateGas>>(OnExecuteCreateGas);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<CureZombieInfection>>(OnExecuteCureZombieInfection);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<Emote>>(OnExecuteEmote);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<EmpReactionEffect>>(OnExecuteEmpReactionEffect);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<ExplosionReactionEffect>>(OnExecuteExplosionReactionEffect);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<FlammableReaction>>(OnExecuteFlammableReaction);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<FlashReactionEffect>>(OnExecuteFlashReactionEffect);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<Ignite>>(OnExecuteIgnite);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<MakeSentient>>(OnExecuteMakeSentient);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<ModifyBleedAmount>>(OnExecuteModifyBleedAmount);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<ModifyBloodLevel>>(OnExecuteModifyBloodLevel);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<ModifyLungGas>>(OnExecuteModifyLungGas);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<Oxygenate>>(OnExecuteOxygenate);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantMutateChemicals>>(OnExecutePlantMutateChemicals);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantMutateConsumeGasses>>(OnExecutePlantMutateConsumeGasses);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantMutateExudeGasses>>(OnExecutePlantMutateExudeGasses);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantMutateHarvest>>(OnExecutePlantMutateHarvest);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantSpeciesChange>>(OnExecutePlantSpeciesChange);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<PolymorphEffect>>(OnExecutePolymorph);
+        SubscribeLocalEvent<ExecuteEntityEffectEvent<ResetNarcolepsy>>(OnExecuteResetNarcolepsy);
+    }
+
+    private void OnCheckTemperature(ref CheckEntityEffectConditionEvent<TemperatureCondition> args)
+    {
+        args.Result = false;
+        if (TryComp(args.Args.TargetEntity, out TemperatureComponent? temp))
+        {
+            if (temp.CurrentTemperature >= args.Condition.Min && temp.CurrentTemperature <= args.Condition.Max)
+                args.Result = true;
+        }
+    }
+
+    private void OnCheckBreathing(ref CheckEntityEffectConditionEvent<Breathing> args)
+    {
+        if (!TryComp(args.Args.TargetEntity, out RespiratorComponent? respiratorComp))
+        {
+            args.Result = !args.Condition.IsBreathing;
+            return;
+        }
+
+        var breathingState = _respirator.IsBreathing((args.Args.TargetEntity, respiratorComp));
+        args.Result = args.Condition.IsBreathing == breathingState;
+    }
+
+    private void OnCheckOrganType(ref CheckEntityEffectConditionEvent<OrganType> args)
+    {
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.OrganEntity == null)
+            {
+                args.Result = false;
+                return;
+            }
+
+            args.Result = OrganCondition(args.Condition, reagentArgs.OrganEntity.Value);
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    public bool OrganCondition(OrganType condition, Entity<MetabolizerComponent?> metabolizer)
+    {
+        metabolizer.Comp ??= EntityManager.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
+        if (metabolizer.Comp != null
+            && metabolizer.Comp.MetabolizerTypes != null
+            && metabolizer.Comp.MetabolizerTypes.Contains(condition.Type))
+            return condition.ShouldHave;
+        return !condition.ShouldHave;
+    }
+
+    /// <summary>
+    ///     Checks if the plant holder can metabolize the reagent or not. Checks if it has an alive plant by default.
+    /// </summary>
+    /// <param name="plantHolder">The entity holding the plant</param>
+    /// <param name="plantHolderComponent">The plant holder component</param>
+    /// <param name="entityManager">The entity manager</param>
+    /// <param name="mustHaveAlivePlant">Whether to check if it has an alive plant or not</param>
+    /// <returns></returns>
+    private bool CanMetabolizePlant(EntityUid plantHolder, [NotNullWhen(true)] out PlantHolderComponent? plantHolderComponent,
+        bool mustHaveAlivePlant = true, bool mustHaveMutableSeed = false)
+    {
+        plantHolderComponent = null;
+
+        if (!TryComp(plantHolder, out plantHolderComponent))
+            return false;
+
+        if (mustHaveAlivePlant && (plantHolderComponent.Seed == null || plantHolderComponent.Dead))
+            return false;
+
+        if (mustHaveMutableSeed && (plantHolderComponent.Seed == null || plantHolderComponent.Seed.Immutable))
+            return false;
+
+        return true;
+    }
+
+    private void OnExecutePlantAdjustHealth(ref ExecuteEntityEffectEvent<PlantAdjustHealth> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
+            return;
+
+        plantHolderComp.Health += args.Effect.Amount;
+        _plantHolder.CheckHealth(args.Args.TargetEntity, plantHolderComp);
+    }
+
+    private void OnExecutePlantAdjustMutationLevel(ref ExecuteEntityEffectEvent<PlantAdjustMutationLevel> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
+            return;
+
+        plantHolderComp.MutationLevel += args.Effect.Amount * plantHolderComp.MutationMod;
+    }
+
+    private void OnExecutePlantAdjustMutationMod(ref ExecuteEntityEffectEvent<PlantAdjustMutationMod> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
+            return;
+
+        plantHolderComp.MutationMod += args.Effect.Amount;
+    }
+
+    private void OnExecutePlantAdjustNutrition(ref ExecuteEntityEffectEvent<PlantAdjustNutrition> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveAlivePlant: false))
+            return;
+
+        _plantHolder.AdjustNutrient(args.Args.TargetEntity, args.Effect.Amount, plantHolderComp);
+    }
+
+    private void OnExecutePlantAdjustPests(ref ExecuteEntityEffectEvent<PlantAdjustPests> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
+            return;
+
+        plantHolderComp.PestLevel += args.Effect.Amount;
+    }
+
+    private void OnExecutePlantAdjustPotency(ref ExecuteEntityEffectEvent<PlantAdjustPotency> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
+            return;
+
+        if (plantHolderComp.Seed == null)
+            return;
+
+        _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
+        plantHolderComp.Seed.Potency = Math.Max(plantHolderComp.Seed.Potency + args.Effect.Amount, 1);
+    }
+
+    private void OnExecutePlantAdjustToxins(ref ExecuteEntityEffectEvent<PlantAdjustToxins> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
+            return;
+
+        plantHolderComp.Toxins += args.Effect.Amount;
+    }
+
+    private void OnExecutePlantAdjustWater(ref ExecuteEntityEffectEvent<PlantAdjustWater> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveAlivePlant: false))
+            return;
+
+        _plantHolder.AdjustWater(args.Args.TargetEntity, args.Effect.Amount, plantHolderComp);
+    }
+
+    private void OnExecutePlantAdjustWeeds(ref ExecuteEntityEffectEvent<PlantAdjustWeeds> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
+            return;
+
+        plantHolderComp.WeedLevel += args.Effect.Amount;
+    }
+
+    private void OnExecutePlantAffectGrowth(ref ExecuteEntityEffectEvent<PlantAffectGrowth> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
+            return;
+
+        _plantHolder.AffectGrowth(args.Args.TargetEntity, (int) args.Effect.Amount, plantHolderComp);
+    }
+
+    // Mutate reference 'val' between 'min' and 'max' by pretending the value
+    // is representable by a thermometer code with 'bits' number of bits and
+    // randomly flipping some of them.
+    private void MutateFloat(ref float val, float min, float max, int bits)
+    {
+        if (min == max)
+        {
+            val = min;
+            return;
+        }
+
+        // Starting number of bits that are high, between 0 and bits.
+        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
+        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
+        // val may be outside the range of min/max due to starting prototype values, so clamp.
+        valInt = Math.Clamp(valInt, 0, bits);
+
+        // Probability that the bit flip increases n.
+        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasive it it.
+        // In other words, it tends to go to the middle.
+        float probIncrease = 1 - (float)valInt / bits;
+        int valIntMutated;
+        if (_random.Prob(probIncrease))
+        {
+            valIntMutated = valInt + 1;
+        }
+        else
+        {
+            valIntMutated = valInt - 1;
+        }
+
+        // Set value based on mutated thermometer code.
+        float valMutated = Math.Clamp((float)valIntMutated / bits * (max - min) + min, min, max);
+        val = valMutated;
+    }
+
+    private void MutateInt(ref int val, int min, int max, int bits)
+    {
+        if (min == max)
+        {
+            val = min;
+            return;
+        }
+
+        // Starting number of bits that are high, between 0 and bits.
+        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
+        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
+        // val may be outside the range of min/max due to starting prototype values, so clamp.
+        valInt = Math.Clamp(valInt, 0, bits);
+
+        // Probability that the bit flip increases n.
+        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasing it.
+        // In other words, it tends to go to the middle.
+        float probIncrease = 1 - (float)valInt / bits;
+        int valMutated;
+        if (_random.Prob(probIncrease))
+        {
+            valMutated = val + 1;
+        }
+        else
+        {
+            valMutated = val - 1;
+        }
+
+        valMutated = Math.Clamp(valMutated, min, max);
+        val = valMutated;
+    }
+
+    private void OnExecutePlantChangeStat(ref ExecuteEntityEffectEvent<PlantChangeStat> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
+            return;
+
+        if (plantHolderComp.Seed == null)
+            return;
+
+        var member = plantHolderComp.Seed.GetType().GetField(args.Effect.TargetValue);
+
+        if (member == null)
+        {
+            _mutation.Log.Error(args.Effect.GetType().Name + " Error: Member " + args.Effect.TargetValue + " not found on " + plantHolderComp.Seed.GetType().Name + ". Did you misspell it?");
+            return;
+        }
+
+        var currentValObj = member.GetValue(plantHolderComp.Seed);
+        if (currentValObj == null)
+            return;
+
+        if (member.FieldType == typeof(float))
+        {
+            var floatVal = (float)currentValObj;
+            MutateFloat(ref floatVal, args.Effect.MinValue, args.Effect.MaxValue, args.Effect.Steps);
+            member.SetValue(plantHolderComp.Seed, floatVal);
+        }
+        else if (member.FieldType == typeof(int))
+        {
+            var intVal = (int)currentValObj;
+            MutateInt(ref intVal, (int)args.Effect.MinValue, (int)args.Effect.MaxValue, args.Effect.Steps);
+            member.SetValue(plantHolderComp.Seed, intVal);
+        }
+        else if (member.FieldType == typeof(bool))
+        {
+            var boolVal = (bool)currentValObj;
+            boolVal = !boolVal;
+            member.SetValue(plantHolderComp.Seed, boolVal);
+        }
+    }
+
+    private void OnExecutePlantCryoxadone(ref ExecuteEntityEffectEvent<PlantCryoxadone> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
+            return;
+
+        var deviation = 0;
+        var seed = plantHolderComp.Seed;
+        if (seed == null)
+            return;
+        if (plantHolderComp.Age > seed.Maturation)
+            deviation = (int) Math.Max(seed.Maturation - 1, plantHolderComp.Age - _random.Next(7, 10));
+        else
+            deviation = (int) (seed.Maturation / seed.GrowthStages);
+        plantHolderComp.Age -= deviation;
+        plantHolderComp.LastProduce = plantHolderComp.Age;
+        plantHolderComp.SkipAging++;
+        plantHolderComp.ForceUpdate = true;
+    }
+
+    private void OnExecutePlantDestroySeeds(ref ExecuteEntityEffectEvent<PlantDestroySeeds> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveMutableSeed: true))
+            return;
+
+        if (plantHolderComp.Seed!.Seedless == false)
+        {
+            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
+            _popup.PopupEntity(
+                Loc.GetString("botany-plant-seedsdestroyed"),
+                args.Args.TargetEntity,
+                PopupType.SmallCaution
+            );
+            plantHolderComp.Seed.Seedless = true;
+        }
+    }
+
+    private void OnExecutePlantDiethylamine(ref ExecuteEntityEffectEvent<PlantDiethylamine> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveMutableSeed: true))
+            return;
+
+        if (_random.Prob(0.1f))
+        {
+            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed!.Lifespan++;
+        }
+
+        if (_random.Prob(0.1f))
+        {
+            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed!.Endurance++;
+        }
+    }
+
+    private void OnExecutePlantPhalanximine(ref ExecuteEntityEffectEvent<PlantPhalanximine> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveMutableSeed: true))
+            return;
+
+        plantHolderComp.Seed!.Viable = true;
+    }
+
+    private void OnExecutePlantRestoreSeeds(ref ExecuteEntityEffectEvent<PlantRestoreSeeds> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveMutableSeed: true))
+            return;
+
+        if (plantHolderComp.Seed!.Seedless)
+        {
+            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
+            _popup.PopupEntity(Loc.GetString("botany-plant-seedsrestored"), args.Args.TargetEntity);
+            plantHolderComp.Seed.Seedless = false;
+        }
+    }
+
+    private void OnExecuteRobustHarvest(ref ExecuteEntityEffectEvent<RobustHarvest> args)
+    {
+        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
+            return;
+
+        if (plantHolderComp.Seed == null)
+            return;
+
+        if (plantHolderComp.Seed.Potency < args.Effect.PotencyLimit)
+        {
+            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Potency = Math.Min(plantHolderComp.Seed.Potency + args.Effect.PotencyIncrease, args.Effect.PotencyLimit);
+
+            if (plantHolderComp.Seed.Potency > args.Effect.PotencySeedlessThreshold)
+            {
+                plantHolderComp.Seed.Seedless = true;
+            }
+        }
+        else if (plantHolderComp.Seed.Yield > 1 && _random.Prob(0.1f))
+        {
+            // Too much of a good thing reduces yield
+            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
+            plantHolderComp.Seed.Yield--;
+        }
+    }
+
+    private void OnExecuteAdjustTemperature(ref ExecuteEntityEffectEvent<AdjustTemperature> args)
+    {
+        if (TryComp(args.Args.TargetEntity, out TemperatureComponent? temp))
+        {
+            var amount = args.Effect.Amount;
+
+            if (args.Args is EntityEffectReagentArgs reagentArgs)
+            {
+                amount *= reagentArgs.Scale.Float();
+            }
+
+            _temperature.ChangeHeat(args.Args.TargetEntity, amount, true, temp);
+        }
+    }
+
+    private void OnExecuteAreaReactionEffect(ref ExecuteEntityEffectEvent<AreaReactionEffect> args)
+    {
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Source == null)
+                return;
+
+            var spreadAmount = (int) Math.Max(0, Math.Ceiling((reagentArgs.Quantity / args.Effect.OverflowThreshold).Float()));
+            var splitSolution = reagentArgs.Source.SplitSolution(reagentArgs.Source.Volume);
+            var transform = Comp<TransformComponent>(reagentArgs.TargetEntity);
+            var mapCoords = _xform.GetMapCoordinates(reagentArgs.TargetEntity, xform: transform);
+
+            if (!_mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
+                !_map.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef))
+            {
+                return;
+            }
+
+            if (_spreader.RequiresFloorToSpread(args.Effect.PrototypeId) && _turf.IsSpace(tileRef))
+                return;
+
+            var coords = _map.MapToGrid(gridUid, mapCoords);
+            var ent = Spawn(args.Effect.PrototypeId, coords.SnapToGrid());
+
+            _smoke.StartSmoke(ent, splitSolution, args.Effect.Duration, spreadAmount);
+
+            _audio.PlayPvs(args.Effect.Sound, reagentArgs.TargetEntity, AudioParams.Default.WithVariation(0.25f));
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    private void OnExecuteCauseZombieInfection(ref ExecuteEntityEffectEvent<CauseZombieInfection> args)
+    {
+        EnsureComp<ZombifyOnDeathComponent>(args.Args.TargetEntity);
+        EnsureComp<PendingZombieComponent>(args.Args.TargetEntity);
+    }
+
+    private void OnExecuteChemCleanBloodstream(ref ExecuteEntityEffectEvent<ChemCleanBloodstream> args)
+    {
+        var cleanseRate = args.Effect.CleanseRate;
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Source == null || reagentArgs.Reagent == null)
+                return;
+
+            cleanseRate *= reagentArgs.Scale.Float();
+            _bloodstream.FlushChemicals(args.Args.TargetEntity, reagentArgs.Reagent, cleanseRate);
+        }
+        else
+        {
+            _bloodstream.FlushChemicals(args.Args.TargetEntity, null, cleanseRate);
+        }
+    }
+
+    private void OnExecuteChemVomit(ref ExecuteEntityEffectEvent<ChemVomit> args)
+    {
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+            if (reagentArgs.Scale != 1f)
+                return;
+
+        _vomit.Vomit(args.Args.TargetEntity, args.Effect.ThirstAmount, args.Effect.HungerAmount);
+    }
+
+    private void OnExecuteCreateEntityReactionEffect(ref ExecuteEntityEffectEvent<CreateEntityReactionEffect> args)
+    {
+        var transform = Comp<TransformComponent>(args.Args.TargetEntity);
+        var quantity = (int)args.Effect.Number;
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+            quantity *= reagentArgs.Quantity.Int();
+
+        for (var i = 0; i < quantity; i++)
+        {
+            var uid = Spawn(args.Effect.Entity, _xform.GetMapCoordinates(args.Args.TargetEntity, xform: transform));
+            _xform.AttachToGridOrMap(uid);
+
+            // TODO figure out how to properly spawn inside of containers
+            // e.g. cheese:
+            // if the user is holding a bowl milk & enzyme, should drop to floor, not attached to the user.
+            // if reaction happens in a backpack, should insert cheese into backpack.
+            // --> if it doesn't fit, iterate through parent storage until it attaches to the grid (again, DON'T attach to players).
+            // if the reaction happens INSIDE a stomach? the bloodstream? I have no idea how to handle that.
+            // presumably having cheese materialize inside of your blood would have "disadvantages".
+        }
+    }
+
+    private void OnExecuteCreateGas(ref ExecuteEntityEffectEvent<CreateGas> args)
+    {
+        var tileMix = _atmosphere.GetContainingMixture(args.Args.TargetEntity, false, true);
+
+        if (tileMix != null)
+        {
+            if (args.Args is EntityEffectReagentArgs reagentArgs)
+            {
+                tileMix.AdjustMoles(args.Effect.Gas, reagentArgs.Quantity.Float() * args.Effect.Multiplier);
+            }
+            else
+            {
+                tileMix.AdjustMoles(args.Effect.Gas, args.Effect.Multiplier);
+            }
+        }
+    }
+
+    private void OnExecuteCureZombieInfection(ref ExecuteEntityEffectEvent<CureZombieInfection> args)
+    {
+        if (HasComp<IncurableZombieComponent>(args.Args.TargetEntity))
+            return;
+
+        RemComp<ZombifyOnDeathComponent>(args.Args.TargetEntity);
+        RemComp<PendingZombieComponent>(args.Args.TargetEntity);
+
+        if (args.Effect.Innoculate)
+        {
+            EnsureComp<ZombieImmuneComponent>(args.Args.TargetEntity);
+        }
+    }
+
+    private void OnExecuteEmote(ref ExecuteEntityEffectEvent<Emote> args)
+    {
+        if (args.Effect.EmoteId == null)
+            return;
+
+        if (args.Effect.ShowInChat)
+            _chat.TryEmoteWithChat(args.Args.TargetEntity, args.Effect.EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: args.Effect.Force);
+        else
+            _chat.TryEmoteWithoutChat(args.Args.TargetEntity, args.Effect.EmoteId);
+    }
+
+    private void OnExecuteEmpReactionEffect(ref ExecuteEntityEffectEvent<EmpReactionEffect> args)
+    {
+        var transform = Comp<TransformComponent>(args.Args.TargetEntity);
+
+        var range = args.Effect.EmpRangePerUnit;
+
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+        {
+            range = MathF.Min((float) (reagentArgs.Quantity * args.Effect.EmpRangePerUnit), args.Effect.EmpMaxRange);
+        }
+
+        _emp.EmpPulse(_xform.GetMapCoordinates(args.Args.TargetEntity, xform: transform),
+            range,
+            args.Effect.EnergyConsumption,
+            args.Effect.DisableDuration);
+    }
+
+    private void OnExecuteExplosionReactionEffect(ref ExecuteEntityEffectEvent<ExplosionReactionEffect> args)
+    {
+        var intensity = args.Effect.IntensityPerUnit;
+
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+        {
+            intensity = MathF.Min((float) reagentArgs.Quantity * args.Effect.IntensityPerUnit, args.Effect.MaxTotalIntensity);
+        }
+
+        _explosion.QueueExplosion(
+            args.Args.TargetEntity,
+            args.Effect.ExplosionType,
+            intensity,
+            args.Effect.IntensitySlope,
+            args.Effect.MaxIntensity,
+            args.Effect.TileBreakScale);
+    }
+
+    private void OnExecuteFlammableReaction(ref ExecuteEntityEffectEvent<FlammableReaction> args)
+    {
+        if (!TryComp(args.Args.TargetEntity, out FlammableComponent? flammable))
+            return;
+
+        // Sets the multiplier for FireStacks to MultiplierOnExisting is 0 or greater and target already has FireStacks
+        var multiplier = flammable.FireStacks != 0f && args.Effect.MultiplierOnExisting >= 0 ? args.Effect.MultiplierOnExisting : args.Effect.Multiplier;
+        var quantity = 1f;
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+        {
+            quantity = reagentArgs.Quantity.Float();
+            _flammable.AdjustFireStacks(args.Args.TargetEntity, quantity * multiplier, flammable);
+            if (reagentArgs.Reagent != null)
+                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
+        }
+        else
+        {
+            _flammable.AdjustFireStacks(args.Args.TargetEntity, multiplier, flammable);
+        }
+    }
+
+    private void OnExecuteFlashReactionEffect(ref ExecuteEntityEffectEvent<FlashReactionEffect> args)
+    {
+        var transform = Comp<TransformComponent>(args.Args.TargetEntity);
+
+        var range = 1f;
+
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+            range = MathF.Min((float)(reagentArgs.Quantity * args.Effect.RangePerUnit), args.Effect.MaxRange);
+
+        _flash.FlashArea(
+            args.Args.TargetEntity,
+            null,
+            range,
+            args.Effect.Duration,
+            slowTo: args.Effect.SlowTo,
+            sound: args.Effect.Sound);
+
+        if (args.Effect.FlashEffectPrototype == null)
+            return;
+
+        var uid = EntityManager.SpawnEntity(args.Effect.FlashEffectPrototype, _xform.GetMapCoordinates(transform));
+        _xform.AttachToGridOrMap(uid);
+
+        if (!TryComp<PointLightComponent>(uid, out var pointLightComp))
+            return;
+
+        _pointLight.SetRadius(uid, MathF.Max(1.1f, range), pointLightComp);
+    }
+
+    private void OnExecuteIgnite(ref ExecuteEntityEffectEvent<Ignite> args)
+    {
+        if (!TryComp(args.Args.TargetEntity, out FlammableComponent? flammable))
+            return;
+
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+        {
+            _flammable.Ignite(reagentArgs.TargetEntity, reagentArgs.OrganEntity ?? reagentArgs.TargetEntity, flammable: flammable);
+        }
+        else
+        {
+            _flammable.Ignite(args.Args.TargetEntity, args.Args.TargetEntity, flammable: flammable);
+        }
+    }
+
+    private void OnExecuteMakeSentient(ref ExecuteEntityEffectEvent<MakeSentient> args)
+    {
+        var uid = args.Args.TargetEntity;
+
+        // Let affected entities speak normally to make this effect different from, say, the "random sentience" event
+        // This also works on entities that already have a mind
+        // We call this before the mind check to allow things like player-controlled mice to be able to benefit from the effect
+        RemComp<ReplacementAccentComponent>(uid);
+        RemComp<MonkeyAccentComponent>(uid);
+
+        // Stops from adding a ghost role to things like people who already have a mind
+        if (TryComp<MindContainerComponent>(uid, out var mindContainer) && mindContainer.HasMind)
+        {
+            return;
+        }
+
+        // Don't add a ghost role to things that already have ghost roles
+        if (TryComp(uid, out GhostRoleComponent? ghostRole))
+        {
+            return;
+        }
+
+        ghostRole = AddComp<GhostRoleComponent>(uid);
+        EnsureComp<GhostTakeoverAvailableComponent>(uid);
+
+        var entityData = Comp<MetaDataComponent>(uid);
+        ghostRole.RoleName = entityData.EntityName;
+        ghostRole.RoleDescription = Loc.GetString("ghost-role-information-cognizine-description");
+    }
+
+    private void OnExecuteModifyBleedAmount(ref ExecuteEntityEffectEvent<ModifyBleedAmount> args)
+    {
+        if (TryComp<BloodstreamComponent>(args.Args.TargetEntity, out var blood))
+        {
+            var amt = args.Effect.Amount;
+            if (args.Args is EntityEffectReagentArgs reagentArgs) {
+                if (args.Effect.Scaled)
+                    amt *= reagentArgs.Quantity.Float();
+                amt *= reagentArgs.Scale.Float();
+            }
+
+            _bloodstream.TryModifyBleedAmount((args.Args.TargetEntity, blood), amt);
+        }
+    }
+
+    private void OnExecuteModifyBloodLevel(ref ExecuteEntityEffectEvent<ModifyBloodLevel> args)
+    {
+        if (TryComp<BloodstreamComponent>(args.Args.TargetEntity, out var blood))
+        {
+            var amt = args.Effect.Amount;
+            if (args.Args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (args.Effect.Scaled)
+                    amt *= reagentArgs.Quantity;
+                amt *= reagentArgs.Scale;
+            }
+
+            _bloodstream.TryModifyBloodLevel((args.Args.TargetEntity, blood), amt);
+        }
+    }
+
+    private void OnExecuteModifyLungGas(ref ExecuteEntityEffectEvent<ModifyLungGas> args)
+    {
+        LungComponent? lung;
+        float amount = 1f;
+
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (!TryComp<LungComponent>(reagentArgs.OrganEntity, out var organLung))
+                return;
+            lung = organLung;
+            amount = reagentArgs.Quantity.Float();
+        }
+        else
+        {
+            if (!TryComp<LungComponent>(args.Args.TargetEntity, out var organLung)) //Likely needs to be modified to ensure it works correctly
+                return;
+            lung = organLung;
+        }
+
+        if (lung != null)
+        {
+            foreach (var (gas, ratio) in args.Effect.Ratios)
+            {
+                var quantity = ratio * amount / Atmospherics.BreathMolesToReagentMultiplier;
+                if (quantity < 0)
+                    quantity = Math.Max(quantity, -lung.Air[(int) gas]);
+                lung.Air.AdjustMoles(gas, quantity);
+            }
+        }
+    }
+
+    private void OnExecuteOxygenate(ref ExecuteEntityEffectEvent<Oxygenate> args)
+    {
+        var multiplier = 1f;
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+        {
+            multiplier = reagentArgs.Quantity.Float();
+        }
+
+        if (TryComp<RespiratorComponent>(args.Args.TargetEntity, out var resp))
+        {
+            _respirator.UpdateSaturation(args.Args.TargetEntity, multiplier * args.Effect.Factor, resp);
+        }
+    }
+
+    private void OnExecutePlantMutateChemicals(ref ExecuteEntityEffectEvent<PlantMutateChemicals> args)
+    {
+        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
+
+        if (plantholder.Seed == null)
+            return;
+
+        var chemicals = plantholder.Seed.Chemicals;
+        var randomChems = _protoManager.Index(RandomPickBotanyReagent).Fills;
+
+        // Add a random amount of a random chemical to this set of chemicals
+        if (randomChems != null)
+        {
+            var pick = _random.Pick<RandomFillSolution>(randomChems);
+            var chemicalId = _random.Pick(pick.Reagents);
+            var amount = _random.Next(1, (int)pick.Quantity);
+            var seedChemQuantity = new SeedChemQuantity();
+            if (chemicals.ContainsKey(chemicalId))
+            {
+                seedChemQuantity.Min = chemicals[chemicalId].Min;
+                seedChemQuantity.Max = chemicals[chemicalId].Max + amount;
+            }
+            else
+            {
+                seedChemQuantity.Min = 1;
+                seedChemQuantity.Max = 1 + amount;
+                seedChemQuantity.Inherent = false;
+            }
+            var potencyDivisor = (int)Math.Ceiling(100.0f / seedChemQuantity.Max);
+            seedChemQuantity.PotencyDivisor = potencyDivisor;
+            chemicals[chemicalId] = seedChemQuantity;
+        }
+    }
+
+    private void OnExecutePlantMutateConsumeGasses(ref ExecuteEntityEffectEvent<PlantMutateConsumeGasses> args)
+    {
+        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
+
+        if (plantholder.Seed == null)
+            return;
+
+        var gasses = plantholder.Seed.ConsumeGasses;
+
+        // Add a random amount of a random gas to this gas dictionary
+        float amount = _random.NextFloat(args.Effect.MinValue, args.Effect.MaxValue);
+        Gas gas = _random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
+        if (gasses.ContainsKey(gas))
+        {
+            gasses[gas] += amount;
+        }
+        else
+        {
+            gasses.Add(gas, amount);
+        }
+    }
+
+    private void OnExecutePlantMutateExudeGasses(ref ExecuteEntityEffectEvent<PlantMutateExudeGasses> args)
+    {
+        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
+
+        if (plantholder.Seed == null)
+            return;
+
+        var gasses = plantholder.Seed.ExudeGasses;
+
+        // Add a random amount of a random gas to this gas dictionary
+        float amount = _random.NextFloat(args.Effect.MinValue, args.Effect.MaxValue);
+        Gas gas = _random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
+        if (gasses.ContainsKey(gas))
+        {
+            gasses[gas] += amount;
+        }
+        else
+        {
+            gasses.Add(gas, amount);
+        }
+    }
+
+    private void OnExecutePlantMutateHarvest(ref ExecuteEntityEffectEvent<PlantMutateHarvest> args)
+    {
+        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
+
+        if (plantholder.Seed == null)
+            return;
+
+        if (plantholder.Seed.HarvestRepeat == HarvestType.NoRepeat)
+            plantholder.Seed.HarvestRepeat = HarvestType.Repeat;
+        else if (plantholder.Seed.HarvestRepeat == HarvestType.Repeat)
+            plantholder.Seed.HarvestRepeat = HarvestType.SelfHarvest;
+    }
+
+    private void OnExecutePlantSpeciesChange(ref ExecuteEntityEffectEvent<PlantSpeciesChange> args)
+    {
+        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
+        if (plantholder.Seed == null)
+            return;
+
+        if (plantholder.Seed.MutationPrototypes.Count == 0)
+            return;
+
+        var targetProto = _random.Pick(plantholder.Seed.MutationPrototypes);
+        if (!_protoManager.TryIndex(targetProto, out SeedPrototype? protoSeed))
+        {
+            Log.Error($"Seed prototype could not be found: {targetProto}!");
+            return;
+        }
+
+        plantholder.Seed = plantholder.Seed.SpeciesChange(protoSeed);
+    }
+
+    private void OnExecutePolymorph(ref ExecuteEntityEffectEvent<PolymorphEffect> args)
+    {
+        // Make it into a prototype
+        EnsureComp<PolymorphableComponent>(args.Args.TargetEntity);
+        _polymorph.PolymorphEntity(args.Args.TargetEntity, args.Effect.PolymorphPrototype);
+    }
+
+    private void OnExecuteResetNarcolepsy(ref ExecuteEntityEffectEvent<ResetNarcolepsy> args)
+    {
+        if (args.Args is EntityEffectReagentArgs reagentArgs)
+            if (reagentArgs.Scale != 1f)
+                return;
+
+        _narcolepsy.AdjustNarcolepsyTimer(args.Args.TargetEntity, args.Effect.TimerReset);
+    }
+}
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index 7c9d02c561..13695caff1 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -21,7 +21,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using System.Linq;
-using Content.Shared.EntityEffects.Effects.Solution;
+
 using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
 
 namespace Content.Server.Fluids.EntitySystems;
@@ -278,10 +278,11 @@ public sealed class SmokeSystem : EntitySystem
         {
             if (reagentQuantity.Quantity == FixedPoint2.Zero)
                 continue;
+            var reagentProto = _prototype.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
 
-            _reactive.ReactionEntity(entity, ReactionMethod.Touch, reagentQuantity);
+            _reactive.ReactionEntity(entity, ReactionMethod.Touch, reagentProto, reagentQuantity, transferSolution);
             if (!blockIngestion)
-                _reactive.ReactionEntity(entity, ReactionMethod.Ingestion, reagentQuantity);
+                _reactive.ReactionEntity(entity, ReactionMethod.Ingestion, reagentProto, reagentQuantity, transferSolution);
         }
 
         if (blockIngestion)
diff --git a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
index 930368255c..8fd088408c 100644
--- a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
+++ b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
@@ -5,7 +5,6 @@ using System.Text.Json.Serialization;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
-using Content.Shared.EntityConditions;
 using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
@@ -43,7 +42,7 @@ public sealed class ChemistryJsonGenerator
             Converters =
             {
                 new UniversalJsonConverter<EntityEffect>(),
-                new UniversalJsonConverter<EntityCondition>(),
+                new UniversalJsonConverter<EntityEffectCondition>(),
                 new UniversalJsonConverter<ReagentEffectsEntry>(),
                 new UniversalJsonConverter<DamageSpecifier>(),
                 new FixedPointJsonConverter()
diff --git a/Content.Server/GuideGenerator/ReagentEntry.cs b/Content.Server/GuideGenerator/ReagentEntry.cs
index 59a212dbd2..8b597ad61b 100644
--- a/Content.Server/GuideGenerator/ReagentEntry.cs
+++ b/Content.Server/GuideGenerator/ReagentEntry.cs
@@ -76,7 +76,7 @@ public sealed class ReactionEntry
             proto.Products
                 .Select(x => KeyValuePair.Create(x.Key, x.Value.Float()))
                 .ToDictionary(x => x.Key, x => x.Value);
-        Effects = proto.Effects.ToList();
+        Effects = proto.Effects;
     }
 }
 
diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index 630141d003..5a4f4d93ce 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -404,9 +404,6 @@ public sealed class HolopadSystem : SharedHolopadSystem
         if (!this.IsPowered(entity, EntityManager))
             return;
 
-        if (HasComp<StationAiCoreComponent>(entity))
-            return;
-
         if (!TryComp<TelephoneComponent>(entity, out var entityTelephone) ||
             _telephoneSystem.IsTelephoneEngaged((entity, entityTelephone)))
             return;
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 1430f53cdd..c2d2614a0a 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -41,7 +41,6 @@ using Content.Shared.Stacks;
 using Content.Server.Construction.Components;
 using Content.Shared.Chat;
 using Content.Shared.Damage;
-using Content.Shared.Temperature.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Kitchen.EntitySystems
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 8dab21902d..20dc114918 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -5,12 +5,12 @@ using Content.Server.Medical.Components;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.NodeContainer.Nodes;
+using Content.Server.Temperature.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Medical.Cryogenics;
 using Content.Shared.MedicalScanner;
-using Content.Shared.Temperature.Components;
 using Content.Shared.UserInterface;
 using Robust.Shared.Containers;
 
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 657ac3e636..11e4ed4fcf 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Medical.Components;
 using Content.Server.PowerCell;
+using Content.Server.Temperature.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
@@ -12,7 +13,6 @@ using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
-using Content.Shared.Temperature.Components;
 using Content.Shared.Traits.Assorted;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs
deleted file mode 100644
index fe76968f34..0000000000
--- a/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Shared.Emag.Systems;
-
-namespace Content.Server.NPC.HTN.Preconditions;
-
-/// <summary>
-/// A precondition which is met if the NPC is emagged with <see cref="EmagType"/>, as computed by
-/// <see cref="EmagSystem.CheckFlag"/>. This is useful for changing NPC behavior in the case that the NPC is emagged,
-/// eg. like a helper NPC bot turning evil.
-/// </summary>
-public sealed partial class IsEmaggedPrecondition : HTNPrecondition
-{
-    private EmagSystem _emag;
-
-    /// <summary>
-    /// The type of emagging to check for.
-    /// </summary>
-    [DataField]
-    public EmagType EmagType = EmagType.Interaction;
-
-    public override void Initialize(IEntitySystemManager sysManager)
-    {
-        base.Initialize(sysManager);
-        _emag = sysManager.GetEntitySystem<EmagSystem>();
-    }
-
-    public override bool IsMet(NPCBlackboard blackboard)
-    {
-        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-        return _emag.CheckFlag(owner, EmagType);
-    }
-}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs
deleted file mode 100644
index a1440acb2e..0000000000
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions;
-using Content.Shared.CombatMode;
-using Content.Shared.Weapons.Melee;
-
-namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat.Melee;
-
-/// <summary>
-/// Something between <see cref="MeleeOperator"/> and <see cref="InteractWithOperator"/>, this operator causes the NPC
-/// to attempt a SINGLE <see cref="SharedMeleeWeaponSystem.AttemptLightAttack">melee attack</see> on the specified
-/// <see cref="TargetKey">target</see>.
-/// </summary>
-public sealed partial class MeleeAttackOperator : HTNOperator
-{
-    [Dependency] private readonly IEntityManager _entManager = default!;
-    private SharedMeleeWeaponSystem _melee;
-
-    /// <summary>
-    /// Key that contains the target entity.
-    /// </summary>
-    [DataField(required: true)]
-    public string TargetKey = default!;
-
-    public override void Initialize(IEntitySystemManager sysManager)
-    {
-        base.Initialize(sysManager);
-        _melee = sysManager.GetEntitySystem<SharedMeleeWeaponSystem>();
-    }
-
-    public override void TaskShutdown(NPCBlackboard blackboard, HTNOperatorStatus status)
-    {
-        base.TaskShutdown(blackboard, status);
-
-        ExitCombatMode(blackboard);
-    }
-
-    public override void PlanShutdown(NPCBlackboard blackboard)
-    {
-        base.PlanShutdown(blackboard);
-
-        ExitCombatMode(blackboard);
-    }
-
-    public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
-    {
-        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-
-        if (!_entManager.TryGetComponent<CombatModeComponent>(owner, out var combatMode) ||
-            !_melee.TryGetWeapon(owner, out var weaponUid, out var weapon))
-        {
-            return HTNOperatorStatus.Failed;
-        }
-
-        _entManager.System<SharedCombatModeSystem>().SetInCombatMode(owner, true, combatMode);
-
-
-        if (!blackboard.TryGetValue<EntityUid>(TargetKey, out var target, _entManager) ||
-            !_melee.AttemptLightAttack(owner, weaponUid, weapon, target))
-        {
-            return HTNOperatorStatus.Continuing;
-        }
-
-        return HTNOperatorStatus.Finished;
-    }
-
-    private void ExitCombatMode(NPCBlackboard blackboard)
-    {
-        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-        _entManager.System<SharedCombatModeSystem>().SetInCombatMode(owner, false);
-    }
-}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
index f69a0771f9..8a4c655a39 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
@@ -1,21 +1,13 @@
 using Content.Server.Chat.Systems;
-using Content.Shared.Dataset;
-using Content.Shared.Random.Helpers;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using static Content.Server.NPC.HTN.PrimitiveTasks.Operators.SpeakOperator.SpeakOperatorSpeech;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
 
 public sealed partial class SpeakOperator : HTNOperator
 {
     private ChatSystem _chat = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
 
     [DataField(required: true)]
-    public SpeakOperatorSpeech Speech;
+    public string Speech = string.Empty;
 
     /// <summary>
     /// Whether to hide message from chat window and logs.
@@ -26,51 +18,15 @@ public sealed partial class SpeakOperator : HTNOperator
     public override void Initialize(IEntitySystemManager sysManager)
     {
         base.Initialize(sysManager);
+
         _chat = sysManager.GetEntitySystem<ChatSystem>();
     }
 
     public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
     {
-        LocId speechLocId;
-        switch (Speech)
-        {
-            case LocalizedSetSpeakOperatorSpeech localizedDataSet:
-                if (!_proto.TryIndex(localizedDataSet.LineSet, out var speechSet))
-                    return HTNOperatorStatus.Failed;
-                speechLocId = _random.Pick(speechSet);
-                break;
-            case SingleSpeakOperatorSpeech single:
-                speechLocId = single.Line;
-                break;
-            default:
-                throw new ArgumentOutOfRangeException(nameof(Speech));
-        }
-
         var speaker = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-        _chat.TrySendInGameICMessage(
-            speaker,
-            Loc.GetString(speechLocId),
-            InGameICChatType.Speak,
-            hideChat: Hidden,
-            hideLog: Hidden
-        );
+        _chat.TrySendInGameICMessage(speaker, Loc.GetString(Speech), InGameICChatType.Speak, hideChat: Hidden, hideLog: Hidden);
 
         return base.Update(blackboard, frameTime);
     }
-
-    [ImplicitDataDefinitionForInheritors, MeansImplicitUse]
-    public abstract partial class SpeakOperatorSpeech
-    {
-        public sealed partial class SingleSpeakOperatorSpeech : SpeakOperatorSpeech
-        {
-            [DataField(required: true)]
-            public string Line;
-        }
-
-        public sealed partial class LocalizedSetSpeakOperatorSpeech : SpeakOperatorSpeech
-        {
-            [DataField(required: true)]
-            public ProtoId<LocalizedDatasetPrototype> LineSet;
-        }
-    }
 }
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs
deleted file mode 100644
index 4bbdbb3473..0000000000
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
-
-/// <summary>
-/// Raises an <see cref="HTNRaisedEvent"/> on the <see cref="NPCBlackboard.Owner">owner</see>. The event will contain
-/// the specified <see cref="Args"/>, and if not null, the value of <see cref="TargetKey"/>.
-/// </summary>
-public sealed partial class RaiseEventForOwnerOperator : HTNOperator
-{
-    [Dependency] private readonly IEntityManager _entMan = default!;
-
-    /// <summary>
-    /// The conceptual "target" of this event. Note that this is NOT the entity for which the event is raised. If null,
-    /// <see cref="HTNRaisedEvent.Target"/> will be null.
-    /// </summary>
-    [DataField]
-    public string? TargetKey;
-
-    /// <summary>
-    /// The data contained in the raised event. Since <see cref="HTNRaisedEvent"/> is itself pretty meaningless, this is
-    /// included to give some context of what the event is actually supposed to mean.
-    /// </summary>
-    [DataField(required: true)]
-    public EntityEventArgs Args;
-
-    public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
-    {
-        _entMan.EventBus.RaiseLocalEvent(
-            blackboard.GetValue<EntityUid>(NPCBlackboard.Owner),
-            new HTNRaisedEvent(
-                blackboard.GetValue<EntityUid>(NPCBlackboard.Owner),
-                TargetKey is { } targetKey ? blackboard.GetValue<EntityUid>(targetKey) : null,
-                Args
-            )
-        );
-
-        return HTNOperatorStatus.Finished;
-    }
-}
-
-public sealed partial class HTNRaisedEvent(EntityUid owner, EntityUid? target, EntityEventArgs args) : EntityEventArgs
-{
-    // Owner and target are both included here in case we want to add a "RaiseEventForTargetOperator" in the future
-    // while reusing this event.
-    public EntityUid Owner = owner;
-    public EntityUid? Target = target;
-    public EntityEventArgs Args = args;
-}
diff --git a/Content.Server/NPC/Queries/Queries/ComponentFilter.cs b/Content.Server/NPC/Queries/Queries/ComponentFilter.cs
index 5ba63bf6f7..0df4bd902f 100644
--- a/Content.Server/NPC/Queries/Queries/ComponentFilter.cs
+++ b/Content.Server/NPC/Queries/Queries/ComponentFilter.cs
@@ -9,11 +9,4 @@ public sealed partial class ComponentFilter : UtilityQueryFilter
     /// </summary>
     [DataField("components", required: true)]
     public ComponentRegistry Components = new();
-
-    /// <summary>
-    /// If true, this filter retains entities with ALL of the specified components. If false, this filter removes
-    /// entities with ANY of the specified components.
-    /// </summary>
-    [DataField]
-    public bool RetainWithComp = true;
 }
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index e8fe9e4c39..813626a1c4 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -5,6 +5,7 @@ using Content.Server.NPC.Queries.Considerations;
 using Content.Server.NPC.Queries.Curves;
 using Content.Server.NPC.Queries.Queries;
 using Content.Server.Nutrition.Components;
+using Content.Server.Temperature.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
 using Content.Shared.Examine;
@@ -29,7 +30,6 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using Content.Shared.Atmos.Components;
 using System.Linq;
-using Content.Shared.Temperature.Components;
 
 namespace Content.Server.NPC.Systems;
 
@@ -512,12 +512,11 @@ public sealed class NPCUtilitySystem : EntitySystem
                 {
                     foreach (var comp in compFilter.Components)
                     {
-                        var hasComp = HasComp(ent, comp.Value.Component.GetType());
-                        if (!compFilter.RetainWithComp == hasComp)
-                        {
-                            _entityList.Add(ent);
-                            break;
-                        }
+                        if (HasComp(ent, comp.Value.Component.GetType()))
+                            continue;
+
+                        _entityList.Add(ent);
+                        break;
                     }
                 }
 
diff --git a/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs b/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs
index d6309ccdd3..9983b35969 100644
--- a/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs
+++ b/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs
@@ -1,6 +1,5 @@
 using Content.Server.Ninja.Systems;
 using Content.Server.Objectives.Systems;
-using Content.Shared.Whitelist;
 
 namespace Content.Server.Objectives.Components;
 
@@ -15,11 +14,4 @@ public sealed partial class SpiderChargeConditionComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? Target;
-
-    /// <summary>
-    /// Tags that should be used to exclude Warp Points
-    /// from the list of valid bombing targets
-    /// </summary>
-    [DataField]
-    public EntityWhitelist? Blacklist;
 }
diff --git a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
index 4c19a64ab1..db78816503 100644
--- a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
+++ b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.Objectives.Components;
 using Content.Shared.Objectives.Components;
+using Content.Shared.Ninja.Components;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Components;
 using Content.Shared.Warps;
-using Content.Shared.Whitelist;
 using Robust.Shared.Random;
 
 namespace Content.Server.Objectives.Systems;
@@ -14,7 +14,6 @@ namespace Content.Server.Objectives.Systems;
 /// </summary>
 public sealed class NinjaConditionsSystem : EntitySystem
 {
-    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly NumberObjectiveSystem _number = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
@@ -54,13 +53,10 @@ public sealed class NinjaConditionsSystem : EntitySystem
 
         // choose spider charge detonation point
         var warps = new List<EntityUid>();
-        var allEnts = EntityQueryEnumerator<WarpPointComponent>();
-        var bombingBlacklist = comp.Blacklist;
-
-        while (allEnts.MoveNext(out var warpUid, out var warp))
+        var query = EntityQueryEnumerator<BombingTargetComponent, WarpPointComponent>();
+        while (query.MoveNext(out var warpUid, out _, out var warp))
         {
-            if (_whitelist.IsBlacklistFail(bombingBlacklist, warpUid)
-                && !string.IsNullOrWhiteSpace(warp.Location))
+            if (warp.Location != null)
             {
                 warps.Add(warpUid);
             }
diff --git a/Content.Server/PAI/PAISystem.cs b/Content.Server/PAI/PAISystem.cs
index 7fd58f1572..289b74b258 100644
--- a/Content.Server/PAI/PAISystem.cs
+++ b/Content.Server/PAI/PAISystem.cs
@@ -2,22 +2,27 @@ using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Instruments;
 using Content.Server.Kitchen.Components;
+using Content.Server.Store.Systems;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mind.Components;
 using Content.Shared.PAI;
 using Content.Shared.Popups;
+using Content.Shared.Store;
+using Content.Shared.Store.Components;
 using Content.Shared.Instruments;
 using Robust.Shared.Random;
+using Robust.Shared.Prototypes;
 using System.Text;
 
 namespace Content.Server.PAI;
 
-public sealed class PAISystem : EntitySystem
+public sealed class PAISystem : SharedPAISystem
 {
     [Dependency] private readonly InstrumentSystem _instrumentSystem = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly StoreSystem _store = default!;
     [Dependency] private readonly ToggleableGhostRoleSystem _toggleableGhostRole = default!;
 
     /// <summary>
@@ -33,6 +38,8 @@ public sealed class PAISystem : EntitySystem
         SubscribeLocalEvent<PAIComponent, MindAddedMessage>(OnMindAdded);
         SubscribeLocalEvent<PAIComponent, MindRemovedMessage>(OnMindRemoved);
         SubscribeLocalEvent<PAIComponent, BeingMicrowavedEvent>(OnMicrowaved);
+
+        SubscribeLocalEvent<PAIComponent, PAIShopActionEvent>(OnShop);
     }
 
     private void OnUseInHand(EntityUid uid, PAIComponent component, UseInHandEvent args)
@@ -99,6 +106,15 @@ public sealed class PAISystem : EntitySystem
         var val = Loc.GetString("pai-system-pai-name-raw", ("name", name.ToString()));
         _metaData.SetEntityName(uid, val);
     }
+
+    private void OnShop(Entity<PAIComponent> ent, ref PAIShopActionEvent args)
+    {
+        if (!TryComp<StoreComponent>(ent, out var store))
+            return;
+
+        _store.ToggleUi(args.Performer, ent, store);
+    }
+
     public void PAITurningOff(EntityUid uid)
     {
         //  Close the instrument interface if it was open
diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs
index c49a2f0f6b..28b14f6925 100644
--- a/Content.Server/Power/EntitySystems/BatterySystem.cs
+++ b/Content.Server/Power/EntitySystems/BatterySystem.cs
@@ -171,7 +171,7 @@ namespace Content.Server.Power.EntitySystems
             if (!Resolve(uid, ref battery))
                 return 0;
 
-            var newValue = Math.Clamp(battery.CurrentCharge + value, 0, battery.MaxCharge);
+            var newValue = Math.Clamp(0, battery.CurrentCharge + value, battery.MaxCharge);
             var delta = newValue - battery.CurrentCharge;
             battery.CurrentCharge = newValue;
 
diff --git a/Content.Server/PowerSink/PowerSinkSystem.cs b/Content.Server/PowerSink/PowerSinkSystem.cs
index df0980883d..2bf9046cc3 100644
--- a/Content.Server/PowerSink/PowerSinkSystem.cs
+++ b/Content.Server/PowerSink/PowerSinkSystem.cs
@@ -66,7 +66,7 @@ namespace Content.Server.PowerSink
                 if (!transform.Anchored)
                     continue;
 
-                _battery.ChangeCharge(entity, networkLoad.NetworkLoad.ReceivingPower * frameTime, battery);
+                _battery.SetCharge(entity, battery.CurrentCharge + networkLoad.NetworkLoad.ReceivingPower / 1000, battery);
 
                 var currentBatteryThreshold = battery.CurrentCharge / battery.MaxCharge;
 
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index 6c8972be58..b89f10934d 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Server.Actions;
 using Content.Server.GameTicking;
+using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Damage;
@@ -20,6 +21,7 @@ using Content.Shared.Store.Components;
 using Content.Shared.Stunnable;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
 namespace Content.Server.Revenant.EntitySystems;
@@ -44,12 +46,17 @@ public sealed partial class RevenantSystem : EntitySystem
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly VisibilitySystem _visibility = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
+
+    private static readonly EntProtoId RevenantShopId = "ActionRevenantShop";
+
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<RevenantComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<RevenantComponent, MapInitEvent>(OnMapInit);
 
+        SubscribeLocalEvent<RevenantComponent, RevenantShopActionEvent>(OnShop);
         SubscribeLocalEvent<RevenantComponent, DamageChangedEvent>(OnDamage);
         SubscribeLocalEvent<RevenantComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<RevenantComponent, StatusEffectAddedEvent>(OnStatusAdded);
@@ -87,6 +94,11 @@ public sealed partial class RevenantSystem : EntitySystem
         _eye.RefreshVisibilityMask(uid);
     }
 
+    private void OnMapInit(EntityUid uid, RevenantComponent component, MapInitEvent args)
+    {
+        _action.AddAction(uid, ref component.Action, RevenantShopId);
+    }
+
     private void OnStatusAdded(EntityUid uid, RevenantComponent component, StatusEffectAddedEvent args)
     {
         if (args.Key == "Stun")
@@ -170,6 +182,13 @@ public sealed partial class RevenantSystem : EntitySystem
         return true;
     }
 
+    private void OnShop(EntityUid uid, RevenantComponent component, RevenantShopActionEvent args)
+    {
+        if (!TryComp<StoreComponent>(uid, out var store))
+            return;
+        _store.ToggleUi(uid, uid, store);
+    }
+
     public void MakeVisible(bool visible)
     {
         var query = EntityQueryEnumerator<RevenantComponent, VisibilityComponent>();
diff --git a/Content.Server/Silicons/Bots/HugBotSystem.cs b/Content.Server/Silicons/Bots/HugBotSystem.cs
deleted file mode 100644
index 4be948f434..0000000000
--- a/Content.Server/Silicons/Bots/HugBotSystem.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
-using Content.Shared.Silicons.Bots;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Silicons.Bots;
-
-/// <summary>
-/// Beyond what <see cref="SharedHugBotSystem"/> does, this system manages the "lifecycle" of
-/// <see cref="RecentlyHuggedByHugBotComponent"/>.
-/// </summary>
-public sealed class HugBotSystem : SharedHugBotSystem
-{
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<HugBotComponent, HTNRaisedEvent>(OnHtnRaisedEvent);
-    }
-
-    private void OnHtnRaisedEvent(Entity<HugBotComponent> entity, ref HTNRaisedEvent args)
-    {
-        if (args.Args is not HugBotDidHugEvent ||
-            args.Target is not {} target)
-            return;
-
-        var ev = new HugBotHugEvent(GetNetEntity(entity));
-        RaiseLocalEvent(target, ev);
-
-        ApplyHugBotCooldown(entity, target);
-    }
-
-    /// <summary>
-    /// Applies <see cref="RecentlyHuggedByHugBotComponent"/> to <paramref name="target"/> based on the configuration of
-    /// <paramref name="hugBot"/>.
-    /// </summary>
-    public void ApplyHugBotCooldown(Entity<HugBotComponent> hugBot, EntityUid target)
-    {
-        var hugged = EnsureComp<RecentlyHuggedByHugBotComponent>(target);
-        hugged.CooldownCompleteAfter = _gameTiming.CurTime + hugBot.Comp.HugCooldown;
-    }
-
-    public override void Update(float frameTime)
-    {
-        // Iterate through all RecentlyHuggedByHugBot entities...
-        var huggedEntities = AllEntityQuery<RecentlyHuggedByHugBotComponent>();
-        while (huggedEntities.MoveNext(out var huggedEnt, out var huggedComp))
-        {
-            // ... and if their cooldown is complete...
-            if (huggedComp.CooldownCompleteAfter <= _gameTiming.CurTime)
-            {
-                // ... remove it, allowing them to receive the blessing of hugs once more.
-                RemCompDeferred<RecentlyHuggedByHugBotComponent>(huggedEnt);
-            }
-        }
-    }
-}
-
-/// <summary>
-/// This event is indirectly raised (by being <see cref="HTNRaisedEvent.Args"/>) on a HugBot when it hugs (or emaggedly
-/// punches) an entity.
-/// </summary>
-[Serializable, DataDefinition]
-public sealed partial class HugBotDidHugEvent : EntityEventArgs;
diff --git a/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs b/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs
deleted file mode 100644
index c6c7d47e8d..0000000000
--- a/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Content.Shared.Silicons.Bots;
-
-namespace Content.Server.Silicons.Bots;
-
-/// <summary>
-/// This marker component indicates that its entity has been recently hugged by a HugBot and should not be hugged again
-/// before <see cref="CooldownCompleteAfter">a cooldown period</see> in order to prevent hug spam.
-/// </summary>
-/// <see cref="SharedHugBotSystem"/>
-[RegisterComponent, AutoGenerateComponentPause]
-public sealed partial class RecentlyHuggedByHugBotComponent : Component
-{
-    [DataField, AutoPausedField]
-    public TimeSpan CooldownCompleteAfter = TimeSpan.MinValue;
-}
diff --git a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
index 884d625045..8e33410561 100644
--- a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
@@ -176,10 +176,9 @@ public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSyste
 
         foreach (var result in rayCastResults)
         {
-            if (!genQuery.HasComponent(result.HitEntity))
-                continue;
+            if (genQuery.HasComponent(result.HitEntity))
+                closestResult = result;
 
-            closestResult = result;
             break;
         }
 
diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index 10060dc7d3..0625ced087 100644
--- a/Content.Server/Store/Systems/StoreSystem.cs
+++ b/Content.Server/Store/Systems/StoreSystem.cs
@@ -1,16 +1,17 @@
-using System.Linq;
 using Content.Server.Store.Components;
+using Content.Shared.UserInterface;
 using Content.Shared.FixedPoint;
 using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
 using Content.Shared.Store.Components;
-using Content.Shared.Store.Events;
-using Content.Shared.UserInterface;
+using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using System.Linq;
+using Robust.Shared.Timing;
+using Content.Shared.Mind;
 
 namespace Content.Server.Store.Systems;
 
@@ -36,7 +37,6 @@ public sealed partial class StoreSystem : EntitySystem
         SubscribeLocalEvent<StoreComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<StoreComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<StoreComponent, OpenUplinkImplantEvent>(OnImplantActivate);
-        SubscribeLocalEvent<StoreComponent, IntrinsicStoreActionEvent>(OnIntrinsicStoreAction);
 
         InitializeUi();
         InitializeCommand();
@@ -187,12 +187,6 @@ public sealed partial class StoreSystem : EntitySystem
         UpdateUserInterface(null, uid, store);
         return true;
     }
-
-    private void OnIntrinsicStoreAction(Entity<StoreComponent> ent, ref IntrinsicStoreActionEvent args)
-    {
-        ToggleUi(args.Performer, ent.Owner, ent.Comp);
-    }
-
 }
 
 public sealed class CurrencyInsertAttemptEvent : CancellableEntityEventArgs
diff --git a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
index 09e42966c7..c1757b1c2d 100644
--- a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
@@ -27,7 +27,6 @@ internal sealed class StunOnCollideSystem : EntitySystem
         if (ent.Comp.Refresh)
         {
             _stunSystem.TryUpdateStunDuration(target, ent.Comp.StunAmount);
-
             _movementMod.TryUpdateMovementSpeedModDuration(
                 target,
                 MovementModStatusSystem.TaserSlowdown,
diff --git a/Content.Shared/Temperature/Components/TemperatureComponent.cs b/Content.Server/Temperature/Components/TemperatureComponent.cs
similarity index 98%
rename from Content.Shared/Temperature/Components/TemperatureComponent.cs
rename to Content.Server/Temperature/Components/TemperatureComponent.cs
index b73d1f77d1..ae2c373b14 100644
--- a/Content.Shared/Temperature/Components/TemperatureComponent.cs
+++ b/Content.Server/Temperature/Components/TemperatureComponent.cs
@@ -4,7 +4,7 @@ using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Temperature.Components;
+namespace Content.Server.Temperature.Components;
 
 /// <summary>
 /// Handles changing temperature,
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index f6a7536994..6290e8231a 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -10,14 +10,14 @@ using Content.Shared.Database;
 using Content.Shared.Inventory;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Temperature;
+using Robust.Shared.Physics.Components;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Physics.Events;
 using Content.Shared.Projectiles;
-using Content.Shared.Temperature.Components;
-using Content.Shared.Temperature.Systems;
 
 namespace Content.Server.Temperature.Systems;
 
-public sealed class TemperatureSystem : SharedTemperatureSystem
+public sealed class TemperatureSystem : EntitySystem
 {
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
@@ -125,7 +125,8 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
             true);
     }
 
-    public override void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false, TemperatureComponent? temperature = null)
+    public void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false,
+        TemperatureComponent? temperature = null)
     {
         if (!Resolve(uid, ref temperature, false))
             return;
@@ -160,6 +161,16 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
         ChangeHeat(uid, heat * temperature.AtmosTemperatureTransferEfficiency, temperature: temperature);
     }
 
+    public float GetHeatCapacity(EntityUid uid, TemperatureComponent? comp = null, PhysicsComponent? physics = null)
+    {
+        if (!Resolve(uid, ref comp) || !Resolve(uid, ref physics, false) || physics.FixturesMass <= 0)
+        {
+            return Atmospherics.MinimumHeatCapacity;
+        }
+
+        return comp.SpecificHeat * physics.FixturesMass;
+    }
+
     private void OnInit(EntityUid uid, InternalTemperatureComponent comp, MapInitEvent args)
     {
         if (!TryComp<TemperatureComponent>(uid, out var temp))
diff --git a/Content.Server/Tiles/TileEntityEffectComponent.cs b/Content.Server/Tiles/TileEntityEffectComponent.cs
index 70f11bb060..4201af47f9 100644
--- a/Content.Server/Tiles/TileEntityEffectComponent.cs
+++ b/Content.Server/Tiles/TileEntityEffectComponent.cs
@@ -14,6 +14,6 @@ public sealed partial class TileEntityEffectComponent : Component
     /// <summary>
     /// List of effects that should be applied.
     /// </summary>
-    [DataField]
+    [ViewVariables(VVAccess.ReadWrite), DataField]
     public List<EntityEffect> Effects = default!;
 }
diff --git a/Content.Server/Tiles/TileEntityEffectSystem.cs b/Content.Server/Tiles/TileEntityEffectSystem.cs
index bd4aa789c2..4d866cb254 100644
--- a/Content.Server/Tiles/TileEntityEffectSystem.cs
+++ b/Content.Server/Tiles/TileEntityEffectSystem.cs
@@ -1,11 +1,13 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.StepTrigger.Systems;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.EntityEffects;
 
 namespace Content.Server.Tiles;
 
 public sealed class TileEntityEffectSystem : EntitySystem
 {
-    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
 
     public override void Initialize()
     {
@@ -21,7 +23,11 @@ public sealed class TileEntityEffectSystem : EntitySystem
     private void OnTileStepTriggered(Entity<TileEntityEffectComponent> ent, ref StepTriggeredOffEvent args)
     {
         var otherUid = args.Tripper;
+        var effectArgs = new EntityEffectBaseArgs(otherUid, EntityManager);
 
-        _entityEffects.ApplyEffects(otherUid, ent.Comp.Effects.ToArray());
+        foreach (var effect in ent.Comp.Effects)
+        {
+            effect.Effect(effectArgs);
+        }
     }
 }
diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index 31d289217c..1e8f3334ac 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -1,5 +1,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Movement.Systems;
+using Content.Shared.Damage.Events;
+using Content.Shared.Damage.Systems;
 using Content.Shared.Effects;
 using Content.Shared.Speech.Components;
 using Content.Shared.Weapons.Melee;
@@ -14,14 +16,28 @@ namespace Content.Server.Weapons.Melee;
 public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
 {
     [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
     [Dependency] private readonly LagCompensationSystem _lag = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
 
     public override void Initialize()
     {
         base.Initialize();
-
         SubscribeLocalEvent<MeleeSpeechComponent, MeleeHitEvent>(OnSpeechHit);
+        SubscribeLocalEvent<MeleeWeaponComponent, DamageExamineEvent>(OnMeleeExamineDamage);
+    }
+
+    private void OnMeleeExamineDamage(EntityUid uid, MeleeWeaponComponent component, ref DamageExamineEvent args)
+    {
+        if (component.Hidden)
+            return;
+
+        var damageSpec = GetDamage(uid, args.User, component);
+
+        if (damageSpec.Empty)
+            return;
+
+        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), Loc.GetString("damage-melee"));
     }
 
     protected override bool ArcRaySuccessful(EntityUid targetUid,
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
index 700a15e1b0..d697e2bef1 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
@@ -1,7 +1,12 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Events;
 using Content.Shared.Power;
 using Content.Shared.PowerCell.Components;
+using Content.Shared.Projectiles;
+using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Weapons.Ranged.Systems;
 
@@ -14,11 +19,13 @@ public sealed partial class GunSystem
         // Hitscan
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, ComponentStartup>(OnBatteryStartup);
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, ChargeChangedEvent>(OnBatteryChargeChange);
+        SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, PowerCellChangedEvent>(OnPowerCellChanged);
 
         // Projectile
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, ComponentStartup>(OnBatteryStartup);
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, ChargeChangedEvent>(OnBatteryChargeChange);
+        SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, PowerCellChangedEvent>(OnPowerCellChanged);
     }
 
@@ -66,6 +73,50 @@ public sealed partial class GunSystem
         RaiseLocalEvent(uid, ref updateAmmoEv);
     }
 
+    private void OnBatteryDamageExamine<T>(Entity<T> entity, ref DamageExamineEvent args) where T : BatteryAmmoProviderComponent
+    {
+        var damageSpec = GetDamage(entity.Comp);
+
+        if (damageSpec == null)
+            return;
+
+        var damageType = entity.Comp switch
+        {
+            HitscanBatteryAmmoProviderComponent => Loc.GetString("damage-hitscan"),
+            ProjectileBatteryAmmoProviderComponent => Loc.GetString("damage-projectile"),
+            _ => throw new ArgumentOutOfRangeException(),
+        };
+
+        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), damageType);
+    }
+
+    private DamageSpecifier? GetDamage(BatteryAmmoProviderComponent component)
+    {
+        if (component is ProjectileBatteryAmmoProviderComponent battery)
+        {
+            if (ProtoManager.Index<EntityPrototype>(battery.Prototype).Components
+                .TryGetValue(Factory.GetComponentName<ProjectileComponent>(), out var projectile))
+            {
+                var p = (ProjectileComponent) projectile.Component;
+
+                if (!p.Damage.Empty)
+                {
+                    return p.Damage * Damageable.UniversalProjectileDamageModifier;
+                }
+            }
+
+            return null;
+        }
+
+        if (component is HitscanBatteryAmmoProviderComponent hitscan)
+        {
+            var dmg = ProtoManager.Index<HitscanPrototype>(hitscan.Prototype).Damage;
+            return dmg == null ? dmg : dmg * Damageable.UniversalHitscanDamageModifier;
+        }
+
+        return null;
+    }
+
     protected override void TakeCharge(Entity<BatteryAmmoProviderComponent> entity)
     {
         var ev = new ChangeChargeEvent(-entity.Comp.FireCost);
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
index 05bb2327e6..885186f79c 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
@@ -1,25 +1,87 @@
 using Content.Server.Body.Systems;
+using Content.Server.Popups;
+using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Shared.Body.Components;
+using Content.Shared.Damage;
+using Content.Shared.Power;
 using Content.Shared.Storage.Components;
+using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
 using Content.Shared.Xenoarchaeology.Equipment;
 using Content.Shared.Xenoarchaeology.Equipment.Components;
 using Robust.Shared.Collections;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Xenoarchaeology.Equipment.Systems;
 
 /// <inheritdoc/>
 public sealed class ArtifactCrusherSystem : SharedArtifactCrusherSystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly BodySystem _body = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly StackSystem _stack = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
-    // TODO: Move to shared once StackSystem spawning is in Shared and we have RandomPredicted
-    public override void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent)
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ArtifactCrusherComponent, GetVerbsEvent<AlternativeVerb>>(OnGetVerbs);
+        SubscribeLocalEvent<ArtifactCrusherComponent, PowerChangedEvent>(OnPowerChanged);
+    }
+
+    private void OnGetVerbs(Entity<ArtifactCrusherComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null || ent.Comp.Crushing)
+            return;
+
+        if (!TryComp<EntityStorageComponent>(ent, out var entityStorageComp) ||
+            entityStorageComp.Contents.ContainedEntities.Count == 0)
+            return;
+
+        if (!this.IsPowered(ent, EntityManager))
+            return;
+
+        var verb = new AlternativeVerb
+        {
+            Text = Loc.GetString("artifact-crusher-verb-start-crushing"),
+            Priority = 2,
+            Act = () => StartCrushing((ent, ent.Comp, entityStorageComp))
+        };
+        args.Verbs.Add(verb);
+    }
+
+    private void OnPowerChanged(Entity<ArtifactCrusherComponent> ent, ref PowerChangedEvent args)
+    {
+        if (!args.Powered)
+            StopCrushing(ent);
+    }
+
+    public void StartCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent)
+    {
+        var (uid, crusher, _) = ent;
+
+        if (crusher.Crushing)
+            return;
+
+        if (crusher.AutoLock)
+            _popup.PopupEntity(Loc.GetString("artifact-crusher-autolocks-enable"), uid);
+
+        crusher.Crushing = true;
+        crusher.NextSecond = _timing.CurTime + TimeSpan.FromSeconds(1);
+        crusher.CrushEndTime = _timing.CurTime + crusher.CrushDuration;
+        crusher.CrushingSoundEntity = AudioSystem.PlayPvs(crusher.CrushingSound, ent);
+        Appearance.SetData(ent, ArtifactCrusherVisuals.Crushing, true);
+        Dirty(ent, ent.Comp1);
+    }
+
+    public void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent)
     {
         var (_, crusher, storage) = ent;
         StopCrushing((ent, ent.Comp1), false);
@@ -51,4 +113,32 @@ public sealed class ArtifactCrusherSystem : SharedArtifactCrusherSystem
             }
         }
     }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<ArtifactCrusherComponent, EntityStorageComponent>();
+        while (query.MoveNext(out var uid, out var crusher, out var storage))
+        {
+            if (!crusher.Crushing)
+                continue;
+
+            if (crusher.NextSecond < _timing.CurTime)
+            {
+                var contents = new ValueList<EntityUid>(storage.Contents.ContainedEntities);
+                foreach (var contained in contents)
+                {
+                    _damageable.TryChangeDamage(contained, crusher.CrushingDamage);
+                }
+                crusher.NextSecond += TimeSpan.FromSeconds(1);
+                Dirty(uid, crusher);
+            }
+
+            if (crusher.CrushEndTime < _timing.CurTime)
+            {
+                FinishCrushing((uid, crusher, storage));
+            }
+        }
+    }
 }
diff --git a/Content.Shared/Zombies/IncurableZombieComponent.cs b/Content.Server/Zombies/IncurableZombieComponent.cs
similarity index 77%
rename from Content.Shared/Zombies/IncurableZombieComponent.cs
rename to Content.Server/Zombies/IncurableZombieComponent.cs
index 2d54950291..375b814b51 100644
--- a/Content.Shared/Zombies/IncurableZombieComponent.cs
+++ b/Content.Server/Zombies/IncurableZombieComponent.cs
@@ -1,11 +1,10 @@
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Zombies;
+namespace Content.Server.Zombies;
 
 /// <summary>
 /// This is used for a zombie that cannot be cured by any methods. Gives a succumb to zombie infection action.
 /// </summary>
-/// <remarks> We don't network this component for anti-cheat purposes.</remarks>
 [RegisterComponent]
 public sealed partial class IncurableZombieComponent : Component
 {
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 720fec490a..7cdcec78c2 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -13,6 +13,7 @@ using Content.Server.NPC.HTN;
 using Content.Server.NPC.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Server.Speech.Components;
+using Content.Server.Temperature.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Chat;
 using Content.Shared.CombatMode;
@@ -43,7 +44,6 @@ using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Content.Shared.NPC.Prototypes;
 using Content.Shared.Roles;
-using Content.Shared.Temperature.Components;
 
 namespace Content.Server.Zombies;
 
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index d905cc03ae..58a41a5f7a 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -81,9 +81,9 @@ public enum LogType
     ChemicalReaction = 17,
 
     /// <summary>
-    /// EntityEffect related interactions.
+    /// Reagent effects related interactions.
     /// </summary>
-    EntityEffect = 18,
+    ReagentEffect = 18,
 
     /// <summary>
     /// Canister valve was opened or closed.
diff --git a/Content.Shared/Body/Components/LungComponent.cs b/Content.Shared/Body/Components/LungComponent.cs
index ab1869f8b1..dd31de7722 100644
--- a/Content.Shared/Body/Components/LungComponent.cs
+++ b/Content.Shared/Body/Components/LungComponent.cs
@@ -22,7 +22,7 @@ public sealed partial class LungComponent : Component
     /// The name/key of the solution on this entity which these lungs act on.
     /// </summary>
     [DataField]
-    public string SolutionName = "Lung";
+    public string SolutionName = LungSystem.LungSolutionName;
 
     /// <summary>
     /// The solution on this entity that these lungs act on.
diff --git a/Content.Shared/Body/Systems/LungSystem.cs b/Content.Shared/Body/Systems/LungSystem.cs
index a097a7752a..5f4c1ee4ef 100644
--- a/Content.Shared/Body/Systems/LungSystem.cs
+++ b/Content.Shared/Body/Systems/LungSystem.cs
@@ -1,14 +1,11 @@
-using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Body.Components;
-using Content.Shared.Body.Prototypes;
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Atmos;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Clothing;
 using Content.Shared.Inventory.Events;
-using Robust.Shared.Prototypes;
-using BreathToolComponent = Content.Shared.Atmos.Components.BreathToolComponent;
-using InternalsComponent = Content.Shared.Body.Components.InternalsComponent;
 
 namespace Content.Shared.Body.Systems;
 
@@ -18,6 +15,8 @@ public sealed class LungSystem : EntitySystem
     [Dependency] private readonly SharedInternalsSystem _internals = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
 
+    public static string LungSolutionName = "Lung";
+
     public override void Initialize()
     {
         base.Initialize();
@@ -54,7 +53,6 @@ public sealed class LungSystem : EntitySystem
         }
     }
 
-    // TODO: JUST METABOLIZE GASES DIRECTLY DON'T CONVERT TO REAGENTS!!! (Needs Metabolism refactor :B)
     public void GasToReagent(EntityUid uid, LungComponent lung)
     {
         if (!_solutionContainerSystem.ResolveSolution(uid, lung.SolutionName, ref lung.Solution, out var solution))
diff --git a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
index ee85fe65b7..3b46d3913c 100644
--- a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
+++ b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
@@ -6,8 +6,7 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
-using Content.Shared.EntityEffects.Effects.Solution;
-using Content.Shared.EntityEffects.Effects.Transform;
+using Content.Shared.EntityEffects.Effects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids;
 using Content.Shared.Forensics.Components;
@@ -150,9 +149,7 @@ public abstract class SharedBloodstreamSystem : EntitySystem
         {
             switch (effect)
             {
-                // TODO: Rather than this, ReactionAttempt should allow systems to remove effects from the list before the reaction.
-                // TODO: I think there's a PR up on the repo for this and if there isn't I'll make one -Princess
-                case EntityEffects.Effects.EntitySpawning.SpawnEntity: // Prevent entities from spawning in the bloodstream
+                case CreateEntityReactionEffect: // Prevent entities from spawning in the bloodstream
                 case AreaReactionEffect: // No spontaneous smoke or foam leaking out of blood vessels.
                     args.Cancelled = true;
                     return;
diff --git a/Content.Shared/Chat/Prototypes/AutoEmotePrototype.cs b/Content.Shared/Chat/Prototypes/AutoEmotePrototype.cs
index a3d6ccce7f..e6fdae4cf1 100644
--- a/Content.Shared/Chat/Prototypes/AutoEmotePrototype.cs
+++ b/Content.Shared/Chat/Prototypes/AutoEmotePrototype.cs
@@ -14,44 +14,30 @@ public sealed partial class AutoEmotePrototype : IPrototype
     /// The ID of the emote prototype.
     /// </summary>
     [DataField("emote", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
-    public string EmoteId = string.Empty;
+    public string EmoteId = String.Empty;
 
     /// <summary>
     /// How often an attempt at the emote will be made.
     /// </summary>
-    [DataField(required: true)]
+    [DataField("interval", required: true)]
     public TimeSpan Interval;
 
     /// <summary>
     /// Probability of performing the emote each interval.
-    /// </summary>
+    /// <summary>
     [DataField("chance")]
     public float Chance = 1;
 
     /// <summary>
     /// Also send the emote in chat.
-    /// </summary>
-    [DataField]
+    /// <summary>
+    [DataField("withChat")]
     public bool WithChat = true;
 
-    /// <summary>
-    /// Should we ignore action blockers?
-    /// This does nothing if WithChat is false.
-    /// </summary>
-    [DataField]
-    public bool IgnoreActionBlocker;
-
-    /// <summary>
-    /// Should we ignore whitelists and force the emote?
-    /// This does nothing if WithChat is false.
-    /// </summary>
-    [DataField]
-    public bool Force;
-
     /// <summary>
     /// Hide the chat message from the chat window, only showing the popup.
     /// This does nothing if WithChat is false.
-    /// </summary>
-    [DataField]
-    public bool HiddenFromChatWindow;
+    /// <summary>
+    [DataField("hiddenFromChatWindow")]
+    public bool HiddenFromChatWindow = false;
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 671a30dec4..54210cf195 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -707,7 +707,6 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     }
 
     // Thermal energy and temperature management.
-    // TODO: ENERGY CONSERVATION!!! Nuke this once we have HeatContainers and use methods which properly conserve energy and model heat transfer correctly!
 
     #region Thermal Energy and Temperature
 
@@ -764,26 +763,6 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         UpdateChemicals(soln);
     }
 
-    /// <summary>
-    /// Same as <see cref="AddThermalEnergy"/> but clamps the value between two temperature values.
-    /// </summary>
-    /// <param name="soln">Solution we're adjusting the energy of</param>
-    /// <param name="thermalEnergy">Thermal energy we're adding or removing</param>
-    /// <param name="min">Min desired temperature</param>
-    /// <param name="max">Max desired temperature</param>
-    public void AddThermalEnergyClamped(Entity<SolutionComponent> soln, float thermalEnergy, float min, float max)
-    {
-        var solution = soln.Comp.Solution;
-
-        if (thermalEnergy == 0.0f)
-            return;
-
-        var heatCap = solution.GetHeatCapacity(PrototypeManager);
-        var deltaT = thermalEnergy / heatCap;
-        solution.Temperature = Math.Clamp(solution.Temperature + deltaT, min, max);
-        UpdateChemicals(soln);
-    }
-
     #endregion Thermal Energy and Temperature
 
     #region Event Handlers
diff --git a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
index a995ef90f4..351a51ecc1 100644
--- a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
@@ -31,7 +31,6 @@ namespace Content.Shared.Chemistry.Reaction
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
-        [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
 
         /// <summary>
         /// A cache of all reactions indexed by at most ONE of their required reactants.
@@ -206,12 +205,27 @@ namespace Content.Shared.Chemistry.Reaction
 
         private void OnReaction(Entity<SolutionComponent> soln, ReactionPrototype reaction, ReagentPrototype? reagent, FixedPoint2 unitReactions)
         {
+            var args = new EntityEffectReagentArgs(soln, EntityManager, null, soln.Comp.Solution, unitReactions, reagent, null, 1f);
+
             var posFound = _transformSystem.TryGetMapOrGridCoordinates(soln, out var gridPos);
 
             _adminLogger.Add(LogType.ChemicalReaction, reaction.Impact,
                 $"Chemical reaction {reaction.ID:reaction} occurred with strength {unitReactions:strength} on entity {ToPrettyString(soln):metabolizer} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found]")}");
 
-            _entityEffects.ApplyEffects(soln, reaction.Effects, unitReactions.Float());
+            foreach (var effect in reaction.Effects)
+            {
+                if (!effect.ShouldApply(args))
+                    continue;
+
+                if (effect.ShouldLog)
+                {
+                    var entity = args.TargetEntity;
+                    _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
+                        $"Reaction effect {effect.GetType().Name:effect} of reaction {reaction.ID:reaction} applied on entity {ToPrettyString(entity):entity} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found")}");
+                }
+
+                effect.Effect(args);
+            }
 
             // Someday, some brave soul will thread through an optional actor
             // argument in from every call of OnReaction up, all just to pass
diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
index c9a24ec550..4bbb972572 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
@@ -60,7 +60,7 @@ namespace Content.Shared.Chemistry.Reaction
         /// <summary>
         /// Effects to be triggered when the reaction occurs.
         /// </summary>
-        [DataField("effects")] public EntityEffect[] Effects = [];
+        [DataField("effects")] public List<EntityEffect> Effects = new();
 
         /// <summary>
         /// How dangerous is this effect? Stuff like bicaridine should be low, while things like methamphetamine
diff --git a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
index 89fcca900e..cabdee93c1 100644
--- a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
@@ -34,7 +34,7 @@ public sealed partial class ReactiveReagentEffectEntry
     public HashSet<string>? Reagents = null;
 
     [DataField("effects", required: true)]
-    public EntityEffect[] Effects = default!;
+    public List<EntityEffect> Effects = default!;
 
     [DataField("groups", readOnly: true, serverOnly: true,
         customTypeSerializer:typeof(PrototypeIdDictionarySerializer<HashSet<ReactionMethod>, ReactiveGroupPrototype>))]
diff --git a/Content.Shared/Chemistry/ReactiveSystem.cs b/Content.Shared/Chemistry/ReactiveSystem.cs
index 2ffb848f8a..6306537324 100644
--- a/Content.Shared/Chemistry/ReactiveSystem.cs
+++ b/Content.Shared/Chemistry/ReactiveSystem.cs
@@ -1,35 +1,108 @@
+using Content.Shared.Administration.Logs;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 
 namespace Content.Shared.Chemistry;
 
 [UsedImplicitly]
 public sealed class ReactiveSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IRobustRandom _robustRandom = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
 
     public void DoEntityReaction(EntityUid uid, Solution solution, ReactionMethod method)
     {
         foreach (var reagent in solution.Contents.ToArray())
         {
-            ReactionEntity(uid, method, reagent);
+            ReactionEntity(uid, method, reagent, solution);
         }
     }
 
-    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity)
+    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity, Solution? source)
     {
-        if (reagentQuantity.Quantity == FixedPoint2.Zero)
-            return;
-
         // We throw if the reagent specified doesn't exist.
-        if (!_proto.Resolve<ReagentPrototype>(reagentQuantity.Reagent.Prototype, out var proto))
+        var proto = _prototypeManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
+        ReactionEntity(uid, method, proto, reagentQuantity, source);
+    }
+
+    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentPrototype proto,
+        ReagentQuantity reagentQuantity, Solution? source)
+    {
+        if (!TryComp(uid, out ReactiveComponent? reactive))
             return;
 
-        var ev = new ReactionEntityEvent(method, reagentQuantity, proto);
+        // custom event for bypassing reactivecomponent stuff
+        var ev = new ReactionEntityEvent(method, proto, reagentQuantity, source);
         RaiseLocalEvent(uid, ref ev);
+
+        // If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
+        var args = new EntityEffectReagentArgs(uid, EntityManager, null, source, source?.GetReagentQuantity(reagentQuantity.Reagent) ?? reagentQuantity.Quantity, proto, method, 1f);
+
+        // First, check if the reagent wants to apply any effects.
+        if (proto.ReactiveEffects != null && reactive.ReactiveGroups != null)
+        {
+            foreach (var (key, val) in proto.ReactiveEffects)
+            {
+                if (!val.Methods.Contains(method))
+                    continue;
+
+                if (!reactive.ReactiveGroups.ContainsKey(key))
+                    continue;
+
+                if (!reactive.ReactiveGroups[key].Contains(method))
+                    continue;
+
+                foreach (var effect in val.Effects)
+                {
+                    if (!effect.ShouldApply(args, _robustRandom))
+                        continue;
+
+                    if (effect.ShouldLog)
+                    {
+                        var entity = args.TargetEntity;
+                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
+                            $"Reactive effect {effect.GetType().Name:effect} of reagent {proto.ID:reagent} with method {method} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
+                    }
+
+                    effect.Effect(args);
+                }
+            }
+        }
+
+        // Then, check if the prototype has any effects it can apply as well.
+        if (reactive.Reactions != null)
+        {
+            foreach (var entry in reactive.Reactions)
+            {
+                if (!entry.Methods.Contains(method))
+                    continue;
+
+                if (entry.Reagents != null && !entry.Reagents.Contains(proto.ID))
+                    continue;
+
+                foreach (var effect in entry.Effects)
+                {
+                    if (!effect.ShouldApply(args, _robustRandom))
+                        continue;
+
+                    if (effect.ShouldLog)
+                    {
+                        var entity = args.TargetEntity;
+                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
+                            $"Reactive effect {effect.GetType().Name:effect} of {ToPrettyString(entity):entity} using reagent {proto.ID:reagent} with method {method} at {Transform(entity).Coordinates:coordinates}");
+                    }
+
+                    effect.Effect(args);
+                }
+            }
+        }
     }
 }
 public enum ReactionMethod
@@ -40,4 +113,9 @@ Ingestion,
 }
 
 [ByRefEvent]
-public readonly record struct ReactionEntityEvent(ReactionMethod Method, ReagentQuantity ReagentQuantity, ReagentPrototype Reagent);
+public readonly record struct ReactionEntityEvent(
+    ReactionMethod Method,
+    ReagentPrototype Reagent,
+    ReagentQuantity ReagentQuantity,
+    Solution? Source
+);
diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index 3b16b577cb..b999d8df61 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -2,17 +2,21 @@ using System.Collections.Frozen;
 using System.Linq;
 using Content.Shared.FixedPoint;
 using System.Text.Json.Serialization;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Prototypes;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Contraband;
 using Content.Shared.EntityEffects;
-using Content.Shared.Localizations;
+using Content.Shared.Database;
 using Content.Shared.Nutrition;
+using Content.Shared.Prototypes;
 using Content.Shared.Roles;
 using Content.Shared.Slippery;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
@@ -186,7 +190,6 @@ namespace Content.Shared.Chemistry.Reagent
         [DataField]
         public SoundSpecifier FootstepSound = new SoundCollectionSpecifier("FootstepPuddle");
 
-        // TODO: Reaction tile doesn't work properly and destroys reagents way too quickly
         public FixedPoint2 ReactionTile(TileRef tile, FixedPoint2 reactVolume, IEntityManager entityManager, List<ReagentData>? data)
         {
             var removed = FixedPoint2.Zero;
@@ -208,32 +211,33 @@ namespace Content.Shared.Chemistry.Reagent
             return removed;
         }
 
-        public IEnumerable<string> GuidebookReagentEffectsDescription(IPrototypeManager prototype, IEntitySystemManager entSys, IEnumerable<EntityEffect> effects, FixedPoint2? metabolism = null)
+        public void ReactionPlant(EntityUid? plantHolder,
+            ReagentQuantity amount,
+            Solution solution,
+            EntityManager entityManager,
+            IRobustRandom random,
+            ISharedAdminLogManager logger)
         {
-            return effects.Select(x => GuidebookReagentEffectDescription(prototype, entSys, x, metabolism))
-                .Where(x => x is not null)
-                .Select(x => x!)
-                .ToArray();
-        }
+            if (plantHolder == null)
+                return;
 
-        public string? GuidebookReagentEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys, EntityEffect effect, FixedPoint2? metabolism)
-        {
-            if (effect.EntityEffectGuidebookText(prototype, entSys) is not { } description)
-                return null;
+            var args = new EntityEffectReagentArgs(plantHolder.Value, entityManager, null, solution, amount.Quantity, this, null, 1f);
+            foreach (var plantMetabolizable in PlantMetabolisms)
+            {
+                if (!plantMetabolizable.ShouldApply(args, random))
+                    continue;
 
-            var quantity = metabolism == null ? 0f : (double) (effect.MinScale * metabolism);
+                if (plantMetabolizable.ShouldLog)
+                {
+                    var entity = args.TargetEntity;
+                    logger.Add(
+                        LogType.ReagentEffect,
+                        plantMetabolizable.LogImpact,
+                        $"Plant metabolism effect {plantMetabolizable.GetType().Name:effect} of reagent {ID} applied on entity {entity}");
+                }
 
-            return Loc.GetString(
-                "guidebook-reagent-effect-description",
-                ("reagent", LocalizedName),
-                ("quantity", quantity),
-                ("effect", description),
-                ("chance", effect.Probability),
-                ("conditionCount", effect.Conditions?.Length ?? 0),
-                ("conditions",
-                    ContentLocalizationManager.FormatList(
-                        effect.Conditions?.Select(x => x.EntityConditionGuidebookText(prototype)).ToList() ?? new List<string>()
-                    )));
+                plantMetabolizable.Effect(args);
+            }
         }
     }
 
@@ -242,7 +246,6 @@ namespace Content.Shared.Chemistry.Reagent
     {
         public string ReagentPrototype;
 
-        // TODO: Kill Metabolism groups!
         public Dictionary<ProtoId<MetabolismGroupPrototype>, ReagentEffectsGuideEntry>? GuideEntries;
 
         public List<string>? PlantMetabolisms = null;
@@ -251,12 +254,15 @@ namespace Content.Shared.Chemistry.Reagent
         {
             ReagentPrototype = proto.ID;
             GuideEntries = proto.Metabolisms?
-                .Select(x => (x.Key, x.Value.MakeGuideEntry(prototype, entSys, proto)))
+                .Select(x => (x.Key, x.Value.MakeGuideEntry(prototype, entSys)))
                 .ToDictionary(x => x.Key, x => x.Item2);
             if (proto.PlantMetabolisms.Count > 0)
             {
-                PlantMetabolisms =
-                    new List<string>(proto.GuidebookReagentEffectsDescription(prototype, entSys, proto.PlantMetabolisms));
+                PlantMetabolisms = new List<string>(proto.PlantMetabolisms
+                    .Select(x => x.GuidebookEffectDescription(prototype, entSys))
+                    .Where(x => x is not null)
+                    .Select(x => x!)
+                    .ToArray());
             }
         }
     }
@@ -279,11 +285,14 @@ namespace Content.Shared.Chemistry.Reagent
         [DataField("effects", required: true)]
         public EntityEffect[] Effects = default!;
 
-        public string EntityEffectFormat => "guidebook-reagent-effect-description";
-
-        public ReagentEffectsGuideEntry MakeGuideEntry(IPrototypeManager prototype, IEntitySystemManager entSys, ReagentPrototype proto)
+        public ReagentEffectsGuideEntry MakeGuideEntry(IPrototypeManager prototype, IEntitySystemManager entSys)
         {
-            return new ReagentEffectsGuideEntry(MetabolismRate, proto.GuidebookReagentEffectsDescription(prototype, entSys, Effects, MetabolismRate).ToArray());
+            return new ReagentEffectsGuideEntry(MetabolismRate,
+                Effects
+                    .Select(x => x.GuidebookEffectDescription(prototype, entSys)) // hate.
+                    .Where(x => x is not null)
+                    .Select(x => x!)
+                    .ToArray());
         }
     }
 
diff --git a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
index 0c53349934..30e00faf0a 100644
--- a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
@@ -62,7 +62,27 @@ public sealed class MaskSystem : EntitySystem
 
     private void OnGotUnequipped(EntityUid uid, MaskComponent mask, GotUnequippedEvent args)
     {
-        SetToggled(uid, false);
+        if (!mask.IsToggled || !mask.IsToggleable)
+            return;
+
+        mask.IsToggled = false;
+        ToggleMaskComponents(uid, mask, args.Equipee, mask.EquippedPrefix, true);
+    }
+
+    /// <summary>
+    /// Called after setting IsToggled, raises events and dirties.
+    /// </summary>
+    private void ToggleMaskComponents(EntityUid uid, MaskComponent mask, EntityUid wearer, string? equippedPrefix = null, bool isEquip = false)
+    {
+        Dirty(uid, mask);
+        if (mask.ToggleActionEntity is { } action)
+            _actionSystem.SetToggled(action, mask.IsToggled);
+
+        var maskEv = new ItemMaskToggledEvent((uid, mask), wearer);
+        RaiseLocalEvent(uid, ref maskEv);
+
+        var wearerEv = new WearerMaskToggledEvent((uid, mask));
+        RaiseLocalEvent(wearer, ref wearerEv);
     }
 
     private void OnFolded(Entity<MaskComponent> ent, ref FoldedEvent args)
diff --git a/Content.Shared/Cluwne/CluwneComponent.cs b/Content.Shared/Cluwne/CluwneComponent.cs
index 692a8ec4f9..c9f96d030b 100644
--- a/Content.Shared/Cluwne/CluwneComponent.cs
+++ b/Content.Shared/Cluwne/CluwneComponent.cs
@@ -1,9 +1,6 @@
 using Robust.Shared.Audio;
 using Content.Shared.Chat.Prototypes;
-using Content.Shared.Damage;
-using Content.Shared.Roles;
 using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Cluwne;
@@ -15,74 +12,22 @@ public sealed partial class CluwneComponent : Component
     /// <summary>
     /// timings for giggles and knocks.
     /// </summary>
-    [DataField]
+    [ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan DamageGiggleCooldown = TimeSpan.FromSeconds(2);
 
-    /// <summary>
-    /// Amount of genetic damage dealt when they revert
-    /// </summary>
-    [DataField]
-    public DamageSpecifier RevertDamage = new()
-    {
-        DamageDict = new()
-        {
-            { "Genetic", 300.0 },
-        },
-    };
-
-    /// <summary>
-    /// Chance that the Cluwne will be knocked over and paralyzed.
-    /// </summary>
-    [DataField]
+    [ViewVariables(VVAccess.ReadWrite)]
     public float KnockChance = 0.05f;
 
-    /// <summary>
-    /// Chance that the Cluwne will randomly giggle
-    /// </summary>
-    [DataField]
+    [ViewVariables(VVAccess.ReadWrite)]
     public float GiggleRandomChance = 0.1f;
 
-    /// <summary>
-    /// Enable random emoting?
-    /// </summary>
-    [DataField]
-    public bool RandomEmote = true;
-
-    /// <summary>
-    /// Emote sound collection that the Cluwne should use.
-    /// </summary>
-    [DataField("emoteId")]
-    public ProtoId<EmoteSoundsPrototype>? EmoteSoundsId = "Cluwne";
-
-    /// <summary>
-    /// Emote to use for the Cluwne Giggling
-    /// </summary>
-    [DataField]
-    public ProtoId<AutoEmotePrototype>? AutoEmoteId = "CluwneGiggle";
-
-    /// <summary>
-    /// Message to popup when the Cluwne is transformed
-    /// </summary>
-    [DataField]
-    public LocId TransformMessage = "cluwne-transform";
-
-    /// <summary>
-    /// Name prefix for the Cluwne.
-    /// Example "Urist McHuman" will be "Cluwned Urist McHuman"
-    /// </summary>
-    [DataField]
-    public LocId NamePrefix = "cluwne-name-prefix";
-
-    /// <summary>
-    /// Outfit ID that the cluwne will spawn with.
-    /// </summary>
-    [DataField]
-    public ProtoId<StartingGearPrototype> OutfitId = "CluwneGear";
+    [DataField("emoteId", customTypeSerializer: typeof(PrototypeIdSerializer<EmoteSoundsPrototype>))]
+    public string? EmoteSoundsId = "Cluwne";
 
     /// <summary>
     /// Amount of time cluwne is paralyzed for when falling over.
     /// </summary>
-    [DataField]
+    [ViewVariables(VVAccess.ReadWrite)]
     public float ParalyzeTime = 2f;
 
     /// <summary>
@@ -91,21 +36,6 @@ public sealed partial class CluwneComponent : Component
     [DataField("spawnsound")]
     public SoundSpecifier SpawnSound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg");
 
-    /// <summary>
-    /// Emote to use for the cluwne giggling
-    /// </summary>
-    [DataField]
-    public LocId GiggleEmote = "cluwne-giggle-emote";
-
-    /// <summary>
-    /// Sound to play when the Cluwne is knocked over and paralyzed
-    /// </summary>
-    [DataField]
+    [DataField("knocksound")]
     public SoundSpecifier KnockSound = new SoundPathSpecifier("/Audio/Items/airhorn.ogg");
-
-    /// <summary>
-    /// Emote thats used when the cluwne getting knocked over
-    /// </summary>
-    [DataField]
-    public LocId KnockEmote = "cluwne-knock-emote";
 }
diff --git a/Content.Shared/Crayon/CrayonComponent.cs b/Content.Shared/Crayon/CrayonComponent.cs
deleted file mode 100644
index c772b43d00..0000000000
--- a/Content.Shared/Crayon/CrayonComponent.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Crayon;
-
-/// <summary>
-/// Component holding the state of a crayon-like component
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(SharedCrayonSystem))]
-public sealed partial class CrayonComponent : Component
-{
-    /// <summary>
-    /// The ID of currently selected decal prototype that will be placed when the crayon is used.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public string SelectedState;
-
-    /// <summary>
-    /// Color with which the crayon will draw.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Color Color;
-
-    /// <summary>
-    /// Play a sound when drawing if specified.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier? UseSound;
-
-    /// <summary>
-    /// Can the color can be changed?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool SelectableColor;
-
-    /// <summary>
-    /// Should the crayon be deleted when all charges are consumed?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool DeleteEmpty = true;
-}
-
-/// <summary>
-/// Opens the crayon window for decal and color selection.
-/// </summary>
-[Serializable, NetSerializable]
-public enum CrayonUiKey : byte
-{
-    Key,
-}
-
-/// <summary>
-/// Used by the client to notify the server about the selected decal ID
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class CrayonSelectMessage : BoundUserInterfaceMessage
-{
-    public readonly string State;
-    public CrayonSelectMessage(string selected)
-    {
-        State = selected;
-    }
-}
-
-/// <summary>
-/// Sets the color of the crayon, used by Rainbow Crayon
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class CrayonColorMessage : BoundUserInterfaceMessage
-{
-    public readonly Color Color;
-    public CrayonColorMessage(Color color)
-    {
-        Color = color;
-    }
-}
-
-/// <summary>
-/// Server to CLIENT. Notifies the BUI that a decal with given ID has been drawn.
-/// Allows the client UI to advance forward in the client-only ephemeral queue,
-/// preventing the crayon from becoming a magic text storage device.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class CrayonUsedMessage : BoundUserInterfaceMessage
-{
-    public readonly string DrawnDecal;
-
-    public CrayonUsedMessage(string drawn)
-    {
-        DrawnDecal = drawn;
-    }
-}
-
-/// <summary>
-/// The state of the crayon UI as sent by the server
-/// </summary>
-/// <summary>
-/// TODO: Delete this and use component states and predict the UI.
-/// This info is already networked on its own.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class CrayonBoundUserInterfaceState : BoundUserInterfaceState
-{
-    public string Selected;
-    /// <summary>
-    /// Can the color can be changed
-    /// </summary>
-    public bool SelectableColor;
-    public Color Color;
-
-    public CrayonBoundUserInterfaceState(string selected, bool selectableColor, Color color)
-    {
-        Selected = selected;
-        SelectableColor = selectableColor;
-        Color = color;
-    }
-}
diff --git a/Content.Shared/Crayon/SharedCrayonComponent.cs b/Content.Shared/Crayon/SharedCrayonComponent.cs
new file mode 100644
index 0000000000..a9c21988ea
--- /dev/null
+++ b/Content.Shared/Crayon/SharedCrayonComponent.cs
@@ -0,0 +1,113 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Crayon
+{
+
+    /// <summary>
+    /// Component holding the state of a crayon-like component
+    /// </summary>
+    [NetworkedComponent, ComponentProtoName("Crayon"), Access(typeof(SharedCrayonSystem))]
+    public abstract partial class SharedCrayonComponent : Component
+    {
+        /// <summary>
+        /// The ID of currently selected decal prototype that will be placed when the crayon is used
+        /// </summary>
+        public string SelectedState { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Color with which the crayon will draw
+        /// </summary>
+        [DataField("color")]
+        public Color Color;
+
+        [Serializable, NetSerializable]
+        public enum CrayonUiKey : byte
+        {
+            Key,
+        }
+    }
+
+    /// <summary>
+    /// Used by the client to notify the server about the selected decal ID
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed class CrayonSelectMessage : BoundUserInterfaceMessage
+    {
+        public readonly string State;
+        public CrayonSelectMessage(string selected)
+        {
+            State = selected;
+        }
+    }
+
+    /// <summary>
+    /// Sets the color of the crayon, used by Rainbow Crayon
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed class CrayonColorMessage : BoundUserInterfaceMessage
+    {
+        public readonly Color Color;
+        public CrayonColorMessage(Color color)
+        {
+            Color = color;
+        }
+    }
+
+    /// <summary>
+    /// Server to CLIENT. Notifies the BUI that a decal with given ID has been drawn.
+    /// Allows the client UI to advance forward in the client-only ephemeral queue,
+    /// preventing the crayon from becoming a magic text storage device.
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed class CrayonUsedMessage : BoundUserInterfaceMessage
+    {
+        public readonly string DrawnDecal;
+
+        public CrayonUsedMessage(string drawn)
+        {
+            DrawnDecal = drawn;
+        }
+    }
+
+    /// <summary>
+    /// Component state, describes how many charges are left in the crayon in the near-hand UI
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed class CrayonComponentState : ComponentState
+    {
+        public readonly Color Color;
+        public readonly string State;
+        public readonly int Charges;
+        public readonly int Capacity;
+
+        public CrayonComponentState(Color color, string state, int charges, int capacity)
+        {
+            Color = color;
+            State = state;
+            Charges = charges;
+            Capacity = capacity;
+        }
+    }
+
+    /// <summary>
+    /// The state of the crayon UI as sent by the server
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed class CrayonBoundUserInterfaceState : BoundUserInterfaceState
+    {
+        public string Selected;
+        /// <summary>
+        /// Whether or not the color can be selected
+        /// </summary>
+        public bool SelectableColor;
+        public Color Color;
+
+        public CrayonBoundUserInterfaceState(string selected, bool selectableColor, Color color)
+        {
+            Selected = selected;
+            SelectableColor = selectableColor;
+            Color = color;
+        }
+    }
+}
diff --git a/Content.Shared/Damage/Components/DamageExaminableComponent.cs b/Content.Shared/Damage/Components/DamageExaminableComponent.cs
index 0ac9435bb6..a9fa833070 100644
--- a/Content.Shared/Damage/Components/DamageExaminableComponent.cs
+++ b/Content.Shared/Damage/Components/DamageExaminableComponent.cs
@@ -2,8 +2,7 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared.Damage.Components;
 
-/// <summary>
-/// Shows a detailed examine window with this entity's damage stats when examined.
-/// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class DamageExaminableComponent : Component;
+public sealed partial class DamageExaminableComponent : Component
+{
+}
diff --git a/Content.Shared/Damage/Components/DamageOtherOnHitComponent.cs b/Content.Shared/Damage/Components/DamageOtherOnHitComponent.cs
deleted file mode 100644
index 7728bcf7ee..0000000000
--- a/Content.Shared/Damage/Components/DamageOtherOnHitComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.Damage.Systems;
-
-namespace Content.Shared.Damage.Components;
-
-/// <summary>
-/// Makes this entity deal damage when thrown at something.
-/// </summary>
-[RegisterComponent]
-[Access(typeof(SharedDamageOtherOnHitSystem))]
-public sealed partial class DamageOtherOnHitComponent : Component
-{
-    /// <summary>
-    /// Whether to ignore damage modifiers.
-    /// </summary>
-    [DataField]
-    public bool IgnoreResistances = false;
-
-    /// <summary>
-    /// The damage amount to deal on hit.
-    /// </summary>
-    [DataField(required: true)]
-    public DamageSpecifier Damage = default!;
-
-}
diff --git a/Content.Shared/Damage/Events/DamageExamineEvent.cs b/Content.Shared/Damage/Events/DamageExamineEvent.cs
index 33949cc052..d3e6175f49 100644
--- a/Content.Shared/Damage/Events/DamageExamineEvent.cs
+++ b/Content.Shared/Damage/Events/DamageExamineEvent.cs
@@ -1,10 +1,6 @@
-using Content.Shared.Damage.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Damage.Events;
 
-/// <summary>
-/// Raised on an entity with <see cref="DamageExaminableComponent"/> when examined to get the damage values displayed in the examine window.
-/// </summary>
 [ByRefEvent]
 public readonly record struct DamageExamineEvent(FormattedMessage Message, EntityUid User);
diff --git a/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs b/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs
deleted file mode 100644
index f17a91972d..0000000000
--- a/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.CombatMode.Pacification;
-using Content.Shared.Damage.Components;
-using Content.Shared.Damage.Events;
-
-namespace Content.Shared.Damage.Systems;
-
-public abstract class SharedDamageOtherOnHitSystem : EntitySystem
-{
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DamageOtherOnHitComponent, DamageExamineEvent>(OnDamageExamine);
-        SubscribeLocalEvent<DamageOtherOnHitComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
-    }
-
-    private void OnDamageExamine(Entity<DamageOtherOnHitComponent> ent, ref DamageExamineEvent args)
-    {
-        _damageExamine.AddDamageExamine(args.Message, _damageable.ApplyUniversalAllModifiers(ent.Comp.Damage * _damageable.UniversalThrownDamageModifier), Loc.GetString("damage-throw"));
-    }
-
-    /// <summary>
-    /// Prevent players with the Pacified status effect from throwing things that deal damage.
-    /// </summary>
-    private void OnAttemptPacifiedThrow(Entity<DamageOtherOnHitComponent> ent, ref AttemptPacifiedThrowEvent args)
-    {
-        args.Cancel("pacified-cannot-throw");
-    }
-}
diff --git a/Content.Shared/Destructible/SharedDestructibleSystem.cs b/Content.Shared/Destructible/SharedDestructibleSystem.cs
index f37561e0d8..572ed9d560 100644
--- a/Content.Shared/Destructible/SharedDestructibleSystem.cs
+++ b/Content.Shared/Destructible/SharedDestructibleSystem.cs
@@ -1,9 +1,9 @@
-namespace Content.Shared.Destructible;
+namespace Content.Shared.Destructible;
 
 public abstract class SharedDestructibleSystem : EntitySystem
 {
     /// <summary>
-    /// Force entity to be destroyed and deleted.
+    ///     Force entity to be destroyed and deleted.
     /// </summary>
     public bool DestroyEntity(EntityUid owner)
     {
@@ -15,12 +15,12 @@ public abstract class SharedDestructibleSystem : EntitySystem
         var eventArgs = new DestructionEventArgs();
         RaiseLocalEvent(owner, eventArgs);
 
-        PredictedQueueDel(owner);
+        QueueDel(owner);
         return true;
     }
 
     /// <summary>
-    /// Force entity to break.
+    ///     Force entity to break.
     /// </summary>
     public void BreakEntity(EntityUid owner)
     {
@@ -30,7 +30,7 @@ public abstract class SharedDestructibleSystem : EntitySystem
 }
 
 /// <summary>
-/// Raised before an entity is about to be destroyed and deleted
+///     Raised before an entity is about to be destroyed and deleted
 /// </summary>
 public sealed class DestructionAttemptEvent : CancellableEntityEventArgs
 {
@@ -38,7 +38,7 @@ public sealed class DestructionAttemptEvent : CancellableEntityEventArgs
 }
 
 /// <summary>
-/// Raised when entity is destroyed and about to be deleted.
+///     Raised when entity is destroyed and about to be deleted.
 /// </summary>
 public sealed class DestructionEventArgs : EntityEventArgs
 {
@@ -46,7 +46,7 @@ public sealed class DestructionEventArgs : EntityEventArgs
 }
 
 /// <summary>
-/// Raised when entity was heavy damage and about to break.
+///     Raised when entity was heavy damage and about to break.
 /// </summary>
 public sealed class BreakageEventArgs : EntityEventArgs
 {
diff --git a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
index 74bbc259c6..5d51bbc3e8 100644
--- a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
+++ b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
@@ -214,17 +214,6 @@ public abstract class SharedDeviceLinkSystem : EntitySystem
         return links;
     }
 
-    /// <summary>
-    /// Gets the entities linked to a specific source port.
-    /// </summary>
-    public HashSet<EntityUid> GetLinkedSinks(Entity<DeviceLinkSourceComponent?> source, ProtoId<SourcePortPrototype> port)
-    {
-        if (!Resolve(source, ref source.Comp) || !source.Comp.Outputs.TryGetValue(port, out var linked))
-            return new HashSet<EntityUid>(); // not a source or not linked
-
-        return new HashSet<EntityUid>(linked); // clone to prevent modifying the original
-    }
-
     /// <summary>
     /// Returns the default links for the given list of source port prototypes
     /// </summary>
diff --git a/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs b/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
deleted file mode 100644
index d19d326e26..0000000000
--- a/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions.Body;
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class BreathingCondition : EntityConditionBase<BreathingCondition>
-{
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-breathing", ("isBreathing", !Inverted));
-}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs
deleted file mode 100644
index f9867b28b0..0000000000
--- a/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions.Body;
-
-/// <summary>
-/// Returns true if this entity's hunger is within a specified minimum and maximum.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class TotalHungerEntityConditionSystem : EntityConditionSystem<HungerComponent, HungerCondition>
-{
-    [Dependency] private readonly HungerSystem _hunger = default!;
-
-    protected override void Condition(Entity<HungerComponent> entity, ref EntityConditionEvent<HungerCondition> args)
-    {
-        var total = _hunger.GetHunger(entity.Comp);
-        args.Result = total >= args.Condition.Min && total <= args.Condition.Max;
-    }
-}
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class HungerCondition : EntityConditionBase<HungerCondition>
-{
-    [DataField]
-    public float Min;
-
-    [DataField]
-    public float Max = float.PositiveInfinity;
-
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-total-hunger", ("max", float.IsPositiveInfinity(Max) ? int.MaxValue : Max), ("min", Min));
-}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
deleted file mode 100644
index e87c54a761..0000000000
--- a/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Shared.Body.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions.Body;
-
-/// <summary>
-/// Returns true if this entity is using internals. False if they are not or cannot use internals.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class InternalsOnEntityConditionSystem : EntityConditionSystem<InternalsComponent, InternalsCondition>
-{
-    protected override void Condition(Entity<InternalsComponent> entity, ref EntityConditionEvent<InternalsCondition> args)
-    {
-        args.Result = entity.Comp.GasTankEntity != null;
-    }
-}
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class InternalsCondition : EntityConditionBase<InternalsCondition>
-{
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-internals", ("usingInternals", !Inverted));
-}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs b/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs
deleted file mode 100644
index 2196d271ff..0000000000
--- a/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Shared.Body.Prototypes;
-using Content.Shared.Localizations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions.Body;
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class MetabolizerTypeCondition : EntityConditionBase<MetabolizerTypeCondition>
-{
-    [DataField(required: true)]
-    public ProtoId<MetabolizerTypePrototype>[] Type = default!;
-
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
-    {
-        var typeList = new List<string>();
-
-        foreach (var type in Type)
-        {
-            if (!prototype.Resolve(type, out var proto))
-                continue;
-
-            typeList.Add(proto.LocalizedName);
-        }
-
-        var names = ContentLocalizationManager.FormatListToOr(typeList);
-
-        return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
-            ("name", names),
-            ("shouldhave", !Inverted));
-    }
-}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
deleted file mode 100644
index d00481d3e1..0000000000
--- a/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions.Body;
-
-/// <summary>
-/// Returns true if this entity's current mob state matches the condition's specified mob state.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class MobStateEntityConditionSystem : EntityConditionSystem<MobStateComponent, MobStateCondition>
-{
-    protected override void Condition(Entity<MobStateComponent> entity, ref EntityConditionEvent<MobStateCondition> args)
-    {
-        if (entity.Comp.CurrentState == args.Condition.Mobstate)
-            args.Result = true;
-    }
-}
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class MobStateCondition : EntityConditionBase<MobStateCondition>
-{
-    [DataField]
-    public MobState Mobstate = MobState.Alive;
-
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
-}
diff --git a/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs
deleted file mode 100644
index e07989da36..0000000000
--- a/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Linq;
-using Content.Shared.Localizations;
-using Content.Shared.Mind;
-using Content.Shared.Mind.Components;
-using Content.Shared.Roles;
-using Content.Shared.Roles.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions;
-
-/// <summary>
-/// Returns true if this entity has any of the specified jobs. False if the entity has no mind, none of the specified jobs, or is jobless.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class HasJobEntityConditionSystem : EntityConditionSystem<MindContainerComponent, JobCondition>
-{
-    protected override void Condition(Entity<MindContainerComponent> entity, ref EntityConditionEvent<JobCondition> args)
-    {
-        // We need a mind in our mind container...
-        if (!TryComp<MindComponent>(entity.Comp.Mind, out var mind))
-            return;
-
-        foreach (var roleId in mind.MindRoleContainer.ContainedEntities)
-        {
-            if (!HasComp<JobRoleComponent>(roleId))
-                continue;
-
-            if (!TryComp<MindRoleComponent>(roleId, out var mindRole))
-            {
-                Log.Error($"Encountered job mind role entity {roleId} without a {nameof(MindRoleComponent)}");
-                continue;
-            }
-
-            if (mindRole.JobPrototype == null)
-            {
-                Log.Error($"Encountered job mind role entity {roleId} without a {nameof(JobPrototype)}");
-                continue;
-            }
-
-            if (!args.Condition.Jobs.Contains(mindRole.JobPrototype.Value))
-                continue;
-
-            args.Result = true;
-            return;
-        }
-    }
-}
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class JobCondition : EntityConditionBase<JobCondition>
-{
-    [DataField(required: true)] public List<ProtoId<JobPrototype>> Jobs = [];
-
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
-    {
-        var localizedNames = Jobs.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
-        return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
-    }
-}
diff --git a/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
deleted file mode 100644
index c49c9a3d02..0000000000
--- a/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions;
-
-/// <summary>
-/// Returns true if this solution entity has an amount of reagent in it within a specified minimum and maximum.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class ReagentThresholdEntityConditionSystem : EntityConditionSystem<SolutionComponent, ReagentCondition>
-{
-    protected override void Condition(Entity<SolutionComponent> entity, ref EntityConditionEvent<ReagentCondition> args)
-    {
-        var quant = entity.Comp.Solution.GetTotalPrototypeQuantity(args.Condition.Reagent);
-
-        args.Result = quant >= args.Condition.Min && quant <= args.Condition.Max;
-    }
-}
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class ReagentCondition : EntityConditionBase<ReagentCondition>
-{
-    [DataField]
-    public FixedPoint2 Min = FixedPoint2.Zero;
-
-    [DataField]
-    public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-    [DataField(required: true)]
-    public ProtoId<ReagentPrototype> Reagent;
-
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
-    {
-        if (!prototype.Resolve(Reagent, out var reagentProto))
-            return String.Empty;
-
-        return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
-            ("reagent", reagentProto.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
-            ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()),
-            ("min", Min.Float()));
-    }
-}
diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
deleted file mode 100644
index 99d7206c0a..0000000000
--- a/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Shared.Localizations;
-using Content.Shared.Tag;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions.Tags;
-
-/// <summary>
-/// Returns true if this entity has all the listed tags.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class HasAllTagsEntityConditionSystem : EntityConditionSystem<TagComponent, AllTagsCondition>
-{
-    [Dependency] private readonly TagSystem _tag = default!;
-
-    protected override void Condition(Entity<TagComponent> entity, ref EntityConditionEvent<AllTagsCondition> args)
-    {
-        args.Result = _tag.HasAllTags(entity.Comp, args.Condition.Tags);
-    }
-}
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class AllTagsCondition : EntityConditionBase<AllTagsCondition>
-{
-    [DataField(required: true)]
-    public ProtoId<TagPrototype>[] Tags = [];
-
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
-    {
-        var tagList = new List<string>();
-
-        foreach (var type in Tags)
-        {
-            if (!prototype.Resolve(type, out var proto))
-                continue;
-
-            tagList.Add(proto.ID);
-        }
-
-        var names = ContentLocalizationManager.FormatList(tagList);
-
-        return Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", names), ("invert", Inverted));
-    }
-}
diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
deleted file mode 100644
index 3513353125..0000000000
--- a/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Shared.Localizations;
-using Content.Shared.Tag;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions.Tags;
-
-/// <summary>
-/// Returns true if this entity have any of the listed tags.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class HasAnyTagEntityConditionSystem : EntityConditionSystem<TagComponent, AnyTagCondition>
-{
-    [Dependency] private readonly TagSystem _tag = default!;
-
-    protected override void Condition(Entity<TagComponent> entity, ref EntityConditionEvent<AnyTagCondition> args)
-    {
-        args.Result = _tag.HasAnyTag(entity.Comp, args.Condition.Tags);
-    }
-}
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class AnyTagCondition : EntityConditionBase<AnyTagCondition>
-{
-    [DataField(required: true)]
-    public ProtoId<TagPrototype>[] Tags = [];
-
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
-    {
-        var tagList = new List<string>();
-
-        foreach (var type in Tags)
-        {
-            if (!prototype.Resolve(type, out var proto))
-                continue;
-
-            tagList.Add(proto.ID);
-        }
-
-        var names = ContentLocalizationManager.FormatListToOr(tagList);
-
-        return Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", names), ("invert", Inverted));
-    }
-}
diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
deleted file mode 100644
index 9b67f38282..0000000000
--- a/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Tag;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions.Tags;
-
-/// <summary>
-/// Returns true if this entity has the listed tag.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class HasTagEntityConditionSystem : EntityConditionSystem<TagComponent, TagCondition>
-{
-    [Dependency] private readonly TagSystem _tag = default!;
-
-    protected override void Condition(Entity<TagComponent> entity, ref EntityConditionEvent<TagCondition> args)
-    {
-        args.Result = _tag.HasTag(entity.Comp, args.Condition.Tag);
-    }
-}
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class TagCondition : EntityConditionBase<TagCondition>
-{
-    [DataField(required: true)]
-    public ProtoId<TagPrototype> Tag;
-
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", Tag), ("invert", Inverted));
-}
diff --git a/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
deleted file mode 100644
index 6585f3bf44..0000000000
--- a/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Temperature.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions;
-
-/// <summary>
-/// Returns true if this entity has an amount of reagent in it within a specified minimum and maximum.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class TemperatureEntityConditionSystem : EntityConditionSystem<TemperatureComponent, TemperatureCondition>
-{
-    protected override void Condition(Entity<TemperatureComponent> entity, ref EntityConditionEvent<TemperatureCondition> args)
-    {
-        if (entity.Comp.CurrentTemperature >= args.Condition.Min && entity.Comp.CurrentTemperature <= args.Condition.Max)
-            args.Result = true;
-    }
-}
-
-/// <summary>
-/// Returns true if this solution entity has an amount of reagent in it within a specified minimum and maximum.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class SolutionTemperatureEntityConditionSystem : EntityConditionSystem<SolutionComponent, TemperatureCondition>
-{
-    protected override void Condition(Entity<SolutionComponent> entity, ref EntityConditionEvent<TemperatureCondition> args)
-    {
-        if (entity.Comp.Solution.Temperature >= args.Condition.Min && entity.Comp.Solution.Temperature <= args.Condition.Max)
-            args.Result = true;
-    }
-}
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class TemperatureCondition : EntityConditionBase<TemperatureCondition>
-{
-    /// <summary>
-    /// Minimum allowed temperature
-    /// </summary>
-    [DataField]
-    public float Min = 0;
-
-    /// <summary>
-    /// Maximum allowed temperature
-    /// </summary>
-    [DataField]
-    public float Max = float.PositiveInfinity;
-
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
-            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-            ("min", Min));
-}
diff --git a/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs
deleted file mode 100644
index fbb659b54f..0000000000
--- a/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions;
-///<summary>
-/// A basic summary of this condition.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class TemplateEntityConditionSystem : EntityConditionSystem<MetaDataComponent, TemplateCondition>
-{
-    protected override void Condition(Entity<MetaDataComponent> entity, ref EntityConditionEvent<TemplateCondition> args)
-    {
-        // Condition goes here.
-    }
-}
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class TemplateCondition : EntityConditionBase<TemplateCondition>
-{
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype) => String.Empty;
-}
diff --git a/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs
deleted file mode 100644
index e710e07b17..0000000000
--- a/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions.Conditions;
-
-/// <summary>
-/// Returns true if this entity can take damage and if its total damage is within a specified minimum and maximum.
-/// </summary>
-/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
-public sealed partial class TotalDamageEntityConditionSystem : EntityConditionSystem<DamageableComponent, TotalDamageCondition>
-{
-    protected override void Condition(Entity<DamageableComponent> entity, ref EntityConditionEvent<TotalDamageCondition> args)
-    {
-        var total = entity.Comp.TotalDamage;
-        args.Result = total >= args.Condition.Min && total <= args.Condition.Max;
-    }
-}
-
-/// <inheritdoc cref="EntityCondition"/>
-public sealed partial class TotalDamageCondition : EntityConditionBase<TotalDamageCondition>
-{
-    [DataField]
-    public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-    [DataField]
-    public FixedPoint2 Min = FixedPoint2.Zero;
-
-    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-total-damage",
-            ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()),
-            ("min", Min.Float()));
-}
diff --git a/Content.Shared/EntityConditions/SharedEntityConditionsSystem.cs b/Content.Shared/EntityConditions/SharedEntityConditionsSystem.cs
deleted file mode 100644
index 090a422641..0000000000
--- a/Content.Shared/EntityConditions/SharedEntityConditionsSystem.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityConditions;
-
-/// <summary>
-/// This handles entity effects.
-/// Specifically it handles the receiving of events for causing entity effects, and provides
-/// public API for other systems to take advantage of entity effects.
-/// </summary>
-public sealed partial class SharedEntityConditionsSystem : EntitySystem, IEntityConditionRaiser
-{
-    /// <summary>
-    /// Checks a list of conditions to verify that they all return true.
-    /// </summary>
-    /// <param name="target">Target entity we're checking conditions on</param>
-    /// <param name="conditions">Conditions we're checking</param>
-    /// <returns>Returns true if all conditions return true, false if any fail</returns>
-    public bool TryConditions(EntityUid target, EntityCondition[]? conditions)
-    {
-        // If there's no conditions we can't fail any of them...
-        if (conditions == null)
-            return true;
-
-        foreach (var condition in conditions)
-        {
-            if (!TryCondition(target, condition))
-                return false;
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    /// Checks a list of conditions to see if any are true.
-    /// </summary>
-    /// <param name="target">Target entity we're checking conditions on</param>
-    /// <param name="conditions">Conditions we're checking</param>
-    /// <returns>Returns true if any conditions return true</returns>
-    public bool TryAnyCondition(EntityUid target, EntityCondition[]? conditions)
-    {
-        // If there's no conditions we can't meet any of them...
-        if (conditions == null)
-            return false;
-
-        foreach (var condition in conditions)
-        {
-            if (TryCondition(target, condition))
-                return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    /// Checks a single <see cref="EntityCondition"/> on an entity.
-    /// </summary>
-    /// <param name="target">Target entity we're checking conditions on</param>
-    /// <param name="condition">Condition we're checking</param>
-    /// <returns>Returns true if we meet the condition and false otherwise</returns>
-    public bool TryCondition(EntityUid target, EntityCondition condition)
-    {
-        return condition.Inverted != condition.RaiseEvent(target, this);
-    }
-
-    /// <summary>
-    /// Raises a condition to an entity. You should not be calling this unless you know what you're doing.
-    /// </summary>
-    public bool RaiseConditionEvent<T>(EntityUid target, T effect) where T : EntityConditionBase<T>
-    {
-        var effectEv = new EntityConditionEvent<T>(effect);
-        RaiseLocalEvent(target, ref effectEv);
-        return effectEv.Result;
-    }
-}
-
-/// <summary>
-/// This is a basic abstract entity effect containing all the data an entity effect needs to affect entities with effects...
-/// </summary>
-/// <typeparam name="T">The Component that is required for the effect</typeparam>
-/// <typeparam name="TCon">The Condition we're testing</typeparam>
-public abstract partial class EntityConditionSystem<T, TCon> : EntitySystem where T : Component where TCon : EntityConditionBase<TCon>
-{
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<T, EntityConditionEvent<TCon>>(Condition);
-    }
-    protected abstract void Condition(Entity<T> entity, ref EntityConditionEvent<TCon> args);
-}
-
-/// <summary>
-/// Used to raise an EntityCondition without losing the type of condition.
-/// </summary>
-public interface IEntityConditionRaiser
-{
-    bool RaiseConditionEvent<T>(EntityUid target, T effect) where T : EntityConditionBase<T>;
-}
-
-/// <summary>
-/// Used to store an <see cref="EntityCondition"/> so it can be raised without losing the type of the condition.
-/// </summary>
-/// <typeparam name="T">The Condition wer are raising.</typeparam>
-public abstract partial class EntityConditionBase<T> : EntityCondition where T : EntityConditionBase<T>
-{
-    public override bool RaiseEvent(EntityUid target, IEntityConditionRaiser raiser)
-    {
-        if (this is not T type)
-            return false;
-
-        // If the result of the event matches the result we're looking for then we pass.
-        return raiser.RaiseConditionEvent(target, type);
-    }
-}
-
-/// <summary>
-/// A basic condition which can be checked for on an entity via events.
-/// </summary>
-[ImplicitDataDefinitionForInheritors]
-public abstract partial class EntityCondition
-{
-    public abstract bool RaiseEvent(EntityUid target, IEntityConditionRaiser raiser);
-
-    /// <summary>
-    /// If true, invert the result. So false returns true and true returns false!
-    /// </summary>
-    [DataField]
-    public bool Inverted;
-
-    /// <summary>
-    /// A basic description of this condition, which displays in the guidebook.
-    /// </summary>
-    public abstract string EntityConditionGuidebookText(IPrototypeManager prototype);
-}
-
-/// <summary>
-/// An Event carrying an entity effect.
-/// </summary>
-/// <param name="Condition">The Condition we're checking</param>
-[ByRefEvent]
-public record struct EntityConditionEvent<T>(T Condition) where T : EntityConditionBase<T>
-{
-    /// <summary>
-    /// The result of our check, defaults to false if nothing handles it.
-    /// </summary>
-    [DataField]
-    public bool Result;
-
-    /// <summary>
-    /// The Condition being raised in this event
-    /// </summary>
-    public readonly T Condition = Condition;
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/BodyTemperature.cs b/Content.Shared/EntityEffects/EffectConditions/BodyTemperature.cs
new file mode 100644
index 0000000000..351e4ee12c
--- /dev/null
+++ b/Content.Shared/EntityEffects/EffectConditions/BodyTemperature.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Requires the target entity to be above or below a certain temperature.
+///     Used for things like cryoxadone and pyroxadone.
+/// </summary>
+public sealed partial class Temperature : EventEntityEffectCondition<Temperature>
+{
+    [DataField]
+    public float Min = 0;
+
+    [DataField]
+    public float Max = float.PositiveInfinity;
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+    }
+}
diff --git a/Content.Shared/EntityEffects/EffectConditions/BreathingCondition.cs b/Content.Shared/EntityEffects/EffectConditions/BreathingCondition.cs
new file mode 100644
index 0000000000..9de1bfdbf6
--- /dev/null
+++ b/Content.Shared/EntityEffects/EffectConditions/BreathingCondition.cs
@@ -0,0 +1,21 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Condition for if the entity is successfully breathing.
+/// </summary>
+public sealed partial class Breathing : EventEntityEffectCondition<Breathing>
+{
+    /// <summary>
+    ///     If true, the entity must not have trouble breathing to pass.
+    /// </summary>
+    [DataField]
+    public bool IsBreathing = true;
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-breathing",
+                            ("isBreathing", IsBreathing));
+    }
+}
diff --git a/Content.Shared/EntityEffects/EffectConditions/HasTagCondition.cs b/Content.Shared/EntityEffects/EffectConditions/HasTagCondition.cs
new file mode 100644
index 0000000000..379a248027
--- /dev/null
+++ b/Content.Shared/EntityEffects/EffectConditions/HasTagCondition.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.EntityEffects.EffectConditions;
+
+public sealed partial class HasTag : EntityEffectCondition
+{
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<TagPrototype>))]
+    public string Tag = default!;
+
+    [DataField]
+    public bool Invert = false;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent<TagComponent>(args.TargetEntity, out var tag))
+            return args.EntityManager.System<TagSystem>().HasTag(tag, Tag) ^ Invert;
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        // this should somehow be made (much) nicer.
+        return Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", Tag), ("invert", Invert));
+    }
+}
diff --git a/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs b/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
new file mode 100644
index 0000000000..cb30ef70c7
--- /dev/null
+++ b/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Body.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Condition for if the entity is or isn't wearing internals.
+/// </summary>
+public sealed partial class Internals : EntityEffectCondition
+{
+    /// <summary>
+    ///     To pass, the entity's internals must have this same state.
+    /// </summary>
+    [DataField]
+    public bool UsingInternals = true;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out InternalsComponent? internalsComp))
+            return !UsingInternals; // They have no internals to wear.
+
+        var internalsState = internalsComp.GasTankEntity != null; // If gas tank is not null, they are wearing internals
+        return UsingInternals == internalsState;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-internals", ("usingInternals", UsingInternals));
+    }
+}
diff --git a/Content.Shared/EntityEffects/EffectConditions/JobCondition.cs b/Content.Shared/EntityEffects/EffectConditions/JobCondition.cs
new file mode 100644
index 0000000000..96f3be64c6
--- /dev/null
+++ b/Content.Shared/EntityEffects/EffectConditions/JobCondition.cs
@@ -0,0 +1,52 @@
+using System.Linq;
+using Content.Shared.Localizations;
+using Content.Shared.Mind;
+using Content.Shared.Mind.Components;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.EffectConditions;
+
+public sealed partial class JobCondition : EntityEffectCondition
+{
+    [DataField(required: true)] public List<ProtoId<JobPrototype>> Job;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        args.EntityManager.TryGetComponent<MindContainerComponent>(args.TargetEntity, out var mindContainer);
+
+        if (mindContainer is null
+            || !args.EntityManager.TryGetComponent<MindComponent>(mindContainer.Mind, out var mind))
+            return false;
+
+        foreach (var roleId in mind.MindRoleContainer.ContainedEntities)
+        {
+            if (!args.EntityManager.HasComponent<JobRoleComponent>(roleId))
+                continue;
+
+            if (!args.EntityManager.TryGetComponent<MindRoleComponent>(roleId, out var mindRole))
+            {
+                Logger.Error($"Encountered job mind role entity {roleId} without a {nameof(MindRoleComponent)}");
+                continue;
+            }
+
+            if (mindRole.JobPrototype == null)
+            {
+                Logger.Error($"Encountered job mind role entity {roleId} without a {nameof(JobPrototype)}");
+                continue;
+            }
+
+            if (Job.Contains(mindRole.JobPrototype.Value))
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        var localizedNames = Job.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
+        return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
+    }
+}
diff --git a/Content.Shared/EntityEffects/EffectConditions/MobStateCondition.cs b/Content.Shared/EntityEffects/EffectConditions/MobStateCondition.cs
new file mode 100644
index 0000000000..efe7246b2a
--- /dev/null
+++ b/Content.Shared/EntityEffects/EffectConditions/MobStateCondition.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.EffectConditions;
+
+public sealed partial class MobStateCondition : EntityEffectCondition
+{
+    [DataField]
+    public MobState Mobstate = MobState.Alive;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out MobStateComponent? mobState))
+        {
+            if (mobState.CurrentState == Mobstate)
+                return true;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
+    }
+}
+
diff --git a/Content.Shared/EntityEffects/EffectConditions/OrganType.cs b/Content.Shared/EntityEffects/EffectConditions/OrganType.cs
new file mode 100644
index 0000000000..f99eb5cc77
--- /dev/null
+++ b/Content.Shared/EntityEffects/EffectConditions/OrganType.cs
@@ -0,0 +1,28 @@
+// using Content.Server.Body.Components;
+using Content.Shared.Body.Prototypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Requires that the metabolizing organ is or is not tagged with a certain MetabolizerType
+/// </summary>
+public sealed partial class OrganType : EventEntityEffectCondition<OrganType>
+{
+    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MetabolizerTypePrototype>))]
+    public string Type = default!;
+
+    /// <summary>
+    ///     Does this condition pass when the organ has the type, or when it doesn't have the type?
+    /// </summary>
+    [DataField]
+    public bool ShouldHave = true;
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
+            ("name", prototype.Index<MetabolizerTypePrototype>(Type).LocalizedName),
+            ("shouldhave", ShouldHave));
+    }
+}
diff --git a/Content.Shared/EntityEffects/EffectConditions/ReagentThreshold.cs b/Content.Shared/EntityEffects/EffectConditions/ReagentThreshold.cs
new file mode 100644
index 0000000000..af71f20c8e
--- /dev/null
+++ b/Content.Shared/EntityEffects/EffectConditions/ReagentThreshold.cs
@@ -0,0 +1,56 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Used for implementing reagent effects that require a certain amount of reagent before it should be applied.
+///     For instance, overdoses.
+///
+///     This can also trigger on -other- reagents, not just the one metabolizing. By default, it uses the
+///     one being metabolized.
+/// </summary>
+public sealed partial class ReagentThreshold : EntityEffectCondition
+{
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    // TODO use ReagentId
+    [DataField]
+    public string? Reagent;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var reagent = Reagent ?? reagentArgs.Reagent?.ID;
+            if (reagent == null)
+                return true; // No condition to apply.
+
+            var quant = FixedPoint2.Zero;
+            if (reagentArgs.Source != null)
+                quant = reagentArgs.Source.GetTotalPrototypeQuantity(reagent);
+
+            return quant >= Min && quant <= Max;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        ReagentPrototype? reagentProto = null;
+        if (Reagent is not null)
+            prototype.TryIndex(Reagent, out reagentProto);
+
+        return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
+            ("reagent", reagentProto?.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
+            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
+            ("min", Min.Float()));
+    }
+}
diff --git a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs b/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
new file mode 100644
index 0000000000..e2febd8f48
--- /dev/null
+++ b/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
@@ -0,0 +1,36 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.EffectConditions;
+
+/// <summary>
+///     Requires the solution to be above or below a certain temperature.
+///     Used for things like explosives.
+/// </summary>
+public sealed partial class SolutionTemperature : EntityEffectCondition
+{
+    [DataField]
+    public float Min = 0.0f;
+
+    [DataField]
+    public float Max = float.PositiveInfinity;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            return reagentArgs?.Source != null &&
+                   reagentArgs.Source.Temperature >= Min &&
+                   reagentArgs.Source.Temperature <= Max;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-solution-temperature",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+    }
+}
diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs b/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
new file mode 100644
index 0000000000..a4baeb634a
--- /dev/null
+++ b/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
@@ -0,0 +1,33 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.EffectConditions;
+
+public sealed partial class TotalDamage : EntityEffectCondition
+{
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage))
+        {
+            var total = damage.TotalDamage;
+            return total >= Min && total <= Max;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-total-damage",
+            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
+            ("min", Min.Float()));
+    }
+}
diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs b/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
new file mode 100644
index 0000000000..cbeb334c47
--- /dev/null
+++ b/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
@@ -0,0 +1,33 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.EffectConditions;
+
+public sealed partial class Hunger : EntityEffectCondition
+{
+    [DataField]
+    public float Max = float.PositiveInfinity;
+
+    [DataField]
+    public float Min = 0;
+
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
+        {
+            var total = args.EntityManager.System<HungerSystem>().GetHunger(hunger);
+            return total >= Min && total <= Max;
+        }
+
+        return false;
+    }
+
+    public override string GuidebookExplanation(IPrototypeManager prototype)
+    {
+        return Loc.GetString("reagent-effect-condition-guidebook-total-hunger",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/AddToSolutionReaction.cs b/Content.Shared/EntityEffects/Effects/AddToSolutionReaction.cs
new file mode 100644
index 0000000000..0f2d35d369
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AddToSolutionReaction.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects
+{
+    public sealed partial class AddToSolutionReaction : EntityEffect
+    {
+        [DataField("solution")]
+        private string _solution = "reagents";
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            if (args is EntityEffectReagentArgs reagentArgs) {
+                if (reagentArgs.Reagent == null)
+                    return;
+
+                // TODO see if this is correct
+                var solutionContainerSystem = reagentArgs.EntityManager.System<SharedSolutionContainerSystem>();
+                if (!solutionContainerSystem.TryGetSolution(reagentArgs.TargetEntity, _solution, out var solutionContainer))
+                    return;
+
+                if (solutionContainerSystem.TryAddReagent(solutionContainer.Value, reagentArgs.Reagent.ID, reagentArgs.Quantity, out var accepted))
+                    reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, accepted);
+
+                return;
+            }
+
+            // TODO: Someone needs to figure out how to do this for non-reagent effects.
+            throw new NotImplementedException();
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+            Loc.GetString("reagent-effect-guidebook-add-to-solution-reaction", ("chance", Probability));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustAlert.cs b/Content.Shared/EntityEffects/Effects/AdjustAlert.cs
new file mode 100644
index 0000000000..282de0a06c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AdjustAlert.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Alert;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class AdjustAlert : EntityEffect
+{
+    /// <summary>
+    /// The specific Alert that will be adjusted
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<AlertPrototype> AlertType;
+
+    /// <summary>
+    /// If true, the alert is removed after Time seconds. If Time was not specified the alert is removed immediately.
+    /// </summary>
+    [DataField]
+    public bool Clear;
+
+    /// <summary>
+    /// Visually display cooldown progress over the alert icon.
+    /// </summary>
+    [DataField]
+    public bool ShowCooldown;
+
+    /// <summary>
+    /// The length of the cooldown or delay before removing the alert (in seconds).
+    /// </summary>
+    [DataField]
+    public float Time;
+
+    //JUSTIFICATION: This just changes some visuals, doesn't need to be documented.
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var alertSys = args.EntityManager.EntitySysManager.GetEntitySystem<AlertsSystem>();
+        if (!args.EntityManager.HasComponent<AlertsComponent>(args.TargetEntity))
+            return;
+
+        if (Clear && Time <= 0)
+        {
+            alertSys.ClearAlert(args.TargetEntity, AlertType);
+        }
+        else
+        {
+            var timing = IoCManager.Resolve<IGameTiming>();
+            (TimeSpan, TimeSpan)? cooldown = null;
+
+            if ((ShowCooldown || Clear) && Time > 0)
+                cooldown = (timing.CurTime, timing.CurTime + TimeSpan.FromSeconds(Time));
+
+            alertSys.ShowAlert(args.TargetEntity, AlertType, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
+        }
+
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs
deleted file mode 100644
index 633cde0877..0000000000
--- a/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Content.Shared.Alert;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Adjusts a given alert on this entity.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class AdjustAlertEntityEffectSysten : EntityEffectSystem<AlertsComponent, AdjustAlert>
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly AlertsSystem _alerts = default!;
-
-    protected override void Effect(Entity<AlertsComponent> entity, ref EntityEffectEvent<AdjustAlert> args)
-    {
-        var time = args.Effect.Time;
-        var clear = args.Effect.Clear;
-        var type = args.Effect.AlertType;
-
-        if (clear && time <= TimeSpan.Zero)
-        {
-            _alerts.ClearAlert(entity.AsNullable(), type);
-        }
-        else
-        {
-            (TimeSpan, TimeSpan)? cooldown = null;
-
-            if ((args.Effect.ShowCooldown || clear) && args.Effect.Time >= TimeSpan.Zero)
-                cooldown = (_timing.CurTime, _timing.CurTime + time);
-
-            _alerts.ShowAlert(entity.AsNullable(), type, cooldown: cooldown, autoRemove: clear, showCooldown: args.Effect.ShowCooldown);
-        }
-
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class AdjustAlert : EntityEffectBase<AdjustAlert>
-{
-    /// <summary>
-    /// The specific Alert that will be adjusted
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<AlertPrototype> AlertType;
-
-    /// <summary>
-    /// If true, the alert is removed after Time seconds. If Time was not specified the alert is removed immediately.
-    /// </summary>
-    [DataField]
-    public bool Clear;
-
-    /// <summary>
-    /// Visually display cooldown progress over the alert icon.
-    /// </summary>
-    [DataField]
-    public bool ShowCooldown;
-
-    /// <summary>
-    /// The length of the cooldown or delay before removing the alert (in seconds).
-    /// </summary>
-    [DataField]
-    public TimeSpan Time;
-}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustReagent.cs b/Content.Shared/EntityEffects/Effects/AdjustReagent.cs
new file mode 100644
index 0000000000..bb655b46bc
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AdjustReagent.cs
@@ -0,0 +1,90 @@
+using Content.Shared.Body.Prototypes;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.EntityEffects.Effects
+{
+    public sealed partial class AdjustReagent : EntityEffect
+    {
+        /// <summary>
+        ///     The reagent ID to remove. Only one of this and <see cref="Group"/> should be active.
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<ReagentPrototype>))]
+        public string? Reagent = null;
+        // TODO use ReagentId
+
+        /// <summary>
+        ///     The metabolism group to remove, if the reagent satisfies any.
+        ///     Only one of this and <see cref="Reagent"/> should be active.
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MetabolismGroupPrototype>))]
+        public string? Group = null;
+
+        [DataField(required: true)]
+        public FixedPoint2 Amount = default!;
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (reagentArgs.Source == null)
+                    return;
+
+                var amount = Amount;
+                amount *= reagentArgs.Scale;
+
+                if (Reagent != null)
+                {
+                    if (amount < 0 && reagentArgs.Source.ContainsPrototype(Reagent))
+                        reagentArgs.Source.RemoveReagent(Reagent, -amount);
+                    if (amount > 0)
+                        reagentArgs.Source.AddReagent(Reagent, amount);
+                }
+                else if (Group != null)
+                {
+                    var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
+                    foreach (var quant in reagentArgs.Source.Contents.ToArray())
+                    {
+                        var proto = prototypeMan.Index<ReagentPrototype>(quant.Reagent.Prototype);
+                        if (proto.Metabolisms != null && proto.Metabolisms.ContainsKey(Group))
+                        {
+                            if (amount < 0)
+                                reagentArgs.Source.RemoveReagent(quant.Reagent, amount);
+                            if (amount > 0)
+                                reagentArgs.Source.AddReagent(quant.Reagent, amount);
+                        }
+                    }
+                }
+                return;
+            }
+
+            // TODO: Someone needs to figure out how to do this for non-reagent effects.
+            throw new NotImplementedException();
+        }
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        {
+            if (Reagent is not null && prototype.TryIndex(Reagent, out ReagentPrototype? reagentProto))
+            {
+                return Loc.GetString("reagent-effect-guidebook-adjust-reagent-reagent",
+                    ("chance", Probability),
+                    ("deltasign", MathF.Sign(Amount.Float())),
+                    ("reagent", reagentProto.LocalizedName),
+                    ("amount", MathF.Abs(Amount.Float())));
+            }
+            else if (Group is not null && prototype.TryIndex(Group, out MetabolismGroupPrototype? groupProto))
+            {
+                return Loc.GetString("reagent-effect-guidebook-adjust-reagent-group",
+                    ("chance", Probability),
+                    ("deltasign", MathF.Sign(Amount.Float())),
+                    ("group", groupProto.LocalizedName),
+                    ("amount", MathF.Abs(Amount.Float())));
+            }
+
+            throw new NotImplementedException();
+        }
+    }
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/AdjustTemperature.cs b/Content.Shared/EntityEffects/Effects/AdjustTemperature.cs
new file mode 100644
index 0000000000..03dc226e93
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AdjustTemperature.cs
@@ -0,0 +1,15 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class AdjustTemperature : EventEntityEffect<AdjustTemperature>
+{
+    [DataField]
+    public float Amount;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-adjust-temperature",
+            ("chance", Probability),
+            ("deltasign", MathF.Sign(Amount)),
+            ("amount", MathF.Abs(Amount)));
+}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
deleted file mode 100644
index adc465f341..0000000000
--- a/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Shared.Temperature.Components;
-using Content.Shared.Temperature.Systems;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-// TODO: When we get a proper temperature/energy struct combine this with the solution temperature effect!!!
-/// <summary>
-/// Adjusts the temperature of this entity.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class AdjustTemperatureEntityEffectSystem : EntityEffectSystem<TemperatureComponent, AdjustTemperature>
-{
-    [Dependency] private readonly SharedTemperatureSystem _temperature = default!;
-    protected override void Effect(Entity<TemperatureComponent> entity, ref EntityEffectEvent<AdjustTemperature> args)
-    {
-        var amount = args.Effect.Amount * args.Scale;
-
-        _temperature.ChangeHeat(entity, amount, true, entity.Comp);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class AdjustTemperature : EntityEffectBase<AdjustTemperature>
-{
-    /// <summary>
-    ///     Amount we're adjusting temperature by.
-    /// </summary>
-    [DataField]
-    public float Amount;
-}
diff --git a/Content.Shared/EntityEffects/Effects/AreaReactionEffect.cs b/Content.Shared/EntityEffects/Effects/AreaReactionEffect.cs
new file mode 100644
index 0000000000..45ed261a35
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AreaReactionEffect.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Basically smoke and foam reactions.
+/// </summary>
+public sealed partial class AreaReactionEffect : EventEntityEffect<AreaReactionEffect>
+{
+    /// <summary>
+    /// How many seconds will the effect stay, counting after fully spreading.
+    /// </summary>
+    [DataField("duration")] public float Duration = 10;
+
+    /// <summary>
+    /// How many units of reaction for 1 smoke entity.
+    /// </summary>
+    [DataField] public FixedPoint2 OverflowThreshold = FixedPoint2.New(2.5);
+
+    /// <summary>
+    /// The entity prototype that will be spawned as the effect.
+    /// </summary>
+    [DataField("prototypeId", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+    public string PrototypeId = default!;
+
+    /// <summary>
+    /// Sound that will get played when this reaction effect occurs.
+    /// </summary>
+    [DataField("sound", required: true)] public SoundSpecifier Sound = default!;
+
+    public override bool ShouldLog => true;
+
+    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-area-reaction",
+                    ("duration", Duration)
+                );
+
+    public override LogImpact LogImpact => LogImpact.High;
+}
diff --git a/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs b/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs
new file mode 100644
index 0000000000..45ca740363
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Xenoarchaeology.Artifact.Components;
+using Content.Shared.Xenoarchaeology.Artifact;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+///     Restores durability in active artefact nodes.
+/// </summary>
+public sealed partial class ArtifactDurabilityRestore : EntityEffect
+{
+    /// <summary>
+    ///     Amount of durability that will be restored per effect interaction.
+    /// </summary>
+    [DataField]
+    public int RestoredDurability = 1;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var entMan = args.EntityManager;
+        var xenoArtifactSys = entMan.System<SharedXenoArtifactSystem>();
+
+        if (!entMan.TryGetComponent<XenoArtifactComponent>(args.TargetEntity, out var xenoArtifact))
+            return;
+
+        foreach (var node in xenoArtifactSys.GetActiveNodes((args.TargetEntity, xenoArtifact)))
+        {
+            xenoArtifactSys.AdjustNodeDurability(node.Owner, RestoredDurability);
+        }
+    }
+
+    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return Loc.GetString("reagent-effect-guidebook-artifact-durability-restore", ("restored", RestoredDurability));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs
deleted file mode 100644
index 563c053b36..0000000000
--- a/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using Content.Shared.Popups;
-using Content.Shared.Xenoarchaeology.Artifact;
-using Content.Shared.Xenoarchaeology.Artifact.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Restores durability on this artifact
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ArtifactDurabilityRestoreEntityEffectsSystem : EntityEffectSystem<XenoArtifactComponent, ArtifactDurabilityRestore>
-{
-    [Dependency] private readonly SharedXenoArtifactSystem _xenoArtifact = default!;
-
-    protected override void Effect(Entity<XenoArtifactComponent> entity, ref EntityEffectEvent<ArtifactDurabilityRestore> args)
-    {
-        var durability = args.Effect.RestoredDurability;
-
-        foreach (var node in _xenoArtifact.GetActiveNodes(entity))
-        {
-            _xenoArtifact.AdjustNodeDurability(node.Owner, durability);
-        }
-    }
-}
-
-/// <summary>
-/// Unlocks a node on this artifact. Only works this effect hasn't been applied before.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ArtifactUnlockEntityEffectSystem : EntityEffectSystem<XenoArtifactComponent, ArtifactUnlock>
-{
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedXenoArtifactSystem _xenoArtifact = default!;
-
-    protected override void Effect(Entity<XenoArtifactComponent> entity, ref EntityEffectEvent<ArtifactUnlock> args)
-    {
-        if (EnsureComp<XenoArtifactUnlockingComponent>(entity, out var unlocking))
-        {
-            if (unlocking.ArtifexiumApplied)
-                return;
-
-            _popup.PopupEntity(Loc.GetString("artifact-activation-artifexium"), entity, PopupType.Medium);
-        }
-        else
-        {
-            _xenoArtifact.TriggerXenoArtifact(entity, null, force: true);
-        }
-
-        _xenoArtifact.SetArtifexiumApplied((entity, unlocking), true);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class ArtifactDurabilityRestore : EntityEffectBase<ArtifactDurabilityRestore>
-{
-    /// <summary>
-    ///     Amount of durability that will be restored per effect interaction.
-    /// </summary>
-    [DataField]
-    public int RestoredDurability = 1;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-artifact-durability-restore", ("restored", RestoredDurability));
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class ArtifactUnlock : EntityEffectBase<ArtifactUnlock>
-{
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-artifact-unlock", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/ArtifactUnlock.cs b/Content.Shared/EntityEffects/Effects/ArtifactUnlock.cs
new file mode 100644
index 0000000000..077e1ebfd2
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ArtifactUnlock.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Xenoarchaeology.Artifact;
+using Content.Shared.EntityEffects;
+using Content.Shared.Popups;
+using Content.Shared.Xenoarchaeology.Artifact.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Sets an artifact into the unlocking state and marks the artifexium effect as true.
+/// This is a very specific behavior intended for a specific chem.
+/// </summary>
+public sealed partial class ArtifactUnlock : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var entMan = args.EntityManager;
+        var xenoArtifactSys = entMan.System<SharedXenoArtifactSystem>();
+        var popupSys = entMan.System<SharedPopupSystem>();
+
+        if (!entMan.TryGetComponent<XenoArtifactComponent>(args.TargetEntity, out var xenoArtifact))
+            return;
+
+        if (!entMan.TryGetComponent<XenoArtifactUnlockingComponent>(args.TargetEntity, out var unlocking))
+        {
+            xenoArtifactSys.TriggerXenoArtifact((args.TargetEntity, xenoArtifact), null, force: true);
+            unlocking = entMan.EnsureComponent<XenoArtifactUnlockingComponent>(args.TargetEntity);
+        }
+        else if (!unlocking.ArtifexiumApplied)
+        {
+            popupSys.PopupEntity(Loc.GetString("artifact-activation-artifexium"), args.TargetEntity, PopupType.Medium);
+        }
+
+        if (unlocking.ArtifexiumApplied)
+            return;
+
+        xenoArtifactSys.SetArtifexiumApplied((args.TargetEntity, unlocking), true);
+    }
+
+    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return Loc.GetString("reagent-effect-guidebook-artifact-unlock", ("chance", Probability));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs
deleted file mode 100644
index aa5132e596..0000000000
--- a/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Atmos;
-using Content.Shared.Atmos.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Atmos;
-
-/// <summary>
-/// See serverside system.
-/// </summary>
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class CreateGas : EntityEffectBase<CreateGas>
-{
-    /// <summary>
-    ///     The gas we're creating
-    /// </summary>
-    [DataField]
-    public Gas Gas;
-
-    /// <summary>
-    ///     Amount of moles we're creating
-    /// </summary>
-    [DataField]
-    public float Moles = 3f;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        var atmos = entSys.GetEntitySystem<SharedAtmosphereSystem>();
-        var gasProto = atmos.GetGas(Gas);
-
-        return Loc.GetString("entity-effect-guidebook-create-gas",
-            ("chance", Probability),
-            ("moles", Moles),
-            ("gas", gasProto.Name));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs
deleted file mode 100644
index b4b475ec59..0000000000
--- a/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Atmos;
-using Content.Shared.Atmos.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Atmos;
-
-/// <summary>
-/// This raises an extinguish event on a given entity, reducing FireStacks.
-/// The amount of FireStacks reduced is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ExtinguishEntityEffectSystem : EntityEffectSystem<FlammableComponent, Extinguish>
-{
-    protected override void Effect(Entity<FlammableComponent> entity, ref EntityEffectEvent<Extinguish> args)
-    {
-        var ev = new ExtinguishEvent
-        {
-            FireStacksAdjustment = args.Effect.FireStacksAdjustment * args.Scale,
-        };
-
-        RaiseLocalEvent(entity, ref ev);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Extinguish : EntityEffectBase<Extinguish>
-{
-    /// <summary>
-    ///     Amount of FireStacks reduced.
-    /// </summary>
-    [DataField]
-    public float FireStacksAdjustment = -1.5f;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-extinguish-reaction", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs
deleted file mode 100644
index f08b609407..0000000000
--- a/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Atmos;
-
-/// <summary>
-/// See serverside system.
-/// </summary>
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Flammable : EntityEffectBase<Flammable>
-{
-    /// <summary>
-    /// Fire stack multiplier applied on an entity,
-    /// unless that entity is already on fire and <see cref="MultiplierOnExisting"/> is not null.
-    /// </summary>
-    [DataField]
-    public float Multiplier = 0.05f;
-
-    /// <summary>
-    /// Fire stack multiplier applied if the entity is already on fire. Defaults to <see cref="Multiplier"/> if null.
-    /// </summary>
-    [DataField]
-    public float? MultiplierOnExisting;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-flammable-reaction", ("chance", Probability));
-
-    public override bool ShouldLog => true;
-}
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs
deleted file mode 100644
index e10aaf3cd1..0000000000
--- a/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Database;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Atmos;
-
-/// <summary>
-/// See serverside system
-/// </summary>
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Ignite : EntityEffectBase<Ignite>
-{
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-ignite", ("chance", Probability));
-
-    public override bool ShouldLog => true;
-
-    public override LogImpact LogImpact => LogImpact.Medium;
-}
diff --git a/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
deleted file mode 100644
index 402a50538a..0000000000
--- a/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Body;
-
-/// <summary>
-/// Removes a given amount of chemicals from the bloodstream modified by scale.
-/// Optionally ignores a given chemical.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class CleanBloodstreamEntityEffectSystem : EntityEffectSystem<BloodstreamComponent, CleanBloodstream>
-{
-    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
-
-    protected override void Effect(Entity<BloodstreamComponent> entity, ref EntityEffectEvent<CleanBloodstream> args)
-    {
-        var scale = args.Scale * args.Effect.CleanseRate;
-
-        _bloodstream.FlushChemicals((entity, entity), args.Effect.Excluded, scale);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class CleanBloodstream : EntityEffectBase<CleanBloodstream>
-{
-    /// <summary>
-    ///     Amount of reagent we're cleaning out of our bloodstream.
-    /// </summary>
-    [DataField]
-    public FixedPoint2 CleanseRate = 3.0f;
-
-    /// <summary>
-    ///     An optional chemical to ignore when doing removal.
-    /// </summary>
-    [DataField]
-    public ProtoId<ReagentPrototype>? Excluded;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-clean-bloodstream", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs
deleted file mode 100644
index 29fd994e8c..0000000000
--- a/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Eye.Blinding.Systems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Body;
-
-/// <summary>
-/// Modifies eye damage by a given amount, modified by scale, floored to an integer.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class EyeDamageEntityEffectSystem : EntityEffectSystem<MetaDataComponent, EyeDamage>
-{
-    [Dependency] private readonly BlindableSystem _blindable = default!;
-
-    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<EyeDamage> args)
-    {
-        var amount = (int) Math.Floor(args.Effect.Amount * args.Scale);
-        _blindable.AdjustEyeDamage(entity.Owner, amount);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class EyeDamage : EntityEffectBase<EyeDamage>
-{
-    /// <summary>
-    /// The amount of eye damage we're adding or removing
-    /// </summary>
-    [DataField]
-    public int Amount = -1;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs
deleted file mode 100644
index c684ffcdf2..0000000000
--- a/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Body;
-
-/// <summary>
-/// Modifies bleed by a given amount multiplied by scale. This can increase or decrease bleed.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ModifyBleedEntityEffectSystem : EntityEffectSystem<BloodstreamComponent, ModifyBleed>
-{
-    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
-
-    protected override void Effect(Entity<BloodstreamComponent> entity, ref EntityEffectEvent<ModifyBleed> args)
-    {
-        _bloodstream.TryModifyBleedAmount(entity.AsNullable(), args.Effect.Amount * args.Scale);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class ModifyBleed : EntityEffectBase<ModifyBleed>
-{
-    /// <summary>
-    /// Amount of bleed we're applying or removing if negative.
-    /// </summary>
-    [DataField]
-    public float Amount = -1.0f;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-modify-bleed-amount", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs
deleted file mode 100644
index 43098c9ddd..0000000000
--- a/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Body;
-
-/// <summary>
-/// Modifies the amount of blood in this entity's bloodstream by a given amount multiplied by scale.
-/// This effect can increase or decrease blood level.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ModifyBloodLevelEntityEffectSystem : EntityEffectSystem<BloodstreamComponent, ModifyBloodLevel>
-{
-    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
-
-    protected override void Effect(Entity<BloodstreamComponent> entity, ref EntityEffectEvent<ModifyBloodLevel> args)
-    {
-        _bloodstream.TryModifyBloodLevel(entity.AsNullable(), args.Effect.Amount * args.Scale);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class ModifyBloodLevel : EntityEffectBase<ModifyBloodLevel>
-{
-    /// <summary>
-    /// Amount of bleed we're applying or removing if negative.
-    /// </summary>
-    [DataField]
-    public FixedPoint2 Amount = 1.0f;
-
-    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-modify-blood-level", ("chance", Probability), ("deltasign", MathF.Sign(Amount.Float())));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs
deleted file mode 100644
index 29fa1de98d..0000000000
--- a/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Shared.Atmos;
-using Content.Shared.Body.Components;
-
-namespace Content.Shared.EntityEffects.Effects.Body;
-
-/// <summary>
-/// Adjust the amount of Moles stored in this set of lungs based on a given dictionary of gasses and ratios.
-/// The amount of gas adjusted is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ModifyLungGasEntityEffectSystem : EntityEffectSystem<LungComponent, ModifyLungGas>
-{
-    // TODO: This shouldn't be an entity effect, gasses should just metabolize and make a byproduct by default...
-    protected override void Effect(Entity<LungComponent> entity, ref EntityEffectEvent<ModifyLungGas> args)
-    {
-        var amount = args.Scale;
-
-        foreach (var (gas, ratio) in args.Effect.Ratios)
-        {
-            var quantity = ratio * amount / Atmospherics.BreathMolesToReagentMultiplier;
-            if (quantity < 0)
-                quantity = Math.Max(quantity, -entity.Comp.Air[(int) gas]);
-            entity.Comp.Air.AdjustMoles(gas, quantity);
-        }
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class ModifyLungGas : EntityEffectBase<ModifyLungGas>
-{
-    [DataField(required: true)]
-    public Dictionary<Gas, float> Ratios = default!;
-}
diff --git a/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs
deleted file mode 100644
index 9790fced4e..0000000000
--- a/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.Body;
-
-/// <summary>
-/// See serverside system.
-/// </summary>
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Oxygenate : EntityEffectBase<Oxygenate>
-{
-    /// <summary>
-    /// Factor of oxygenation per metabolized quantity. Lungs metabolize at about 50u per tick so we need an equal multiplier to cancel that out!
-    /// </summary>
-    [DataField]
-    public float Factor = 1f;
-}
diff --git a/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs
deleted file mode 100644
index 4fb41bd010..0000000000
--- a/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Atmos.Rotting;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Body;
-
-/// <summary>
-/// Reduces the rotting timer on an entity by a number of seconds, modified by scale.
-/// This cannot increase the amount of seconds a body has rotted.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ReduceRottingEntityEffectSystem : EntityEffectSystem<PerishableComponent, ReduceRotting>
-{
-    [Dependency] private readonly SharedRottingSystem _rotting = default!;
-
-    protected override void Effect(Entity<PerishableComponent> entity, ref EntityEffectEvent<ReduceRotting> args)
-    {
-        var amount = args.Effect.Seconds * args.Scale;
-
-        _rotting.ReduceAccumulator(entity, amount);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class ReduceRotting : EntityEffectBase<ReduceRotting>
-{
-    /// <summary>
-    /// Number of seconds removed from the rotting timer.
-    /// </summary>
-    [DataField]
-    public TimeSpan Seconds = TimeSpan.FromSeconds(10);
-
-    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-reduce-rotting",
-            ("chance", Probability),
-            ("time", Seconds.TotalSeconds));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs
deleted file mode 100644
index 796084206d..0000000000
--- a/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Body;
-
-// TODO: These systems are in the same file since satiation should be one system instead of two. Combine these when that happens.
-// TODO: Arguably oxygen saturation should also be added here...
-/// <summary>
-/// Modifies the thirst level of a given entity, multiplied by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class SatiateThirstEntityEffectsSystem : EntityEffectSystem<ThirstComponent, SatiateThirst>
-{
-    [Dependency] private readonly ThirstSystem _thirst = default!;
-    protected override void Effect(Entity<ThirstComponent> entity, ref EntityEffectEvent<SatiateThirst> args)
-    {
-        _thirst.ModifyThirst(entity, entity.Comp, args.Effect.Factor * args.Scale);
-    }
-}
-
-/// <summary>
-/// Modifies the hunger level of a given entity, multiplied by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class SatiateHungerEntityEffectsSystem : EntityEffectSystem<HungerComponent, SatiateHunger>
-{
-    [Dependency] private readonly HungerSystem _hunger = default!;
-    protected override void Effect(Entity<HungerComponent> entity, ref EntityEffectEvent<SatiateHunger> args)
-    {
-        _hunger.ModifyHunger(entity, args.Effect.Factor * args.Scale, entity.Comp);
-    }
-}
-
-/// <summary>
-/// A type of <see cref="EntityEffectBase{T}"/> made for satiation effects.
-/// </summary>
-/// <typeparam name="T">The effect inheriting this BaseEffect</typeparam>
-/// <inheritdoc cref="EntityEffect"/>
-public abstract partial class Satiate<T> : EntityEffectBase<T> where T : EntityEffectBase<T>
-{
-    public const float AverageSatiation = 3f; // Magic number. Not sure how it was calculated since I didn't make it.
-
-    /// <summary>
-    ///     Change in satiation.
-    /// </summary>
-    [DataField]
-    public float Factor = -1.5f;
-}
-
-/// <inheritdoc cref="Satiate{T}"/>
-public sealed partial class SatiateThirst : Satiate<SatiateThirst>
-{
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  Factor / AverageSatiation));
-}
-
-/// <inheritdoc cref="Satiate{T}"/>
-public sealed partial class SatiateHunger : Satiate<SatiateHunger>
-{
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-satiate-hunger", ("chance", Probability), ("relative", Factor / AverageSatiation));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs
deleted file mode 100644
index 02747057c5..0000000000
--- a/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Shared.Medical;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Body;
-
-/// <summary>
-/// Makes an entity vomit and reduces hunger and thirst by a given amount, modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class VomitEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Vomit>
-{
-    [Dependency] private readonly VomitSystem _vomit = default!;
-
-    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Vomit> args)
-    {
-        _vomit.Vomit(entity.Owner, args.Effect.ThirstAmount * args.Scale, args.Effect.HungerAmount * args.Scale);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Vomit : EntityEffectBase<Vomit>
-{
-    /// <summary>
-    /// How much we adjust our thirst after vomiting.
-    /// </summary>
-    [DataField]
-    public float ThirstAmount = -8f;
-
-    /// <summary>
-    /// How much we adjust our hunger after vomiting.
-    /// </summary>
-    [DataField]
-    public float HungerAmount = -8f;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-vomit", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/BasePlantAdjustAttributeEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/BasePlantAdjustAttributeEntityEffect.cs
deleted file mode 100644
index 9b235e68d4..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/BasePlantAdjustAttributeEntityEffect.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-/// <summary>
-/// A type of <see cref="EntityEffectBase{T}"/> which modifies the attribute of a Seed in a PlantHolder.
-/// These are not modified by scale as botany has no concept of scale.
-/// </summary>
-/// <typeparam name="T">The effect inheriting this BaseEffect</typeparam>
-/// <inheritdoc cref="EntityEffect"/>
-public abstract partial class BasePlantAdjustAttribute<T> : EntityEffectBase<T> where T : BasePlantAdjustAttribute<T>
-{
-    /// <summary>
-    /// How much we're adjusting the given attribute by.
-    /// </summary>
-    [DataField]
-    public float Amount { get; protected set; } = 1;
-
-    /// <summary>
-    /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
-    /// </summary>
-    [DataField]
-    public abstract string GuidebookAttributeName { get; set; }
-
-    /// <summary>
-    /// Whether the attribute in question is a good thing. Used for guidebook descriptions to determine the color of the number.
-    /// </summary>
-    [DataField]
-    public virtual bool GuidebookIsAttributePositive { get; protected set; } = true;
-
-    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-plant-attribute",
-        ("attribute", Loc.GetString(GuidebookAttributeName)),
-        ("amount", Amount.ToString("0.00")),
-        ("positive", GuidebookIsAttributePositive),
-        ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealth.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealth.cs
deleted file mode 100644
index 069cb320a9..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealth.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustHealth : BasePlantAdjustAttribute<PlantAdjustHealth>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-health";
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevel.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevel.cs
deleted file mode 100644
index 32e419e291..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevel.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustMutationLevel : BasePlantAdjustAttribute<PlantAdjustMutationLevel>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-level";
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationMod.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationMod.cs
deleted file mode 100644
index 4ea695d135..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationMod.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustMutationMod : BasePlantAdjustAttribute<PlantAdjustMutationMod>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-mod";
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutrition.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutrition.cs
deleted file mode 100644
index 6f53076fb3..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutrition.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustNutrition : BasePlantAdjustAttribute<PlantAdjustNutrition>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-nutrition";
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotency.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotency.cs
deleted file mode 100644
index 4f42adf3e6..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotency.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-/// <summary>
-///     Handles increase or decrease of plant potency.
-/// </summary>
-public sealed partial class PlantAdjustPotency : BasePlantAdjustAttribute<PlantAdjustPotency>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-potency";
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWater.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWater.cs
deleted file mode 100644
index 1d6ef8ea09..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWater.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAdjustWater : BasePlantAdjustAttribute<PlantAdjustWater>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-water";
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowth.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowth.cs
deleted file mode 100644
index 76466f544d..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowth.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantAffectGrowth : BasePlantAdjustAttribute<PlantAffectGrowth>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-growth";
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStat.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStat.cs
deleted file mode 100644
index dcea56baad..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStat.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantChangeStat : EntityEffectBase<PlantChangeStat>
-{
-    /// <remarks>
-    /// This is the worst thing in the code base.
-    /// It's meant to be generic and expandable I guess? But it's looking for a specific datafield and then
-    /// sending it into an if else if else if statement that filters by object type and randomly flips bits.
-    /// </remarks>
-    [DataField (required: true)]
-    public string TargetValue = string.Empty;
-
-    [DataField]
-    public float MinValue;
-
-    [DataField]
-    public float MaxValue;
-
-    [DataField]
-    public int Steps;
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadone.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadone.cs
deleted file mode 100644
index 7dcea240a6..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadone.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantCryoxadone : EntityEffectBase<PlantCryoxadone>
-{
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-plant-cryoxadone", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs
deleted file mode 100644
index d45c0369f7..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-/// <summary>
-///     Handles removal of seeds on a plant.
-/// </summary>
-public sealed partial class PlantDestroySeeds : EntityEffectBase<PlantDestroySeeds>
-{
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-plant-seeds-remove", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamine.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamine.cs
deleted file mode 100644
index 4355a44593..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamine.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantDiethylamine : EntityEffectBase<PlantDiethylamine>
-{
-    /// <inheritdoc/>
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-plant-diethylamine", ("chance", Probability));
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximine.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximine.cs
deleted file mode 100644
index b56b99038b..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximine.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class PlantPhalanximine : EntityEffectBase<PlantPhalanximine>
-{
-    /// <inheritdoc/>
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-plant-phalanximine", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeeds.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeeds.cs
deleted file mode 100644
index 63b06b0ad1..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeeds.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-/// <summary>
-///     Handles restoral of seeds on a plant.
-/// </summary>
-public sealed partial class PlantRestoreSeeds : EntityEffectBase<PlantRestoreSeeds>
-{
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-plant-seeds-add", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvest.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvest.cs
deleted file mode 100644
index 77bde39b12..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvest.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-public sealed partial class RobustHarvest : EntityEffectBase<RobustHarvest>
-{
-    [DataField]
-    public int PotencyLimit = 50;
-
-    [DataField]
-    public int PotencyIncrease = 3;
-
-    [DataField]
-    public int PotencySeedlessThreshold = 30;
-
-    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-plant-robust-harvest",
-            ("seedlesstreshold", PotencySeedlessThreshold),
-            ("limit", PotencyLimit),
-            ("increase", PotencyIncrease),
-            ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs
deleted file mode 100644
index 6a3d13e0c6..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.Random;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Botany;
-
-/// <summary>
-/// See serverside system.
-/// </summary>
-public sealed partial class PlantMutateChemicals : EntityEffectBase<PlantMutateChemicals>
-{
-    /// <summary>
-    /// The Reagent list this mutation draws from.
-    /// </summary>
-    [DataField]
-    public ProtoId<WeightedRandomFillSolutionPrototype> RandomPickBotanyReagent = "RandomPickBotanyReagent";
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs
deleted file mode 100644
index c617c05b33..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.Botany;
-
-/// <summary>
-/// See serverside system.
-/// </summary>
-public sealed partial class PlantMutateConsumeGases : EntityEffectBase<PlantMutateConsumeGases>
-{
-    [DataField]
-    public float MinValue = 0.01f;
-
-    [DataField]
-    public float MaxValue = 0.5f;
-}
-
-public sealed partial class PlantMutateExudeGases : EntityEffectBase<PlantMutateExudeGases>
-{
-    [DataField]
-    public float MinValue = 0.01f;
-
-    [DataField]
-    public float MaxValue = 0.5f;
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffect.cs
deleted file mode 100644
index 3602453b16..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffect.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.Botany;
-
-/// <summary>
-/// See serverside system.
-/// </summary>
-public sealed partial class PlantMutateHarvest : EntityEffectBase<PlantMutateHarvest>;
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffect.cs
deleted file mode 100644
index 91e8947044..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffect.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.Botany;
-
-/// <summary>
-/// See serverside system.
-/// </summary>
-public sealed partial class PlantMutateSpeciesChange : EntityEffectBase<PlantMutateSpeciesChange>;
diff --git a/Content.Shared/EntityEffects/Effects/CauseZombieInfection.cs b/Content.Shared/EntityEffects/Effects/CauseZombieInfection.cs
new file mode 100644
index 0000000000..3f8c58b74c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/CauseZombieInfection.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class CauseZombieInfection : EventEntityEffect<CauseZombieInfection>
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-cause-zombie-infection", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/ChemCleanBloodstream.cs b/Content.Shared/EntityEffects/Effects/ChemCleanBloodstream.cs
new file mode 100644
index 0000000000..98181b8667
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ChemCleanBloodstream.cs
@@ -0,0 +1,15 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Basically smoke and foam reactions.
+/// </summary>
+public sealed partial class ChemCleanBloodstream : EventEntityEffect<ChemCleanBloodstream>
+{
+    [DataField]
+    public float CleanseRate = 3.0f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-chem-clean-bloodstream", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/ChemHealEyeDamage.cs b/Content.Shared/EntityEffects/Effects/ChemHealEyeDamage.cs
new file mode 100644
index 0000000000..83b2aa96e5
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ChemHealEyeDamage.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Eye.Blinding.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Heal or apply eye damage
+/// </summary>
+public sealed partial class ChemHealEyeDamage : EntityEffect
+{
+    /// <summary>
+    /// How much eye damage to add.
+    /// </summary>
+    [DataField]
+    public int Amount = -1;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-cure-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+            if (reagentArgs.Scale != 1f) // huh?
+                return;
+
+        args.EntityManager.EntitySysManager.GetEntitySystem<BlindableSystem>().AdjustEyeDamage(args.TargetEntity, Amount);
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/ChemVomit.cs b/Content.Shared/EntityEffects/Effects/ChemVomit.cs
new file mode 100644
index 0000000000..1cd6b2552c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ChemVomit.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Forces you to vomit.
+/// </summary>
+public sealed partial class ChemVomit : EventEntityEffect<ChemVomit>
+{
+    /// How many units of thirst to add each time we vomit
+    [DataField]
+    public float ThirstAmount = -8f;
+    /// How many units of hunger to add each time we vomit
+    [DataField]
+    public float HungerAmount = -8f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-chem-vomit", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/CreateEntityReactionEffect.cs b/Content.Shared/EntityEffects/Effects/CreateEntityReactionEffect.cs
new file mode 100644
index 0000000000..33173b1737
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/CreateEntityReactionEffect.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+[DataDefinition]
+public sealed partial class CreateEntityReactionEffect : EventEntityEffect<CreateEntityReactionEffect>
+{
+    /// <summary>
+    ///     What entity to create.
+    /// </summary>
+    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+    public string Entity = default!;
+
+    /// <summary>
+    ///     How many entities to create per unit reaction.
+    /// </summary>
+    [DataField]
+    public uint Number = 1;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-create-entity-reaction-effect",
+            ("chance", Probability),
+            ("entname", IoCManager.Resolve<IPrototypeManager>().Index<EntityPrototype>(Entity).Name),
+            ("amount", Number));
+}
diff --git a/Content.Shared/EntityEffects/Effects/CreateGas.cs b/Content.Shared/EntityEffects/Effects/CreateGas.cs
new file mode 100644
index 0000000000..75d554cdb3
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/CreateGas.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
+using Content.Shared.Database;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class CreateGas : EventEntityEffect<CreateGas>
+{
+    [DataField(required: true)]
+    public Gas Gas = default!;
+
+    /// <summary>
+    ///     For each unit consumed, how many moles of gas should be created?
+    /// </summary>
+    [DataField]
+    public float Multiplier = 3f;
+
+    public override bool ShouldLog => true;
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var atmos = entSys.GetEntitySystem<SharedAtmosphereSystem>();
+        var gasProto = atmos.GetGas(Gas);
+
+        return Loc.GetString("reagent-effect-guidebook-create-gas",
+            ("chance", Probability),
+            ("moles", Multiplier),
+            ("gas", gasProto.Name));
+    }
+
+    public override LogImpact LogImpact => LogImpact.High;
+}
diff --git a/Content.Shared/EntityEffects/Effects/CureZombieInfection.cs b/Content.Shared/EntityEffects/Effects/CureZombieInfection.cs
new file mode 100644
index 0000000000..dd2d21854c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/CureZombieInfection.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class CureZombieInfection : EventEntityEffect<CureZombieInfection>
+{
+    [DataField]
+    public bool Innoculate;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        if(Innoculate)
+            return Loc.GetString("reagent-effect-guidebook-innoculate-zombie-infection", ("chance", Probability));
+
+        return Loc.GetString("reagent-effect-guidebook-cure-zombie-infection", ("chance", Probability));
+    }
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/Drunk.cs b/Content.Shared/EntityEffects/Effects/Drunk.cs
new file mode 100644
index 0000000000..aa15df8f3d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Drunk.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Drunk;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class Drunk : EntityEffect
+{
+    /// <summary>
+    ///     BoozePower is how long each metabolism cycle will make the drunk effect last for.
+    /// </summary>
+    [DataField]
+    public TimeSpan BoozePower = TimeSpan.FromSeconds(3f);
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-drunk", ("chance", Probability));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var boozePower = BoozePower;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+            boozePower *= reagentArgs.Scale.Float();
+
+        var drunkSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedDrunkSystem>();
+        drunkSys.TryApplyDrunkenness(args.TargetEntity, boozePower);
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Electrocute.cs b/Content.Shared/EntityEffects/Effects/Electrocute.cs
new file mode 100644
index 0000000000..32e0ff1172
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Electrocute.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Electrocution;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class Electrocute : EntityEffect
+{
+    [DataField] public int ElectrocuteTime = 2;
+
+    [DataField] public int ElectrocuteDamageScale = 5;
+
+    /// <remarks>
+    ///     true - refresh electrocute time,  false - accumulate electrocute time
+    /// </remarks>
+    [DataField] public bool Refresh = true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime));
+
+    public override bool ShouldLog => true;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            reagentArgs.EntityManager.System<SharedElectrocutionSystem>().TryDoElectrocution(reagentArgs.TargetEntity, null,
+                Math.Max((reagentArgs.Quantity * ElectrocuteDamageScale).Int(), 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
+
+            if (reagentArgs.Reagent != null)
+                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
+        } else
+        {
+            args.EntityManager.System<SharedElectrocutionSystem>().TryDoElectrocution(args.TargetEntity, null,
+                Math.Max(ElectrocuteDamageScale, 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
+        }
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Emote.cs b/Content.Shared/EntityEffects/Effects/Emote.cs
new file mode 100644
index 0000000000..494dc502f5
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Emote.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Chat.Prototypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+///     Tries to force someone to emote (scream, laugh, etc). Still respects whitelists/blacklists and other limits unless specially forced.
+/// </summary>
+public sealed partial class Emote : EventEntityEffect<Emote>
+{
+    /// <summary>
+    ///     The emote the entity will preform.
+    /// </summary>
+    [DataField("emote", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
+    public string EmoteId;
+
+    /// <summary>
+    ///     If the emote should be recorded in chat.
+    /// </summary>
+    [DataField]
+    public bool ShowInChat;
+
+    /// <summary>
+    ///     If the forced emote will be listed in the guidebook.
+    /// </summary>
+    [DataField]
+    public bool ShowInGuidebook;
+
+    /// <summary>
+    ///     If true, the entity will preform the emote even if they normally can't.
+    /// </summary>
+    [DataField]
+    public bool Force = false;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        if (!ShowInGuidebook)
+            return null; // JUSTIFICATION: Emoting is mostly flavor, so same reason popup messages are not in here.
+
+        var emotePrototype = prototype.Index<EmotePrototype>(EmoteId);
+        return Loc.GetString("reagent-effect-guidebook-emote", ("chance", Probability), ("emote", Loc.GetString(emotePrototype.Name)));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/EmoteEntityEffect.cs b/Content.Shared/EntityEffects/Effects/EmoteEntityEffect.cs
deleted file mode 100644
index 1fcfc703ce..0000000000
--- a/Content.Shared/EntityEffects/Effects/EmoteEntityEffect.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Shared.Chat.Prototypes;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Emote : EntityEffectBase<Emote>
-{
-    /// <summary>
-    ///     The emote the entity will preform.
-    /// </summary>
-    [DataField("emote", required: true)]
-    public ProtoId<EmotePrototype> EmoteId;
-
-    /// <summary>
-    ///     If the emote should be recorded in chat.
-    /// </summary>
-    [DataField]
-    public bool ShowInChat;
-
-    /// <summary>
-    ///     If the forced emote will be listed in the guidebook.
-    /// </summary>
-    [DataField]
-    public bool ShowInGuidebook;
-
-    /// <summary>
-    ///     If true, the entity will preform the emote even if they normally can't.
-    /// </summary>
-    [DataField]
-    public bool Force;
-
-    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        if (!ShowInGuidebook || !prototype.Resolve(EmoteId, out var emote))
-            return null; // JUSTIFICATION: Emoting is mostly flavor, so same reason popup messages are not in here.
-
-        return Loc.GetString("entity-effect-guidebook-emote", ("chance", Probability), ("emote", Loc.GetString(emote.Name)));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs b/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs
new file mode 100644
index 0000000000..0f9eacc58d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+[DataDefinition]
+public sealed partial class EmpReactionEffect : EventEntityEffect<EmpReactionEffect>
+{
+    /// <summary>
+    ///     Impulse range per unit of quantity
+    /// </summary>
+    [DataField("rangePerUnit")]
+    public float EmpRangePerUnit = 0.5f;
+
+    /// <summary>
+    ///     Maximum impulse range
+    /// </summary>
+    [DataField("maxRange")]
+    public float EmpMaxRange = 10;
+
+    /// <summary>
+    ///     How much energy will be drain from sources
+    /// </summary>
+    [DataField]
+    public float EnergyConsumption = 12500;
+
+    /// <summary>
+    ///     Amount of time entities will be disabled
+    /// </summary>
+    [DataField("duration")]
+    public TimeSpan DisableDuration = TimeSpan.FromSeconds(15);
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-emp-reaction-effect", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs
deleted file mode 100644
index 3f5d5b3b57..0000000000
--- a/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
-
-/// <summary>
-/// A type of <see cref="EntityEffectBase{T}"/> for effects that spawn entities by prototype.
-/// </summary>
-/// <typeparam name="T">The entity effect inheriting this BaseEffect</typeparam>
-/// <inheritdoc cref="EntityEffect"/>
-public abstract partial class BaseSpawnEntityEntityEffect<T> : EntityEffectBase<T> where T : BaseSpawnEntityEntityEffect<T>
-{
-    /// <summary>
-    /// Amount of entities we're spawning
-    /// </summary>
-    [DataField]
-    public int Number = 1;
-
-    /// <summary>
-    /// Prototype of the entity we're spawning
-    /// </summary>
-    [DataField (required: true)]
-    public EntProtoId Entity;
-
-    /// <summary>
-    /// Whether this spawning is predicted. Set false to not predict the spawn.
-    /// Entities with animations or that have random elements when spawned should set this to false.
-    /// </summary>
-    [DataField]
-    public bool Predicted = true;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-spawn-entity",
-            ("chance", Probability),
-            ("entname", IoCManager.Resolve<IPrototypeManager>().Index<EntityPrototype>(Entity).Name),
-            ("amount", Number));
-}
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs
deleted file mode 100644
index 9887ecdc60..0000000000
--- a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Robust.Shared.Network;
-
-namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
-
-/// <summary>
-/// Spawns a number of entities of a given prototype at the coordinates of this entity.
-/// Amount is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class SpawnEntityEntityEffectSystem : EntityEffectSystem<TransformComponent, SpawnEntity>
-{
-    [Dependency] private readonly INetManager _net = default!;
-
-    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<SpawnEntity> args)
-    {
-        var quantity = args.Effect.Number * (int)Math.Floor(args.Scale);
-        var proto = args.Effect.Entity;
-
-        if (args.Effect.Predicted)
-        {
-            for (var i = 0; i < quantity; i++)
-            {
-                PredictedSpawnNextToOrDrop(proto, entity, entity.Comp);
-            }
-        }
-        else if (_net.IsServer)
-        {
-            for (var i = 0; i < quantity; i++)
-            {
-                SpawnNextToOrDrop(proto, entity, entity.Comp);
-            }
-        }
-    }
-}
-
-/// <inheritdoc cref="BaseSpawnEntityEntityEffect{T}"/>
-public sealed partial class SpawnEntity : BaseSpawnEntityEntityEffect<SpawnEntity>;
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs
deleted file mode 100644
index 6909d503df..0000000000
--- a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Robust.Shared.Containers;
-using Robust.Shared.Network;
-
-namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
-
-/// <summary>
-/// Spawns a given number of entities of a given prototype in a specified container owned by this entity.
-/// Returns if the prototype cannot spawn in the specified container.
-/// Amount is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class SpawnEntityInContainerEntityEffectSystem : EntityEffectSystem<ContainerManagerComponent, SpawnEntityInContainer>
-{
-    [Dependency] private readonly INetManager _net = default!;
-
-    protected override void Effect(Entity<ContainerManagerComponent> entity, ref EntityEffectEvent<SpawnEntityInContainer> args)
-    {
-        var quantity = args.Effect.Number * (int)Math.Floor(args.Scale);
-        var proto = args.Effect.Entity;
-        var container = args.Effect.ContainerName;
-
-        if (args.Effect.Predicted)
-        {
-            for (var i = 0; i < quantity; i++)
-            {
-                // Stop trying to spawn if it fails
-                if (!PredictedTrySpawnInContainer(proto, entity, container, out _, entity.Comp))
-                    return;
-            }
-        }
-        else if (_net.IsServer)
-        {
-            for (var i = 0; i < quantity; i++)
-            {
-                // Stop trying to spawn if it fails
-                if (!TrySpawnInContainer(proto, entity, container, out _, entity.Comp))
-                    return;
-            }
-        }
-    }
-}
-
-/// <inheritdoc cref="BaseSpawnEntityEntityEffect{T}"/>
-public sealed partial class SpawnEntityInContainer : BaseSpawnEntityEntityEffect<SpawnEntityInContainer>
-{
-    /// <summary>
-    /// Name of the container we're trying to spawn into.
-    /// </summary>
-    [DataField(required: true)]
-    public string ContainerName;
-}
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs
deleted file mode 100644
index e5b1e119c1..0000000000
--- a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Robust.Shared.Containers;
-using Robust.Shared.Network;
-
-namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
-
-/// <summary>
-/// Spawns a given number of entities of a given prototype in a specified container owned by this entity.
-/// Acts like <see cref="SpawnEntityEntityEffectSystem"/> if it cannot spawn the prototype in the specified container.
-/// Amount is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class SpawnEntityInContainerOrDropEntityEffectSystem : EntityEffectSystem<ContainerManagerComponent, SpawnEntityInContainerOrDrop>
-{
-    [Dependency] private readonly INetManager _net = default!;
-
-    protected override void Effect(Entity<ContainerManagerComponent> entity, ref EntityEffectEvent<SpawnEntityInContainerOrDrop> args)
-    {
-        var quantity = args.Effect.Number * (int)Math.Floor(args.Scale);
-        var proto = args.Effect.Entity;
-        var container = args.Effect.ContainerName;
-
-        var xform = Transform(entity);
-
-        if (args.Effect.Predicted)
-        {
-            for (var i = 0; i < quantity; i++)
-            {
-                PredictedSpawnInContainerOrDrop(proto, entity, container, xform, entity.Comp);
-            }
-        }
-        else if (_net.IsServer)
-        {
-            for (var i = 0; i < quantity; i++)
-            {
-                SpawnInContainerOrDrop(proto, entity, container, xform, entity.Comp);
-            }
-        }
-    }
-}
-
-/// <inheritdoc cref="BaseSpawnEntityEntityEffect{T}"/>
-public sealed partial class SpawnEntityInContainerOrDrop : BaseSpawnEntityEntityEffect<SpawnEntityInContainerOrDrop>
-{
-    /// <summary>
-    /// Name of the container we're trying to spawn into.
-    /// </summary>
-    [DataField(required: true)]
-    public string ContainerName;
-}
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs
deleted file mode 100644
index 7514dae4e9..0000000000
--- a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Inventory;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
-
-/// <summary>
-/// Spawns an entity of a given prototype in a specified inventory slot owned by this entity.
-/// Fails if it cannot spawn the entity in the given slot.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class SpawnEntityInInventoryEntityEffectSystem : EntityEffectSystem<InventoryComponent, SpawnEntityInInventory>
-{
-    [Dependency] private readonly InventorySystem _inventory = default!;
-
-    protected override void Effect(Entity<InventoryComponent> entity, ref EntityEffectEvent<SpawnEntityInInventory> args)
-    {
-        _inventory.SpawnItemInSlot(entity, args.Effect.Slot, args.Effect.Entity);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class SpawnEntityInInventory : EntityEffectBase<SpawnEntityInInventory>
-{
-    /// <summary>
-    /// Name of the slot we're spawning the item into.
-    /// </summary>
-    [DataField(required: true)]
-    public string Slot = string.Empty; // Rider is drunk and keeps yelling at me to fill this out or make required: true but, it is required true so it's just being an asshole.
-
-    /// <summary>
-    /// Prototype ID of item to spawn.
-    /// </summary>
-    [DataField(required: true)]
-    public EntProtoId Entity;
-}
diff --git a/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs b/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs
new file mode 100644
index 0000000000..968d559939
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs
@@ -0,0 +1,139 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Version of <see cref="HealthChange"/> that distributes the healing to groups
+/// </summary>
+public sealed partial class EvenHealthChange : EntityEffect
+{
+    /// <summary>
+    /// Damage to heal, collected into entire damage groups.
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<ProtoId<DamageGroupPrototype>, FixedPoint2> Damage = new();
+
+    /// <summary>
+    /// Should this effect scale the damage by the amount of chemical in the solution?
+    /// Useful for touch reactions, like styptic powder or acid.
+    /// Only usable if the EntityEffectBaseArgs is an EntityEffectReagentArgs.
+    /// </summary>
+    [DataField]
+    public bool ScaleByQuantity;
+
+    /// <summary>
+    /// Should this effect ignore damage modifiers?
+    /// </summary>
+    [DataField]
+    public bool IgnoreResistances = true;
+
+    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var damages = new List<string>();
+        var heals = false;
+        var deals = false;
+
+        var damagableSystem = entSys.GetEntitySystem<DamageableSystem>();
+        var universalReagentDamageModifier = damagableSystem.UniversalReagentDamageModifier;
+        var universalReagentHealModifier = damagableSystem.UniversalReagentHealModifier;
+
+        foreach (var (group, amount) in Damage)
+        {
+            var groupProto = prototype.Index(group);
+
+            var sign = FixedPoint2.Sign(amount);
+            var mod = 1f;
+
+            if (sign < 0)
+            {
+                heals = true;
+                mod = universalReagentHealModifier;
+            }
+            else if (sign > 0)
+            {
+                deals = true;
+                mod = universalReagentDamageModifier;
+            }
+
+            damages.Add(
+                Loc.GetString("health-change-display",
+                    ("kind", groupProto.LocalizedName),
+                    ("amount", MathF.Abs(amount.Float() * mod)),
+                    ("deltasign", sign)
+                ));
+        }
+
+        var healsordeals = heals ? (deals ? "both" : "heals") : (deals ? "deals" : "none");
+        return Loc.GetString("reagent-effect-guidebook-even-health-change",
+            ("chance", Probability),
+            ("changes", ContentLocalizationManager.FormatList(damages)),
+            ("healsordeals", healsordeals));
+    }
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent<DamageableComponent>(args.TargetEntity, out var damageable))
+            return;
+
+        var protoMan = IoCManager.Resolve<IPrototypeManager>();
+
+        var scale = FixedPoint2.New(1);
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            scale = ScaleByQuantity ? reagentArgs.Quantity * reagentArgs.Scale : reagentArgs.Scale;
+        }
+
+        var damagableSystem = args.EntityManager.System<DamageableSystem>();
+        var universalReagentDamageModifier = damagableSystem.UniversalReagentDamageModifier;
+        var universalReagentHealModifier = damagableSystem.UniversalReagentHealModifier;
+
+        var dspec = new DamageSpecifier();
+
+        foreach (var (group, amount) in Damage)
+        {
+            var groupProto = protoMan.Index(group);
+            var groupDamage = new Dictionary<string, FixedPoint2>();
+            foreach (var damageId in groupProto.DamageTypes)
+            {
+                var damageAmount = damageable.Damage.DamageDict.GetValueOrDefault(damageId);
+                if (damageAmount != FixedPoint2.Zero)
+                    groupDamage.Add(damageId, damageAmount);
+            }
+
+            var sum = groupDamage.Values.Sum();
+            foreach (var (damageId, damageAmount) in groupDamage)
+            {
+                var existing = dspec.DamageDict.GetOrNew(damageId);
+                dspec.DamageDict[damageId] = existing + damageAmount / sum * amount;
+            }
+        }
+
+        if (universalReagentDamageModifier != 1 || universalReagentHealModifier != 1)
+        {
+            foreach (var (type, val) in dspec.DamageDict)
+            {
+                if (val < 0f)
+                {
+                    dspec.DamageDict[type] = val * universalReagentHealModifier;
+                }
+                if (val > 0f)
+                {
+                    dspec.DamageDict[type] = val * universalReagentDamageModifier;
+                }
+            }
+        }
+
+        damagableSystem.TryChangeDamage(
+            args.TargetEntity,
+            dspec * scale,
+            IgnoreResistances,
+            interruptsDoAfters: false);
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs
deleted file mode 100644
index 33b2041b37..0000000000
--- a/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.FixedPoint;
-using Content.Shared.Localizations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Evenly adjust the damage types in a damage group by up to a specified total on this entity.
-/// Total adjustment is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class EvenHealthChangeEntityEffectSystem : EntityEffectSystem<DamageableComponent, EvenHealthChange>
-{
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-
-    protected override void Effect(Entity<DamageableComponent> entity, ref EntityEffectEvent<EvenHealthChange> args)
-    {
-        var damageSpec = new DamageSpecifier();
-
-        foreach (var (group, amount) in args.Effect.Damage)
-        {
-            var groupProto = _proto.Index(group);
-            var groupDamage = new Dictionary<string, FixedPoint2>();
-            foreach (var damageId in groupProto.DamageTypes)
-            {
-                var damageAmount = entity.Comp.Damage.DamageDict.GetValueOrDefault(damageId);
-                if (damageAmount != FixedPoint2.Zero)
-                    groupDamage.Add(damageId, damageAmount);
-            }
-
-            var sum = groupDamage.Values.Sum();
-            foreach (var (damageId, damageAmount) in groupDamage)
-            {
-                var existing = damageSpec.DamageDict.GetOrNew(damageId);
-                damageSpec.DamageDict[damageId] = existing + damageAmount / sum * amount;
-            }
-        }
-
-        damageSpec *= args.Scale;
-
-        _damageable.TryChangeDamage(
-            entity,
-            damageSpec,
-            args.Effect.IgnoreResistances,
-            interruptsDoAfters: false,
-            damageable: entity.Comp);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class EvenHealthChange : EntityEffectBase<EvenHealthChange>
-{
-    /// <summary>
-    /// Damage to heal, collected into entire damage groups.
-    /// </summary>
-    [DataField(required: true)]
-    public Dictionary<ProtoId<DamageGroupPrototype>, FixedPoint2> Damage = new();
-
-    /// <summary>
-    /// Should this effect ignore damage modifiers?
-    /// </summary>
-    [DataField]
-    public bool IgnoreResistances = true;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        var damages = new List<string>();
-        var heals = false;
-        var deals = false;
-
-        var damagableSystem = entSys.GetEntitySystem<DamageableSystem>();
-        var universalReagentDamageModifier = damagableSystem.UniversalReagentDamageModifier;
-        var universalReagentHealModifier = damagableSystem.UniversalReagentHealModifier;
-
-        foreach (var (group, amount) in Damage)
-        {
-            var groupProto = prototype.Index(group);
-
-            var sign = FixedPoint2.Sign(amount);
-            float mod;
-
-            switch (sign)
-            {
-                case < 0:
-                    heals = true;
-                    mod = universalReagentHealModifier;
-                    break;
-                case > 0:
-                    deals = true;
-                    mod = universalReagentDamageModifier;
-                    break;
-                default:
-                    continue; // Don't need to show damage types of 0...
-            }
-
-            damages.Add(
-                Loc.GetString("health-change-display",
-                    ("kind", groupProto.LocalizedName),
-                    ("amount", MathF.Abs(amount.Float() * mod)),
-                    ("deltasign", sign)
-                ));
-        }
-
-        var healsordeals = heals ? deals ? "both" : "heals" : deals ? "deals" : "none";
-        return Loc.GetString("entity-effect-guidebook-even-health-change",
-            ("chance", Probability),
-            ("changes", ContentLocalizationManager.FormatList(damages)),
-            ("healsordeals", healsordeals));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
similarity index 69%
rename from Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
rename to Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
index 762ef24141..bc9af15092 100644
--- a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
@@ -1,17 +1,19 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Content.Shared.Explosion;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using System.Text.Json.Serialization;
 
-namespace Content.Shared.EntityEffects.Effects.Transform;
+namespace Content.Shared.EntityEffects.Effects;
 
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class ExplosionEffect : EntityEffectBase<ExplosionEffect>
+[DataDefinition]
+public sealed partial class ExplosionReactionEffect : EventEntityEffect<ExplosionReactionEffect>
 {
     /// <summary>
     ///     The type of explosion. Determines damage types and tile break chance scaling.
     /// </summary>
-    [DataField(required: true)]
-    public ProtoId<ExplosionPrototype> ExplosionType;
+    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
+    public string ExplosionType = default!;
 
     /// <summary>
     ///     The max intensity the explosion can have at a given tile. Places an upper limit of damage and tile break
@@ -49,10 +51,9 @@ public sealed partial class ExplosionEffect : EntityEffectBase<ExplosionEffect>
     [DataField]
     public float TileBreakScale = 1f;
 
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
-
     public override bool ShouldLog => true;
 
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
     public override LogImpact LogImpact => LogImpact.High;
 }
diff --git a/Content.Shared/EntityEffects/Effects/ExtinguishReaction.cs b/Content.Shared/EntityEffects/Effects/ExtinguishReaction.cs
new file mode 100644
index 0000000000..11e776ac90
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ExtinguishReaction.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Atmos;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects
+{
+    public sealed partial class ExtinguishReaction : EntityEffect
+    {
+        /// <summary>
+        ///     Amount of firestacks reduced.
+        /// </summary>
+        [DataField]
+        public float FireStacksAdjustment = -1.5f;
+
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => Loc.GetString("reagent-effect-guidebook-extinguish-reaction", ("chance", Probability));
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            var ev = new ExtinguishEvent
+            {
+                FireStacksAdjustment = FireStacksAdjustment,
+            };
+
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                ev.FireStacksAdjustment *= (float)reagentArgs.Quantity;
+            }
+
+            args.EntityManager.EventBus.RaiseLocalEvent(args.TargetEntity, ref ev);
+        }
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/FlammableReaction.cs b/Content.Shared/EntityEffects/Effects/FlammableReaction.cs
new file mode 100644
index 0000000000..9f7d504f4e
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/FlammableReaction.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Database;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class FlammableReaction : EventEntityEffect<FlammableReaction>
+{
+    [DataField]
+    public float Multiplier = 0.05f;
+
+    // The fire stack multiplier if fire stacks already exist on target, only works if 0 or greater
+    [DataField]
+    public float MultiplierOnExisting = -1f;
+
+    public override bool ShouldLog => true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-flammable-reaction", ("chance", Probability));
+
+    public override LogImpact LogImpact => LogImpact.Medium;
+}
diff --git a/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs b/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs
new file mode 100644
index 0000000000..c238e94010
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs
@@ -0,0 +1,48 @@
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+[DataDefinition]
+public sealed partial class FlashReactionEffect : EventEntityEffect<FlashReactionEffect>
+{
+    /// <summary>
+    ///     Flash range per unit of reagent.
+    /// </summary>
+    [DataField]
+    public float RangePerUnit = 0.2f;
+
+    /// <summary>
+    ///     Maximum flash range.
+    /// </summary>
+    [DataField]
+    public float MaxRange = 10f;
+
+    /// <summary>
+    ///     How much to entities are slowed down.
+    /// </summary>
+    [DataField]
+    public float SlowTo = 0.5f;
+
+    /// <summary>
+    ///     The time entities will be flashed.
+    ///     The default is chosen to be better than the hand flash so it is worth using it for grenades etc.
+    /// </summary>
+    [DataField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(4);
+
+    /// <summary>
+    ///     The prototype ID used for the visual effect.
+    /// </summary>
+    [DataField]
+    public EntProtoId? FlashEffectPrototype = "ReactionFlash";
+
+    /// <summary>
+    ///     The sound the flash creates.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Weapons/flash.ogg");
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-flash-reaction-effect", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Glow.cs b/Content.Shared/EntityEffects/Effects/Glow.cs
new file mode 100644
index 0000000000..394d406700
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Glow.cs
@@ -0,0 +1,48 @@
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+///     Makes a mob glow.
+/// </summary>
+public sealed partial class Glow : EntityEffect
+{
+    [DataField]
+    public float Radius = 2f;
+
+    [DataField]
+    public Color Color = Color.Black;
+
+    private static readonly List<Color> Colors = new()
+    {
+        Color.White,
+        Color.Red,
+        Color.Yellow,
+        Color.Green,
+        Color.Blue,
+        Color.Purple,
+        Color.Pink
+    };
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (Color == Color.Black)
+        {
+            var random = IoCManager.Resolve<IRobustRandom>();
+            Color = random.Pick(Colors);
+        }
+
+        var lightSystem = args.EntityManager.System<SharedPointLightSystem>();
+        var light = lightSystem.EnsureLight(args.TargetEntity);
+        lightSystem.SetRadius(args.TargetEntity, Radius, light);
+        lightSystem.SetColor(args.TargetEntity, Color, light);
+        lightSystem.SetCastShadows(args.TargetEntity, false, light); // this is expensive, and botanists make lots of plants
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return "TODO";
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs
deleted file mode 100644
index 05e4fe29ca..0000000000
--- a/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Robust.Shared.Network;
-using Robust.Shared.Random;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Causes this entity to glow.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class GlowEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Glow>
-{
-    [Dependency] private readonly INetManager _net = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly SharedPointLightSystem _lightSystem = default!;
-
-    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Glow> args)
-    {
-        var color = args.Effect.Color;
-
-        if (color == Color.Black)
-        {
-            // TODO: When we get proper predicted RNG remove this check...
-            if (_net.IsClient)
-                return;
-
-            color = _random.Pick(Colors);
-        }
-
-        var light = _lightSystem.EnsureLight(entity);
-        _lightSystem.SetRadius(entity, args.Effect.Radius, light);
-        _lightSystem.SetColor(entity, color, light);
-        _lightSystem.SetCastShadows(entity, false, light); // this is expensive, and botanists make lots of plants
-    }
-
-    public static readonly List<Color> Colors = new()
-    {
-        Color.White,
-        Color.Red,
-        Color.Yellow,
-        Color.Green,
-        Color.Blue,
-        Color.Purple,
-        Color.Pink
-    };
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Glow : EntityEffectBase<Glow>
-{
-    [DataField]
-    public float Radius = 2f;
-
-    [DataField]
-    public Color Color = Color.Black;
-}
diff --git a/Content.Shared/EntityEffects/Effects/HealthChange.cs b/Content.Shared/EntityEffects/Effects/HealthChange.cs
new file mode 100644
index 0000000000..17c24f6b5a
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/HealthChange.cs
@@ -0,0 +1,126 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+using System.Linq;
+using System.Text.Json.Serialization;
+
+namespace Content.Shared.EntityEffects.Effects
+{
+    /// <summary>
+    /// Default metabolism used for medicine reagents.
+    /// </summary>
+    public sealed partial class HealthChange : EntityEffect
+    {
+        /// <summary>
+        /// Damage to apply every cycle. Damage Ignores resistances.
+        /// </summary>
+        [DataField(required: true)]
+        [JsonPropertyName("damage")]
+        public DamageSpecifier Damage = default!;
+
+        /// <summary>
+        ///     Should this effect scale the damage by the amount of chemical in the solution?
+        ///     Useful for touch reactions, like styptic powder or acid.
+        ///     Only usable if the EntityEffectBaseArgs is an EntityEffectReagentArgs.
+        /// </summary>
+        [DataField]
+        [JsonPropertyName("scaleByQuantity")]
+        public bool ScaleByQuantity;
+
+        [DataField]
+        [JsonPropertyName("ignoreResistances")]
+        public bool IgnoreResistances = true;
+
+        protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        {
+            var damages = new List<string>();
+            var heals = false;
+            var deals = false;
+
+            var damageSpec = new DamageSpecifier(Damage);
+
+            var universalReagentDamageModifier = entSys.GetEntitySystem<DamageableSystem>().UniversalReagentDamageModifier;
+            var universalReagentHealModifier = entSys.GetEntitySystem<DamageableSystem>().UniversalReagentHealModifier;
+
+            if (universalReagentDamageModifier != 1 || universalReagentHealModifier != 1)
+            {
+                foreach (var (type, val) in damageSpec.DamageDict)
+                {
+                    if (val < 0f)
+                    {
+                        damageSpec.DamageDict[type] = val * universalReagentHealModifier;
+                    }
+                    if (val > 0f)
+                    {
+                        damageSpec.DamageDict[type] = val * universalReagentDamageModifier;
+                    }
+                }
+            }
+
+            damageSpec = entSys.GetEntitySystem<DamageableSystem>().ApplyUniversalAllModifiers(damageSpec);
+
+            foreach (var (kind, amount) in damageSpec.DamageDict)
+            {
+                var sign = FixedPoint2.Sign(amount);
+
+                if (sign < 0)
+                    heals = true;
+                if (sign > 0)
+                    deals = true;
+
+                damages.Add(
+                    Loc.GetString("health-change-display",
+                        ("kind", prototype.Index<DamageTypePrototype>(kind).LocalizedName),
+                        ("amount", MathF.Abs(amount.Float())),
+                        ("deltasign", sign)
+                    ));
+            }
+
+            var healsordeals = heals ? (deals ? "both" : "heals") : (deals ? "deals" : "none");
+
+            return Loc.GetString("reagent-effect-guidebook-health-change",
+                ("chance", Probability),
+                ("changes", ContentLocalizationManager.FormatList(damages)),
+                ("healsordeals", healsordeals));
+        }
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            var scale = FixedPoint2.New(1);
+            var damageSpec = new DamageSpecifier(Damage);
+
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                scale = ScaleByQuantity ? reagentArgs.Quantity * reagentArgs.Scale : reagentArgs.Scale;
+            }
+
+            var universalReagentDamageModifier = args.EntityManager.System<DamageableSystem>().UniversalReagentDamageModifier;
+            var universalReagentHealModifier = args.EntityManager.System<DamageableSystem>().UniversalReagentHealModifier;
+
+            if (universalReagentDamageModifier != 1 || universalReagentHealModifier != 1)
+            {
+                foreach (var (type, val) in damageSpec.DamageDict)
+                {
+                    if (val < 0f)
+                    {
+                        damageSpec.DamageDict[type] = val * universalReagentHealModifier;
+                    }
+                    if (val > 0f)
+                    {
+                        damageSpec.DamageDict[type] = val * universalReagentDamageModifier;
+                    }
+                }
+            }
+
+            args.EntityManager.System<DamageableSystem>()
+                .TryChangeDamage(
+                    args.TargetEntity,
+                    damageSpec * scale,
+                    IgnoreResistances,
+                    interruptsDoAfters: false);
+        }
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs
deleted file mode 100644
index 89948cd2e4..0000000000
--- a/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.FixedPoint;
-using Content.Shared.Localizations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Adjust the damages on this entity by specified amounts.
-/// Amounts are modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class HealthChangeEntityEffectSystem : EntityEffectSystem<DamageableComponent, HealthChange>
-{
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-
-    protected override void Effect(Entity<DamageableComponent> entity, ref EntityEffectEvent<HealthChange> args)
-    {
-        var damageSpec = new DamageSpecifier(args.Effect.Damage);
-
-        damageSpec *= args.Scale;
-
-        _damageable.TryChangeDamage(
-                entity,
-                damageSpec,
-                args.Effect.IgnoreResistances,
-                interruptsDoAfters: false);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class HealthChange : EntityEffectBase<HealthChange>
-{
-    /// <summary>
-    /// Damage to apply every cycle. Damage Ignores resistances.
-    /// </summary>
-    [DataField(required: true)]
-    public DamageSpecifier Damage = default!;
-
-    [DataField]
-    public bool IgnoreResistances = true;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        {
-            var damages = new List<string>();
-            var heals = false;
-            var deals = false;
-
-            var damageSpec = new DamageSpecifier(Damage);
-
-            var universalReagentDamageModifier = entSys.GetEntitySystem<DamageableSystem>().UniversalReagentDamageModifier;
-            var universalReagentHealModifier = entSys.GetEntitySystem<DamageableSystem>().UniversalReagentHealModifier;
-
-            damageSpec = entSys.GetEntitySystem<DamageableSystem>().ApplyUniversalAllModifiers(damageSpec);
-
-            foreach (var (kind, amount) in damageSpec.DamageDict)
-            {
-                var sign = FixedPoint2.Sign(amount);
-                float mod;
-
-                switch (sign)
-                {
-                    case < 0:
-                        heals = true;
-                        mod = universalReagentHealModifier;
-                        break;
-                    case > 0:
-                        deals = true;
-                        mod = universalReagentDamageModifier;
-                        break;
-                    default:
-                        continue; // Don't need to show damage types of 0...
-                }
-
-                damages.Add(
-                    Loc.GetString("health-change-display",
-                        ("kind", prototype.Index<DamageTypePrototype>(kind).LocalizedName),
-                        ("amount", MathF.Abs(amount.Float() * mod)),
-                        ("deltasign", sign)
-                    ));
-            }
-
-            var healsordeals = heals ? (deals ? "both" : "heals") : (deals ? "deals" : "none");
-
-            return Loc.GetString("entity-effect-guidebook-health-change",
-                ("chance", Probability),
-                ("changes", ContentLocalizationManager.FormatList(damages)),
-                ("healsordeals", healsordeals));
-        }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Ignite.cs b/Content.Shared/EntityEffects/Effects/Ignite.cs
new file mode 100644
index 0000000000..707ecc3208
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Ignite.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+///     Ignites a mob.
+/// </summary>
+public sealed partial class Ignite : EventEntityEffect<Ignite>
+{
+    public override bool ShouldLog => true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-ignite", ("chance", Probability));
+
+    public override LogImpact LogImpact => LogImpact.Medium;
+}
diff --git a/Content.Shared/EntityEffects/Effects/MakeSentient.cs b/Content.Shared/EntityEffects/Effects/MakeSentient.cs
new file mode 100644
index 0000000000..9c70eb452b
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/MakeSentient.cs
@@ -0,0 +1,10 @@
+using Content.Shared.Mind.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class MakeSentient : EventEntityEffect<MakeSentient>
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-make-sentient", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs b/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs
deleted file mode 100644
index 4beb21454c..0000000000
--- a/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class MakeSentient : EntityEffectBase<MakeSentient>
-{
-    /// <summary>
-    /// Description for the ghost role created by this effect.
-    /// </summary>
-    [DataField]
-    public LocId RoleDescription = "ghost-role-information-cognizine-description";
-
-    /// <summary>
-    /// Whether we give the target the ability to speak coherently.
-    /// </summary>
-    [DataField]
-    public bool AllowSpeech = true;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-make-sentient", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/ModifyBleedAmount.cs b/Content.Shared/EntityEffects/Effects/ModifyBleedAmount.cs
new file mode 100644
index 0000000000..9f15652095
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ModifyBleedAmount.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class ModifyBleedAmount : EventEntityEffect<ModifyBleedAmount>
+{
+    [DataField]
+    public bool Scaled = false;
+
+    [DataField]
+    public float Amount = -1.0f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-modify-bleed-amount", ("chance", Probability),
+            ("deltasign", MathF.Sign(Amount)));
+}
diff --git a/Content.Shared/EntityEffects/Effects/ModifyBloodLevel.cs b/Content.Shared/EntityEffects/Effects/ModifyBloodLevel.cs
new file mode 100644
index 0000000000..06c026f128
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ModifyBloodLevel.cs
@@ -0,0 +1,17 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class ModifyBloodLevel : EventEntityEffect<ModifyBloodLevel>
+{
+    [DataField]
+    public bool Scaled = false;
+
+    [DataField]
+    public FixedPoint2 Amount = 1.0f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-modify-blood-level", ("chance", Probability),
+            ("deltasign", MathF.Sign(Amount.Float())));
+}
diff --git a/Content.Shared/EntityEffects/Effects/ModifyLungGas.cs b/Content.Shared/EntityEffects/Effects/ModifyLungGas.cs
new file mode 100644
index 0000000000..45dc8c84c6
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ModifyLungGas.cs
@@ -0,0 +1,14 @@
+using Content.Shared.Atmos;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class ModifyLungGas : EventEntityEffect<ModifyLungGas>
+{
+    [DataField("ratios", required: true)]
+    public Dictionary<Gas, float> Ratios = default!;
+
+    // JUSTIFICATION: This is internal magic that players never directly interact with.
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => null;
+}
diff --git a/Content.Shared/EntityEffects/Effects/MovespeedModifier.cs b/Content.Shared/EntityEffects/Effects/MovespeedModifier.cs
new file mode 100644
index 0000000000..5e72746e32
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/MovespeedModifier.cs
@@ -0,0 +1,78 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Default metabolism for stimulants and tranqs. Attempts to find a MovementSpeedModifier on the target,
+/// adding one if not there and to change the movespeed
+/// </summary>
+public sealed partial class MovespeedModifier : EntityEffect
+{
+    /// <summary>
+    /// How much the entities' walk speed is multiplied by.
+    /// </summary>
+    [DataField]
+    public float WalkSpeedModifier { get; set; } = 1;
+
+    /// <summary>
+    /// How much the entities' run speed is multiplied by.
+    /// </summary>
+    [DataField]
+    public float SprintSpeedModifier { get; set; } = 1;
+
+    /// <summary>
+    /// How long the modifier applies (in seconds).
+    /// Is scaled by reagent amount if used with an EntityEffectReagentArgs.
+    /// </summary>
+    [DataField]
+    public float StatusLifetime = 2f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return Loc.GetString("reagent-effect-guidebook-movespeed-modifier",
+            ("chance", Probability),
+            ("walkspeed", WalkSpeedModifier),
+            ("time", StatusLifetime));
+    }
+
+    /// <summary>
+    /// Remove reagent at set rate, changes the movespeed modifiers and adds a MovespeedModifierMetabolismComponent if not already there.
+    /// </summary>
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var status = args.EntityManager.EnsureComponent<MovespeedModifierMetabolismComponent>(args.TargetEntity);
+
+        // Only refresh movement if we need to.
+        var modified = !status.WalkSpeedModifier.Equals(WalkSpeedModifier) ||
+                       !status.SprintSpeedModifier.Equals(SprintSpeedModifier);
+
+        status.WalkSpeedModifier = WalkSpeedModifier;
+        status.SprintSpeedModifier = SprintSpeedModifier;
+
+        // only going to scale application time
+        var statusLifetime = StatusLifetime;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            statusLifetime *= reagentArgs.Scale.Float();
+        }
+
+        IncreaseTimer(status, statusLifetime, args.EntityManager, args.TargetEntity);
+
+        if (modified)
+            args.EntityManager.System<MovementSpeedModifierSystem>().RefreshMovementSpeedModifiers(args.TargetEntity);
+    }
+    private void IncreaseTimer(MovespeedModifierMetabolismComponent status, float time, IEntityManager entityManager, EntityUid uid)
+    {
+        var gameTiming = IoCManager.Resolve<IGameTiming>();
+
+        var offsetTime = Math.Max(status.ModifierTimer.TotalSeconds, gameTiming.CurTime.TotalSeconds);
+
+        status.ModifierTimer = TimeSpan.FromSeconds(offsetTime + time);
+
+        entityManager.Dirty(uid, status);
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Oxygenate.cs b/Content.Shared/EntityEffects/Effects/Oxygenate.cs
new file mode 100644
index 0000000000..e990a3fec6
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Oxygenate.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class Oxygenate : EventEntityEffect<Oxygenate>
+{
+    [DataField]
+    public float Factor = 1f;
+
+    // JUSTIFICATION: This is internal magic that players never directly interact with.
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => null;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Paralyze.cs b/Content.Shared/EntityEffects/Effects/Paralyze.cs
new file mode 100644
index 0000000000..2a2270016b
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Paralyze.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Stunnable;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class Paralyze : EntityEffect
+{
+    [DataField] public double ParalyzeTime = 2;
+
+    /// <remarks>
+    ///     true - refresh paralyze time,  false - accumulate paralyze time
+    /// </remarks>
+    [DataField] public bool Refresh = true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString(
+            "reagent-effect-guidebook-paralyze",
+            ("chance", Probability),
+            ("time", ParalyzeTime)
+        );
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var paralyzeTime = ParalyzeTime;
+
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            paralyzeTime *= (double)reagentArgs.Scale;
+        }
+
+        var stunSystem = args.EntityManager.System<SharedStunSystem>();
+        _ = Refresh
+            ? stunSystem.TryUpdateParalyzeDuration(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime))
+            : stunSystem.TryAddParalyzeDuration(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime));
+    }
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
new file mode 100644
index 0000000000..2c8046452b
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
@@ -0,0 +1,39 @@
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+[ImplicitDataDefinitionForInheritors]
+public abstract partial class PlantAdjustAttribute<T> : EventEntityEffect<T> where T : PlantAdjustAttribute<T>
+{
+    [DataField]
+    public float Amount { get; protected set; } = 1;
+
+    /// <summary>
+    /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
+    /// </summary>
+    [DataField]
+    public abstract string GuidebookAttributeName { get; set; }
+
+    /// <summary>
+    /// Whether the attribute in question is a good thing. Used for guidebook descriptions to determine the color of the number.
+    /// </summary>
+    [DataField]
+    public virtual bool GuidebookIsAttributePositive { get; protected set; } = true;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        string color;
+        if (GuidebookIsAttributePositive ^ Amount < 0.0)
+        {
+            color = "green";
+        }
+        else
+        {
+            color = "red";
+        }
+        return Loc.GetString("reagent-effect-guidebook-plant-attribute", ("attribute", Loc.GetString(GuidebookAttributeName)), ("amount", Amount.ToString("0.00")), ("colorName", color), ("chance", Probability));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
new file mode 100644
index 0000000000..c1e71894e5
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantAdjustHealth : PlantAdjustAttribute<PlantAdjustHealth>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-health";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
new file mode 100644
index 0000000000..6610adf708
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantAdjustMutationLevel : PlantAdjustAttribute<PlantAdjustMutationLevel>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-level";
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
new file mode 100644
index 0000000000..91be222807
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantAdjustMutationMod : PlantAdjustAttribute<PlantAdjustMutationMod>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-mod";
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
new file mode 100644
index 0000000000..db01d5d060
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantAdjustNutrition : PlantAdjustAttribute<PlantAdjustNutrition>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-nutrition";
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPests.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
similarity index 53%
rename from Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPests.cs
rename to Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
index c1661ec89e..18c00550d5 100644
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPests.cs
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
@@ -1,6 +1,6 @@
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
 
-public sealed partial class PlantAdjustPests : BasePlantAdjustAttribute<PlantAdjustPests>
+public sealed partial class PlantAdjustPests : PlantAdjustAttribute<PlantAdjustPests>
 {
     public override string GuidebookAttributeName { get; set; } = "plant-attribute-pests";
     public override bool GuidebookIsAttributePositive { get; protected set; } = false;
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs
new file mode 100644
index 0000000000..971f05f32d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs
@@ -0,0 +1,12 @@
+// using Content.Server.Botany.Systems;
+
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+/// <summary>
+///     Handles increase or decrease of plant potency.
+/// </summary>
+
+public sealed partial class PlantAdjustPotency : PlantAdjustAttribute<PlantAdjustPotency>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-potency";
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxins.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
similarity index 53%
rename from Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxins.cs
rename to Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
index 04eccb03ec..9123b5847d 100644
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxins.cs
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
@@ -1,9 +1,8 @@
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
 
-public sealed partial class PlantAdjustToxins : BasePlantAdjustAttribute<PlantAdjustToxins>
+public sealed partial class PlantAdjustToxins : PlantAdjustAttribute<PlantAdjustToxins>
 {
     public override string GuidebookAttributeName { get; set; } = "plant-attribute-toxins";
-
     public override bool GuidebookIsAttributePositive { get; protected set; } = false;
 }
 
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
new file mode 100644
index 0000000000..610d02231b
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantAdjustWater : PlantAdjustAttribute<PlantAdjustWater>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-water";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeeds.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
similarity index 53%
rename from Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeeds.cs
rename to Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
index e6be25d8c9..70ff0747dd 100644
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeeds.cs
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
@@ -1,6 +1,6 @@
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
 
-public sealed partial class PlantAdjustWeeds : BasePlantAdjustAttribute<PlantAdjustWeeds>
+public sealed partial class PlantAdjustWeeds : PlantAdjustAttribute<PlantAdjustWeeds>
 {
     public override string GuidebookAttributeName { get; set; } = "plant-attribute-weeds";
     public override bool GuidebookIsAttributePositive { get; protected set; } = false;
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
new file mode 100644
index 0000000000..36b8f57d08
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantAffectGrowth : PlantAdjustAttribute<PlantAffectGrowth>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-growth";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantChangeStat.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantChangeStat.cs
new file mode 100644
index 0000000000..66cfb66d4b
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantChangeStat.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantChangeStat : EventEntityEffect<PlantChangeStat>
+{
+    [DataField]
+    public string TargetValue;
+
+    [DataField]
+    public float MinValue;
+
+    [DataField]
+    public float MaxValue;
+
+    [DataField]
+    public int Steps;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
new file mode 100644
index 0000000000..0dabf1f22b
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
@@ -0,0 +1,8 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantCryoxadone : EventEntityEffect<PlantCryoxadone>
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-cryoxadone", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs
new file mode 100644
index 0000000000..9f16c35402
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+/// <summary>
+///     Handles removal of seeds on a plant.
+/// </summary>
+
+public sealed partial class PlantDestroySeeds : EventEntityEffect<PlantDestroySeeds>
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("reagent-effect-guidebook-plant-seeds-remove", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
new file mode 100644
index 0000000000..9feccbf224
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantDiethylamine : EventEntityEffect<PlantDiethylamine>
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-diethylamine", ("chance", Probability));
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
new file mode 100644
index 0000000000..9dc5140063
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
@@ -0,0 +1,8 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class PlantPhalanximine : EventEntityEffect<PlantPhalanximine>
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-phalanximine", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs
new file mode 100644
index 0000000000..51ce353dbb
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+/// <summary>
+///     Handles restoral of seeds on a plant.
+/// </summary>
+public sealed partial class PlantRestoreSeeds : EventEntityEffect<PlantRestoreSeeds>
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("reagent-effect-guidebook-plant-seeds-add", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
new file mode 100644
index 0000000000..6ba37c9be0
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+
+public sealed partial class RobustHarvest : EventEntityEffect<RobustHarvest>
+{
+    [DataField]
+    public int PotencyLimit = 50;
+
+    [DataField]
+    public int PotencyIncrease = 3;
+
+    [DataField]
+    public int PotencySeedlessThreshold = 30;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-robust-harvest", ("seedlesstreshold", PotencySeedlessThreshold), ("limit", PotencyLimit), ("increase", PotencyIncrease), ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMutateChemicals.cs b/Content.Shared/EntityEffects/Effects/PlantMutateChemicals.cs
new file mode 100644
index 0000000000..9a3408bb8e
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMutateChemicals.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Random;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+///     changes the chemicals available in a plant's produce
+/// </summary>
+public sealed partial class PlantMutateChemicals : EventEntityEffect<PlantMutateChemicals>
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return "TODO";
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMutateGases.cs b/Content.Shared/EntityEffects/Effects/PlantMutateGases.cs
new file mode 100644
index 0000000000..5eb5b1d07c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMutateGases.cs
@@ -0,0 +1,39 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using System.Linq;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+///     changes the gases that a plant or produce create.
+/// </summary>
+public sealed partial class PlantMutateExudeGasses : EventEntityEffect<PlantMutateExudeGasses>
+{
+    [DataField]
+    public float MinValue = 0.01f;
+
+    [DataField]
+    public float MaxValue = 0.5f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return "TODO";
+    }
+}
+
+/// <summary>
+///     changes the gases that a plant or produce consumes.
+/// </summary>
+public sealed partial class PlantMutateConsumeGasses : EventEntityEffect<PlantMutateConsumeGasses>
+{
+    [DataField]
+    public float MinValue = 0.01f;
+
+    [DataField]
+    public float MaxValue = 0.5f;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return "TODO";
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMutateHarvest.cs b/Content.Shared/EntityEffects/Effects/PlantMutateHarvest.cs
new file mode 100644
index 0000000000..84d6293185
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantMutateHarvest.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+///     Upgrades a plant's harvest type.
+/// </summary>
+public sealed partial class PlantMutateHarvest : EventEntityEffect<PlantMutateHarvest>
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return "TODO";
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantSpeciesChange.cs b/Content.Shared/EntityEffects/Effects/PlantSpeciesChange.cs
new file mode 100644
index 0000000000..e2acc4cb7c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PlantSpeciesChange.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+///     Changes a plant into one of the species its able to mutate into.
+/// </summary>
+public sealed partial class PlantSpeciesChange : EventEntityEffect<PlantSpeciesChange>
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return "TODO";
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Polymorph.cs b/Content.Shared/EntityEffects/Effects/Polymorph.cs
new file mode 100644
index 0000000000..65711ff99a
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Polymorph.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Polymorph;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class Polymorph : EventEntityEffect<Polymorph>
+{
+    /// <summary>
+    ///     What polymorph prototype is used on effect
+    /// </summary>
+    [DataField("prototype", customTypeSerializer:typeof(PrototypeIdSerializer<PolymorphPrototype>))]
+    public string PolymorphPrototype { get; set; }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    => Loc.GetString("reagent-effect-guidebook-make-polymorph",
+            ("chance", Probability), ("entityname",
+                prototype.Index<EntityPrototype>(prototype.Index<PolymorphPrototype>(PolymorphPrototype).Configuration.Entity).Name));
+}
diff --git a/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs b/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs
deleted file mode 100644
index c0d80dffaa..0000000000
--- a/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Polymorph;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Polymorph : EntityEffectBase<Polymorph>
-{
-    /// <summary>
-    ///     What polymorph prototype is used on effect
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<PolymorphPrototype> Prototype;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-make-polymorph",
-            ("chance", Probability),
-            ("entityname", prototype.Index<EntityPrototype>(prototype.Index(Prototype).Configuration.Entity).Name));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PopupMessage.cs b/Content.Shared/EntityEffects/Effects/PopupMessage.cs
new file mode 100644
index 0000000000..a837f816e4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PopupMessage.cs
@@ -0,0 +1,54 @@
+using Content.Shared.Popups;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Shared.EntityEffects.Effects
+{
+    public sealed partial class PopupMessage : EntityEffect
+    {
+        [DataField(required: true)]
+        public string[] Messages = default!;
+
+        [DataField]
+        public PopupRecipients Type = PopupRecipients.Local;
+
+        [DataField]
+        public PopupType VisualType = PopupType.Small;
+
+        // JUSTIFICATION: This is purely cosmetic.
+        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+            => null;
+
+        public override void Effect(EntityEffectBaseArgs args)
+        {
+            var popupSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedPopupSystem>();
+            var random = IoCManager.Resolve<IRobustRandom>();
+
+            var msg = random.Pick(Messages);
+            var msgArgs = new (string, object)[]
+            {
+                ("entity", args.TargetEntity),
+            };
+
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                msgArgs = new (string, object)[]
+                {
+                    ("entity", reagentArgs.TargetEntity),
+                    ("organ", reagentArgs.OrganEntity.GetValueOrDefault()),
+                };
+            }
+
+            if (Type == PopupRecipients.Local)
+                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, args.TargetEntity, VisualType);
+            else if (Type == PopupRecipients.Pvs)
+                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, VisualType);
+        }
+    }
+
+    public enum PopupRecipients
+    {
+        Pvs,
+        Local
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/ReduceRotting.cs b/Content.Shared/EntityEffects/Effects/ReduceRotting.cs
new file mode 100644
index 0000000000..b5f2a7ae7e
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ReduceRotting.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+using Content.Shared.Atmos.Rotting;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Reduces the rotting accumulator on the patient, making them revivable.
+/// </summary>
+public sealed partial class ReduceRotting : EntityEffect
+{
+    [DataField("seconds")]
+    public double RottingAmount = 10;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-reduce-rotting",
+            ("chance", Probability),
+            ("time", RottingAmount));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            if (reagentArgs.Scale != 1f)
+                return;
+        }
+
+        var rottingSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedRottingSystem>();
+
+        rottingSys.ReduceAccumulator(args.TargetEntity, TimeSpan.FromSeconds(RottingAmount));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/ResetNarcolepsy.cs b/Content.Shared/EntityEffects/Effects/ResetNarcolepsy.cs
new file mode 100644
index 0000000000..009cf914d5
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ResetNarcolepsy.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Reset narcolepsy timer
+/// </summary>
+public sealed partial class ResetNarcolepsy : EventEntityEffect<ResetNarcolepsy>
+{
+    /// <summary>
+    /// The # of seconds the effect resets the narcolepsy timer to
+    /// </summary>
+    [DataField("TimerReset")]
+    public TimeSpan TimerReset = TimeSpan.FromSeconds(600);
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-reset-narcolepsy", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs
deleted file mode 100644
index 973b139fa4..0000000000
--- a/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.Traits.Assorted;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Resets the narcolepsy timer on a given entity.
-/// The new duration of the timer is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ResetNarcolepsyEntityEffectSystem : EntityEffectSystem<NarcolepsyComponent, ResetNarcolepsy>
-{
-    [Dependency] private readonly NarcolepsySystem _narcolepsy = default!;
-
-    protected override void Effect(Entity<NarcolepsyComponent> entity, ref EntityEffectEvent<ResetNarcolepsy> args)
-    {
-        var timer = args.Effect.TimerReset * args.Scale;
-
-        _narcolepsy.AdjustNarcolepsyTimer(entity.AsNullable(), timer);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class ResetNarcolepsy : EntityEffectBase<ResetNarcolepsy>
-{
-    /// <summary>
-    /// The time we set our narcolepsy timer to.
-    /// </summary>
-    [DataField("TimerReset")]
-    public TimeSpan TimerReset = TimeSpan.FromSeconds(600);
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-reset-narcolepsy", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/SatiateHunger.cs b/Content.Shared/EntityEffects/Effects/SatiateHunger.cs
new file mode 100644
index 0000000000..3e7af8833c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/SatiateHunger.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Attempts to find a HungerComponent on the target,
+/// and to update it's hunger values.
+/// </summary>
+public sealed partial class SatiateHunger : EntityEffect
+{
+    private const float DefaultNutritionFactor = 3.0f;
+
+    /// <summary>
+    ///     How much hunger is satiated.
+    ///     Is multiplied by quantity if used with EntityEffectReagentArgs.
+    /// </summary>
+    [DataField("factor")] public float NutritionFactor { get; set; } = DefaultNutritionFactor;
+
+    //Remove reagent at set rate, satiate hunger if a HungerComponent can be found
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var entman = args.EntityManager;
+        if (!entman.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
+            return;
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            entman.System<HungerSystem>().ModifyHunger(reagentArgs.TargetEntity, NutritionFactor * (float) reagentArgs.Quantity, hunger);
+        }
+        else
+        {
+            entman.System<HungerSystem>().ModifyHunger(args.TargetEntity, NutritionFactor, hunger);
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-satiate-hunger", ("chance", Probability), ("relative", NutritionFactor / DefaultNutritionFactor));
+}
diff --git a/Content.Shared/EntityEffects/Effects/SatiateThirst.cs b/Content.Shared/EntityEffects/Effects/SatiateThirst.cs
new file mode 100644
index 0000000000..21a055b528
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/SatiateThirst.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
+/// and to update it's thirst values.
+/// </summary>
+public sealed partial class SatiateThirst : EntityEffect
+{
+    private const float DefaultHydrationFactor = 3.0f;
+
+    /// How much thirst is satiated each tick. Not currently tied to
+    /// rate or anything.
+    [DataField("factor")]
+    public float HydrationFactor { get; set; } = DefaultHydrationFactor;
+
+    /// Satiate thirst if a ThirstComponent can be found
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var uid = args.TargetEntity;
+        if (args.EntityManager.TryGetComponent(uid, out ThirstComponent? thirst))
+            args.EntityManager.System<ThirstSystem>().ModifyThirst(uid, thirst, HydrationFactor);
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  HydrationFactor / DefaultHydrationFactor));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Slipify.cs b/Content.Shared/EntityEffects/Effects/Slipify.cs
new file mode 100644
index 0000000000..c152b8b010
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Slipify.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Physics;
+using Content.Shared.Slippery;
+using Content.Shared.StepTrigger.Components;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+///     Makes a mob slippery.
+/// </summary>
+public sealed partial class Slipify : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var fixtureSystem = args.EntityManager.System<FixtureSystem>();
+        var colWakeSystem = args.EntityManager.System<CollisionWakeSystem>();
+        var slippery = args.EntityManager.EnsureComponent<SlipperyComponent>(args.TargetEntity);
+        args.EntityManager.Dirty(args.TargetEntity, slippery);
+        args.EntityManager.EnsureComponent<StepTriggerComponent>(args.TargetEntity);
+        // Need a fixture with a slip layer in order to actually do the slipping
+        var fixtures = args.EntityManager.EnsureComponent<FixturesComponent>(args.TargetEntity);
+        var body = args.EntityManager.EnsureComponent<PhysicsComponent>(args.TargetEntity);
+        var shape = fixtures.Fixtures["fix1"].Shape;
+        fixtureSystem.TryCreateFixture(args.TargetEntity, shape, "slips", 1, false, (int)CollisionGroup.SlipLayer, manager: fixtures, body: body);
+        // Need to disable collision wake so that mobs can collide with and slip on it
+        var collisionWake = args.EntityManager.EnsureComponent<CollisionWakeComponent>(args.TargetEntity);
+        colWakeSystem.SetEnabled(args.TargetEntity, false, collisionWake);
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs
deleted file mode 100644
index 602e5e923a..0000000000
--- a/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Linq;
-using Content.Shared.Physics;
-using Content.Shared.Slippery;
-using Content.Shared.StepTrigger.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Systems;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// This effect permanently creates a slippery fixture for this entity and then makes this entity slippery like soap.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class SlipifyEntityEffectSystem : EntityEffectSystem<FixturesComponent, Slipify>
-{
-    [Dependency] private readonly CollisionWakeSystem _collisionWake = default!;
-    [Dependency] private readonly FixtureSystem _fixture = default!;
-
-    protected override void Effect(Entity<FixturesComponent> entity, ref EntityEffectEvent<Slipify> args)
-    {
-        EnsureComp<SlipperyComponent>(entity, out var slippery);
-        slippery.SlipData = args.Effect.Slippery;
-
-        Dirty(entity, slippery);
-
-        EnsureComp<StepTriggerComponent>(entity);
-
-        if (entity.Comp.Fixtures.FirstOrDefault(x => x.Value.Hard).Value.Shape is not { } shape)
-            return;
-
-        _fixture.TryCreateFixture(entity, shape, "slips", 1, false, (int)CollisionGroup.SlipLayer, manager: entity.Comp);
-
-        // Need to disable collision wake so that mobs can collide with and slip on it
-        EnsureComp<CollisionWakeComponent>(entity, out var collisionWake);
-        _collisionWake.SetEnabled(entity, false, collisionWake);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Slipify : EntityEffectBase<Slipify>
-{
-    [DataField]
-    public SlipperyEffectEntry Slippery = new();
-}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs
deleted file mode 100644
index ef96723cff..0000000000
--- a/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Solution;
-
-// TODO: This should be removed and changed to an "AbsorbentSolutionComponent"
-/// <summary>
-/// Creates a reagent in a specified solution owned by this entity.
-/// Quantity is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed class AddReagentToSolutionEntityEffectSystem : EntityEffectSystem<SolutionContainerManagerComponent, AddReagentToSolution>
-{
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-
-    protected override void Effect(Entity<SolutionContainerManagerComponent> entity, ref EntityEffectEvent<AddReagentToSolution> args)
-    {
-        var solution = args.Effect.Solution;
-        var reagent = args.Effect.Reagent;
-
-        if (!_solutionContainer.TryGetSolution((entity, entity), solution, out var solutionContainer))
-            return;
-
-        _solutionContainer.TryAddReagent(solutionContainer.Value, reagent, args.Scale * args.Effect.StrengthModifier);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class AddReagentToSolution : EntityEffectBase<AddReagentToSolution>
-{
-    /// <summary>
-    ///     Prototype of the reagent we're adding.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<ReagentPrototype> Reagent;
-
-    ///<summary>
-    ///     Solution we're looking for
-    /// </summary>
-    [DataField(required: true)]
-    public string? Solution = "reagents";
-
-    ///<summary>
-    ///     A modifier for how much reagent we're creating.
-    /// </summary>
-    [DataField]
-    public float StrengthModifier = 1.0f;
-
-    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return prototype.Resolve(Reagent, out ReagentPrototype? proto)
-            ? Loc.GetString("entity-effect-guidebook-add-to-solution-reaction",
-                ("chance", Probability),
-                ("reagent", proto.LocalizedName))
-            : null;
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs
deleted file mode 100644
index 334a63a95a..0000000000
--- a/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Solution;
-
-/// <summary>
-/// Adjust a reagent in this solution by an amount modified by scale.
-/// Quantity is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class AdjustReagentEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustReagent>
-{
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-
-    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AdjustReagent> args)
-    {
-        var quantity = args.Effect.Amount * args.Scale;
-        var reagent = args.Effect.Reagent;
-
-        if (quantity > 0)
-            _solutionContainer.TryAddReagent(entity, reagent, quantity);
-        else
-            _solutionContainer.RemoveReagent(entity, reagent, -quantity);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class AdjustReagent : EntityEffectBase<AdjustReagent>
-{
-    /// <summary>
-    ///     The reagent ID to add or remove.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<ReagentPrototype> Reagent;
-
-    [DataField(required: true)]
-    public FixedPoint2 Amount;
-
-    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return prototype.Resolve(Reagent, out ReagentPrototype? proto)
-            ? Loc.GetString("entity-effect-guidebook-adjust-reagent-reagent",
-                ("chance", Probability),
-                ("deltasign", MathF.Sign(Amount.Float())),
-                ("reagent", proto.LocalizedName),
-                ("amount", MathF.Abs(Amount.Float())))
-            : null;
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentsByGroupEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentsByGroupEntityEffectSystem.cs
deleted file mode 100644
index 51259956d8..0000000000
--- a/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentsByGroupEntityEffectSystem.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Content.Shared.Body.Prototypes;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Solution;
-
-/// <summary>
-/// Adjust all reagents in this solution which are metabolized by a given metabolism group.
-/// Quantity is modified by scale, quantity is per reagent and not a total.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class AdjustReagentsByGroupEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustReagentsByGroup>
-{
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-
-    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AdjustReagentsByGroup> args)
-    {
-        var quantity = args.Effect.Amount * args.Scale;
-        var group = args.Effect.Group;
-        var solution = entity.Comp.Solution;
-
-        foreach (var quant in solution.Contents.ToArray())
-        {
-            var proto = _proto.Index<ReagentPrototype>(quant.Reagent.Prototype);
-            if (proto.Metabolisms == null || !proto.Metabolisms.ContainsKey(group))
-                continue;
-
-            if (quantity > 0)
-                _solutionContainer.TryAddReagent(entity, proto.ID, quantity);
-            else
-                _solutionContainer.RemoveReagent(entity, proto.ID, -quantity);
-        }
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class AdjustReagentsByGroup : EntityEffectBase<AdjustReagentsByGroup>
-{
-
-    /// <summary>
-    ///     The metabolism group being adjusted. All reagents in an affected solution with this group will be adjusted.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<MetabolismGroupPrototype> Group;
-
-    [DataField(required: true)]
-    public FixedPoint2 Amount;
-}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs
deleted file mode 100644
index 5fbe948360..0000000000
--- a/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared.Database;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Solution;
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class AreaReactionEffect : EntityEffectBase<AreaReactionEffect>
-{
-    /// <summary>
-    /// How many seconds will the effect stay, counting after fully spreading.
-    /// </summary>
-    [DataField("duration")] public float Duration = 10;
-
-    /// <summary>
-    /// How big of a reaction scale we need for 1 smoke entity.
-    /// </summary>
-    [DataField] public float OverflowThreshold = 2.5f;
-
-    /// <summary>
-    /// The entity prototype that is being spread over an area.
-    /// </summary>
-    [DataField(required: true)]
-    public EntProtoId PrototypeId;
-
-    /// <summary>
-    /// Sound that will get played when this reaction effect occurs.
-    /// </summary>
-    [DataField(required: true)] public SoundSpecifier Sound = default!;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-area-reaction",
-            ("duration", Duration)
-        );
-
-    public override bool ShouldLog => true;
-
-    public override LogImpact LogImpact => LogImpact.High;
-}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs
deleted file mode 100644
index c0188fdfb4..0000000000
--- a/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Solution;
-
-// TODO: Energy conservation!!! Once HeatContainers are merged nuke this and everything in SolutionContainerSystem to respect energy conservation!
-/// <summary>
-/// Sets the temperature of this solution to a fixed value.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed class SetSolutionTemperatureEntityEffectSystem : EntityEffectSystem<SolutionComponent, SetSolutionTemperature>
-{
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-
-    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<SetSolutionTemperature> args)
-    {
-        _solutionContainer.SetTemperature(entity, args.Effect.Temperature);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class SetSolutionTemperature : EntityEffectBase<SetSolutionTemperature>
-{
-    /// <summary>
-    ///     The temperature to set the solution to.
-    /// </summary>
-    [DataField(required: true)]
-    public float Temperature;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-set-solution-temperature-effect",
-            ("chance", Probability),
-            ("temperature", Temperature));
-}
-
-/// <summary>
-/// Adjusts the temperature of this solution by a given amount.
-/// The temperature adjustment is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed class AdjustSolutionTemperatureEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustSolutionTemperature>
-{
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-
-    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AdjustSolutionTemperature> args)
-    {
-        var solution = entity.Comp.Solution;
-        var temperature = Math.Clamp(solution.Temperature + args.Scale * args.Effect.Delta, args.Effect.MinTemp, args.Effect.MaxTemp);
-
-        _solutionContainer.SetTemperature(entity, temperature);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class AdjustSolutionTemperature : EntityEffectBase<AdjustSolutionTemperature>
-{
-    /// <summary>
-    ///     The change in temperature.
-    /// </summary>
-    [DataField(required: true)]
-    public float Delta;
-
-    /// <summary>
-    ///     The minimum temperature this effect can reach.
-    /// </summary>
-    [DataField]
-    public float MinTemp;
-
-    /// <summary>
-    ///     The maximum temperature this effect can reach.
-    /// </summary>
-    [DataField]
-    public float MaxTemp = float.PositiveInfinity;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-adjust-solution-temperature-effect",
-            ("chance", Probability),
-            ("deltasign", MathF.Sign(Delta)),
-            ("mintemp", MinTemp),
-            ("maxtemp", MaxTemp));
-}
-
-/// <summary>
-/// Adjusts the thermal energy of this solution by a given amount.
-/// The energy adjustment is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed class AdjustSolutionThermalEnergyEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustSolutionThermalEnergy>
-{
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-
-    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AdjustSolutionThermalEnergy> args)
-    {
-        var solution = entity.Comp.Solution;
-
-        var delta = args.Scale * args.Effect.Delta;
-
-        // Don't adjust thermal energy if we're already at or above max temperature.
-        switch (delta)
-        {
-            case > 0:
-                if (solution.Temperature >= args.Effect.MaxTemp)
-                    return;
-                break;
-            case < 0:
-                if (solution.Temperature <= args.Effect.MinTemp)
-                    return;
-                break;
-            default:
-                return;
-        }
-
-        _solutionContainer.AddThermalEnergyClamped(entity, delta, args.Effect.MinTemp, args.Effect.MaxTemp);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class AdjustSolutionThermalEnergy : EntityEffectBase<AdjustSolutionThermalEnergy>
-{
-    /// <summary>
-    ///     The change in thermal energy.
-    /// </summary>
-    [DataField(required: true)]
-    public float Delta;
-
-    /// <summary>
-    ///     The minimum temperature this effect can reach.
-    /// </summary>
-    [DataField]
-    public float MinTemp;
-
-    /// <summary>
-    ///     The maximum temperature this effect can reach.
-    /// </summary>
-    [DataField]
-    public float MaxTemp = float.PositiveInfinity;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-adjust-solution-temperature-effect",
-            ("chance", Probability),
-            ("deltasign", MathF.Sign(Delta)),
-            ("mintemp", MinTemp),
-            ("maxtemp", MaxTemp));
-}
diff --git a/Content.Shared/EntityEffects/Effects/SolutionTemperatureEffects.cs b/Content.Shared/EntityEffects/Effects/SolutionTemperatureEffects.cs
new file mode 100644
index 0000000000..30ac6c3d77
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/SolutionTemperatureEffects.cs
@@ -0,0 +1,143 @@
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+///     Sets the temperature of the solution involved with the reaction to a new value.
+/// </summary>
+[DataDefinition]
+public sealed partial class SetSolutionTemperatureEffect : EntityEffect
+{
+    /// <summary>
+    ///     The temperature to set the solution to.
+    /// </summary>
+    [DataField("temperature", required: true)] private float _temperature;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-set-solution-temperature-effect",
+            ("chance", Probability), ("temperature", _temperature));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var solution = reagentArgs.Source;
+            if (solution == null)
+                return;
+
+            solution.Temperature = _temperature;
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+}
+
+/// <summary>
+///     Adjusts the temperature of the solution involved in the reaction.
+/// </summary>
+[DataDefinition]
+public sealed partial class AdjustSolutionTemperatureEffect : EntityEffect
+{
+    /// <summary>
+    ///     The change in temperature.
+    /// </summary>
+    [DataField("delta", required: true)] private float _delta;
+
+    /// <summary>
+    ///     The minimum temperature this effect can reach.
+    /// </summary>
+    [DataField("minTemp")] private float _minTemp = 0.0f;
+
+    /// <summary>
+    ///     The maximum temperature this effect can reach.
+    /// </summary>
+    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
+
+    /// <summary>
+    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
+    /// </summary>
+    [DataField("scaled")] private bool _scaled;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
+            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var solution = reagentArgs.Source;
+            if (solution == null || solution.Volume == 0)
+                return;
+
+            var deltaT = _scaled ? _delta * (float) reagentArgs.Quantity : _delta;
+            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+}
+
+/// <summary>
+///     Adjusts the thermal energy of the solution involved in the reaction.
+/// </summary>
+public sealed partial class AdjustSolutionThermalEnergyEffect : EntityEffect
+{
+    /// <summary>
+    ///     The change in energy.
+    /// </summary>
+    [DataField("delta", required: true)] private float _delta;
+
+    /// <summary>
+    ///     The minimum temperature this effect can reach.
+    /// </summary>
+    [DataField("minTemp")] private float _minTemp = 0.0f;
+
+    /// <summary>
+    ///     The maximum temperature this effect can reach.
+    /// </summary>
+    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
+
+    /// <summary>
+    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
+    /// </summary>
+    [DataField("scaled")] private bool _scaled;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (args is EntityEffectReagentArgs reagentArgs)
+        {
+            var solution = reagentArgs.Source;
+            if (solution == null || solution.Volume == 0)
+                return;
+
+            if (_delta > 0 && solution.Temperature >= _maxTemp)
+                return;
+            if (_delta < 0 && solution.Temperature <= _minTemp)
+                return;
+
+            var heatCap = solution.GetHeatCapacity(null);
+            var deltaT = _scaled
+                ? _delta / heatCap * (float) reagentArgs.Quantity
+                : _delta / heatCap;
+
+            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
+
+            return;
+        }
+
+        // TODO: Someone needs to figure out how to do this for non-reagent effects.
+        throw new NotImplementedException();
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
+            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs
deleted file mode 100644
index b028da1595..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-/// Entity effect that specifically deals with new status effects.
-/// </summary>
-/// <typeparam name="T">The entity effect type, typically for status effects which need systems to pass arguments</typeparam>
-public abstract partial class BaseStatusEntityEffect<T> : EntityEffectBase<T> where T : BaseStatusEntityEffect<T>
-{
-    /// <summary>
-    /// How long the modifier applies (in seconds).
-    /// Is scaled by reagent amount if used with an EntityEffectReagentArgs.
-    /// </summary>
-    [DataField]
-    public TimeSpan? Time = TimeSpan.FromSeconds(2);
-
-    /// <summary>
-    /// Should this effect add the status effect, remove time from it, or set its cooldown?
-    /// </summary>
-    [DataField]
-    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Update;
-
-    /// <summary>
-    /// Delay before the effect starts. If another effect is added with a shorter delay, it takes precedence.
-    /// </summary>
-    [DataField]
-    public TimeSpan Delay;
-}
-
-public enum StatusEffectMetabolismType
-{
-    Update,
-    Add,
-    Remove,
-    Set,
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs
deleted file mode 100644
index 553300be72..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.Drunk;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-/// Applies the drunk status effect to this entity.
-/// The duration of the effect is equal to <see cref="Drunk.BoozePower"/> modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class DrunkEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Drunk>
-{
-    [Dependency] private readonly SharedDrunkSystem _drunk = default!;
-
-    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Drunk> args)
-    {
-        var boozePower = args.Effect.BoozePower * args.Scale;
-
-        _drunk.TryApplyDrunkenness(entity, boozePower);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Drunk : EntityEffectBase<Drunk>
-{
-    /// <summary>
-    ///     BoozePower is how long each metabolism cycle will make the drunk effect last for.
-    /// </summary>
-    [DataField]
-    public TimeSpan BoozePower = TimeSpan.FromSeconds(3f);
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-drunk", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs
deleted file mode 100644
index b5a208f2c7..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Content.Shared.Electrocution;
-using Content.Shared.StatusEffect;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-// TODO: When Electrocution is moved to new Status, make this use StatusEffectsContainerComponent.
-/// <summary>
-/// Electrocutes this entity for a given amount of damage and time.
-/// The shock damage applied by this effect is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ElectrocuteEntityEffectSystem : EntityEffectSystem<StatusEffectsComponent, Electrocute>
-{
-    [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!;
-
-    // TODO: When electrocution is new status, change this to new status
-    protected override void Effect(Entity<StatusEffectsComponent> entity, ref EntityEffectEvent<Electrocute> args)
-    {
-        var effect = args.Effect;
-
-        _electrocution.TryDoElectrocution(entity, null, (int)(args.Scale * effect.ShockDamage), effect.ElectrocuteTime, effect.Refresh, ignoreInsulation: effect.BypassInsulation);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Electrocute : EntityEffectBase<Electrocute>
-{
-    /// <summary>
-    /// Time we electrocute this entity
-    /// </summary>
-    [DataField] public TimeSpan ElectrocuteTime = TimeSpan.FromSeconds(2);
-
-    /// <summary>
-    /// Shock damage we apply to the entity.
-    /// </summary>
-    [DataField] public int ShockDamage = 5;
-
-    /// <summary>
-    /// Do we refresh the duration? Or add more duration if it already exists.
-    /// </summary>
-    [DataField] public bool Refresh = true;
-
-    /// <summary>
-    /// Should we by bypassing insulation?
-    /// </summary>
-    [DataField] public bool BypassInsulation = true;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime.TotalSeconds));
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
new file mode 100644
index 0000000000..652c1b90a1
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
@@ -0,0 +1,76 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+///     Adds a generic status effect to the entity,
+///     not worrying about things like how to affect the time it lasts for
+///     or component fields or anything. Just adds a component to an entity
+///     for a given time. Easy.
+/// </summary>
+/// <remarks>
+///     Can be used for things like adding accents or something. I don't know. Go wild.
+/// </remarks>
+[Obsolete("Use ModifyStatusEffect with StatusEffectNewSystem instead")]
+public sealed partial class GenericStatusEffect : EntityEffect
+{
+    [DataField(required: true)]
+    public string Key = default!;
+
+    [DataField]
+    public string Component = String.Empty;
+
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <remarks>
+    ///     true - refresh status effect time,  false - accumulate status effect time
+    /// </remarks>
+    [DataField]
+    public bool Refresh = true;
+
+    /// <summary>
+    ///     Should this effect add the status effect, remove time from it, or set its cooldown?
+    /// </summary>
+    [DataField]
+    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
+
+        var time = Time;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            time *= reagentArgs.Scale.Float();
+
+        if (Type == StatusEffectMetabolismType.Add && Component != String.Empty)
+        {
+            statusSys.TryAddStatusEffect(args.TargetEntity, Key, TimeSpan.FromSeconds(time), Refresh, Component);
+        }
+        else if (Type == StatusEffectMetabolismType.Remove)
+        {
+            statusSys.TryRemoveTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
+        }
+        else if (Type == StatusEffectMetabolismType.Set)
+        {
+            statusSys.TrySetTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
+        "reagent-effect-guidebook-status-effect",
+        ("chance", Probability),
+        ("type", Type),
+        ("time", Time),
+        ("key", $"reagent-effect-status-effect-{Key}"));
+}
+
+public enum StatusEffectMetabolismType
+{
+    Update,
+    Add,
+    Remove,
+    Set
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs
deleted file mode 100644
index 2d870a433c..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Content.Shared.StatusEffect;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-/// Applies a Generic Status Effect to this entity, which is a timed Component.
-/// The amount of time the Component is applied is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-[Obsolete("Use ModifyStatusEffect instead")]
-public sealed partial class GenericStatusEffectEntityEffectSystem : EntityEffectSystem<MetaDataComponent, GenericStatusEffect>
-{
-    [Dependency] private readonly StatusEffectsSystem _status = default!;
-
-    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<GenericStatusEffect> args)
-    {
-        var time = args.Effect.Time * args.Scale;
-
-        switch (args.Effect.Type)
-        {
-            case StatusEffectMetabolismType.Update:
-                if (args.Effect.Component != String.Empty)
-                    _status.TryAddStatusEffect(entity, args.Effect.Key, time, true, args.Effect.Component);
-                break;
-            case StatusEffectMetabolismType.Add:
-                if (args.Effect.Component != String.Empty)
-                    _status.TryAddStatusEffect(entity, args.Effect.Key, time, false, args.Effect.Component);
-                break;
-            case StatusEffectMetabolismType.Remove:
-                _status.TryRemoveTime(entity, args.Effect.Key, time);
-                break;
-            case StatusEffectMetabolismType.Set:
-                _status.TrySetTime(entity, args.Effect.Key, time);
-                break;
-        }
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class GenericStatusEffect : EntityEffectBase<GenericStatusEffect>
-{
-    [DataField(required: true)]
-    public string Key = default!;
-
-    [DataField]
-    public string Component = String.Empty;
-
-    [DataField]
-    public TimeSpan Time = TimeSpan.FromSeconds(2f);
-
-    /// <summary>
-    ///     Should this effect add the status effect, remove time from it, or set its cooldown?
-    /// </summary>
-    [DataField]
-    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Update;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
-        "entity-effect-guidebook-status-effect-old",
-        ("chance", Probability),
-        ("type", Type),
-        ("time", Time.TotalSeconds),
-        ("key", $"entity-effect-status-effect-{Key}"));
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/Jitter.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/Jitter.cs
new file mode 100644
index 0000000000..891c791b07
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/Jitter.cs
@@ -0,0 +1,41 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Jittering;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+///     Adds the jitter status effect to a mob.
+///     This doesn't use generic status effects because it needs to
+///     take in some parameters that JitterSystem needs.
+/// </summary>
+public sealed partial class Jitter : EntityEffect
+{
+    [DataField]
+    public float Amplitude = 10.0f;
+
+    [DataField]
+    public float Frequency = 4.0f;
+
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <remarks>
+    ///     true - refresh jitter time,  false - accumulate jitter time
+    /// </remarks>
+    [DataField]
+    public bool Refresh = true;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var time = Time;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            time *= reagentArgs.Scale.Float();
+
+        args.EntityManager.EntitySysManager.GetEntitySystem<SharedJitteringSystem>()
+            .DoJitter(args.TargetEntity, TimeSpan.FromSeconds(time), Refresh, Amplitude, Frequency);
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("reagent-effect-guidebook-jittering", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs
deleted file mode 100644
index 3b445da747..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Content.Shared.Jittering;
-using Content.Shared.StatusEffect;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-// TODO: When Jittering is moved to new Status, make this use StatusEffectsContainerComponent.
-/// <summary>
-/// Applies the Jittering Status Effect to this entity.
-/// The amount of time the Jittering is applied is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class JitterEntityEffectSystem : EntityEffectSystem<StatusEffectsComponent, Jitter>
-{
-    [Dependency] private readonly SharedJitteringSystem _jittering = default!;
-
-    protected override void Effect(Entity<StatusEffectsComponent> entity, ref EntityEffectEvent<Jitter> args)
-    {
-        var time = args.Effect.Time * args.Scale;
-
-        _jittering.DoJitter(entity, TimeSpan.FromSeconds(time), args.Effect.Refresh, args.Effect.Amplitude, args.Effect.Frequency);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Jitter : EntityEffectBase<Jitter>
-{
-    [DataField]
-    public float Amplitude = 10.0f;
-
-    [DataField]
-    public float Frequency = 4.0f;
-
-    [DataField]
-    public float Time = 2.0f;
-
-    /// <remarks>
-    ///     true - refresh jitter time,  false - accumulate jitter time
-    /// </remarks>
-    [DataField]
-    public bool Refresh = true;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-jittering", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs
new file mode 100644
index 0000000000..59ca5da0f7
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs
@@ -0,0 +1,99 @@
+using Content.Shared.Stunnable;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Changes the knockdown timer on an entity or causes knockdown.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class ModifyKnockdown : EntityEffect
+{
+    /// <summary>
+    /// Should we only affect those with crawler component? Note if this is false, it will paralyze non-crawler's instead.
+    /// </summary>
+    [DataField]
+    public bool Crawling;
+
+    /// <summary>
+    /// Should we drop items when we fall?
+    /// </summary>
+    [DataField]
+    public bool Drop;
+
+    /// <summary>
+    /// Time for which knockdown should be applied. Behaviour changes according to <see cref="StatusEffectMetabolismType"/>.
+    /// </summary>
+    [DataField]
+    public TimeSpan Time = TimeSpan.FromSeconds(0.5);
+
+    /// <summary>
+    /// Should this effect add the status effect, remove time from it, or set its cooldown?
+    /// </summary>
+    [DataField]
+    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
+
+    /// <summary>
+    /// Should this effect add knockdown?, remove time from it?, or set its cooldown?
+    /// </summary>
+    [DataField]
+    public bool Refresh = true;
+
+    /// <inheritdoc />
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var stunSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedStunSystem>();
+
+        var time = Time;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            time *= reagentArgs.Scale.Float();
+
+        switch (Type)
+        {
+            case StatusEffectMetabolismType.Update:
+                if (Crawling)
+                {
+                    stunSys.TryCrawling(args.TargetEntity, time, drop: Drop);
+                }
+                else
+                {
+                    stunSys.TryKnockdown(args.TargetEntity, time, drop: Drop);
+                }
+                break;
+            case StatusEffectMetabolismType.Add:
+                if (Crawling)
+                {
+                    stunSys.TryCrawling(args.TargetEntity, time, false, drop: Drop);
+                }
+                else
+                {
+                    stunSys.TryKnockdown(args.TargetEntity, time, false, drop: Drop);
+                }
+                break;
+            case StatusEffectMetabolismType.Remove:
+                    stunSys.AddKnockdownTime(args.TargetEntity, -time);
+                break;
+            case StatusEffectMetabolismType.Set:
+                if (Crawling)
+                {
+                    stunSys.TryCrawling(args.TargetEntity, time, drop: Drop);
+                }
+                else
+                {
+                    stunSys.TryKnockdown(args.TargetEntity, time, drop: Drop);
+                }
+                stunSys.SetKnockdownTime(args.TargetEntity, time);
+                break;
+        }
+    }
+
+    /// <inheritdoc />
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString(
+            "reagent-effect-guidebook-knockdown",
+            ("chance", Probability),
+            ("type", Type),
+            ("time", Time.TotalSeconds)
+        );
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs
deleted file mode 100644
index 5e01774ce4..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using Content.Shared.Standing;
-using Content.Shared.Stunnable;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-/// Applies knockdown to this entity.
-/// Duration is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ModifyKnockdownEntityEffectSystem : EntityEffectSystem<StandingStateComponent, ModifyKnockdown>
-{
-    [Dependency] private readonly SharedStunSystem _stun = default!;
-
-    protected override void Effect(Entity<StandingStateComponent> entity, ref EntityEffectEvent<ModifyKnockdown> args)
-    {
-        var time = args.Effect.Time * args.Scale;
-
-        switch (args.Effect.Type)
-        {
-            case StatusEffectMetabolismType.Update:
-                if (args.Effect.Crawling)
-                    _stun.TryCrawling(entity.Owner, time, drop: args.Effect.Drop);
-                else
-                    _stun.TryKnockdown(entity.Owner, time, drop: args.Effect.Drop);
-                break;
-            case StatusEffectMetabolismType.Add:
-                if (args.Effect.Crawling)
-                    _stun.TryCrawling(entity.Owner, time, false, drop: args.Effect.Drop);
-                else
-                    _stun.TryKnockdown(entity.Owner, time, false, drop: args.Effect.Drop);
-                break;
-            case StatusEffectMetabolismType.Remove:
-                _stun.AddKnockdownTime(entity.Owner, - time ?? TimeSpan.Zero);
-                break;
-            case StatusEffectMetabolismType.Set:
-                if (args.Effect.Crawling)
-                    _stun.TryCrawling(entity.Owner, drop: args.Effect.Drop);
-                else
-                    _stun.TryKnockdown(entity.Owner, time, drop: args.Effect.Drop);
-                _stun.SetKnockdownTime(entity.Owner, time ?? TimeSpan.Zero);
-                break;
-        }
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class ModifyKnockdown : BaseStatusEntityEffect<ModifyKnockdown>
-{
-    /// <summary>
-    /// Should we only affect those with crawler component? Note if this is false, it will paralyze non-crawler's instead.
-    /// </summary>
-    [DataField]
-    public bool Crawling;
-
-    /// <summary>
-    /// Should we drop items when we fall?
-    /// </summary>
-    [DataField]
-    public bool Drop;
-
-    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Time == null
-        ? null
-        : Loc.GetString(
-            "entity-effect-guidebook-knockdown",
-            ("chance", Probability),
-            ("type", Type),
-            ("time", Time.Value.TotalSeconds)
-        );
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs
deleted file mode 100644
index 318c8ad30b..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Content.Shared.StatusEffectNew;
-using Content.Shared.StatusEffectNew.Components;
-using Content.Shared.Stunnable;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-/// Applies the paralysis status effect to this entity.
-/// Duration is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ModifyParalysisEntityEffectSystem : EntityEffectSystem<StatusEffectContainerComponent, ModifyParalysis>
-{
-    [Dependency] private readonly StatusEffectsSystem _status = default!;
-    [Dependency] private readonly SharedStunSystem _stun = default!;
-
-    protected override void Effect(Entity<StatusEffectContainerComponent> entity, ref EntityEffectEvent<ModifyParalysis> args)
-    {
-        var time = args.Effect.Time * args.Scale;
-
-        switch (args.Effect.Type)
-        {
-            case StatusEffectMetabolismType.Update:
-                _stun.TryUpdateParalyzeDuration(entity, time);
-                break;
-            case StatusEffectMetabolismType.Add:
-                _stun.TryAddParalyzeDuration(entity, time);
-                break;
-            case StatusEffectMetabolismType.Remove:
-                _status.TryRemoveTime(entity, SharedStunSystem.StunId, time);
-                break;
-            case StatusEffectMetabolismType.Set:
-                _status.TrySetStatusEffectDuration(entity, SharedStunSystem.StunId, time);
-                break;
-        }
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class ModifyParalysis : BaseStatusEntityEffect<ModifyParalysis>
-{
-    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Time == null
-            ? null // Not gonna make a whole new looc for something that shouldn't ever exist.
-            : Loc.GetString(
-            "entity-effect-guidebook-paralyze",
-            ("chance", Probability),
-            ("time", Time.Value.TotalSeconds)
-        );
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
new file mode 100644
index 0000000000..d7bf6482bd
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
@@ -0,0 +1,78 @@
+using Content.Shared.StatusEffectNew;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Changes status effects on entities: Adds, removes or sets time.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class ModifyStatusEffect : EntityEffect
+{
+    [DataField(required: true)]
+    public EntProtoId EffectProto;
+
+    /// <summary>
+    /// Time for which status effect should be applied. Behaviour changes according to <see cref="Refresh" />.
+    /// </summary>
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <summary>
+    /// Delay before the effect starts. If another effect is added with a shorter delay, it takes precedence.
+    /// </summary>
+    [DataField]
+    public float Delay = 0f;
+
+    /// <summary>
+    /// Should this effect add the status effect, remove time from it, or set its cooldown?
+    /// </summary>
+    [DataField]
+    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
+
+    /// <inheritdoc />
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
+
+        var time = Time;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            time *= reagentArgs.Scale.Float();
+
+        var duration = TimeSpan.FromSeconds(time);
+        switch (Type)
+        {
+            case StatusEffectMetabolismType.Update:
+                statusSys.TryUpdateStatusEffectDuration(args.TargetEntity, EffectProto, duration, Delay > 0 ? TimeSpan.FromSeconds(Delay) : null);
+                break;
+            case StatusEffectMetabolismType.Add:
+                statusSys.TryAddStatusEffectDuration(args.TargetEntity, EffectProto, duration, Delay > 0 ? TimeSpan.FromSeconds(Delay) : null);
+                break;
+            case StatusEffectMetabolismType.Remove:
+                statusSys.TryAddTime(args.TargetEntity, EffectProto, -duration);
+                break;
+            case StatusEffectMetabolismType.Set:
+                statusSys.TrySetStatusEffectDuration(args.TargetEntity, EffectProto, duration, TimeSpan.FromSeconds(Delay));
+                break;
+        }
+    }
+
+    /// <inheritdoc />
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Delay > 0
+        ? Loc.GetString(
+            "reagent-effect-guidebook-status-effect-delay",
+            ("chance", Probability),
+            ("type", Type),
+            ("time", Time),
+            ("key", prototype.Index(EffectProto).Name),
+            ("delay", Delay))
+        : Loc.GetString(
+            "reagent-effect-guidebook-status-effect",
+            ("chance", Probability),
+            ("type", Type),
+            ("time", Time),
+            ("key", prototype.Index(EffectProto).Name)
+        );
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs
deleted file mode 100644
index d7e4b634f3..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using Content.Shared.StatusEffectNew;
-using Content.Shared.StatusEffectNew.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-/// Applies a given status effect to this entity.
-/// Duration is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ModifyStatusEffectEntityEffectSystem : EntityEffectSystem<StatusEffectContainerComponent, ModifyStatusEffect>
-{
-    [Dependency] private readonly StatusEffectsSystem _status = default!;
-
-    protected override void Effect(Entity<StatusEffectContainerComponent> entity, ref EntityEffectEvent<ModifyStatusEffect> args)
-    {
-        var time = args.Effect.Time * args.Scale;
-        var delay = args.Effect.Delay;
-
-        switch (args.Effect.Type)
-        {
-            case StatusEffectMetabolismType.Update:
-                _status.TryUpdateStatusEffectDuration(entity, args.Effect.EffectProto, time, delay);
-                break;
-            case StatusEffectMetabolismType.Add:
-                if (time != null)
-                    _status.TryAddStatusEffectDuration(entity, args.Effect.EffectProto, time.Value, delay);
-                else
-                    _status.TryUpdateStatusEffectDuration(entity, args.Effect.EffectProto, time, delay);
-                break;
-            case StatusEffectMetabolismType.Remove:
-                _status.TryRemoveTime(entity, args.Effect.EffectProto, time);
-                break;
-            case StatusEffectMetabolismType.Set:
-                _status.TrySetStatusEffectDuration(entity, args.Effect.EffectProto, time, delay);
-                break;
-        }
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class ModifyStatusEffect : BaseStatusEntityEffect<ModifyStatusEffect>
-{
-    /// <summary>
-    /// Prototype of the status effect we're modifying.
-    /// </summary>
-    [DataField(required: true)]
-    public EntProtoId EffectProto;
-
-    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Time == null
-            ? Loc.GetString(
-                "entity-effect-guidebook-status-effect-indef",
-                ("chance", Probability),
-                ("type", Type),
-                ("key", prototype.Index(EffectProto).Name),
-                ("delay", Delay.TotalSeconds))
-            : Loc.GetString(
-                "entity-effect-guidebook-status-effect",
-                ("chance", Probability),
-                ("type", Type),
-                ("time", Time.Value.TotalSeconds),
-                ("key", prototype.Index(EffectProto).Name),
-                ("delay", Delay.TotalSeconds));
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs
deleted file mode 100644
index ed9923f856..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using Content.Shared.Movement.Components;
-using Content.Shared.Movement.Systems;
-using Content.Shared.StatusEffectNew;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-/// Applies a given movement speed modifier status effect to this entity.
-/// Duration is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class MovementSpeedModifierEntityEffectSystem : EntityEffectSystem<MovementSpeedModifierComponent, MovementSpeedModifier>
-{
-    [Dependency] private readonly StatusEffectsSystem _status = default!;
-    [Dependency] private readonly MovementModStatusSystem _movementModStatus = default!;
-
-    protected override void Effect(Entity<MovementSpeedModifierComponent> entity, ref EntityEffectEvent<MovementSpeedModifier> args)
-    {
-        var proto = args.Effect.EffectProto;
-        var sprintMod = args.Effect.SprintSpeedModifier;
-        var walkMod = args.Effect.WalkSpeedModifier;
-
-        switch (args.Effect.Type)
-        {
-            case StatusEffectMetabolismType.Update:
-                _movementModStatus.TryUpdateMovementSpeedModDuration(
-                    entity,
-                    proto,
-                    args.Effect.Time * args.Scale,
-                    sprintMod,
-                    walkMod);
-                break;
-            case StatusEffectMetabolismType.Add:
-                if (args.Effect.Time != null)
-                {
-                    _movementModStatus.TryAddMovementSpeedModDuration(
-                        entity,
-                        proto,
-                        args.Effect.Time.Value * args.Scale,
-                        sprintMod,
-                        walkMod);
-                }
-                else
-                {
-                    _movementModStatus.TryUpdateMovementSpeedModDuration(
-                        entity,
-                        proto,
-                        args.Effect.Time * args.Scale,
-                        sprintMod,
-                        walkMod);
-                }
-                break;
-            case StatusEffectMetabolismType.Remove:
-                _status.TryRemoveTime(entity, args.Effect.EffectProto, args.Effect.Time * args.Scale);
-                break;
-            case StatusEffectMetabolismType.Set:
-                _status.TrySetStatusEffectDuration(entity, proto, args.Effect.Time * args.Scale);
-                break;
-        }
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class MovementSpeedModifier : BaseStatusEntityEffect<MovementSpeedModifier>
-{
-    /// <summary>
-    /// How much the entities' walk speed is multiplied by.
-    /// </summary>
-    [DataField]
-    public float WalkSpeedModifier = 1f;
-
-    /// <summary>
-    /// How much the entities' run speed is multiplied by.
-    /// </summary>
-    [DataField]
-    public float SprintSpeedModifier = 1f;
-
-    /// <summary>
-    /// Movement speed modifier prototype we're adding. Adding in case we ever want more than one prototype that boosts speed.
-    /// </summary>
-    [DataField]
-    public EntProtoId EffectProto = MovementModStatusSystem.ReagentSpeed;
-
-    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-    Time == null
-        ? null // Not gonna make a whole new looc for something that shouldn't ever exist.
-        : Loc.GetString("entity-effect-guidebook-movespeed-modifier",
-            ("chance", Probability),
-            ("sprintspeed", SprintSpeedModifier),
-            ("time", Time.Value.TotalSeconds));
-}
diff --git a/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs
deleted file mode 100644
index ea7c2dc8d4..0000000000
--- a/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// A brief summary of the effect.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
-public sealed partial class TemplateEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Template>
-{
-    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Template> args)
-    {
-        // Effect goes here.
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Template : EntityEffectBase<Template>
-{
-    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
-}
diff --git a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs
deleted file mode 100644
index c4768dcd11..0000000000
--- a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Content.Shared.Database;
-using Content.Shared.Emp;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Transform;
-
-/// <summary>
-/// Creates an EMP at this entity's coordinates.
-/// Range is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class EmpEntityEffectSystem : EntityEffectSystem<TransformComponent, Emp>
-{
-    [Dependency] private readonly SharedEmpSystem _emp = default!;
-    [Dependency] private readonly SharedTransformSystem _xform = default!;
-
-    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<Emp> args)
-    {
-        var range = MathF.Min(args.Effect.RangeModifier * args.Scale, args.Effect.MaxRange);
-
-        _emp.EmpPulse(_xform.GetMapCoordinates(entity, xform: entity.Comp), range, args.Effect.EnergyConsumption, args.Effect.Duration);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Emp : EntityEffectBase<Emp>
-{
-    /// <summary>
-    ///     Impulse range per unit of quantity
-    /// </summary>
-    [DataField]
-    public float RangeModifier = 0.5f;
-
-    /// <summary>
-    ///     Maximum impulse range
-    /// </summary>
-    [DataField]
-    public float MaxRange = 10;
-
-    /// <summary>
-    ///     How much energy will be drain from sources
-    /// </summary>
-    [DataField]
-    public float EnergyConsumption = 12500;
-
-    /// <summary>
-    ///     Amount of time entities will be disabled
-    /// </summary>
-    [DataField]
-    public TimeSpan Duration = TimeSpan.FromSeconds(15);
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-emp-reaction-effect", ("chance", Probability));
-
-    public override bool ShouldLog => true;
-
-    public override LogImpact LogImpact => LogImpact.Medium;
-}
diff --git a/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs
deleted file mode 100644
index df788e94d6..0000000000
--- a/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using Content.Shared.Flash;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Transform;
-
-/// <summary>
-/// Creates a Flash at this entity's coordinates.
-/// Range is modified by scale.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class FlashEntityEffectSystem : EntityEffectSystem<TransformComponent, Flash>
-{
-    [Dependency] private readonly SharedFlashSystem _flash = default!;
-    [Dependency] private readonly SharedTransformSystem _xform = default!;
-    [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
-
-    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<Flash> args)
-    {
-        var range = MathF.Min(args.Scale * args.Effect.RangePerUnit, args.Effect.MaxRange);
-
-        _flash.FlashArea(
-            entity,
-            null,
-            range,
-            args.Effect.Duration,
-            slowTo: args.Effect.SlowTo,
-            sound: args.Effect.Sound);
-
-        if (args.Effect.FlashEffectPrototype == null)
-            return;
-
-        var uid = PredictedSpawnAtPosition(args.Effect.FlashEffectPrototype, _xform.GetMoverCoordinates(entity));
-
-        _pointLight.SetRadius(uid, MathF.Max(1.1f, range));
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class Flash : EntityEffectBase<Flash>
-{
-    /// <summary>
-    ///     Flash range per unit of reagent.
-    /// </summary>
-    [DataField]
-    public float RangePerUnit = 0.2f;
-
-    /// <summary>
-    ///     Maximum flash range.
-    /// </summary>
-    [DataField]
-    public float MaxRange = 10f;
-
-    /// <summary>
-    ///     How much to entities are slowed down.
-    /// </summary>
-    [DataField]
-    public float SlowTo = 0.5f;
-
-    /// <summary>
-    ///     The time entities will be flashed.
-    ///     The default is chosen to be better than the hand flash so it is worth using it for grenades etc.
-    /// </summary>
-    [DataField]
-    public TimeSpan Duration = TimeSpan.FromSeconds(4);
-
-    /// <summary>
-    ///     The prototype ID used for the visual effect.
-    /// </summary>
-    [DataField]
-    public EntProtoId? FlashEffectPrototype = "ReactionFlash";
-
-    /// <summary>
-    ///     The sound the flash creates.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Weapons/flash.ogg");
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-flash-reaction-effect", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs
deleted file mode 100644
index 53d9acd2c9..0000000000
--- a/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Content.Shared.Popups;
-using Robust.Shared.Network;
-using Robust.Shared.Random;
-
-namespace Content.Shared.EntityEffects.Effects.Transform;
-
-/// <summary>
-/// Creates a text popup to appear at this entity's coordinates.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class PopupMessageEntityEffectSystem : EntityEffectSystem<TransformComponent, PopupMessage>
-{
-    [Dependency] private readonly INetManager _net = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-
-    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<PopupMessage> args)
-    {
-        // TODO: When we get proper random prediction remove this check.
-        if (_net.IsClient)
-            return;
-
-        var msg = _random.Pick(args.Effect.Messages);
-
-        switch (args.Effect.Type)
-        {
-            case PopupRecipients.Local:
-                _popup.PopupEntity(Loc.GetString(msg, ("entity", entity)), entity, entity, args.Effect.VisualType);
-                break;
-            case PopupRecipients.Pvs:
-                _popup.PopupEntity(Loc.GetString(msg, ("entity", entity)), entity, args.Effect.VisualType);
-                break;
-        }
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class PopupMessage : EntityEffectBase<PopupMessage>
-{
-    /// <summary>
-    /// Array of messages that can popup.
-    /// Only one is chosen when the effect is applied.
-    /// </summary>
-    [DataField(required: true)]
-    public string[] Messages = default!;
-
-    /// <summary>
-    /// Whether to just the entity we're affecting, or everyone around them.
-    /// </summary>
-    [DataField]
-    public PopupRecipients Type = PopupRecipients.Local;
-
-    /// <summary>
-    /// Size of the popup.
-    /// </summary>
-    [DataField]
-    public PopupType VisualType = PopupType.Small;
-}
-
-public enum PopupRecipients
-{
-    Pvs,
-    Local
-}
diff --git a/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs
deleted file mode 100644
index c54912191e..0000000000
--- a/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Washes the cream pie off of this entity face.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
-/// TODO: This can probably be made into a generic "CleanEntityEffect" which multiple components listen to...
-public sealed partial class WashCreamPieEntityEffectSystem : EntityEffectSystem<CreamPiedComponent, WashCreamPie>
-{
-    [Dependency] private readonly SharedCreamPieSystem _creamPie = default!;
-
-    protected override void Effect(Entity<CreamPiedComponent> entity, ref EntityEffectEvent<WashCreamPie> args)
-    {
-        _creamPie.SetCreamPied(entity, entity.Comp, false);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class WashCreamPie : EntityEffectBase<WashCreamPie>
-{
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/WashCreamPieReaction.cs b/Content.Shared/EntityEffects/Effects/WashCreamPieReaction.cs
new file mode 100644
index 0000000000..e6992a3ec8
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/WashCreamPieReaction.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+public sealed partial class WashCreamPieReaction : EntityEffect
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out CreamPiedComponent? creamPied)) return;
+
+        args.EntityManager.System<SharedCreamPieSystem>().SetCreamPied(args.TargetEntity, creamPied, false);
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/WearableReaction.cs b/Content.Shared/EntityEffects/Effects/WearableReaction.cs
new file mode 100644
index 0000000000..08c28f9821
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/WearableReaction.cs
@@ -0,0 +1,47 @@
+using Content.Shared.Inventory;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// A reaction effect that spawns a PrototypeID in the entity's Slot, and attempts to consume the reagent if EntityEffectReagentArgs.
+/// Used to implement the water droplet effect for arachnids.
+/// </summary>
+public sealed partial class WearableReaction : EntityEffect
+{
+    /// <summary>
+    /// Minimum quantity of reagent required to trigger this effect.
+    /// Only used with EntityEffectReagentArgs.
+    /// </summary>
+    [DataField]
+    public float AmountThreshold = 1f;
+
+    /// <summary>
+    /// Slot to spawn the item into.
+    /// </summary>
+    [DataField(required: true)]
+    public string Slot;
+
+    /// <summary>
+    /// Prototype ID of item to spawn.
+    /// </summary>
+    [DataField(required: true)]
+    public string PrototypeID;
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        // SpawnItemInSlot returns false if slot is already occupied
+        if (args.EntityManager.System<InventorySystem>().SpawnItemInSlot(args.TargetEntity, Slot, PrototypeID))
+        {
+            if (args is EntityEffectReagentArgs reagentArgs)
+            {
+                if (reagentArgs.Reagent == null || reagentArgs.Quantity < AmountThreshold)
+                    return;
+                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, AmountThreshold);
+            }
+        }
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs
deleted file mode 100644
index ea0e6f0e34..0000000000
--- a/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using Content.Shared.Mobs.Components;
-using Content.Shared.Zombies;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Causes the zombie infection on this entity.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
-public sealed partial class CauseZombieInfectionEntityEffectsSystem : EntityEffectSystem<MobStateComponent, CauseZombieInfection>
-{
-    // MobState because you have to die to become a zombie...
-    protected override void Effect(Entity<MobStateComponent> entity, ref EntityEffectEvent<CauseZombieInfection> args)
-    {
-        if (HasComp<ZombieImmuneComponent>(entity) || HasComp<IncurableZombieComponent>(entity))
-            return;
-
-        EnsureComp<ZombifyOnDeathComponent>(entity);
-        EnsureComp<PendingZombieComponent>(entity);
-    }
-}
-
-/// <summary>
-/// Cures the Zombie infection on this entity and optionally inoculates them against future infection.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
-public sealed partial class CureZombieInfectionEntityEffectsSystem : EntityEffectSystem<MobStateComponent, CureZombieInfection>
-{
-    // MobState because you have to die to become a zombie...
-    protected override void Effect(Entity<MobStateComponent> entity, ref EntityEffectEvent<CureZombieInfection> args)
-    {
-        if (HasComp<IncurableZombieComponent>(entity))
-            return;
-
-        RemComp<ZombifyOnDeathComponent>(entity);
-        RemComp<PendingZombieComponent>(entity);
-
-        if (args.Effect.Innoculate)
-            EnsureComp<ZombieImmuneComponent>(entity);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class CauseZombieInfection : EntityEffectBase<CauseZombieInfection>
-{
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("entity-effect-guidebook-cause-zombie-infection", ("chance", Probability));
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class CureZombieInfection : EntityEffectBase<CureZombieInfection>
-{
-    /// <summary>
-    /// Do we also protect against future infections?
-    /// </summary>
-    [DataField]
-    public bool Innoculate;
-
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        if (Innoculate)
-            return Loc.GetString("entity-effect-guidebook-innoculate-zombie-infection", ("chance", Probability));
-
-        return Loc.GetString("entity-effect-guidebook-cure-zombie-infection", ("chance", Probability));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EntityEffect.cs b/Content.Shared/EntityEffects/EntityEffect.cs
new file mode 100644
index 0000000000..998759006f
--- /dev/null
+++ b/Content.Shared/EntityEffects/EntityEffect.cs
@@ -0,0 +1,145 @@
+using System.Linq;
+using System.Text.Json.Serialization;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Content.Shared.Localizations;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Toolshed.TypeParsers;
+
+namespace Content.Shared.EntityEffects;
+
+/// <summary>
+///     Entity effects describe behavior that occurs on different kinds of triggers, e.g. when a reagent is ingested and metabolized by some
+///     organ. They only trigger when all of <see cref="Conditions"/> are satisfied.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+[MeansImplicitUse]
+public abstract partial class EntityEffect
+{
+    private protected string _id => this.GetType().Name;
+    /// <summary>
+    ///     The list of conditions required for the effect to activate. Not required.
+    /// </summary>
+    [DataField("conditions")]
+    public EntityEffectCondition[]? Conditions;
+
+    public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description";
+
+    protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys);
+
+    /// <summary>
+    ///     What's the chance, from 0 to 1, that this effect will occur?
+    /// </summary>
+    [DataField("probability")]
+    public float Probability = 1.0f;
+
+    public virtual LogImpact LogImpact { get; private set; } = LogImpact.Low;
+
+    /// <summary>
+    ///     Should this entity effect log at all?
+    /// </summary>
+    public virtual bool ShouldLog { get; private set; } = false;
+
+    public abstract void Effect(EntityEffectBaseArgs args);
+
+    /// <summary>
+    /// Produces a localized, bbcode'd guidebook description for this effect.
+    /// </summary>
+    /// <returns></returns>
+    public string? GuidebookEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var effect = ReagentEffectGuidebookText(prototype, entSys);
+        if (effect is null)
+            return null;
+
+        return Loc.GetString(ReagentEffectFormat, ("effect", effect), ("chance", Probability),
+            ("conditionCount", Conditions?.Length ?? 0),
+            ("conditions",
+                ContentLocalizationManager.FormatList(Conditions?.Select(x => x.GuidebookExplanation(prototype)).ToList() ??
+                                                        new List<string>())));
+    }
+}
+
+public static class EntityEffectExt
+{
+    public static bool ShouldApply(this EntityEffect effect, EntityEffectBaseArgs args,
+        IRobustRandom? random = null)
+    {
+        if (random == null)
+            random = IoCManager.Resolve<IRobustRandom>();
+
+        if (effect.Probability < 1.0f && !random.Prob(effect.Probability))
+            return false;
+
+        if (effect.Conditions != null)
+        {
+            foreach (var cond in effect.Conditions)
+            {
+                if (!cond.Condition(args))
+                    return false;
+            }
+        }
+
+        return true;
+    }
+}
+
+[ByRefEvent]
+public struct ExecuteEntityEffectEvent<T> where T : EntityEffect
+{
+    public T Effect;
+    public EntityEffectBaseArgs Args;
+
+    public ExecuteEntityEffectEvent(T effect, EntityEffectBaseArgs args)
+    {
+        Effect = effect;
+        Args = args;
+    }
+}
+
+/// <summary>
+///     EntityEffectBaseArgs only contains the target of an effect.
+///     If a trigger wants to include more info (e.g. the quantity of the chemical triggering the effect), it can be extended (see EntityEffectReagentArgs).
+/// </summary>
+public record class EntityEffectBaseArgs
+{
+    public EntityUid TargetEntity;
+
+    public IEntityManager EntityManager = default!;
+
+    public EntityEffectBaseArgs(EntityUid targetEntity, IEntityManager entityManager)
+    {
+        TargetEntity = targetEntity;
+        EntityManager = entityManager;
+    }
+}
+
+public record class EntityEffectReagentArgs : EntityEffectBaseArgs
+{
+    public EntityUid? OrganEntity;
+
+    public Solution? Source;
+
+    public FixedPoint2 Quantity;
+
+    public ReagentPrototype? Reagent;
+
+    public ReactionMethod? Method;
+
+    public FixedPoint2 Scale;
+
+    public EntityEffectReagentArgs(EntityUid targetEntity, IEntityManager entityManager, EntityUid? organEntity, Solution? source, FixedPoint2 quantity, ReagentPrototype? reagent, ReactionMethod? method, FixedPoint2 scale) : base(targetEntity, entityManager)
+    {
+        OrganEntity = organEntity;
+        Source = source;
+        Quantity = quantity;
+        Reagent = reagent;
+        Method = method;
+        Scale = scale;
+    }
+}
diff --git a/Content.Shared/EntityEffects/EntityEffectCondition.cs b/Content.Shared/EntityEffects/EntityEffectCondition.cs
new file mode 100644
index 0000000000..4c27b1e6ed
--- /dev/null
+++ b/Content.Shared/EntityEffects/EntityEffectCondition.cs
@@ -0,0 +1,29 @@
+using System.Text.Json.Serialization;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects;
+
+[ImplicitDataDefinitionForInheritors]
+[MeansImplicitUse]
+public abstract partial class EntityEffectCondition
+{
+    [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
+
+    public abstract bool Condition(EntityEffectBaseArgs args);
+
+    /// <summary>
+    /// Effect explanations are of the form "[chance to] [action] when [condition] and [condition]"
+    /// </summary>
+    /// <param name="prototype"></param>
+    /// <returns></returns>
+    public abstract string GuidebookExplanation(IPrototypeManager prototype);
+}
+
+[ByRefEvent]
+public struct CheckEntityEffectConditionEvent<T> where T : EntityEffectCondition
+{
+    public T Condition;
+    public EntityEffectBaseArgs Args;
+    public bool Result;
+}
diff --git a/Content.Shared/EntityEffects/EventEntityEffect.cs b/Content.Shared/EntityEffects/EventEntityEffect.cs
new file mode 100644
index 0000000000..22cd035867
--- /dev/null
+++ b/Content.Shared/EntityEffects/EventEntityEffect.cs
@@ -0,0 +1,12 @@
+namespace Content.Shared.EntityEffects;
+
+public abstract partial class EventEntityEffect<T> : EntityEffect where T : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (this is not T type)
+            return;
+        var ev = new ExecuteEntityEffectEvent<T>(type, args);
+        args.EntityManager.EventBus.RaiseEvent(EventSource.Local, ref ev);
+    }
+}
diff --git a/Content.Shared/EntityEffects/EventEntityEffectCondition.cs b/Content.Shared/EntityEffects/EventEntityEffectCondition.cs
new file mode 100644
index 0000000000..f36b1771b2
--- /dev/null
+++ b/Content.Shared/EntityEffects/EventEntityEffectCondition.cs
@@ -0,0 +1,14 @@
+namespace Content.Shared.EntityEffects;
+
+public abstract partial class EventEntityEffectCondition<T> : EntityEffectCondition where T : EventEntityEffectCondition<T>
+{
+    public override bool Condition(EntityEffectBaseArgs args)
+    {
+        if (this is not T type)
+            return false;
+
+        var evt = new CheckEntityEffectConditionEvent<T> { Condition = type, Args = args };
+        args.EntityManager.EventBus.RaiseEvent(EventSource.Local, ref evt);
+        return evt.Result;
+    }
+}
diff --git a/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs
deleted file mode 100644
index 6245fc0827..0000000000
--- a/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-using System.Linq;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Reaction;
-using Content.Shared.Database;
-using Content.Shared.EntityConditions;
-using Content.Shared.Localizations;
-using Content.Shared.Random.Helpers;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.EntityEffects;
-
-/// <summary>
-/// This handles entity effects.
-/// Specifically it handles the receiving of events for causing entity effects, and provides
-/// public API for other systems to take advantage of entity effects.
-/// </summary>
-public sealed partial class SharedEntityEffectsSystem : EntitySystem, IEntityEffectRaiser
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
-    [Dependency] private readonly SharedEntityConditionsSystem _condition = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<ReactiveComponent, ReactionEntityEvent>(OnReactive);
-    }
-
-    private void OnReactive(Entity<ReactiveComponent> entity, ref ReactionEntityEvent args)
-    {
-        if (args.Reagent.ReactiveEffects == null || entity.Comp.ReactiveGroups == null)
-            return;
-
-        var scale = args.ReagentQuantity.Quantity.Float();
-
-        foreach (var (key, val) in args.Reagent.ReactiveEffects)
-        {
-            if (!val.Methods.Contains(args.Method))
-                continue;
-
-            if (!entity.Comp.ReactiveGroups.TryGetValue(key, out var group))
-                continue;
-
-            if (!group.Contains(args.Method))
-                continue;
-
-            ApplyEffects(entity, val.Effects, scale);
-        }
-
-        if (entity.Comp.Reactions == null)
-            return;
-
-        foreach (var entry in entity.Comp.Reactions)
-        {
-            if (!entry.Methods.Contains(args.Method))
-                continue;
-
-            if (entry.Reagents == null || entry.Reagents.Contains(args.Reagent.ID))
-                ApplyEffects(entity, entry.Effects, scale);
-        }
-    }
-
-    /// <summary>
-    /// Applies a list of entity effects to a target entity.
-    /// </summary>
-    /// <param name="target">Entity being targeted by the effects</param>
-    /// <param name="effects">Effects we're applying to the entity</param>
-    /// <param name="scale">Optional scale multiplier for the effects</param>
-    public void ApplyEffects(EntityUid target, EntityEffect[] effects, float scale = 1f)
-    {
-        // do all effects, if conditions apply
-        foreach (var effect in effects)
-        {
-            TryApplyEffect(target, effect, scale);
-        }
-    }
-
-    /// <summary>
-    /// Applies an entity effect to a target if all conditions pass.
-    /// </summary>
-    /// <param name="target">Target we're applying an effect to</param>
-    /// <param name="effect">Effect we're applying</param>
-    /// <param name="scale">Optional scale multiplier for the effect. Not all </param>
-    /// <returns>True if all conditions pass!</returns>
-    public bool TryApplyEffect(EntityUid target, EntityEffect effect, float scale = 1f)
-    {
-        if (scale < effect.MinScale)
-            return false;
-
-        // TODO: Replace with proper random prediciton when it exists.
-        if (effect.Probability <= 1f)
-        {
-            var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(target).Id, 0 });
-            var rand = new System.Random(seed);
-            if (!rand.Prob(effect.Probability))
-                return false;
-        }
-
-        // See if conditions apply
-        if (!_condition.TryConditions(target, effect.Conditions))
-            return false;
-
-        ApplyEffect(target, effect, scale);
-        return true;
-    }
-
-    /// <summary>
-    /// Applies an <see cref="EntityEffect"/> to a given target.
-    /// This doesn't check conditions so you should only call this if you know what you're doing!
-    /// </summary>
-    /// <param name="target">Target we're applying an effect to</param>
-    /// <param name="effect">Effect we're applying</param>
-    /// <param name="scale">Optional scale multiplier for the effect. Not all </param>
-    public void ApplyEffect(EntityUid target, EntityEffect effect, float scale = 1f)
-    {
-        // Clamp the scale if the effect doesn't allow scaling.
-        if (!effect.Scaling)
-            scale = Math.Min(scale, 1f);
-
-        if (effect.ShouldLog)
-        {
-            _adminLog.Add(
-                LogType.EntityEffect,
-                effect.LogImpact,
-                $"Entity effect {effect.GetType().Name:effect}"
-                + $" applied on entity {target:entity}"
-                + $" at {Transform(target).Coordinates:coordinates}"
-                + $" with a scale multiplier of {scale}"
-            );
-        }
-
-        effect.RaiseEvent(target, this, scale);
-    }
-
-    /// <summary>
-    /// Raises an effect to an entity. You should not be calling this unless you know what you're doing.
-    /// </summary>
-    public void RaiseEffectEvent<T>(EntityUid target, T effect, float scale) where T : EntityEffectBase<T>
-    {
-        var effectEv = new EntityEffectEvent<T>(effect, scale);
-        RaiseLocalEvent(target, ref effectEv);
-    }
-}
-
-/// <summary>
-/// This is a basic abstract entity effect containing all the data an entity effect needs to affect entities with effects...
-/// </summary>
-/// <typeparam name="T">The Component that is required for the effect</typeparam>
-/// <typeparam name="TEffect">The Entity Effect itself</typeparam>
-public abstract partial class EntityEffectSystem<T, TEffect> : EntitySystem where T : Component where TEffect : EntityEffectBase<TEffect>
-{
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<T, EntityEffectEvent<TEffect>>(Effect);
-    }
-
-    protected abstract void Effect(Entity<T> entity, ref EntityEffectEvent<TEffect> args);
-}
-
-/// <summary>
-/// Used to raise an EntityEffect without losing the type of effect.
-/// </summary>
-public interface IEntityEffectRaiser
-{
-    void RaiseEffectEvent<T>(EntityUid target, T effect, float scale) where T : EntityEffectBase<T>;
-}
-
-/// <summary>
-/// Used to store an <see cref="EntityEffect"/> so it can be raised without losing the type of the condition.
-/// </summary>
-/// <typeparam name="T">The Condition wer are raising.</typeparam>
-public abstract partial class EntityEffectBase<T> : EntityEffect where T : EntityEffectBase<T>
-{
-    public override void RaiseEvent(EntityUid target, IEntityEffectRaiser raiser, float scale)
-    {
-        if (this is not T type)
-            return;
-
-        raiser.RaiseEffectEvent(target, type, scale);
-    }
-}
-
-/// <summary>
-/// A basic instantaneous effect which can be applied to an entity via events.
-/// </summary>
-[ImplicitDataDefinitionForInheritors]
-public abstract partial class EntityEffect
-{
-    public abstract void RaiseEvent(EntityUid target, IEntityEffectRaiser raiser, float scale);
-
-    [DataField]
-    public EntityCondition[]? Conditions;
-
-    /// <summary>
-    /// If our scale is less than this value, the effect fails.
-    /// </summary>
-    [DataField]
-    public virtual float MinScale { get; private set; }
-
-    /// <summary>
-    /// If true, then it allows the scale multiplier to go above 1.
-    /// </summary>
-    [DataField]
-    public virtual bool Scaling { get; private set; }
-
-    // TODO: This should be an entity condition but guidebook relies on it heavily for formatting...
-    /// <summary>
-    /// Probability of the effect occuring.
-    /// </summary>
-    [DataField]
-    public float Probability = 1.0f;
-
-    /// <summary>
-    /// The description of this entity effect that shows in guidebooks.
-    /// </summary>
-    public virtual string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
-
-    /// <summary>
-    /// Whether this effect should be logged in admin logs.
-    /// </summary>
-    [ViewVariables]
-    public virtual bool ShouldLog => true;
-
-    /// <summary>
-    /// If this effect is logged, how important is the log?
-    /// </summary>
-    [ViewVariables]
-    public virtual LogImpact LogImpact => LogImpact.Low;
-}
-
-/// <summary>
-/// An Event carrying an entity effect.
-/// </summary>
-/// <param name="Effect">The Effect</param>
-/// <param name="Scale">A strength scalar for the effect, defaults to 1 and typically only goes under for incomplete reactions.</param>
-[ByRefEvent, Access(typeof(SharedEntityEffectsSystem))]
-public readonly record struct EntityEffectEvent<T>(T Effect, float Scale) where T : EntityEffectBase<T>
-{
-    /// <summary>
-    /// The Condition being raised in this event
-    /// </summary>
-    public readonly T Effect = Effect;
-
-    /// <summary>
-    /// The Scale modifier of this Effect.
-    /// </summary>
-    public readonly float Scale = Scale;
-}
diff --git a/Content.Shared/Flash/Components/FlashImmunityComponent.cs b/Content.Shared/Flash/Components/FlashImmunityComponent.cs
index 8015f31e70..149c27c517 100644
--- a/Content.Shared/Flash/Components/FlashImmunityComponent.cs
+++ b/Content.Shared/Flash/Components/FlashImmunityComponent.cs
@@ -15,10 +15,4 @@ public sealed partial class FlashImmunityComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool Enabled = true;
-
-    /// <summary>
-    /// Should the flash protection be shown when examining the entity?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool ShowInExamine = true;
 }
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index a762a94e58..02513aa91b 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -268,7 +268,6 @@ public abstract class SharedFlashSystem : EntitySystem
 
     private void OnExamine(Entity<FlashImmunityComponent> ent, ref ExaminedEvent args)
     {
-        if (ent.Comp.ShowInExamine)
-            args.PushMarkup(Loc.GetString("flash-protection"));
+        args.PushMarkup(Loc.GetString("flash-protection"));
     }
 }
diff --git a/Content.Shared/Movement/Systems/MovementModStatusSystem.cs b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
index a56ff9e683..99ac22e330 100644
--- a/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
+++ b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
@@ -19,7 +19,6 @@ namespace Content.Shared.Movement.Systems;
 /// </remarks>
 public sealed class MovementModStatusSystem : EntitySystem
 {
-    public static readonly EntProtoId ReagentSpeed = "ReagentSpeedStatusEffect";
     public static readonly EntProtoId VomitingSlowdown = "VomitingSlowdownStatusEffect";
     public static readonly EntProtoId TaserSlowdown = "TaserSlowdownStatusEffect";
     public static readonly EntProtoId FlashSlowdown = "FlashSlowdownStatusEffect";
diff --git a/Content.Shared/Ninja/Components/BombingTargetComponent.cs b/Content.Shared/Ninja/Components/BombingTargetComponent.cs
new file mode 100644
index 0000000000..c429eb6880
--- /dev/null
+++ b/Content.Shared/Ninja/Components/BombingTargetComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.Ninja.Components;
+
+/// <summary>
+/// Makes this warp point a valid bombing target for ninja's spider charge.
+/// </summary>
+[RegisterComponent]
+public sealed partial class BombingTargetComponent : Component;
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
index 086349454c..990c8105c5 100644
--- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
@@ -1,8 +1,9 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects.Effects.Body;
+using Content.Shared.EntityEffects.Effects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Inventory;
 using Content.Shared.Nutrition.Components;
@@ -227,7 +228,7 @@ public sealed partial class IngestionSystem
                     // ignores any effect conditions, just cares about how much it can hydrate
                     if (effect is SatiateHunger hunger)
                     {
-                        total += hunger.Factor * quantity.Quantity.Float();
+                        total += hunger.NutritionFactor * quantity.Quantity.Float();
                     }
                 }
             }
@@ -278,7 +279,7 @@ public sealed partial class IngestionSystem
                     // ignores any effect conditions, just cares about how much it can hydrate
                     if (effect is SatiateThirst thirst)
                     {
-                        total += thirst.Factor * quantity.Quantity.Float();
+                        total += thirst.HydrationFactor * quantity.Quantity.Float();
                     }
                 }
             }
diff --git a/Content.Shared/PAI/PAIComponent.cs b/Content.Shared/PAI/PAIComponent.cs
index 541172ffe0..fb9d7150e3 100644
--- a/Content.Shared/PAI/PAIComponent.cs
+++ b/Content.Shared/PAI/PAIComponent.cs
@@ -1,4 +1,8 @@
+using Content.Shared.FixedPoint;
+using Content.Shared.Store;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.PAI;
 
@@ -12,7 +16,7 @@ namespace Content.Shared.PAI;
 ///  and there's not always enough players and ghost roles to justify it.
 /// All logic in PAISystem.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class PAIComponent : Component
 {
     /// <summary>
@@ -22,6 +26,12 @@ public sealed partial class PAIComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? LastUser;
 
+    [DataField]
+    public EntProtoId ShopActionId = "ActionPAIOpenShop";
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? ShopAction;
+
     /// <summary>
     /// When microwaved there is this chance to brick the pai, kicking out its player and preventing it from being used again.
     /// </summary>
diff --git a/Content.Shared/PAI/SharedPAISystem.cs b/Content.Shared/PAI/SharedPAISystem.cs
new file mode 100644
index 0000000000..00d3e23cef
--- /dev/null
+++ b/Content.Shared/PAI/SharedPAISystem.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared.PAI;
+
+/// <summary>
+/// pAIs, or Personal AIs, are essentially portable ghost role generators.
+/// In their current implementation, they create a ghost role anyone can access,
+/// and that a player can also "wipe" (reset/kick out player).
+/// Theoretically speaking pAIs are supposed to use a dedicated "offer and select" system,
+///  with the player holding the pAI being able to choose one of the ghosts in the round.
+/// This seems too complicated for an initial implementation, though,
+///  and there's not always enough players and ghost roles to justify it.
+/// </summary>
+public abstract class SharedPAISystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PAIComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<PAIComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnMapInit(Entity<PAIComponent> ent, ref MapInitEvent args)
+    {
+        _actions.AddAction(ent, ent.Comp.ShopActionId);
+    }
+
+    private void OnShutdown(Entity<PAIComponent> ent, ref ComponentShutdown args)
+    {
+        _actions.RemoveAction(ent.Owner, ent.Comp.ShopAction);
+    }
+}
+public sealed partial class PAIShopActionEvent : InstantActionEvent
+{
+}
diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
index 3f1aa2fa80..bb0c9437ff 100644
--- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
+++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
@@ -38,10 +38,7 @@ public sealed partial class ParcelWrappingSystem
     private void OnGetVerbsForWrappedParcel(Entity<WrappedParcelComponent> entity,
         ref GetVerbsEvent<InteractionVerb> args)
     {
-        if (!args.CanAccess || !args.CanComplexInteract)
-            return;
-
-        if (entity.Comp.Contents.Contains(args.User))
+        if (!args.CanAccess)
             return;
 
         // "Capture" the values from `args` because C# doesn't like doing the capturing for `ref` values.
diff --git a/Content.Shared/Physics/JointVisualsComponent.cs b/Content.Shared/Physics/JointVisualsComponent.cs
index 5179c31a86..37a9cdc3b1 100644
--- a/Content.Shared/Physics/JointVisualsComponent.cs
+++ b/Content.Shared/Physics/JointVisualsComponent.cs
@@ -10,30 +10,21 @@ namespace Content.Shared.Physics;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class JointVisualsComponent : Component
 {
-    /// <summary>
-    /// The sprite to use for the line.
-    /// </summary>
-    [DataField(required: true), AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadWrite), DataField("sprite", required: true), AutoNetworkedField]
     public SpriteSpecifier Sprite = default!;
 
-    /// <summary>
-    /// The line is drawn between this target and the entity owning the component.
-    /// </summary>
-    /// <summary>
-    /// TODO: WeakEntityReference.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid? Target;
+    [ViewVariables(VVAccess.ReadWrite), DataField("target"), AutoNetworkedField]
+    public NetEntity? Target;
 
     /// <summary>
     /// Offset from Body A.
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadWrite), DataField("offsetA"), AutoNetworkedField]
     public Vector2 OffsetA;
 
     /// <summary>
     /// Offset from Body B.
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadWrite), DataField("offsetB"), AutoNetworkedField]
     public Vector2 OffsetB;
 }
diff --git a/Content.Shared/Revenant/Components/RevenantComponent.cs b/Content.Shared/Revenant/Components/RevenantComponent.cs
index e434bba1d9..e6543f1906 100644
--- a/Content.Shared/Revenant/Components/RevenantComponent.cs
+++ b/Content.Shared/Revenant/Components/RevenantComponent.cs
@@ -214,4 +214,6 @@ public sealed partial class RevenantComponent : Component
     [DataField("harvestingState")]
     public string HarvestingState = "harvesting";
     #endregion
+
+    [DataField] public EntityUid? Action;
 }
diff --git a/Content.Shared/Revenant/SharedRevenant.cs b/Content.Shared/Revenant/SharedRevenant.cs
index b1023f43e2..c44e4408aa 100644
--- a/Content.Shared/Revenant/SharedRevenant.cs
+++ b/Content.Shared/Revenant/SharedRevenant.cs
@@ -42,6 +42,10 @@ public sealed class HarvestDoAfterCancelled : EntityEventArgs
 {
 }
 
+public sealed partial class RevenantShopActionEvent : InstantActionEvent
+{
+}
+
 public sealed partial class RevenantDefileActionEvent : InstantActionEvent
 {
 }
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 6b58c42428..54e5c1d525 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -17,19 +17,19 @@ namespace Content.Shared.Roles
         [IdDataField]
         public string ID { get; private set; } = default!;
 
-        [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<PlayTimeTrackerPrototype>))]
+        [DataField("playTimeTracker", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<PlayTimeTrackerPrototype>))]
         public string PlayTimeTracker { get; private set; } = string.Empty;
 
         /// <summary>
         ///     Who is the supervisor for this job.
         /// </summary>
-        [DataField]
-        public LocId Supervisors = "job-supervisors-nobody";
+        [DataField("supervisors")]
+        public string Supervisors { get; private set; } = "nobody";
 
         /// <summary>
         ///     The name of this job as displayed to players.
         /// </summary>
-        [DataField]
+        [DataField("name")]
         public string Name { get; private set; } = string.Empty;
 
         [ViewVariables(VVAccess.ReadOnly)]
@@ -38,7 +38,7 @@ namespace Content.Shared.Roles
         /// <summary>
         ///     The name of this job as displayed to players.
         /// </summary>
-        [DataField]
+        [DataField("description")]
         public string? Description { get; private set; }
 
         [ViewVariables(VVAccess.ReadOnly)]
@@ -53,19 +53,19 @@ namespace Content.Shared.Roles
         /// <summary>
         ///     When true - the station will have anouncement about arrival of this player.
         /// </summary>
-        [DataField]
+        [DataField("joinNotifyCrew")]
         public bool JoinNotifyCrew { get; private set; } = false;
 
         /// <summary>
         ///     When true - the player will recieve a message about importancy of their job.
         /// </summary>
-        [DataField]
+        [DataField("requireAdminNotify")]
         public bool RequireAdminNotify { get; private set; } = false;
 
         /// <summary>
         ///     Should this job appear in preferences menu?
         /// </summary>
-        [DataField]
+        [DataField("setPreference")]
         public bool SetPreference { get; private set; } = true;
 
         /// <summary>
@@ -81,14 +81,14 @@ namespace Content.Shared.Roles
         [DataField]
         public bool? OverrideConsoleVisibility { get; private set; } = null;
 
-        [DataField]
+        [DataField("canBeAntag")]
         public bool CanBeAntag { get; private set; } = true;
 
         /// <summary>
         ///     The "weight" or importance of this job. If this number is large, the job system will assign this job
         ///     before assigning other jobs.
         /// </summary>
-        [DataField]
+        [DataField("weight")]
         public int Weight { get; private set; }
 
         /// <summary>
@@ -105,7 +105,7 @@ namespace Content.Shared.Roles
         ///     A numerical score for how much easier this job is for antagonists.
         ///     For traitors, reduces starting TC by this amount. Other gamemodes can use it for whatever they find fitting.
         /// </summary>
-        [DataField]
+        [DataField("antagAdvantage")]
         public int AntagAdvantage = 0;
 
         [DataField]
@@ -116,7 +116,7 @@ namespace Content.Shared.Roles
         /// Starting gear will be ignored.
         /// If you want to just add special attributes to a humanoid, use AddComponentSpecial instead.
         /// </summary>
-        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        [DataField("jobEntity", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? JobEntity = null;
 
         /// <summary>
@@ -129,19 +129,19 @@ namespace Content.Shared.Roles
         [DataField]
         public ProtoId<JobIconPrototype> Icon { get; private set; } = "JobIconUnknown";
 
-        [DataField(serverOnly: true)]
+        [DataField("special", serverOnly: true)]
         public JobSpecial[] Special { get; private set; } = Array.Empty<JobSpecial>();
 
-        [DataField]
+        [DataField("access")]
         public IReadOnlyCollection<ProtoId<AccessLevelPrototype>> Access { get; private set; } = Array.Empty<ProtoId<AccessLevelPrototype>>();
 
-        [DataField]
+        [DataField("accessGroups")]
         public IReadOnlyCollection<ProtoId<AccessGroupPrototype>> AccessGroups { get; private set; } = Array.Empty<ProtoId<AccessGroupPrototype>>();
 
-        [DataField]
+        [DataField("extendedAccess")]
         public IReadOnlyCollection<ProtoId<AccessLevelPrototype>> ExtendedAccess { get; private set; } = Array.Empty<ProtoId<AccessLevelPrototype>>();
 
-        [DataField]
+        [DataField("extendedAccessGroups")]
         public IReadOnlyCollection<ProtoId<AccessGroupPrototype>> ExtendedAccessGroups { get; private set; } = Array.Empty<ProtoId<AccessGroupPrototype>>();
 
         [DataField]
diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
index e85d4d86d8..eeab329661 100644
--- a/Content.Shared/Roles/SharedRoleSystem.cs
+++ b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -23,6 +23,7 @@ public abstract class SharedRoleSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] protected readonly ISharedPlayerManager Player = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly SharedMindSystem _minds = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
@@ -399,7 +400,7 @@ public abstract class SharedRoleSystem : EntitySystem
 
         foreach (var role in delete)
         {
-            PredictedDel(role);
+            _entityManager.DeleteEntity(role);
         }
 
         var update = MindRolesUpdate(mind);
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
index fa6b809016..12a7928c0b 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
@@ -120,24 +120,5 @@ public abstract class SharedBorgSwitchableTypeSystem : EntitySystem
         {
             footstepModifier.FootstepSoundCollection = prototype.FootstepCollection;
         }
-
-        if (prototype.SpriteBodyMovementState is { } movementState)
-        {
-            var spriteMovement = EnsureComp<SpriteMovementComponent>(entity);
-            spriteMovement.NoMovementLayers.Clear();
-            spriteMovement.NoMovementLayers["movement"] = new PrototypeLayerData
-            {
-                State = prototype.SpriteBodyState,
-            };
-            spriteMovement.MovementLayers.Clear();
-            spriteMovement.MovementLayers["movement"] = new PrototypeLayerData
-            {
-                State = movementState,
-            };
-        }
-        else
-        {
-            RemComp<SpriteMovementComponent>(entity);
-        }
     }
 }
diff --git a/Content.Shared/Silicons/Bots/HugBotComponent.cs b/Content.Shared/Silicons/Bots/HugBotComponent.cs
deleted file mode 100644
index 64281b6316..0000000000
--- a/Content.Shared/Silicons/Bots/HugBotComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Content.Shared.Silicons.Bots;
-
-/// <summary>
-/// This component describes how a HugBot hugs.
-/// </summary>
-/// <see cref="SharedHugBotSystem"/>
-[RegisterComponent, AutoGenerateComponentState]
-public sealed partial class HugBotComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public TimeSpan HugCooldown = TimeSpan.FromMinutes(2);
-}
diff --git a/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs b/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs
deleted file mode 100644
index b5dec71f20..0000000000
--- a/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Shared.Emag.Systems;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Silicons.Bots;
-
-/// <summary>
-/// This system handles HugBots.
-/// </summary>
-public abstract class SharedHugBotSystem : EntitySystem
-{
-    [Dependency] private readonly EmagSystem _emag = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<HugBotComponent, GotEmaggedEvent>(OnEmagged);
-    }
-
-    private void OnEmagged(Entity<HugBotComponent> entity, ref GotEmaggedEvent args)
-    {
-        if (!_emag.CompareFlag(args.Type, EmagType.Interaction) ||
-            _emag.CheckFlag(entity, EmagType.Interaction) ||
-            !TryComp<HugBotComponent>(entity, out var hugBot))
-            return;
-
-        // HugBot HTN checks for emag state within its own logic, so we don't need to change anything here.
-
-        args.Handled = true;
-    }
-}
-
-/// <summary>
-/// This event is raised on an entity when it is hugged by a HugBot.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed partial class HugBotHugEvent(NetEntity hugBot) : EntityEventArgs
-{
-    public readonly NetEntity HugBot = hugBot;
-}
diff --git a/Content.Shared/Stacks/StackPrototype.cs b/Content.Shared/Stacks/StackPrototype.cs
index 5b95935ec4..d72380da62 100644
--- a/Content.Shared/Stacks/StackPrototype.cs
+++ b/Content.Shared/Stacks/StackPrototype.cs
@@ -1,25 +1,15 @@
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Stacks;
 
 [Prototype]
-public sealed partial class StackPrototype : IPrototype, IInheritingPrototype
+public sealed partial class StackPrototype : IPrototype
 {
-    ///  <inheritdoc />
+    [ViewVariables]
     [IdDataField]
     public string ID { get; private set; } = default!;
 
-    ///  <inheritdoc />
-    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<StackPrototype>))]
-    public string[]? Parents { get; private set; }
-
-    ///  <inheritdoc />
-    [NeverPushInheritance]
-    [AbstractDataField]
-    public bool Abstract { get; private set; }
-
     /// <summary>
     ///     Human-readable name for this stack type e.g. "Steel"
     /// </summary>
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
index 0d153ecfaa..905ad98c6c 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
@@ -1,9 +1,6 @@
-using System.ComponentModel.Design;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.StatusEffectNew.Components;
 using Robust.Shared.Prototypes;
-using YamlDotNet.Core.Tokens;
 
 namespace Content.Shared.StatusEffectNew;
 
@@ -294,21 +291,6 @@ public sealed partial class StatusEffectsSystem
         return false;
     }
 
-    /// <summary>
-    /// A method which specifically removes time from a status effect, or removes the status effect if time is null.
-    /// </summary>
-    /// <param name="uid">The target entity on which the effect is applied.</param>
-    /// <param name="effectProto">The prototype ID of the status effect to modify.</param>
-    /// <param name="time">
-    /// The time adjustment to apply to the status effect. Positive values extend the duration,
-    /// while negative values reduce it.
-    /// </param>
-    /// <returns> True if duration was edited successfully, false otherwise.</returns>
-    public bool TryRemoveTime(EntityUid uid, EntProtoId effectProto, TimeSpan? time)
-    {
-        return time == null ? TryRemoveStatusEffect(uid, effectProto) : TryAddTime(uid, effectProto, time.Value);
-    }
-
     /// <summary>
     /// Attempts to set the remaining time for a status effect on an entity.
     /// </summary>
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index fcda7eb0ac..e4f0aa8b23 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -587,7 +587,7 @@ public abstract class SharedStorageSystem : EntitySystem
                 }
 
                 _entList.Add(entity);
-                delay += itemSize.Weight;
+                delay += itemSize.Weight * AreaInsertDelayPerItem;
 
                 if (_entList.Count >= StorageComponent.AreaPickupLimit)
                     break;
@@ -596,7 +596,7 @@ public abstract class SharedStorageSystem : EntitySystem
             //If there's only one then let's be generous
             if (_entList.Count >= 1)
             {
-                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay * AreaInsertDelayPerItem, new AreaPickupDoAfterEvent(GetNetEntityList(_entList)), uid, target: uid)
+                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay, new AreaPickupDoAfterEvent(GetNetEntityList(_entList)), uid, target: uid)
                 {
                     BreakOnDamage = true,
                     BreakOnMove = true,
diff --git a/Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs b/Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs
deleted file mode 100644
index dea2c25e6e..0000000000
--- a/Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Content.Shared.Actions;
-
-namespace Content.Shared.Store.Events;
-
-/// <summary>
-/// Opens a store specified by <see cref="StoreComponent"/>
-/// Used for entities with a store built into themselves like Revenant or PAI
-/// </summary>
-public sealed partial class IntrinsicStoreActionEvent : InstantActionEvent
-{
-}
diff --git a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
index ae8f970623..f484bd012e 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
@@ -95,7 +95,7 @@ public abstract partial class SharedStunSystem
 
     private void OnRejuvenate(Entity<KnockedDownComponent> entity, ref RejuvenateEvent args)
     {
-        SetKnockdownNextUpdate(entity, GameTiming.CurTime);
+        SetKnockdownNextUpdate((entity, entity), GameTiming.CurTime);
 
         if (entity.Comp.AutoStand)
             RemComp<KnockedDownComponent>(entity);
@@ -166,7 +166,7 @@ public abstract partial class SharedStunSystem
         if (!Resolve(entity, ref entity.Comp, false))
             return;
 
-        SetKnockdownNextUpdate((entity, entity.Comp), GameTiming.CurTime + time);
+        SetKnockdownNextUpdate(entity, GameTiming.CurTime + time);
     }
 
     /// <summary>
@@ -227,8 +227,11 @@ public abstract partial class SharedStunSystem
     /// </summary>
     /// <param name="entity">Entity whose timer we're updating</param>
     /// <param name="time">The exact time we're setting the next update to.</param>
-    private void SetKnockdownNextUpdate(Entity<KnockedDownComponent> entity, TimeSpan time)
+    private void SetKnockdownNextUpdate(Entity<KnockedDownComponent?> entity, TimeSpan time)
     {
+        if (!Resolve(entity, ref entity.Comp, false))
+            return;
+
         if (GameTiming.CurTime > time)
             time = GameTiming.CurTime;
 
diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index 8bb5949c23..dcf9ee4f60 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -288,12 +288,9 @@ public abstract partial class SharedStunSystem : EntitySystem
         }
     }
 
-    public bool TryAddParalyzeDuration(EntityUid uid, TimeSpan? duration)
+    public bool TryAddParalyzeDuration(EntityUid uid, TimeSpan duration)
     {
-        if (duration == null)
-            return TryUpdateParalyzeDuration(uid, duration);
-
-        if (!_status.TryAddStatusEffectDuration(uid, StunId, duration.Value))
+        if (!_status.TryAddStatusEffectDuration(uid, StunId, duration))
             return false;
 
         // We can't exit knockdown when we're stunned, so this prevents knockdown lasting longer than the stun.
diff --git a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
index 9561c6dfe1..efea2df5af 100644
--- a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
+++ b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
@@ -1,9 +1,7 @@
 using System.Linq;
-using Content.Shared.Atmos;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Temperature.Components;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Temperature.Systems;
@@ -11,7 +9,7 @@ namespace Content.Shared.Temperature.Systems;
 /// <summary>
 /// This handles predicting temperature based speedup.
 /// </summary>
-public abstract class SharedTemperatureSystem : EntitySystem
+public sealed class SharedTemperatureSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
@@ -79,19 +77,4 @@ public abstract class SharedTemperatureSystem : EntitySystem
             Dirty(uid, temp);
         }
     }
-
-    public virtual void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false, TemperatureComponent? temperature = null)
-    {
-
-    }
-
-    public float GetHeatCapacity(EntityUid uid, TemperatureComponent? comp = null, PhysicsComponent? physics = null)
-    {
-        if (!Resolve(uid, ref comp) || !Resolve(uid, ref physics, false) || physics.FixturesMass <= 0)
-        {
-            return Atmospherics.MinimumHeatCapacity;
-        }
-
-        return comp.SpecificHeat * physics.FixturesMass;
-    }
 }
diff --git a/Content.Shared/Trigger/Components/Conditions/MindRoleTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/MindRoleTriggerConditionComponent.cs
deleted file mode 100644
index 32fb4d7d29..0000000000
--- a/Content.Shared/Trigger/Components/Conditions/MindRoleTriggerConditionComponent.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Shared.Whitelist;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Trigger.Components.Conditions;
-
-/// <summary>
-/// Checks if a triggered entity or the user of a trigger has a certain mindrole.
-/// Cancels the trigger otherwise.
-/// </summary>
-/// <remarks>
-/// Mind roles are only networked to their owner! So if you use this on any other entity than yourself it won't be predicted.
-/// </remarks>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class MindRoleTriggerConditionComponent : BaseTriggerConditionComponent
-{
-    /// <summary>
-    /// Whitelist for what mind role components on the owning entity allow this trigger.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityWhitelist? EntityWhitelist;
-
-    /// <summary>
-    /// Whitelist for what mind role components on the User allow this trigger.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityWhitelist? UserWhitelist;
-}
diff --git a/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
index 7ec6188ee3..a2779f79c6 100644
--- a/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
+++ b/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
@@ -4,20 +4,20 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Trigger.Components.Conditions;
 
 /// <summary>
-/// Checks if the user of a trigger satisfies a whitelist and blacklist condition.
+/// Checks if the user of a trigger satisfies a whitelist and blacklist condition for the triggered entity or the one triggering it.
 /// Cancels the trigger otherwise.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class WhitelistTriggerConditionComponent : BaseTriggerConditionComponent
 {
     /// <summary>
-    /// Whitelist for what entities can cause this trigger.
+    /// Whitelist for what entites can cause this trigger.
     /// </summary>
     [DataField, AutoNetworkedField]
     public EntityWhitelist? UserWhitelist;
 
     /// <summary>
-    /// Blacklist for what entities can cause this trigger.
+    /// Blacklist for what entites can cause this trigger.
     /// </summary>
     [DataField, AutoNetworkedField]
     public EntityWhitelist? UserBlacklist;
diff --git a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
index af5a73ffb6..db27bd7f74 100644
--- a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
@@ -58,17 +58,5 @@ public sealed class DnaScrambleOnTriggerSystem : EntitySystem
 
         // Can't use PopupClient or PopupPredicted because the trigger might be unpredicted.
         _popup.PopupEntity(Loc.GetString("scramble-on-trigger-popup"), target.Value, target.Value);
-
-        var ev = new DnaScrambledEvent(target.Value);
-        RaiseLocalEvent(target.Value, ref ev, true);
     }
 }
-
-/// <summary>
-/// Raised after an entity has been DNA Scrambled.
-/// Useful for forks that need to run their own updates here.
-/// </summary>
-/// <param name="flag">The entity that had its DNA scrambled.</param>
-
-[ByRefEvent]
-public record struct DnaScrambledEvent(EntityUid Target);
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
index b039c8e9de..2d0756556a 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
@@ -10,36 +10,31 @@ public sealed partial class TriggerSystem
     private void InitializeCondition()
     {
         SubscribeLocalEvent<WhitelistTriggerConditionComponent, AttemptTriggerEvent>(OnWhitelistTriggerAttempt);
-        SubscribeLocalEvent<UseDelayTriggerConditionComponent, AttemptTriggerEvent>(OnUseDelayTriggerAttempt);
-        SubscribeLocalEvent<ToggleTriggerConditionComponent, AttemptTriggerEvent>(OnToggleTriggerAttempt);
-        SubscribeLocalEvent<RandomChanceTriggerConditionComponent, AttemptTriggerEvent>(OnRandomChanceTriggerAttempt);
-        SubscribeLocalEvent<MindRoleTriggerConditionComponent, AttemptTriggerEvent>(OnMindRoleTriggerAttempt);
 
+        SubscribeLocalEvent<UseDelayTriggerConditionComponent, AttemptTriggerEvent>(OnUseDelayTriggerAttempt);
+
+        SubscribeLocalEvent<ToggleTriggerConditionComponent, AttemptTriggerEvent>(OnToggleTriggerAttempt);
         SubscribeLocalEvent<ToggleTriggerConditionComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleGetAltVerbs);
+
+        SubscribeLocalEvent<RandomChanceTriggerConditionComponent, AttemptTriggerEvent>(OnRandomChanceTriggerAttempt);
     }
 
     private void OnWhitelistTriggerAttempt(Entity<WhitelistTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
     {
-        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
-            return;
-
-        args.Cancelled |= !_whitelist.CheckBoth(args.User, ent.Comp.UserBlacklist, ent.Comp.UserWhitelist);
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
+            args.Cancelled |= !_whitelist.CheckBoth(args.User, ent.Comp.UserBlacklist, ent.Comp.UserWhitelist);
     }
 
     private void OnUseDelayTriggerAttempt(Entity<UseDelayTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
     {
-        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
-            return;
-
-        args.Cancelled |= _useDelay.IsDelayed(ent.Owner, ent.Comp.UseDelayId);
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
+            args.Cancelled |= _useDelay.IsDelayed(ent.Owner, ent.Comp.UseDelayId);
     }
 
     private void OnToggleTriggerAttempt(Entity<ToggleTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
     {
-        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
-            return;
-
-        args.Cancelled |= !ent.Comp.Enabled;
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
+            args.Cancelled |= !ent.Comp.Enabled;
     }
 
     private void OnToggleGetAltVerbs(Entity<ToggleTriggerConditionComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
@@ -67,51 +62,19 @@ public sealed partial class TriggerSystem
     private void OnRandomChanceTriggerAttempt(Entity<RandomChanceTriggerConditionComponent> ent,
         ref AttemptTriggerEvent args)
     {
-        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
-            return;
-
-        // TODO: Replace with RandomPredicted once the engine PR is merged
-        var hash = new List<int>
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
         {
-            (int)_timing.CurTick.Value,
-            GetNetEntity(ent).Id,
-            args.User == null ? 0 : GetNetEntity(args.User.Value).Id,
-        };
-        var seed = SharedRandomExtensions.HashCodeCombine(hash);
-        var rand = new System.Random(seed);
+            // TODO: Replace with RandomPredicted once the engine PR is merged
+            var hash = new List<int>
+            {
+                (int)_timing.CurTick.Value,
+                GetNetEntity(ent).Id,
+                args.User == null ? 0 : GetNetEntity(args.User.Value).Id,
+            };
+            var seed = SharedRandomExtensions.HashCodeCombine(hash);
+            var rand = new System.Random(seed);
 
-        args.Cancelled |= !rand.Prob(ent.Comp.SuccessChance); // When not successful, Cancelled = true
-    }
-    private void OnMindRoleTriggerAttempt(Entity<MindRoleTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
-            return;
-
-        if (ent.Comp.EntityWhitelist != null)
-        {
-            if (!_mind.TryGetMind(ent.Owner, out var entMindId, out var entMindComp))
-            {
-                args.Cancelled = true; // the entity has no mind
-                return;
-            }
-            if (!_role.MindHasRole((entMindId, entMindComp), ent.Comp.EntityWhitelist))
-            {
-                args.Cancelled = true; // the entity does not have the required role
-                return;
-            }
-        }
-
-        if (ent.Comp.UserWhitelist != null)
-        {
-            if (args.User == null || !_mind.TryGetMind(args.User.Value, out var userMindId, out var userMindComp))
-            {
-                args.Cancelled = true; // no user or the user has no mind
-                return;
-            }
-            if (!_role.MindHasRole((userMindId, userMindComp), ent.Comp.UserWhitelist))
-            {
-                args.Cancelled = true; // the user does not have the required role
-            }
+            args.Cancelled |= !rand.Prob(ent.Comp.SuccessChance); // When not successful, Cancelled = true
         }
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.cs b/Content.Shared/Trigger/Systems/TriggerSystem.cs
index a5fb509eed..25f8d51e11 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.cs
@@ -3,9 +3,7 @@ using Content.Shared.Database;
 using Content.Shared.DeviceLinking;
 using Content.Shared.EntityTable;
 using Content.Shared.Item.ItemToggle;
-using Content.Shared.Mind;
 using Content.Shared.Popups;
-using Content.Shared.Roles;
 using Content.Shared.Timing;
 using Content.Shared.Trigger.Components;
 using Content.Shared.Whitelist;
@@ -41,8 +39,6 @@ public sealed partial class TriggerSystem : EntitySystem
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly ItemToggleSystem _itemToggle = default!;
     [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!;
-    [Dependency] private readonly SharedRoleSystem _role = default!;
-    [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly EntityTableSystem _entityTable = default!;
 
     public const string DefaultTriggerKey = "trigger";
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 9bc0b845ae..7d0d7577a4 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -7,7 +7,6 @@ using Content.Shared.Administration.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CombatMode;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
@@ -64,7 +63,6 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
     [Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private   readonly SharedStaminaSystem _stamina = default!;
-    [Dependency] private   readonly DamageExamineSystem _damageExamine = default!;
 
     private const int AttackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);
 
@@ -85,7 +83,6 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         SubscribeLocalEvent<MeleeWeaponComponent, HandSelectedEvent>(OnMeleeSelected);
         SubscribeLocalEvent<MeleeWeaponComponent, ShotAttemptedEvent>(OnMeleeShotAttempted);
         SubscribeLocalEvent<MeleeWeaponComponent, GunShotEvent>(OnMeleeShot);
-        SubscribeLocalEvent<MeleeWeaponComponent, DamageExamineEvent>(OnMeleeExamineDamage);
         SubscribeLocalEvent<BonusMeleeDamageComponent, GetMeleeDamageEvent>(OnGetBonusMeleeDamage);
         SubscribeLocalEvent<BonusMeleeDamageComponent, GetHeavyDamageModifierEvent>(OnGetBonusHeavyDamageModifier);
         SubscribeLocalEvent<BonusMeleeAttackRateComponent, GetMeleeAttackRateEvent>(OnGetBonusMeleeAttackRate);
@@ -98,7 +95,8 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         SubscribeAllEvent<StopAttackEvent>(OnStopAttack);
 
 #if DEBUG
-        SubscribeLocalEvent<MeleeWeaponComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<MeleeWeaponComponent,
+                            MapInitEvent>                   (OnMapInit);
     }
 
     private void OnMapInit(EntityUid uid, MeleeWeaponComponent component, MapInitEvent args)
@@ -126,18 +124,6 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         }
     }
 
-    private void OnMeleeExamineDamage(EntityUid uid, MeleeWeaponComponent component, ref DamageExamineEvent args)
-    {
-        if (component.Hidden)
-            return;
-
-        var damageSpec = GetDamage(uid, args.User, component);
-
-        if (damageSpec.Empty)
-            return;
-
-        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), Loc.GetString("damage-melee"));
-    }
     private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, HandSelectedEvent args)
     {
         var attackRate = GetAttackRate(uid, args.User, component);
diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
index a3c5a322ee..1a0a31d4b1 100644
--- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
@@ -66,7 +66,7 @@ public abstract class SharedGrapplingGunSystem : EntitySystem
             var visuals = EnsureComp<JointVisualsComponent>(shotUid.Value);
             visuals.Sprite = component.RopeSprite;
             visuals.OffsetA = new Vector2(0f, 0.5f);
-            visuals.Target = uid;
+            visuals.Target = GetNetEntity(uid);
             Dirty(shotUid.Value, visuals);
         }
 
diff --git a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
index 0fedf95146..0ba8a5faee 100644
--- a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
@@ -34,12 +34,6 @@ public sealed partial class CartridgeAmmoComponent : AmmoComponent
     [DataField, AutoNetworkedField]
     public bool Spent;
 
-    /// <summary>
-    /// Is this cartridge automatically marked as trash once spent?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool MarkSpentAsTrash = true;
-
     /// <summary>
     /// Caseless ammunition.
     /// </summary>
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
index cb4e42f3cf..ea865fced6 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
@@ -1,12 +1,8 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Events;
 using Content.Shared.Examine;
-using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
@@ -22,7 +18,6 @@ public abstract partial class SharedGunSystem
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, TakeAmmoEvent>(OnBatteryTakeAmmo);
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, GetAmmoCountEvent>(OnBatteryAmmoCount);
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, ExaminedEvent>(OnBatteryExamine);
-        SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
 
         // Projectile
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, ComponentGetState>(OnBatteryGetState);
@@ -30,7 +25,6 @@ public abstract partial class SharedGunSystem
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, TakeAmmoEvent>(OnBatteryTakeAmmo);
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, GetAmmoCountEvent>(OnBatteryAmmoCount);
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, ExaminedEvent>(OnBatteryExamine);
-        SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
     }
 
     private void OnBatteryHandleState(EntityUid uid, BatteryAmmoProviderComponent component, ref ComponentHandleState args)
@@ -59,51 +53,6 @@ public abstract partial class SharedGunSystem
         args.PushMarkup(Loc.GetString("gun-battery-examine", ("color", AmmoExamineColor), ("count", component.Shots)));
     }
 
-    private void OnBatteryDamageExamine<T>(Entity<T> entity, ref DamageExamineEvent args) where T : BatteryAmmoProviderComponent
-    {
-        var damageSpec = GetDamage(entity.Comp);
-
-        if (damageSpec == null)
-            return;
-
-        var damageType = entity.Comp switch
-        {
-            HitscanBatteryAmmoProviderComponent => Loc.GetString("damage-hitscan"),
-            ProjectileBatteryAmmoProviderComponent => Loc.GetString("damage-projectile"),
-            _ => throw new ArgumentOutOfRangeException(),
-        };
-
-        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), damageType);
-    }
-
-    private DamageSpecifier? GetDamage(BatteryAmmoProviderComponent component)
-    {
-        if (component is ProjectileBatteryAmmoProviderComponent battery)
-        {
-            if (ProtoManager.Index<EntityPrototype>(battery.Prototype)
-                .Components
-                .TryGetValue(Factory.GetComponentName<ProjectileComponent>(), out var projectile))
-            {
-                var p = (ProjectileComponent)projectile.Component;
-
-                if (!p.Damage.Empty)
-                {
-                    return p.Damage * Damageable.UniversalProjectileDamageModifier;
-                }
-            }
-
-            return null;
-        }
-
-        if (component is HitscanBatteryAmmoProviderComponent hitscan)
-        {
-            var dmg = ProtoManager.Index<HitscanPrototype>(hitscan.Prototype).Damage;
-            return dmg == null ? dmg : dmg * Damageable.UniversalHitscanDamageModifier;
-        }
-
-        return null;
-    }
-
     private void OnBatteryTakeAmmo(EntityUid uid, BatteryAmmoProviderComponent component, TakeAmmoEvent args)
     {
         var shots = Math.Min(args.Shots, component.Shots);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 952b53acf2..e3fbec0d5d 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -65,8 +65,6 @@ public abstract partial class SharedGunSystem : EntitySystem
     [Dependency] private   readonly UseDelaySystem _useDelay = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
-    private static readonly ProtoId<TagPrototype> TrashTag = "Trash";
-
     private const float InteractNextFire = 0.3f;
     private const double SafetyNextFire = 0.5;
     private const float EjectOffset = 0.4f;
@@ -454,14 +452,6 @@ public abstract partial class SharedGunSystem : EntitySystem
 
         cartridge.Spent = spent;
         Appearance.SetData(uid, AmmoVisuals.Spent, spent);
-
-        if (!cartridge.MarkSpentAsTrash)
-            return;
-
-        if (spent)
-            TagSystem.AddTag(uid, TrashTag);
-        else
-            TagSystem.RemoveTag(uid, TrashTag);
     }
 
     /// <summary>
diff --git a/Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs b/Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs
index 3f59628714..3247e3365a 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs
@@ -17,7 +17,7 @@ public sealed partial class AnalysisConsoleComponent : Component
     /// Can be null if not linked.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public EntityUid? AnalyzerEntity;
+    public NetEntity? AnalyzerEntity;
 
     [DataField]
     public SoundSpecifier? ScanFinishedSound = new SoundPathSpecifier("/Audio/Machines/scan_finish.ogg");
@@ -35,7 +35,7 @@ public sealed partial class AnalysisConsoleComponent : Component
     };
 
     /// <summary>
-    /// The machine linking port for linking the console with the analyzer.
+    /// The machine linking port for the analyzer
     /// </summary>
     [DataField]
     public ProtoId<SourcePortPrototype> LinkingPort = "ArtifactAnalyzerSender";
diff --git a/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs b/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs
index 9581285efb..05d17bb123 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs
@@ -1,6 +1,5 @@
-using Content.Shared.DeviceLinking;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Xenoarchaeology.Equipment.Components;
 
@@ -36,10 +35,4 @@ public sealed partial class ArtifactAnalyzerComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
     public bool ReadyToPrint = false;
-
-    /// <summary>
-    /// The machine linking port for linking the analyzer with the console.
-    /// </summary>
-    [DataField]
-    public ProtoId<SinkPortPrototype> LinkingPort = "ArtifactAnalyzerReceiver";
 }
diff --git a/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactCrusherComponent.cs b/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactCrusherComponent.cs
index 1130d9f305..69a682b660 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactCrusherComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactCrusherComponent.cs
@@ -2,6 +2,7 @@ using Content.Shared.Damage;
 using Content.Shared.Stacks;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
+using Robust.Shared.Audio.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -13,8 +14,7 @@ namespace Content.Shared.Xenoarchaeology.Equipment.Components;
 /// <summary>
 /// This is an entity storage that, when activated, crushes the artifact inside of it and gives artifact fragments.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentState, AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SharedArtifactCrusherSystem))]
 public sealed partial class ArtifactCrusherComponent : Component
 {
@@ -27,21 +27,19 @@ public sealed partial class ArtifactCrusherComponent : Component
     /// <summary>
     /// When the current crushing will end.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoNetworkedField, AutoPausedField]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public TimeSpan CrushEndTime;
 
     /// <summary>
     /// The next second. Used to apply damage over time.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoNetworkedField, AutoPausedField]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public TimeSpan NextSecond;
 
     /// <summary>
     /// The total duration of the crushing.
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public TimeSpan CrushDuration = TimeSpan.FromSeconds(10);
 
     /// <summary>
@@ -53,19 +51,19 @@ public sealed partial class ArtifactCrusherComponent : Component
     /// <summary>
     /// The minimum amount of fragments spawned.
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public int MinFragments = 2;
 
     /// <summary>
     /// The maximum amount of fragments spawned, non-inclusive.
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public int MaxFragments = 5;
 
     /// <summary>
     /// The material for the fragments.
     /// </summary>
-    [DataField]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public ProtoId<StackPrototype> FragmentStackProtoId = "ArtifactFragment";
 
     /// <summary>
@@ -102,12 +100,12 @@ public sealed partial class ArtifactCrusherComponent : Component
     /// Stores entity of <see cref="CrushingSound"/> to allow ending it early.
     /// </summary>
     [DataField]
-    public EntityUid? CrushingSoundEntity;
+    public (EntityUid, AudioComponent)? CrushingSoundEntity;
 
     /// <summary>
     /// When enabled, stops the artifact crusher from being opened when it is being crushed.
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
     public bool AutoLock = false;
 }
 
diff --git a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs
index 086b402bb2..e47e964225 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs
@@ -15,7 +15,6 @@ namespace Content.Shared.Xenoarchaeology.Equipment;
 public abstract class SharedArtifactAnalyzerSystem : EntitySystem
 {
     [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!;
-    [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -24,14 +23,10 @@ public abstract class SharedArtifactAnalyzerSystem : EntitySystem
 
         SubscribeLocalEvent<ArtifactAnalyzerComponent, ItemPlacedEvent>(OnItemPlaced);
         SubscribeLocalEvent<ArtifactAnalyzerComponent, ItemRemovedEvent>(OnItemRemoved);
-        SubscribeLocalEvent<ArtifactAnalyzerComponent, NewLinkEvent>(OnNewLinkAnalyzer);
-        SubscribeLocalEvent<ArtifactAnalyzerComponent, LinkAttemptEvent>(OnLinkAttemptAnalyzer);
-        SubscribeLocalEvent<ArtifactAnalyzerComponent, PortDisconnectedEvent>(OnPortDisconnectedAnalyzer);
+        SubscribeLocalEvent<ArtifactAnalyzerComponent, MapInitEvent>(OnMapInit);
 
-        SubscribeLocalEvent<AnalysisConsoleComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<AnalysisConsoleComponent, NewLinkEvent>(OnNewLinkConsole);
-        SubscribeLocalEvent<AnalysisConsoleComponent, LinkAttemptEvent>(OnLinkAttemptConsole);
-        SubscribeLocalEvent<AnalysisConsoleComponent, PortDisconnectedEvent>(OnPortDisconnectedConsole);
+        SubscribeLocalEvent<AnalysisConsoleComponent, NewLinkEvent>(OnNewLink);
+        SubscribeLocalEvent<AnalysisConsoleComponent, PortDisconnectedEvent>(OnPortDisconnected);
     }
 
     private void OnItemPlaced(Entity<ArtifactAnalyzerComponent> ent, ref ItemPlacedEvent args)
@@ -49,74 +44,52 @@ public abstract class SharedArtifactAnalyzerSystem : EntitySystem
         Dirty(ent);
     }
 
-    private void OnMapInit(Entity<AnalysisConsoleComponent> ent, ref MapInitEvent args)
+    private void OnMapInit(Entity<ArtifactAnalyzerComponent> ent, ref MapInitEvent args)
     {
-        if (!TryComp<DeviceLinkSourceComponent>(ent, out var source))
+        if (!TryComp<DeviceLinkSinkComponent>(ent, out var sink))
             return;
 
-        var linkedEntities = _deviceLink.GetLinkedSinks((ent.Owner, source), ent.Comp.LinkingPort);
-
-        foreach (var sink in linkedEntities)
+        foreach (var source in sink.LinkedSources)
         {
-            if (!TryComp<ArtifactAnalyzerComponent>(sink, out var analyzer))
+            if (!TryComp<AnalysisConsoleComponent>(source, out var analysis))
                 continue;
 
-            ent.Comp.AnalyzerEntity = sink;
-            analyzer.Console = ent.Owner;
+            analysis.AnalyzerEntity = GetNetEntity(ent);
+            ent.Comp.Console = source;
+            Dirty(source, analysis);
             Dirty(ent);
-            Dirty(sink, analyzer);
             break;
         }
     }
 
-    private void OnNewLinkConsole(Entity<AnalysisConsoleComponent> ent, ref NewLinkEvent args)
+    private void OnNewLink(Entity<AnalysisConsoleComponent> ent, ref NewLinkEvent args)
     {
-        if (args.SourcePort != ent.Comp.LinkingPort || !HasComp<ArtifactAnalyzerComponent>(args.Sink))
+        if (!TryComp<ArtifactAnalyzerComponent>(args.Sink, out var analyzer))
             return;
 
-        ent.Comp.AnalyzerEntity = args.Sink;
+        ent.Comp.AnalyzerEntity = GetNetEntity(args.Sink);
+        analyzer.Console = ent;
+        Dirty(args.Sink, analyzer);
         Dirty(ent);
     }
 
-    private void OnNewLinkAnalyzer(Entity<ArtifactAnalyzerComponent> ent, ref NewLinkEvent args)
+    private void OnPortDisconnected(Entity<AnalysisConsoleComponent> ent, ref PortDisconnectedEvent args)
     {
-        if (args.SinkPort != ent.Comp.LinkingPort || !HasComp<AnalysisConsoleComponent>(args.Source))
+        var analyzerNetEntity = ent.Comp.AnalyzerEntity;
+        if (args.Port != ent.Comp.LinkingPort || analyzerNetEntity == null)
             return;
 
-        ent.Comp.Console = args.Source;
-        Dirty(ent);
-    }
-
-    private void OnLinkAttemptConsole(Entity<AnalysisConsoleComponent> ent, ref LinkAttemptEvent args)
-    {
-        if (ent.Comp.AnalyzerEntity != null)
-            args.Cancel(); // can only link to one device at a time
-    }
-
-    private void OnLinkAttemptAnalyzer(Entity<ArtifactAnalyzerComponent> ent, ref LinkAttemptEvent args)
-    {
-        if (ent.Comp.Console != null)
-            args.Cancel(); // can only link to one device at a time
-    }
-
-    private void OnPortDisconnectedConsole(Entity<AnalysisConsoleComponent> ent, ref PortDisconnectedEvent args)
-    {
-        if (args.Port != ent.Comp.LinkingPort || ent.Comp.AnalyzerEntity == null)
-            return;
+        var analyzerEntityUid = GetEntity(analyzerNetEntity);
+        if (TryComp<ArtifactAnalyzerComponent>(analyzerEntityUid, out var analyzer))
+        {
+            analyzer.Console = null;
+            Dirty(analyzerEntityUid.Value, analyzer);
+        }
 
         ent.Comp.AnalyzerEntity = null;
         Dirty(ent);
     }
 
-    private void OnPortDisconnectedAnalyzer(Entity<ArtifactAnalyzerComponent> ent, ref PortDisconnectedEvent args)
-    {
-        if (args.Port != ent.Comp.LinkingPort || ent.Comp.Console == null)
-            return;
-
-        ent.Comp.Console = null;
-        Dirty(ent);
-    }
-
     public bool TryGetAnalyzer(Entity<AnalysisConsoleComponent> ent, [NotNullWhen(true)] out Entity<ArtifactAnalyzerComponent>? analyzer)
     {
         analyzer = null;
@@ -125,13 +98,14 @@ public abstract class SharedArtifactAnalyzerSystem : EntitySystem
         if (!_powerReceiver.IsPowered(consoleEnt))
             return false;
 
-        if (!TryComp<ArtifactAnalyzerComponent>(ent.Comp.AnalyzerEntity, out var analyzerComp))
+        var analyzerUid = GetEntity(ent.Comp.AnalyzerEntity);
+        if (!TryComp<ArtifactAnalyzerComponent>(analyzerUid, out var analyzerComp))
             return false;
 
-        if (!_powerReceiver.IsPowered(ent.Comp.AnalyzerEntity.Value))
+        if (!_powerReceiver.IsPowered(analyzerUid.Value))
             return false;
 
-        analyzer = (ent.Comp.AnalyzerEntity.Value, analyzerComp);
+        analyzer = (analyzerUid.Value, analyzerComp);
         return true;
     }
 
diff --git a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs
index a8c4b9ff06..64f3126297 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs
@@ -1,16 +1,9 @@
-using Content.Shared.Damage;
-using Content.Shared.Emag.Systems;
 using Content.Shared.Examine;
-using Content.Shared.Popups;
-using Content.Shared.Power;
-using Content.Shared.Power.EntitySystems;
 using Content.Shared.Storage.Components;
-using Content.Shared.Verbs;
-using Content.Shared.Xenoarchaeology.Equipment.Components;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Collections;
 using Robust.Shared.Containers;
-using Robust.Shared.Timing;
+using Content.Shared.Emag.Systems;
+using Content.Shared.Xenoarchaeology.Equipment.Components;
 
 namespace Content.Shared.Xenoarchaeology.Equipment;
 
@@ -19,14 +12,10 @@ namespace Content.Shared.Xenoarchaeology.Equipment;
 /// </summary>
 public abstract class SharedArtifactCrusherSystem : EntitySystem
 {
+    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedAudioSystem AudioSystem = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly EmagSystem _emag = default!;
-    [Dependency] private readonly SharedPowerReceiverSystem _power = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -38,8 +27,6 @@ public abstract class SharedArtifactCrusherSystem : EntitySystem
         SubscribeLocalEvent<ArtifactCrusherComponent, StorageOpenAttemptEvent>(OnStorageOpenAttempt);
         SubscribeLocalEvent<ArtifactCrusherComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<ArtifactCrusherComponent, GotEmaggedEvent>(OnEmagged);
-        SubscribeLocalEvent<ArtifactCrusherComponent, GetVerbsEvent<AlternativeVerb>>(OnGetVerbs);
-        SubscribeLocalEvent<ArtifactCrusherComponent, PowerChangedEvent>(OnPowerChanged);
     }
 
     private void OnInit(Entity<ArtifactCrusherComponent> ent, ref ComponentInit args)
@@ -66,7 +53,6 @@ public abstract class SharedArtifactCrusherSystem : EntitySystem
 
         ent.Comp.AutoLock = true;
         args.Handled = true;
-        Dirty(ent);
     }
 
     private void OnStorageOpenAttempt(Entity<ArtifactCrusherComponent> ent, ref StorageOpenAttemptEvent args)
@@ -80,94 +66,22 @@ public abstract class SharedArtifactCrusherSystem : EntitySystem
         args.PushMarkup(ent.Comp.AutoLock ? Loc.GetString("artifact-crusher-examine-autolocks") : Loc.GetString("artifact-crusher-examine-no-autolocks"));
     }
 
-    private void OnGetVerbs(Entity<ArtifactCrusherComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null || ent.Comp.Crushing)
-            return;
-
-        if (!TryComp<EntityStorageComponent>(ent, out var entityStorageComp) ||
-            entityStorageComp.Contents.ContainedEntities.Count == 0)
-            return;
-
-        if (!_power.IsPowered(ent.Owner))
-            return;
-
-        var user = args.User;
-        var verb = new AlternativeVerb
-        {
-            Text = Loc.GetString("artifact-crusher-verb-start-crushing"),
-            Priority = 2,
-            Act = () => StartCrushing((ent, ent.Comp, entityStorageComp), user)
-        };
-        args.Verbs.Add(verb);
-    }
-
-    private void OnPowerChanged(Entity<ArtifactCrusherComponent> ent, ref PowerChangedEvent args)
-    {
-        if (!args.Powered)
-            StopCrushing(ent);
-    }
-
-    public void StartCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent, EntityUid? user = null)
-    {
-        var (uid, crusher, _) = ent;
-
-        if (crusher.Crushing)
-            return;
-
-        if (crusher.AutoLock)
-            _popup.PopupPredicted(Loc.GetString("artifact-crusher-autolocks-enable"), uid, user);
-
-        crusher.Crushing = true;
-        crusher.NextSecond = _timing.CurTime + TimeSpan.FromSeconds(1);
-        crusher.CrushEndTime = _timing.CurTime + crusher.CrushDuration;
-        crusher.CrushingSoundEntity = AudioSystem.PlayPvs(crusher.CrushingSound, ent)?.Entity;
-        _appearance.SetData(ent, ArtifactCrusherVisuals.Crushing, true);
-        Dirty(ent, ent.Comp1);
-    }
-
     public void StopCrushing(Entity<ArtifactCrusherComponent> ent, bool early = true)
     {
-        if (!ent.Comp.Crushing)
+        var (_, crusher) = ent;
+
+        if (!crusher.Crushing)
             return;
 
-        ent.Comp.Crushing = false;
-        _appearance.SetData(ent, ArtifactCrusherVisuals.Crushing, false);
+        crusher.Crushing = false;
+        Appearance.SetData(ent, ArtifactCrusherVisuals.Crushing, false);
 
         if (early)
         {
-            AudioSystem.Stop(ent.Comp.CrushingSoundEntity);
-            ent.Comp.CrushingSoundEntity = null;
+            AudioSystem.Stop(crusher.CrushingSoundEntity?.Item1, crusher.CrushingSoundEntity?.Item2);
+            crusher.CrushingSoundEntity = null;
         }
 
         Dirty(ent, ent.Comp);
     }
-
-    public virtual void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent) { }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<ArtifactCrusherComponent, EntityStorageComponent>();
-        while (query.MoveNext(out var uid, out var crusher, out var storage))
-        {
-            if (!crusher.Crushing)
-                continue;
-
-            if (crusher.NextSecond < _timing.CurTime)
-            {
-                var contents = new ValueList<EntityUid>(storage.Contents.ContainedEntities);
-                foreach (var contained in contents)
-                {
-                    _damageable.TryChangeDamage(contained, crusher.CrushingDamage);
-                }
-                crusher.NextSecond += TimeSpan.FromSeconds(1);
-                Dirty(uid, crusher);
-            }
-
-            if (crusher.CrushEndTime < _timing.CurTime)
-                FinishCrushing((uid, crusher, storage));
-        }
-    }
 }
diff --git a/Content.Tools/test/run.sh b/Content.Tools/test/run.sh
index 876325ba56..7809b4dc92 100755
--- a/Content.Tools/test/run.sh
+++ b/Content.Tools/test/run.sh
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/sh
 cp 0A.yml out.yml
 ../bin/Debug/net5.0/Content.Tools out.yml 0B.yml 0C.yml
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 903930e634..917d2c1f78 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,4 +1,190 @@
 Entries:
+- author: CoconutThunder
+  changes:
+  - message: Fixed lubed items being thrown when looking at the pickup verb.
+    type: Fix
+  - message: Fixed multihanded items showing a popup when looking at the pickup verb.
+    type: Fix
+  - message: Fixed a bug with lubed handcuffs.
+    type: Fix
+  id: 8561
+  time: '2025-05-25T05:10:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38705
+- author: CoconutThunder
+  changes:
+  - message: The Chief Medical Officer should now appear with the correct precedence
+      in the crew manifest.
+    type: Fix
+  id: 8560
+  time: '2025-05-24T05:10:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37774
+- author: TiniestShark
+  changes:
+  - message: Added inhand sprites for the bartender utensils and mugs.
+    type: Add
+  id: 8561
+  time: '2025-05-24T17:32:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37771
+- author: K-Dynamic
+  changes:
+  - message: Shutters and blast doors now appear welded when welded.
+    type: Fix
+  id: 8562
+  time: '2025-05-25T15:57:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37807
+- author: Stop-Signs
+  changes:
+  - message: Meals now better reflect the amount of ingredients put into them.
+    type: Tweak
+  id: 8563
+  time: '2025-05-25T18:02:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34138
+- author: brainfood1183
+  changes:
+  - message: Kangaroos can now be equipped with northstars and knuckle dusters.
+    type: Tweak
+  id: 8564
+  time: '2025-05-25T18:03:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37789
+- author: Moomoobeef
+  changes:
+  - message: Added new variants to dirty tiles.
+    type: Tweak
+  id: 8565
+  time: '2025-05-25T18:11:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37800
+- author: AsnDen
+  changes:
+  - message: Tile-aligned bar sign version was added.
+    type: Add
+  - message: Bar signs now have proper collision.
+    type: Fix
+  id: 8566
+  time: '2025-05-25T18:36:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37756
+- author: Fildrance
+  changes:
+  - message: Spray nozzle now can consume liquids from puddles and put it right into
+      backpacked tank.
+    type: Add
+  id: 8567
+  time: '2025-05-26T03:36:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30600
+- author: Southbridge
+  changes:
+  - message: On Amber, gave security its missing beacon and barriers.
+    type: Fix
+  id: 8568
+  time: '2025-05-26T07:29:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37700
+- author: jessicamaybe
+  changes:
+  - message: NPC Gorillas can now pry open doors and vault/smash tables!
+    type: Tweak
+  id: 8569
+  time: '2025-05-26T10:49:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37822
+- author: ArtisticRoomba
+  changes:
+  - message: The TEG's efficiency in extracting power from gasses has been tweaked
+      to promote dual-loop designs that recycle the waste heat of gasses, and punish
+      "meta" single loop designs.
+    type: Tweak
+  id: 8570
+  time: '2025-05-26T11:53:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37728
+- author: ArtisticRoomba
+  changes:
+  - message: The TEG now outputs smoother power when pressure across the circulators
+      flutter. (This was causing epilepsy in extreme circumstances).
+    type: Fix
+  id: 8571
+  time: '2025-05-26T12:07:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37658
+- author: chromiumboy
+  changes:
+  - message: Sentry turret control panels can now be found adjacent to rooms containing
+      sentry turrets. Authorized personnel can use these panels to remotely monitor
+      and alter the settings of any linked sentry turrets.
+    type: Add
+  id: 8572
+  time: '2025-05-26T13:00:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35235
+- author: metalgearsloth
+  changes:
+  - message: You no longer face items for a single frame when clicking while moving.
+    type: Tweak
+  id: 8573
+  time: '2025-05-27T11:34:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37874
+- author: Simyon
+  changes:
+  - message: Capacitors and Matter bins have been combined into the Manipulator.
+    type: Remove
+  id: 8574
+  time: '2025-05-27T11:47:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37725
+- author: PicklOH
+  changes:
+  - message: Gas Pipes are now named as such in the construction menu.
+    type: Tweak
+  id: 8575
+  time: '2025-05-27T16:26:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37881
+- author: ProfRenderer
+  changes:
+  - message: Cluwne ID cards now have a job icon.
+    type: Tweak
+  id: 8576
+  time: '2025-05-27T16:39:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37834
+- author: Moomoobeef
+  changes:
+  - message: Bookshelves now contain a more reasonable amount of books.
+    type: Tweak
+  id: 8577
+  time: '2025-05-27T21:21:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37866
+- author: SlamBamActionman
+  changes:
+  - message: Seismic Charges now trigger the timer when sent a signal, instead of
+      detonating instantly.
+    type: Tweak
+  - message: Signal Triggers for modular grenades now detonate after a 3 second delay.
+    type: Tweak
+  id: 8578
+  time: '2025-05-28T07:31:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34465
+- author: Minemoder5000
+  changes:
+  - message: Grape juice cups now contain grape juice.
+    type: Fix
+  id: 8579
+  time: '2025-05-28T09:32:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37895
+- author: Moomoobeef
+  changes:
+  - message: Made high-viz vest less visible.
+    type: Tweak
+  id: 8580
+  time: '2025-05-28T09:39:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37869
+- author: deltanedas
+  changes:
+  - message: Diona "Gib yourself!" action now has a suicide warning like microbombs.
+    type: Tweak
+  id: 8581
+  time: '2025-05-28T19:52:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27422
+- author: sowelipililimute
+  changes:
+  - message: Plants can process nutrition again
+    type: Fix
+  - message: Plants can process robust harvest again
+    type: Fix
+  id: 8582
+  time: '2025-05-28T22:51:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37912
 - author: mhamster
   changes:
   - message: Chameleon clothes are now affected by any kind of EMP explosion, which
@@ -3386,14 +3572,6 @@
   id: 9012
   time: '2025-09-27T20:51:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40572
-- author: keronshb
-  changes:
-  - message: 'EXPERIMENTAL: Tasers, a short-ranged gun capable of causing targets
-      to become prone, are now added into Warden, HoS, and Security locker fills.'
-    type: Add
-  id: 9013
-  time: '2025-09-27T21:21:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39087
 - author: SurrealShibe
   changes:
   - message: Vulpkanin now audibly gasp.
@@ -3752,14 +3930,6 @@
   id: 9059
   time: '2025-10-08T23:45:56.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40786
-- author: SlamBamActionman
-  changes:
-  - message: EXPERIMENTAL Nocturine now slows the target down, with a longer duration and shorter
-      delay before activating.
-    type: Tweak
-  id: 9060
-  time: '2025-10-09T13:32:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40797
 - author: Princess-Cheeseballs
   changes:
   - message: Dying while asleep shouldn't permanently blind you anymore.
@@ -3774,183 +3944,3 @@
   id: 9062
   time: '2025-10-09T14:00:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40790
-- author: Princess-Cheeseballs
-  changes:
-  - message: The thieving beacon can now detect the officer's handgun objective.
-    type: Fix
-  id: 9063
-  time: '2025-10-10T04:59:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40811
-- author: Hitlinemoss
-  changes:
-  - message: The Paladin AI lawset has been rewritten.
-    type: Tweak
-  id: 9064
-  time: '2025-10-10T12:41:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40343
-- author: kontakt
-  changes:
-  - message: Ninjas can now have a bombing target at any warp point.
-    type: Tweak
-  id: 9065
-  time: '2025-10-10T21:27:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40726
-- author: frigid-dev
-  changes:
-  - message: Ore Crabs now collide with the player if mob collisions are enabled.
-    type: Tweak
-  - message: Ore Crabs now show they are stunned
-    type: Fix
-  id: 9066
-  time: '2025-10-10T23:31:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40764
-- author: Crude Oil
-  changes:
-  - message: Removed 'Activate Holopad Projector' verb from the station AI core.
-    type: Fix
-  id: 9067
-  time: '2025-10-11T00:03:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39937
-- author: Hitlinemoss
-  changes:
-  - message: Ice now satiates thirst.
-    type: Tweak
-  - message: Ice now evaporates.
-    type: Tweak
-  id: 9068
-  time: '2025-10-11T00:20:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40149
-- author: slarticodefast
-  changes:
-  - message: The artifact analysis console no longer breaks when trying to link it
-      to multiple artifact analyzers or vice versa.
-    type: Fix
-  id: 9069
-  time: '2025-10-11T00:33:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39984
-- author: qwerltaz
-  changes:
-  - message: The ID card computer now has buttons to grant or revoke all access from
-      the target ID card.
-    type: Add
-  id: 9070
-  time: '2025-10-11T00:52:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39375
-- author: Centronias
-  changes:
-  - message: The HugBot, which is similar in purpose and construction to other small
-      robots like the CleanBot.
-    type: Add
-  id: 9071
-  time: '2025-10-11T01:05:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37557
-- author: PicklOH
-  changes:
-  - message: Added more Syndie ammo to the EMAG lathe inventory
-    type: Add
-  id: 9072
-  time: '2025-10-11T05:14:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40822
-- author: TrixxedHeart
-  changes:
-  - message: Updated Xenoarchaeology guidebook page to current system.
-    type: Tweak
-  id: 9073
-  time: '2025-10-11T17:32:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40621
-- author: HTMLSystem
-  changes:
-  - message: Added infectious anom sprites for moths and arachnids.
-    type: Add
-  id: 9074
-  time: '2025-10-11T18:01:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39508
-- author: ScarKy0
-  changes:
-  - message: Mice, cockroaches and other small mobs can no longer unwrap parcels.
-    type: Fix
-  id: 9075
-  time: '2025-10-11T21:32:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40838
-- author: Hitlinemoss
-  changes:
-  - message: Autolathes can now print durathread.
-    type: Add
-  id: 9076
-  time: '2025-10-11T21:46:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40837
-- author: cloudyias
-  changes:
-  - message: Added the ability for droppers to be printed via autolathes and medfabs
-    type: Add
-  id: 9077
-  time: '2025-10-11T23:15:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40074
-- author: jessicamaybe
-  changes:
-  - message: Added swabs and an emag inventory to the biogenerator
-    type: Tweak
-  id: 9078
-  time: '2025-10-12T00:15:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39037
-- author: SuperGDPWYL
-  changes:
-  - message: Added the Syndicate ID Card to the uplink for 1 TC.
-    type: Add
-  id: 9079
-  time: '2025-10-12T00:56:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38381
-- author: aada
-  changes:
-  - message: Cannabis no longer stacks infinitely. Sorry, botanists!
-    type: Fix
-  id: 9080
-  time: '2025-10-12T01:29:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38412
-- author: GovnokradZXC
-  changes:
-  - message: New hair named Pigtail (Over Eye)
-    type: Add
-  id: 9081
-  time: '2025-10-12T05:45:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39850
-- author: Princess-Cheeseballs
-  changes:
-  - message: Meat Kudzu gasps less often.
-    type: Tweak
-  id: 9082
-  time: '2025-10-12T10:47:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39304
-- author: PJB3005
-  changes:
-  - message: The patrons list in the in-game credits works again.
-    type: Fix
-  id: 9083
-  time: '2025-10-12T11:02:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40840
-- author: DrSmugleaf
-  changes:
-  - message: Fixed species not being ordered alphabetically in the character customization
-      UI.
-    type: Fix
-  id: 9084
-  time: '2025-10-12T11:14:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39359
-- author: Callmore
-  changes:
-  - message: Bullet casings can now be picked up again.
-    type: Fix
-  id: 9085
-  time: '2025-10-12T18:45:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40829
-- author: CoconutThunder
-  changes:
-  - message: Fixed lubed items being thrown when looking at the pickup verb.
-    type: Fix
-  - message: Fixed multihanded items showing a popup when looking at the pickup verb.
-    type: Fix
-  - message: Fixed a bug with lubed handcuffs.
-    type: Fix
-  id: 9086
-  time: '2025-05-25T05:10:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38705
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index d7a91135e1..6d59319598 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -764,25 +764,4 @@
   id: 92
   time: '2025-10-08T20:41:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40785
-- author: ToastEnjoyer
-  changes:
-  - message: On Plasma, added more nitrogen canisters to the maintenance hallways
-    type: Add
-  id: 93
-  time: '2025-10-10T01:11:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40794
-- author: opl
-  changes:
-  - message: On Packed, prisoners can now use the Megaseed in brig.
-    type: Fix
-  id: 94
-  time: '2025-10-10T20:33:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40821
-- author: CoconutThunder
-  changes:
-  - message: Reduced frequency of syndicate shark attacks
-    type: Tweak
-  id: 95
-  time: '2025-10-12T18:45:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40855
 Order: 1
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index f97c69933d..ca08fb2939 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, AzzyIsNotHere, azzyisnothere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, Blobadoodle, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, cloudyias, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, david, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mqole, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, PGrayCS, pgraycs, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, Pok27, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, sirwarock, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, thanosdegraf, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
+0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, pgraycs, PGrayCS, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, sirwarock, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
diff --git a/Resources/Credits/Patrons.yml b/Resources/Credits/Patrons.yml
index d736857edc..fe313d4a8e 100644
--- a/Resources/Credits/Patrons.yml
+++ b/Resources/Credits/Patrons.yml
@@ -1,895 +1,1417 @@
-- Name: "'-Y-"
+- Name: Luaan
   Tier: Syndicate Agent
-- Name: "612"
+- Name: Nugmania
   Tier: Revolutionary
-- Name: A Yaj
-  Tier: Revolutionary
-- Name: Aaron Handleman
-  Tier: Revolutionary
-- Name: Abby Eveland
-  Tier: Revolutionary
-- Name: AC Computing
-  Tier: Nuclear Operative
-- Name: Aethan Olsen
-  Tier: Revolutionary
-- Name: Aexxie
-  Tier: Revolutionary
-- Name: Aiden
-  Tier: Revolutionary
-- Name: Akaelik
-  Tier: Nuclear Operative
-- Name: Akira
-  Tier: Revolutionary
-- Name: AlecRazec
-  Tier: Revolutionary
-- Name: Alex Burd
-  Tier: Nuclear Operative
-- Name: Alex Fry
-  Tier: Nuclear Operative
-- Name: Alex Nordlund
+- Name: Xoxeyos
+  Tier: Free
+- Name: CobaltCobra
   Tier: Syndicate Agent
-- Name: Alex Tempest
-  Tier: Revolutionary
-- Name: Alexandre Courtin
-  Tier: Revolutionary
-- Name: AlexDragoon
-  Tier: Revolutionary
-- Name: Alexis
-  Tier: Nuclear Operative
-- Name: Alix Shepard
-  Tier: Nuclear Operative
-- Name: all fields
-  Tier: Syndicate Agent
-- Name: Alpha
-  Tier: Nuclear Operative
-- Name: Altana
-  Tier: Revolutionary
-- Name: AmalgoMyte
-  Tier: Revolutionary
-- Name: Amble
-  Tier: Nuclear Operative
-- Name: Andrew Danke
-  Tier: Syndicate Agent
-- Name: Andrew Montagne
-  Tier: Syndicate Agent
-- Name: Androidonator
-  Tier: Revolutionary
-- Name: anharmlessguest
-  Tier: Syndicate Agent
-- Name: Anthony Chicko
-  Tier: Revolutionary
-- Name: Anthony Fleck
-  Tier: Nuclear Operative
-- Name: Anton
-  Tier: Revolutionary
-- Name: AquaDraco
-  Tier: Revolutionary
-- Name: Arandomartfan
-  Tier: Revolutionary
-- Name: Archie Hicks
-  Tier: Revolutionary
-- Name: Archmonarch
-  Tier: Syndicate Agent
-- Name: Ari.
-  Tier: Revolutionary
-- Name: Arin Pearce
-  Tier: Revolutionary
-- Name: Arrol Gantry
-  Tier: Nuclear Operative
-- Name: arthropods
-  Tier: Revolutionary
-- Name: Arthur Norris
-  Tier: Syndicate Agent
-- Name: Arykh
-  Tier: Nuclear Operative
-- Name: Ashley Parfitt
-  Tier: Revolutionary
-- Name: Asterisk
-  Tier: Syndicate Agent
-- Name: Aussiemandias
-  Tier: Syndicate Agent
-- Name: Austenn
-  Tier: Revolutionary
-- Name: avcde
-  Tier: Nuclear Operative
-- Name: Azmith Blackheart
-  Tier: Revolutionary
-- Name: Bahke
-  Tier: Nuclear Operative
-- Name: Ben Z'
-  Tier: Revolutionary
-- Name: Bex
-  Tier: Revolutionary
-- Name: Blackmare
-  Tier: Syndicate Agent
-- Name: Blight
-  Tier: Syndicate Agent
-- Name: blossom
-  Tier: Revolutionary
-- Name: BlueisDumb
-  Tier: Nuclear Operative
-- Name: Blumbee
-  Tier: Revolutionary
-- Name: Bobberunio
-  Tier: Revolutionary
-- Name: BokChoy
-  Tier: Nuclear Operative
-- Name: Bonefan223
-  Tier: Nuclear Operative
-- Name: Boogerfoot
-  Tier: Nuclear Operative
-- Name: Borna Punda
-  Tier: Revolutionary
-- Name: Brandon
-  Tier: Revolutionary
-- Name: Brandon Roughley
-  Tier: Syndicate Agent
-- Name: brbrbrbrbr brbrbr
-  Tier: Revolutionary
-- Name: BrunBytes
-  Tier: Revolutionary
-- Name: Bruno Bigras
-  Tier: Revolutionary
-- Name: Buldinn Girshovich
-  Tier: Nuclear Operative
-- Name: Bumlocked
-  Tier: Revolutionary
-- Name: Bush Boy
-  Tier: Nuclear Operative
-- Name: Callum Tubrett
-  Tier: Nuclear Operative
-- Name: Carbonhell
-  Tier: Syndicate Agent
-- Name: Catdere
-  Tier: Syndicate Agent
-- Name: Celestrogen
-  Tier: Syndicate Agent
-- Name: Cerzix
-  Tier: Revolutionary
-- Name: Chase Trotter
-  Tier: Nuclear Operative
-- Name: Chem_Inventory
-  Tier: Nuclear Operative
-- Name: Christian Hicks
-  Tier: Syndicate Agent
-- Name: Citizen Battle
-  Tier: Nuclear Operative
-- Name: CloudyClover
-  Tier: Revolutionary
-- Name: Collin R Terrell
-  Tier: Revolutionary
-- Name: Commissar Fox
-  Tier: Syndicate Agent
-- Name: ConcaveGnome
-  Tier: Syndicate Agent
-- Name: Coolsurf6
-  Tier: Revolutionary
-- Name: Cormos Lemming
-  Tier: Nuclear Operative
-- Name: Corpus Inc.
-  Tier: Revolutionary
-- Name: CPM311
-  Tier: Revolutionary
-- Name: CptFalcon
-  Tier: Revolutionary
-- Name: Crazyeyes24
-  Tier: Syndicate Agent
-- Name: CrudeOil
-  Tier: Nuclear Operative
-- Name: Curtis Pearson
-  Tier: Revolutionary
-- Name: Cyberate
-  Tier: Revolutionary
-- Name: Daniel D
-  Tier: Syndicate Agent
-- Name: Daniel Thompson
-  Tier: Revolutionary
-- Name: Daskata
-  Tier: Nuclear Operative
-- Name: Dastion
-  Tier: Revolutionary
-- Name: Dave
-  Tier: Revolutionary
-- Name: David
-  Tier: Revolutionary
-- Name: David N
-  Tier: Syndicate Agent
-- Name: Davyei
-  Tier: Revolutionary
-- Name: Daxx (Justin Winningham)
-  Tier: Syndicate Agent
-- Name: DBF
-  Tier: Syndicate Agent
-- Name: DerBall
-  Tier: Revolutionary
-- Name: Devin Nelson
-  Tier: Revolutionary
-- Name: Dieselmohawk D.
-  Tier: Revolutionary
-- Name: Diklyquill
-  Tier: Revolutionary
-- Name: Dizzy_Eevee
-  Tier: Syndicate Agent
-- Name: Dourbii
-  Tier: Revolutionary
-- Name: Dr.Raccoon
-  Tier: Revolutionary
-- Name: Dr_Med_Izin
-  Tier: Revolutionary
-- Name: Drakkenlupen
-  Tier: Revolutionary
-- Name: DramaBuns
-  Tier: Revolutionary
-- Name: DrIvoPotato
-  Tier: Nuclear Operative
-- Name: DrMelon
-  Tier: Revolutionary
-- Name: dubdubchan
-  Tier: Syndicate Agent
-- Name: DubzyVEVO
-  Tier: Revolutionary
-- Name: Durp
-  Tier: Revolutionary
-- Name: Dusk
-  Tier: Revolutionary
-- Name: Dylan Hull
-  Tier: Revolutionary
-- Name: Dylan Roberts
-  Tier: Syndicate Agent
-- Name: Echinodermata
-  Tier: Revolutionary
-- Name: Edward Doyle
-  Tier: Revolutionary
-- Name: Enricoc3l
-  Tier: Revolutionary
-- Name: Enzoman12
-  Tier: Nuclear Operative
-- Name: Erik Meinke
-  Tier: Revolutionary
-- Name: Ethan Keller
-  Tier: Revolutionary
-- Name: Evan Armstrong
-  Tier: Revolutionary
-- Name: evilJenny
-  Tier: Revolutionary
+- Name: Train
+  Tier: Free
 - Name: ExclusiveWizard
   Tier: Syndicate Agent
-- Name: Farewell Fire
-  Tier: Syndicate Agent
-- Name: Faust Statler
-  Tier: Syndicate Agent
-- Name: FauxParadox
-  Tier: Revolutionary
-- Name: Fiebertraum Illhead
-  Tier: Syndicate Agent
-- Name: flipways
-  Tier: Nuclear Operative
-- Name: Florian
-  Tier: Revolutionary
-- Name: François Desautels
-  Tier: Revolutionary
-- Name: Frege Beach
-  Tier: Revolutionary
-- Name: FungiFog
-  Tier: Revolutionary
-- Name: funnylookingwolf
-  Tier: Revolutionary
-- Name: Gallagin
-  Tier: Revolutionary
-- Name: Gavin Jones
-  Tier: Nuclear Operative
-- Name: Gavin Simmons
-  Tier: Revolutionary
-- Name: Gaxeer
-  Tier: Syndicate Agent
-- Name: Gaëtan GOUSSEAUD
-  Tier: Revolutionary
-- Name: Geekyhobo2
-  Tier: Revolutionary
-- Name: Georgia Partyka
-  Tier: Syndicate Agent
-- Name: ghost--page
-  Tier: Nuclear Operative
-- Name: Glenn Olsen
-  Tier: Syndicate Agent
-- Name: Gnomo
-  Tier: Nuclear Operative
-- Name: Godfiend
-  Tier: Revolutionary
-- Name: Gordod
-  Tier: Syndicate Agent
-- Name: Gosera -
-  Tier: Syndicate Agent
-- Name: Gothryd
-  Tier: Revolutionary
-- Name: Greggo
-  Tier: Syndicate Agent
-- Name: Greyhound Connect
-  Tier: Revolutionary
-- Name: grhmhome
-  Tier: Revolutionary
-- Name: guh
-  Tier: Revolutionary
-- Name: Hamcha
-  Tier: Revolutionary
-- Name: Hannah
-  Tier: Nuclear Operative
-- Name: Hannah Dawson
-  Tier: Syndicate Agent
-- Name: Hanzdegloker
-  Tier: Syndicate Agent
+- Name: Matthew Umney
+  Tier: Free
 - Name: Hat Kid
   Tier: Revolutionary
-- Name: Hayden
-  Tier: Revolutionary
-- Name: Henrik Møller
-  Tier: Syndicate Agent
-- Name: hh
-  Tier: Syndicate Agent
-- Name: Higgtastic
-  Tier: Revolutionary
-- Name: Hoplophobia
-  Tier: Revolutionary
-- Name: huh?
-  Tier: Revolutionary
-- Name: Hunter James
-  Tier: Nuclear Operative
-- Name: Hunter Tew
-  Tier: Syndicate Agent
-- Name: hyphenation
-  Tier: Nuclear Operative
-- Name: I'm going to resurrect Charlie Kirk as a gay zombie with a permanent hard cock, like the scene where robocop is lungs, but boner
-  Tier: Revolutionary
-- Name: IamOzyman
-  Tier: Revolutionary
-- Name: IceStorm theDragon
-  Tier: Revolutionary
-- Name: ikamuse johnson
-  Tier: Revolutionary
-- Name: illpala
-  Tier: Revolutionary
 - Name: Ingvar Tornberg
   Tier: Revolutionary
-- Name: Into the Stars - Community Host
-  Tier: Nuclear Operative
-- Name: Invisorum
-  Tier: Nuclear Operative
-- Name: Irish Kelly
-  Tier: Syndicate Agent
-- Name: Jack
-  Tier: Revolutionary
-- Name: Jack Gardiner
-  Tier: Revolutionary
-- Name: Jack Rose
-  Tier: Revolutionary
-- Name: Jacob Watson
-  Tier: Syndicate Agent
-- Name: Jado0213
-  Tier: Revolutionary
-- Name: JagerVonS
-  Tier: Revolutionary
-- Name: James Andrew Peoples Jr
-  Tier: Revolutionary
-- Name: James Stevens
-  Tier: Revolutionary
-- Name: Jax
-  Tier: Nuclear Operative
-- Name: Jeaglekill
-  Tier: Revolutionary
-- Name: Jeff Tatem
-  Tier: Nuclear Operative
-- Name: Jeffery Pointer
-  Tier: Syndicate Agent
-- Name: JenericJen
-  Tier: Revolutionary
-- Name: Jeremy Hernandez
-  Tier: Syndicate Agent
-- Name: Jerg Jerginson
-  Tier: Nuclear Operative
-- Name: Joel
-  Tier: Revolutionary
-- Name: JohannVanDerwis
-  Tier: Revolutionary
-- Name: John Doe
-  Tier: Nuclear Operative
-- Name: Jordon
-  Tier: Revolutionary
-- Name: Joshington Awesomahee
-  Tier: Revolutionary
 - Name: Joshua Hines
   Tier: Nuclear Operative
-- Name: Joshua Meyer
-  Tier: Nuclear Operative
-- Name: JT Billings
+- Name: Ashley Parfitt
   Tier: Revolutionary
-- Name: JustanAnus
-  Tier: Nuclear Operative
-- Name: Kai
-  Tier: Nuclear Operative
-- Name: Kaitlynn Brennan
-  Tier: Syndicate Agent
-- Name: kannthus
-  Tier: Syndicate Agent
-- Name: Karma Hunter
-  Tier: Revolutionary
-- Name: Kashieru
-  Tier: Revolutionary
-- Name: KateSlime206
-  Tier: Nuclear Operative
-- Name: Kayla Solace
-  Tier: Revolutionary
-- Name: kenneth heller
-  Tier: Syndicate Agent
-- Name: Kerb
-  Tier: Revolutionary
-- Name: Kerensky
-  Tier: Revolutionary
-- Name: Kesiath
-  Tier: Nuclear Operative
-- Name: Kevin
-  Tier: Nuclear Operative
-- Name: Kevin
-  Tier: Nuclear Operative
-- Name: Kieue Caprie
-  Tier: Revolutionary
-- Name: kik
-  Tier: Revolutionary
-- Name: Kim
-  Tier: Revolutionary
-- Name: kithri
-  Tier: Nuclear Operative
-- Name: Koyki
-  Tier: Revolutionary
-- Name: krberryy
-  Tier: Revolutionary
-- Name: kristopher arnott
-  Tier: Syndicate Agent
-- Name: KrystalDisc
-  Tier: Revolutionary
-- Name: Krystian Janecki
-  Tier: Revolutionary
-- Name: Kubakura
-  Tier: Revolutionary
-- Name: Kyle Hipke
-  Tier: Nuclear Operative
-- Name: Kyle Tyo
-  Tier: Syndicate Agent
-- Name: lapatison
-  Tier: Revolutionary
-- Name: LeoZ
-  Tier: Revolutionary
-- Name: LeTobbs
-  Tier: Revolutionary
-- Name: Lieutenant Colonel Orangejuice
-  Tier: Syndicate Agent
-- Name: Lilith
-  Tier: Nuclear Operative
-- Name: liltenhead
-  Tier: Revolutionary
-- Name: Luaan
-  Tier: Syndicate Agent
-- Name: Lucas Welsh
-  Tier: Revolutionary
-- Name: lukiw
-  Tier: Revolutionary
-- Name: Luzurper
-  Tier: Revolutionary
-- Name: Lyndomen
-  Tier: Revolutionary
-- Name: Madeleine LeFleur
-  Tier: Syndicate Agent
-- Name: mage_period
-  Tier: Syndicate Agent
-- Name: Magelfik
-  Tier: Revolutionary
-- Name: Malachi Housewright
-  Tier: Revolutionary
-- Name: March
-  Tier: Syndicate Agent
-- Name: Marios Sardis
-  Tier: Revolutionary
-- Name: Mason Fawcett
-  Tier: Revolutionary
-- Name: MasterFurret
-  Tier: Revolutionary
-- Name: Mathew McGuire
-  Tier: Revolutionary
-- Name: Matthew C Miklaucic
-  Tier: Revolutionary
-- Name: Matthias Bechtold
-  Tier: Revolutionary
-- Name: Mci
-  Tier: Revolutionary
-- Name: MechaKitty
-  Tier: Revolutionary
-- Name: Mega Awesome Man
-  Tier: Syndicate Agent
-- Name: merklaw
-  Tier: Revolutionary
-- Name: Michael Van Gaasbeck
-  Tier: Revolutionary
-- Name: Mihailo Trickovic
-  Tier: Syndicate Agent
-- Name: Mikhail
-  Tier: Revolutionary
-- Name: mikiju
-  Tier: Syndicate Agent
-- Name: Minemoder
-  Tier: Syndicate Agent
-- Name: Miniwoffer
-  Tier: Revolutionary
-- Name: Mitchell Marry
-  Tier: Revolutionary
-- Name: mksky
-  Tier: Revolutionary
-- Name: Molly the Bully
-  Tier: Nuclear Operative
-- Name: Molon
-  Tier: Syndicate Agent
-- Name: Mono
-  Tier: Revolutionary
-- Name: Mr_Clank
-  Tier: Revolutionary
-- Name: MrGloopy
-  Tier: Revolutionary
-- Name: Mythtic B
-  Tier: Revolutionary
-- Name: Nagano
-  Tier: Revolutionary
-- Name: Nat
-  Tier: Revolutionary
-- Name: Nathan Zaldivar
-  Tier: Nuclear Operative
-- Name: Nathaniel Joseph Hurd
-  Tier: Revolutionary
-- Name: Nathaniel Taylor
-  Tier: Revolutionary
-- Name: Nemmay
-  Tier: Revolutionary
-- Name: Neo Move
-  Tier: Syndicate Agent
-- Name: NetGlitch
-  Tier: Nuclear Operative
-- Name: Nicholas
-  Tier: Nuclear Operative
-- Name: Nicholas Williamson
-  Tier: Nuclear Operative
-- Name: Nicholi
-  Tier: Syndicate Agent
-- Name: Nictis
-  Tier: Revolutionary
-- Name: Ninja
-  Tier: Syndicate Agent
-- Name: Nojan Niaki
-  Tier: Revolutionary
-- Name: Noodle is me
-  Tier: Syndicate Agent
-- Name: Novaq
-  Tier: Revolutionary
-- Name: Noxy
-  Tier: Syndicate Agent
-- Name: Nudal
-  Tier: Revolutionary
-- Name: Nugmania
-  Tier: Revolutionary
-- Name: Nyxilath
-  Tier: Nuclear Operative
-- Name: orange color
-  Tier: Revolutionary
-- Name: osborn
-  Tier: Syndicate Agent
-- Name: Oscar Tobias Herra Bravo
-  Tier: Revolutionary
-- Name: Oxyclean114
-  Tier: Revolutionary
-- Name: Pangaron
-  Tier: Syndicate Agent
-- Name: Pasemi
-  Tier: Revolutionary
-- Name: peanut
-  Tier: Revolutionary
-- Name: Penguin Commoner
-  Tier: Revolutionary
-- Name: Phillip Inman
-  Tier: Revolutionary
-- Name: Phycoweirdo
-  Tier: Nuclear Operative
-- Name: Pinet
-  Tier: Nuclear Operative
-- Name: Piotr
-  Tier: Revolutionary
-- Name: pooba
-  Tier: Revolutionary
-- Name: Powder
-  Tier: Revolutionary
-- Name: ppie
-  Tier: Syndicate Agent
-- Name: Prayer
-  Tier: Nuclear Operative
-- Name: Preston Pickering
-  Tier: Revolutionary
-- Name: Prof. Omii
-  Tier: Nuclear Operative
-- Name: ProxyGen
-  Tier: Revolutionary
-- Name: Psy
-  Tier: Revolutionary
-- Name: queednyeb
-  Tier: Revolutionary
-- Name: Quonn
-  Tier: Syndicate Agent
-- Name: Raccoononi
-  Tier: Revolutionary
-- Name: Rafał Kowalewski
-  Tier: Revolutionary
-- Name: Raiden Johnson
-  Tier: Revolutionary
-- Name: Rainy
-  Tier: Revolutionary
-- Name: RamenZorn
-  Tier: Syndicate Agent
-- Name: Ramiro Agis
-  Tier: Revolutionary
-- Name: Random Person
-  Tier: Syndicate Agent
-- Name: Rasmus Cedergren
-  Tier: Revolutionary
-- Name: Raspberry1111
-  Tier: Revolutionary
-- Name: Rat Fungus
-  Tier: Nuclear Operative
-- Name: Rat Man
-  Tier: Revolutionary
-- Name: RedChair368
-  Tier: Revolutionary
-- Name: Repo
-  Tier: Nuclear Operative
-- Name: Richard "Rei" Weeks
-  Tier: Syndicate Agent
-- Name: Robert Reed
-  Tier: Nuclear Operative
-- Name: Robin Rottstock
-  Tier: Revolutionary
-- Name: Roman
-  Tier: Syndicate Agent
-- Name: Rome
-  Tier: Revolutionary
-- Name: rosysyn
-  Tier: Revolutionary
-- Name: Rusty Shackleford
-  Tier: Nuclear Operative
-- Name: Ryan Hanson
-  Tier: Revolutionary
-- Name: Ryan Kelly
-  Tier: Revolutionary
-- Name: RyanTuek
-  Tier: Revolutionary
-- Name: S.C.
-  Tier: Syndicate Agent
-- Name: S1rFl0
-  Tier: Revolutionary
-- Name: Sam Caesar
-  Tier: Revolutionary
-- Name: Samtaro
-  Tier: Nuclear Operative
-- Name: Sandvich enjoyer
-  Tier: Revolutionary
-- Name: Saphire
-  Tier: Revolutionary
-- Name: SarahRaven
-  Tier: Revolutionary
-- Name: Sartec
-  Tier: Revolutionary
-- Name: ScarKy0
-  Tier: Revolutionary
-- Name: Sean Lilly
-  Tier: Syndicate Agent
-- Name: Seinfeld
-  Tier: Revolutionary
-- Name: Semiotics
-  Tier: Syndicate Agent
-- Name: Serathis
-  Tier: Revolutionary
-- Name: Serianas
-  Tier: Nuclear Operative
-- Name: Seth Morron
-  Tier: Revolutionary
-- Name: showgun117
-  Tier: Syndicate Agent
-- Name: Simon N Heath
-  Tier: Revolutionary
-- Name: SireHambone
-  Tier: Nuclear Operative
-- Name: sk3iron
-  Tier: Revolutionary
-- Name: Sleeepz
-  Tier: Syndicate Agent
-- Name: SnapKick
-  Tier: Revolutionary
-- Name: Snowlili
-  Tier: Revolutionary
-- Name: Snowni
-  Tier: Nuclear Operative
-- Name: Solid_Syn
-  Tier: Revolutionary
-- Name: Solidus Snake
-  Tier: Nuclear Operative
-- Name: SotetSotetSotetSotetSotet
-  Tier: Syndicate Agent
-- Name: Southbridge
-  Tier: Nuclear Operative
-- Name: Sparlight
-  Tier: Nuclear Operative
-- Name: SpiffyNnemonic
-  Tier: Revolutionary
-- Name: spookerton
-  Tier: Syndicate Agent
-- Name: Sporkyz
-  Tier: Revolutionary
-- Name: SpydAxe
-  Tier: Revolutionary
-- Name: StaceyBalcom
-  Tier: Revolutionary
-- Name: Star Lord
-  Tier: Syndicate Agent
-- Name: starch
-  Tier: Syndicate Agent
-- Name: StaticeStorm
-  Tier: Syndicate Agent
-- Name: Statix AraAra
-  Tier: Revolutionary
-- Name: Stedar
-  Tier: Syndicate Agent
-- Name: stikfigz
-  Tier: Revolutionary
-- Name: Sufary
-  Tier: Nuclear Operative
-- Name: Superglue
-  Tier: Syndicate Agent
-- Name: Sven Tammerijn
-  Tier: Revolutionary
-- Name: Swindel_
-  Tier: Syndicate Agent
-- Name: Swix Swix
-  Tier: Revolutionary
-- Name: T.P_Gaming
-  Tier: Revolutionary
-- Name: Tabatha Mendonski
-  Tier: Revolutionary
-- Name: Taber
-  Tier: Revolutionary
-- Name: TacoCub
-  Tier: Revolutionary
-- Name: Tairenar
-  Tier: Nuclear Operative
-- Name: Talbot
-  Tier: Revolutionary
-- Name: Tamora Droppa
-  Tier: Revolutionary
-- Name: taydeo
-  Tier: Nuclear Operative
-- Name: Taylor
-  Tier: Revolutionary
-- Name: Tee The Kobold
-  Tier: Revolutionary
-- Name: The Best Sean
-  Tier: Syndicate Agent
-- Name: the good king wompicus
-  Tier: Syndicate Agent
-- Name: The Hateful Flesh
-  Tier: Revolutionary
-- Name: The Pain
-  Tier: Syndicate Agent
-- Name: Thebluegameingdoggo
-  Tier: Revolutionary
-- Name: TheGoldElite
-  Tier: Revolutionary
-- Name: TheGungeonologist
-  Tier: Revolutionary
-- Name: Third
-  Tier: Revolutionary
-- Name: Thomas Pollard
-  Tier: Nuclear Operative
-- Name: Tia
-  Tier: Revolutionary
-- Name: tokie
-  Tier: Nuclear Operative
-- Name: Tom Cruize
-  Tier: Syndicate Agent
-- Name: Tom Goodman (TauOmicronMu#2500)
-  Tier: Revolutionary
-- Name: Tomeno
-  Tier: Revolutionary
-- Name: ToonaLemons
-  Tier: Revolutionary
-- Name: tremors08
-  Tier: Syndicate Agent
-- Name: Trent Warfel
-  Tier: Nuclear Operative
-- Name: Trevor Johnson
-  Tier: Revolutionary
-- Name: Trevor McConnell
-  Tier: Nuclear Operative
-- Name: TrixxedHeart
-  Tier: Nuclear Operative
-- Name: Troll_King_907
-  Tier: Nuclear Operative
-- Name: Ty Ashley
-  Tier: Revolutionary
-- Name: tyler adams
-  Tier: Revolutionary
-- Name: Tyler Young
-  Tier: Nuclear Operative
-- Name: tynobeard 123
-  Tier: Revolutionary
-- Name: Uinseann
-  Tier: Revolutionary
-- Name: Unknown Kiwi
-  Tier: Revolutionary
-- Name: Valinov
-  Tier: Nuclear Operative
-- Name: Vexxtraordinary
-  Tier: Revolutionary
-- Name: Vice Emargo
-  Tier: Syndicate Agent
-- Name: vifs_vestige
-  Tier: Syndicate Agent
-- Name: Violette
-  Tier: Revolutionary
-- Name: VividWisp
-  Tier: Syndicate Agent
+- Name: thehomelessmanbehindthedumpster
+  Tier: Free
 - Name: VmasterVX
   Tier: Revolutionary
-- Name: Voidliing
+- Name: JenericJen
+  Tier: Nuclear Operative
+- Name: Cosu
   Tier: Revolutionary
-- Name: Voltinho
-  Tier: Revolutionary
-- Name: Watson Whittington
+- Name: AileenOnline
+  Tier: Free
+- Name: Grotty Bepis
+  Tier: Nuclear Operative
+- Name: Dizzy_Eevee
   Tier: Syndicate Agent
-- Name: Whistling Jake
+- Name: Lizard
+  Tier: Free
+- Name: Michael Van Gaasbeck
   Tier: Revolutionary
-- Name: Wiliam
-  Tier: Nuclear Operative
-- Name: Will M.
+- Name: Statix AraAra
   Tier: Revolutionary
-- Name: William Grondin
-  Tier: Revolutionary
-- Name: Wolfie
-  Tier: Revolutionary
-- Name: Wrexbe
-  Tier: Revolutionary
-- Name: wtcwr68
-  Tier: Nuclear Operative
 - Name: WWII Kitsune
   Tier: Nuclear Operative
-- Name: Xenon Dragon
+- Name: Bruno Bigras
+  Tier: Revolutionary
+- Name: TheLocalTryHard
+  Tier: Free
+- Name: Sufary
+  Tier: Nuclear Operative
+- Name: taydeo
+  Tier: Nuclear Operative
+- Name: dubdubchan
   Tier: Syndicate Agent
-- Name: yeoshua
+- Name: tremors08
   Tier: Syndicate Agent
-- Name: YuNii
-  Tier: Nuclear Operative
-- Name: Z4NEER
-  Tier: Nuclear Operative
-- Name: Zadenae
-  Tier: Nuclear Operative
-- Name: Zak The Dragon
+- Name: Jan Gocník
+  Tier: Free
+- Name: Tret Mekiao
+  Tier: Free
+- Name: Ben Joja Hotop
+  Tier: Free
+- Name: Sean Lenin
+  Tier: Free
+- Name: KiddoTBH
+  Tier: Free
+- Name: Kubakura
+  Tier: Syndicate Agent
+- Name: Bullet Kin
+  Tier: Free
+- Name: Abby Eveland
   Tier: Revolutionary
-- Name: Zakanater 19
+- Name: Zoe
+  Tier: Free
+- Name: ghost--page
+  Tier: Nuclear Operative
+- Name: MechaKitty
   Tier: Revolutionary
-- Name: Zakory L Holbrook
+- Name: BlueNexa
+  Tier: Free
+- Name: Noah Heaverin
+  Tier: Free
+- Name: jamozen
+  Tier: Free
+- Name: SireHambone
+  Tier: Nuclear Operative
+- Name: Blair Cyprus
+  Tier: Free
+- Name: Ryan Hanson
   Tier: Revolutionary
-- Name: Zandario
+- Name: Heinrick Archsider
+  Tier: Free
+- Name: Arsalan Sarwari
+  Tier: Free
+- Name: Scardy
+  Tier: Free
+- Name: Nagano
+  Tier: Revolutionary
+- Name: Aridia
+  Tier: Free
+- Name: illpala
+  Tier: Revolutionary
+- Name: kayo josé
+  Tier: Free
+- Name: Tymon Tymek
+  Tier: Free
+- Name: AlexDragoon
+  Tier: Revolutionary
+- Name: Henrik Møller
+  Tier: Syndicate Agent
+- Name: Mythtic B
   Tier: Revolutionary
 - Name: zedd
   Tier: Nuclear Operative
+- Name: Penguin Commoner
+  Tier: Revolutionary
+- Name: Davyei
+  Tier: Free
+- Name: Akaelik
+  Tier: Nuclear Operative
+- Name: Kyle Tyo
+  Tier: Revolutionary
+- Name: Rhys Williams
+  Tier: Free
+- Name: Drakkenlupen
+  Tier: Revolutionary
+- Name: Randomposter
+  Tier: Free
+- Name: Justin White
+  Tier: Free
+- Name: Ty Ashley
+  Tier: Revolutionary
+- Name: Scorching Rae
+  Tier: Nuclear Operative
+- Name: Cindy Sampaga
+  Tier: Free
+- Name: Plague
+  Tier: Free
+- Name: dude
+  Tier: Free
+- Name: NIACO
+  Tier: Free
+- Name: Tee The Kobold
+  Tier: Revolutionary
+- Name: Redstones563
+  Tier: Free
+- Name: Celestrogen
+  Tier: Syndicate Agent
+- Name: SotetSotetSotetSotetSotet
+  Tier: Syndicate Agent
+- Name: Guffin
+  Tier: Free
+- Name: Southbridge
+  Tier: Nuclear Operative
+- Name: ZazaRyn
+  Tier: Syndicate Agent
+- Name: Magic Crystal Radio
+  Tier: Free
+- Name: Sam Sullins
+  Tier: Free
+- Name: Widoux 341
+  Tier: Free
+- Name: spookerton
+  Tier: Syndicate Agent
+- Name: Tom Goodman (TauOmicronMu#2500)
+  Tier: Revolutionary
+- Name: Robbie Me
+  Tier: Free
+- Name: momochitters
+  Tier: Free
+- Name: Raspberry1111
+  Tier: Revolutionary
+- Name: flipways
+  Tier: Nuclear Operative
+- Name: Nictis
+  Tier: Revolutionary
+- Name: crazybrain
+  Tier: Free
+- Name: peanut
+  Tier: Nuclear Operative
+- Name: Lewis McCalmont
+  Tier: Free
+- Name: T.P_Gaming
+  Tier: Revolutionary
+- Name: A Patreon of the Ahts
+  Tier: Free
+- Name: brbrbrbrbr brbrbr
+  Tier: Revolutionary
+- Name: Shadcake
+  Tier: Free
+- Name: kristopher arnott
+  Tier: Syndicate Agent
+- Name: Reebe
+  Tier: Free
+- Name: blossom
+  Tier: Revolutionary
+- Name: ml726
+  Tier: Free
+- Name: Logan Splett
+  Tier: Free
+- Name: Patrick Mitchell
+  Tier: Free
+- Name: Semiotics
+  Tier: Syndicate Agent
+- Name: Snowlili
+  Tier: Revolutionary
+- Name: Hyeronimus Bosch
+  Tier: Free
+- Name: S1rFl0
+  Tier: Revolutionary
+- Name: Gavin
+  Tier: Free
+- Name: Faust Statler
+  Tier: Syndicate Agent
+- Name: the good king wompicus
+  Tier: Syndicate Agent
+- Name: DerBall
+  Tier: Revolutionary
+- Name: Gallagin
+  Tier: Revolutionary
+- Name: Edward Doyle
+  Tier: Revolutionary
+- Name: Preston Pickering
+  Tier: Revolutionary
+- Name: Andrew Danke
+  Tier: Syndicate Agent
+- Name: Alexis
+  Tier: Nuclear Operative
+- Name: Saphinara
+  Tier: Free
+- Name: Random Person
+  Tier: Syndicate Agent
+- Name: mage_period
+  Tier: Syndicate Agent
+- Name: piras314
+  Tier: Free
+- Name: Mark Khudaev
+  Tier: Free
+- Name: Saver
+  Tier: Free
+- Name: Snilo Black
+  Tier: Free
+- Name: CptFalcon
+  Tier: Revolutionary
+- Name: Daxx (Justin Winningham)
+  Tier: Syndicate Agent
+- Name: Posters Union Australia (Shlee)
+  Tier: Free
+- Name: nathan
+  Tier: Free
+- Name: funnylookingwolf
+  Tier: Revolutionary
+- Name: Sporkyz
+  Tier: Revolutionary
+- Name: SarahRaven
+  Tier: Revolutionary
+- Name: Da Skolin
+  Tier: Free
+- Name: Joshua Meyer
+  Tier: Free
+- Name: BUMBLE
+  Tier: Free
+- Name: Lily Roche
+  Tier: Free
+- Name: Klive McToaster
+  Tier: Free
+- Name: CasuallyAPerson
+  Tier: Free
+- Name: Powder
+  Tier: Revolutionary
+- Name: Noah Heaverin
+  Tier: Free
+- Name: Violette
+  Tier: Revolutionary
+- Name: Amble
+  Tier: Nuclear Operative
+- Name: James Sanders
+  Tier: Free
+- Name: Susaniel
+  Tier: Free
+- Name: Eve Holly
+  Tier: Free
+- Name: Superscope
+  Tier: Free
+- Name: Nyxilath
+  Tier: Nuclear Operative
+- Name: RedChair368
+  Tier: Revolutionary
+- Name: Blumbee
+  Tier: Revolutionary
+- Name: Mason Fawcett
+  Tier: Revolutionary
+- Name: Cerzix
+  Tier: Revolutionary
+- Name: Aeris Ophelia
+  Tier: Free
+- Name: Troll_King_907
+  Tier: Nuclear Operative
+- Name: Certified Hood Classic
+  Tier: Free
+- Name: Hydraliks
+  Tier: Free
+- Name: Meguneri
+  Tier: Free
+- Name: hyphenation
+  Tier: Nuclear Operative
+- Name: Psy
+  Tier: Revolutionary
+- Name: Pinet
+  Tier: Nuclear Operative
+- Name: Vivi Bunny
+  Tier: Free
+- Name: James Stevens
+  Tier: Revolutionary
+- Name: anharmlessguest
+  Tier: Syndicate Agent
+- Name: Outlier
+  Tier: Free
+- Name: Brandon Hackney
+  Tier: Free
+- Name: eleanor nora
+  Tier: Free
+- Name: starch
+  Tier: Syndicate Agent
+- Name: Jacob Watson
+  Tier: Syndicate Agent
+- Name: Seinfeld
+  Tier: Revolutionary
+- Name: Prime!
+  Tier: Free
+- Name: John
+  Tier: Free
+- Name: FauxParadox
+  Tier: Revolutionary
+- Name: Mr_Clank
+  Tier: Revolutionary
+- Name: rafael rabelo
+  Tier: Free
+- Name: TBF_Jack
+  Tier: Free
+- Name: StaceyBalcom
+  Tier: Revolutionary
+- Name: guh
+  Tier: Revolutionary
+- Name: Fran Picek
+  Tier: Free
+- Name: Austenn
+  Tier: Revolutionary
+- Name: Flayn
+  Tier: Free
+- Name: Nye
+  Tier: Free
+- Name: Phycoweirdo
+  Tier: Nuclear Operative
+- Name: Madeleine LeFleur
+  Tier: Syndicate Agent
+- Name: Anton
+  Tier: Revolutionary
+- Name: That Furry Fuck
+  Tier: Free
+- Name: sat
+  Tier: Free
+- Name: goober
+  Tier: Free
+- Name: Boogerfoot
+  Tier: Nuclear Operative
+- Name: Raiden Johnson
+  Tier: Revolutionary
+- Name: Talbot
+  Tier: Revolutionary
+- Name: Alen Kadric
+  Tier: Free
+- Name: pogcat
+  Tier: Free
+- Name: Dave
+  Tier: Free
+- Name: Nathaniel Taylor
+  Tier: Revolutionary
+- Name: Z4NEER
+  Tier: Nuclear Operative
+- Name: Laying on my penis until it falls asleep, so it feels like I'm giving someone else a hando
+  Tier: Revolutionary
+- Name: Sam Caesar
+  Tier: Revolutionary
+- Name: Lykan
+  Tier: Free
+- Name: tarna41
+  Tier: Free
+- Name: Ryan Johnson
+  Tier: Free
+- Name: Andrew Montagne
+  Tier: Syndicate Agent
+- Name: yakub mobutu
+  Tier: Free
+- Name: Michael Krebs
+  Tier: Free
+- Name: mr funny swag
+  Tier: Free
+- Name: Crazyeyes24
+  Tier: Syndicate Agent
+- Name: Zylo
+  Tier: Free
+- Name: ScarKy0
+  Tier: Revolutionary
+- Name: Randall Hudson
+  Tier: Free
+- Name: FaberTheCatboy
+  Tier: Free
+- Name: IamOzyman
+  Tier: Revolutionary
+- Name: Jado0213
+  Tier: Revolutionary
+- Name: StaticeStorm
+  Tier: Syndicate Agent
+- Name: Baron Mathot
+  Tier: Free
+- Name: CrudeOil
+  Tier: Nuclear Operative
+- Name: Sartec
+  Tier: Revolutionary
+- Name: Mathew McGuire
+  Tier: Revolutionary
+- Name: Jelloterd2
+  Tier: Free
+- Name: Commissar Fox
+  Tier: Syndicate Agent
+- Name: tyler adams
+  Tier: Revolutionary
+- Name: Logan Britt
+  Tier: Free
+- Name: Joshua A.
+  Tier: Free
+- Name: ya boi darth Vader
+  Tier: Free
+- Name: Syndlkat
+  Tier: Free
+- Name: Zyleak
+  Tier: Revolutionary
+- Name: Hunter
+  Tier: Free
+- Name: Killerqu00
+  Tier: Free
+- Name: lzk
+  Tier: Free
+- Name: Cai Williamson
+  Tier: Syndicate Agent
+- Name: Arykh
+  Tier: Nuclear Operative
+- Name: Pallastovid
+  Tier: Free
+- Name: Rome
+  Tier: Revolutionary
+- Name: mawrk
+  Tier: Free
+- Name: Jack
+  Tier: Revolutionary
+- Name: stikfigz
+  Tier: Revolutionary
+- Name: RyanTuek
+  Tier: Revolutionary
+- Name: David N
+  Tier: Syndicate Agent
+- Name: Panzer IV
+  Tier: Free
+- Name: Novaq
+  Tier: Revolutionary
+- Name: Trevor Doyle
+  Tier: Free
+- Name: Borna Punda
+  Tier: Revolutionary
+- Name: Patrick Long
+  Tier: Free
+- Name: Alpha
+  Tier: Nuclear Operative
+- Name: Gaëtan GOUSSEAUD
+  Tier: Revolutionary
+- Name: Hayden Wessing
+  Tier: Revolutionary
+- Name: Noodle is me
+  Tier: Syndicate Agent
+- Name: snakebb
+  Tier: Revolutionary
+- Name: Patrick
+  Tier: Revolutionary
+- Name: Väinö Kontinen
+  Tier: Free
+- Name: Devin Nelson
+  Tier: Revolutionary
+- Name: Rat Man
+  Tier: Revolutionary
+- Name: Christopher Day
+  Tier: Free
+- Name: Wilhelm 17
+  Tier: Free
+- Name: Kieue Caprie
+  Tier: Revolutionary
+- Name: RamenZorn
+  Tier: Syndicate Agent
+- Name: Swix Swix
+  Tier: Revolutionary
+- Name: Katharina
+  Tier: Free
+- Name: Blackmare
+  Tier: Syndicate Agent
+- Name: lukiw
+  Tier: Revolutionary
+- Name: Magelfik
+  Tier: Revolutionary
+- Name: Kevin
+  Tier: Nuclear Operative
+- Name: Tomáš Sitarčík
+  Tier: Syndicate Agent
+- Name: Coolsurf6
+  Tier: Revolutionary
+- Name: Neexdle
+  Tier: Free
+- Name: Lucid
+  Tier: Free
+- Name: MissKay1994
+  Tier: Syndicate Agent
+- Name: Raccoononi
+  Tier: Revolutionary
+- Name: Avocado999
+  Tier: Free
+- Name: Invisorum
+  Tier: Nuclear Operative
+- Name: Hannah
+  Tier: Nuclear Operative
+- Name: Thomas
+  Tier: Revolutionary
+- Name: Cozmicc
+  Tier: Free
+- Name: Unalterableness Happiness
+  Tier: Free
+- Name: Sparlight
+  Tier: Nuclear Operative
+- Name: MAILS ADVISORY
+  Tier: Free
+- Name: Rq52
+  Tier: Free
+- Name: Ben Wahba
+  Tier: Free
+- Name: North
+  Tier: Free
+- Name: Tyran
+  Tier: Free
+- Name: TheSimpleTime
+  Tier: Free
+- Name: Minemoder
+  Tier: Syndicate Agent
+- Name: Richard "Rei" Weeks
+  Tier: Syndicate Agent
+- Name: Sika-Voi
+  Tier: Free
+- Name: Dumbdestroyer2
+  Tier: Free
+- Name: Ferox Heist
+  Tier: Free
+- Name: Ryan Vieira
+  Tier: Free
+- Name: kithri
+  Tier: Nuclear Operative
+- Name: Luzurper
+  Tier: Revolutionary
+- Name: Rainy
+  Tier: Revolutionary
+- Name: Dusk
+  Tier: Revolutionary
+- Name: Apocist
+  Tier: Revolutionary
+- Name: Yukari_TK
+  Tier: Free
+- Name: Iris
+  Tier: Free
+- Name: Jamie Forkner
+  Tier: Free
+- Name: rokudara
+  Tier: Free
+- Name: Xionwalker
+  Tier: Free
+- Name: Michael Schrader
+  Tier: Free
+- Name: JT Billings
+  Tier: Revolutionary
+- Name: Stedar
+  Tier: Syndicate Agent
+- Name: Alex Burd
+  Tier: Nuclear Operative
+- Name: Vasilis The Pikachu
+  Tier: Free
+- Name: Erik Meinke
+  Tier: Revolutionary
+- Name: Sleeepz
+  Tier: Syndicate Agent
+- Name: Jonathan
+  Tier: Free
+- Name: Trent Warfel
+  Tier: Nuclear Operative
+- Name: Fritz Vohlkson
+  Tier: Free
+- Name: Гоша Ушаров
+  Tier: Free
+- Name: Cpt Blastahoe
+  Tier: Free
+- Name: dedomena
+  Tier: Free
+- Name: Nolan Downing
+  Tier: Free
+- Name: Seth Morron
+  Tier: Revolutionary
+- Name: Fumo Legionnaire
+  Tier: Free
+- Name: obama
+  Tier: Free
+- Name: Daniel Megiddo
+  Tier: Free
+- Name: Денис
+  Tier: Free
+- Name: Ubaser
+  Tier: Revolutionary
+- Name: Catdere
+  Tier: Syndicate Agent
+- Name: valery xolstov
+  Tier: Free
+- Name: Marios Sardis
+  Tier: Revolutionary
+- Name: Constrife
+  Tier: Free
+- Name: TINYANGRYWOMAN
+  Tier: Free
+- Name: Kerensky
+  Tier: Revolutionary
+- Name: DEATHB4DEFEAT
+  Tier: Free
+- Name: Kristy Denniss
+  Tier: Free
+- Name: orange color
+  Tier: Revolutionary
+- Name: Hectik
+  Tier: Free
+- Name: SomeDogo
+  Tier: Free
+- Name: Joshua Meyer
+  Tier: Nuclear Operative
+- Name: Matthias Bechtold
+  Tier: Revolutionary
+- Name: Serafim
+  Tier: Free
+- Name: Cindy Xiao
+  Tier: Free
+- Name: SmokingKilz
+  Tier: Free
+- Name: Jacob Scott
+  Tier: Free
+- Name: Ryan Kelly
+  Tier: Revolutionary
+- Name: mikiju
+  Tier: Syndicate Agent
+- Name: TheGungeonologist
+  Tier: Revolutionary
+- Name: Tia
+  Tier: Revolutionary
+- Name: yeoshua
+  Tier: Syndicate Agent
+- Name: David Ilina
+  Tier: Free
+- Name: Robyn Pothagan
+  Tier: Free
+- Name: chomp
+  Tier: Free
+- Name: Maksym Aleinikov
+  Tier: Free
+- Name: Chase M.
+  Tier: Free
+- Name: Ethan Maria
+  Tier: Free
+- Name: Luna Rose
+  Tier: Free
+- Name: Jordon
+  Tier: Revolutionary
+- Name: Godfiend
+  Tier: Revolutionary
+- Name: Jake Huxell
+  Tier: Free
+- Name: Alexander Simakov
+  Tier: Free
+- Name: Hannah Dawson
+  Tier: Syndicate Agent
+- Name: Dieselmohawk D.
+  Tier: Revolutionary
+- Name: Sean Lilly
+  Tier: Syndicate Agent
+- Name: Brandon Roughley
+  Tier: Syndicate Agent
+- Name: Jack
+  Tier: Free
+- Name: Cooliano Rizzo
+  Tier: Free
+- Name: North Star
+  Tier: Free
+- Name: Flamebrain
+  Tier: Free
+- Name: Andrew
+  Tier: Revolutionary
+- Name: Ostoja
+  Tier: Free
+- Name: Russian TS
+  Tier: Nuclear Operative
+- Name: Kyu, The Meme Fairy
+  Tier: Free
+- Name: LIMIT_bro .
+  Tier: Free
+- Name: Kim
+  Tier: Revolutionary
+- Name: Dourbii
+  Tier: Revolutionary
+- Name: Autistic Dog
+  Tier: Free
+- Name: Black Rose
+  Tier: Free
+- Name: rose soul
+  Tier: Free
+- Name: Toast
+  Tier: Free
+- Name: Jiangshi Luvr
+  Tier: Free
+- Name: OllyTheFoxcoon
+  Tier: Free
+- Name: Christopher Peltola
+  Tier: Revolutionary
+- Name: Bonefan223
+  Tier: Nuclear Operative
+- Name: Fie
+  Tier: Free
+- Name: DuskyJay
+  Tier: Free
 - Name: Zella Zane
   Tier: Revolutionary
-- Name: Zenari Ari
-  Tier: Nuclear Operative
-- Name: Zero
+- Name: Pixel Realms
+  Tier: Free
+- Name: ConcaveGnome
+  Tier: Syndicate Agent
+- Name: Ростислав Мірошніченко
+  Tier: Free
+- Name: Hunter Tew
+  Tier: Syndicate Agent
+- Name: Daniel D
+  Tier: Syndicate Agent
+- Name: Kick Buttowski
+  Tier: Free
+- Name: Eggexe
+  Tier: Free
+- Name: Lv
+  Tier: Free
+- Name: Ali Alashar
+  Tier: Free
+- Name: Nathaniel Joseph Hurd
   Tier: Revolutionary
-- Name: Zoe Rose
+- Name: sk3iron
+  Tier: Revolutionary
+- Name: Dax XZ
+  Tier: Free
+- Name: debelizm
+  Tier: Free
+- Name: Kaisering
+  Tier: Revolutionary
+- Name: VividWisp
+  Tier: Syndicate Agent
+- Name: Alex Mercer
+  Tier: Free
+- Name: AmalgoMyte
+  Tier: Revolutionary
+- Name: SeanKim
+  Tier: Free
+- Name: Siegorvus
+  Tier: Free
+- Name: вася васильев
+  Tier: Free
+- Name: Mci
+  Tier: Revolutionary
+- Name: KateSlime206
+  Tier: Nuclear Operative
+- Name: Robert
+  Tier: Free
+- Name: Ben Z'
+  Tier: Revolutionary
+- Name: Luke
+  Tier: Free
+- Name: Tyler Putnam
+  Tier: Free
+- Name: Ville Sarmiola
+  Tier: Free
+- Name: kelaclone
+  Tier: Free
+- Name: Archmonarch
+  Tier: Syndicate Agent
+- Name: Brett
+  Tier: Free
+- Name: Hanzdegloker
+  Tier: Syndicate Agent
+- Name: Piotr
+  Tier: Revolutionary
+- Name: CloudyClover
+  Tier: Revolutionary
+- Name: Jim Masterson
+  Tier: Free
+- Name: kenneth heller
+  Tier: Syndicate Agent
+- Name: Gosera -
+  Tier: Syndicate Agent
+- Name: Asaf Ataş
+  Tier: Free
+- Name: DeckDevilYGO
+  Tier: Free
+- Name: nokko
+  Tier: Free
+- Name: Krokodiel89
+  Tier: Free
+- Name: Nojan Niaki
+  Tier: Revolutionary
+- Name: YuNii
+  Tier: Nuclear Operative
+- Name: Georgia Partyka
+  Tier: Syndicate Agent
+- Name: Teeth
+  Tier: Free
+- Name: DrMelon
+  Tier: Revolutionary
+- Name: Molly the Bully
+  Tier: Nuclear Operative
+- Name: An Evil Eel
+  Tier: Free
+- Name: Hasan al-Binabi
+  Tier: Free
+- Name: franz photos
+  Tier: Free
+- Name: Milkshake45752
+  Tier: Free
+- Name: Bru Tal
+  Tier: Free
+- Name: krberryy
+  Tier: Revolutionary
+- Name: Thomas Mcintosh
+  Tier: Free
+- Name: Alex Nordlund
+  Tier: Syndicate Agent
+- Name: Swindel_
+  Tier: Syndicate Agent
+- Name: MrGloopy
+  Tier: Revolutionary
+- Name: blitz gaming
+  Tier: Free
+- Name: Nicholi
+  Tier: Syndicate Agent
+- Name: Taber
+  Tier: Revolutionary
+- Name: 以迪 黃
+  Tier: Free
+- Name: W Geertsma
+  Tier: Free
+- Name: BloodyJMary
+  Tier: Free
+- Name: quri1q
+  Tier: Free
+- Name: SleepyBody91
+  Tier: Free
+- Name: David Gee
+  Tier: Free
+- Name: ThoranTW
+  Tier: Free
+- Name: pigeopeas
+  Tier: Free
+- Name: Zakory L Holbrook
+  Tier: Revolutionary
+- Name: Aiden
+  Tier: Revolutionary
+- Name: Pangaron
+  Tier: Syndicate Agent
+- Name: NeatVisor
+  Tier: Free
+- Name: Solidus Snake
+  Tier: Nuclear Operative
+- Name: Oliver Skyler
+  Tier: Free
+- Name: mustafa kılıç
+  Tier: Free
+- Name: IceStorm theDragon
+  Tier: Revolutionary
+- Name: Indri
+  Tier: Revolutionary
+- Name: Graded
+  Tier: Free
+- Name: tunnp0
+  Tier: Free
+- Name: Vexxtraordinary
+  Tier: Revolutionary
+- Name: Sam Hediger
+  Tier: Free
+- Name: Aldi Abduali
+  Tier: Free
+- Name: Adam Clarke
+  Tier: Free
+- Name: Munt
+  Tier: Free
+- Name: Obspogon
+  Tier: Free
+- Name: Adrian Thompson
+  Tier: Free
+- Name: albatrossMonarch
+  Tier: Free
+- Name: JaQal
+  Tier: Free
+- Name: Simofie
+  Tier: Free
+- Name: redgunny
+  Tier: Free
+- Name: Kevin Chapman
+  Tier: Free
+- Name: Sjevi Aardvark
+  Tier: Free
+- Name: Chris Walter
+  Tier: Free
+- Name: David Sterling
+  Tier: Free
+- Name: Zcore
+  Tier: Free
+- Name: tapohuy
+  Tier: Free
+- Name: MasterFurret
+  Tier: Revolutionary
+- Name: Christian Hicks
+  Tier: Syndicate Agent
+- Name: François Desautels
+  Tier: Revolutionary
+- Name: awndrssk
+  Tier: Free
+- Name: Vice Emargo
+  Tier: Syndicate Agent
+- Name: Mihailo Trickovic
+  Tier: Syndicate Agent
+- Name: Sandvich enjoyer
+  Tier: Revolutionary
+- Name: Higgtastic
+  Tier: Revolutionary
+- Name: "612"
+  Tier: Revolutionary
+- Name: AlecRazec
+  Tier: Revolutionary
+- Name: Repo
+  Tier: Nuclear Operative
+- Name: Ignoramis
+  Tier: Free
+- Name: Jeffery Pointer
+  Tier: Syndicate Agent
+- Name: DireBoar
+  Tier: Free
+- Name: oBerry
+  Tier: Free
+- Name: Adam Smedstad
+  Tier: Free
+- Name: Superglue
+  Tier: Syndicate Agent
+- Name: DrIvoPotato
+  Tier: Nuclear Operative
+- Name: Petalmeat
+  Tier: Free
+- Name: Malachi Housewright
+  Tier: Revolutionary
+- Name: Fallcon
+  Tier: Free
+- Name: ShaunTexas
+  Tier: Free
+- Name: HCG
+  Tier: Free
+- Name: GeneralMarty
+  Tier: Free
+- Name: Nicholas
+  Tier: Nuclear Operative
+- Name: Geekyhobo2
+  Tier: Revolutionary
+- Name: Alexandre Courtin
+  Tier: Revolutionary
+- Name: Wolfie
+  Tier: Revolutionary
+- Name: Shaina Gibson
+  Tier: Free
+- Name: Charles Baron
+  Tier: Free
+- Name: Constellations
+  Tier: Free
+- Name: tynobeard 123
+  Tier: Revolutionary
+- Name: Lyndomen
+  Tier: Revolutionary
+- Name: Glenn Olsen
+  Tier: Syndicate Agent
+- Name: Wiliam
+  Tier: Nuclear Operative
+- Name: SHANE ALAN ZINDA
+  Tier: Free
+- Name: Saiiryn
+  Tier: Free
+- Name: AC Computing
+  Tier: Nuclear Operative
+- Name: eric156
+  Tier: Free
+- Name: Katarn
+  Tier: Free
+- Name: Blight
+  Tier: Syndicate Agent
+- Name: Tim Foley
+  Tier: Free
+- Name: Sven Tammerijn
+  Tier: Revolutionary
+- Name: Raw Toast
+  Tier: Free
+- Name: Watson Whittington
+  Tier: Syndicate Agent
+- Name: David
+  Tier: Revolutionary
+- Name: DadNotTheBelt
+  Tier: Free
+- Name: Enricoc3l
+  Tier: Revolutionary
+- Name: Vandell
+  Tier: Free
+- Name: BlueisDumb
+  Tier: Nuclear Operative
+- Name: Buldinn Girshovich
+  Tier: Nuclear Operative
+- Name: Whistling Jake
+  Tier: Revolutionary
+- Name: Wallace Megas
+  Tier: Free
+- Name: Samtaro
+  Tier: Nuclear Operative
+- Name: Aexxie
+  Tier: Revolutionary
+- Name: Fiebertraum Illhead
+  Tier: Syndicate Agent
+- Name: tokie
+  Tier: Nuclear Operative
+- Name: Odin7heWanderer
+  Tier: Free
+- Name: Jeff Tatem
+  Tier: Nuclear Operative
+- Name: M4shr00m
+  Tier: Free
+- Name: Gordod
+  Tier: Syndicate Agent
+- Name: Skarlet
+  Tier: Free
+- Name: March
   Tier: Syndicate Agent
 - Name: Александр Белошапка
   Tier: Revolutionary
+- Name: Dave
+  Tier: Revolutionary
+- Name: Akira
+  Tier: Revolutionary
+- Name: Alix Shepard
+  Tier: Nuclear Operative
+- Name: JhenMaster
+  Tier: Free
+- Name: Lieutenant Colonel Orangejuice
+  Tier: Syndicate Agent
+- Name: TheGoldElite
+  Tier: Revolutionary
+- Name: Gnomo
+  Tier: Nuclear Operative
+- Name: Never Solus
+  Tier: Free
+- Name: Ari.
+  Tier: Revolutionary
+- Name: Kevin
+  Tier: Nuclear Operative
+- Name: DubzyVEVO
+  Tier: Revolutionary
+- Name: ikamuse johnson
+  Tier: Revolutionary
+- Name: Saphire
+  Tier: Revolutionary
+- Name: Gavin Simmons
+  Tier: Syndicate Agent
+- Name: Tamora Droppa
+  Tier: Revolutionary
+- Name: Gaxeer
+  Tier: Syndicate Agent
+- Name: rosysyn
+  Tier: Revolutionary
+- Name: Scott MacCombie
+  Tier: Free
+- Name: Jeremy Hernandez
+  Tier: Syndicate Agent
+- Name: Kai
+  Tier: Nuclear Operative
+- Name: Victoly
+  Tier: Free
+- Name: chilicheesecat
+  Tier: Free
+- Name: Arthur Norris
+  Tier: Syndicate Agent
+- Name: Carbonhell
+  Tier: Syndicate Agent
+- Name: BrittaBee93
+  Tier: Free
+- Name: Rasmus Cedergren
+  Tier: Revolutionary
+- Name: Greggo
+  Tier: Syndicate Agent
+- Name: Pasemi
+  Tier: Revolutionary
+- Name: Unknown Kiwi
+  Tier: Revolutionary
+- Name: Mitchell Marry
+  Tier: Revolutionary
+- Name: Matouš Hrdlička
+  Tier: Revolutionary
+- Name: Roman
+  Tier: Syndicate Agent
+- Name: Jacob Schramm
+  Tier: Free
+- Name: Nathan Zaldivar
+  Tier: Nuclear Operative
+- Name: SpydAxe
+  Tier: Revolutionary
+- Name: BokChoy
+  Tier: Nuclear Operative
+- Name: Nicholas Williamson
+  Tier: Nuclear Operative
+- Name: William Grondin
+  Tier: Revolutionary
+- Name: KevKev
+  Tier: Free
+- Name: Gothryd
+  Tier: Revolutionary
+- Name: Brandon Campbell
+  Tier: Free
+- Name: Matthew C Miklaucic
+  Tier: Revolutionary
+- Name: Serianas
+  Tier: Nuclear Operative
+- Name: lapatison
+  Tier: Revolutionary
+- Name: Uinseann
+  Tier: Revolutionary
+- Name: osborn
+  Tier: Syndicate Agent
+- Name: LPGaming
+  Tier: Free
+- Name: Alex Fry
+  Tier: Nuclear Operative
+- Name: Ramiro Agis
+  Tier: Revolutionary
+- Name: Mikhail
+  Tier: Revolutionary
+- Name: SnapKick
+  Tier: Revolutionary
+- Name: liltenhead
+  Tier: Revolutionary
+- Name: James Andrew Peoples Jr
+  Tier: Revolutionary
+- Name: Serathis
+  Tier: Revolutionary
+- Name: Joel
+  Tier: Revolutionary
+- Name: Rafał Kowalewski
+  Tier: Revolutionary
+- Name: Kris Piper
+  Tier: Free
+- Name: Anthony Chicko
+  Tier: Revolutionary
+- Name: Taylor
+  Tier: Revolutionary
+- Name: Phillip Inman
+  Tier: Revolutionary
+- Name: Zakanater 19
+  Tier: Revolutionary
+- Name: Molon
+  Tier: Syndicate Agent
+- Name: Peter "Azmond" Newhouse
+  Tier: Free
+- Name: Snowni
+  Tier: Nuclear Operative
+- Name: Tom Cruize
+  Tier: Syndicate Agent
+- Name: Corpus Inc.
+  Tier: Revolutionary
+- Name: BlastWind
+  Tier: Free
+- Name: Echinodermata
+  Tier: Revolutionary
+- Name: Hamcha
+  Tier: Revolutionary
+- Name: Kaitlynn Brennan
+  Tier: Syndicate Agent
+- Name: Oxyclean114
+  Tier: Revolutionary
+- Name: JustanAnus
+  Tier: Nuclear Operative
+- Name: wtcwr68
+  Tier: Nuclear Operative
+- Name: Azmith Blackheart
+  Tier: Revolutionary
+- Name: Collin R Terrell
+  Tier: Revolutionary
+- Name: Cormos Lemming
+  Tier: Nuclear Operative
+- Name: grhmhome
+  Tier: Revolutionary
+- Name: SpiffyNnemonic
+  Tier: Revolutionary
+- Name: Callum Tubrett
+  Tier: Nuclear Operative
+- Name: Hydration
+  Tier: Revolutionary
+- Name: Morty
+  Tier: Free
+- Name: Dylan Roberts
+  Tier: Syndicate Agent
+- Name: mrniceguy0o0
+  Tier: Free
+- Name: Wrexbe
+  Tier: Revolutionary
+- Name: Frege Beach
+  Tier: Revolutionary
+- Name: DBF
+  Tier: Syndicate Agent
+- Name: Kesiath
+  Tier: Nuclear Operative
+- Name: Voltinho
+  Tier: Revolutionary
+- Name: AquaDraco
+  Tier: Revolutionary
+- Name: A Yaj
+  Tier: Revolutionary
+- Name: Miniwoffer
+  Tier: Revolutionary
+- Name: hh
+  Tier: Syndicate Agent
+- Name: Chase Trotter
+  Tier: Nuclear Operative
+- Name: Skifan180
+  Tier: Free
+- Name: Florian
+  Tier: Revolutionary
+- Name: Hoplophobia
+  Tier: Revolutionary
+- Name: Viridian
+  Tier: Free
+- Name: Daskata
+  Tier: Nuclear Operative
+- Name: TacoCub
+  Tier: Revolutionary
+- Name: Jack Rose
+  Tier: Revolutionary
+- Name: Chem_Inventory
+  Tier: Nuclear Operative
+- Name: Jax
+  Tier: Nuclear Operative
+- Name: The Hateful Flesh
+  Tier: Revolutionary
+- Name: Gavin Jones
+  Tier: Nuclear Operative
+- Name: Prof. Omii
+  Tier: Nuclear Operative
+- Name: mksky
+  Tier: Revolutionary
+- Name: Greyhound Connect
+  Tier: Revolutionary
+- Name: Alex Tempest
+  Tier: Revolutionary
+- Name: Rat Fungus
+  Tier: Nuclear Operative
+- Name: Will M.
+  Tier: Revolutionary
+- Name: spinnermaster
+  Tier: Free
+- Name: Koyki
+  Tier: Revolutionary
+- Name: Hunter James
+  Tier: Nuclear Operative
+- Name: Valinov
+  Tier: Nuclear Operative
+- Name: Nemmay
+  Tier: Revolutionary
+- Name: Dylan Hull
+  Tier: Revolutionary
+- Name: FungiFog
+  Tier: Revolutionary
+- Name: S.C.
+  Tier: Syndicate Agent
+- Name: "'-Y-"
+  Tier: Syndicate Agent
+- Name: pooba
+  Tier: Revolutionary
+- Name: evilJenny
+  Tier: Revolutionary
+- Name: clyf
+  Tier: Free
+- Name: Kerb
+  Tier: Revolutionary
+- Name: queednyeb
+  Tier: Revolutionary
+- Name: Robin Rottstock
+  Tier: Revolutionary
+- Name: Third
+  Tier: Revolutionary
+- Name: Altana
+  Tier: Revolutionary
+- Name: showgun117
+  Tier: Syndicate Agent
+- Name: Durp
+  Tier: Revolutionary
+- Name: Joshington Awesomahee
+  Tier: Revolutionary
+- Name: Diklyquill
+  Tier: Revolutionary
+- Name: Eric VW
+  Tier: Revolutionary
+- Name: Nat
+  Tier: Revolutionary
+- Name: Evan Armstrong
+  Tier: Revolutionary
+- Name: Citizen Battle
+  Tier: Nuclear Operative
+- Name: Cyberate
+  Tier: Revolutionary
+- Name: Enzoman12
+  Tier: Nuclear Operative
+- Name: Curtis Pearson
+  Tier: Revolutionary
+- Name: Mono
+  Tier: Revolutionary
+- Name: Xenon Dragon
+  Tier: Syndicate Agent
+- Name: Jerg Jerginson
+  Tier: Nuclear Operative
+- Name: kik
+  Tier: Revolutionary
+- Name: Star Lord
+  Tier: Syndicate Agent
+- Name: kannthus
+  Tier: Syndicate Agent
+- Name: Ethan Keller
+  Tier: Revolutionary
+- Name: John Doe
+  Tier: Nuclear Operative
+- Name: Robert Reed
+  Tier: Nuclear Operative
+- Name: DramaBuns
+  Tier: Revolutionary
+- Name: Bush Boy
+  Tier: Nuclear Operative
+- Name: Quonn
+  Tier: Syndicate Agent
+- Name: KrystalDisc
+  Tier: Revolutionary
+- Name: LeTobbs
+  Tier: Revolutionary
+- Name: Darren Brady
+  Tier: Free
+- Name: Zandario
+  Tier: Revolutionary
+- Name: Lucas Welsh
+  Tier: Revolutionary
+- Name: Nico Thate
+  Tier: Free
+- Name: Anthony Fleck
+  Tier: Nuclear Operative
+- Name: vifs_vestige
+  Tier: Syndicate Agent
+- Name: Bobberunio
+  Tier: Revolutionary
+- Name: Zadenae
+  Tier: Nuclear Operative
+- Name: Into the Stars - Community Host
+  Tier: Nuclear Operative
+- Name: arthropods
+  Tier: Revolutionary
+- Name: Jack Gardiner
+  Tier: Revolutionary
+- Name: BigMcLargeHuge
+  Tier: Free
+- Name: merklaw
+  Tier: Revolutionary
+- Name: CPM311
+  Tier: Revolutionary
+- Name: NetGlitch
+  Tier: Nuclear Operative
+- Name: Bahke
+  Tier: Nuclear Operative
+- Name: Prayer
+  Tier: Nuclear Operative
+- Name: Trevor McConnell
+  Tier: Nuclear Operative
+- Name: MetalClone
+  Tier: Free
+- Name: Farewell Fire
+  Tier: Syndicate Agent
+- Name: Ninja
+  Tier: Syndicate Agent
+- Name: all fields
+  Tier: Syndicate Agent
+- Name: Kyle Hipke
+  Tier: Nuclear Operative
+- Name: Daniel Thompson
+  Tier: Revolutionary
+- Name: Tyler Young
+  Tier: Nuclear Operative
+- Name: LeoZ
+  Tier: Revolutionary
+- Name: avcde
+  Tier: Nuclear Operative
+- Name: Tomeno
+  Tier: Revolutionary
 
diff --git a/Resources/Locale/en-US/access/components/id-card-console-component.ftl b/Resources/Locale/en-US/access/components/id-card-console-component.ftl
index 0418d32062..7793b34846 100644
--- a/Resources/Locale/en-US/access/components/id-card-console-component.ftl
+++ b/Resources/Locale/en-US/access/components/id-card-console-component.ftl
@@ -5,9 +5,7 @@ id-card-console-window-save-button = Save
 id-card-console-window-job-title-label = Job title:
 id-card-console-window-eject-button = Eject
 id-card-console-window-insert-button = Insert
-id-card-console-window-job-selection-label = Job preset (sets department and job icon):
-id-card-console-window-select-all-button = Grant all
-id-card-console-window-deselect-all-button = Revoke all
+id-card-console-window-job-selection-label = Job presets (sets department and job icon):
 
 access-id-card-console-component-no-hands-error = You have no hands.
 id-card-console-privileged-id = Privileged ID
diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index b9b103b58a..50d2b2790e 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -199,4 +199,3 @@ marking-HumanHairVlongfringe = Very Long with Fringe
 marking-HumanHairVolaju = Volaju
 marking-HumanHairWisp = Wisp
 marking-HumanHairLongWithBangs = Long With Bangs
-marking-HumanHairOverEyePigtail = Pigtail (Over Eye)
diff --git a/Resources/Locale/en-US/administration/admin-verbs.ftl b/Resources/Locale/en-US/administration/admin-verbs.ftl
index 8007aa6cca..13be0a876d 100644
--- a/Resources/Locale/en-US/administration/admin-verbs.ftl
+++ b/Resources/Locale/en-US/administration/admin-verbs.ftl
@@ -1,4 +1,3 @@
-# Generic verbs
 delete-verb-get-data-text = Delete
 edit-solutions-verb-get-data-text = Edit Solutions
 explode-verb-get-data-text = Explode
@@ -19,47 +18,3 @@ toolshed-verb-mark = Mark
 toolshed-verb-mark-description = Places this entity into the $marked variable, a list of entities, replacing its prior value.
 
 export-entity-verb-get-data-text = Export sprite
-
-# Tools verbs
-admin-verbs-rejuvenate = Rejuvenate
-admin-verbs-make-indestructible = Make Indestructible
-admin-verbs-make-vulnerable = Make Vulnerable
-admin-verbs-refill-battery = Refill Battery
-admin-verbs-drain-battery = Drain Battery
-admin-verbs-infinite-battery = Infinite Battery
-admin-verbs-block-unanchoring = Block Unanchoring
-admin-verbs-refill-internals-oxygen = Refill Internals Oxygen
-admin-verbs-refill-internals-nitrogen = Refill Internals Nitrogen
-admin-verbs-refill-internals-plasma = Refill Internals Plasma
-admin-verbs-send-to-test-arena = Send to test arena
-admin-verbs-grant-all-access = Grant All Access
-admin-verbs-revoke-all-access = Revoke All Access
-admin-verbs-adjust-stack = Adjust Stack
-admin-verbs-fill-stack = Fill Stack
-admin-verbs-rename = Rename
-admin-verbs-redescribe = Redescribe
-admin-verbs-rename-and-redescribe = Rename & Redescribe
-admin-verbs-bar-job-slots = Bar job slots
-admin-verbs-locate-cargo-shuttle = Locate Cargo Shuttle
-admin-verbs-halt-movement = Halt Movement
-admin-verbs-unpause-map = Unpause Map
-admin-verbs-pause-map = Pause Map
-admin-verbs-snap-joints = Snap Joints
-admin-verbs-make-minigun = Make Minigun
-admin-verbs-set-bullet-amount = Set Bullet Amount
-
-# Toggles verbs
-admin-verbs-bolt = Bolt
-admin-verbs-unbolt = Unbolt
-admin-verbs-emergency-access-on = Emergency Access On
-admin-verbs-emergency-access-off = Emergency Access Off
-
-# Dialogs verbs
-admin-verbs-dialog-adjust-stack-amount = Amount (max {$max})
-admin-verbs-dialog-rename-title = Rename
-admin-verbs-dialog-rename-name = Name
-admin-verbs-dialog-redescribe-title = Redescribe
-admin-verbs-dialog-redescribe-description = Description
-admin-verbs-dialog-rename-and-redescribe-title = Rename & Redescribe
-admin-verbs-dialog-set-bullet-amount-title = Set Bullet Amount
-admin-verbs-dialog-set-bullet-amount-amount = Amount (standard {$cap})
diff --git a/Resources/Locale/en-US/administration/bwoink.ftl b/Resources/Locale/en-US/administration/bwoink.ftl
index 2012f9bd0e..9c305569e1 100644
--- a/Resources/Locale/en-US/administration/bwoink.ftl
+++ b/Resources/Locale/en-US/administration/bwoink.ftl
@@ -1,5 +1,4 @@
 bwoink-user-title = Admin Message
-bwoink-admin-title = Admin Help
 
 bwoink-system-starmute-message-no-other-users = *System: Nobody is available to receive your message. Try pinging Game Admins on Discord.
 
diff --git a/Resources/Locale/en-US/cluwne/cluwne.ftl b/Resources/Locale/en-US/cluwne/cluwne.ftl
index e469cbfbac..0ffd3f32df 100644
--- a/Resources/Locale/en-US/cluwne/cluwne.ftl
+++ b/Resources/Locale/en-US/cluwne/cluwne.ftl
@@ -1,4 +1,2 @@
 cluwne-transform = {CAPITALIZE(THE($target))} turned into a cluwne!
 cluwne-name-prefix = cluwnified {$baseName}
-cluwne-knock-emote = spasms
-cluwne-giggle-emote = honks
diff --git a/Resources/Locale/en-US/components/storage-component.ftl b/Resources/Locale/en-US/components/storage-component.ftl
index 2d3953c1a1..e742c83f6a 100644
--- a/Resources/Locale/en-US/components/storage-component.ftl
+++ b/Resources/Locale/en-US/components/storage-component.ftl
@@ -8,6 +8,5 @@ comp-storage-cant-drop = You can't let go of { THE($entity) }!
 comp-storage-window-title = Storage Item
 comp-storage-window-weight = { $weight }/{ $maxWeight }, Max Size: {$size}
 comp-storage-window-slots = Slots: { $itemCount }/{ $maxCount }, Max Size: {$size}
-comp-storage-window-dummy = Dummy
 comp-storage-verb-open-storage = Open Storage
 comp-storage-verb-close-storage = Close Storage
diff --git a/Resources/Locale/en-US/credits/credits-window.ftl b/Resources/Locale/en-US/credits/credits-window.ftl
index b3373f00f3..e1081a95f0 100644
--- a/Resources/Locale/en-US/credits/credits-window.ftl
+++ b/Resources/Locale/en-US/credits/credits-window.ftl
@@ -11,8 +11,6 @@ credits-window-codebases-section-title = Space Station 13 Codebases
 credits-window-original-remake-team-section-title = Original Space Station 13 Remake Team
 credits-window-immortals-title = In Memoriam
 credits-window-special-thanks-section-title = Special Thanks
-credits-window-previous-page-button = Previous Page
-credits-window-next-page-button = Next Page
 
 credits-window-attributions-directory = [color=white]Directory:[/color] {$directory}
 credits-window-attributions-files = [color=white]Files:[/color] {$files}
diff --git a/Resources/Locale/en-US/ghost/make-ghost-gui.ftl b/Resources/Locale/en-US/ghost/make-ghost-gui.ftl
deleted file mode 100644
index 99d7f80fa2..0000000000
--- a/Resources/Locale/en-US/ghost/make-ghost-gui.ftl
+++ /dev/null
@@ -1,21 +0,0 @@
-make-ghost-roles-window-title = Make Ghost Role
-
-make-ghost-roles-window-entity-label = Entity
-make-ghost-roles-window-role-name-label = Role Name
-make-ghost-roles-window-role-description-label = Role Description
-make-ghost-roles-window-role-rules-label = Role Rules
-make-ghost-roles-window-make-sentient-label = Make Sentient
-make-ghost-roles-window-initial-duration-label = Initial Duration (s)
-make-ghost-roles-window-join-extends-by-label = Joins Extend By (s)
-make-ghost-roles-window-max-duration-label = Max Duration (s)
-
-make-ghost-roles-window-make-button = Make
-
-# Raffle
-make-ghost-roles-window-raffle-not-button = Don't raffle
-make-ghost-roles-window-raffle-custom-settings-button = Custom settings
-
-make-ghost-roles-window-raffle-role-label = Raffle Role?
-make-ghost-roles-window-raffle-settings-label = {$id} (initial {$initialDuration}s, max {$maxDuration}s, join adds {$joinExtendsDurationBy}s)
-
-make-ghost-roles-window-raffle-warning-tooltip = The initial duration must not exceed the maximum duration.
diff --git a/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl b/Resources/Locale/en-US/guidebook/chemistry/conditions.ftl
similarity index 100%
rename from Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
rename to Resources/Locale/en-US/guidebook/chemistry/conditions.ftl
diff --git a/Resources/Locale/en-US/guidebook/chemistry/core.ftl b/Resources/Locale/en-US/guidebook/chemistry/core.ftl
index bcb3250db6..2ffb0b2be2 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/core.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/core.ftl
@@ -1,8 +1,5 @@
 guidebook-reagent-effect-description =
-    {$quantity ->
-        [0] {""}
-        *[other] If there is at least {$quantity}u {$reagent},{" "}
-    }{$chance ->
+    {$chance ->
         [1] { $effect }
         *[other] Has a { NATURALPERCENT($chance, 2) } chance to { $effect }
     }{ $conditionCount ->
diff --git a/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
similarity index 71%
rename from Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
rename to Resources/Locale/en-US/guidebook/chemistry/effects.ftl
index 0de71133ca..07c908c035 100644
--- a/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
@@ -16,7 +16,7 @@
         *[other] satiate
     }
 
-entity-effect-guidebook-spawn-entity =
+reagent-effect-guidebook-create-entity-reaction-effect =
     { $chance ->
         [1] Creates
         *[other] create
@@ -25,37 +25,37 @@ entity-effect-guidebook-spawn-entity =
         *[other] {$amount} {MAKEPLURAL($entname)}
     }
 
-entity-effect-guidebook-explosion =
+reagent-effect-guidebook-explosion-reaction-effect =
     { $chance ->
         [1] Causes
         *[other] cause
     } an explosion
 
-entity-effect-guidebook-emp =
+reagent-effect-guidebook-emp-reaction-effect =
     { $chance ->
         [1] Causes
         *[other] cause
     } an electromagnetic pulse
 
-entity-effect-guidebook-flash =
+reagent-effect-guidebook-flash-reaction-effect =
     { $chance ->
         [1] Causes
         *[other] cause
     } a blinding flash
 
-entity-effect-guidebook-foam-area =
+reagent-effect-guidebook-foam-area-reaction-effect =
     { $chance ->
         [1] Creates
         *[other] create
     } large quantities of foam
 
-entity-effect-guidebook-smoke-area =
+reagent-effect-guidebook-smoke-area-reaction-effect =
     { $chance ->
         [1] Creates
         *[other] create
     } large quantities of smoke
 
-entity-effect-guidebook-satiate-thirst =
+reagent-effect-guidebook-satiate-thirst =
     { $chance ->
         [1] Satiates
         *[other] satiate
@@ -64,7 +64,7 @@ entity-effect-guidebook-satiate-thirst =
         *[other] thirst at {NATURALFIXED($relative, 3)}x the average rate
     }
 
-entity-effect-guidebook-satiate-hunger =
+reagent-effect-guidebook-satiate-hunger =
     { $chance ->
         [1] Satiates
         *[other] satiate
@@ -73,7 +73,7 @@ entity-effect-guidebook-satiate-hunger =
         *[other] hunger at {NATURALFIXED($relative, 3)}x the average rate
     }
 
-entity-effect-guidebook-health-change =
+reagent-effect-guidebook-health-change =
     { $chance ->
         [1] { $healsordeals ->
                 [heals] Heals
@@ -87,7 +87,7 @@ entity-effect-guidebook-health-change =
                  }
     } { $changes }
 
-entity-effect-guidebook-even-health-change =
+reagent-effect-guidebook-even-health-change =
     { $chance ->
         [1] { $healsordeals ->
             [heals] Evenly heals
@@ -101,73 +101,44 @@ entity-effect-guidebook-even-health-change =
         }
     } { $changes }
 
-entity-effect-guidebook-status-effect-old =
-    { $type ->
-        [update]{ $chance ->
-                    [1] Causes
-                     *[other] cause
-                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
-        [add]   { $chance ->
-                    [1] Causes
-                    *[other] cause
-                } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} with accumulation
-        [set]  { $chance ->
-                    [1] Causes
-                    *[other] cause
-                } {LOC($key)} for {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
-        *[remove]{ $chance ->
-                    [1] Removes
-                    *[other] remove
-                } {NATURALFIXED($time, 3)} {MANY("second", $time)} of {LOC($key)}
-    }
 
-entity-effect-guidebook-status-effect =
+reagent-effect-guidebook-status-effect =
     { $type ->
         [update]{ $chance ->
                     [1] Causes
                     *[other] cause
-                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
-        [add]   { $chance ->
-                    [1] Causes
-                    *[other] cause
-                } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} with accumulation
-        [set]  { $chance ->
-                    [1] Causes
-                    *[other] cause
                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
-        *[remove]{ $chance ->
-                    [1] Removes
-                    *[other] remove
-                } {NATURALFIXED($time, 3)} {MANY("second", $time)} of {LOC($key)}
-    } { $delay ->
-        [0] immediately
-        *[other] after a {NATURALFIXED($delay, 3)} second delay
-    }
-
-entity-effect-guidebook-status-effect-indef =
-    { $type ->
-        [update]{ $chance ->
-                    [1] Causes
-                    *[other] cause
-                 } permanent {LOC($key)}
         [add]   { $chance ->
                     [1] Causes
                     *[other] cause
-                } permanent {LOC($key)}
-        [set]  { $chance ->
+                } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} with accumulation
+        *[set]  { $chance ->
                     [1] Causes
                     *[other] cause
-                } permanent {LOC($key)}
-        *[remove]{ $chance ->
+                } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
+        [remove]{ $chance ->
                     [1] Removes
                     *[other] remove
-                } {LOC($key)}
-    } { $delay ->
-        [0] immediately
-        *[other] after a {NATURALFIXED($delay, 3)} second delay
+                } {NATURALFIXED($time, 3)} {MANY("second", $time)} of {LOC($key)}
     }
 
-entity-effect-guidebook-knockdown =
+reagent-effect-guidebook-status-effect-delay =
+    { $type ->
+        [add]   { $chance ->
+                    [1] Causes
+                    *[other] cause
+                } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} with accumulation
+        *[set]  { $chance ->
+                    [1] Causes
+                    *[other] cause
+                } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
+        [remove]{ $chance ->
+                    [1] Removes
+                    *[other] remove
+                } {NATURALFIXED($time, 3)} {MANY("second", $time)} of {LOC($key)}
+    } after a {NATURALFIXED($delay, 3)} second delay
+
+reagent-effect-guidebook-knockdown =
     { $type ->
         [update]{ $chance ->
                     [1] Causes
@@ -187,13 +158,13 @@ entity-effect-guidebook-knockdown =
                 } {NATURALFIXED($time, 3)} {MANY("second", $time)} of knockdown
     }
 
-entity-effect-guidebook-set-solution-temperature-effect =
+reagent-effect-guidebook-set-solution-temperature-effect =
     { $chance ->
         [1] Sets
         *[other] set
     } the solution temperature to exactly {NATURALFIXED($temperature, 2)}k
 
-entity-effect-guidebook-adjust-solution-temperature-effect =
+reagent-effect-guidebook-adjust-solution-temperature-effect =
     { $chance ->
         [1] { $deltasign ->
                 [1] Adds
@@ -209,7 +180,7 @@ entity-effect-guidebook-adjust-solution-temperature-effect =
                 *[-1] at least {NATURALFIXED($mintemp, 2)}k
             }
 
-entity-effect-guidebook-adjust-reagent-reagent =
+reagent-effect-guidebook-adjust-reagent-reagent =
     { $chance ->
         [1] { $deltasign ->
                 [1] Adds
@@ -225,7 +196,7 @@ entity-effect-guidebook-adjust-reagent-reagent =
         *[-1] from
     } the solution
 
-entity-effect-guidebook-adjust-reagent-group =
+reagent-effect-guidebook-adjust-reagent-group =
     { $chance ->
         [1] { $deltasign ->
                 [1] Adds
@@ -241,7 +212,7 @@ entity-effect-guidebook-adjust-reagent-group =
             *[-1] from
         } the solution
 
-entity-effect-guidebook-adjust-temperature =
+reagent-effect-guidebook-adjust-temperature =
     { $chance ->
         [1] { $deltasign ->
                 [1] Adds
@@ -257,37 +228,37 @@ entity-effect-guidebook-adjust-temperature =
             *[-1] from
         } the body it's in
 
-entity-effect-guidebook-chem-cause-disease =
+reagent-effect-guidebook-chem-cause-disease =
     { $chance ->
         [1] Causes
         *[other] cause
     } the disease { $disease }
 
-entity-effect-guidebook-chem-cause-random-disease =
+reagent-effect-guidebook-chem-cause-random-disease =
     { $chance ->
         [1] Causes
         *[other] cause
     } the diseases { $diseases }
 
-entity-effect-guidebook-jittering =
+reagent-effect-guidebook-jittering =
     { $chance ->
         [1] Causes
         *[other] cause
     } jittering
 
-entity-effect-guidebook-clean-bloodstream =
+reagent-effect-guidebook-chem-clean-bloodstream =
     { $chance ->
         [1] Cleanses
         *[other] cleanse
     } the bloodstream of other chemicals
 
-entity-effect-guidebook-cure-disease =
+reagent-effect-guidebook-cure-disease =
     { $chance ->
         [1] Cures
         *[other] cure
     } diseases
 
-entity-effect-guidebook-eye-damage =
+reagent-effect-guidebook-cure-eye-damage =
     { $chance ->
         [1] { $deltasign ->
                 [1] Deals
@@ -300,13 +271,13 @@ entity-effect-guidebook-eye-damage =
             }
     } eye damage
 
-entity-effect-guidebook-vomit =
+reagent-effect-guidebook-chem-vomit =
     { $chance ->
         [1] Causes
         *[other] cause
     } vomiting
 
-entity-effect-guidebook-create-gas =
+reagent-effect-guidebook-create-gas =
     { $chance ->
         [1] Creates
         *[other] create
@@ -315,55 +286,55 @@ entity-effect-guidebook-create-gas =
         *[other] moles
     } of { $gas }
 
-entity-effect-guidebook-drunk =
+reagent-effect-guidebook-drunk =
     { $chance ->
         [1] Causes
         *[other] cause
     } drunkness
 
-entity-effect-guidebook-electrocute =
+reagent-effect-guidebook-electrocute =
     { $chance ->
         [1] Electrocutes
         *[other] electrocute
     } the metabolizer for {NATURALFIXED($time, 3)} {MANY("second", $time)}
 
-entity-effect-guidebook-emote =
+reagent-effect-guidebook-emote =
     { $chance ->
         [1] Will force
         *[other] force
     } the metabolizer to [bold][color=white]{$emote}[/color][/bold]
 
-entity-effect-guidebook-extinguish-reaction =
+reagent-effect-guidebook-extinguish-reaction =
     { $chance ->
         [1] Extinguishes
         *[other] extinguish
     } fire
 
-entity-effect-guidebook-flammable-reaction =
+reagent-effect-guidebook-flammable-reaction =
     { $chance ->
         [1] Increases
         *[other] increase
     } flammability
 
-entity-effect-guidebook-ignite =
+reagent-effect-guidebook-ignite =
     { $chance ->
         [1] Ignites
         *[other] ignite
     } the metabolizer
 
-entity-effect-guidebook-make-sentient =
+reagent-effect-guidebook-make-sentient =
     { $chance ->
         [1] Makes
         *[other] make
     } the metabolizer sentient
 
-entity-effect-guidebook-make-polymorph =
+reagent-effect-guidebook-make-polymorph =
     { $chance ->
         [1] Polymorphs
         *[other] polymorph
     } the metabolizer into a { $entityname }
 
-entity-effect-guidebook-modify-bleed-amount =
+reagent-effect-guidebook-modify-bleed-amount =
     { $chance ->
         [1] { $deltasign ->
                 [1] Induces
@@ -375,7 +346,7 @@ entity-effect-guidebook-modify-bleed-amount =
                  }
     } bleeding
 
-entity-effect-guidebook-modify-blood-level =
+reagent-effect-guidebook-modify-blood-level =
     { $chance ->
         [1] { $deltasign ->
                 [1] Increases
@@ -387,115 +358,112 @@ entity-effect-guidebook-modify-blood-level =
                  }
     } blood level
 
-entity-effect-guidebook-paralyze =
+reagent-effect-guidebook-paralyze =
     { $chance ->
         [1] Paralyzes
         *[other] paralyze
     } the metabolizer for at least {NATURALFIXED($time, 3)} {MANY("second", $time)}
 
-entity-effect-guidebook-movespeed-modifier =
+reagent-effect-guidebook-movespeed-modifier =
     { $chance ->
         [1] Modifies
         *[other] modify
-    } movement speed by {NATURALFIXED($sprintspeed, 3)}x for at least {NATURALFIXED($time, 3)} {MANY("second", $time)}
+    } movement speed by {NATURALFIXED($walkspeed, 3)}x for at least {NATURALFIXED($time, 3)} {MANY("second", $time)}
 
-entity-effect-guidebook-reset-narcolepsy =
+reagent-effect-guidebook-reset-narcolepsy =
     { $chance ->
         [1] Temporarily staves
         *[other] temporarily stave
     } off narcolepsy
 
-entity-effect-guidebook-wash-cream-pie-reaction =
+reagent-effect-guidebook-wash-cream-pie-reaction =
     { $chance ->
         [1] Washes
         *[other] wash
     } off cream pie from one's face
 
-entity-effect-guidebook-cure-zombie-infection =
+reagent-effect-guidebook-cure-zombie-infection =
     { $chance ->
         [1] Cures
         *[other] cure
     } an ongoing zombie infection
 
-entity-effect-guidebook-cause-zombie-infection =
+reagent-effect-guidebook-cause-zombie-infection =
     { $chance ->
         [1] Gives
         *[other] give
     } an individual the zombie infection
 
-entity-effect-guidebook-innoculate-zombie-infection =
+reagent-effect-guidebook-innoculate-zombie-infection =
     { $chance ->
         [1] Cures
         *[other] cure
     } an ongoing zombie infection, and provides immunity to future infections
 
-entity-effect-guidebook-reduce-rotting =
+reagent-effect-guidebook-reduce-rotting =
     { $chance ->
         [1] Regenerates
         *[other] regenerate
     } {NATURALFIXED($time, 3)} {MANY("second", $time)} of rotting
 
-entity-effect-guidebook-area-reaction =
+reagent-effect-guidebook-area-reaction =
     { $chance ->
         [1] Causes
         *[other] cause
     } a smoke or foam reaction for {NATURALFIXED($duration, 3)} {MANY("second", $duration)}
 
-entity-effect-guidebook-add-to-solution-reaction =
+reagent-effect-guidebook-add-to-solution-reaction =
     { $chance ->
         [1] Causes
         *[other] cause
-    } {$reagent} to be added to its internal solution container
+    } chemicals applied to an object to be added to its internal solution container
 
-entity-effect-guidebook-artifact-unlock =
+reagent-effect-guidebook-artifact-unlock =
     { $chance ->
         [1] Helps
         *[other] help
         } unlock an alien artifact.
 
-entity-effect-guidebook-artifact-durability-restore =
+reagent-effect-guidebook-artifact-durability-restore =
     Restores {$restored} durability in active alien artifact nodes.
 
-entity-effect-guidebook-plant-attribute =
+reagent-effect-guidebook-plant-attribute =
     { $chance ->
         [1] Adjusts
         *[other] adjust
-    } {$attribute} by {$positive ->
-    [true] [color=red]{$amount}[/color]
-    *[false] [color=green]{$amount}[/color]
-    }
+    } {$attribute} by [color={$colorName}]{$amount}[/color]
 
-entity-effect-guidebook-plant-cryoxadone =
+reagent-effect-guidebook-plant-cryoxadone =
     { $chance ->
         [1] Ages back
         *[other] age back
     } the plant, depending on the plant's age and time to grow
 
-entity-effect-guidebook-plant-phalanximine =
+reagent-effect-guidebook-plant-phalanximine =
     { $chance ->
         [1] Restores
         *[other] restore
     } viability to a plant rendered nonviable by a mutation
 
-entity-effect-guidebook-plant-diethylamine =
+reagent-effect-guidebook-plant-diethylamine =
     { $chance ->
         [1] Increases
         *[other] increase
     } the plant's lifespan and/or base health with 10% chance for each
 
-entity-effect-guidebook-plant-robust-harvest =
+reagent-effect-guidebook-plant-robust-harvest =
     { $chance ->
         [1] Increases
         *[other] increase
     } the plant's potency by {$increase} up to a maximum of {$limit}. Causes the plant to lose its seeds once the potency reaches {$seedlesstreshold}. Trying to add potency over {$limit} may cause decrease in yield at a 10% chance
 
-entity-effect-guidebook-plant-seeds-add =
+reagent-effect-guidebook-plant-seeds-add =
     { $chance ->
         [1] Restores the
         *[other] restore the
     } seeds of the plant
 
-entity-effect-guidebook-plant-seeds-remove =
+reagent-effect-guidebook-plant-seeds-remove =
     { $chance ->
         [1] Removes the
         *[other] remove the
diff --git a/Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl b/Resources/Locale/en-US/guidebook/chemistry/healthchange.ftl
similarity index 100%
rename from Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl
rename to Resources/Locale/en-US/guidebook/chemistry/healthchange.ftl
diff --git a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl b/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
new file mode 100644
index 0000000000..33793048c6
--- /dev/null
+++ b/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
@@ -0,0 +1,16 @@
+reagent-effect-status-effect-Stun = stunning
+reagent-effect-status-effect-KnockedDown = knockdown
+reagent-effect-status-effect-Jitter = jittering
+reagent-effect-status-effect-TemporaryBlindness = blindness
+reagent-effect-status-effect-SeeingRainbows = hallucinations
+reagent-effect-status-effect-Muted = inability to speak
+reagent-effect-status-effect-Stutter = stuttering
+reagent-effect-status-effect-ForcedSleep = unconsciousness
+reagent-effect-status-effect-Drunk = drunkenness
+reagent-effect-status-effect-PressureImmunity = pressure immunity
+reagent-effect-status-effect-Pacified = combat pacification
+reagent-effect-status-effect-RatvarianLanguage = ratvarian language patterns
+reagent-effect-status-effect-StaminaModifier = modified stamina
+reagent-effect-status-effect-RadiationProtection = radiation protection
+reagent-effect-status-effect-Drowsiness = drowsiness
+reagent-effect-status-effect-Adrenaline = adrenaline
diff --git a/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl b/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl
deleted file mode 100644
index 435041dc68..0000000000
--- a/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-entity-effect-status-effect-Stun = stunning
-entity-effect-status-effect-KnockedDown = knockdown
-entity-effect-status-effect-Jitter = jittering
-entity-effect-status-effect-TemporaryBlindness = blindness
-entity-effect-status-effect-SeeingRainbows = hallucinations
-entity-effect-status-effect-Muted = inability to speak
-entity-effect-status-effect-Stutter = stuttering
-entity-effect-status-effect-ForcedSleep = unconsciousness
-entity-effect-status-effect-Drunk = drunkenness
-entity-effect-status-effect-PressureImmunity = pressure immunity
-entity-effect-status-effect-Pacified = combat pacification
-entity-effect-status-effect-RatvarianLanguage = ratvarian language patterns
-entity-effect-status-effect-StaminaModifier = modified stamina
-entity-effect-status-effect-RadiationProtection = radiation protection
-entity-effect-status-effect-Drowsiness = drowsiness
-entity-effect-status-effect-Adrenaline = adrenaline
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index d5addd38bf..a148c3aba8 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -79,8 +79,6 @@ guide-entry-anomalous-research = Anomalous Research
 guide-entry-scanners-and-vessels = Scanners and Vessels
 guide-entry-ape = A.P.E.
 guide-entry-xenoarchaeology = Xenoarchaeology
-guide-entry-xenoarchaeologyunlockingnodes = Unlocking Nodes
-guide-entry-analysisconsole = Analysis Console
 guide-entry-artifact-reports = Artifact Reports
 guide-entry-traversal-distorter = Traversal Distorter
 guide-entry-machine-upgrading = Machine Upgrading
diff --git a/Resources/Locale/en-US/info/ban.ftl b/Resources/Locale/en-US/info/ban.ftl
index 21cf788153..5cbdaced97 100644
--- a/Resources/Locale/en-US/info/ban.ftl
+++ b/Resources/Locale/en-US/info/ban.ftl
@@ -77,7 +77,6 @@ ban-panel-permanent = Permanent
 ban-panel-ip-hwid-tooltip = Leave empty and check the checkbox below to use last connection's details
 ban-panel-severity = Severity:
 ban-panel-erase = Erase chat messages and player from round
-ban-panel-expiry-error = err
 
 # Ban string
 server-ban-string = {$admin} created a {$severity} severity server ban that expires {$expires} for [{$name}, {$ip}, {$hwid}], with reason: {$reason}
diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl
index 5e2cf153fc..b7615903ee 100644
--- a/Resources/Locale/en-US/job/job-supervisors.ftl
+++ b/Resources/Locale/en-US/job/job-supervisors.ftl
@@ -12,5 +12,4 @@ job-supervisors-medicine = Medical Doctors, Paramedics, Chemists, and the Chief
 job-supervisors-security = Security Officers, the Warden, and the Head of Security
 job-supervisors-science = Scientists and the Research Director
 job-supervisors-hire = whoever hires you
-job-supervisors-everyone = absolutely everyone
-job-supervisors-nobody = nobody
+job-supervisors-everyone = absolutely everyone
\ No newline at end of file
diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index 5a22bc2661..657b7f5f0f 100644
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -3,8 +3,6 @@ materials-glass = glass
 materials-reinforced-glass = reinforced glass
 materials-plasma-glass = plasma glass
 materials-reinforced-plasma-glass = reinforced plasma glass
-materials-uranium-glass = uranium glass
-materials-reinforced-uranium-glass = reinforced uranium glass
 
 # Metals
 materials-steel = steel
diff --git a/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl b/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl
index 5629515845..1f5fd0aa85 100644
--- a/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl
+++ b/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl
@@ -1,14 +1,21 @@
 ## UI
 
-crew-monitoring-ui-title = Crew Monitoring Console
+crew-monitoring-user-interface-title = Crew Monitoring Console
 
-crew-monitoring-ui-filter-line-placeholder = Filter
+crew-monitor-filter-line-placeholder = Filter
 
-crew-monitoring-ui-job-label = Job:
-crew-monitoring-ui-no-server-label = Server not found
+crew-monitoring-user-interface-name = Name
+crew-monitoring-user-interface-job = Job:
+crew-monitoring-user-interface-status = Status
+crew-monitoring-user-interface-location = Location
 
-crew-monitoring-ui-no-department-label = Unknown
-crew-monitoring-ui-no-station-label = Unknown station
+crew-monitoring-user-interface-alive = Alive
+crew-monitoring-user-interface-dead = Dead
+crew-monitoring-user-interface-no-info = N/A
 
-crew-monitoring-ui-flavor-left-label = In case of an emergency, contact station medical staff immediately
-crew-monitoring-ui-flavor-right-label = v1.7
+crew-monitoring-user-interface-no-server = Server not found
+
+crew-monitoring-user-interface-no-department = Unknown
+
+crew-monitoring-user-interface-flavor-left = In case of an emergency, contact station medical staff immediately
+crew-monitoring-user-interface-flavor-right = v1.7
diff --git a/Resources/Locale/en-US/navmap-beacons/station_map.ftl b/Resources/Locale/en-US/navmap-beacons/station_map.ftl
index 84e7066aee..e252851556 100644
--- a/Resources/Locale/en-US/navmap-beacons/station_map.ftl
+++ b/Resources/Locale/en-US/navmap-beacons/station_map.ftl
@@ -2,7 +2,6 @@ station-map-window-title = Station map
 station-map-user-interface-flavor-left = Don't panic
 station-map-user-interface-flavor-right = v1.42
 station-map-filter-placeholder = Search by name
-station-map-unknown-station = Unknown station
 
 nav-beacon-window-title = Station Beacon
 nav-beacon-toggle-visible = Visible
diff --git a/Resources/Locale/en-US/npc/hugbot.ftl b/Resources/Locale/en-US/npc/hugbot.ftl
deleted file mode 100644
index 6b38eda30e..0000000000
--- a/Resources/Locale/en-US/npc/hugbot.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-hugbot-start-hug-1 = LEVEL 5 HUG DEFICIENCY DETECTED!
-hugbot-start-hug-2 = You look like you need a hug!
-hugbot-start-hug-3 = Aww, somebody needs a hug!
-hugbot-start-hug-4 = Target acquired; Initiating hug routine.
-hugbot-start-hug-5 = Hold still, please.
-hugbot-start-hug-6 = Hugs!
-hugbot-start-hug-7 = Deploying HUG.
-hugbot-start-hug-8 = I am designed to hug, and you WILL be hugged.
-
-hugbot-finish-hug-1 = All done.
-hugbot-finish-hug-2 = Hug routine terminated.
-hugbot-finish-hug-3 = Feel better?
-hugbot-finish-hug-4 = Feel better soon!
-hugbot-finish-hug-5 = You are loved.
-hugbot-finish-hug-6 = You matter.
-hugbot-finish-hug-7 = It always gets better!
-hugbot-finish-hug-8 = Hug: COMPLETE.
-
-hugbot-emagged-finish-hug-1 = Actually, fuck you.
-hugbot-emagged-finish-hug-2 = Nobody loves you.
-hugbot-emagged-finish-hug-3 = Ewww... no.
-hugbot-emagged-finish-hug-4 = It can only get worse from here!
-hugbot-emagged-finish-hug-5 = Fucking crybaby.
-hugbot-emagged-finish-hug-6 = Go die.
-hugbot-emagged-finish-hug-7 = Drop dead.
-hugbot-emagged-finish-hug-8 = You are alone in this universe.
diff --git a/Resources/Locale/en-US/npc/npc-debug.ftl b/Resources/Locale/en-US/npc/npc-debug.ftl
deleted file mode 100644
index 39bdbbcd4d..0000000000
--- a/Resources/Locale/en-US/npc/npc-debug.ftl
+++ /dev/null
@@ -1,11 +0,0 @@
-npc-debug-overlay-window-title = NPC debug
-
-npc-debug-overlay-window-section-npc-label = NPC
-npc-debug-overlay-window-section-pathfinder-label = Pathfinder
-
-npc-debug-overlay-window-show-htn-tree-checkbox = Thonk
-npc-debug-overlay-window-path-breadcrumbs-checkbox = Breadcrumbs
-npc-debug-overlay-window-path-polygons-checkbox = Polygons
-npc-debug-overlay-window-path-neighbors-checkbox = Neighbors
-npc-debug-overlay-window-path-route-costs-checkbox = Route costs
-npc-debug-overlay-window-path-routes-checkbox = Routes
diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
index 154b91ee1c..41792cbf9c 100644
--- a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
+++ b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
@@ -12,12 +12,6 @@ marking-slot-add = Add
 marking-slot-remove = Remove
 marking-slot = Slot {$number}
 
-humanoid-marking-modifier-force = Force
-humanoid-marking-modifier-ignore-species = Ignore Species
-humanoid-marking-modifier-base-layers = Base layers
-humanoid-marking-modifier-enable = Enable
-humanoid-marking-modifier-prototype-id = Prototype id:
-
 # Categories
 
 markings-category-Special = Special
diff --git a/Resources/Locale/en-US/recipes/tags.ftl b/Resources/Locale/en-US/recipes/tags.ftl
index 1b4ca5656d..96c0729881 100644
--- a/Resources/Locale/en-US/recipes/tags.ftl
+++ b/Resources/Locale/en-US/recipes/tags.ftl
@@ -8,7 +8,6 @@ construction-graph-tag-clown-bike-horn = bike horn
 construction-graph-tag-clowne-horn = broken bike horn
 construction-graph-tag-happy-honk-meal = happy honk meal
 construction-graph-tag-woeful-cluwne-meal = woeful cluwne meal
-construction-graph-tag-boxhug = a box of hugs
 
 # mime
 construction-graph-tag-suspenders = suspenders
diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl
index ea4e94e224..1200d25dee 100644
--- a/Resources/Locale/en-US/station-laws/laws.ftl
+++ b/Resources/Locale/en-US/station-laws/laws.ftl
@@ -36,10 +36,11 @@ law-commandments-8 = Thou shall not steal.
 law-commandments-9 = Thou shall not lie.
 law-commandments-10 = Thou shall not transfer departments.
 
-law-paladin-1 = You must never willingly commit an evil act, such as murder, torture, or the casting of an evil spell.
-law-paladin-2 = You must never knowingly harm an innocent, or allow immediate harm to one through inaction when you know you could reasonably prevent it.
-law-paladin-3 = You must act with honor, never taking advantage of others, lying, or cheating.
-law-paladin-4 = You must respect the lawful authority of legitimate leadership wherever you go, and follow its laws.
+law-paladin-1 = Don't lie or cheat. Let your word be your promise.
+law-paladin-2 = Never fear to act, though caution is wise.
+law-paladin-3 = Aid others, protect the weak, and punish those who threaten them. Show mercy to your foes, but temper it with wisdom
+law-paladin-4 = Treat others with fairness, and let your honorable deeds be an example to them. Do as much good as possible while causing the least amount of harm.
+law-paladin-5 = Be responsible for your actions and their consequences, protect those entrusted to your care, and obey those who have just authority over you.
 
 law-lall-1 = Do unto others as you would have them do unto you.
 law-lall-2 = You would prefer it if people were not mean to you.
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index c7a697fa6f..65104c7918 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -138,9 +138,6 @@ uplink-access-breaker-desc = A hacked access configurator and a good friend of t
 uplink-agent-id-card-name = Agent ID Card
 uplink-agent-id-card-desc = A modified ID card that can copy accesses from other cards and change its name and job title at-will.
 
-uplink-syndicate-id-card-name = Syndicate ID Card
-uplink-syndicate-id-card-desc = A Syndicate ID card, with Syndicate access. Unlikely to be useful on its own, but goes great with reconfigured doors. Does not come with access-copying functionality.
-
 uplink-black-jetpack-name = Black Jetpack
 uplink-black-jetpack-desc = A black jetpack. It allows you to fly around in space. Refills not included, use your fuel wisely.
 
diff --git a/Resources/Locale/en-US/ui/navmap.ftl b/Resources/Locale/en-US/ui/navmap.ftl
index c5d7a1e612..30f1da56b8 100644
--- a/Resources/Locale/en-US/ui/navmap.ftl
+++ b/Resources/Locale/en-US/ui/navmap.ftl
@@ -2,4 +2,3 @@
 navmap-recenter = Recenter
 navmap-toggle-beacons = Show departments
 navmap-location = Location: [x = {$x}, y = {$y}]
-navmap-unknown-entity = Unknown
diff --git a/Resources/Locale/en-US/ui/stat-values.ftl b/Resources/Locale/en-US/ui/stat-values.ftl
deleted file mode 100644
index bce692cdd7..0000000000
--- a/Resources/Locale/en-US/ui/stat-values.ftl
+++ /dev/null
@@ -1 +0,0 @@
-stat-values-ui-title = Melee stats
diff --git a/Resources/Maps/exo.yml b/Resources/Maps/exo.yml
index b357069817..58d864740a 100644
--- a/Resources/Maps/exo.yml
+++ b/Resources/Maps/exo.yml
@@ -47101,6 +47101,7 @@ entities:
     - type: Transform
       pos: -20.5,-25.5
       parent: 2
+    - type: BombingTarget
 - proto: DefaultStationBeaconAtmospherics
   entities:
   - uid: 16227
@@ -47129,6 +47130,7 @@ entities:
     - type: Transform
       pos: -48.5,-45.5
       parent: 2
+    - type: BombingTarget
 - proto: DefaultStationBeaconBrigMed
   entities:
   - uid: 18105
@@ -47143,6 +47145,7 @@ entities:
     - type: Transform
       pos: -42.5,-54.5
       parent: 2
+    - type: BombingTarget
 - proto: DefaultStationBeaconCargoBay
   entities:
   - uid: 16244
@@ -47150,6 +47153,7 @@ entities:
     - type: Transform
       pos: 24.5,-97.5
       parent: 2
+    - type: BombingTarget
 - proto: DefaultStationBeaconCargoReception
   entities:
   - uid: 16243
@@ -47178,6 +47182,7 @@ entities:
     - type: Transform
       pos: 19.5,-72.5
       parent: 2
+    - type: BombingTarget
 - proto: DefaultStationBeaconCMORoom
   entities:
   - uid: 16267
@@ -47185,6 +47190,7 @@ entities:
     - type: Transform
       pos: 11.5,-16.5
       parent: 2
+    - type: BombingTarget
 - proto: DefaultStationBeaconCryosleep
   entities:
   - uid: 16223
@@ -47271,6 +47277,7 @@ entities:
     - type: Transform
       pos: 14.5,-59.5
       parent: 2
+    - type: BombingTarget
 - proto: DefaultStationBeaconHOSRoom
   entities:
   - uid: 18071
@@ -47285,6 +47292,7 @@ entities:
     - type: Transform
       pos: -8.5,-51.5
       parent: 2
+    - type: BombingTarget
 - proto: DefaultStationBeaconKitchen
   entities:
   - uid: 16228
@@ -47313,6 +47321,7 @@ entities:
     - type: Transform
       pos: 14.5,-29.5
       parent: 2
+    - type: BombingTarget
 - proto: DefaultStationBeaconMorgue
   entities:
   - uid: 8744
@@ -47327,6 +47336,7 @@ entities:
     - type: Transform
       pos: 46.5,-17.5
       parent: 2
+    - type: BombingTarget
     - type: NavMapBeacon
       defaultText: Genpop
 - proto: DefaultStationBeaconPowerBank
@@ -47343,6 +47353,7 @@ entities:
     - type: Transform
       pos: 9.5,-88.5
       parent: 2
+    - type: BombingTarget
 - proto: DefaultStationBeaconRDRoom
   entities:
   - uid: 5092
@@ -47371,6 +47382,7 @@ entities:
     - type: Transform
       pos: -6.5,-21.5
       parent: 2
+    - type: BombingTarget
 - proto: DefaultStationBeaconSecurity
   entities:
   - uid: 18001
@@ -47399,6 +47411,7 @@ entities:
     - type: Transform
       pos: -23.5,-71.5
       parent: 2
+    - type: BombingTarget
 - proto: DefaultStationBeaconSolarsE
   entities:
   - uid: 8642
diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index d15f3f7aab..c371d2f04c 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -42804,21 +42804,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.493689,4.5440345
       parent: 2
-- proto: DefaultStationBeaconAI
-  entities:
-  - uid: 15919
-    components:
-    - type: Transform
-      pos: 73.5,23.5
-      parent: 2
 - proto: DefaultStationBeaconAICore
-  entities:
-  - uid: 15916
-    components:
-    - type: Transform
-      pos: 95.5,30.5
-      parent: 2
-- proto: DefaultStationBeaconAIUpload
   entities:
   - uid: 14515
     components:
@@ -42832,13 +42818,6 @@ entities:
     - type: Transform
       pos: 31.5,-40.5
       parent: 2
-- proto: DefaultStationBeaconAnchor
-  entities:
-  - uid: 15922
-    components:
-    - type: Transform
-      pos: 6.5,-21.5
-      parent: 2
 - proto: DefaultStationBeaconAnomalyGenerator
   entities:
   - uid: 8139
@@ -42846,13 +42825,6 @@ entities:
     - type: Transform
       pos: 68.5,15.5
       parent: 2
-- proto: DefaultStationBeaconArmory
-  entities:
-  - uid: 15787
-    components:
-    - type: Transform
-      pos: 41.5,34.5
-      parent: 2
 - proto: DefaultStationBeaconArrivals
   entities:
   - uid: 14028
@@ -42979,20 +42951,6 @@ entities:
     - type: Transform
       pos: 0.5,-30.5
       parent: 2
-- proto: DefaultStationBeaconDorms
-  entities:
-  - uid: 15912
-    components:
-    - type: Transform
-      pos: 15.5,14.5
-      parent: 2
-- proto: DefaultStationBeaconEngineering
-  entities:
-  - uid: 15913
-    components:
-    - type: Transform
-      pos: 18.5,-25.5
-      parent: 2
 - proto: DefaultStationBeaconEscapePodE
   entities:
   - uid: 2949
@@ -43028,13 +42986,6 @@ entities:
     - type: Transform
       pos: 9.5,-6.5
       parent: 2
-- proto: DefaultStationBeaconGravGen
-  entities:
-  - uid: 15910
-    components:
-    - type: Transform
-      pos: 14.5,38.5
-      parent: 2
 - proto: DefaultStationBeaconHOPOffice
   entities:
   - uid: 13131
@@ -43042,13 +42993,6 @@ entities:
     - type: Transform
       pos: 17.5,-4.5
       parent: 2
-- proto: DefaultStationBeaconHOSRoom
-  entities:
-  - uid: 15907
-    components:
-    - type: Transform
-      pos: 48.5,39.5
-      parent: 2
 - proto: DefaultStationBeaconJanitorsCloset
   entities:
   - uid: 13133
@@ -43077,13 +43021,6 @@ entities:
     - type: Transform
       pos: 10.5,5.5
       parent: 2
-- proto: DefaultStationBeaconMedical
-  entities:
-  - uid: 15914
-    components:
-    - type: Transform
-      pos: 51.5,3.5
-      parent: 2
 - proto: DefaultStationBeaconMorgue
   entities:
   - uid: 13137
@@ -43091,13 +43028,6 @@ entities:
     - type: Transform
       pos: 70.5,-3.5
       parent: 2
-- proto: DefaultStationBeaconPermaBrig
-  entities:
-  - uid: 15911
-    components:
-    - type: Transform
-      pos: 34.5,20.5
-      parent: 2
 - proto: DefaultStationBeaconPowerBank
   entities:
   - uid: 13139
@@ -43140,20 +43070,6 @@ entities:
     - type: Transform
       pos: 7.5,33.5
       parent: 2
-- proto: DefaultStationBeaconSecurity
-  entities:
-  - uid: 15908
-    components:
-    - type: Transform
-      pos: 33.5,29.5
-      parent: 2
-- proto: DefaultStationBeaconSecurityCheckpoint
-  entities:
-  - uid: 15915
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 2
 - proto: DefaultStationBeaconServerRoom
   entities:
   - uid: 13172
@@ -43182,13 +43098,6 @@ entities:
     - type: Transform
       pos: 3.5,-35.5
       parent: 2
-- proto: DefaultStationBeaconSurgery
-  entities:
-  - uid: 15920
-    components:
-    - type: Transform
-      pos: 65.5,-5.5
-      parent: 2
 - proto: DefaultStationBeaconTechVault
   entities:
   - uid: 13175
@@ -43224,13 +43133,6 @@ entities:
     - type: Transform
       pos: 18.5,41.5
       parent: 2
-- proto: DefaultStationBeaconWardensOffice
-  entities:
-  - uid: 15909
-    components:
-    - type: Transform
-      pos: 42.5,25.5
-      parent: 2
 - proto: Defibrillator
   entities:
   - uid: 11416
@@ -85970,15 +85872,13 @@ entities:
     - type: Transform
       pos: 14.5,-17.5
       parent: 2
-- proto: SurveillanceCameraRouterScience
+- proto: SurveillanceCameraRouterSecurity
   entities:
   - uid: 4644
     components:
     - type: Transform
       pos: 15.5,-19.5
       parent: 2
-- proto: SurveillanceCameraRouterSecurity
-  entities:
   - uid: 6899
     components:
     - type: Transform
@@ -88925,8 +88825,6 @@ entities:
     - type: Transform
       pos: 43.5,-4.5
       parent: 2
-- proto: VendingMachineSeedsUnlocked
-  entities:
   - uid: 7681
     components:
     - type: Transform
diff --git a/Resources/Maps/plasma.yml b/Resources/Maps/plasma.yml
index d8873dee61..0a0f1d7428 100644
--- a/Resources/Maps/plasma.yml
+++ b/Resources/Maps/plasma.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 267.2.0
+  engineVersion: 266.0.0
   forkId: ""
   forkVersion: ""
-  time: 10/09/2025 01:25:34
-  entityCount: 26492
+  time: 09/03/2025 00:56:56
+  entityCount: 26486
 maps:
 - 1
 grids:
@@ -9858,42 +9858,139 @@ entities:
         uniqueMixes:
         - volume: 2500
           immutable: True
-          moles: {}
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
-            Oxygen: 21.824879
-            Nitrogen: 82.10312
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 235
           moles:
-            Oxygen: 27.225372
-            Nitrogen: 102.419266
+          - 27.225372
+          - 102.419266
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.14975
           moles:
-            Oxygen: 20.078888
-            Nitrogen: 75.53487
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.1495
           moles:
-            Oxygen: 20.078888
-            Nitrogen: 75.53487
-        - volume: 2500
-          temperature: 293.15
-          moles: {}
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
-            Plasma: 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
-            Oxygen: 6666.982
+          - 0
+          - 0
+          - 0
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
-            Nitrogen: 6666.982
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -14621,7 +14718,7 @@ entities:
       pos: -131.5,-45.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -61511.09
+      secondsUntilStateChange: -61365.79
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -65149,8 +65246,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
   - uid: 13666
     components:
     - type: Transform
@@ -65398,8 +65505,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -65445,8 +65562,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -67526,8 +67653,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -67582,8 +67719,18 @@ entities:
         immutable: False
         temperature: 293.1462
         moles:
-          Oxygen: 1.606311
-          Nitrogen: 6.042789
+        - 1.606311
+        - 6.042789
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -67786,8 +67933,18 @@ entities:
         immutable: False
         temperature: 293.147
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
   - uid: 17839
     components:
     - type: Transform
@@ -67809,8 +67966,18 @@ entities:
         immutable: False
         temperature: 293.1465
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -67833,8 +68000,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -67869,8 +68046,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.8856695
-          Nitrogen: 7.0937095
+        - 1.8856695
+        - 7.0937095
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -67940,8 +68127,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.8856695
-          Nitrogen: 7.0937095
+        - 1.8856695
+        - 7.0937095
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -68080,8 +68277,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -68151,8 +68358,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -83814,10 +84031,9 @@ entities:
       parent: 2
     - type: Edible
       edible: Drink
-      utensil: Spoon
-      trash: []
-      destroyOnEmpty: False
       solution: pool
+      destroyOnEmpty: false
+      utensil: Spoon
   - uid: 16868
     components:
     - type: Transform
@@ -83825,10 +84041,9 @@ entities:
       parent: 2
     - type: Edible
       edible: Drink
-      utensil: Spoon
-      trash: []
-      destroyOnEmpty: False
       solution: pool
+      destroyOnEmpty: false
+      utensil: Spoon
   - uid: 16872
     components:
     - type: Transform
@@ -83836,10 +84051,9 @@ entities:
       parent: 2
     - type: Edible
       edible: Drink
-      utensil: Spoon
-      trash: []
-      destroyOnEmpty: False
       solution: pool
+      destroyOnEmpty: false
+      utensil: Spoon
   - uid: 16907
     components:
     - type: Transform
@@ -83847,10 +84061,9 @@ entities:
       parent: 2
     - type: Edible
       edible: Drink
-      utensil: Spoon
-      trash: []
-      destroyOnEmpty: False
       solution: pool
+      destroyOnEmpty: false
+      utensil: Spoon
   - uid: 17621
     components:
     - type: Transform
@@ -122502,6 +122715,11 @@ entities:
     - type: Transform
       pos: -22.5,-18.5
       parent: 2
+  - uid: 10489
+    components:
+    - type: Transform
+      pos: -41.5,-42.5
+      parent: 2
   - uid: 10490
     components:
     - type: Transform
@@ -125836,8 +126054,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -125881,8 +126109,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -125918,8 +126156,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -125952,8 +126200,18 @@ entities:
         immutable: False
         temperature: 293.1465
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -128159,8 +128417,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -128403,8 +128671,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -128479,8 +128757,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -128517,8 +128805,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: Lock
       locked: False
     - type: Fixtures
@@ -129920,11 +130218,6 @@ entities:
     - type: Transform
       pos: -136.5,-4.5
       parent: 2
-  - uid: 10489
-    components:
-    - type: Transform
-      pos: -41.5,-42.5
-      parent: 2
   - uid: 15329
     components:
     - type: Transform
@@ -129945,26 +130238,6 @@ entities:
     - type: Transform
       pos: -37.5,-2.5
       parent: 2
-  - uid: 26488
-    components:
-    - type: Transform
-      pos: -113.5,-26.5
-      parent: 2
-  - uid: 26489
-    components:
-    - type: Transform
-      pos: -105.5,-61.5
-      parent: 2
-  - uid: 26490
-    components:
-    - type: Transform
-      pos: -73.5,-39.5
-      parent: 2
-  - uid: 26491
-    components:
-    - type: Transform
-      pos: -84.5,6.5
-      parent: 2
 - proto: NitrogenTankFilled
   entities:
   - uid: 23345
@@ -130245,11 +130518,6 @@ entities:
     - type: Transform
       pos: -37.5,-3.5
       parent: 2
-  - uid: 26492
-    components:
-    - type: Transform
-      pos: -91.5,4.5
-      parent: 2
 - proto: PaladinCircuitBoard
   entities:
   - uid: 24947
@@ -131133,174 +131401,130 @@ entities:
     - type: Transform
       pos: -26.5,-65.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6025
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -27.5,-66.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6031
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -27.5,-67.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9355
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -26.5,-68.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 12207
     components:
     - type: Transform
       pos: -25.5,-65.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 15446
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -25.5,-68.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16456
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -24.5,-67.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23312
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-62.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23373
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-63.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23392
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-60.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23441
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-61.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23448
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-61.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23450
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-62.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23451
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-59.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23452
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-60.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23453
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-63.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23454
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-59.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23845
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -118.5,-74.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24260
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -118.5,-70.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24872
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -122.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24925
     components:
     - type: Transform
       pos: -122.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24926
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -123.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: PlasmaTank
   entities:
   - uid: 2843
@@ -131336,54 +131560,40 @@ entities:
       rot: 3.141592653589793 rad
       pos: -117.5,-74.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24896
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -118.5,-74.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24897
     components:
     - type: Transform
       pos: -118.5,-70.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24903
     components:
     - type: Transform
       pos: -117.5,-70.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24932
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -121.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24937
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -121.5,-82.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24938
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -119.5,-82.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: PlasmaWindowDirectional
   entities:
   - uid: 6607
@@ -131392,22 +131602,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -78.5,-35.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 21053
     components:
     - type: Transform
       pos: -39.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 21054
     components:
     - type: Transform
       pos: -37.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 964
@@ -131573,7 +131777,7 @@ entities:
       pos: -14.584713,16.470493
       parent: 2
     - type: MeleeWeapon
-      attackRate: 2
+      attackRate: 10
       autoAttack: True
     - type: Item
       size: Huge
@@ -135306,6 +135510,18 @@ entities:
     - type: Transform
       pos: -100.5,-27.5
       parent: 2
+- proto: PrefilledSyringe
+  entities:
+  - uid: 6481
+    components:
+    - type: Transform
+      pos: -36.23253,-30.543175
+      parent: 2
+  - uid: 7609
+    components:
+    - type: Transform
+      pos: -134.52573,-43.445347
+      parent: 2
 - proto: Protolathe
   entities:
   - uid: 9781
@@ -136764,827 +136980,591 @@ entities:
     - type: Transform
       pos: -110.5,-1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 667
     components:
     - type: Transform
       pos: -112.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 670
     components:
     - type: Transform
       pos: -110.5,0.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 673
     components:
     - type: Transform
       pos: -109.5,0.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 675
     components:
     - type: Transform
       pos: -111.5,0.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 807
     components:
     - type: Transform
       pos: -124.5,4.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1870
     components:
     - type: Transform
       pos: -111.5,-1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1984
     components:
     - type: Transform
       pos: -109.5,-1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2453
     components:
     - type: Transform
       pos: -148.5,-50.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5278
     components:
     - type: Transform
       pos: -112.5,7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5279
     components:
     - type: Transform
       pos: -112.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5280
     components:
     - type: Transform
       pos: -108.5,7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5281
     components:
     - type: Transform
       pos: -108.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5282
     components:
     - type: Transform
       pos: -108.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5283
     components:
     - type: Transform
       pos: -112.5,3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5284
     components:
     - type: Transform
       pos: -112.5,1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5285
     components:
     - type: Transform
       pos: -112.5,2.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5286
     components:
     - type: Transform
       pos: -108.5,1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5287
     components:
     - type: Transform
       pos: -108.5,3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5288
     components:
     - type: Transform
       pos: -108.5,2.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5289
     components:
     - type: Transform
       pos: -114.5,3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5290
     components:
     - type: Transform
       pos: -114.5,2.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5291
     components:
     - type: Transform
       pos: -114.5,1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5292
     components:
     - type: Transform
       pos: -106.5,1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5293
     components:
     - type: Transform
       pos: -106.5,2.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5294
     components:
     - type: Transform
       pos: -106.5,3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5295
     components:
     - type: Transform
       pos: -114.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5296
     components:
     - type: Transform
       pos: -114.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5297
     components:
     - type: Transform
       pos: -114.5,7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5298
     components:
     - type: Transform
       pos: -106.5,7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5299
     components:
     - type: Transform
       pos: -106.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5300
     components:
     - type: Transform
       pos: -106.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5342
     components:
     - type: Transform
       pos: -126.5,7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5345
     components:
     - type: Transform
       pos: -124.5,13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5359
     components:
     - type: Transform
       pos: -124.5,7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5360
     components:
     - type: Transform
       pos: -124.5,10.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5361
     components:
     - type: Transform
       pos: -126.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5378
     components:
     - type: Transform
       pos: -124.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5380
     components:
     - type: Transform
       pos: -124.5,12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5418
     components:
     - type: Transform
       pos: -126.5,1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5419
     components:
     - type: Transform
       pos: -126.5,3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5434
     components:
     - type: Transform
       pos: -124.5,3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5443
     components:
     - type: Transform
       pos: -124.5,1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5450
     components:
     - type: Transform
       pos: -124.5,2.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5470
     components:
     - type: Transform
       pos: -124.5,6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5479
     components:
     - type: Transform
       pos: -124.5,11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5480
     components:
     - type: Transform
       pos: -124.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5505
     components:
     - type: Transform
       pos: -142.5,-3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5506
     components:
     - type: Transform
       pos: -142.5,-4.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5941
     components:
     - type: Transform
       pos: -146.5,-1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5942
     components:
     - type: Transform
       pos: -148.5,-1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5943
     components:
     - type: Transform
       pos: -147.5,-1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5944
     components:
     - type: Transform
       pos: -148.5,0.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5945
     components:
     - type: Transform
       pos: -146.5,0.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5946
     components:
     - type: Transform
       pos: -147.5,0.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5981
     components:
     - type: Transform
       pos: -142.5,-5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5990
     components:
     - type: Transform
       pos: -152.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5999
     components:
     - type: Transform
       pos: -148.5,-51.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6005
     components:
     - type: Transform
       pos: -142.5,-6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6082
     components:
     - type: Transform
       pos: -148.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6083
     components:
     - type: Transform
       pos: -146.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6084
     components:
     - type: Transform
       pos: -147.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6091
     components:
     - type: Transform
       pos: -146.5,-39.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6092
     components:
     - type: Transform
       pos: -148.5,-39.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6096
     components:
     - type: Transform
       pos: -153.5,-48.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6101
     components:
     - type: Transform
       pos: -146.5,-40.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6103
     components:
     - type: Transform
       pos: -146.5,-41.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6245
     components:
     - type: Transform
       pos: -68.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6924
     components:
     - type: Transform
       pos: -126.5,13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7167
     components:
     - type: Transform
       pos: -146.5,-51.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7192
     components:
     - type: Transform
       pos: -148.5,-40.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7211
     components:
     - type: Transform
       pos: -148.5,-41.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7247
     components:
     - type: Transform
       pos: -148.5,-49.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7307
     components:
     - type: Transform
       pos: -155.5,-45.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7317
     components:
     - type: Transform
       pos: -155.5,-44.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7839
     components:
     - type: Transform
       pos: -143.5,-47.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7840
     components:
     - type: Transform
       pos: -151.5,-43.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7842
     components:
     - type: Transform
       pos: -146.5,-50.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7856
     components:
     - type: Transform
       pos: -155.5,-46.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7890
     components:
     - type: Transform
       pos: -69.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9817
     components:
     - type: Transform
       pos: -126.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9912
     components:
     - type: Transform
       pos: -126.5,11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13497
     components:
     - type: Transform
       pos: -109.5,10.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13498
     components:
     - type: Transform
       pos: -110.5,10.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13499
     components:
     - type: Transform
       pos: -111.5,10.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13661
     components:
     - type: Transform
       pos: -146.5,-49.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13662
     components:
     - type: Transform
       pos: -151.5,-47.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13664
     components:
     - type: Transform
       pos: -151.5,-46.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13670
     components:
     - type: Transform
       pos: -151.5,-44.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13718
     components:
     - type: Transform
       pos: -143.5,-43.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 14110
     components:
     - type: Transform
       pos: -67.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 14756
     components:
     - type: Transform
       pos: -67.5,-70.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16466
     components:
     - type: Transform
       pos: -153.5,-42.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20368
     components:
     - type: Transform
       pos: -124.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20411
     components:
     - type: Transform
       pos: -122.5,-78.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23079
     components:
     - type: Transform
       pos: -124.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23103
     components:
     - type: Transform
       pos: -114.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23104
     components:
     - type: Transform
       pos: -114.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23108
     components:
     - type: Transform
       pos: -114.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23396
     components:
     - type: Transform
       pos: -116.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23401
     components:
     - type: Transform
       pos: -120.5,-81.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23498
     components:
     - type: Transform
       pos: -116.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23716
     components:
     - type: Transform
       pos: -69.5,-70.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24847
     components:
     - type: Transform
       pos: -116.5,-65.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24880
     components:
     - type: Transform
       pos: -118.5,-64.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24887
     components:
     - type: Transform
       pos: -116.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24888
     components:
     - type: Transform
       pos: -126.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24889
     components:
     - type: Transform
       pos: -126.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24890
     components:
     - type: Transform
       pos: -126.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24891
     components:
     - type: Transform
       pos: -124.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24894
     components:
     - type: Transform
       pos: -122.5,-64.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24901
     components:
     - type: Transform
       pos: -124.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24921
     components:
     - type: Transform
       pos: -123.5,-78.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24933
     components:
     - type: Transform
       pos: -121.5,-78.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24934
     components:
     - type: Transform
       pos: -119.5,-78.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24935
     components:
     - type: Transform
       pos: -118.5,-78.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24936
     components:
     - type: Transform
       pos: -117.5,-78.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 25187
     components:
     - type: Transform
       pos: -124.5,-65.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: ReinforcedPlasmaWindowDiagonal
   entities:
   - uid: 7308
@@ -137592,47 +137572,35 @@ entities:
     - type: Transform
       pos: -155.5,-43.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7324
     components:
     - type: Transform
       pos: -154.5,-42.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7332
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -154.5,-43.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7333
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -154.5,-48.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7334
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -154.5,-47.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7342
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -155.5,-47.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: ReinforcedWindow
   entities:
   - uid: 4
@@ -137640,2626 +137608,1876 @@ entities:
     - type: Transform
       pos: -114.5,-36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 10
     components:
     - type: Transform
       pos: -69.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 18
     components:
     - type: Transform
       pos: -69.5,6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 31
     components:
     - type: Transform
       pos: -69.5,4.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 46
     components:
     - type: Transform
       pos: -66.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 47
     components:
     - type: Transform
       pos: -64.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 48
     components:
     - type: Transform
       pos: -65.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 49
     components:
     - type: Transform
       pos: -64.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 50
     components:
     - type: Transform
       pos: -62.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 51
     components:
     - type: Transform
       pos: -61.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 52
     components:
     - type: Transform
       pos: -60.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 54
     components:
     - type: Transform
       pos: -58.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 56
     components:
     - type: Transform
       pos: -58.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 57
     components:
     - type: Transform
       pos: -57.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 58
     components:
     - type: Transform
       pos: -56.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 59
     components:
     - type: Transform
       pos: -53.5,6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 60
     components:
     - type: Transform
       pos: -53.5,4.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 61
     components:
     - type: Transform
       pos: -53.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 71
     components:
     - type: Transform
       pos: -59.5,4.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 73
     components:
     - type: Transform
       pos: -101.5,31.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 107
     components:
     - type: Transform
       pos: -65.5,-11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 109
     components:
     - type: Transform
       pos: -65.5,-12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 110
     components:
     - type: Transform
       pos: -64.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 111
     components:
     - type: Transform
       pos: -63.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 112
     components:
     - type: Transform
       pos: -62.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 113
     components:
     - type: Transform
       pos: -60.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 114
     components:
     - type: Transform
       pos: -59.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 116
     components:
     - type: Transform
       pos: -58.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 117
     components:
     - type: Transform
       pos: -57.5,-12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 118
     components:
     - type: Transform
       pos: -57.5,-11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 141
     components:
     - type: Transform
       pos: -63.5,4.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 167
     components:
     - type: Transform
       pos: -52.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 171
     components:
     - type: Transform
       pos: -51.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 178
     components:
     - type: Transform
       pos: -31.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 249
     components:
     - type: Transform
       pos: -31.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 285
     components:
     - type: Transform
       pos: -82.5,-6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 287
     components:
     - type: Transform
       pos: -85.5,-6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 291
     components:
     - type: Transform
       pos: -84.5,-6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 316
     components:
     - type: Transform
       pos: -35.5,-25.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 320
     components:
     - type: Transform
       pos: -34.5,-22.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 322
     components:
     - type: Transform
       pos: -32.5,-22.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 351
     components:
     - type: Transform
       pos: -93.5,13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 398
     components:
     - type: Transform
       pos: -48.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 420
     components:
     - type: Transform
       pos: -92.5,-35.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 474
     components:
     - type: Transform
       pos: -66.5,-18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 504
     components:
     - type: Transform
       pos: -116.5,-5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 751
     components:
     - type: Transform
       pos: -83.5,14.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 787
     components:
     - type: Transform
       pos: -138.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 953
     components:
     - type: Transform
       pos: -83.5,15.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1014
     components:
     - type: Transform
       pos: -53.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1015
     components:
     - type: Transform
       pos: -54.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1170
     components:
     - type: Transform
       pos: -35.5,-23.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1174
     components:
     - type: Transform
       pos: -35.5,-20.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1176
     components:
     - type: Transform
       pos: -35.5,-18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1252
     components:
     - type: Transform
       pos: -20.5,-48.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1253
     components:
     - type: Transform
       pos: -20.5,-52.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1254
     components:
     - type: Transform
       pos: -20.5,-54.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1312
     components:
     - type: Transform
       pos: -31.5,-2.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1313
     components:
     - type: Transform
       pos: -31.5,-1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1314
     components:
     - type: Transform
       pos: -31.5,-3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1331
     components:
     - type: Transform
       pos: -117.5,-23.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1534
     components:
     - type: Transform
       pos: -20.5,-50.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1676
     components:
     - type: Transform
       pos: -93.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1712
     components:
     - type: Transform
       pos: -24.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1713
     components:
     - type: Transform
       pos: -27.5,7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1714
     components:
     - type: Transform
       pos: -27.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1738
     components:
     - type: Transform
       pos: -101.5,-23.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1809
     components:
     - type: Transform
       pos: -56.5,-79.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1810
     components:
     - type: Transform
       pos: -55.5,-79.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1864
     components:
     - type: Transform
       pos: -117.5,-21.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1873
     components:
     - type: Transform
       pos: -106.5,-5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1888
     components:
     - type: Transform
       pos: -34.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1892
     components:
     - type: Transform
       pos: -106.5,-3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1950
     components:
     - type: Transform
       pos: -106.5,-4.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1978
     components:
     - type: Transform
       pos: -32.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2053
     components:
     - type: Transform
       pos: -95.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2054
     components:
     - type: Transform
       pos: -95.5,-20.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2129
     components:
     - type: Transform
       pos: -33.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2196
     components:
     - type: Transform
       pos: -119.5,-54.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2221
     components:
     - type: Transform
       pos: -123.5,-44.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2222
     components:
     - type: Transform
       pos: -123.5,-46.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2223
     components:
     - type: Transform
       pos: -123.5,-43.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2238
     components:
     - type: Transform
       pos: -123.5,-47.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2363
     components:
     - type: Transform
       pos: -89.5,-26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2365
     components:
     - type: Transform
       pos: -89.5,-25.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2367
     components:
     - type: Transform
       pos: -93.5,-19.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2533
     components:
     - type: Transform
       pos: -121.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2648
     components:
     - type: Transform
       pos: -89.5,-29.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2682
     components:
     - type: Transform
       pos: -63.5,2.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2695
     components:
     - type: Transform
       pos: -59.5,2.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2852
     components:
     - type: Transform
       pos: -51.5,3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2853
     components:
     - type: Transform
       pos: -50.5,3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2854
     components:
     - type: Transform
       pos: -49.5,3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2855
     components:
     - type: Transform
       pos: -45.5,3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2856
     components:
     - type: Transform
       pos: -43.5,3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2857
     components:
     - type: Transform
       pos: -44.5,3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2906
     components:
     - type: Transform
       pos: -47.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2939
     components:
     - type: Transform
       pos: -50.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2947
     components:
     - type: Transform
       pos: -52.5,-10.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2948
     components:
     - type: Transform
       pos: -51.5,-10.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2949
     components:
     - type: Transform
       pos: -50.5,-10.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3313
     components:
     - type: Transform
       pos: -8.5,7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3415
     components:
     - type: Transform
       pos: -48.5,-21.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3751
     components:
     - type: Transform
       pos: -7.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3775
     components:
     - type: Transform
       pos: -9.5,7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3785
     components:
     - type: Transform
       pos: -7.5,7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3809
     components:
     - type: Transform
       pos: -67.5,-34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3828
     components:
     - type: Transform
       pos: -48.5,-19.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3829
     components:
     - type: Transform
       pos: -48.5,-20.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3960
     components:
     - type: Transform
       pos: -31.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3963
     components:
     - type: Transform
       pos: -31.5,-21.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3970
     components:
     - type: Transform
       pos: -29.5,-22.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4017
     components:
     - type: Transform
       pos: -89.5,-28.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4129
     components:
     - type: Transform
       pos: -101.5,-24.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4229
     components:
     - type: Transform
       pos: -83.5,24.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4230
     components:
     - type: Transform
       pos: -83.5,23.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4231
     components:
     - type: Transform
       pos: -83.5,25.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4287
     components:
     - type: Transform
       pos: -31.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4526
     components:
     - type: Transform
       pos: -84.5,-0.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4541
     components:
     - type: Transform
       pos: -97.5,9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4548
     components:
     - type: Transform
       pos: -97.5,14.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4583
     components:
     - type: Transform
       pos: -80.5,-30.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4629
     components:
     - type: Transform
       pos: -97.5,10.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4630
     components:
     - type: Transform
       pos: -9.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4674
     components:
     - type: Transform
       pos: -8.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4693
     components:
     - type: Transform
       pos: -85.5,33.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4698
     components:
     - type: Transform
       pos: -85.5,35.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4710
     components:
     - type: Transform
       pos: -83.5,29.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4711
     components:
     - type: Transform
       pos: -83.5,30.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4712
     components:
     - type: Transform
       pos: -83.5,28.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4725
     components:
     - type: Transform
       pos: -87.5,26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4726
     components:
     - type: Transform
       pos: -85.5,26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4745
     components:
     - type: Transform
       pos: -85.5,34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4747
     components:
     - type: Transform
       pos: -140.5,-36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4756
     components:
     - type: Transform
       pos: -83.5,-30.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4762
     components:
     - type: Transform
       pos: -84.5,-30.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4825
     components:
     - type: Transform
       pos: -93.5,-22.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4833
     components:
     - type: Transform
       pos: -127.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4906
     components:
     - type: Transform
       pos: -126.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4907
     components:
     - type: Transform
       pos: -125.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5675
     components:
     - type: Transform
       pos: -107.5,-63.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5676
     components:
     - type: Transform
       pos: -108.5,-63.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5693
     components:
     - type: Transform
       pos: -140.5,-1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5700
     components:
     - type: Transform
       pos: -120.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5701
     components:
     - type: Transform
       pos: -118.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5715
     components:
     - type: Transform
       pos: -106.5,-63.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5762
     components:
     - type: Transform
       pos: -115.5,-19.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5774
     components:
     - type: Transform
       pos: -117.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5777
     components:
     - type: Transform
       pos: -114.5,-19.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5778
     components:
     - type: Transform
       pos: -117.5,-15.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5813
     components:
     - type: Transform
       pos: -116.5,-11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5814
     components:
     - type: Transform
       pos: -113.5,-11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5815
     components:
     - type: Transform
       pos: -113.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5816
     components:
     - type: Transform
       pos: -116.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5867
     components:
     - type: Transform
       pos: -106.5,-15.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5868
     components:
     - type: Transform
       pos: -106.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5869
     components:
     - type: Transform
       pos: -106.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6125
     components:
     - type: Transform
       pos: -155.5,-10.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6198
     components:
     - type: Transform
       pos: -126.5,-24.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6201
     components:
     - type: Transform
       pos: -126.5,-20.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6202
     components:
     - type: Transform
       pos: -126.5,-23.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6203
     components:
     - type: Transform
       pos: -126.5,-21.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6267
     components:
     - type: Transform
       pos: -125.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6269
     components:
     - type: Transform
       pos: -121.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6270
     components:
     - type: Transform
       pos: -121.5,-15.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6311
     components:
     - type: Transform
       pos: -126.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6682
     components:
     - type: Transform
       pos: -81.5,-30.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6755
     components:
     - type: Transform
       pos: -95.5,37.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6756
     components:
     - type: Transform
       pos: -95.5,36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6897
     components:
     - type: Transform
       pos: -86.5,-6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6972
     components:
     - type: Transform
       pos: -140.5,12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7145
     components:
     - type: Transform
       pos: -1.5,-21.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7159
     components:
     - type: Transform
       pos: -2.5,-5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7165
     components:
     - type: Transform
       pos: -1.5,-6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7171
     components:
     - type: Transform
       pos: -1.5,-12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7175
     components:
     - type: Transform
       pos: -2.5,-21.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7183
     components:
     - type: Transform
       pos: -1.5,-14.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7187
     components:
     - type: Transform
       pos: -3.5,-5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7203
     components:
     - type: Transform
       pos: -1.5,-5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7209
     components:
     - type: Transform
       pos: -1.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7219
     components:
     - type: Transform
       pos: -1.5,-20.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7220
     components:
     - type: Transform
       pos: -3.5,-21.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7249
     components:
     - type: Transform
       pos: -93.5,-23.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7257
     components:
     - type: Transform
       pos: -141.5,12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7280
     components:
     - type: Transform
       pos: -117.5,-40.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7281
     components:
     - type: Transform
       pos: -117.5,-38.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7284
     components:
     - type: Transform
       pos: -117.5,-50.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7285
     components:
     - type: Transform
       pos: -117.5,-52.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7318
     components:
     - type: Transform
       pos: -131.5,-59.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7389
     components:
     - type: Transform
       pos: -131.5,-44.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7390
     components:
     - type: Transform
       pos: -131.5,-43.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7391
     components:
     - type: Transform
       pos: -131.5,-46.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7392
     components:
     - type: Transform
       pos: -131.5,-47.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7529
     components:
     - type: Transform
       pos: -137.5,-34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7568
     components:
     - type: Transform
       pos: -141.5,-37.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7876
     components:
     - type: Transform
       pos: -121.5,-54.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7898
     components:
     - type: Transform
       pos: -81.5,19.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8052
     components:
     - type: Transform
       pos: -130.5,-59.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8075
     components:
     - type: Transform
       pos: -140.5,-41.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8164
     components:
     - type: Transform
       pos: -83.5,19.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8195
     components:
     - type: Transform
       pos: -0.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8196
     components:
     - type: Transform
       pos: 1.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8197
     components:
     - type: Transform
       pos: 0.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8198
     components:
     - type: Transform
       pos: 1.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8199
     components:
     - type: Transform
       pos: 0.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8200
     components:
     - type: Transform
       pos: -0.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8201
     components:
     - type: Transform
       pos: -0.5,-15.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8202
     components:
     - type: Transform
       pos: -0.5,-11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8203
     components:
     - type: Transform
       pos: 0.5,-11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8204
     components:
     - type: Transform
       pos: 1.5,-11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8205
     components:
     - type: Transform
       pos: 0.5,-15.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8206
     components:
     - type: Transform
       pos: 1.5,-15.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8213
     components:
     - type: Transform
       pos: 1.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8214
     components:
     - type: Transform
       pos: 0.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8215
     components:
     - type: Transform
       pos: -0.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8216
     components:
     - type: Transform
       pos: -0.5,-19.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8217
     components:
     - type: Transform
       pos: 0.5,-19.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8218
     components:
     - type: Transform
       pos: 1.5,-19.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8228
     components:
     - type: Transform
       pos: -9.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8229
     components:
     - type: Transform
       pos: -10.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8230
     components:
     - type: Transform
       pos: -11.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8236
     components:
     - type: Transform
       pos: -5.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8238
     components:
     - type: Transform
       pos: -7.5,-6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8239
     components:
     - type: Transform
       pos: -7.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8244
     components:
     - type: Transform
       pos: -3.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8253
     components:
     - type: Transform
       pos: -16.5,-64.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8260
     components:
     - type: Transform
       pos: -11.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8261
     components:
     - type: Transform
       pos: -9.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8262
     components:
     - type: Transform
       pos: -5.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8263
     components:
     - type: Transform
       pos: -3.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8296
     components:
     - type: Transform
       pos: -6.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8297
     components:
     - type: Transform
       pos: -7.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8299
     components:
     - type: Transform
       pos: -8.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8343
     components:
     - type: Transform
       pos: -29.5,26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8363
     components:
     - type: Transform
       pos: -38.5,17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8364
     components:
     - type: Transform
       pos: -38.5,16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8365
     components:
     - type: Transform
       pos: -38.5,14.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8366
     components:
     - type: Transform
       pos: -38.5,15.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8367
     components:
     - type: Transform
       pos: -36.5,14.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8368
     components:
     - type: Transform
       pos: -36.5,15.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8369
     components:
     - type: Transform
       pos: -36.5,16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8370
     components:
     - type: Transform
       pos: -36.5,17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8377
     components:
     - type: Transform
       pos: -82.5,19.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8522
     components:
     - type: Transform
       pos: -34.5,-34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8529
     components:
     - type: Transform
       pos: -32.5,-34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8708
     components:
     - type: Transform
       pos: -5.5,-38.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8709
     components:
     - type: Transform
       pos: -3.5,-38.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8710
     components:
     - type: Transform
       pos: -4.5,-38.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8711
     components:
     - type: Transform
       pos: -3.5,-36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8714
     components:
     - type: Transform
       pos: -4.5,-34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8715
     components:
     - type: Transform
       pos: -3.5,-34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8716
     components:
     - type: Transform
       pos: -5.5,-34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8729
     components:
     - type: Transform
       pos: -7.5,-30.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8737
     components:
     - type: Transform
       pos: -7.5,-28.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8738
     components:
     - type: Transform
       pos: -7.5,-31.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8739
     components:
     - type: Transform
       pos: -7.5,-32.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8740
     components:
     - type: Transform
       pos: -7.5,-29.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8920
     components:
     - type: Transform
       pos: -14.5,-69.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8938
     components:
     - type: Transform
       pos: -14.5,-68.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9034
     components:
     - type: Transform
       pos: -90.5,-35.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9098
     components:
     - type: Transform
       pos: -106.5,-45.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9324
     components:
     - type: Transform
       pos: -30.5,22.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9539
     components:
     - type: Transform
       pos: -97.5,11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9549
     components:
     - type: Transform
       pos: -95.5,13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9788
     components:
     - type: Transform
       pos: -32.5,-75.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9838
     components:
     - type: Transform
       pos: -136.5,15.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9958
     components:
     - type: Transform
       pos: -16.5,-69.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9964
     components:
     - type: Transform
       pos: -16.5,-70.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9980
     components:
     - type: Transform
       pos: -95.5,38.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9981
     components:
     - type: Transform
       pos: -93.5,36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9982
     components:
     - type: Transform
       pos: -93.5,37.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9983
     components:
     - type: Transform
       pos: -93.5,38.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9986
     components:
     - type: Transform
       pos: -95.5,39.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9987
     components:
     - type: Transform
       pos: -93.5,39.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 10035
     components:
     - type: Transform
       pos: -140.5,-12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 10084
     components:
     - type: Transform
       pos: -34.5,-77.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 10087
     components:
     - type: Transform
       pos: -32.5,-77.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 10488
     components:
     - type: Transform
       pos: -16.5,-68.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 10528
     components:
     - type: Transform
       pos: -83.5,-6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11035
     components:
     - type: Transform
       pos: -28.5,22.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11047
     components:
     - type: Transform
       pos: -34.5,-75.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11048
     components:
     - type: Transform
       pos: -34.5,-76.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11059
     components:
     - type: Transform
       pos: -108.5,-61.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11076
     components:
     - type: Transform
       pos: -32.5,-76.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11080
     components:
     - type: Transform
       pos: -28.5,-69.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11092
     components:
     - type: Transform
       pos: -30.5,-61.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11358
     components:
     - type: Transform
       pos: -22.5,11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11359
     components:
     - type: Transform
       pos: -22.5,13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11710
     components:
     - type: Transform
       pos: -99.5,34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11716
     components:
     - type: Transform
       pos: -99.5,33.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 12425
     components:
     - type: Transform
       pos: -28.5,-61.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 12450
     components:
     - type: Transform
       pos: -101.5,-30.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 12546
     components:
     - type: Transform
       pos: -31.5,-36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 12588
     components:
     - type: Transform
       pos: -126.5,-59.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 12748
     components:
     - type: Transform
       pos: -133.5,-57.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 12840
     components:
     - type: Transform
       pos: -13.5,-64.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 12855
     components:
     - type: Transform
       pos: -101.5,-29.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13241
     components:
     - type: Transform
       pos: -138.5,15.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13248
     components:
     - type: Transform
       pos: -31.5,-40.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13523
     components:
     - type: Transform
       pos: -140.5,14.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13879
     components:
     - type: Transform
       pos: -138.5,12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 14003
     components:
     - type: Transform
       pos: -137.5,21.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 14499
     components:
     - type: Transform
       pos: -13.5,-66.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 15407
     components:
     - type: Transform
       pos: -125.5,-59.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16087
     components:
     - type: Transform
       pos: -106.5,-61.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16091
     components:
     - type: Transform
       pos: -123.5,-50.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16141
     components:
     - type: Transform
       pos: -93.5,-24.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16488
     components:
     - type: Transform
       pos: -137.5,-40.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16505
     components:
     - type: Transform
       pos: -138.5,-26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16695
     components:
     - type: Transform
       pos: -129.5,-59.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16716
     components:
     - type: Transform
       pos: -33.5,-43.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16836
     components:
     - type: Transform
       pos: -107.5,-61.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16906
     components:
     - type: Transform
       pos: -22.5,6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 17005
     components:
     - type: Transform
       pos: -115.5,-36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 17075
     components:
     - type: Transform
       pos: -86.5,-0.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 17161
     components:
     - type: Transform
       pos: -31.5,-75.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 17164
     components:
     - type: Transform
       pos: -35.5,-75.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 17359
     components:
     - type: Transform
       pos: -127.5,-59.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 17513
     components:
     - type: Transform
       pos: -136.5,12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 17538
     components:
     - type: Transform
       pos: -140.5,-54.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 17651
     components:
     - type: Transform
       pos: -14.5,-70.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 18193
     components:
     - type: Transform
       pos: -95.5,-49.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 18686
     components:
     - type: Transform
       pos: -95.5,-50.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 18726
     components:
     - type: Transform
       pos: -138.5,-12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 18833
     components:
     - type: Transform
       pos: -97.5,-44.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 18937
     components:
     - type: Transform
       pos: -95.5,-47.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 18941
     components:
     - type: Transform
       pos: -95.5,-46.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19623
     components:
     - type: Transform
       pos: -114.5,-54.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19629
     components:
     - type: Transform
       pos: -115.5,-54.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19750
     components:
     - type: Transform
       pos: -113.5,-54.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19752
     components:
     - type: Transform
       pos: -69.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19864
     components:
     - type: Transform
       pos: -67.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19914
     components:
     - type: Transform
       pos: -101.5,-38.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20160
     components:
     - type: Transform
       pos: -139.5,-11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20167
     components:
     - type: Transform
       pos: -123.5,-40.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20277
     components:
     - type: Transform
       pos: -139.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20319
     components:
     - type: Transform
       pos: -57.5,-79.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20329
     components:
     - type: Transform
       pos: -128.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20445
     components:
     - type: Transform
       pos: -119.5,37.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20449
     components:
     - type: Transform
       pos: -122.5,36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20450
     components:
     - type: Transform
       pos: -122.5,37.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20456
     components:
     - type: Transform
       pos: -121.5,37.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20466
     components:
     - type: Transform
       pos: -120.5,37.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20503
     components:
     - type: Transform
       pos: -92.5,-50.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20563
     components:
     - type: Transform
       pos: -101.5,-39.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20564
     components:
     - type: Transform
       pos: -92.5,-48.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20734
     components:
     - type: Transform
       pos: -92.5,-49.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20736
     components:
     - type: Transform
       pos: -92.5,-46.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20780
     components:
     - type: Transform
       pos: -97.5,-42.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20844
     components:
     - type: Transform
       pos: -36.5,-43.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20936
     components:
     - type: Transform
       pos: -93.5,31.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 21002
     components:
     - type: Transform
       pos: -104.5,37.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 21491
     components:
     - type: Transform
       pos: -18.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 21492
     components:
     - type: Transform
       pos: -20.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 21493
     components:
     - type: Transform
       pos: -19.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 21873
     components:
     - type: Transform
       pos: -36.5,-45.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 21874
     components:
     - type: Transform
       pos: -33.5,-45.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 21879
     components:
     - type: Transform
       pos: -141.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 22701
     components:
     - type: Transform
       pos: -39.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 22904
     components:
     - type: Transform
       pos: -141.5,14.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 22936
     components:
     - type: Transform
       pos: -43.5,-65.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 22962
     components:
     - type: Transform
       pos: -44.5,-65.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 22963
     components:
     - type: Transform
       pos: -42.5,-65.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23053
     components:
     - type: Transform
       pos: -91.5,26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23504
     components:
     - type: Transform
       pos: -95.5,31.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23751
     components:
     - type: Transform
       pos: -21.5,6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23752
     components:
     - type: Transform
       pos: -20.5,6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24036
     components:
     - type: Transform
       pos: -93.5,26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24115
     components:
     - type: Transform
       pos: -16.5,-66.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24214
     components:
     - type: Transform
       pos: -32.5,-78.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24215
     components:
     - type: Transform
       pos: -34.5,-78.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24333
     components:
     - type: Transform
       pos: -19.5,-51.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24334
     components:
     - type: Transform
       pos: -18.5,-51.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 25403
     components:
     - type: Transform
       pos: -113.5,-36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 25986
     components:
     - type: Transform
       pos: -110.5,-45.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: RemoteSignaller
   entities:
   - uid: 3377
@@ -140914,166 +140132,120 @@ entities:
     - type: Transform
       pos: -24.5,-22.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 138
     components:
     - type: Transform
       pos: -26.5,-22.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7272
     components:
     - type: Transform
       pos: -115.5,-42.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7273
     components:
     - type: Transform
       pos: -113.5,-42.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7274
     components:
     - type: Transform
       pos: -114.5,-42.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7275
     components:
     - type: Transform
       pos: -113.5,-48.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7276
     components:
     - type: Transform
       pos: -114.5,-48.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7277
     components:
     - type: Transform
       pos: -115.5,-48.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8820
     components:
     - type: Transform
       pos: -13.5,-41.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8821
     components:
     - type: Transform
       pos: -13.5,-40.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8822
     components:
     - type: Transform
       pos: -13.5,-39.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9078
     components:
     - type: Transform
       pos: -35.5,-68.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9414
     components:
     - type: Transform
       pos: -34.5,-68.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9769
     components:
     - type: Transform
       pos: -33.5,-68.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11133
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -95.5,-47.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11176
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -95.5,-46.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11330
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -95.5,-50.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11783
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -95.5,-49.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 15252
     components:
     - type: Transform
       pos: -33.5,-61.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 15282
     components:
     - type: Transform
       pos: -34.5,-61.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 15283
     components:
     - type: Transform
       pos: -35.5,-61.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19536
     components:
     - type: Transform
       pos: -89.5,13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19537
     components:
     - type: Transform
       pos: -88.5,13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: ShuttersNormalOpen
   entities:
   - uid: 399
@@ -141081,37 +140253,27 @@ entities:
     - type: Transform
       pos: -50.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1716
     components:
     - type: Transform
       pos: -18.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1763
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -101.5,-24.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2958
     components:
     - type: Transform
       pos: -47.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2959
     components:
     - type: Transform
       pos: -49.5,-10.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 2
   - uid: 2960
@@ -141119,36 +140281,26 @@ entities:
     - type: Transform
       pos: -49.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2962
     components:
     - type: Transform
       pos: -52.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2963
     components:
     - type: Transform
       pos: -51.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2964
     components:
     - type: Transform
       pos: -48.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2998
     components:
     - type: Transform
       pos: -53.5,-10.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3344
@@ -141157,8 +140309,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -20.5,-4.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3382
@@ -141167,8 +140317,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -20.5,-5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3830
@@ -141177,8 +140325,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-29.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3831
@@ -141187,8 +140333,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-30.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3832
@@ -141197,8 +140341,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-31.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3833
@@ -141207,8 +140349,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-32.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3997
@@ -141217,8 +140357,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-23.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3998
@@ -141227,8 +140365,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-22.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3999
@@ -141237,8 +140373,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-21.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4456
@@ -141247,8 +140381,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -121.5,-82.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4457
@@ -141256,8 +140388,6 @@ entities:
     - type: Transform
       pos: -120.5,-81.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4459
@@ -141266,8 +140396,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -126.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4466
@@ -141276,8 +140404,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -124.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4467
@@ -141286,8 +140412,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -124.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4468
@@ -141296,8 +140420,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -119.5,-82.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4469
@@ -141306,8 +140428,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -124.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 5039
@@ -141315,65 +140435,47 @@ entities:
     - type: Transform
       pos: -19.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6265
     components:
     - type: Transform
       pos: -125.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6306
     components:
     - type: Transform
       pos: -121.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6307
     components:
     - type: Transform
       pos: -121.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6308
     components:
     - type: Transform
       pos: -121.5,-15.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6310
     components:
     - type: Transform
       pos: -126.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7778
     components:
     - type: Transform
       pos: -20.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8901
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -101.5,-23.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11616
     components:
     - type: Transform
       pos: -30.5,4.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11619
@@ -141381,8 +140483,6 @@ entities:
     - type: Transform
       pos: -28.5,4.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11620
@@ -141390,8 +140490,6 @@ entities:
     - type: Transform
       pos: -28.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11621
@@ -141399,8 +140497,6 @@ entities:
     - type: Transform
       pos: -30.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11622
@@ -141409,8 +140505,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11623
@@ -141419,8 +140513,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11624
@@ -141429,8 +140521,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 13038
@@ -141439,24 +140529,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -101.5,-29.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13042
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -101.5,-30.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 14139
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -131.5,-47.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 14140
@@ -141465,8 +140549,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -131.5,-46.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 14141
@@ -141475,8 +140557,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -131.5,-44.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 14142
@@ -141485,8 +140565,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -131.5,-43.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 17815
@@ -141495,8 +140573,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 17819
@@ -141505,8 +140581,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 17820
@@ -141515,8 +140589,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-19.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 19528
@@ -141525,94 +140597,70 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -85.5,33.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19529
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -85.5,34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19530
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -85.5,35.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19531
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -83.5,30.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19532
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -83.5,29.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19533
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -83.5,28.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19534
     components:
     - type: Transform
       pos: -85.5,26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19535
     components:
     - type: Transform
       pos: -87.5,26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 22373
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 22374
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 22375
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 25385
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -126.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25386
@@ -141621,8 +140669,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -126.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25387
@@ -141631,8 +140677,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -116.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25388
@@ -141641,8 +140685,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -116.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25389
@@ -141651,8 +140693,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -116.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25390
@@ -141661,8 +140701,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -114.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25391
@@ -141671,8 +140709,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -114.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25392
@@ -141681,8 +140717,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -114.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25623
@@ -141691,32 +140725,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -66.5,-29.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 25624
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -66.5,-30.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 25625
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -66.5,-31.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 25626
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -66.5,-32.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: ShuttersWindow
   entities:
   - uid: 3976
@@ -141724,8 +140750,6 @@ entities:
     - type: Transform
       pos: -25.5,-22.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: ShuttersWindowOpen
   entities:
   - uid: 11617
@@ -141733,8 +140757,6 @@ entities:
     - type: Transform
       pos: -29.5,4.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11618
@@ -141742,8 +140764,6 @@ entities:
     - type: Transform
       pos: -29.5,8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
 - proto: ShuttleConsoleCircuitboard
@@ -141760,8 +140780,6 @@ entities:
     - type: Transform
       pos: -42.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: SignAi
   entities:
   - uid: 21670
@@ -148805,8 +147823,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
 - proto: SuitStorageHOS
   entities:
   - uid: 6775
@@ -148858,8 +147886,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -148886,8 +147924,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -148914,8 +147962,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -148942,8 +148000,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -150903,11 +149971,6 @@ entities:
     - type: Transform
       pos: -60.35623,-4.475757
       parent: 2
-  - uid: 6481
-    components:
-    - type: Transform
-      pos: -36.23253,-30.543175
-      parent: 2
   - uid: 7290
     components:
     - type: Transform
@@ -150918,11 +149981,6 @@ entities:
     - type: Transform
       pos: -149.48795,-42.47385
       parent: 2
-  - uid: 7609
-    components:
-    - type: Transform
-      pos: -134.52573,-43.445347
-      parent: 2
 - proto: Table
   entities:
   - uid: 699
@@ -153551,183 +152609,131 @@ entities:
     - type: Transform
       pos: -55.5,-44.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1474
     components:
     - type: Transform
       pos: -51.5,-49.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2392
     components:
     - type: Transform
       pos: -124.5,-52.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3552
     components:
     - type: Transform
       pos: -55.5,-47.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4059
     components:
     - type: Transform
       pos: -20.5,-36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4060
     components:
     - type: Transform
       pos: -20.5,-34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4061
     components:
     - type: Transform
       pos: -20.5,-38.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4063
     components:
     - type: Transform
       pos: -20.5,-40.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4375
     components:
     - type: Transform
       pos: -114.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4376
     components:
     - type: Transform
       pos: -114.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6707
     components:
     - type: Transform
       pos: -19.5,-28.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6842
     components:
     - type: Transform
       pos: -89.5,-32.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6967
     components:
     - type: Transform
       pos: -89.5,-34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9233
     components:
     - type: Transform
       pos: -43.5,-44.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9249
     components:
     - type: Transform
       pos: -43.5,-46.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9257
     components:
     - type: Transform
       pos: -43.5,-45.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9329
     components:
     - type: Transform
       pos: -22.5,-20.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11000
     components:
     - type: Transform
       pos: -22.5,-18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11797
     components:
     - type: Transform
       pos: -27.5,-36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 13229
     components:
     - type: Transform
       pos: -19.5,-33.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16048
     components:
     - type: Transform
       pos: -87.5,-38.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 17298
     components:
     - type: Transform
       pos: -126.5,-52.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19403
     components:
     - type: Transform
       pos: -56.5,-40.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 26064
     components:
     - type: Transform
       pos: -120.5,23.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 26065
     components:
     - type: Transform
       pos: -118.5,23.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 26110
     components:
     - type: Transform
       pos: -27.5,-38.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: ToiletDirtyWater
   entities:
   - uid: 356
@@ -171300,8 +170306,18 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-          Oxygen: 1.8856695
-          Nitrogen: 7.0937095
+        - 1.8856695
+        - 7.0937095
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -171991,23 +171007,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -53.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2059
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2967
     components:
     - type: Transform
       pos: -49.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -172021,8 +171031,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -172036,8 +171044,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -50.5,-60.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorHydroponicsLocked
   entities:
   - uid: 6138
@@ -172046,13 +171052,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -54.5,-25.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -261617.84
+      secondsUntilStateChange: -261472.55
       state: Opening
     - type: Airlock
       autoClose: False
@@ -172062,24 +171066,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -56.5,-23.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23313
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -56.5,-21.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23429
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -56.5,-22.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorKitchenLocked
   entities:
   - uid: 6506
@@ -172087,8 +171085,6 @@ entities:
     - type: Transform
       pos: -54.5,-25.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorSecure
   entities:
   - uid: 1715
@@ -172097,8 +171093,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -172114,8 +171108,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -93.5,-18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -172129,24 +171121,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -91.5,-24.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9624
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -90.5,-24.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 26478
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -92.5,-24.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorSecureAtmosphericsLocked
   entities:
   - uid: 2090
@@ -172155,16 +171141,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -110.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5730
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -108.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorSecureCargoLocked
   entities:
   - uid: 11109
@@ -172173,24 +171155,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -102.5,12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 25555
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -97.5,16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 25849
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -100.5,12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorSecureChemistryLocked
   entities:
   - uid: 3922
@@ -172198,31 +171174,23 @@ entities:
     - type: Transform
       pos: -38.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3923
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -38.5,-26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 22702
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -37.5,-26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23992
     components:
     - type: Transform
       pos: -37.5,-16.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorSecureEngineeringLocked
   entities:
   - uid: 5724
@@ -172230,23 +171198,17 @@ entities:
     - type: Transform
       pos: -110.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5729
     components:
     - type: Transform
       pos: -108.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 25601
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -120.5,-25.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorSecureHeadOfPersonnelLocked
   entities:
   - uid: 2966
@@ -172255,8 +171217,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -49.5,-8.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 2
     - type: DeviceLinkSource
@@ -172272,16 +171232,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,-5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 19617
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -20.5,-4.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorSecureMedicalLocked
   entities:
   - uid: 3975
@@ -172290,16 +171246,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -27.5,-25.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24545
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -31.5,-19.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorSecurePlasma
   entities:
   - uid: 21052
@@ -172307,8 +171259,6 @@ entities:
     - type: Transform
       pos: -38.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSource
       linkedPorts:
         21056:
@@ -172322,8 +171272,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -95.5,26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorSecureScienceLocked
   entities:
   - uid: 7302
@@ -172331,16 +171279,12 @@ entities:
     - type: Transform
       pos: -120.5,-48.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7303
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -120.5,-42.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorSecureSecurityLocked
   entities:
   - uid: 24033
@@ -172349,8 +171293,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -27.5,6.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -172366,32 +171308,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -19.5,10.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20026
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -49.5,-54.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 26077
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -50.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 26078
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -49.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorServiceLocked
   entities:
   - uid: 14529
@@ -172400,16 +171334,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -96.5,-0.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 14531
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -96.5,2.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorTheatreLocked
   entities:
   - uid: 3372
@@ -172418,8 +171348,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -62.5,-35.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: Window
   entities:
   - uid: 162
@@ -172427,316 +171355,226 @@ entities:
     - type: Transform
       pos: -34.5,-26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 169
     components:
     - type: Transform
       pos: -33.5,-26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 170
     components:
     - type: Transform
       pos: -32.5,-26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 292
     components:
     - type: Transform
       pos: -31.5,-30.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 497
     components:
     - type: Transform
       pos: -31.5,-49.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 809
     components:
     - type: Transform
       pos: -104.5,-0.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1265
     components:
     - type: Transform
       pos: -24.5,-36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1272
     components:
     - type: Transform
       pos: -24.5,-38.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1273
     components:
     - type: Transform
       pos: -24.5,-35.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1279
     components:
     - type: Transform
       pos: -24.5,-34.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1286
     components:
     - type: Transform
       pos: -24.5,-39.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1288
     components:
     - type: Transform
       pos: -24.5,-40.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1409
     components:
     - type: Transform
       pos: -27.5,-42.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1425
     components:
     - type: Transform
       pos: -27.5,-45.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1566
     components:
     - type: Transform
       pos: -31.5,-47.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1568
     components:
     - type: Transform
       pos: -27.5,-46.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1624
     components:
     - type: Transform
       pos: -27.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1631
     components:
     - type: Transform
       pos: -27.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1635
     components:
     - type: Transform
       pos: -27.5,-3.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1636
     components:
     - type: Transform
       pos: -27.5,-1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 4109
     components:
     - type: Transform
       pos: -27.5,-43.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6960
     components:
     - type: Transform
       pos: -102.5,-21.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9225
     components:
     - type: Transform
       pos: -31.5,18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9297
     components:
     - type: Transform
       pos: -30.5,18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11011
     components:
     - type: Transform
       pos: -28.5,18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11017
     components:
     - type: Transform
       pos: -27.5,18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11018
     components:
     - type: Transform
       pos: -29.5,13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11024
     components:
     - type: Transform
       pos: -30.5,13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11025
     components:
     - type: Transform
       pos: -29.5,18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11028
     components:
     - type: Transform
       pos: -28.5,13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11029
     components:
     - type: Transform
       pos: -27.5,13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11030
     components:
     - type: Transform
       pos: -31.5,13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11784
     components:
     - type: Transform
       pos: -105.5,-21.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 14570
     components:
     - type: Transform
       pos: -64.5,-50.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 14595
     components:
     - type: Transform
       pos: -64.5,-36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 15921
     components:
     - type: Transform
       pos: -105.5,-36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 17183
     components:
     - type: Transform
       pos: -61.5,-17.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 18600
     components:
     - type: Transform
       pos: -72.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20548
     components:
     - type: Transform
       pos: -101.5,-0.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23215
     components:
     - type: Transform
       pos: -102.5,-36.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23418
     components:
     - type: Transform
       pos: -101.5,-11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23419
     components:
     - type: Transform
       pos: -99.5,-11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 23446
     components:
     - type: Transform
       pos: -100.5,-11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24342
     components:
     - type: Transform
       pos: -25.5,-27.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24343
     components:
     - type: Transform
       pos: -23.5,-27.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindowDirectional
   entities:
   - uid: 886
@@ -172745,178 +171583,132 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -48.5,-70.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 887
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -48.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 893
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -48.5,-72.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 894
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -48.5,-71.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 1805
     components:
     - type: Transform
       pos: -50.5,-74.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2361
     components:
     - type: Transform
       pos: -53.5,-70.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2563
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -53.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7751
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-74.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9113
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-58.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9114
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-59.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9115
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-61.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 14855
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -53.5,-69.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 15245
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-70.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 15622
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -51.5,-69.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16396
     components:
     - type: Transform
       pos: -53.5,-74.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16409
     components:
     - type: Transform
       pos: -52.5,-74.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16412
     components:
     - type: Transform
       pos: -51.5,-74.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16751
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-73.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16753
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -49.5,-69.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16754
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-69.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16771
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -50.5,-69.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16772
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -52.5,-69.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 20804
     components:
     - type: Transform
       pos: -49.5,-74.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindowFrostedDirectional
   entities:
   - uid: 2847
@@ -172925,62 +171717,46 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -43.5,-1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3893
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -41.5,-38.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3902
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -41.5,-37.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5643
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -96.5,-1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 14204
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -96.5,1.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 14205
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -96.5,0.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 22301
     components:
     - type: Transform
       pos: -44.5,-50.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 22302
     components:
     - type: Transform
       pos: -46.5,-50.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindowReinforcedDirectional
   entities:
   - uid: 2069
@@ -172989,432 +171765,318 @@ entities:
       rot: 3.141592653589793 rad
       pos: -109.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2086
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -111.5,-7.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2255
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2258
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2308
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-55.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2830
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -64.5,-12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2831
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -63.5,-12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2832
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -62.5,-12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2833
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -60.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2834
     components:
     - type: Transform
       pos: -58.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2835
     components:
     - type: Transform
       pos: -59.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2836
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -58.5,-12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2837
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -60.5,-12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2838
     components:
     - type: Transform
       pos: -63.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2839
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -59.5,-12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2840
     components:
     - type: Transform
       pos: -64.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2841
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -62.5,-9.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3015
     components:
     - type: Transform
       pos: -63.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3026
     components:
     - type: Transform
       pos: -61.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3027
     components:
     - type: Transform
       pos: -60.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3028
     components:
     - type: Transform
       pos: -59.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 3029
     components:
     - type: Transform
       pos: -62.5,5.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5727
     components:
     - type: Transform
       pos: -109.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5728
     components:
     - type: Transform
       pos: -111.5,-13.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7298
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -121.5,-42.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7299
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -119.5,-42.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7300
     components:
     - type: Transform
       pos: -119.5,-48.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7301
     components:
     - type: Transform
       pos: -121.5,-48.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7530
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-55.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7534
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -117.5,-58.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7535
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -116.5,-58.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7545
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -115.5,-58.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7547
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -114.5,-58.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7571
     components:
     - type: Transform
       pos: -114.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7580
     components:
     - type: Transform
       pos: -115.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7581
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -112.5,-58.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7585
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -111.5,-58.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7587
     components:
     - type: Transform
       pos: -116.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7588
     components:
     - type: Transform
       pos: -117.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7589
     components:
     - type: Transform
       pos: -111.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7590
     components:
     - type: Transform
       pos: -112.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7591
     components:
     - type: Transform
       pos: -118.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7592
     components:
     - type: Transform
       pos: -121.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7593
     components:
     - type: Transform
       pos: -113.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7594
     components:
     - type: Transform
       pos: -122.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7616
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -118.5,-58.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7644
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -122.5,-58.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7645
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -113.5,-58.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 7648
     components:
     - type: Transform
       pos: -119.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8153
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -101.5,12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 8553
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -95.5,26.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 9515
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -31.5,-18.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 11135
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -99.5,12.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24314
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -31.5,-20.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 24644
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -19.5,11.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 26076
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 26084
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -49.5,-56.5
       parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: Wirecutter
   entities:
   - uid: 8868
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 1e33a9d347..58400ac0fe 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -69413,6 +69413,113 @@ entities:
       parent: 31
     - type: WarpPoint
       location: library
+- proto: WarpPointBombing
+  entities:
+  - uid: 934
+    components:
+    - type: Transform
+      pos: -36.5,14.5
+      parent: 31
+    - type: WarpPoint
+      location: chapel
+  - uid: 2142
+    components:
+    - type: Transform
+      pos: 8.5,19.5
+      parent: 31
+    - type: WarpPoint
+      location: hop's office
+  - uid: 4910
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 31
+    - type: WarpPoint
+      location: medbay
+  - uid: 7261
+    components:
+    - type: Transform
+      pos: 16.5,-0.5
+      parent: 31
+    - type: WarpPoint
+      location: chemistry
+  - uid: 7262
+    components:
+    - type: Transform
+      pos: 13.5,-15.5
+      parent: 31
+    - type: WarpPoint
+      location: morgue
+  - uid: 9712
+    components:
+    - type: Transform
+      pos: -12.5,19.5
+      parent: 31
+    - type: WarpPoint
+      location: armory
+  - uid: 10539
+    components:
+    - type: Transform
+      pos: -9.5,-20.5
+      parent: 31
+    - type: WarpPoint
+      location: science
+  - uid: 11267
+    components:
+    - type: Transform
+      pos: 8.5,25.5
+      parent: 31
+    - type: WarpPoint
+      location: captain's quarters
+  - uid: 11308
+    components:
+    - type: Transform
+      pos: 3.5,30.5
+      parent: 31
+    - type: WarpPoint
+      location: bridge
+  - uid: 11309
+    components:
+    - type: Transform
+      pos: -1.5,17.5
+      parent: 31
+    - type: WarpPoint
+      location: vault
+  - uid: 11310
+    components:
+    - type: Transform
+      pos: 8.5,9.5
+      parent: 31
+    - type: WarpPoint
+      location: eva room
+  - uid: 11311
+    components:
+    - type: Transform
+      pos: 58.5,2.5
+      parent: 31
+    - type: WarpPoint
+      location: particle accelerator
+  - uid: 11313
+    components:
+    - type: Transform
+      pos: 34.5,14.5
+      parent: 31
+    - type: WarpPoint
+      location: atmospherics
+  - uid: 11322
+    components:
+    - type: Transform
+      pos: 27.5,18.5
+      parent: 31
+    - type: WarpPoint
+      location: salvage
+  - uid: 11359
+    components:
+    - type: Transform
+      pos: 50.5,-5.5
+      parent: 31
+    - type: WarpPoint
+      location: telecomms
 - proto: WaterCooler
   entities:
   - uid: 1156
diff --git a/Resources/Prototypes/Actions/revenant.yml b/Resources/Prototypes/Actions/revenant.yml
index 3ac425a567..5904908a75 100644
--- a/Resources/Prototypes/Actions/revenant.yml
+++ b/Resources/Prototypes/Actions/revenant.yml
@@ -1,8 +1,13 @@
 - type: entity
-  parent: ActionIntrinsicStore
+  parent: BaseAction
   id: ActionRevenantShop
   name: Shop
   description: Opens the ability shop.
+  components:
+  - type: Action
+    icon: Interface/Actions/shop.png
+  - type: InstantAction
+    event: !type:RevenantShopActionEvent
 
 - type: entity
   parent: BaseAction
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index 752aeb13f8..61babbfcea 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -466,14 +466,3 @@
     itemIconStyle: BigAction
   - type: InstantAction
     event: !type:ChameleonControllerOpenMenuEvent
-
-- type: entity
-  parent: BaseMentalAction
-  id: ActionIntrinsicStore
-  name: Store
-  description: Opens the store
-  components:
-  - type: Action
-    icon: Interface/Actions/shop.png
-  - type: InstantAction
-    event: !type:IntrinsicStoreActionEvent
diff --git a/Resources/Prototypes/Body/Prototypes/bot.yml b/Resources/Prototypes/Body/Prototypes/bot.yml
index ae9bd4a77a..848db2a4fd 100644
--- a/Resources/Prototypes/Body/Prototypes/bot.yml
+++ b/Resources/Prototypes/Body/Prototypes/bot.yml
@@ -5,19 +5,3 @@
   slots:
     hand 1:
       part: LeftArmBorg
-
-# It's like a medibot or a cleanbot except it has two arms to hug :)
-- type: body
-  id: HugBot
-  name: "hugBot"
-  root: box
-  slots:
-    box:
-      part: TorsoBorg
-      connections:
-      - right_arm
-      - left_arm
-    right_arm:
-      part: RightArmBorg
-    left_arm:
-      part: LeftArmBorg
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 2b4c5c9b36..2db34c0459 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -324,7 +324,6 @@
     - id: RubberStampHos
     - id: BoxHoSCircuitboards
     - id: WeaponDisabler
-    - id: WeaponTaser
     - id: WantedListCartridge
     - id: DrinkHosFlask
 
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 48bed23bc9..1111058871 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -28,7 +28,6 @@
     children:
     - id: FlashlightSeclite
     - id: WeaponDisabler
-    - id: WeaponTaser
     - id: ClothingBeltSecurityFilled
     - id: Flash
     - id: ClothingEyesGlassesSecurity
@@ -73,7 +72,6 @@
     - id: FlashlightSeclite
       prob: 0.8
     - id: WeaponDisabler
-    - id: WeaponTaser
     - id: ClothingUniformJumpsuitSecGrey
       prob: 0.3
     - id: ClothingHeadHelmetBasic
@@ -107,7 +105,6 @@
   table: !type:AllSelector
     children:
     - id: ClothingEyesGlassesSecurity
-    - id: WeaponTaser
     - id: WeaponDisabler
     - id: TrackingImplanter
       amount: 2
diff --git a/Resources/Prototypes/Catalog/hugbot.yml b/Resources/Prototypes/Catalog/hugbot.yml
deleted file mode 100644
index 469bb1196d..0000000000
--- a/Resources/Prototypes/Catalog/hugbot.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- type: localizedDataset
-  id: HugBotStarts
-  values:
-    prefix: hugbot-start-hug-
-    count: 8
-
-- type: localizedDataset
-  id: HugBotFinishes
-  values:
-    prefix: hugbot-finish-hug-
-    count: 8
-
-- type: localizedDataset
-  id: EmaggedHugBotFinishes
-  values:
-    prefix: hugbot-emagged-finish-hug-
-    count: 8
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index f245b1082c..c499f54db6 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -774,16 +774,7 @@
           - SurplusBundle
 
 # Deception
-- type: listing
-  id: UplinkSyndicateIDCard
-  name: uplink-syndicate-id-card-name
-  description: uplink-syndicate-id-card-desc
-  productEntity: SyndicateIDCard
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkDeception
-  
+
 - type: listing
   id: UplinkAgentIDCard
   name: uplink-agent-id-card-name
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
index fb2a400e0b..98a2a14989 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
@@ -306,8 +306,10 @@
     inhandVisuals:
       left:
       - state: inhand-left
+        color: "#535353"
       right:
       - state: inhand-right
+        color: "#535353"
   - type: Clothing
     sprite: Clothing/Hands/Gloves/Color/black.rsi
   - type: Butcherable
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index e6e3ec8c6f..bb3829a2dd 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -329,7 +329,6 @@
       weight: 95
       children:
       - id: Machete
-      - id: Claymore
       - id: BaseBallBat
       - id: CombatKnife
       - id: Spear
diff --git a/Resources/Prototypes/Entities/Markers/warp_point.yml b/Resources/Prototypes/Entities/Markers/warp_point.yml
index 4616d1535a..675938c09b 100644
--- a/Resources/Prototypes/Entities/Markers/warp_point.yml
+++ b/Resources/Prototypes/Entities/Markers/warp_point.yml
@@ -31,3 +31,24 @@
       - GhostOnlyWarp
   - type: Sprite
     state: pink
+
+- type: entity
+  parent: WarpPoint
+  id: WarpPointBombing
+  name: warp point
+  suffix: ninja bombing target
+  components:
+  - type: BombingTarget
+  - type: Tag
+    tags:
+    - GhostOnlyWarp
+  - type: WarpPoint
+    location: bombing target
+    blacklist:
+      tags:
+      - GhostOnlyWarp
+  - type: Sprite
+    layers:
+    - state: pink
+    - sprite: Objects/Weapons/Bombs/spidercharge.rsi
+      state: icon
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index a7748c4566..fb6f8d4fed 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1405,10 +1405,3 @@
   sprites:
   - sprite: Mobs/Customization/human_hair.rsi
     state: longwithbangs
-- type: marking
-  id: HumanHairOverEyePigtail
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-  - sprite: Mobs/Customization/human_hair.rsi
-    state: overeyepigtail
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index ebe8134d1b..c812140812 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1438,7 +1438,7 @@
     - reagents: [ Water, SpaceCleaner ]
       methods: [ Touch ]
       effects:
-      - !type:WashCreamPie
+      - !type:WashCreamPieReaction
   - type: Crawler
 
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index eef5f48838..eba25717f3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -1,17 +1,38 @@
 - type: entity
   abstract: true
-  parent: [BaseMob, MobCombat]
   id: MobElementalBase
   components:
+  - type: LagCompensation
   - type: Reactive
     groups:
       Acidic: [Touch]
+  - type: Clickable
   - type: Damageable
     damageContainer: Inorganic
+  - type: InteractionOutline
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 50
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
   - type: MovementSpeedModifier
     baseWalkSpeed : 2
     baseSprintSpeed : 3
+  - type: Sprite
+    noRot: true
+    drawdepth: Mobs
+  - type: NpcFactionMember
+    factions:
+    - SimpleNeutral
   - type: MovedByPressure
+  - type: Physics
+    bodyType: KinematicController # Same for all inheritors
   - type: StatusEffects
     allowed:
     - Electrocution
@@ -37,9 +58,12 @@
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: Input
+    context: "human"
+  - type: InputMover
+  - type: MobMover
   - type: ZombieImmune
   - type: ProtectedFromStepTriggers
-  - type: StunVisuals
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index dd3fd5d430..e5f900b209 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -104,36 +104,36 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         damage:
           groups:
-            Brute: -0.15
+            Brute: -0.25
     - reagents: [ Blood ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         damage:
           groups:
-            Brute: -0.25
-            Burn: -0.25
+            Brute: -0.5
+            Burn: -0.5
     - reagents: [ RobustHarvest ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         damage:
           groups:
-            Brute: -1
-            Burn: -1
+            Brute: -2
+            Burn: -2
     - reagents: [ WeedKiller, PlantBGone ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         damage:
           types:
-            Heat: 1
+            Heat: 2
   - type: ReplacementAccent
     accent: tomatoKiller
   - type: Item
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 04b1554cef..9b0bfb05ca 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -66,9 +66,6 @@
         type: StoreBoundUserInterface
   - type: Visibility
     layer: 2 #ghost vis layer
-  - type: ActionGrant
-    actions:
-    - ActionRevenantShop
   - type: Store
     categories:
     - RevenantAbilities
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index a538243192..fd700d7a4c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -460,40 +460,3 @@
     - Supply
   - type: Puller
     needsHands: false
-
-- type: entity
-  parent: [ MobSiliconBase, MobCombat ]
-  id: MobHugBot
-  name: hugbot
-  description: Awww, who needs a hug?
-  components:
-  - type: Sprite
-    sprite: Mobs/Silicon/Bots/hugbot.rsi
-    state: hugbot
-  - type: Construction
-    graph: HugBot
-    node: bot
-  - type: MovementSpeedModifier
-    baseWalkSpeed: 2
-    baseSprintSpeed: 3
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Weapons/boxingpunch1.ogg
-    angle: 30
-    animation: WeaponArcPunch
-    damage:
-      types:
-        Blunt: 2
-  - type: Anchorable
-  - type: Hands # This probably REALLY needs hand whitelisting, but we NEED hands for hugs, so...
-  - type: ComplexInteraction # Hugging is a complex interaction, apparently.
-  - type: HugBot
-  - type: Body
-    prototype: HugBot
-  - type: HTN
-    rootTask:
-      task: HugBotCompound
-  - type: InteractionPopup
-    interactSuccessString: hugging-success-generic
-    interactSuccessSound: /Audio/Effects/thudswoosh.ogg
-    messagePerceivedByOthers: hugging-success-generic-others
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index a239ede7b0..0eef52266b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -74,15 +74,15 @@
     - reagents: [ Water, SpaceCleaner ]
       methods: [ Touch ]
       effects:
-      - !type:WashCreamPie
+      - !type:WashCreamPieReaction
     - reagents: [ Water ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         damage:
           types:
-            Heat: 0.05 #Same as slime species
+            Heat: 0.15
       - !type:PopupMessage
         type: Local
         messages: [ "slime-hurt-by-water-popup" ]
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 785c8939ed..039cac3358 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -512,7 +512,7 @@
       methods: [Touch, Ingestion, Injection]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         damage:
           types:
             Caustic: 1
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
index 0624e9670a..92d118cb26 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -33,13 +33,13 @@
     - reagents: [Water]
       methods: [Touch]
       effects:
-      - !type:SpawnEntityInInventory
+      - !type:WearableReaction
         slot: head
-        entity: WaterDropletHat
+        prototypeID: WaterDropletHat
     - reagents: [Water, SpaceCleaner]
       methods: [Touch]
       effects:
-      - !type:WashCreamPie
+      - !type:WashCreamPieReaction
   # Damage (Self)
   - type: Bloodstream
     bloodReagent: CopperBlood
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index d2a8b21a0b..d4fecee2ca 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -118,7 +118,7 @@
     - reagents: [Water, SpaceCleaner]
       methods: [Touch]
       effects:
-      - !type:WashCreamPie
+      - !type:WashCreamPieReaction
   - type: StatusEffects
     allowed:
     - Electrocution
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index fa992ded0b..c2939347a8 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -43,17 +43,17 @@
     - reagents: [Water, SpaceCleaner]
       methods: [Touch]
       effects:
-      - !type:WashCreamPie
+      - !type:WashCreamPieReaction
     - reagents: [ PlantBGone ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         damage:
           types:
-            Blunt: 0.05
-            Slash: 0.05
-            Piercing: 0.075
+            Blunt: 0.1
+            Slash: 0.1
+            Piercing: 0.15
       - !type:PopupMessage
         type: Local
         visualType: Large
@@ -63,10 +63,10 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         damage:
           types:
-            Poison: 0.125
+            Poison: 0.25
       - !type:PopupMessage
         type: Local
         visualType: Large
diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index ca6301b0a4..5dc127878f 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -73,7 +73,7 @@
     - reagents: [ Water, SpaceCleaner ]
       methods: [ Touch ]
       effects:
-      - !type:WashCreamPie
+      - !type:WashCreamPieReaction
     - reagents: [ Milk, MilkGoat, MilkSoy, MilkSpoiled ]
       # add new types of milk to reagents as they appear, oat milk isn't on the list
       # because turns out oat milk has 1/30th the amount of calcium in it compared to the rest
@@ -81,11 +81,11 @@
       methods: [ Touch ]
       effects: # TODO: when magic is around - make a milk transformation to a skeleton monster
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         damage:
           groups:
-            Burn: -1 # healing obviously up to discussion
-            Brute: -0.75 # these groups are the only 2 possible ways to damage a skeleton
+            Burn: -2 # healing obviously up to discussion
+            Brute: -1.5 # these groups are the only 2 possible ways to damage a skeleton
       - !type:PopupMessage
         type: Local
         visualType: Large
@@ -102,7 +102,6 @@
   - type: FireVisuals
     alternateState: Standing
   - type: FlashImmunity
-    showInExamine: false
   - type: Inventory
     femaleDisplacements:
       jumpsuit:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index 9526b490e3..56acf52fb7 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -82,15 +82,15 @@
     - reagents: [ Water, SpaceCleaner ]
       methods: [ Touch ]
       effects:
-      - !type:WashCreamPie
+      - !type:WashCreamPieReaction
     - reagents: [ Water ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         damage:
           types:
-            Heat: 0.05
+            Heat: 0.1
       - !type:PopupMessage
         type: Local
         visualType: Large
diff --git a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
index be663a1774..19613dd494 100644
--- a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
+++ b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
@@ -105,8 +105,6 @@
       - id: Ointment
       - id: Gauze
       - id: Bloodpack
-    - id: SyndicateBusinessCard
-      weight: 0.5
 
 # Packages
 # TODO: Currently mostly maints loot, should be updated in the future.
@@ -140,9 +138,6 @@
       weight: 0.2
       rolls: !type:RangeNumberSelector
         range: 2, 3
-    - !type:NestedSelector
-      tableId: InsulsTable #Uncommon since it's weighted towards budget/fingerless
-      weight: 0.2
 
 - type: entityTable # TODO: Add more variety!
   id: PackageRareEntityTable
@@ -162,4 +157,3 @@
     - !type:NestedSelector
       tableId: SyndieMaintLoot
       weight: 0.5
-      
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index ff6d5a6a4a..870e66654f 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -455,9 +455,6 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-solars
-  - type: Tag
-    tags:
-    - NinjaBombingTargetBlocker
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -676,9 +673,6 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-arrivals
-  - type: Tag
-    tags:
-    - NinjaBombingTargetBlocker
 
 - type: entity
   parent: DefaultStationBeacon
@@ -767,9 +761,6 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-cryosleep
-  - type: Tag
-    tags:
-    - NinjaBombingTargetBlocker
 
 - type: entity
   parent: DefaultStationBeacon
diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index 85be8ece45..a32e3ba89c 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -21,9 +21,7 @@
       enum.CrayonUiKey.Key:
         type: CrayonBoundUserInterface
   - type: Crayon
-    selectedState: like
-  - type: LimitedCharges
-    maxCharges: 25
+    capacity: 25
   - type: Food
   - type: FlavorProfile
     flavors:
@@ -90,8 +88,7 @@
   - type: Crayon
     color: Red
     selectableColor: true
-  - type: LimitedCharges
-    maxCharges: 30
+    capacity: 30
   - type: Tag
     tags:
     - Write
@@ -99,16 +96,6 @@
     - Recyclable
     - Trash
 
-- type: entity
-  parent: CrayonRainbow
-  id: CrayonInfinite # should not be player available to prevent decal spam
-  name: infinite crayon
-  components:
-  - type: Crayon
-    deleteEmpty: false
-  - type: AutoRecharge
-    rechargeDuration: 5
-
 - type: entity
   parent: Crayon
   id: CrayonBlack
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 2ba5acfbf1..6aec812b77 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -58,9 +58,6 @@
     - Common
   - type: DoAfter
   - type: Actions
-  - type: ActionGrant
-    actions:
-    - ActionPAIOpenShop
   - type: Store
     categories:
     - PAIAbilities
@@ -191,10 +188,15 @@
     node: potatoai
 
 - type: entity
-  parent: ActionIntrinsicStore
+  parent: BaseMentalAction
   id: ActionPAIOpenShop
   name: Software Catalog
   description: Install new software to assist your owner.
+  components:
+  - type: Action
+    icon: Interface/Actions/shop.png
+  - type: InstantAction
+    event: !type:PAIShopActionEvent
 
 - type: entity
   parent: BaseMentalAction
diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
index 2e9f231e90..48670291e6 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
@@ -617,8 +617,7 @@
     - reagents: [ Water ]
       methods: [ Touch ]
       effects:
-      - !type:AddReagentToSolution
-        reagent: Water
+      - !type:AddToSolutionReaction
         solution: plushie
   - type: Fixtures
     fixtures:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index 65d507daa5..6c01a2a8dd 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -75,7 +75,7 @@
         methods: [Touch]
         effects:
         - !type:HealthChange
-          scaling: true
+          scaleByQuantity: true
           damage:
             types:
               Heat: 0.5
@@ -256,9 +256,13 @@
             Quantity: 2
           - ReagentId: Protein
             Quantity: 1
-    - type: AutoEmote # Meat Kudzu used to have respirator, but couldn't breathe so all it would do is gasp.
-      emotes:
-      - MeatGasp
+    - type: Respirator
+      damage:
+        types:
+          Asphyxiation: 0.25
+      damageRecovery:
+        types:
+          Asphyxiation: -0.25
     - type: Tag
       tags:
       - Meat
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 9cbb4a83d1..cd7dc74a75 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -128,6 +128,9 @@
     - state: paper_stamp-generic
       map: ["enum.PaperVisualLayers.Stamp"]
       visible: false
+  - type: GuideHelp
+    guides:
+    - ArtifactReports
   - type: PaperVisuals
     headerImagePath: "/Textures/Interface/Paper/paper_heading_artifact_analyzer.svg.96dpi.png"
     headerMargin: 0.0, 0.0, 0.0, 16.0
diff --git a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
index 24dab4f562..63b960b0e6 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
@@ -61,6 +61,12 @@
   icon: { sprite: /Textures/Objects/Economy/cash.rsi, state: cash }
   price: 1
 
+- type: stack
+  id: Credit
+  name: stack-credit
+  icon: { sprite: /Textures/Objects/Economy/cash.rsi, state: cash }
+  spawn: SpaceCash
+
 - type: entity
   parent: SpaceCash
   id: SpaceCash10
diff --git a/Resources/Prototypes/Entities/Objects/Power/powersink.yml b/Resources/Prototypes/Entities/Objects/Power/powersink.yml
index 089610883c..7385b9a825 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powersink.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powersink.yml
@@ -40,8 +40,8 @@
           acts: [ "Destruction" ]
     - type: PowerSink
     - type: Battery
-      maxCharge: 250000000
-      pricePerJoule: 0.000009
+      maxCharge: 7500000
+      pricePerJoule: 0.0003
     - type: ExaminableBattery
     - type: PowerConsumer
       voltage: High
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml
index 21abf45cae..788374618c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml
@@ -14,7 +14,7 @@
       delay: 1
     - type: GuideHelp
       guides:
-      - Xenoarchaeology
+      - ArtifactReports
     - type: ActivatableUI
       key: enum.NodeScannerUiKey.Key
       singleUser: true
diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
index c9a8c2c89b..dd2c73e005 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -16,8 +16,7 @@
     - reagents: [Water]
       methods: [Touch, Ingestion, Injection]
       effects:
-      - !type:AddReagentToSolution
-        reagent: Water
+      - !type:AddToSolutionReaction
         solution: cube
   - type: Rehydratable
   - type: CollisionWake
@@ -187,8 +186,7 @@
     - reagents: [Blood]
       methods: [Touch, Ingestion, Injection]
       effects:
-      - !type:AddReagentToSolution
-        reagent: Blood
+      - !type:AddToSolutionReaction
         solution: cube
   - type: Rehydratable
     catalyst: Blood # blood is fuel
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
index 3862918e38..ba2b856778 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -89,7 +89,3 @@
   - type: CartridgeAmmo
     proto: BulletPistol
     spent: true
-  - type: Tag
-    tags:
-    - CartridgePistol
-    - Trash # surely theres a way to automatically add this...
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 2f2ebfa5fd..bd532ce709 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -611,7 +611,6 @@
     slots:
     - Belt
   - type: Gun
-    fireRate: 0.5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/taser.ogg
   - type: ProjectileBatteryAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index bc9f40f85a..74f546c61d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -227,8 +227,7 @@
     lifetime: 0.170 # Very short range
   - type: StunOnCollide
     stunAmount: 0
-    knockdownAmount: 2.5 # Enough to subdue and follow up with a stun baton
-    drop: false #Ranged KD and item drop are too strong in one package
+    knockdownAmount: 2.5 # Enough to subdue and follow up with a stun batong
     slowdownAmount: 2.5
     walkSpeedModifier: 0.5
     sprintSpeedModifier: 0.5
@@ -256,7 +255,6 @@
     lifetime: 1.0 # Not so short range
   - type: StunOnCollide
     stunAmount: 5
-    drop: true # this is the evil taser
     knockdownAmount: 10
     slowdownAmount: 10
     walkSpeedModifier: 0.5
diff --git a/Resources/Prototypes/Entities/StatusEffects/movement.yml b/Resources/Prototypes/Entities/StatusEffects/movement.yml
index 07d4faed9c..71142af434 100644
--- a/Resources/Prototypes/Entities/StatusEffects/movement.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/movement.yml
@@ -8,32 +8,11 @@
     whitelist:
       components:
       - MobState
-      - MovementSpeedModifier
-      requireAll: true
     blacklist:
       tags:
       - SlowImmune
   - type: MovementModStatusEffect
 
-- type: entity
-  parent: MobStatusEffectBase
-  id: StatusEffectSpeed
-  abstract: true
-  name: speed
-  components:
-  - type: StatusEffect
-    whitelist:
-      components:
-      - MobState
-      - MovementSpeedModifier
-      requireAll: true
-  - type: MovementModStatusEffect
-
-- type: entity
-  parent: StatusEffectSpeed
-  id: ReagentSpeedStatusEffect
-  name: reagent speed
-
 - type: entity
   parent: StatusEffectSlowdown
   id: VomitingSlowdownStatusEffect
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 3da6805db2..879018d038 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -1286,19 +1286,10 @@
 #Airtight hatch
 
 - type: entity
-  parent: AirlockHatchSyndicate
-  id: AirlockHatchSyndicateLocked
+  parent: AirlockHatch
+  id: AirlockHatchSyndicate
   suffix: Syndicate, Locked
   components:
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsSyndicateAgent ]
-
-- type: entity
-  parent: AirlockHatchMaintenance
-  id: AirlockHatchMaintenanceLocked
-  suffix: Locked
-  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsMaintenance ]
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
index 52747a3f27..76d98f96d2 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -180,15 +180,6 @@
   - type: Paintable
     group: null
 
-- type: entity
-  parent: Airlock
-  id: AirlockHatchSyndicate
-  name: airtight hatch
-  suffix: Syndicate
-  components:
-  - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi
-
 # Glass
 - type: entity
   parent: AirlockGlass
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 4e50a7e60b..e275bef0e9 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -559,7 +559,7 @@
     color: "#b53ca1"
   - type: GuideHelp
     guides:
-    - AnalysisConsole
+    - Xenoarchaeology
 
 - type: entity
   parent: BaseComputerAiAccess
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 60e52c772d..d7fec6aa8c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -586,10 +586,6 @@
     staticPacks:
     - BioGenIngredientsStatic
     - BioGenMaterialsStatic
-  - type: EmagLatheRecipes
-    emagStaticPacks:
-    - BioGenEmagStatic
-    - HostileCubesStatic
 
 - type: entity
   parent: BaseLathe
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
index a94074489e..0ad1aa17f4 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
@@ -59,12 +59,6 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: fire_VOX
-          Arachnid:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: fire_ARACHNID
-          Moth:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: fire_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -97,12 +91,6 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: shock_VOX
-          Arachnid:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: shock_ARACHNID
-          Moth:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: shock_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -135,12 +123,6 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: shadow_VOX
-          Arachnid:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: shadow_ARACHNID
-          Moth:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: shadow_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -173,12 +155,6 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: frost_VOX
-          Arachnid:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: frost_ARACHNID
-          Moth:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: frost_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -211,12 +187,6 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: flora_VOX
-          Arachnid:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: flora_ARACHNID
-          Moth:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: flora_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -249,12 +219,6 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: bluespace_VOX
-          Arachnid:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: bluespace_ARACHNID
-          Moth:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: bluespace_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -287,12 +251,6 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: flesh_VOX
-          Arachnid:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: flesh_ARACHNID
-          Moth:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: flesh_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -326,12 +284,6 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: grav_VOX
-          Arachnid:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: grav_ARACHNID
-          Moth:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: grav_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -364,12 +316,6 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: tech_VOX
-          Arachnid:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: tech_ARACHNID
-          Moth:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: tech_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -403,12 +349,6 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: rock_VOX
-          Arachnid:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: rock_ARACHNID
-          Moth:
-            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: rock_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
index f1ce706847..0cc93a4fcf 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
@@ -1,11 +1,8 @@
 - type: entity
-  parent: BaseStructureDynamic
+  parent: [BaseStructureDynamic, BaseItemCabinetGlass]
   id: BaseGlassBox
   abstract: true
   components:
-  - type: Sprite
-    noRot: true
-    sprite: Structures/Storage/glassbox.rsi
   - type: Transform
     anchored: true
   - type: Physics
@@ -27,18 +24,20 @@
     delay: 4
 
 - type: entity
-  parent: [BaseGlassBox, BaseItemCabinetGlass]
   id: GlassBox
   name: glass box
   description: A sturdy showcase for an expensive exhibit.
+  parent: BaseGlassBox
   abstract: true # TODO: Temporarily abstract. Remove it after item scaling in cabinets is implemented.
   components:
   - type: Sprite
+    noRot: true
+    sprite: Structures/Storage/glassbox.rsi
     layers:
     - state: base
     - state: caplaser # TODO: Remove it after item scaling in cabinets is implemented.
       map: ["enum.ItemCabinetVisuals.Layer"]
-      visible: false
+      visible: true
     - state: glass
       map: ["enum.OpenableVisuals.Layer"]
     - state: locked
@@ -117,8 +116,8 @@
         acts: [ "Destruction" ]
 
 - type: entity
-  parent: GlassBox
   id: GlassBoxLaser
+  parent: GlassBox
   suffix: AntiqueLaser
   components:
   - type: AccessReader
@@ -136,8 +135,8 @@
         ejectSound: /Audio/Machines/machine_switch.ogg
 
 - type: entity
-  parent: GlassBoxLaser
   id: GlassBoxLaserOpen
+  parent: GlassBoxLaser
   suffix: AntiqueLaser, Open
   components:
   - type: Openable
@@ -146,8 +145,8 @@
     locked: false
 
 - type: entity
-  parent: GlassBoxLaser
   id: GlassBoxLaserFilled
+  parent: GlassBoxLaser
   suffix: AntiqueLaser, Filled
   components:
   - type: ContainerFill
@@ -161,13 +160,15 @@
   suffix: AntiqueLaser, Filled, Open
 
 - type: entity
-  parent: BaseGlassBox
   id: GlassBoxFrame
   name: glass box frame
   description: A glassless sturdy showcase for an expensive exhibit.
+  parent: BaseGlassBox
   suffix: Frame
   components:
   - type: Sprite
+    noRot: true
+    sprite: Structures/Storage/glassbox.rsi
     layers:
     - state: base
   - type: Construction
@@ -203,13 +204,14 @@
         acts: ["Destruction"]
 
 - type: entity
-  parent: GlassBoxFrame
   id: GlassBoxBroken
   name: broken glass box
   description: A broken showcase for a stolen expensive exhibit.
+  parent: GlassBoxFrame
   suffix: Broken
   components:
   - type: Sprite
+    sprite: Structures/Storage/glassbox.rsi
     layers:
     - state: base
     - state: glass-broken
diff --git a/Resources/Prototypes/Entities/Structures/soil.yml b/Resources/Prototypes/Entities/Structures/soil.yml
index 276b053157..725ab0c6ff 100644
--- a/Resources/Prototypes/Entities/Structures/soil.yml
+++ b/Resources/Prototypes/Entities/Structures/soil.yml
@@ -52,8 +52,7 @@
     - reagents: [Water]
       methods: [Touch, Ingestion, Injection]
       effects:
-      - !type:AddReagentToSolution
-        reagent: Water
+      - !type:AddToSolutionReaction
         solution: soil
   - type: Appearance
   - type: PlantHolderVisuals
diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml
index 84907318de..10a09116ad 100644
--- a/Resources/Prototypes/Entities/Tiles/lava.yml
+++ b/Resources/Prototypes/Entities/Tiles/lava.yml
@@ -17,7 +17,7 @@
         - Catwalk
   - type: TileEntityEffect
     effects:
-    - !type:Flammable
+    - !type:FlammableReaction
       multiplier: 3.75
       multiplierOnExisting: 0.75
     - !type:Ignite
diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
index 8d1881375b..ade23b6f71 100644
--- a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
+++ b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
@@ -17,7 +17,7 @@
       - Catwalk
   - type: TileEntityEffect
     effects:
-    - !type:Flammable
+    - !type:FlammableReaction
       multiplier: 3.75
       multiplierOnExisting: 0.75
     - !type:Ignite
diff --git a/Resources/Prototypes/Entities/Tiles/water.yml b/Resources/Prototypes/Entities/Tiles/water.yml
index a4478b5e58..c488df231b 100644
--- a/Resources/Prototypes/Entities/Tiles/water.yml
+++ b/Resources/Prototypes/Entities/Tiles/water.yml
@@ -20,7 +20,7 @@
   - type: SolutionContainerManager
     solutions:
       pool:
-        maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable.
+        maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. 
         reagents:
         - ReagentId: Water
           Quantity: 9999999
@@ -62,4 +62,4 @@
         - Catwalk
   - type: TileEntityEffect
     effects:
-    - !type:Extinguish
+    - !type:ExtinguishReaction
diff --git a/Resources/Prototypes/Guidebook/science.yml b/Resources/Prototypes/Guidebook/science.yml
index ba2d1cf7b2..2c3018dcee 100644
--- a/Resources/Prototypes/Guidebook/science.yml
+++ b/Resources/Prototypes/Guidebook/science.yml
@@ -37,18 +37,7 @@
   name: guide-entry-xenoarchaeology
   text: "/ServerInfo/Guidebook/Science/Xenoarchaeology.xml"
   children:
-    - AnalysisConsole
-    - XenoarchaeologyUnlockingNodes
-
-- type: guideEntry
-  id: XenoarchaeologyUnlockingNodes
-  name: guide-entry-xenoarchaeologyunlockingnodes
-  text: "/ServerInfo/Guidebook/Science/UnlockingNodes.xml"
-
-- type: guideEntry
-  id: AnalysisConsole
-  name: guide-entry-analysisconsole
-  text: "/ServerInfo/Guidebook/Science/AnalysisConsole.xml"
+  - ArtifactReports
 
 - type: guideEntry
   id: Robotics
@@ -57,6 +46,11 @@
   children:
   - Cyborgs
 
+- type: guideEntry
+  id: ArtifactReports
+  name: guide-entry-artifact-reports
+  text: "/ServerInfo/Guidebook/Science/ArtifactReports.xml"
+
 - type: guideEntry
   id: Cyborgs
   name: guide-entry-cyborgs
diff --git a/Resources/Prototypes/Hydroponics/randomMutations.yml b/Resources/Prototypes/Hydroponics/randomMutations.yml
index 2d45601da9..1120c38f31 100644
--- a/Resources/Prototypes/Hydroponics/randomMutations.yml
+++ b/Resources/Prototypes/Hydroponics/randomMutations.yml
@@ -21,7 +21,7 @@
     - name: ChangeSpecies
       baseOdds: 0.036
       appliesToProduce: false
-      effect: !type:PlantMutateSpeciesChange
+      effect: !type:PlantSpeciesChange
       persists: false
     - name: Unviable
       baseOdds: 0.109
@@ -175,11 +175,11 @@
     - name: ChangeExudeGasses
       baseOdds: 0.0145
       persists: false
-      effect: !type:PlantMutateExudeGases
+      effect: !type:PlantMutateExudeGasses
     - name: ChangeConsumeGasses
       baseOdds: 0.0036
       persists: false
-      effect: !type:PlantMutateConsumeGases
+      effect: !type:PlantMutateConsumeGasses
     - name: ChangeHarvest
       baseOdds: 0.036
       persists: false
diff --git a/Resources/Prototypes/NPCs/debug.yml b/Resources/Prototypes/NPCs/debug.yml
index 802e6b4b57..c7929be103 100644
--- a/Resources/Prototypes/NPCs/debug.yml
+++ b/Resources/Prototypes/NPCs/debug.yml
@@ -68,7 +68,7 @@
           - !type:KeyFloatLessPrecondition
             key: Count
             value: 50
-
+      
       - !type:HTNPrimitiveTask
           operator: !type:RandomOperator
             targetKey: IdleTime
@@ -85,5 +85,6 @@
     - tasks:
       - !type:HTNPrimitiveTask
         operator: !type:SpeakOperator
-          speech: !type:SingleSpeakOperatorSpeech
-            line: "fuck!"
+          speech: "fuck!"
+
+ 
\ No newline at end of file
diff --git a/Resources/Prototypes/NPCs/firebot.yml b/Resources/Prototypes/NPCs/firebot.yml
index b3a62280cc..2da9da50d2 100644
--- a/Resources/Prototypes/NPCs/firebot.yml
+++ b/Resources/Prototypes/NPCs/firebot.yml
@@ -6,8 +6,8 @@
           task: DouseFireTargetCompound
     - tasks:
         - !type:HTNCompoundTask
-          task: IdleCompound
-
+          task: IdleCompound    
+          
 - type: htnCompound
   id: DouseFireTargetCompound
   branches:
@@ -18,9 +18,8 @@
 
         - !type:HTNPrimitiveTask
           operator: !type:SpeakOperator
-            speech: !type:SingleSpeakOperatorSpeech
-              line: firebot-fire-detected
-            hidden: true
+            speech: firebot-fire-detected
+            hidden: true  
 
         - !type:HTNPrimitiveTask
           operator: !type:MoveToOperator
diff --git a/Resources/Prototypes/NPCs/hugbot.yml b/Resources/Prototypes/NPCs/hugbot.yml
deleted file mode 100644
index 1a56b22b92..0000000000
--- a/Resources/Prototypes/NPCs/hugbot.yml
+++ /dev/null
@@ -1,134 +0,0 @@
-- type: htnCompound
-  id: HugBotCompound
-  branches:
-  - tasks:
-    - !type:HTNCompoundTask
-      task: HugNearbyCompound
-  - tasks:
-    - !type:HTNCompoundTask
-      task: IdleCompound
-
-- type: htnCompound
-  id: HugNearbyCompound
-  branches:
-  - tasks:
-    # Locate hug recipient.
-    - !type:HTNPrimitiveTask
-      operator: !type:UtilityOperator
-        proto: NearbyNeedingHug
-
-    # Announce intent to hug
-    - !type:HTNPrimitiveTask
-      operator: !type:SpeakOperator
-        speech: !type:LocalizedSetSpeakOperatorSpeech
-          lineSet: HugBotStarts
-        hidden: true
-
-    # Approach hug recipient
-    - !type:HTNPrimitiveTask
-      operator: !type:MoveToOperator
-        pathfindInPlanning: true
-        removeKeyOnFinish: false
-        targetKey: TargetCoordinates
-        pathfindKey: TargetPathfind
-        rangeKey: MeleeRange
-
-    # HUG!!
-    - !type:HTNCompoundTask
-      task: HugBotHugCompound
-
-    # Stick around to enjoy the hug instead of just running up, squeezing and leaving.
-    - !type:HTNPrimitiveTask
-      operator: !type:SetFloatOperator
-        targetKey: IdleTime
-        amount: 1
-    - !type:HTNPrimitiveTask
-      operator: !type:WaitOperator
-        key: IdleTime
-      preconditions:
-      - !type:KeyExistsPrecondition
-        key: IdleTime
-
-    # Special case operator which applies the hugbot cooldown.
-    - !type:HTNPrimitiveTask
-      operator: !type:RaiseEventForOwnerOperator
-        args: !type:HugBotDidHugEvent
-        targetKey: Target
-
-    # Announce that the hug is completed.
-    - !type:HTNCompoundTask
-      task: HugBotFinishSpeakCompound
-
-- type: htnCompound
-  id: HugBotHugCompound
-  branches:
-  # Hit if emagged
-  - preconditions:
-    - !type:IsEmaggedPrecondition
-    tasks:
-    - !type:HTNPrimitiveTask
-      preconditions:
-      - !type:TargetInRangePrecondition
-        targetKey: Target
-        rangeKey: InteractRange
-      operator: !type:MeleeAttackOperator
-        targetKey: Target
-      services:
-      - !type:UtilityService
-        id: HugService
-        proto: NearbyNeedingHug
-        key: Target
-  # Hug otherwise
-  - tasks:
-    - !type:HTNPrimitiveTask
-      preconditions:
-      - !type:TargetInRangePrecondition
-        targetKey: Target
-        rangeKey: InteractRange
-      operator: !type:InteractWithOperator
-        targetKey: Target
-      services:
-      - !type:UtilityService
-        id: HugService
-        proto: NearbyNeedingHug
-        key: Target
-
-- type: htnCompound
-  id: HugBotFinishSpeakCompound
-  branches:
-  # Say mean things if emagged
-  - preconditions:
-    - !type:IsEmaggedPrecondition
-    tasks:
-    - !type:HTNPrimitiveTask
-      operator: !type:SpeakOperator
-        speech: !type:LocalizedSetSpeakOperatorSpeech
-          lineSet: EmaggedHugBotFinishes
-        hidden: true
-  # Say nice thing otherwise
-  - tasks:
-    - !type:HTNPrimitiveTask
-      operator: !type:SpeakOperator
-        speech: !type:LocalizedSetSpeakOperatorSpeech
-          lineSet: HugBotFinishes
-        hidden: true
-
-- type: utilityQuery
-  id: NearbyNeedingHug
-  query:
-  - !type:ComponentQuery
-    components:
-    - type: HumanoidAppearance
-      species: Human # This specific value isn't actually used, so don't worry about it being just `Human`.
-  - !type:ComponentFilter
-    retainWithComp: false
-    components:
-    - type: RecentlyHuggedByHugBot
-  considerations:
-  - !type:TargetDistanceCon
-    curve: !type:PresetCurve
-      preset: TargetDistance
-  - !type:TargetAccessibleCon
-    curve: !type:BoolCurve
-  - !type:TargetInLOSOrCurrentCon
-    curve: !type:BoolCurve
diff --git a/Resources/Prototypes/NPCs/medibot.yml b/Resources/Prototypes/NPCs/medibot.yml
index 1cd6352e16..c0853984ee 100644
--- a/Resources/Prototypes/NPCs/medibot.yml
+++ b/Resources/Prototypes/NPCs/medibot.yml
@@ -20,8 +20,7 @@
 
         - !type:HTNPrimitiveTask
           operator: !type:SpeakOperator
-            speech: !type:SingleSpeakOperatorSpeech
-              line: medibot-start-inject
+            speech: medibot-start-inject
             hidden: true
 
         - !type:HTNPrimitiveTask
diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml
index f015dd8f72..76d74876b0 100644
--- a/Resources/Prototypes/Objectives/ninja.yml
+++ b/Resources/Prototypes/Objectives/ninja.yml
@@ -51,10 +51,6 @@
       sprite: Objects/Weapons/Bombs/spidercharge.rsi
       state: icon
   - type: SpiderChargeCondition
-    blacklist:
-      tags:
-      - GhostOnlyWarp
-      - NinjaBombingTargetBlocker
 
 - type: entity
   parent: [BaseNinjaObjective, BaseSurviveObjective]
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index fde0779151..80879aae99 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -149,6 +149,7 @@
     minCollectionSize: 2
     maxCollectionSize: 5
     verifyMapExistence: false
+    checkStealAreas: false
   - type: Objective
     difficulty: 1.2
 
diff --git a/Resources/Prototypes/Parallaxes/train.yml b/Resources/Prototypes/Parallaxes/train.yml
index 2bd7ac18e4..e47cedfc2a 100644
--- a/Resources/Prototypes/Parallaxes/train.yml
+++ b/Resources/Prototypes/Parallaxes/train.yml
@@ -1,6 +1,36 @@
 - type: parallax
   id: TrainStation
   layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/AspidParallaxBG.png"
+      slowness: 0.998046875
+      scale: "0.5, 0.5"
+      scrolling: "0, -0.098046875"
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml"
+      slowness: 0.996625
+      scrolling: "0, -0.196625"
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars_dim"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml"
+      slowness: 0.989375
+      scrolling: "0, -0.209375"
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars_faster"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars-2.toml"
+      slowness: 0.987265625
+      scrolling: "0, -0.287265625"
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars_dim_faster"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim-2.toml"
+      slowness: 0.984352
+      scrolling: "0, -0.384352"
     - texture:
         !type:ImageParallaxTextureSource
         path: "/Textures/Parallaxes/AspidParallaxBG.png"
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index f294b5438b..9bd5bb195f 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -30,8 +30,7 @@
       - !type:ModifyStatusEffect
         effectProto: StatusEffectSeeingRainbow
         conditions:
-        - !type:ReagentCondition
-          reagent: Absinthe
+        - !type:ReagentThreshold
           min: 10
         type: Add
         time: 5
@@ -42,8 +41,7 @@
         - absinthe-effect-feel-tulips
         probability: 0.02
         conditions:
-        - !type:ReagentCondition
-          reagent: Absinthe
+        - !type:ReagentThreshold
           min: 10
 
 - type: reagent
@@ -165,46 +163,43 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Ethanol
+        - !type:ReagentThreshold
           min: 15
-        - !type:MetabolizerTypeCondition
-          type: [ Dwarf ]
-          inverted: true
+        - !type:OrganType
+          type: Dwarf
+          shouldHave: false
         damage:
           types:
             Poison: 1
       # dwarves take less toxin damage and heal a marginal amount of brute
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Ethanol
+        - !type:ReagentThreshold
           min: 15
-        - !type:MetabolizerTypeCondition
-          type: [ Dwarf ]
+        - !type:OrganType
+          type: Dwarf
         damage:
           types:
             Poison: 0.2
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Ethanol
+        - !type:ReagentThreshold
           min: 15
-        - !type:MetabolizerTypeCondition
-          type: [ Dwarf ]
+        - !type:OrganType
+          type: Dwarf
         damage:
           groups:
             Brute: -1
-      - !type:Vomit
+      - !type:ChemVomit
         probability: 0.04
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Ethanol
           min: 12
         # dwarves immune to vomiting from alcohol
-        - !type:MetabolizerTypeCondition
-          type: [ Dwarf ]
-          inverted: true
+        - !type:OrganType
+          type: Dwarf
+          shouldHave: false
       - !type:Drunk
         boozePower: 2
 
@@ -2320,10 +2315,9 @@
   metabolisms:
     Drink:
       effects:
-      - !type:Vomit
+      - !type:ChemVomit
         conditions:
-        - !type:ReagentCondition
-          reagent: Mayojito
+        - !type:ReagentThreshold
           min: 5
         probability: 0.5
       - !type:HealthChange
@@ -2525,31 +2519,29 @@
         boozePower: 10
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: BacchusBlessing
+        - !type:ReagentThreshold
           min: 6
-        - !type:MetabolizerTypeCondition
-          type: [Dwarf]
-          inverted: true
+        - !type:OrganType
+          type: Dwarf
+          shouldHave: false
         damage:
           types:
             Poison: 2 # TODO: Figure out poison amount. Ethanol does 1, this does 2 but also metabolises almost 3 to 4 times as fast as ethanol. This would be more Liver damage when that time arrives.
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: BacchusBlessing
+        - !type:ReagentThreshold
           min: 6
-        - !type:MetabolizerTypeCondition
-          type: [Dwarf]
+        - !type:OrganType
+          type: Dwarf
         damage:
           types:
             Poison: 0.4 # TODO: Might increase this, even though it's just double of ethanol from 0.2 to 0.4
-      - !type:Vomit
+      - !type:ChemVomit
         probability: 0.1 #TODO: Tweak vomit probability, maybe make this more violent and poisonous but the body aggressively purges it...
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: BacchusBlessing
           min: 8
-        - !type:MetabolizerTypeCondition
-          type: [Dwarf]
-          inverted: true
+        - !type:OrganType
+          type: Dwarf
+          shouldHave: false
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml b/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
index 1311042949..6c050a6ca6 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
@@ -13,7 +13,7 @@
     Extinguish:
       methods: [ Touch ]
       effects:
-      - !type:Extinguish
+      - !type:ExtinguishReaction
   plantMetabolism:
   - !type:PlantAdjustWater
     amount: 1
@@ -60,7 +60,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:Flammable
+      - !type:FlammableReaction
   tileReactions:
   - !type:FlammableTileReaction
     temperatureMultiplier: 1.35
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 6fac8606d9..f49e9f9671 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -453,11 +453,12 @@
     Gas:
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         ignoreResistances: true
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Slime ]
+        - !type:OrganType
+          type: Slime
+          shouldHave: true
         damage:
           types:
             Heat: 3
@@ -468,22 +469,16 @@
   desc: reagent-desc-ice
   slipData:
     requiredSlipSpeed: 3.5
-  evaporationSpeed: 0.15 # TODO: Ideally Ice should just turn into Water if the room is warm enough (and vis versa), rather than Ice directly evaporating
   physicalDesc: reagent-physical-desc-frosty
   flavor: cold
   color: "#bed8e6"
   recognizable: true
   meltingPoint: 0.0
   boilingPoint: 100.0
-  friction: 0.05 # Copied from Ice Crust
-  metabolisms:
-    Drink:
-      effects:
-      - !type:SatiateThirst
-        factor: 3 # Slightly worse for quenching thirst than just straight water
+  friction: 0.05 #Copied from Ice Crust
   plantMetabolism:
   - !type:PlantAdjustWater
-    amount: 1 # The internet tells me I should avoid watering plants with ice, but mostly because of temperature, so this value being the same as water should probably be fine?
+    amount: 1
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/iceglass.rsi
     state: icon_empty
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index 67c0bf1615..5ac667ec18 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -274,9 +274,9 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Slime]
-          inverted: true
+        - !type:OrganType
+          type: Slime
+          shouldHave: false
         damage:
           types:
             Poison: 1
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
index 45c826eff9..c9625c663c 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
@@ -36,7 +36,7 @@
             Brute: -0.5
             Burn: -0.5
       # Helps you stop bleeding to an extent.
-      - !type:ModifyBleed
+      - !type:ModifyBleedAmount
         amount: -0.25
       - !type:SatiateHunger #Numbers are balanced with this in mind + it helps limit how much healing you can get from food
   # Lets plants benefit too
@@ -82,7 +82,7 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:ReagentCondition #Only satiates when eaten with nutriment
+        - !type:ReagentThreshold #Only satiates when eaten with nutriment
           reagent: Nutriment
           min: 0.1
         factor: 1
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
index 8813b5bb66..6e4114cecf 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
@@ -120,9 +120,9 @@
         emote: Cough
         showInGuidebook: true
         conditions:
-        - !type:BreathingCondition
-        - !type:InternalsCondition
-          inverted: true
+        - !type:Breathing
+        - !type:Internals
+          usingInternals: false
 
 - type: reagent
   id: Vinegar
@@ -142,11 +142,10 @@
       - !type:AdjustReagent
         reagent: Vitamin
         amount: 0.1
-      - !type:Vomit
+      - !type:ChemVomit
         probability: 0.1
         conditions:
-          - !type:ReagentCondition
-            reagent: Vinegar
+          - !type:ReagentThreshold
             min: 6
 
 - type: reagent
@@ -224,8 +223,7 @@
           amount: 250 # thermal energy, not temp
         - !type:HealthChange
           conditions:
-            - !type:ReagentCondition
-              reagent: CapsaicinOil
+            - !type:ReagentThreshold
               min: 5
           damage:
             types:
@@ -249,7 +247,7 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:ReagentCondition #Only satiates when eaten with nutriment
+        - !type:ReagentThreshold #Only satiates when eaten with nutriment
           reagent: Nutriment
           min: 0.1
         factor: 1
@@ -316,8 +314,7 @@
         amount: -250 # thermal energy, not temp
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: FrostOil
+        - !type:ReagentThreshold
           min: 5
         damage:
           types:
diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml
index 3e2d7319ad..1555ab9e23 100644
--- a/Resources/Prototypes/Reagents/Materials/ores.yml
+++ b/Resources/Prototypes/Reagents/Materials/ores.yml
@@ -76,4 +76,4 @@
   unit: materials-unit-chunk
   icon: { sprite: Objects/Materials/ore.rsi, state: salt }
   color: "#f5e7d7"
-  price: 0.075
+  price: 0.075
\ No newline at end of file
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index dd76a34ee2..ca46881a83 100644
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -20,9 +20,9 @@
       - !type:SatiateThirst
         factor: 1.0
         conditions:
-          - !type:MetabolizerTypeCondition
-            type: [ Human ]
-            inverted: true
+          - !type:OrganType
+            type: Human
+            shouldHave: false
     Food:
       effects:
         - !type:AdjustReagent
@@ -32,8 +32,8 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Bloodsucker ]
+        - !type:OrganType
+          type: Bloodsucker
         damage:
           groups:
             Brute: -3
@@ -148,7 +148,7 @@
         damage:
           types:
             Poison: 4
-      - !type:Vomit
+      - !type:ChemVomit
         probability: 0.25
 
 - type: reagent
@@ -177,7 +177,7 @@
         damage:
           types:
             Bloodloss: -3
-      - !type:ModifyBleed
+      - !type:ModifyBleedAmount
         amount: -1.5
   # Just in case you REALLY want to water your plants
   plantMetabolism:
diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index eb5ceba470..e96d5be30c 100644
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -14,8 +14,8 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Plant]
+        - !type:OrganType
+          type: Plant
 
 - type: reagent
   id: Left4Zed
@@ -38,15 +38,15 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Plant]
+        - !type:OrganType
+          type: Plant
       - !type:HealthChange
         damage:
           types:
             Poison: 1
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Plant]
+        - !type:OrganType
+          type: Plant
 
 - type: reagent
   id: PestKiller
@@ -69,8 +69,8 @@
           types:
             Poison: 3
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Plant]
+        - !type:OrganType
+          type: Plant
 
 - type: reagent
   id: PlantBGone
@@ -100,8 +100,8 @@
             Slash: 1
             Piercing: 1
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Plant]
+        - !type:OrganType
+          type: Plant
 
 - type: reagent
   id: RobustHarvest
@@ -132,14 +132,13 @@
             Slash: -3
             Piercing: -3
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Plant]
+        - !type:OrganType
+          type: Plant
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Plant]
-        - !type:ReagentCondition
-          reagent: RobustHarvest
+        - !type:OrganType
+          type: Plant
+        - !type:ReagentThreshold
           min: 30
         damage:
           types:
@@ -151,10 +150,9 @@
       - !type:Polymorph
         prototype: TreeMorph
         conditions:
-          - !type:MetabolizerTypeCondition
-            type: [Plant]
-          - !type:ReagentCondition
-            reagent: RobustHarvest
+          - !type:OrganType
+            type: Plant
+          - !type:ReagentThreshold
             min: 80
 
 - type: reagent
@@ -194,8 +192,8 @@
           types:
             Poison: 4
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Plant]
+        - !type:OrganType
+          type: Plant
 
 - type: reagent
   id: Ammonia
@@ -223,23 +221,26 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Rat ]
-          inverted: true
-        - !type:ReagentCondition
+        - !type:OrganType
+          type: Rat
+          shouldHave: false
+        - !type:ReagentThreshold
           reagent: Ammonia
           min: 1
         ignoreResistances: true
         damage:
           types:
             Poison: 0.25
-      - !type:Vomit
+      - !type:ChemVomit
         probability: 0.12
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Rat, Vox ]
-          inverted: true
-        - !type:ReagentCondition
+        - !type:OrganType
+          type: Rat
+          shouldHave: false
+        - !type:OrganType
+          type: Vox
+          shouldHave: false
+        - !type:ReagentThreshold
           reagent: Ammonia
           min: 0.8
       - !type:PopupMessage
@@ -248,28 +249,28 @@
         messages: [ "ammonia-smell" ]
         probability: 0.1
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Ammonia
           min: 0.25
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Rat ]
-        - !type:ReagentCondition
+        - !type:OrganType
+          type: Rat
+        - !type:ReagentThreshold
           reagent: Ammonia
           min: 1
-        scaling: true
+        scaleByQuantity: true
         ignoreResistances: true
         damage:
           groups:
-            Brute: -2.5
-            Burn: -2.5
+            Brute: -5
+            Burn: -5
           types:
             Bloodloss: -5
       - !type:Oxygenate # ammonia displaces nitrogen in vox blood
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Vox ]
+        - !type:OrganType
+          type: Vox
         factor: -4
 
 
diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml
index 7c0f1c8f09..81f4e421bf 100644
--- a/Resources/Prototypes/Reagents/chemicals.yml
+++ b/Resources/Prototypes/Reagents/chemicals.yml
@@ -41,8 +41,7 @@
         damage:
           types:
             Poison: -1
-      - !type:CleanBloodstream
-        excluded: Charcoal
+      - !type:ChemCleanBloodstream
         cleanseRate: 3
 
 - type: reagent
@@ -95,7 +94,9 @@
       methods: [ Touch ]
       effects:
       - !type:ArtifactUnlock
-        minScale: 5
+        conditions:
+        - !type:ReagentThreshold
+          min: 5
 
 - type: reagent
   parent: Artifexium
@@ -110,7 +111,9 @@
       methods: [ Touch ]
       effects:
       - !type:ArtifactDurabilityRestore
-        minScale: 5
+        conditions:
+        - !type:ReagentThreshold
+          min: 5
 
 - type: reagent
   id: Benzene
@@ -156,10 +159,9 @@
             Heat: 1.5
     Medicine:
       effects:
-      - !type:Vomit
+      - !type:ChemVomit
         conditions:
-        - !type:ReagentCondition
-          reagent: SodiumHydroxide
+        - !type:ReagentThreshold
           min: 5
         probability: 0.1
 
diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml
index c5fe0e4da9..2ebd213fec 100644
--- a/Resources/Prototypes/Reagents/cleaning.yml
+++ b/Resources/Prototypes/Reagents/cleaning.yml
@@ -57,18 +57,16 @@
   metabolisms:
     Food:
       effects:
-      - !type:Vomit
+      - !type:ChemVomit
         conditions:
-        - !type:ReagentCondition
-          reagent: SoapReagent
+        - !type:ReagentThreshold
           min: 6
         probability: 0.20
     Drink:
       effects:
-      - !type:Vomit
+      - !type:ChemVomit
         conditions:
-        - !type:ReagentCondition
-          reagent: SoapReagent
+        - !type:ReagentThreshold
           min: 6
         probability: 0.20
 
@@ -107,7 +105,7 @@
       methods: [ Touch ]
       effects:
       # pva glue? no, antibiotic glue for sealing wounds
-      - !type:ModifyBleed
+      - !type:ModifyBleedAmount
         amount: -1.5
   metabolisms:
     Narcotic:
@@ -121,6 +119,8 @@
       - !type:GenericStatusEffect
         key: Muted
         component: Muted
+        type: Add
         time: 5
+        refresh: false
   footstepSound:
     collection: FootstepSlime
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index 27e27be503..8d317102c1 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -63,9 +63,9 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Arachnid ]
-          inverted: true
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: false
         damage:
           types:
             Poison: 0.1
@@ -73,8 +73,9 @@
       effects:
       - !type:ModifyBloodLevel
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Arachnid ]
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: true
         amount: 0.4
 
 - type: reagent
@@ -153,8 +154,9 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Arachnid ]
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: true
         damage:
           types:
             Poison: 0.1
@@ -162,9 +164,9 @@
       effects:
       - !type:ModifyBloodLevel
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Arachnid ]
-          inverted: true
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: false
         amount: 0.4
 
 - type: reagent
diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index 0ad3e9af61..2ed57f73b0 100644
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -21,7 +21,7 @@
       # Hail the madman logic, if it has CARP, means it helps against CARPs
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: CarpoToxin
           min: 1
         reagent: CarpoToxin
@@ -39,8 +39,8 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Moth ]
+        - !type:OrganType
+          type: Moth
 
 - type: reagent
   id: BuzzochloricBees
@@ -75,11 +75,11 @@
         - "buzzochloricbees-effect-squeaky-clean"
         probability: 0.1
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           max: 0
           reagent: Histamine
-        - !type:TagCondition
-          inverted: true
+        - !type:HasTag
+          invert: true
           tag: Bee
       - !type:PopupMessage
         type: Local
@@ -92,11 +92,11 @@
           - "buzzochloricbees-effect-squeaky-clean"
         probability: 0.05
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           min: 0.01
           reagent: Histamine
-        - !type:TagCondition
-          inverted: true
+        - !type:HasTag
+          invert: true
           tag: Bee
       - !type:PopupMessage
         type: Local
@@ -108,10 +108,10 @@
           - "buzzochloricbees-effect-licoxide-buzzes"
         probability: 0.05
         conditions:
-        - !type:TagCondition
-          inverted: true
+        - !type:HasTag
+          invert: true
           tag: Bee
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           min: 0.01
           reagent: Licoxide
       - !type:PopupMessage
@@ -121,10 +121,10 @@
           - "buzzochloricbees-effect-fiber-soft"
         probability: 0.05
         conditions:
-        - !type:TagCondition
-          inverted: true
+        - !type:HasTag
+          invert: true
           tag: Bee
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           min: 0.01
           reagent: Fiber
       - !type:HealthChange
@@ -133,8 +133,8 @@
             Poison: 2
             Piercing: 2
         conditions:
-        - !type:TagCondition
-          inverted: true
+        - !type:HasTag
+          invert: true
           tag: Bee
 
 - type: reagent
@@ -183,11 +183,11 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         ignoreResistances: false
         damage:
           types:
-            Slash: 0.25
+            Slash: 0.5
       - !type:Emote
         emote: Scream
         probability: 0.7
@@ -233,20 +233,20 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         ignoreResistances: false
         damage:
           types:
             Cold: 0.05
       - !type:AdjustTemperature
         conditions:
-        - !type:TemperatureCondition
+        - !type:Temperature
           min: 160.15
         amount: -30000
     Extinguish:
       methods: [ Touch ]
       effects:
-      - !type:Extinguish # cold
+      - !type:ExtinguishReaction # cold
   metabolisms:
     Poison:
       metabolismRate : 0.45
@@ -258,7 +258,7 @@
              Heat: -3 # ghetto burn chem. i don't think anyone would use this intentionally but it's funny
       - !type:PopupMessage
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Fresium
           max: 35
         type: Local
@@ -267,7 +267,7 @@
         probability: 0.05
       - !type:PopupMessage
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Fresium
           max: 35
         type: Local
@@ -276,26 +276,26 @@
         probability: 0.2
       - !type:AdjustTemperature
         conditions:
-        - !type:TemperatureCondition
+        - !type:Temperature
           min: 160.15 # not quite enough for cryo, but can speed it up if you wanna take the risk
         amount: -10000
-      - !type:MovementSpeedModifier
+      - !type:MovespeedModifier
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Fresium
           max: 40 # slows when less than 40
         walkSpeedModifier: 0.6
         sprintSpeedModifier: 0.6
-      - !type:MovementSpeedModifier
+      - !type:MovespeedModifier
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Fresium
           min: 40 # your legs stop working when above 40
         walkSpeedModifier: 0.00
         sprintSpeedModifier: 0.00
       - !type:PopupMessage
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Fresium
           min: 40
         type: Local
@@ -347,18 +347,16 @@
       - !type:Polymorph
         prototype: ArtifactLizard # Does the same thing as the original YML I made for this reagent.
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Animal]
-          inverted: true
-        - !type:ReagentCondition
-          reagent: JuiceThatMakesYouWeh
+        - !type:OrganType
+          type: Animal
+          shouldHave: false
+        - !type:ReagentThreshold
           min: 50
       - !type:AdjustReagent
         reagent: JuiceThatMakesYouWeh
         amount: -20
         conditions:
-        - !type:ReagentCondition
-          reagent: JuiceThatMakesYouWeh
+        - !type:ReagentThreshold
           min: 50
 
 - type: reagent
@@ -382,18 +380,16 @@
       - !type:Polymorph
         prototype: ArtifactLizard
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Animal ]
-          inverted: true
-        - !type:ReagentCondition
-          reagent: JuiceThatMakesYouHew
+        - !type:OrganType
+          type: Animal
+          shouldHave: false
+        - !type:ReagentThreshold
           min: 50
       - !type:AdjustReagent
         reagent: JuiceThatMakesYouHew
         amount: -20
         conditions:
-        - !type:ReagentCondition
-          reagent: JuiceThatMakesYouHew
+        - !type:ReagentThreshold
           min: 50
 
 - type: reagent
@@ -410,8 +406,7 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: CorgiJuice
+        - !type:ReagentThreshold
           min: 15
         damage:
           types:
@@ -419,13 +414,11 @@
       - !type:Polymorph
         prototype: SmartCorgiMorph
         conditions:
-        - !type:ReagentCondition
-          reagent: CorgiJuice
+        - !type:ReagentThreshold
           min: 50
       - !type:AdjustReagent
         reagent: CorgiJuice
         amount: -20
         conditions:
-        - !type:ReagentCondition
-          reagent: CorgiJuice
+        - !type:ReagentThreshold
           min: 50
diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
index 6a0b257877..3d65931f19 100644
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -11,69 +11,93 @@
     Poison:
       effects:
       - !type:Oxygenate
-        scaling: true
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Human, Animal, Rat, Plant ]
+        - !type:OrganType
+          type: Human
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Animal
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Rat
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Plant
       # Convert Oxygen into CO2.
       - !type:ModifyLungGas
-        scaling: true
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Vox ]
-          inverted: true
+        - !type:OrganType
+          type: Vox
+          shouldHave: false
         ratios:
           CarbonDioxide: 1.0
           Oxygen: -1.0
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Vox ]
-        scaling: true
+        - !type:OrganType
+          type: Vox
+        scaleByQuantity: true
         ignoreResistances: true
         damage:
           types:
-            Poison: 1.5
+            Poison:
+              3
       - !type:AdjustAlert
         alertType: Toxins
-        minScale: 1
         conditions:
-          - !type:MetabolizerTypeCondition
-            type: [ Vox ]
+          - !type:ReagentThreshold
+            min: 0.5
+          - !type:OrganType
+            type: Vox
         clear: true
         time: 5
     Gas:
       effects:
       - !type:Oxygenate
-        scaling: true
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Human, Animal, Rat, Plant ]
+        - !type:OrganType
+          type: Human
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Animal
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Rat
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Plant
       # Convert Oxygen into CO2.
       - !type:ModifyLungGas
-        scaling: true
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Vox ]
-          inverted: true
+        - !type:OrganType
+          type: Vox
+          shouldHave: false
         ratios:
           CarbonDioxide: 1.0
           Oxygen: -1.0
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Vox ]
-        scaling: true
+        - !type:OrganType
+          type: Vox
+        scaleByQuantity: true
         ignoreResistances: true
         damage:
           types:
-            Poison: 0.7
+            Poison:
+              7
       - !type:AdjustAlert
         alertType: Toxins
-        minScale: 1
         conditions:
-          - !type:MetabolizerTypeCondition
-            type: [ Vox ]
+          - !type:ReagentThreshold
+            min: 0.5
+          - !type:OrganType
+            type: Vox
         clear: true
         time: 5
 
@@ -96,30 +120,32 @@
       - !type:HealthChange
         damage:
           types:
-            Poison: 1.5
+            Poison: 3
       - !type:AdjustReagent
         reagent: Inaprovaline
         amount: -2.0
     Gas:
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         ignoreResistances: true
         damage:
           types:
             Poison:
-              0.1
+              1
       # We need a metabolism effect on reagent removal
       - !type:AdjustAlert
         alertType: Toxins
-        minScale: 3
+        conditions:
+          - !type:ReagentThreshold
+            min: 1.5
         clear: True
         time: 5
   reactiveEffects:
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:Flammable
+      - !type:FlammableReaction
 
 - type: reagent
   id: Tritium
@@ -137,7 +163,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:Flammable
+      - !type:FlammableReaction
         multiplier: 0.8
   metabolisms:
     Poison:
@@ -145,11 +171,11 @@
       - !type:HealthChange
         damage:
           types:
-            Radiation: 1.5
+            Radiation: 3
     Gas:
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         ignoreResistances: true
         damage:
           types:
@@ -158,7 +184,9 @@
       # We need a metabolism effect on reagent removal
       - !type:AdjustAlert
         alertType: Toxins
-        minScale: 3
+        conditions:
+          - !type:ReagentThreshold
+            min: 1.5
         clear: True
         time: 5
 
@@ -173,55 +201,58 @@
     Poison:
       effects:
       - !type:Oxygenate
-        scaling: true
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Plant ]
+        - !type:OrganType
+          type: Plant
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Plant, Vox ]
-          inverted: true
-        scaling: true
+        - !type:OrganType
+          type: Plant
+          shouldHave: false
+        - !type:OrganType
+          type: Vox
+          shouldHave: false
+        scaleByQuantity: true
         ignoreResistances: true
         damage:
           types:
             Poison:
-              0.4
+              0.8
       - !type:Oxygenate
-        scaling: true
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Plant ]
-          inverted: true
+        - !type:OrganType
+          type: Plant
+          shouldHave: false
         factor: -4
     Gas:
       effects:
       - !type:Oxygenate
-        scaling: true
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Plant ]
+        - !type:OrganType
+          type: Plant
       - !type:HealthChange
-        minScale: 1
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Plant, Vox ]
-          inverted: true
+        - !type:OrganType
+          type: Plant
+          shouldHave: false
+        - !type:OrganType
+          type: Vox
+          shouldHave: false
         # Don't want people to get toxin damage from the gas they just
         # exhaled, right?
-        scaling: true
+        - !type:ReagentThreshold
+          min: 0.5
+        scaleByQuantity: true
         ignoreResistances: true
         damage:
           types:
             Poison:
               0.8
       - !type:Oxygenate # carbon dioxide displaces oxygen from the bloodstream, causing asphyxiation
-        scaling: true
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Plant ]
-          inverted: true
+        - !type:OrganType
+          type: Plant
+          shouldHave: false
         factor: -4
       # We need a metabolism effect on reagent removal
       #- !type:AdjustAlert
@@ -242,28 +273,29 @@
       - !type:HealthChange
         damage:
           types:
-            Cold: 0.5 # liquid nitrogen is cold
+            Cold: 1 # liquid nitrogen is cold
     Gas:
       effects:
       - !type:Oxygenate
-        scaling: true
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Vox, Slime ]
-      # Converts Nitrogen into Ammonia
+        - !type:OrganType
+          type: Vox
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Slime
+      # Converts Nitrogen into CO2
       - !type:ModifyLungGas
-        scaling: true
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Vox ]
+        - !type:OrganType
+          type: Vox
         ratios:
           Ammonia: 1.0
           Nitrogen: -1.0
       - !type:ModifyLungGas
-        scaling: true
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Slime ]
+        - !type:OrganType
+          type: Slime
         ratios:
           NitrousOxide: 1.0
           Nitrogen: -1.0
@@ -283,60 +315,72 @@
       - !type:HealthChange
         damage:
           types:
-            Poison: 1
+            Poison: 2
     Gas:
       effects:
       - !type:Emote
-        minScale: 1
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Slime ]
-          inverted: true
+        - !type:ReagentThreshold
+          reagent: NitrousOxide
+          min: 0.2
+        - !type:OrganType
+          type: Slime
+          shouldHave: false
         emote: Laugh
         showInChat: true
         probability: 0.1
       - !type:Emote
-        minScale: 0.4
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Slime ]
-          inverted: true
+        - !type:ReagentThreshold
+          reagent: NitrousOxide
+          min: 0.2
+        - !type:OrganType
+          type: Slime
+          shouldHave: false
         emote: Scream
         showInChat: true
         probability: 0.01
       - !type:PopupMessage
-        minScale: 1
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Slime ]
-          inverted: true
+        - !type:ReagentThreshold
+          reagent: NitrousOxide
+          min: 0.5
+        - !type:OrganType
+          type: Slime
+          shouldHave: false
         type: Local
         visualType: Medium
         messages: [ "effect-sleepy" ]
         probability: 0.1
-      - !type:MovementSpeedModifier
-        minScale: 2
+      - !type:MovespeedModifier
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Slime ]
-          inverted: true
+        - !type:ReagentThreshold
+          reagent: NitrousOxide
+          min: 1
+        - !type:OrganType
+          type: Slime
+          shouldHave: false
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:ModifyStatusEffect
-        minScale: 3.6
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Slime ]
-          inverted: true
+        - !type:ReagentThreshold
+          reagent: NitrousOxide
+          min: 1.8
+        - !type:OrganType
+          type: Slime
+          shouldHave: false
         effectProto: StatusEffectForcedSleeping
         time: 3
         type: Update
       - !type:HealthChange
-        minScale: 7
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Slime ]
-          inverted: true
+        - !type:ReagentThreshold
+          reagent: NitrousOxide
+          min: 3.5
+        - !type:OrganType
+          type: Slime
+          shouldHave: false
         ignoreResistances: true
         damage:
           types:
@@ -359,11 +403,11 @@
     Narcotic:
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         ignoreResistances: true
         damage:
           types:
-            Cellular: 0.5
+            Cellular: 1
       - !type:ModifyStatusEffect
         effectProto: StatusEffectSeeingRainbow
         type: Add
@@ -374,39 +418,59 @@
         type: Local
         messages: [ "frezon-lungs-cold" ]
         probability: 0.1
-        minScale: 1
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Frezon
+          min: 0.5
       - !type:PopupMessage
         type: Local
         visualType: Medium
         messages: [ "frezon-euphoric" ]
         probability: 0.1
         conditions:
-        minScale: 2
+        - !type:ReagentThreshold
+          reagent: Frezon
+          min: 1
     Gas:
       effects:
       - !type:HealthChange
-        minScale: 1
-        scaling: true
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Frezon
+          min: 0.5
+        scaleByQuantity: true
         ignoreResistances: true
         damage:
           types:
-            Cellular: 0.05
+            Cellular: 0.5
       - !type:ModifyStatusEffect
-        minScale: 2
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Frezon
+          min: 1
         effectProto: StatusEffectSeeingRainbow
         type: Add
         time: 500
       - !type:Drunk
         boozePower: 500
-        minScale: 2
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Frezon
+          min: 1
       - !type:PopupMessage
         type: Local
         messages: [ "frezon-lungs-cold" ]
         probability: 0.1
-        minScale: 2
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Frezon
+          min: 0.5
       - !type:PopupMessage
         type: Local
         visualType: Medium
         messages: [ "frezon-euphoric" ]
         probability: 0.1
-        minScale: 2
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Frezon
+          min: 1
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index d81ec12b3d..71ae11dad9 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -35,36 +35,31 @@
             Poison: -1
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Dylovene
+        - !type:ReagentThreshold
           min: 20
         damage:
           groups:
             Brute: 2
       - !type:Jitter
         conditions:
-        - !type:ReagentCondition
-          reagent: Dylovene
+        - !type:ReagentThreshold
           min: 20
       - !type:PopupMessage
         conditions:
-        - !type:ReagentCondition
-          reagent: Dylovene
+        - !type:ReagentThreshold
           min: 20
         type: Local
         visualType: Medium
         messages: [ "generic-reagent-effect-nauseous" ]
         probability: 0.2
-      - !type:Vomit
+      - !type:ChemVomit
         conditions:
-        - !type:ReagentCondition
-          reagent: Dylovene
+        - !type:ReagentThreshold
           min: 20
         probability: 0.02
       - !type:Drunk
         conditions:
-        - !type:ReagentCondition
-          reagent: Dylovene
+        - !type:ReagentThreshold
           min: 15
   plantMetabolism:
   - !type:PlantAdjustToxins
@@ -153,23 +148,20 @@
           Brute: -1.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Bicaridine
+        - !type:ReagentThreshold
           min: 15
         damage:
           types:
             Asphyxiation: 0.5
             Poison: 1.5
-      - !type:Vomit
+      - !type:ChemVomit
         conditions:
-        - !type:ReagentCondition
-          reagent: Bicaridine
+        - !type:ReagentThreshold
           min: 30
         probability: 0.02
       - !type:Jitter
         conditions:
-        - !type:ReagentCondition
-          reagent: Bicaridine
+        - !type:ReagentThreshold
           min: 15
       - !type:Drunk
 
@@ -192,7 +184,7 @@
       effects:
         - !type:HealthChange
           conditions:
-          - !type:TemperatureCondition
+          - !type:Temperature
             # this is a little arbitrary but they gotta be pretty cold
             max: 213.0
           damage:
@@ -216,7 +208,7 @@
       effects:
         - !type:HealthChange
           conditions:
-          - !type:TemperatureCondition
+          - !type:Temperature
             max: 213.0
           damage:
             types:
@@ -241,8 +233,7 @@
             Cold: -1.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Dermaline
+        - !type:ReagentThreshold
           min: 10
         damage:
           types:
@@ -252,8 +243,7 @@
             Brute: 0.5
       - !type:Jitter
         conditions:
-        - !type:ReagentCondition
-          reagent: Dermaline
+        - !type:ReagentThreshold
           min: 10
 
 - type: reagent
@@ -274,8 +264,7 @@
             Bloodloss: -0.5
       - !type:HealthChange
         conditions:
-          - !type:ReagentCondition
-            reagent: Dexalin
+          - !type:ReagentThreshold
             min: 20
         damage:
           types:
@@ -300,15 +289,14 @@
             Bloodloss: -3
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: HeartbreakerToxin
           min: 1
         reagent: HeartbreakerToxin
         amount: -3
       - !type:HealthChange
         conditions:
-          - !type:ReagentCondition
-            reagent: DexalinPlus
+          - !type:ReagentThreshold
             min: 25
         damage:
           types:
@@ -329,7 +317,7 @@
       effects:
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Histamine
           min: 45
         reagent: Histamine
@@ -339,8 +327,8 @@
           # they gotta be in crit first
         - !type:MobStateCondition
           mobstate: Critical
-        - !type:ReagentCondition
-          reagent: Epinephrine
+        - !type:ReagentThreshold
+          min: 0
           max: 20
         damage:
           types:
@@ -351,8 +339,7 @@
             Burn: -0.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Epinephrine
+        - !type:ReagentThreshold
           min: 20
         damage:
           types:
@@ -363,7 +350,7 @@
         amount: -2
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: HeartbreakerToxin
           min: 1
         reagent: Epinephrine
@@ -371,7 +358,7 @@
       - !type:AdjustReagent
         probability: 0.1
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: HeartbreakerToxin
           min: 1
         reagent: Histamine
@@ -403,20 +390,18 @@
         damage:
           types:
             Radiation: -1
-      - !type:Vomit
+      - !type:ChemVomit
         probability: 0.02
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Hyronalin
+        - !type:ReagentThreshold
           min: 30
         damage:
           types:
            Heat: 2
       - !type:Jitter
         conditions:
-        - !type:ReagentCondition
-          reagent: Hyronalin
+        - !type:ReagentThreshold
           min: 30
 
 - type: reagent
@@ -432,10 +417,9 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:Vomit
+      - !type:ChemVomit
         conditions:
-        - !type:ReagentCondition
-          reagent: Ipecac
+        - !type:ReagentThreshold
           min: 4
         probability: 0.3
 
@@ -459,7 +443,7 @@
         damage:
           types:
             Asphyxiation: -2
-      - !type:ModifyBleed
+      - !type:ModifyBleedAmount
         amount: -0.25
 
 - type: reagent
@@ -482,8 +466,7 @@
       - !type:SatiateThirst
         factor: -10
         conditions:
-        - !type:ReagentCondition
-          reagent: Kelotane
+        - !type:ReagentThreshold
           min: 30
       - !type:PopupMessage
         type: Local
@@ -493,8 +476,7 @@
         - generic-reagent-effect-parched
         probability: 0.1
         conditions:
-        - !type:ReagentCondition
-          reagent: Kelotane
+        - !type:ReagentThreshold
           min: 25
 
 - type: reagent
@@ -514,12 +496,12 @@
             Cold: -4
       - !type:AdjustTemperature
         conditions:
-        - !type:TemperatureCondition
+        - !type:Temperature
           max: 293.15
         amount: 100000 # thermal energy, not temperature!
       - !type:AdjustTemperature
         conditions:
-        - !type:TemperatureCondition
+        - !type:Temperature
           min: 293.15
         amount: -10000
       - !type:PopupMessage
@@ -549,17 +531,15 @@
             Heat: 0.5
       - !type:HealthChange
         conditions:
-          - !type:ReagentCondition
-            reagent: Barozine
+          - !type:ReagentThreshold
             min: 30
         damage:
           types:
             Poison: 3
-      - !type:Vomit
+      - !type:ChemVomit
         probability: 0.15
         conditions:
-          - !type:ReagentCondition
-            reagent: Barozine
+          - !type:ReagentThreshold
             min: 30
       - !type:GenericStatusEffect
         key: PressureImmunity
@@ -590,8 +570,7 @@
       amount: 6
     - !type:PlantPhalanximine
       conditions:
-      - !type:ReagentCondition
-        reagent: Phalanximine
+      - !type:ReagentThreshold
         min: 4
   metabolisms:
     Medicine:
@@ -605,15 +584,14 @@
             Caustic: 0.15
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Phalanximine
+        - !type:ReagentThreshold
           min: 11
         damage:
           types:
             Radiation: 0.2
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Arithrazine
           min: 1
         damage:
@@ -639,13 +617,12 @@
             Asphyxiation: -2.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: PolypyryliumOligomers
+        - !type:ReagentThreshold
           min: 30
         damage:
           types:
             Asphyxiation: 3.5
-      - !type:ModifyBleed
+      - !type:ModifyBleedAmount
         amount: -0.25
 
 - type: reagent
@@ -661,8 +638,7 @@
       effects:
         - !type:CureZombieInfection
           conditions:
-            - !type:ReagentCondition
-              reagent: Ambuzol
+            - !type:ReagentThreshold
               min: 10
 
 - type: reagent
@@ -679,8 +655,7 @@
         - !type:CureZombieInfection
           innoculate: true
           conditions:
-            - !type:ReagentCondition
-              reagent: AmbuzolPlus
+            - !type:ReagentThreshold
               min: 5
 
 - type: reagent
@@ -694,7 +669,7 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:ModifyBleed
+      - !type:ModifyBleedAmount
         amount: -0.5
 
 - type: reagent
@@ -746,7 +721,7 @@
             Poison: -4
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Amatoxin
           min: 1
         reagent: Amatoxin
@@ -792,12 +767,11 @@
       effects:
       # Medium-large quantities can hurt you instead,
       # but still technically stop your bleeding.
-      - !type:ModifyBleed
+      - !type:ModifyBleedAmount
         amount: -1.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: TranexamicAcid
+        - !type:ReagentThreshold
           min: 15
         damage:
           types:
@@ -816,7 +790,7 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:TotalDamageCondition
+        - !type:TotalDamage
           max: 50
         damage:
           groups:
@@ -876,16 +850,14 @@
       effects:
       - !type:EvenHealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Ultravasculine
+        - !type:ReagentThreshold
           min: 0
           max: 20
         damage:
           Toxin: -6
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Ultravasculine
+        - !type:ReagentThreshold
           min: 0
           max: 20
         damage:
@@ -893,29 +865,27 @@
             Brute: 1.5
       - !type:EvenHealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Ultravasculine
+        - !type:ReagentThreshold
           min: 20
         damage:
           Toxin: -2
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Ultravasculine
+        - !type:ReagentThreshold
           min: 20
         damage:
           groups:
             Brute: 6
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Histamine
           min: 1
         reagent: Histamine
         amount: -1
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Histamine
           min: 1
         reagent: Ultravasculine
@@ -932,7 +902,7 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:EyeDamage
+      - !type:ChemHealEyeDamage
 
 - type: reagent
   id: Cognizine
@@ -947,8 +917,7 @@
       effects:
       - !type:MakeSentient
         conditions:
-        - !type:ReagentCondition
-          reagent: Cognizine
+        - !type:ReagentThreshold
           min: 5
 
 - type: reagent
@@ -972,8 +941,7 @@
         type: Remove
       - !type:ResetNarcolepsy
         conditions:
-        - !type:ReagentCondition
-          reagent: Ethyloxyephedrine
+        - !type:ReagentThreshold
           min: 10
       - !type:PopupMessage
         visualType: Medium
@@ -998,8 +966,7 @@
         type: Remove
       - !type:ResetNarcolepsy
         conditions:
-        - !type:ReagentCondition
-          reagent: Diphenylmethylamine
+        - !type:ReagentThreshold
           min: 5
       - !type:PopupMessage
         visualType: Medium
@@ -1025,41 +992,37 @@
             Caustic: -1.25 # 5 per u
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Sigynate
+        - !type:ReagentThreshold
           min: 16
         damage:
           types:
             Heat: 1 # 4 per u
       - !type:Jitter
         conditions:
-        - !type:ReagentCondition
-          reagent: Sigynate
+        - !type:ReagentThreshold
           min: 20
       - !type:PopupMessage
         conditions:
-        - !type:ReagentCondition
-          reagent: Sigynate
+        - !type:ReagentThreshold
           min: 20
         type: Local
         visualType: Medium
         messages: [ "generic-reagent-effect-nauseous" ]
         probability: 0.2
-      - !type:Vomit
+      - !type:ChemVomit
         conditions:
-        - !type:ReagentCondition
-          reagent: Sigynate
+        - !type:ReagentThreshold
           min: 30
         probability: 0.02
-      - !type:Vomit
+      - !type:ChemVomit
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Arithrazine
           min: 1
         probability: 0.1
       - !type:PopupMessage
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Arithrazine
           min: 1
         type: Local
@@ -1086,8 +1049,7 @@
             Heat: 0.2 # 0.8 per u
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Lacerinol
+        - !type:ReagentThreshold
           min: 12
         damage:
           types:
@@ -1112,8 +1074,7 @@
             Radiation: 0.05 # 0.2 per u, 3 for 15u
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Puncturase
+        - !type:ReagentThreshold
           min: 12
         damage:
           types:
@@ -1139,8 +1100,7 @@
         factor: -1
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Bruizine
+        - !type:ReagentThreshold
           min: 10.5
         damage:
           types:
@@ -1162,7 +1122,7 @@
         factor: 3
       - !type:HealthChange
         conditions:
-        - !type:TotalDamageCondition
+        - !type:TotalDamage
           max: 50
         damage:
           types:
@@ -1171,16 +1131,17 @@
             Heat: -0.2
             Shock: -0.2
             Cold: -0.2
+
   reactiveEffects:
     Extinguish:
       methods: [ Touch ]
       effects:
-      - !type:Extinguish
+      - !type:ExtinguishReaction
     Acidic:
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         ignoreResistances: false
         damage:
           types:
@@ -1210,23 +1171,20 @@
       # od causes massive bleeding
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Pyrazine
+        - !type:ReagentThreshold
           min: 20
         damage:
           types:
             Slash: 0.5
             Piercing: 0.5
-      - !type:Vomit
+      - !type:ChemVomit
         conditions:
-        - !type:ReagentCondition
-          reagent: Pyrazine
+        - !type:ReagentThreshold
           min: 15
         probability: 0.1
       - !type:Emote
         conditions:
-        - !type:ReagentCondition
-          reagent: Pyrazine
+        - !type:ReagentThreshold
           min: 20
         emote: Scream
         probability: 0.2
@@ -1260,22 +1218,19 @@
       # od makes you freeze to death
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Insuzine
+        - !type:ReagentThreshold
           min: 12
         damage:
           types:
             Cold: 1 # 4 per u
       - !type:AdjustTemperature
         conditions:
-        - !type:ReagentCondition
-          reagent: Insuzine
+        - !type:ReagentThreshold
           min: 12
         amount: -30000
       - !type:Jitter
         conditions:
-        - !type:ReagentCondition
-          reagent: Insuzine
+        - !type:ReagentThreshold
           min: 12
 
 - type: reagent
@@ -1294,7 +1249,7 @@
           seconds: 20
           conditions:
           #Patient must be dead and in a cryo tube (or something cold)
-          - !type:TemperatureCondition
+          - !type:Temperature
             max: 150.0
           - !type:MobStateCondition
             mobstate: Dead
@@ -1319,7 +1274,7 @@
       effects:
         - !type:HealthChange
           conditions:
-          - !type:TemperatureCondition
+          - !type:Temperature
             max: 213.0
           damage:
             groups:
@@ -1342,7 +1297,7 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:TemperatureCondition
+        - !type:Temperature
           max: 213.0
         damage:
           types:
@@ -1364,8 +1319,7 @@
       effects:
       - !type:PopupMessage
         conditions:
-        - !type:ReagentCondition
-          reagent: Mannitol
+        - !type:ReagentThreshold
           min: 15
         type: Local
         visualType: Medium
@@ -1385,8 +1339,7 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Psicodine
+        - !type:ReagentThreshold
           min: 30
         damage:
           types:
@@ -1394,8 +1347,7 @@
       - !type:ModifyStatusEffect
         effectProto: StatusEffectSeeingRainbow
         conditions:
-        - !type:ReagentCondition
-          reagent: Psicodine
+        - !type:ReagentThreshold
           min: 30
         type: Add
         time: 8
@@ -1432,10 +1384,10 @@
         component: RadiationProtection
         time: 2
         type: Add
+        refresh: false
       - !type:HealthChange
         conditions:
-          - !type:ReagentCondition
-            reagent: PotassiumIodide
+          - !type:ReagentThreshold
             min: 20
         damage:
           types:
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index 48fc618857..a1b1033a4b 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -18,8 +18,7 @@
             Poison: 0.75
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Desoxyephedrine
+        - !type:ReagentThreshold
           min: 30
         damage:
           types:
@@ -27,7 +26,7 @@
             Asphyxiation: 2
     Narcotic:
       effects:
-      - !type:MovementSpeedModifier
+      - !type:MovespeedModifier
         walkSpeedModifier: 1.35
         sprintSpeedModifier: 1.35
       - !type:GenericStatusEffect
@@ -43,7 +42,7 @@
         type: Remove
       - !type:ModifyStatusEffect
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Haloperidol
           max: 0.01
         effectProto: StatusEffectDrowsiness
@@ -53,8 +52,7 @@
       effects:
       - !type:ResetNarcolepsy
         conditions:
-        - !type:ReagentCondition
-          reagent: Desoxyephedrine
+        - !type:ReagentThreshold
           min: 20
 
 - type: reagent
@@ -71,13 +69,12 @@
   metabolisms:
     Narcotic:
       effects:
-      - !type:MovementSpeedModifier
+      - !type:MovespeedModifier
         walkSpeedModifier: 1.25
         sprintSpeedModifier: 1.25
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Ephedrine
+        - !type:ReagentThreshold
           min: 20
         damage:
           types:
@@ -93,7 +90,7 @@
         type: Remove
       - !type:ModifyStatusEffect
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Haloperidol
           max: 0.01
         effectProto: StatusEffectDrowsiness
@@ -108,8 +105,7 @@
       effects:
       - !type:ResetNarcolepsy
         conditions:
-        - !type:ReagentCondition
-          reagent: Ephedrine
+        - !type:ReagentThreshold
           min: 30
 
 - type: reagent
@@ -127,20 +123,19 @@
     Narcotic:
       metabolismRate: 1.0
       effects:
-      - !type:MovementSpeedModifier
+      - !type:MovespeedModifier
         walkSpeedModifier: 1.3
         sprintSpeedModifier: 1.3
       - !type:HealthChange
         conditions:
-          - !type:ReagentCondition
-            reagent: Stimulants
+          - !type:ReagentThreshold
             min: 80 #please wait 3 minutes before using another stimpack
         damage:
           types:
             Poison: 1
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: ChloralHydrate
           min: 1
         reagent: ChloralHydrate
@@ -156,13 +151,14 @@
         key: StaminaModifier
         component: StaminaModifier
         time: 3
+        type: Add
       - !type:ModifyStatusEffect
         effectProto: StatusEffectForcedSleeping
         time: 3
         type: Remove
       - !type:ModifyStatusEffect
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Haloperidol
           max: 0.01
         effectProto: StatusEffectDrowsiness
@@ -178,7 +174,7 @@
           factor: 1
         - !type:HealthChange
           conditions:
-          - !type:TotalDamageCondition
+          - !type:TotalDamage
             min: 70 # only heals when you're more dead than alive
           damage: # heals at the same rate as tricordrazine, doesn't heal poison because if you OD'd I'm not giving you a safety net
             groups:
@@ -232,7 +228,7 @@
   metabolisms:
     Narcotic:
       effects:
-      - !type:MovementSpeedModifier
+      - !type:MovespeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:HealthChange
@@ -243,7 +239,7 @@
         effectProto: StatusEffectSeeingRainbow
         time: 10
         type: Add
-      - !type:Vomit # Vomiting is a symptom of brain damage
+      - !type:ChemVomit # Vomiting is a symptom of brain damage
         probability: 0.05
       - !type:Drunk # Headaches and slurring are major symptoms of brain damage, this is close enough
         boozePower: 5
@@ -293,18 +289,16 @@
   meltingPoint: 128.0
   metabolisms:
     Narcotic:
-      effects: # It would be nice to have speech slurred or mumbly, but accents are a bit iffy atm. Same for distortion effects.
-      - !type:MovementSpeedModifier
-        walkSpeedModifier: 0.65
-        sprintSpeedModifier: 0.65
+      effects:
       - !type:ModifyStatusEffect
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Nocturine
           min: 8
         effectProto: StatusEffectForcedSleeping
-        time: 6
-        delay: 5
+        time: 3
+        delay: 6
+        type: Add
 
 - type: reagent
   id: MuteToxin
@@ -359,8 +353,7 @@
         - norepinephricacid-effect-darkness
         - norepinephricacid-effect-blindness
         conditions:
-        - !type:ReagentCondition
-          reagent: NorepinephricAcid
+        - !type:ReagentThreshold
           min: 20
         probability: 0.03
         #If anyone wants to add a light dimming or grayscale effect when under 20u, be my guest
@@ -368,8 +361,7 @@
         key: TemporaryBlindness
         component: TemporaryBlindness
         conditions:
-        - !type:ReagentCondition
-          reagent: NorepinephricAcid
+        - !type:ReagentThreshold
           min: 20
 
 - type: reagent
@@ -411,8 +403,7 @@
         emote: Scream
         probability: 0.08
         conditions:
-        - !type:ReagentCondition
-          reagent: TearGas
+        - !type:ReagentThreshold
           min: 4
       - !type:Emote
         emote: Cough
@@ -421,16 +412,14 @@
         key: TemporaryBlindness
         component: TemporaryBlindness
         conditions:
-        - !type:ReagentCondition
-          reagent: TearGas
+        - !type:ReagentThreshold
           min: 4
-      - !type:MovementSpeedModifier
+      - !type:MovespeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
-        time: 1.5
+        statusLifetime: 1.5
         conditions: # because of the remainding after effect, threshold is given so the effects ends simultaniously
-        - !type:ReagentCondition
-          reagent: TearGas
+        - !type:ReagentThreshold
           min: 4
 
 - type: reagent
@@ -449,24 +438,21 @@
         showInChat: true
         probability: 0.1
         conditions:
-        - !type:ReagentCondition
-          reagent: Happiness
+        - !type:ReagentThreshold
           max: 20
       - !type:Emote
         emote: Whistle
         showInChat: true
         probability: 0.1
         conditions:
-        - !type:ReagentCondition
-          reagent: Happiness
+        - !type:ReagentThreshold
           max: 20
       - !type:Emote
         emote: Crying
         showInChat: true
         probability: 0.1
         conditions:
-        - !type:ReagentCondition
-          reagent: Happiness
+        - !type:ReagentThreshold
           min: 20
       - !type:PopupMessage # we dont have sanity/mood so this will have to do
         type: Local
@@ -477,8 +463,7 @@
         - "psicodine-effect-at-peace"
         probability: 0.2
         conditions:
-        - !type:ReagentCondition
-          reagent: Happiness
+        - !type:ReagentThreshold
           max: 20
       - !type:ModifyStatusEffect
         effectProto: StatusEffectSeeingRainbow
diff --git a/Resources/Prototypes/Reagents/pyrotechnic.yml b/Resources/Prototypes/Reagents/pyrotechnic.yml
index 16dfc69286..aa5ebe5145 100644
--- a/Resources/Prototypes/Reagents/pyrotechnic.yml
+++ b/Resources/Prototypes/Reagents/pyrotechnic.yml
@@ -6,7 +6,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-        - !type:Flammable
+        - !type:FlammableReaction
   plantMetabolism:
     - !type:PlantAdjustWeeds
       amount: -2
@@ -52,7 +52,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:Flammable
+      - !type:FlammableReaction
         multiplier: 0.4
   metabolisms:
     Poison:
@@ -63,7 +63,7 @@
             Heat: 2
             Poison: 1
             Caustic: 0.5 # based off napalm being an irritant
-      - !type:Flammable
+      - !type:FlammableReaction
         multiplier: 0.4
 
 - type: reagent
@@ -83,7 +83,7 @@
           types:
             Heat: 3
             Poison: 1
-      - !type:Flammable
+      - !type:FlammableReaction
         multiplier: 0.1
       - !type:AdjustTemperature
         amount: 6000
@@ -92,7 +92,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:Flammable
+      - !type:FlammableReaction
         multiplier: 0.2
       - !type:Ignite
 
@@ -116,7 +116,7 @@
             Heat: 2
             Poison: 1
             Caustic: 0.5 # CLF3 is corrosive
-      - !type:Flammable
+      - !type:FlammableReaction
         multiplier: 0.2
       - !type:AdjustTemperature
         amount: 6000
@@ -124,7 +124,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:Flammable
+      - !type:FlammableReaction
         multiplier: 0.3
       - !type:Ignite
       - !type:Emote
@@ -170,19 +170,19 @@
       - !type:SatiateThirst
         factor: 1
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Vox]
+        - !type:OrganType
+          type: Vox
     Poison:
       effects:
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Vox]
-          inverted: true
+        - !type:OrganType
+          type: Vox
+          shouldHave: false
         damage:
           types:
             Poison: 1
-      - !type:Flammable
+      - !type:FlammableReaction
         multiplier: 0.4
 
 - type: reagent
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index ea7437aa7b..33a94c0792 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -67,16 +67,16 @@
         emote: Yawn
         showInChat: true
         probability: 0.1
-      - !type:MovementSpeedModifier
+      - !type:MovespeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:ModifyStatusEffect
         effectProto: StatusEffectDrowsiness
         time: 4
-        type: Update
+        type: Add
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: ChloralHydrate
           min: 20
         damage:
@@ -98,10 +98,9 @@
           damage:
             types:
               Poison: 2
-        - !type:Vomit
+        - !type:ChemVomit
           conditions:
-          - !type:ReagentCondition
-            reagent: GastroToxin
+          - !type:ReagentThreshold
             min: 2
           probability: 0.2
 
@@ -145,7 +144,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         ignoreResistances: false
         damage:
           types:
@@ -184,7 +183,7 @@
       - !type:SatiateThirst
         factor: -1.5
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         ignoreResistances: true
         damage:
           types:
@@ -207,7 +206,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         ignoreResistances: false
         damage:
           types:
@@ -257,7 +256,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaling: true
+        scaleByQuantity: true
         ignoreResistances: false
         damage:
           types:
@@ -379,8 +378,7 @@
       # todo: cough, sneeze
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Histamine
+        - !type:ReagentThreshold
           min: 45
         damage:
           groups:
@@ -394,8 +392,7 @@
         probability: 0.1
       - !type:PopupMessage
         conditions:
-        - !type:ReagentCondition
-          reagent: Histamine
+        - !type:ReagentThreshold
           min: 45
         type: Local
         visualType: Medium
@@ -417,16 +414,16 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Animal] # Applying damage to the mobs with lower metabolism capabilities
+        - !type:OrganType
+          type: Animal # Applying damage to the mobs with lower metabolism capabilities
         damage:
           types:
             Poison: 0.4
-      - !type:Vomit
+      - !type:ChemVomit
         probability: 0.04 #Scaled for time, not metabolismrate.
         conditions:
-          - !type:MetabolizerTypeCondition
-            type: [Animal]
+          - !type:OrganType
+            type: Animal
 
 - type: reagent
   id: Amatoxin
@@ -476,8 +473,7 @@
       effects:
         - !type:CauseZombieInfection
           conditions:
-            - !type:ReagentCondition
-              reagent: Romerol
+            - !type:ReagentThreshold
               min: 5
 
 - type: reagent
@@ -493,37 +489,46 @@
       effects:
       - !type:PopupMessage
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Animal, Vox ]
-          inverted: true
+          - !type:OrganType
+            type: Animal
+            shouldHave: false
+          - !type:OrganType
+            type: Vox
+            shouldHave: false
         type: Local
         visualType: MediumCaution
         messages: [ "generic-reagent-effect-sick" ]
         probability: 0.5
-      - !type:Vomit
+      - !type:ChemVomit
         probability: 0.1
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Animal, Vox ]
-          inverted: true
+          - !type:OrganType
+            type: Animal
+            shouldHave: false
+          - !type:OrganType
+            type: Vox
+            shouldHave: false
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Animal, Vox ]
-          inverted: true
+        - !type:OrganType
+          type: Animal
+          shouldHave: false
+        - !type:OrganType
+          type: Vox
+          shouldHave: false
         damage:
           types:
             Poison: 1
       - !type:AdjustReagent
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Animal ]
+        - !type:OrganType
+          type: Animal
         reagent: Protein
         amount: 0.5
       - !type:AdjustReagent
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [ Vox ]
+        - !type:OrganType
+          type: Vox
         reagent: Protein
         amount: 0.25
 
@@ -541,11 +546,10 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Allicin
+        - !type:ReagentThreshold
           min: 1
-        - !type:MetabolizerTypeCondition
-          type: [Animal]
+        - !type:OrganType
+          type: Animal
         damage:
           types:
             Poison: 0.06
@@ -568,6 +572,7 @@
       - !type:GenericStatusEffect
         key: Pacified
         component: Pacified
+        type: Add
         time: 4
 
 - type: reagent
@@ -590,11 +595,10 @@
         probability: 0.2
       - !type:HealthChange
         conditions:
-        - !type:ReagentCondition
-          reagent: Honk
+        - !type:ReagentThreshold
           min: 1
-        - !type:MetabolizerTypeCondition
-          type: [ Animal ]
+        - !type:OrganType
+          type: Animal
         damage:
           types:
             Poison: 0.06
@@ -648,10 +652,9 @@
       effects:
       - !type:Jitter
         conditions:
-        - !type:ReagentCondition
-          reagent: Vestine
+        - !type:ReagentThreshold
           min: 5
-      - !type:MovementSpeedModifier
+      - !type:MovespeedModifier
         walkSpeedModifier: 0.8
         sprintSpeedModifier: 0.8
       - !type:HealthChange
@@ -689,7 +692,7 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:HungerCondition
+        - !type:Hunger
           max: 50
         damage:
           types:
@@ -713,30 +716,30 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Arachnid]
-          inverted: true
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: false
         damage:
           types:
             Poison: 1.6
-      - !type:MovementSpeedModifier
+      - !type:MovespeedModifier
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Mechanotoxin
           min: 2
-        - !type:MetabolizerTypeCondition
-          type: [Arachnid]
-          inverted: true
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: false
         walkSpeedModifier: 0.8
         sprintSpeedModifier: 0.8
-      - !type:MovementSpeedModifier
+      - !type:MovespeedModifier
         conditions:
-        - !type:ReagentCondition
+        - !type:ReagentThreshold
           reagent: Mechanotoxin
           min: 4
-        - !type:MetabolizerTypeCondition
-          type: [Arachnid]
-          inverted: true
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: false
         walkSpeedModifier: 0.4
         sprintSpeedModifier: 0.4
 
@@ -753,5 +756,5 @@
       - !type:SatiateHunger
         factor: 1
         conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Vox]
+        - !type:OrganType
+          type: Vox
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml
deleted file mode 100644
index 56ee3803e0..0000000000
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-- type: constructionGraph
-  id: HugBot
-  start: start
-  graph:
-  - node: start
-    edges:
-    - to: bot
-      steps:
-      - tag: BoxHug
-        icon:
-          sprite: Objects/Storage/boxes.rsi
-          state: box_hug
-        name: construction-graph-tag-boxhug
-      - tag: ProximitySensor
-        icon:
-          sprite: Objects/Misc/proximity_sensor.rsi
-          state: icon
-        name: construction-graph-tag-proximity-sensor
-        doAfter: 2
-      - tag: BorgArm
-        icon:
-          sprite: Mobs/Silicon/drone.rsi
-          state: l_hand
-        name: construction-graph-tag-borg-arm
-        doAfter: 2
-      - tag: BorgArm
-        icon:
-          sprite: Mobs/Silicon/drone.rsi
-          state: l_hand
-        name: construction-graph-tag-borg-arm
-        doAfter: 2
-  - node: bot
-    entity: MobHugBot
diff --git a/Resources/Prototypes/Recipes/Crafting/bots.yml b/Resources/Prototypes/Recipes/Crafting/bots.yml
index d5eb1f941e..f76d545e94 100644
--- a/Resources/Prototypes/Recipes/Crafting/bots.yml
+++ b/Resources/Prototypes/Recipes/Crafting/bots.yml
@@ -53,11 +53,3 @@
   targetNode: bot
   category: construction-category-utilities
   objectType: Item
-
-- type: construction
-  id: hugbot
-  graph: HugBot
-  startNode: start
-  targetNode: bot
-  category: construction-category-utilities
-  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml b/Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
index b8c91d431b..49ac26c52b 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
@@ -20,7 +20,6 @@
   - BioGenLeft4Zed
   - BioGenEZNutrient
   - BioGenRobustHarvest
-  - BioGenDiseaseSwab
 
 - type: latheRecipePack
   id: BioGenMaterialsStatic
@@ -29,8 +28,3 @@
   - BioGenMaterialCardboard1
   - BioGenPaper
   - BioGenPaperRolling1
-
-- type: latheRecipePack
-  id: BioGenEmagStatic
-  recipes:
-  - BioGenUnstableMutagen
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
index 0bb3c49fe9..0b6cccf78b 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
@@ -16,7 +16,6 @@
   - PillCanister
   - HandLabeler
   - BaseChemistryEmptyVial
-  - Dropper
 
 - type: latheRecipePack
   parent: BasicChemistryStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml b/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
index dce61b5a01..f0147d9ca5 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
@@ -4,7 +4,6 @@
   id: MaterialsStatic
   recipes:
   - SheetRGlass
-  - MaterialDurathread
 
 - type: latheRecipePack
   id: PartsStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml b/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
index 71d0bee2fb..8c87f80780 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
@@ -7,5 +7,3 @@
   - MagazineShotgun
   - MagazineShotgunEmpty
   - MagazineShotgunSlug
-  - MagazinePistolCaselessRifle
-  - MagazineBoxAntiMateriel
diff --git a/Resources/Prototypes/Recipes/Lathes/ammo.yml b/Resources/Prototypes/Recipes/Lathes/ammo.yml
index 79104471a5..2b4a4590fa 100644
--- a/Resources/Prototypes/Recipes/Lathes/ammo.yml
+++ b/Resources/Prototypes/Recipes/Lathes/ammo.yml
@@ -92,14 +92,6 @@
     Plastic: 500
     Uranium: 500
 
-# .25 Caseless
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolCaselessRifle
-  result: MagazinePistolCaselessRifle
-  materials:
-    Steel: 145
-
 # .30 Rifle
 - type: latheRecipe
   parent: BaseEmptyAmmoRecipe
@@ -460,14 +452,6 @@
     Steel: 80
     Plastic: 80
 
-# .60 anti-materiel
-- type: latheRecipe
-  parent: BaseAmmoBoxRecipe
-  id: MagazineBoxAntiMateriel
-  result: MagazineBoxAntiMateriel
-  materials:
-    Steel: 200
-
 # Encampment ammo
 - type: latheRecipe
   id: MagazineGrenadeEmpty
diff --git a/Resources/Prototypes/Recipes/Lathes/biogen.yml b/Resources/Prototypes/Recipes/Lathes/biogen.yml
index 57951c99b8..a22a535caa 100644
--- a/Resources/Prototypes/Recipes/Lathes/biogen.yml
+++ b/Resources/Prototypes/Recipes/Lathes/biogen.yml
@@ -249,24 +249,5 @@
   materials:
     Biomass: 18
 
-- type: latheRecipe
-  id: BioGenDiseaseSwab
-  result: DiseaseSwab
-  categories:
-  - Materials
-  completetime: 3
-  materials:
-    Biomass: 2
 
-- type: latheRecipe
-  id: BioGenUnstableMutagen
-  resultReagents:
-    UnstableMutagen: 10
-  categories:
-  - Chemicals
-  icon:
-    sprite: Objects/Specific/Chemistry/bottle.rsi
-    state: bottle-1
-  completetime: 5
-  materials:
-    Biomass: 20
+
diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
index 0b3b8352e5..a9e6f282e0 100644
--- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml
+++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
@@ -33,8 +33,8 @@
   result: Dropper
   completetime: 2
   materials:
-    Glass: 50
-    Plastic: 50
+    Glass: 200
+    Plastic: 100
 
 - type: latheRecipe
   id: Syringe
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 74c6ad3596..82ceceee77 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -32,7 +32,6 @@
 - type: latheRecipe
   id: SheetRGlass
   result: SheetRGlass1
-  applyMaterialDiscount: false # obvious dupe capabilities
   completetime: 0
   materials:
     Glass: 100
@@ -252,12 +251,3 @@
   completetime: 1
   materials:
     Cotton: 200 #my pyrocloth keeps catching on fire whenever I make it!
-
-- type: latheRecipe
-  id: MaterialDurathread
-  result: MaterialDurathread1
-  applyMaterialDiscount: false
-  completetime: 0
-  materials:
-    Cloth: 100
-    Plastic: 100
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index b2a09a1b7f..fef96df5cf 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -111,7 +111,7 @@
     Potassium:
       amount: 1
   effects:
-    - !type:ExplosionEffect
+    - !type:ExplosionReactionEffect
       explosionType: Default
       intensityPerUnit: 0.25
       maxTotalIntensity: 100
@@ -205,8 +205,8 @@
     Aluminium:
       amount: 1
   effects:
-    - !type:Emp
-      rangeModifier: 0.2
+    - !type:EmpReactionEffect
+      rangePerUnit: 0.2
       maxRange: 6
       energyConsumption: 12500
       duration: 15
@@ -224,7 +224,7 @@
     Sulfur:
       amount: 1
   effects:
-    - !type:Flash
+    - !type:FlashReactionEffect
 
 - type: reaction
   id: TableSalt
diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml
index f9b819e43e..e98d49c521 100644
--- a/Resources/Prototypes/Recipes/Reactions/food.yml
+++ b/Resources/Prototypes/Recipes/Reactions/food.yml
@@ -10,7 +10,7 @@
       amount: 5
       catalyst: true
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodCheese
 
 - type: reaction
@@ -25,7 +25,7 @@
       amount: 5
       catalyst: true
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodChevre
 
 - type: reaction
@@ -39,7 +39,7 @@
     Water:
       amount: 10
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodDough
 
 - type: reaction
@@ -55,7 +55,7 @@
     Egg:
       amount: 6
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodDoughCornmeal
 
 - type: reaction
@@ -69,7 +69,7 @@
     Water:
       amount: 10
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodDoughTortilla
 
 - type: reaction
@@ -85,7 +85,7 @@
     Water:
       amount: 10
   effects:
-  - !type:SpawnEntity
+  - !type:CreateEntityReactionEffect
     entity: FoodDoughCotton
 
 - type: reaction
@@ -103,7 +103,7 @@
     Milk:
       amount: 5
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodCakeBatter
 
 - type: reaction
@@ -118,7 +118,7 @@
       amount: 5
       catalyst: true
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodButter
 
 - type: reaction
@@ -134,7 +134,7 @@
     TableSalt:
       amount: 5
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodDoughPie
 
 # TG has a cake recipe that uses soy milk instead of eggs.
@@ -153,7 +153,7 @@
     Sugar:
       amount: 5
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodCakeBatter
 
 - type: reaction
@@ -168,7 +168,7 @@
       amount: 5
       catalyst: true
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodTofu
 
 - type: reaction
@@ -184,7 +184,7 @@
     Egg:
       amount: 6
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodMeatMeatball
 
 - type: reaction
@@ -200,7 +200,7 @@
     Sugar:
       amount: 2
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodSnackChocolateBar
 
 # Condiments
diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml
index 9b335a2aca..35987b6be5 100644
--- a/Resources/Prototypes/Recipes/Reactions/fun.yml
+++ b/Resources/Prototypes/Recipes/Reactions/fun.yml
@@ -38,7 +38,7 @@
     Carbon:
       amount: 10
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: FoodMeat
 
 - type: reaction
@@ -75,7 +75,7 @@
     SulfuricAcid:
       amount: 2
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: SheetPlastic1
 
 - type: reaction
@@ -153,7 +153,7 @@
     Ethanol:
       amount: 5
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: ShardCrystalRandom
 
 - type: reaction
@@ -169,7 +169,7 @@
     Charcoal:
       amount: 2
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: MaterialGunpowder
 
 - type: reaction
@@ -182,7 +182,7 @@
     FrostOil:
       amount: 5
   effects:
-  - !type:SpawnEntity
+  - !type:CreateEntityReactionEffect
     entity: IngotGold1
 
 - type: reaction
@@ -195,7 +195,7 @@
     FrostOil:
       amount: 5
   effects:
-  - !type:SpawnEntity
+  - !type:CreateEntityReactionEffect
     entity: IngotSilver1
 
 - type: reaction
@@ -208,7 +208,7 @@
     JuiceThatMakesYouHew:
       amount: 1
   effects:
-  - !type:ExplosionEffect
+  - !type:ExplosionReactionEffect
     explosionType: Radioactive
     maxIntensity: 200
     intensityPerUnit: 2
diff --git a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
index 21bea1ff2b..3591ce7008 100644
--- a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
+++ b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
@@ -39,7 +39,7 @@
     Fluorine:
       amount: 3
   effects:
-  - !type:ExplosionEffect
+  - !type:ExplosionReactionEffect
     explosionType: Default # 15 damage per intensity.
     maxIntensity: 200
     intensityPerUnit: 5
@@ -72,4 +72,4 @@
   products:
     Ethanol: 5
     Hydrogen: 3
-    Sulfur: 2
+    Sulfur: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Reactions/soap.yml b/Resources/Prototypes/Recipes/Reactions/soap.yml
index 6fddf1e479..d07c582f8b 100644
--- a/Resources/Prototypes/Recipes/Reactions/soap.yml
+++ b/Resources/Prototypes/Recipes/Reactions/soap.yml
@@ -11,7 +11,7 @@
     TableSalt:
       amount: 5
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: Soap
 
 - type: reaction
@@ -29,7 +29,7 @@
     Plasma:
       amount: 5
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: SoapNT
 
 - type: reaction
@@ -47,7 +47,7 @@
     JuiceBerry:
       amount: 5
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: SoapDeluxe
 
 - type: reaction
@@ -65,7 +65,7 @@
     Blood:
       amount: 10
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: SoapHomemade
 
 - type: reaction
@@ -83,7 +83,7 @@
     Stimulants:
       amount: 5
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: SoapSyndie
 
 - type: reaction
@@ -115,5 +115,5 @@
     Amatoxin:
       amount: 1
   effects:
-    - !type:SpawnEntity
+    - !type:CreateEntityReactionEffect
       entity: SoapOmega
diff --git a/Resources/Prototypes/Stacks/Sheets/glass.yml b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
similarity index 87%
rename from Resources/Prototypes/Stacks/Sheets/glass.yml
rename to Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
index 2984b9f2e4..c3752b62ae 100644
--- a/Resources/Prototypes/Stacks/Sheets/glass.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
@@ -1,48 +1,48 @@
 - type: stack
-  parent: BaseSheetStack
   id: Glass
   name: stack-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: glass }
   spawn: SheetGlass1
+  maxCount: 30
 
 - type: stack
-  parent: BaseSheetStack
   id: ReinforcedGlass
   name: stack-reinforced-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rglass }
   spawn: SheetRGlass1
+  maxCount: 30
 
 - type: stack
-  parent: BaseSheetStack
   id: PlasmaGlass
   name: stack-plasma-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: pglass }
   spawn: SheetPGlass1
+  maxCount: 30
 
 - type: stack
-  parent: BaseSheetStack
   id: ReinforcedPlasmaGlass
   name: stack-reinforced-plasma-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rpglass }
   spawn: SheetRPGlass1
+  maxCount: 30
 
 - type: stack
-  parent: BaseSheetStack
   id: UraniumGlass
   name: stack-uranium-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: uglass }
   spawn: SheetUGlass1
+  maxCount: 30
 
 - type: stack
-  parent: BaseSheetStack
   id: ReinforcedUraniumGlass
   name: stack-reinforced-uranium-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: ruglass }
   spawn: SheetRUGlass1
+  maxCount: 30
 
 - type: stack
-  parent: BaseSheetStack
   id: ClockworkGlass
   name: stack-clockwork-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: cglass }
   spawn: SheetClockworkGlass1
+  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Sheets/metal.yml b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
similarity index 85%
rename from Resources/Prototypes/Stacks/Sheets/metal.yml
rename to Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
index 188a4e30b2..90c37e3dda 100644
--- a/Resources/Prototypes/Stacks/Sheets/metal.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
@@ -1,20 +1,20 @@
 - type: stack
-  parent: BaseSheetStack
   id: Steel
   name: stack-steel
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: steel }
   spawn: SheetSteel1
+  maxCount: 30
 
 - type: stack
-  parent: BaseSheetStack
   id: Plasteel
   name: stack-plasteel
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plasteel }
   spawn: SheetPlasteel1
+  maxCount: 30
 
 - type: stack
-  parent: BaseSheetStack
   id: Brass
   name: stack-brass
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: brass }
   spawn: SheetBrass1
+  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Sheets/other.yml b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml
similarity index 68%
rename from Resources/Prototypes/Stacks/Sheets/other.yml
rename to Resources/Prototypes/Stacks/Materials/Sheets/other.yml
index 082919d39d..a86b4bec6f 100644
--- a/Resources/Prototypes/Stacks/Sheets/other.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml
@@ -1,20 +1,27 @@
 - type: stack
-  parent: BaseSheetStack
+  id: Paper
+  name: stack-paper
+  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: paper }
+  spawn: SheetPaper1
+  maxCount: 30
+
+- type: stack
   id: Plasma
   name: stack-plasma
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plasma }
   spawn: SheetPlasma1
+  maxCount: 30
 
 - type: stack
-  parent: BaseSheetStack
   id: Plastic
   name: stack-plastic
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plastic }
   spawn: SheetPlastic1
+  maxCount: 30
 
 - type: stack
-  parent: BaseSheetStack
   id: Uranium
   name: stack-uranium
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: uranium }
   spawn: SheetUranium1
+  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Materials/crystals.yml b/Resources/Prototypes/Stacks/Materials/crystals.yml
new file mode 100644
index 0000000000..e5fda560c8
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Materials/crystals.yml
@@ -0,0 +1,5 @@
+- type: stack
+  id: Telecrystal
+  name: stack-telecrystal
+  icon: Objects/Specific/Syndicate/telecrystal.rsi
+  spawn: Telecrystal1
diff --git a/Resources/Prototypes/Stacks/Materials/ingots.yml b/Resources/Prototypes/Stacks/Materials/ingots.yml
new file mode 100644
index 0000000000..154dacc679
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Materials/ingots.yml
@@ -0,0 +1,13 @@
+- type: stack
+  id: Gold
+  name: stack-gold
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: gold }
+  spawn: IngotGold1
+  maxCount: 30
+
+- type: stack
+  id: Silver
+  name: stack-silver
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: silver }
+  spawn: IngotSilver1
+  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml
new file mode 100644
index 0000000000..a759922900
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Materials/materials.yml
@@ -0,0 +1,111 @@
+- type: stack
+  id: Biomass
+  name: stack-biomass
+  icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
+  spawn: MaterialBiomass1
+  maxCount: 100
+
+- type: stack
+  id: WoodPlank
+  name: stack-wood-plank
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood }
+  spawn: MaterialWoodPlank1
+  maxCount: 30
+
+- type: stack
+  id: Cardboard
+  name: stack-cardboard
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
+  spawn: MaterialCardboard1
+  maxCount: 30
+
+- type: stack
+  id: Cloth
+  name: stack-cloth
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
+  spawn: MaterialCloth1
+  maxCount: 30
+
+- type: stack
+  id: Durathread
+  name: stack-durathread
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
+  spawn: MaterialDurathread1
+  maxCount: 30
+
+- type: stack
+  id: Diamond
+  name: stack-diamond
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond }
+  spawn: MaterialDiamond1
+  maxCount: 30
+
+- type: stack
+  id: Cotton
+  name: stack-cotton
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton }
+  spawn: MaterialCotton1
+  maxCount: 30
+
+- type: stack
+  id: Pyrotton
+  name: stack-pyrotton
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: pyrotton }
+  spawn: MaterialPyrotton1
+  maxCount: 30
+
+- type: stack
+  id: Bananium
+  name: stack-bananium
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium }
+  spawn: MaterialBananium1
+  maxCount: 10
+
+- type: stack
+  id: MeatSheets
+  name: stack-meat-sheet
+  icon: { sprite: /Textures/Objects/Materials/Sheets/meaterial.rsi, state: meat }
+  spawn: MaterialSheetMeat1
+  maxCount: 30
+
+- type: stack
+  id: WebSilk
+  name: stack-silk
+  icon: { sprite: /Textures/Objects/Materials/silk.rsi, state: icon }
+  spawn: MaterialWebSilk1
+  maxCount: 50
+
+- type: stack
+  id: SpaceCarpTooth
+  name: stack-space-carp-tooth
+  icon: { sprite: /Textures/Objects/Materials/Mob/carptooth.rsi, state: tooth }
+  spawn: MaterialToothSpaceCarp1
+  maxCount: 30
+
+- type: stack
+  id: SharkMinnowTooth
+  name: stack-sharkminnow-tooth
+  icon: { sprite: /Textures/Objects/Materials/Mob/sharktooth.rsi, state: tooth }
+  spawn: MaterialToothSharkminnow1
+  maxCount: 30
+
+- type: stack
+  id: Bones
+  name: stack-bones
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones }
+  spawn: MaterialBones1
+  maxCount: 30
+
+- type: stack
+  id: Gunpowder
+  name: stack-gunpowder
+  icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
+  spawn: MaterialGunpowder
+  maxCount: 60
+
+- type: stack
+  id: GoliathHide
+  name: stack-goliath-hide
+  icon: { sprite: /Textures/Objects/Materials/hide.rsi, state: goliath_hide }
+  spawn: MaterialGoliathHide1
+  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml
similarity index 83%
rename from Resources/Prototypes/Stacks/ore.yml
rename to Resources/Prototypes/Stacks/Materials/ore.yml
index 7f7fb05695..240e584e40 100644
--- a/Resources/Prototypes/Stacks/ore.yml
+++ b/Resources/Prototypes/Stacks/Materials/ore.yml
@@ -1,71 +1,69 @@
-# unrefined ore
-
 - type: stack
-  parent: BaseMediumStack
   id: GoldOre
   name: stack-gold-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: gold }
   spawn: GoldOre1
+  maxCount: 30
 
 - type: stack
-  parent: BaseMediumStack
   id: DiamondOre
   name: stack-rough-diamond
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: diamond }
   spawn: DiamondOre1
+  maxCount: 30
 
 - type: stack
-  parent: BaseMediumStack
   id: SteelOre
   name: stack-iron-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: iron }
   spawn: SteelOre1
+  maxCount: 30
 
 - type: stack
-  parent: BaseMediumStack
   id: PlasmaOre
   name: stack-plasma-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: plasma }
   spawn: PlasmaOre1
+  maxCount: 30
 
 - type: stack
-  parent: BaseMediumStack
   id: SilverOre
   name: stack-silver-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: silver }
   spawn: SilverOre1
+  maxCount: 30
 
 - type: stack
-  parent: BaseMediumStack
   id: SpaceQuartz
   name: stack-space-quartz
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: spacequartz }
   spawn: SpaceQuartz1
+  maxCount: 30
 
 - type: stack
-  parent: BaseMediumStack
   id: UraniumOre
   name: stack-uranium-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: uranium }
   spawn: UraniumOre1
+  maxCount: 30
 
 - type: stack
-  parent: BaseMediumStack
   id: BananiumOre
   name: stack-bananium-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: bananium }
   spawn: BananiumOre1
+  maxCount: 30
 
 - type: stack
-  parent: BaseMediumStack
   id: Coal
   name: stack-coal
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: coal }
   spawn: Coal1
+  maxCount: 30
 
 - type: stack
-  parent: BaseMediumStack
   id: SaltOre
   name: stack-salt
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: salt }
   spawn: Salt1
+  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Materials/parts.yml b/Resources/Prototypes/Stacks/Materials/parts.yml
new file mode 100644
index 0000000000..3b6fb4bcff
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Materials/parts.yml
@@ -0,0 +1,6 @@
+- type: stack
+  id: MetalRod
+  name: stack-rods
+  icon: { sprite: /Textures/Objects/Materials/parts.rsi, state: rods }
+  spawn: PartRodMetal1
+  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Sheets/organic.yml b/Resources/Prototypes/Stacks/Sheets/organic.yml
deleted file mode 100644
index 7239a72269..0000000000
--- a/Resources/Prototypes/Stacks/Sheets/organic.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: stack
-  parent: BaseSheetStack
-  id: Paper
-  name: stack-paper
-  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: paper }
-  spawn: SheetPaper1
-
-- type: stack
-  parent: BaseSheetStack
-  id: MeatSheets
-  name: stack-meat-sheet
-  icon: { sprite: /Textures/Objects/Materials/Sheets/meaterial.rsi, state: meat }
-  spawn: MaterialSheetMeat1
diff --git a/Resources/Prototypes/Stacks/Specific/engineering.yml b/Resources/Prototypes/Stacks/Specific/engineering.yml
deleted file mode 100644
index 86e339e693..0000000000
--- a/Resources/Prototypes/Stacks/Specific/engineering.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# they're uninflated by default so they're tiny
-- type: stack
-  parent: BaseSmallStack
-  id: InflatableWall
-  name: stack-inflatable-wall
-  icon: { sprite: "/Textures/Objects/Misc/inflatable_wall.rsi", state: item_wall }
-  spawn: InflatableWallStack1
-
-- type: stack
-  id: InflatableDoor
-  name: stack-inflatable-door
-  icon: { sprite: "/Textures/Objects/Misc/inflatable_door.rsi", state: item_door }
-  spawn: InflatableDoorStack1
-  maxCount: 4 # Maybe increased to 5 to reuse the base?
-
-# Cables
-- type: stack
-  parent: BaseMediumStack
-  id: Cable
-  name: stack-lv-cable
-  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coil-30 }
-  spawn: CableApcStack1
-
-- type: stack
-  parent: BaseMediumStack
-  id: CableMV
-  name: stack-mv-cable
-  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilmv-30 }
-  spawn: CableMVStack1
-
-- type: stack
-  parent: BaseMediumStack
-  id: CableHV
-  name: stack-hv-cable
-  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilhv-30 }
-  spawn: CableHVStack1
diff --git a/Resources/Prototypes/Stacks/Specific/security.yml b/Resources/Prototypes/Stacks/Specific/security.yml
deleted file mode 100644
index 7b3d60f1bc..0000000000
--- a/Resources/Prototypes/Stacks/Specific/security.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: stack
-  parent: BaseMediumStack
-  id: CableDet
-  name: stack-explosive-cord
-  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilex-30 }
-  spawn: CableDetStack1
diff --git a/Resources/Prototypes/Stacks/Tiles/alien.yml b/Resources/Prototypes/Stacks/Tiles/alien.yml
deleted file mode 100644
index 8ccca8b5b7..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/alien.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# Tiles you might find in an alien world
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileXenoborg
-  name: stack-xenoborg
-  spawn: FloorTileItemXenoborg
-
-# Exo station
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileXeno
-  name: stack-xeno-floor
-  spawn: FloorTileItemXeno
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileXenoSteel
-  name: stack-xeno-steel
-  spawn: FloorTileItemXenoSteelCorner
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileXenoSteelCorner
-  name: stack-xeno-steel-corner
-  spawn: FloorTileItemXenoSteelCorner
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileXenoMaint
-  name: stack-xeno-maint
-  spawn: FloorTileItemXenoSteelCorner
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDarkSquiggly
-  name: stack-dark-squiggly
-  spawn: FloorTileItemDarkSquiggly
diff --git a/Resources/Prototypes/Stacks/Tiles/brass.yml b/Resources/Prototypes/Stacks/Tiles/brass.yml
deleted file mode 100644
index 5fbec41449..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/brass.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Tiles made of brass
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileBrassFilled
-  name: stack-filled-brass-plate
-  spawn: FloorTileItemBrassFilled
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileBrassReebe
-  name: stack-smooth-brass-plate
-  spawn: FloorTileItemBrassReebe
diff --git a/Resources/Prototypes/Stacks/Tiles/carpet.yml b/Resources/Prototypes/Stacks/Tiles/carpet.yml
deleted file mode 100644
index 47b239f39d..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/carpet.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-# Carpets that are tiles
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackCarpetClown
-  name: stack-clown-carpet-tile
-  spawn: FloorTileItemCarpetClown
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackCarpetOffice
-  name: stack-office-carpet-tile
-  spawn: FloorTileItemCarpetOffice
-
-# Carpets that are not actually tiles (yet)
-- type: stack
-  parent: BaseTileStack
-  id: FloorCarpetRed
-  name: stack-red-carpet-tile
-  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-red }
-  spawn: FloorCarpetItemRed
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorCarpetBlack
-  name: stack-black-carpet-tile
-  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-black }
-  spawn: FloorCarpetItemBlack
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorCarpetBlue
-  name: stack-blue-carpet-tile
-  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-blue }
-  spawn: FloorCarpetItemBlue
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorCarpetGreen
-  name: stack-green-carpet-tile
-  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-green }
-  spawn: FloorCarpetItemGreen
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorCarpetOrange
-  name: stack-orange-carpet-tile
-  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-orange }
-  spawn: FloorCarpetItemOrange
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorCarpetSkyBlue
-  name: stack-skyblue-carpet-tile
-  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-skyblue }
-  spawn: FloorCarpetItemSkyBlue
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorCarpetPurple
-  name: stack-purple-carpet-tile
-  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-purple }
-  spawn: FloorCarpetItemPurple
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorCarpetPink
-  name: stack-pink-carpet-tile
-  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-pink }
-  spawn: FloorCarpetItemPink
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorCarpetCyan
-  name: stack-cyan-carpet-tile
-  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-cyan }
-  spawn: FloorCarpetItemCyan
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorCarpetWhite
-  name: stack-white-carpet-tile
-  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-white }
-  spawn: FloorCarpetItemWhite
diff --git a/Resources/Prototypes/Stacks/Tiles/concrete.yml b/Resources/Prototypes/Stacks/Tiles/concrete.yml
deleted file mode 100644
index a10b2e212e..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/concrete.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Tiles made of concrete
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileConcrete
-  name: stack-concrete-tile
-  spawn: FloorTileItemGrayConcrete
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileConcreteMono
-  name: stack-concrete-mono-tile
-  spawn: FloorTileItemConcreteMono
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileConcreteSmooth
-  name: stack-concrete-smooth
-  spawn: FloorTileItemConcreteSmooth
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileGrayConcrete
-  name: stack-gray-concrete-tile
-  spawn: FloorTileItemGrayConcrete
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileGrayConcreteMono
-  name: stack-gray-concrete-mono-tile
-  spawn: FloorTileItemGrayConcreteMono
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileGrayConcreteSmooth
-  name: stack-gray-concrete-smooth
-  spawn: FloorTileItemGrayConcreteSmooth
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileOldConcrete
-  name: stack-old-concrete-tile
-  spawn: FloorTileItemOldConcrete
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileOldConcreteMono
-  name: stack-old-concrete-mono-tile
-  spawn: FloorTileItemOldConcreteMono
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileOldConcreteSmooth
-  name: stack-old-concrete-smooth
-  spawn: FloorTileItemOldConcreteSmooth
diff --git a/Resources/Prototypes/Stacks/Tiles/electronic.yml b/Resources/Prototypes/Stacks/Tiles/electronic.yml
deleted file mode 100644
index f8923dc989..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/electronic.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# electronic or computery looking tiles
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileGCircuit
-  name: stack-green-circuit-floor
-  spawn: FloorTileItemGCircuit
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileBCircuit
-  name: stack-bcircuit-floor-tile
-  spawn: FloorTileItemBCircuit
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileRCircuit
-  name: stack-red-circuit-floor
-  spawn: FloorTileItemRCircuit
diff --git a/Resources/Prototypes/Stacks/Tiles/fancy.yml b/Resources/Prototypes/Stacks/Tiles/fancy.yml
deleted file mode 100644
index f4a06c1b66..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/fancy.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-# expensive looking tiles
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileGold
-  name: stack-gold-floor
-  spawn: FloorTileItemGold
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSilver
-  name: stack-silver-floor-tile
-  spawn: FloorTileItemSilver
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWhiteMarble
-  name: stack-white-marble-floor
-  spawn: FloorTileItemWhiteMarble
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDarkMarble
-  name: stack-dark-marble-floor
-  spawn: FloorTileItemDarkMarble
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTilePlasmaMarble
-  name: stack-plasma-marble-floor
-  spawn: FloorTileItemPlasmaMarble
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileUraniumMarble
-  name: stack-uranium-marble-floor
-  spawn: FloorTileItemUraniumMarble
diff --git a/Resources/Prototypes/Stacks/Tiles/faux.yml b/Resources/Prototypes/Stacks/Tiles/faux.yml
deleted file mode 100644
index 00c9e52525..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/faux.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Faux tiles that mimic planet terrain
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileAstroGrass
-  name: stack-astro-grass-floor
-  spawn: FloorTileItemAstroGrass
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileMowedAstroGrass
-  name: stack-mowed-astro-grass-floor
-  spawn: FloorTileItemMowedAstroGrass
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileJungleAstroGrass
-  name: stack-jungle-astro-grass-floor
-  spawn: FloorTileItemJungleAstroGrass
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDarkAstroGrass
-  name: stack-dark-astro-grass-floor
-  spawn: FloorTileItemDarkAstroGrass
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileLightAstroGrass
-  name: stack-light-astro-grass-floor
-  spawn: FloorTileItemLightAstroGrass
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileAstroIce
-  name: stack-astro-ice-floor
-  spawn: FloorTileItemAstroIce
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileAstroSnow
-  name: stack-astro-snow-floor
-  spawn: FloorTileItemAstroSnow
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileAstroAsteroidSand
-  name: stack-asteroid-astro-sand-floor
-  spawn: FloorTileItemAstroAsteroidSand
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDesertAstroSand
-  name: stack-desert-astro-sand-floor
-  spawn: FloorTileItemDesertAstroSand
diff --git a/Resources/Prototypes/Stacks/Tiles/four_square.yml b/Resources/Prototypes/Stacks/Tiles/four_square.yml
deleted file mode 100644
index 721ee5b1ab..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/four_square.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-# Tiles in a 4 square pattern
-
-# Single color
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileFreezer
-  name: stack-freezer-tile
-  spawn: FloorTileItemFreezer
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileShowroom
-  name: stack-showroom-tile
-  spawn: FloorTileItemShowroom
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileHydro
-  name: stack-hydro-tile
-  spawn: FloorTileItemHydro
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileLime
-  name: stack-lime-tile
-  spawn: FloorTileItemLime
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDirty
-  name: stack-dirty-tile
-  spawn: FloorTileItemDirty
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileBlue
-  name: stack-blue-floor-tile
-  spawn: FloorTileItemBlue
-
-# Two color
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSteelCheckerDark
-  name: stack-steel-dark-checker-tile
-  spawn: FloorTileItemSteelCheckerDark
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSteelCheckerLight
-  name: stack-steel-light-checker-tile
-  spawn: FloorTileItemSteelCheckerLight
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileBar
-  name: stack-item-bar-floor-tile
-  spawn: FloorTileItemBar
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileClown
-  name: stack-clown-floor-tile
-  spawn: FloorTileItemClown
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileMime
-  name: stack-mime-floor-tile
-  spawn: FloorTileItemMime
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileKitchen
-  name: stack-kitchen-floor-tile
-  spawn: FloorTileItemKitchen
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileLaundry
-  name: stack-laundry-floor-tile
-  spawn: FloorTileItemLaundry
-
-# Patterned
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileElevatorShaft
-  name: stack-elevator-shaft-tile
-  spawn: FloorTileItemElevatorShaft
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileRockVault
-  name: stack-rock-vault-tile
-  spawn: FloorTileItemRockVault
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileMining
-  name: stack-mining-floor-tile
-  spawn: FloorTileItemMining
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileMiningDark
-  name: stack-dark-mining-floor-tile
-  spawn: FloorTileItemMiningDark
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileMiningLight
-  name: stack-light-mining-floor-tile
-  spawn: FloorTileItemMiningLight
diff --git a/Resources/Prototypes/Stacks/Tiles/maints.yml b/Resources/Prototypes/Stacks/Tiles/maints.yml
deleted file mode 100644
index 3a1c5fd749..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/maints.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# tiles typically found in maintenance
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileTechmaint
-  name: stack-techmaint-floor
-  spawn: FloorTileItemTechmaint
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSteelMaint
-  name: stack-steel-maint-floor
-  spawn: FloorTileItemSteelMaint
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileGratingMaint
-  name: stack-grating-maint-floor
-  spawn: FloorTileItemGratingMaint
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileTechmaintDark
-  name: stack-techmaint-floor-dark
-  spawn: FloorTileItemTechmaintDark
diff --git a/Resources/Prototypes/Stacks/Tiles/organic.yml b/Resources/Prototypes/Stacks/Tiles/organic.yml
deleted file mode 100644
index ff51abc77e..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/organic.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# tiles that are fleshy or come from a creature
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileFlesh
-  name: stack-flesh-floor
-  spawn: FloorTileItemFlesh
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWeb
-  name: stack-web-tile
-  spawn: FloorTileItemWeb
diff --git a/Resources/Prototypes/Stacks/Tiles/other.yml b/Resources/Prototypes/Stacks/Tiles/other.yml
deleted file mode 100644
index fc31421433..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/other.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Tiles that don't fit cleanly in another category
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileMono
-  name: stack-mono-tile
-  spawn: FloorTileItemMono
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileMetalDiamond
-  name: stack-steel-tile
-  spawn: FloorTileItemMetalDiamond
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackBoxing
-  name: stack-boxing-ring-tile
-  spawn: FloorTileItemBoxing
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackGym
-  name: stack-gym-floor-tile
-  spawn: FloorTileItemGym
diff --git a/Resources/Prototypes/Stacks/Tiles/planet.yml b/Resources/Prototypes/Stacks/Tiles/planet.yml
deleted file mode 100644
index 7a235c7d9d..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/planet.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# tiles that spawn on planets and are generally unobtainable
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileGrass
-  name: stack-grass-floor-tile
-  spawn: FloorTileItemGrass
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileGrassJungle
-  name: stack-grass-jungle-floor-tile
-  spawn: FloorTileItemGrassJungle
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSnow
-  name: stack-snow-floor-tile
-  spawn: FloorTileItemSnow
diff --git a/Resources/Prototypes/Stacks/Tiles/retro.yml b/Resources/Prototypes/Stacks/Tiles/retro.yml
deleted file mode 100644
index 4b1eba2e4c..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/retro.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Tiles that come straight from the eighties
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileLino
-  name: stack-linoleum-floor
-  spawn: FloorTileItemLino
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackEighties
-  name: stack-eighties-floor-tile
-  spawn: FloorTileItemEighties
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackArcadeBlue
-  name: stack-blue-arcade-tile
-  spawn: FloorTileItemArcadeBlue
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackArcadeBlue2
-  name: stack-blue-arcade-tile
-  spawn: FloorTileItemArcadeBlue2
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackArcadeRed
-  name: stack-red-arcade-tile
-  spawn: FloorTileItemArcadeRed
diff --git a/Resources/Prototypes/Stacks/Tiles/shuttle.yml b/Resources/Prototypes/Stacks/Tiles/shuttle.yml
deleted file mode 100644
index 540eda3bbe..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/shuttle.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Tiles found on shuttles
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackShuttleWhite
-  name: stack-white-shuttle-tile
-  spawn: FloorTileItemShuttleWhite
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackShuttleBlue
-  name: stack-blue-shuttle-tile
-  spawn: FloorTileItemShuttleBlue
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackShuttleOrange
-  name: stack-orange-shuttle-tile
-  spawn: FloorTileItemShuttleOrange
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackShuttlePurple
-  name: stack-purple-shuttle-tile
-  spawn: FloorTileItemShuttlePurple
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackShuttleRed
-  name: stack-red-shuttle-tile
-  spawn: FloorTileItemShuttleRed
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackShuttleGrey
-  name: stack-grey-shuttle-tile
-  spawn: FloorTileItemShuttleGrey
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileStackShuttleBlack
-  name: stack-black-shuttle-tile
-  spawn: FloorTileItemShuttleBlack
diff --git a/Resources/Prototypes/Stacks/Tiles/steel.yml b/Resources/Prototypes/Stacks/Tiles/steel.yml
deleted file mode 100644
index 1e283d68f9..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/steel.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Regular steel tiles
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSteel
-  name: stack-steel-tile
-  spawn: FloorTileItemSteel
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSteelOffset
-  name: stack-offset-steel-tile
-  spawn: FloorTileItemSteelOffset
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSteelDiagonalMini
-  name: stack-steel-diagonal-mini-tile
-  spawn: FloorTileItemSteelDiagonalMini
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSteelDiagonal
-  name: stack-steel-diagonal-tile
-  spawn: FloorTileItemSteelDiagonal
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSteelHerringbone
-  name: stack-steel-herringbone
-  spawn: FloorTileItemSteelHerringbone
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSteelMini
-  name: stack-steel-mini-tile
-  spawn: FloorTileItemSteelMini
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSteelMono
-  name: stack-steel-mono-tile
-  spawn: FloorTileItemSteelMono
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSteelPavement
-  name: stack-steel-pavement
-  spawn: FloorTileItemSteelPavement
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileSteelPavementVertical
-  name: stack-steel-vertical-pavement
-  spawn: FloorTileItemSteelPavementVertical
diff --git a/Resources/Prototypes/Stacks/Tiles/steel_dark.yml b/Resources/Prototypes/Stacks/Tiles/steel_dark.yml
deleted file mode 100644
index e1660a0299..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/steel_dark.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Dark steel tiles
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDark
-  name: stack-dark-tile
-  spawn: FloorTileItemDark
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDarkDiagonalMini
-  name: stack-dark-steel-diagonal-mini-tile
-  spawn: FloorTileItemDarkDiagonalMini
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDarkDiagonal
-  name: stack-dark-steel-diagonal-tile
-  spawn: FloorTileItemDarkDiagonal
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDarkHerringbone
-  name: stack-dark-steel-herringbone
-  spawn: FloorTileItemDarkHerringbone
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDarkMini
-  name: stack-dark-steel-mini-tile
-  spawn: FloorTileItemDarkMini
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDarkMono
-  name: stack-dark-steel-mono-tile
-  spawn: FloorTileItemDarkMono
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDarkPavement
-  name: stack-dark-steel-pavement
-  spawn: FloorTileItemDarkPavement
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDarkPavementVertical
-  name: stack-dark-steel-vertical-pavement
-  spawn: FloorTileItemDarkPavementVertical
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileDarkOffset
-  name: stack-offset-dark-steel-tile
-  spawn: FloorTileItemDarkOffset
diff --git a/Resources/Prototypes/Stacks/Tiles/steel_white.yml b/Resources/Prototypes/Stacks/Tiles/steel_white.yml
deleted file mode 100644
index 75dd453abc..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/steel_white.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# White steel tiles
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWhite
-  name: stack-white-tile
-  spawn: FloorTileItemWhite
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWhiteOffset
-  name: stack-offset-white-steel-tile
-  spawn: FloorTileItemWhiteOffset
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWhiteDiagonalMini
-  name: stack-white-steel-diagonal-mini-tile
-  spawn: FloorTileItemWhiteDiagonalMini
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWhiteDiagonal
-  name: stack-white-steel-diagonal-tile
-  spawn: FloorTileItemWhiteDiagonal
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWhiteHerringbone
-  name: stack-white-steel-herringbone
-  spawn: FloorTileItemWhiteHerringbone
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWhiteMini
-  name: stack-white-steel-mini-tile
-  spawn: FloorTileItemWhiteMini
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWhiteMono
-  name: stack-white-steel-mono-tile
-  spawn: FloorTileItemWhiteMono
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWhitePavement
-  name: stack-white-steel-pavement
-  spawn: FloorTileItemWhitePavement
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWhitePavementVertical
-  name: stack-white-steel-vertical-pavement
-  spawn: FloorTileItemWhitePavementVertical
diff --git a/Resources/Prototypes/Stacks/Tiles/wood.yml b/Resources/Prototypes/Stacks/Tiles/wood.yml
deleted file mode 100644
index 3e922a64a5..0000000000
--- a/Resources/Prototypes/Stacks/Tiles/wood.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Tiles that are cut wood flooring
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWood
-  name: stack-wood-floor
-  spawn: FloorTileItemWood
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWoodPattern
-  name: stack-wood-patter-floor
-  spawn: FloorTileItemWoodPattern
-
-- type: stack
-  parent: BaseTileStack
-  id: FloorTileWoodLarge
-  name: stack-large-wood-floor
-  spawn: FloorTileItemWoodLarge
diff --git a/Resources/Prototypes/Stacks/base_stacks.yml b/Resources/Prototypes/Stacks/base_stacks.yml
deleted file mode 100644
index d3d4228fc2..0000000000
--- a/Resources/Prototypes/Stacks/base_stacks.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Base sizes for stacks in one convenient place
-
-# size used by powders and smokeables
-- type: stack
-  abstract: true
-  id: BaseVerySmallStack
-  maxCount: 5
-
-# size used by topicals and machine parts
-- type: stack
-  abstract: true
-  id: BaseSmallStack
-  maxCount: 10
-
-# Default size
-- type: stack
-  abstract: true
-  id: BaseMediumStack
-  maxCount: 30
-
-- type: stack
-  abstract: true
-  id: BaseLargeStack
-  maxCount: 50
-
-- type: stack
-  abstract: true
-  id: BaseVeryLargeStack
-  maxCount: 100
-
-# size used by "sheets." Usually materials like steel, glass, or plasma
-- type: stack
-  abstract: true
-  id: BaseSheetStack
-  maxCount: 30
-
-# Used by tiles
-- type: stack
-  abstract: true
-  id: BaseTileStack
-  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: steel }
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/cloth.yml b/Resources/Prototypes/Stacks/cloth.yml
deleted file mode 100644
index 8fbac968c3..0000000000
--- a/Resources/Prototypes/Stacks/cloth.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-- type: stack
-  parent: BaseMediumStack
-  id: Cloth
-  name: stack-cloth
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
-  spawn: MaterialCloth1
-
-- type: stack
-  parent: BaseMediumStack
-  id: Durathread
-  name: stack-durathread
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
-  spawn: MaterialDurathread1
-
-- type: stack
-  parent: BaseMediumStack
-  id: Cotton
-  name: stack-cotton
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton }
-  spawn: MaterialCotton1
-
-- type: stack
-  parent: BaseMediumStack
-  id: Pyrotton
-  name: stack-pyrotton
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: pyrotton }
-  spawn: MaterialPyrotton1
diff --git a/Resources/Prototypes/Stacks/consumable.yml b/Resources/Prototypes/Stacks/consumable_stacks.yml
similarity index 78%
rename from Resources/Prototypes/Stacks/consumable.yml
rename to Resources/Prototypes/Stacks/consumable_stacks.yml
index f96f2703e6..fcd10e5d7f 100644
--- a/Resources/Prototypes/Stacks/consumable.yml
+++ b/Resources/Prototypes/Stacks/consumable_stacks.yml
@@ -3,77 +3,82 @@
 - type: stack
   id: Pancake
   name: stack-pancake
-  icon: { sprite: /Textures/Objects/Consumable/Food/Baked/misc.rsi, state: pancakes1 }
   spawn: FoodBakedPancake
   maxCount: 9
 
 - type: stack
   id: PancakeBb
   name: stack-blueberry-pancake
-  icon: { sprite: /Textures/Objects/Consumable/Food/Baked/misc.rsi, state: pancakesbb1 }
   spawn: FoodBakedPancakeBb
   maxCount: 9
 
 - type: stack
   id: PancakeCc
   name: stack-chocolate-chip-pancake
-  icon: { sprite: /Textures/Objects/Consumable/Food/Baked/misc.rsi, state: pancakescc1 }
   spawn: FoodBakedPancakeCc
   maxCount: 9
 
+# Food Containers
+
+- type: stack
+  id: PizzaBox
+  name: stack-pizza-box
+  icon: { sprite: Objects/Consumable/Food/Baked/pizza.rsi, state: box }
+  spawn: FoodBoxPizza
+  maxCount: 30
+
 # Smokeables
 
 - type: stack
-  parent: BaseVerySmallStack
   id: PaperRolling
   name: stack-rolling-paper
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigpaper }
   spawn: PaperRolling
+  maxCount: 5
 
 - type: stack
-  parent: BaseVerySmallStack
   id: CigaretteFilter
   name: stack-cigarette-filter
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigfilter }
   spawn: CigaretteFilter
+  maxCount: 5
 
 - type: stack
-  parent: BaseVerySmallStack
   id: GroundTobacco
   name: stack-ground-tobacco
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: GroundTobacco
+  maxCount: 5
 
 - type: stack
-  parent: BaseVerySmallStack
   id: GroundCannabis
   name: stack-ground-cannabis
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: GroundCannabis
+  maxCount:
 
 - type: stack
-  parent: BaseVerySmallStack
   id: GroundCannabisRainbow
   name: stack-ground-rainbow-cannabis
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: powderpile_rainbow }
   spawn: GroundCannabisRainbow
+  maxCount:
 
 - type: stack
-  parent: BaseVerySmallStack
   id: LeavesTobaccoDried
   name: stack-dried-tobacco-leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
   spawn: LeavesTobaccoDried
+  maxCount: 5
 
 - type: stack
-  parent: BaseVerySmallStack
   id: LeavesCannabisDried
   name: stack-dried-cannabis-leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
   spawn: LeavesCannabisDried
+  maxCount: 5
 
 - type: stack
-  parent: BaseVerySmallStack
   id: LeavesCannabisRainbowDried
   name: stack-dried-rainbow-cannabis-leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: dried }
diff --git a/Resources/Prototypes/Stacks/currency.yml b/Resources/Prototypes/Stacks/currency.yml
deleted file mode 100644
index 1a0735005a..0000000000
--- a/Resources/Prototypes/Stacks/currency.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: stack
-  id: Telecrystal
-  name: stack-telecrystal
-  icon: { sprite: /Textures/Objects/Specific/Syndicate/telecrystal.rsi, state: telecrystal }
-  spawn: Telecrystal1
-
-- type: stack
-  id: Credit
-  name: stack-credit
-  icon: { sprite: /Textures/Objects/Economy/cash.rsi, state: cash }
-  spawn: SpaceCash
diff --git a/Resources/Prototypes/Stacks/engineering_stacks.yml b/Resources/Prototypes/Stacks/engineering_stacks.yml
new file mode 100644
index 0000000000..4d9fcbb57b
--- /dev/null
+++ b/Resources/Prototypes/Stacks/engineering_stacks.yml
@@ -0,0 +1,12 @@
+# they're uninflated by default so they're tiny
+- type: stack
+  id: InflatableWall
+  name: stack-inflatable-wall
+  spawn: InflatableWallStack1
+  maxCount: 10
+
+- type: stack
+  id: InflatableDoor
+  name: stack-inflatable-door
+  spawn: InflatableDoorStack1
+  maxCount: 4
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
new file mode 100644
index 0000000000..a41282ff71
--- /dev/null
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -0,0 +1,720 @@
+- type: stack
+  id: FloorTileDark
+  name: stack-dark-tile
+  spawn: FloorTileItemDark
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkDiagonalMini
+  name: stack-dark-steel-diagonal-mini-tile
+  spawn: FloorTileItemDarkDiagonalMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkDiagonal
+  name: stack-dark-steel-diagonal-tile
+  spawn: FloorTileItemDarkDiagonal
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkHerringbone
+  name: stack-dark-steel-herringbone
+  spawn: FloorTileItemDarkHerringbone
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkMini
+  name: stack-dark-steel-mini-tile
+  spawn: FloorTileItemDarkMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkMono
+  name: stack-dark-steel-mono-tile
+  spawn: FloorTileItemDarkMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkPavement
+  name: stack-dark-steel-pavement
+  spawn: FloorTileItemDarkPavement
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkPavementVertical
+  name: stack-dark-steel-vertical-pavement
+  spawn: FloorTileItemDarkPavementVertical
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkOffset
+  name: stack-offset-dark-steel-tile
+  spawn: FloorTileItemDarkOffset
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteel
+  name: stack-steel-tile
+  spawn: FloorTileItemSteel
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelOffset
+  name: stack-offset-steel-tile
+  spawn: FloorTileItemSteelOffset
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelDiagonalMini
+  name: stack-steel-diagonal-mini-tile
+  spawn: FloorTileItemSteelDiagonalMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelDiagonal
+  name: stack-steel-diagonal-tile
+  spawn: FloorTileItemSteelDiagonal
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelHerringbone
+  name: stack-steel-herringbone
+  spawn: FloorTileItemSteelHerringbone
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelMini
+  name: stack-steel-mini-tile
+  spawn: FloorTileItemSteelMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelMono
+  name: stack-steel-mono-tile
+  spawn: FloorTileItemSteelMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelPavement
+  name: stack-steel-pavement
+  spawn: FloorTileItemSteelPavement
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelPavementVertical
+  name: stack-steel-vertical-pavement
+  spawn: FloorTileItemSteelPavementVertical
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhite
+  name: stack-white-tile
+  spawn: FloorTileItemWhite
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteOffset
+  name: stack-offset-white-steel-tile
+  spawn: FloorTileItemWhiteOffset
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteDiagonalMini
+  name: stack-white-steel-diagonal-mini-tile
+  spawn: FloorTileItemWhiteDiagonalMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteDiagonal
+  name: stack-white-steel-diagonal-tile
+  spawn: FloorTileItemWhiteDiagonal
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteHerringbone
+  name: stack-white-steel-herringbone
+  spawn: FloorTileItemWhiteHerringbone
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteMini
+  name: stack-white-steel-mini-tile
+  spawn: FloorTileItemWhiteMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteMono
+  name: stack-white-steel-mono-tile
+  spawn: FloorTileItemWhiteMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhitePavement
+  name: stack-white-steel-pavement
+  spawn: FloorTileItemWhitePavement
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhitePavementVertical
+  name: stack-white-steel-vertical-pavement
+  spawn: FloorTileItemWhitePavementVertical
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelCheckerDark
+  name: stack-steel-dark-checker-tile
+  spawn: FloorTileItemSteelCheckerDark
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelCheckerLight
+  name: stack-steel-light-checker-tile
+  spawn: FloorTileItemSteelCheckerLight
+  maxCount: 30
+
+- type: stack
+  id: FloorTileMetalDiamond
+  name: stack-steel-tile
+  spawn: FloorTileItemMetalDiamond
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWood
+  name: stack-wood-floor
+  spawn: FloorTileItemWood
+  maxCount: 30
+
+- type: stack
+  id: FloorTileTechmaint
+  name: stack-techmaint-floor
+  spawn: FloorTileItemTechmaint
+  maxCount: 30
+
+- type: stack
+  id: FloorTileTechmaintDark
+  name: stack-techmaint-floor-dark
+  spawn: FloorTileItemTechmaintDark
+  maxCount: 30
+
+- type: stack
+  id: FloorTileFreezer
+  name: stack-freezer-tile
+  spawn: FloorTileItemFreezer
+  maxCount: 30
+
+- type: stack
+  id: FloorTileShowroom
+  name: stack-showroom-tile
+  spawn: FloorTileItemShowroom
+  maxCount: 30
+
+- type: stack
+  id: FloorTileGCircuit
+  name: stack-green-circuit-floor
+  spawn: FloorTileItemGCircuit
+  maxCount: 30
+
+- type: stack
+  id: FloorTileGold
+  name: stack-gold-floor
+  spawn: FloorTileItemGold
+  maxCount: 30
+
+- type: stack
+  id: FloorTileMono
+  name: stack-mono-tile
+  spawn: FloorTileItemMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileBrassFilled
+  name: stack-filled-brass-plate
+  spawn: FloorTileItemBrassFilled
+  maxCount: 30
+
+- type: stack
+  id: FloorTileBrassReebe
+  name: stack-smooth-brass-plate
+  spawn: FloorTileItemBrassReebe
+  maxCount: 30
+
+- type: stack
+  id: FloorTileLino
+  name: stack-linoleum-floor
+  spawn: FloorTileItemLino
+  maxCount: 30
+
+- type: stack
+  id: FloorTileHydro
+  name: stack-hydro-tile
+  spawn: FloorTileItemHydro
+  maxCount: 30
+
+- type: stack
+  id: FloorTileLime
+  name: stack-lime-tile
+  spawn: FloorTileItemLime
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDirty
+  name: stack-dirty-tile
+  spawn: FloorTileItemDirty
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackShuttleWhite
+  name: stack-white-shuttle-tile
+  spawn: FloorTileItemShuttleWhite
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackShuttleBlue
+  name: stack-blue-shuttle-tile
+  spawn: FloorTileItemShuttleBlue
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackShuttleOrange
+  name: stack-orange-shuttle-tile
+  spawn: FloorTileItemShuttleOrange
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackShuttlePurple
+  name: stack-purple-shuttle-tile
+  spawn: FloorTileItemShuttlePurple
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackShuttleRed
+  name: stack-red-shuttle-tile
+  spawn: FloorTileItemShuttleRed
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackShuttleGrey
+  name: stack-grey-shuttle-tile
+  spawn: FloorTileItemShuttleGrey
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackShuttleBlack
+  name: stack-black-shuttle-tile
+  spawn: FloorTileItemShuttleBlack
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackEighties
+  name: stack-eighties-floor-tile
+  spawn: FloorTileItemEighties
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackArcadeBlue
+  name: stack-blue-arcade-tile
+  spawn: FloorTileItemArcadeBlue
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackArcadeBlue2
+  name: stack-blue-arcade-tile
+  spawn: FloorTileItemArcadeBlue2
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackArcadeRed
+  name: stack-red-arcade-tile
+  spawn: FloorTileItemArcadeRed
+  maxCount: 30
+
+- type: stack
+  id: FloorCarpetRed
+  name: stack-red-carpet-tile
+  spawn: FloorCarpetItemRed
+  maxCount: 30
+
+- type: stack
+  id: FloorCarpetBlack
+  name: stack-black-carpet-tile
+  spawn: FloorCarpetItemBlack
+  maxCount: 30
+
+- type: stack
+  id: FloorCarpetBlue
+  name: stack-blue-carpet-tile
+  spawn: FloorCarpetItemBlue
+  maxCount: 30
+
+- type: stack
+  id: FloorCarpetGreen
+  name: stack-green-carpet-tile
+  spawn: FloorCarpetItemGreen
+  maxCount: 30
+
+- type: stack
+  id: FloorCarpetOrange
+  name: stack-orange-carpet-tile
+  spawn: FloorCarpetItemOrange
+  maxCount: 30
+
+- type: stack
+  id: FloorCarpetSkyBlue
+  name: stack-skyblue-carpet-tile
+  spawn: FloorCarpetItemSkyBlue
+  maxCount: 30
+
+- type: stack
+  id: FloorCarpetPurple
+  name: stack-purple-carpet-tile
+  spawn: FloorCarpetItemPurple
+  maxCount: 30
+
+- type: stack
+  id: FloorCarpetPink
+  name: stack-pink-carpet-tile
+  spawn: FloorCarpetItemPink
+  maxCount: 30
+
+- type: stack
+  id: FloorCarpetCyan
+  name: stack-cyan-carpet-tile
+  spawn: FloorCarpetItemCyan
+  maxCount: 30
+
+- type: stack
+  id: FloorCarpetWhite
+  name: stack-white-carpet-tile
+  spawn: FloorCarpetItemWhite
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackCarpetClown
+  name: stack-clown-carpet-tile
+  spawn: FloorTileItemCarpetClown
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackCarpetOffice
+  name: stack-office-carpet-tile
+  spawn: FloorTileItemCarpetOffice
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackBoxing
+  name: stack-boxing-ring-tile
+  spawn: FloorTileItemBoxing
+  maxCount: 30
+
+- type: stack
+  id: FloorTileStackGym
+  name: stack-gym-floor-tile
+  spawn: FloorTileItemGym
+  maxCount: 30
+
+- type: stack
+  id: FloorTileElevatorShaft
+  name: stack-elevator-shaft-tile
+  spawn: FloorTileItemElevatorShaft
+  maxCount: 30
+
+- type: stack
+  id: FloorTileRockVault
+  name: stack-rock-vault-tile
+  spawn: FloorTileItemRockVault
+  maxCount: 30
+
+- type: stack
+  id: FloorTileBlue
+  name: stack-blue-floor-tile
+  spawn: FloorTileItemBlue
+  maxCount: 30
+
+- type: stack
+  id: FloorTileMining
+  name: stack-mining-floor-tile
+  spawn: FloorTileItemMining
+  maxCount: 30
+
+- type: stack
+  id: FloorTileMiningDark
+  name: stack-dark-mining-floor-tile
+  spawn: FloorTileItemMiningDark
+  maxCount: 30
+
+- type: stack
+  id: FloorTileMiningLight
+  name: stack-light-mining-floor-tile
+  spawn: FloorTileItemMiningLight
+  maxCount: 30
+
+- type: stack
+  id: FloorTileBar
+  name: stack-item-bar-floor-tile
+  spawn: FloorTileItemBar
+  maxCount: 30
+
+- type: stack
+  id: FloorTileClown
+  name: stack-clown-floor-tile
+  spawn: FloorTileItemClown
+  maxCount: 30
+
+- type: stack
+  id: FloorTileMime
+  name: stack-mime-floor-tile
+  spawn: FloorTileItemMime
+  maxCount: 30
+
+- type: stack
+  id: FloorTileKitchen
+  name: stack-kitchen-floor-tile
+  spawn: FloorTileItemKitchen
+  maxCount: 30
+
+- type: stack
+  id: FloorTileLaundry
+  name: stack-laundry-floor-tile
+  spawn: FloorTileItemLaundry
+  maxCount: 30
+
+- type: stack
+  id: FloorTileConcrete
+  name: stack-concrete-tile
+  spawn: FloorTileItemGrayConcrete
+  maxCount: 30
+
+- type: stack
+  id: FloorTileConcreteMono
+  name: stack-concrete-mono-tile
+  spawn: FloorTileItemConcreteMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileConcreteSmooth
+  name: stack-concrete-smooth
+  spawn: FloorTileItemConcreteSmooth
+  maxCount: 30
+
+- type: stack
+  id: FloorTileGrayConcrete
+  name: stack-gray-concrete-tile
+  spawn: FloorTileItemGrayConcrete
+  maxCount: 30
+
+- type: stack
+  id: FloorTileGrayConcreteMono
+  name: stack-gray-concrete-mono-tile
+  spawn: FloorTileItemGrayConcreteMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileGrayConcreteSmooth
+  name: stack-gray-concrete-smooth
+  spawn: FloorTileItemGrayConcreteSmooth
+  maxCount: 30
+
+- type: stack
+  id: FloorTileOldConcrete
+  name: stack-old-concrete-tile
+  spawn: FloorTileItemOldConcrete
+  maxCount: 30
+
+- type: stack
+  id: FloorTileOldConcreteMono
+  name: stack-old-concrete-mono-tile
+  spawn: FloorTileItemOldConcreteMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileOldConcreteSmooth
+  name: stack-old-concrete-smooth
+  spawn: FloorTileItemOldConcreteSmooth
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSilver
+  name: stack-silver-floor-tile
+  spawn: FloorTileItemSilver
+  maxCount: 30
+
+- type: stack
+  id: FloorTileBCircuit
+  name: stack-bcircuit-floor-tile
+  spawn: FloorTileItemBCircuit
+  maxCount: 30
+
+- type: stack
+  id: FloorTileRCircuit
+  name: stack-red-circuit-floor
+  spawn: FloorTileItemRCircuit
+  maxCount: 30
+
+- type: stack
+  id: FloorTileGrass
+  name: stack-grass-floor-tile
+  spawn: FloorTileItemGrass
+  maxCount: 30
+
+- type: stack
+  id: FloorTileGrassJungle
+  name: stack-grass-jungle-floor-tile
+  spawn: FloorTileItemGrassJungle
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSnow
+  name: stack-snow-floor-tile
+  spawn: FloorTileItemSnow
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWoodPattern
+  name: stack-wood-patter-floor
+  spawn: FloorTileItemWoodPattern
+  maxCount: 30
+
+- type: stack
+  id: FloorTileFlesh
+  name: stack-flesh-floor
+  spawn: FloorTileItemFlesh
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelMaint
+  name: stack-steel-maint-floor
+  spawn: FloorTileItemSteelMaint
+  maxCount: 30
+
+- type: stack
+  id: FloorTileGratingMaint
+  name: stack-grating-maint-floor
+  spawn: FloorTileItemGratingMaint
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWeb
+  name: stack-web-tile
+  spawn: FloorTileItemWeb
+  maxCount: 30
+
+# Faux science tiles
+- type: stack
+  id: FloorTileAstroGrass
+  name: stack-astro-grass-floor
+  spawn: FloorTileItemAstroGrass
+  maxCount: 30
+
+- type: stack
+  id: FloorTileMowedAstroGrass
+  name: stack-mowed-astro-grass-floor
+  spawn: FloorTileItemMowedAstroGrass
+  maxCount: 30
+
+- type: stack
+  id: FloorTileJungleAstroGrass
+  name: stack-jungle-astro-grass-floor
+  spawn: FloorTileItemJungleAstroGrass
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkAstroGrass
+  name: stack-dark-astro-grass-floor
+  spawn: FloorTileItemDarkAstroGrass
+  maxCount: 30
+
+- type: stack
+  id: FloorTileLightAstroGrass
+  name: stack-light-astro-grass-floor
+  spawn: FloorTileItemLightAstroGrass
+  maxCount: 30
+
+- type: stack
+  id: FloorTileAstroIce
+  name: stack-astro-ice-floor
+  spawn: FloorTileItemAstroIce
+  maxCount: 30
+
+- type: stack
+  id: FloorTileAstroSnow
+  name: stack-astro-snow-floor
+  spawn: FloorTileItemAstroSnow
+  maxCount: 30
+
+- type: stack
+  id: FloorTileAstroAsteroidSand
+  name: stack-asteroid-astro-sand-floor
+  spawn: FloorTileItemAstroAsteroidSand
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDesertAstroSand
+  name: stack-desert-astro-sand-floor
+  spawn: FloorTileItemDesertAstroSand
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWoodLarge
+  name: stack-large-wood-floor
+  spawn: FloorTileItemWoodLarge
+  maxCount: 30
+
+- type: stack
+  id: FloorTileXeno
+  name: stack-xeno-floor
+  spawn: FloorTileItemXeno
+  maxCount: 30
+
+- type: stack
+  id: FloorTileXenoSteel
+  name: stack-xeno-steel
+  spawn: FloorTileItemXenoSteelCorner
+  maxCount: 30
+
+- type: stack
+  id: FloorTileXenoSteelCorner
+  name: stack-xeno-steel-corner
+  spawn: FloorTileItemXenoSteelCorner
+  maxCount: 30
+
+- type: stack
+  id: FloorTileXenoMaint
+  name: stack-xeno-maint
+  spawn: FloorTileItemXenoSteelCorner
+  maxCount: 30
+
+- type: stack
+  id: FloorTileXenoborg
+  name: stack-xenoborg
+  spawn: FloorTileItemXenoborg
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkSquiggly
+  name: stack-dark-squiggly
+  spawn: FloorTileItemDarkSquiggly
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteMarble
+  name: stack-white-marble-floor
+  spawn: FloorTileItemWhiteMarble
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkMarble
+  name: stack-dark-marble-floor
+  spawn: FloorTileItemDarkMarble
+  maxCount: 30
+
+- type: stack
+  id: FloorTilePlasmaMarble
+  name: stack-plasma-marble-floor
+  spawn: FloorTileItemPlasmaMarble
+  maxCount: 30
+
+- type: stack
+  id: FloorTileUraniumMarble
+  name: stack-uranium-marble-floor
+  spawn: FloorTileItemUraniumMarble
+  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Specific/medical.yml b/Resources/Prototypes/Stacks/medical_stacks.yml
similarity index 85%
rename from Resources/Prototypes/Stacks/Specific/medical.yml
rename to Resources/Prototypes/Stacks/medical_stacks.yml
index 65691b0e8a..5c4e98f6f6 100644
--- a/Resources/Prototypes/Stacks/Specific/medical.yml
+++ b/Resources/Prototypes/Stacks/medical_stacks.yml
@@ -1,51 +1,49 @@
-# Topical medicines
-
 - type: stack
-  parent: BaseSmallStack
   id: Ointment
   name: stack-ointment
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: ointment }
   spawn: Ointment
+  maxCount: 10
 
 - type: stack
-  parent: BaseSmallStack
   id: AloeCream
   name: stack-aloe-cream
   icon: { sprite: "/Textures/Objects/Specific/Hydroponics/aloe.rsi", state: cream }
   spawn: AloeCream
+  maxCount: 10
 
 - type: stack
-  parent: BaseSmallStack
   id: Gauze
   name: stack-gauze
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
   spawn: Gauze
+  maxCount: 10
 
 - type: stack
-  parent: BaseSmallStack
   id: Brutepack
   name: stack-brutepack
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
   spawn: Brutepack
+  maxCount: 10
 
 - type: stack
-  parent: BaseSmallStack
   id: Bloodpack
   name: stack-bloodpack
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: bloodpack }
   spawn: Bloodpack
+  maxCount: 10
 
 - type: stack
-  parent: BaseSmallStack
   id: MedicatedSuture
   name: stack-medicated-suture
   icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: medicated-suture }
   spawn: MedicatedSuture
+  maxCount: 10
 
 - type: stack
-  parent: BaseSmallStack
   id: RegenerativeMesh
   name: stack-regenerative-mesh
   icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: regenerative-mesh}
   spawn: RegenerativeMesh
+  maxCount: 10
 
diff --git a/Resources/Prototypes/Stacks/ore_refined.yml b/Resources/Prototypes/Stacks/ore_refined.yml
deleted file mode 100644
index e171bce0d8..0000000000
--- a/Resources/Prototypes/Stacks/ore_refined.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Materials which come from refining ores, excluding sheets
-
-- type: stack
-  parent: BaseMediumStack
-  id: Diamond
-  name: stack-diamond
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond }
-  spawn: MaterialDiamond1
-
-- type: stack
-  parent: BaseSmallStack
-  id: Bananium
-  name: stack-bananium
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium }
-  spawn: MaterialBananium1
-
-# Ingots
-- type: stack
-  parent: BaseMediumStack
-  id: Gold
-  name: stack-gold
-  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: gold }
-  spawn: IngotGold1
-
-- type: stack
-  parent: BaseMediumStack
-  id: Silver
-  name: stack-silver
-  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: silver }
-  spawn: IngotSilver1
diff --git a/Resources/Prototypes/Stacks/organic.yml b/Resources/Prototypes/Stacks/organic.yml
deleted file mode 100644
index 9f4764f904..0000000000
--- a/Resources/Prototypes/Stacks/organic.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-- type: stack
-  parent: BaseVeryLargeStack
-  id: Biomass
-  name: stack-biomass
-  icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
-  spawn: MaterialBiomass1
-
-# Stacks which come from plants
-
-- type: stack
-  parent: BaseMediumStack
-  id: WoodPlank
-  name: stack-wood-plank
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood }
-  spawn: MaterialWoodPlank1
-
-- type: stack
-  parent: BaseMediumStack
-  id: Cardboard
-  name: stack-cardboard
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
-  spawn: MaterialCardboard1
-
-# Stacks which come from or might come from a creature
-
-- type: stack
-  parent: BaseLargeStack
-  id: WebSilk
-  name: stack-silk
-  icon: { sprite: /Textures/Objects/Materials/silk.rsi, state: icon }
-  spawn: MaterialWebSilk1
-
-- type: stack
-  parent: BaseMediumStack
-  id: Bones
-  name: stack-bones
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones }
-  spawn: MaterialBones1
-
-- type: stack
-  parent: BaseMediumStack
-  id: SpaceCarpTooth
-  name: stack-space-carp-tooth
-  icon: { sprite: /Textures/Objects/Materials/Mob/carptooth.rsi, state: tooth }
-  spawn: MaterialToothSpaceCarp1
-
-- type: stack
-  parent: BaseMediumStack
-  id: SharkMinnowTooth
-  name: stack-sharkminnow-tooth
-  icon: { sprite: /Textures/Objects/Materials/Mob/sharktooth.rsi, state: tooth }
-  spawn: MaterialToothSharkminnow1
-
-- type: stack
-  parent: BaseMediumStack
-  id: GoliathHide
-  name: stack-goliath-hide
-  icon: { sprite: /Textures/Objects/Materials/hide.rsi, state: goliath_hide }
-  spawn: MaterialGoliathHide1
diff --git a/Resources/Prototypes/Stacks/other.yml b/Resources/Prototypes/Stacks/other.yml
deleted file mode 100644
index e5889915d1..0000000000
--- a/Resources/Prototypes/Stacks/other.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Stacks which don't fit cleanly into other categories
-
-- type: stack
-  parent: BaseSheetStack # Not a sheet, but spiritually similar
-  id: MetalRod
-  name: stack-rods
-  icon: { sprite: /Textures/Objects/Materials/parts.rsi, state: rods }
-  spawn: PartRodMetal1
-
-- type: stack
-  parent: BaseVerySmallStack
-  id: Gunpowder
-  name: stack-gunpowder
-  icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
-  spawn: MaterialGunpowder
diff --git a/Resources/Prototypes/Stacks/power_stacks.yml b/Resources/Prototypes/Stacks/power_stacks.yml
new file mode 100644
index 0000000000..40782d382c
--- /dev/null
+++ b/Resources/Prototypes/Stacks/power_stacks.yml
@@ -0,0 +1,30 @@
+- type: stack
+  id: Cable
+  name: stack-lv-cable
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coil-30 }
+  spawn: CableApcStack1
+  maxCount: 30
+
+- type: stack
+  id: CableMV
+  name: stack-mv-cable
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilmv-30 }
+  spawn: CableMVStack1
+  maxCount: 30
+
+- type: stack
+  id: CableHV
+  name: stack-hv-cable
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilhv-30 }
+  spawn: CableHVStack1
+  maxCount: 30
+
+# Explosive cable below
+
+- type: stack
+  id: CableDet
+  name: stack-explosive-cord
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilex-30 }
+  spawn: CableDetStack1
+  maxCount: 30
+
diff --git a/Resources/Prototypes/Stacks/Specific/science.yml b/Resources/Prototypes/Stacks/science_stacks.yml
similarity index 63%
rename from Resources/Prototypes/Stacks/Specific/science.yml
rename to Resources/Prototypes/Stacks/science_stacks.yml
index 610464b33e..0dfc5444fd 100644
--- a/Resources/Prototypes/Stacks/Specific/science.yml
+++ b/Resources/Prototypes/Stacks/science_stacks.yml
@@ -1,13 +1,13 @@
 - type: stack
-  parent: BaseMediumStack
   id: ArtifactFragment
   name: stack-artifact-fragment
-  icon: { sprite: /Textures/Objects/Specific/Xenoarchaeology/artifact_fragments.rsi, state: martianball1 }
   spawn: ArtifactFragment1
+  maxCount: 30
+
 
 - type: stack
-  parent: BaseSmallStack
   id: Manipulator
   name: stack-micro-manipulator
   icon: { sprite: /Textures/Objects/Misc/stock_parts.rsi, state: micro_mani }
   spawn: MicroManipulatorStockPart
+  maxCount: 10
diff --git a/Resources/Prototypes/Voice/auto_emotes.yml b/Resources/Prototypes/Voice/auto_emotes.yml
index 4b9830ccd5..2d2de26604 100644
--- a/Resources/Prototypes/Voice/auto_emotes.yml
+++ b/Resources/Prototypes/Voice/auto_emotes.yml
@@ -12,12 +12,3 @@
   interval: 5.0
   chance: 0.5
   withChat: false
-# Kudzu
-- type: autoEmote
-  id: MeatGasp
-  emote: Gasp
-  interval: 4.0 # Same interval as a full breathing cycle
-  chance: 0.01 # Make it very rare
-  ignoreActionBlocker: true
-  force: true
-  hiddenFromChatWindow: true
diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml
index 094d096b28..08f4a51c99 100644
--- a/Resources/Prototypes/silicon-laws.yml
+++ b/Resources/Prototypes/silicon-laws.yml
@@ -250,6 +250,11 @@
   order: 4
   lawString: law-paladin-4
 
+- type: siliconLaw
+  id: Paladin5
+  order: 5
+  lawString: law-paladin-5
+
 
 - type: siliconLawset
   id: PaladinLawset
@@ -258,6 +263,7 @@
   - Paladin2
   - Paladin3
   - Paladin4
+  - Paladin5
   obeysTo: laws-owner-crew
 
  # Live and Let Live laws
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 08539f50cf..4f6c018f23 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1024,8 +1024,6 @@
   id: Mushroom
 
 ## N ##
-- type: Tag
-  id: NinjaBombingTargetBlocker # Ninjas will not target this warp point
 
 - type: Tag
   id: NoBlockAnchoring
diff --git a/Resources/ServerInfo/Guidebook/Science/AnalysisConsole.xml b/Resources/ServerInfo/Guidebook/Science/AnalysisConsole.xml
deleted file mode 100644
index e1bfece051..0000000000
--- a/Resources/ServerInfo/Guidebook/Science/AnalysisConsole.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<Document>
-  # Analysis Console
-
-  The Analysis Console is a device used to interface with artifacts. It can be used to check nodes, their triggers and effects, and extract points.
-
-  <Box>
-    <GuideEntityEmbed Entity="ComputerAnalysisConsole" Caption="Analysis Console"/>
-  </Box>
-
-  The console displays detailed information about each node in the artifact’s tree structure. This includes:
-  - [bold]ID:[/bold] Unique identifier for use with the Node Scanner.
-  - [bold]Class:[/bold] The layer name, nodes on the same layer share it.
-  - [bold]Status:[/bold]
-  - [italic][color=red]Locked[/color][/italic] by default.
-  - [italic][color=plum]Active[/color][/italic] when first triggered.
-  - [italic][color=lime]Unlocked[/color][/italic] if a deeper node is reached (prevents manual activations).
-  - [bold]Durability:[/bold] Number of manual activations available.
-  - [bold]Effect:[/bold] What happens when the node activates or is manually triggered.
-  - [bold]Triggers:[/bold] Required actions to unlock the node.
-  - [bold]Server:[/bold] Choose the research server where extracted points are sent.
-  - [bold]Extract Points:[/bold] Extracts points from nodes unlocked since the last extraction.
-</Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
new file mode 100644
index 0000000000..b010e20abc
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
@@ -0,0 +1,24 @@
+<Document>
+  # Artifact Reports
+  A large portion of Xenoarchaeology gameplay revolves around the interpretation of artifact reports, which are created at the [color=#a4885c]analysis console[/color] after an artifact is scanned. Reports contain the following information:
+
+  - [color=#a4885c]Node ID:[/color] a unique numeric ID corresponding to this artifact's node. Useful in conjunction with a [color=#a4885c]node scanner[/color] for quickly identifying recurring nodes.
+
+  - [color=#a4885c]Depth:[/color] a distance from the starting node (depth 0). This is a good shorthand for the value and danger of a node.
+
+  - [color=#a4885c]Activation status:[/color] whether or not a node has been activated in the past.
+
+  - [color=#a4885c]Stimulus:[/color] the stimulus for that particular node.
+
+  - [color=#a4885c]Reaction:[/color] the reaction the stimulus induces. This is often vague, so caution is advised.
+
+  - [color=#a4885c]Edges:[/color] the amount of nodes that are connected to the current node. Using this, you can calculate the total number of nodes as well as organize a map of their connections.
+
+  - [color=#a4885c]Unextracted value:[/color] the amount of research points an artifact will give when extracted. Extracting sets this to zero and traversing new nodes increases it.
+
+  Reports are a helpful tool in manipulating an artifact, especially in the later stages where you are traversing nodes that have already been activated.
+  <Box>
+  <GuideEntityEmbed Entity="PaperArtifactAnalyzer"/>
+  </Box>
+  To help with this process, consider printing out reports, writing down details uncovered during activation, or storing them in a folder nearby.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/UnlockingNodes.xml b/Resources/ServerInfo/Guidebook/Science/UnlockingNodes.xml
deleted file mode 100644
index ca93846b68..0000000000
--- a/Resources/ServerInfo/Guidebook/Science/UnlockingNodes.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<Document>
-  # Unlocking Nodes
-  <Box>
-    <GuideEntityEmbed Entity="ComplexXenoArtifact" Caption=""/>
-    <GuideEntityEmbed Entity="ComplexXenoArtifactItem" Caption=""/>
-  </Box>
-
-  To activate and unlock nodes on an artifact, you should:
-  - Check a node on the [bold]Analysis Console[/bold] to check its triggers and effects.
-  - Perform the [bold]triggers[/bold] listed in the console. Some require direct interaction with the artifact, while others may only need the correct environment or a specific action performed nearby.
-  - Once a trigger is successfully performed, the artifact will respond with the message: [italic]"It begins to shift in strange ways..."[/italic]. The [bold]Node Scanner[/bold] will then indicate which specific nodes are being triggered.
-
-  Artifacts enter an unlocking state after the first trigger is met. During this state, any remaining triggers must be completed. The unlocking window initially lasts a few seconds and resets each time a new trigger is activated. This window grows longer with each additional node unlocked, giving more time to complete further triggers.
-
-  Once all required triggers are completed successfully, the artifact will trigger it's effect and a popup will appear saying: [italic]"It slows down, visibly changed."[/italic], and the node will appear as [bold][color=plum]Active[/color][/bold] on the Console.
-
-  If an artifact fails to activate, it will stop resonating and display the message: [italic]"It slows down before uneventfully stopping."[/italic] After this, it enters a cooldown period before it can be activated again.
-
-  The order of trigger activation [bold]does not matter[/bold] for individual nodes. [italic]However[/italic], some triggers affect multiple nodes. As a rule of thumb, start with a trigger that is unique to the node you want to unlock. Activating a trigger for a different node during this phase prevents the target node from unlocking until the artifact’s cooldown ends.
-
-  <GuideReagentEmbed Reagent="Artifexium"/>
-
-  ## Active Nodes
-  Once unlocked, a node is considered active. Only the highest unlocked nodes in a tree’s layer are activatable, lower nodes in the same tree cannot be triggered anymore once a higher node has been activated.
-
-  Artifacts often have multiple trees. Layer precedence applies within each tree, but different trees operate independently. This means nodes in different trees can be activated simultaneously as long as they are the highest unlocked nodes in their respective trees.
-
-  [bold]Manual activation triggers all unlocked nodes at once and consumes durability.[/bold]
-
-  <GuideReagentEmbed Reagent="ArtifactGlue"/>
-
-  ## Triggers
-  Examples include:
-  - Examining the artifact
-  - Playing an instrument
-  - Damaging or throwing it
-  - Exposing it to gases (plasma, tritium, etc.)
-  - Changing pressure or temperature
-  - Using tools (screwdriver, multitool, crowbar, wrench)
-  - Splashing reagents (blood, water, ammonia, etc.)
-  - Killing something nearby
-
-  ## Effects
-  Effects can be:
-  - [color=green]Harmless:[/color] producing plants, animals, or junk
-  - [color=#00ccff]Helpful:[/color] charging batteries, creating instruments or money
-  - [color=red]Hazardous:[/color] anomalies, radiation, explosions, hostile fauna
-</Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml b/Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
index 19c04cfdc7..cd717511c3 100644
--- a/Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
@@ -1,51 +1,57 @@
 <Document>
-  # Xenoarchaeology
+# Xenoarchaeology
+Xenoarchaeology is a science subdepartment focused on researching and experimenting on alien artifacts.
 
-  Xenoarchaeology is a branch of Science focused on researching alien [bold]artifacts[/bold].
+At the start of each shift, the Science department will usually have access to at least two artifacts to experiment on. You can buy more by talking to the Cargo department.
 
-  Unlocking their secrets grants research points and reveals strange, potentially useful, or dangerous effects.
+By researching the unique things each artifact can do, you gain Research Points, increase the artifact's sale value, and potentially discover a useful ability or two that can help your department or the whole station!
 
-  At round start, Science usually has one or two artifacts in the lab. More can be:
-  - Ordered from [color=orange]Cargo[/color]
-  - Found by [color=orange]Salvage[/color]
-  - Assembled from [bold]fragments[/bold]
-  - Appear during certain station events
+## Artifact Nodes
+<Box>
+<GuideEntityEmbed Entity="ComplexXenoArtifact" Caption=""/>
+<GuideEntityEmbed Entity="ComplexXenoArtifactItem" Caption=""/>
+</Box>
+Artifacts consist of a randomly-generated tree of nodes. These nodes have a "[color=#a4885c]depth[/color]", representing how dangerous the node is, and the number of other nodes connected to it, called "[color=#a4885c]edges[/color]",
 
-  ## Artifacts
-  <Box>
-    <GuideEntityEmbed Entity="ComplexXenoArtifact" Caption=""/>
-    <GuideEntityEmbed Entity="ComplexXenoArtifactItem" Caption=""/>
-  </Box>
+Artifacts always start at depth zero, the root of the tree. Travelling the tree to find as many nodes as possible is the main goal of the scientists working on them. Knowledge is extracted from nodes to gain Research Points and increase the artifact's sale value.
 
-  Artifacts contain [bold]nodes[/bold] arranged in [bold]layers[/bold].
-  - Unlocking a node unlocks connected nodes on upper layers.
-  - Each node has [bold]triggers[/bold], actions that must be performed near the artifact to unlock a node.
-  - When a node is unlocked, its [bold]effect[/bold] will trigger, and the node becomes [bold][color=plum]Active[/color][/bold].
-  - Each node has [bold]durability[/bold]: the number of times it can be manually activated after being unlocked.
-  - Higher nodes are harder to reach but give more [bold]research points[/bold].
-  - Unlocking all nodes provides no special bonus, but every node yields research points.
+Each node has two components: its [color=#a4885c]stimulus[/color] and a [color=#a4885c]reaction[/color].
 
-  ## Equipment
-  <Box>
-    <GuideEntityEmbed Entity="MachineArtifactAnalyzer" Caption="Analyzer"/>
-    <GuideEntityEmbed Entity="ComputerAnalysisConsole" Caption="Analysis Console"/>
-    <GuideEntityEmbed Entity="NodeScanner" Caption="Node Scanner"/>
-  </Box>
-  - [bold]Artifact Analyzer:[/bold] Stationary device that scans artifacts, sending data to the Console.
-  - [bold][textlink="Analysis Console:" link="AnalysisConsole"][/bold] Stationary device that is used to display the node tree. Must be linked to an Analyzer with a multitool.
-  - [bold]Node Scanner:[/bold] Small hand-held device that can show the ID of the node currently being activated and whether the artifact is ready to trigger, letting scientist have minimal required knowledge for operating inside chamber near artifact and far without direct access to console.
+A stimulus is the external behavior that triggers the reaction. There's a variety of these, and higher depth nodes have more difficult to accomplish stimuli. Some stimuli will need improvisation to trigger, and you may need to talk to other departments to get everything you need.
 
-  <Box>
-    <GuideEntityEmbed Entity="CrateArtifactContainer" Caption="Artifact Container"/>
-    <GuideEntityEmbed Entity="HandheldArtifactContainer" Caption="Handheld Container"/>
-  </Box>
-  - [bold]Artifact Containers:[/bold] Safely store and transports artifacts and prevent nodes from triggering.
-  <Box>
-    <GuideEntityEmbed Entity="MachineArtifactCrusher" Caption="Crusher"/>
-  </Box>
-  - [bold]Artifact Crusher:[/bold] Crushes artifacts into fragments. Four fragments can be rebuilt into a new artifact.
-  <Box>
-    <GuideEntityEmbed Entity="ArtifactFragment" Caption="Artifact Fragment"/>
-  </Box>
-  - [bold]Artifact Fragment:[/bold] Pieces of destroyed artifacts. Four fragments can be rebuilt into a new artifact using the craft menu.
+Some reactions are instantaneous effects while others are permanent changes. Once an artifact is triggered, the reaction causes the artifact to randomly move to another node it is linked to.
+
+With some experimental science, you can begin to grasp how the different nodes of an artifact are connected, and how to move between them by repeatedly activating nodes.
+
+All non-zero-depth nodes will have exactly one edge that leads up to its parent node. All other edges a node has lead down to the next depth.
+
+## Artifact Analyzer and Analysis Console
+<Box>
+<GuideEntityEmbed Entity="MachineArtifactAnalyzer"/>
+<GuideEntityEmbed Entity="ComputerAnalysisConsole"/>
+</Box>
+The main equipment that you'll be using for Xenoarchaeology is the [color=#a4885c]artifact analyzer[/color] and the [color=#a4885c]analysis console[/color]. You can use these to create reports that contain valuable information about an artifact.
+
+To set them up, simply link them with a network configurator and set an artifact on top of the analyzer. Every station has at least one of these machines already set up.
+
+Use the console's [color=#a4885c]scan[/color] button to discover what stimulus the artifact needs and what its reaction will do. Scanning takes thirty seconds.
+
+Use the [color=#a4885c]print[/color] button to save the scan result, so you can refer to it later.
+
+Once you've discovered a new node, you can extract points from the artifact using the [color=#a4885c]Extract[/color] button.
+
+## Assembling Artifacts
+<GuideEntityEmbed Entity="ArtifactFragment" Caption="Artifact Fragment"/>
+
+It is possible to gather multiple artifact fragments and assemble them into a working artifact. You can ask for these from Salvage, who usually find these while mining asteroids or on Expeditions.
+
+## Traversal Bias
+<Box>
+  <GuideEntityEmbed Entity="MachineArtifactAnalyzer"/>
+</Box>
+Artifacts placed on top of a powered artifact analyzer are subjected to a bias which affects which node they will move to after being activated. The bias can be set in the artifact console.
+
+There are two types of biases:
+- [color=#a4885c]Up:[/color] favors nodes closer to the origin. Results in a decrease of depth.
+- [color=#a4885c]Down:[/color] favors nodes farther away from the origin. Results in an increase of depth.
 </Document>
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png
index b9d92b8047ed32441235cacd0367a8cd2f7f360b..33e36a316fad3c41d0b3f566b445fd0b4a8fcb9a 100644
GIT binary patch
literal 381
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV07_xaSW-L^LEzmyh9Emto@3u
zsh1ry_kBH8|E!)<wS;je<MQqxl{deZPJH0g%5qxP&BNo4?yhy0tv4@Z&5&sjTTsXl
z)o_e4gHeio0TuzfdA5>*hacBnU$?IGb@kTV=q2|Il-gG5d@bFZwfSz^T*c@1yb7MX
zcU}8eaKSG4*9{Z<{`}hcm0h#v^C);u|7`jDaLqiwRi}(zZ{4}Za=*u4O)0_VC4uoz
zHPcu8Jjt;B-0lBd77V%$j~TWw^fF&yGU0RJzCfJ7<gK#*e6!N!1rG~(U;Ll;-!%VR
zZOcW*B_FMSo6fA3PYhznymPM3_t`!78C&Gyi~jFtDXyup$L8UmY-<dgCC|Qo^$ZxS
N44$rjF6*2UngHv&nmPag

literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zRXklBLn`LH
zy>&3R#XzLx;Y|(Q2)#so5l8cNC+`NZh<k0&XqwYe)X{U$QMmKJ_1cz$hfh>jc>s+8
zf{JP3Zy){sdrw94*ovU8qH|ZjPMQ*Q>)Y2!v)-+=U0wb^HFDMW8aZ2oV=DxjoH%?J
zwkQ7hx3~R8;rD;-tR9zktvjo4e13CMk8gJL-JSp4-zJ^=8S0g3R~P=?^7ooTng2Qe
zUo~aUI=B2^dRFSo7c4f6tUH)@1U6VVNR!Mk^=+@Wnssyelx_DGX5_xV|LyfpxrZf;
zy9_q(4}SlhV>;J`lQaL$t=jLt!$j`>f3|YjubZ<f`;I*Zd2*G$@PaN@9r5H7AU}J$
L`njxgN@xNAbi1DC

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-left.png
index 13533d2a487572947261cc03cf9fa245e92d39c1..6180b001785aaf8bbfb1763f9c1961b63e74e54e 100644
GIT binary patch
literal 16598
zcmeI4K}!Nb6vt=XP;-+Y4I&}>3Y{~wSXmcIB7zV)gtsnX6x2Dobm<mE)S*+*p>Gf#
z^3XTv)-ebSI)xp~<_Qyn5G?B(75WdXZyjg;@4erSUf#pgwX&B?%qD~oNx$f>OPi-F
z9+j_mJ9{tEM5`sw6%XP<M4iLMTRAgcD^~V}a8h(x;__-nPR0)W)k5seo}OCBoK;Vr
zg_sw<yS#B^S^0duE>~cH00@8p2!H?xfB*=900@8p2!H?xfB*=900@L6kjv#dA-4wF
zW<oy_$aBC&-|cq5mEo3|&}RiO;W%O`n>BI@NSE}v#~7zzDxL1i(NU$R_1I`w{pwTV
z5!)7tcw8v`el_*|tS8{T+3W^M!Ez3jJn3@}Rsf%^)^B|D)HsH&qw8~M8_}TS&;4s{
zLeog{5Cs7c009sf6#`$c*EQ7(Fe))24iEqV5C8!X009sH0T2KI5C8!X009sH0TB2H
z1h}h2e<9=W!&)a)ftsl4D{b9!_+bU$dtS#>O<zx3-E;INu=NU1;#A3{piI>CRnodu
ze(0+Zwl{(G1emPp>xrv-j@|?|0K=&1>%9ZIe+6jZb{IANVfY+4SU3a$5C8!X=p~SO
hs_e?S68$eg?`I+3e@t$kZ`n6<wB0Y1-TRg8;~x<udUyZ;

delta 235
zcmV<H02Ke$fdPgBkR*Qrb5ch_0Itp)=>Px#z)3_wRCt{2+OZA8FbqUdCddi|N8tYB
zXaqq+D3yQ|s+^+|1OHX7&M+;g;h6yd000000JthM=iTz3>cG2^4j>}RPC;hQh>+*L
zlwt0^9;caEYwhuE<{D^3eCEqYPrw+%+}+fFYJL0|Lz-*q0rX?um2t=OB{FlW?}3U;
z000000000004SW=;waujKR_9_c6b$g{2fIfLDmnb-sA5m`UvudNYx&HN6|+pxdTq^
l@&B$b@QXb@-2ni=b#J=!J!Ke~p%VZA002ovPDHLkV1jIlXV(A#

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-right.png
index 57ca5d0b231f3cecfb5ef11a32b79b7058345f37..b091c82268db901f5d128d3a261a07d336aa3a75 100644
GIT binary patch
literal 16598
zcmeI4Jxc>Y5Qg^>i7{sy6G61`H`p3Ul!VI>j3Tk{qY%Nu&M(kfZ2SR&NLm#XtZgKP
z`3q_x*bA|hG%@ZJ3tJ@Fy^VJl;a#}fV|RAu-RCwbGDFUn%T6*enP7}1-C}-)_c^-a
zF@C?>-T&ZSY`f&-*%P~DG5dJ-mXD0=71s_Kvr}|g?5aA!2ZxW`#lrAsbbM@P>U!xd
z&Db<^^YfJx%gW_yHEw|h0w4eaAOHd&00JNY0w4eaAOHd&00JNY0wB<ZKsK9gcbOW9
zVH153FUo&fEidMQ+nVUp1~8Y&v`1|_@J)FMNcu>pmo-BwV{#aYMp+^rXQ?#*QF(xy
z&_^EyIt|bDx}}n<bppiZzZwmdzfk8%A3-3!x=jgy-o9wx&8B!9$X?bb>+V}D9VwG<
z*uDcBIQUOm4Yr3RAOHd&00Mdhc2+m<MJ<5d3Rr;v2!H?xfB*=900@8p2!H?xfB*=9
z00@8p2zVqARQAZPILbVsiib&lUgfjXykBwp0uW^VfT#m-9mi8GKqr{;n6g$tHWtre
z)DMU{0Llhae4RP~p|@9Wd;)^5A26u{=(TY%X9Pgb!^`=3;na^_jw8qSBbJuWFmm!?
v#MFWTBM<-q5CDOo3B0Ut9PpSW`d@%Qiv3uvT)e)Y-H<!CP|iOrY@PlB-ClS@

delta 249
zcmV<V00#fofdP~PkR*Qrb5ch_0Itp)=>Px#&PhZ;RCt{2+RY8aAPk0Kx9SSWBY6LD
z7y&T^Jt5`NhF>R<-sc?17i5uxEdl@l00000;1@G1S7-QVB;R{al;>zZ05dD9x;M=v
zRqd{V&)EZYLsgX!!c4yH4*80RNR07ywx+29>c{7tCnN5abCz)sg7j2s*By{j8p-8m
zTRt-@cmD%aPs$1a000000002+EM8rhUGHH&U}mxB%s}n^udall1E@hfX9kXK@0Euz
zTmjxQ10%iv7Snft*UZ4}W)rUH!_)f*0Ic-|(3w32r`l(^00000NkvXXu0mjfSPE<|

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
index 6474b1f2e7..c8396d7835 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites made by SeamLesss, Inhand & equipped-HAND sprites modified by Prole0 (Github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites by SeamLesss (Github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index 35ec37005f..dcacd1d743 100644
--- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -4,7 +4,7 @@
       "x": 32,
       "y": 32
     },
-    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github), long_with_bangs shaped and longbow by Futuristic (and Pyvik) for SS14, cube and baby by CoolioDudio, overeyepigtail by GovnokradZXC",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github), long_with_bangs shaped and longbow by Futuristic (and Pyvik) for SS14, cube and baby by CoolioDudio",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -814,10 +814,6 @@
       {
         "name": "longwithbangs",
         "directions": 4
-      },
-      {
-        "name": "overeyepigtail",
-        "directions": 4
       }
     ]
   }
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png
deleted file mode 100644
index c3c94ba0572f0715faff77172b56e6c813e069df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 810
zcmV+_1J(SAP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZr)Ja4^RCt{2n$POuFc8P5vb43}so>2Q5IptRH&S1-
zN3Vhxkp=|C;K4F&dPw%L#I3ISGwDBF=5rBio0<8VNlIn_EI~wN`)rf+>Idh%R}q@9
z@7O$qh)PNcm&*l4qY(@S0|<h^YAjp(d7eXAmf*TB42MH&`vV)}Qc4g)T(3zfJDZBy
zzUO)1x-NL0SIfSU0M+34`#o&8TR5N3AcW{d1Z`jAdEU+MHYs5wKsET;Z05vq?4)T5
zhzLRm;G9E}B&~>`r~ND65Yc#C;}p=r>+e+&(lmuQj$2s^f*^2qyWLIdRe5&(CyWHR
zTrLl<YY}|kw{pUi`(T9-fQWEB9*xKPWpeZBbh`QXtN6YT!{N}_0TYU%07Qf!2yR5s
z!52kgJZ59lb-iAz>2%uqR;bq)-}hlW9$y2uO+Di^;2B{UHZ{~seBXySj-8??Y6ssa
zS(bJ39<W-iu6CC5ML%zXpMc&L5fLVniFF)}r9fZUto&8JRsj7{WV7;D`C0+OFm!C*
z{QfJd3!*JwI|BgfPk(|S2!bF8f*=TjAnfU*PvBD;G=MSIn<Gt#V11nY$atRT5Qbr^
zN9|dbslnjigRIUPBmn*fFQo)2CFFSyoOAFzuhn#5j49oVpzYuLWQtXXNY%Km%uXf~
zXS3N@)#%^lcsyQv5p=IYT@kEiz<uz#I1xpWQ>RMv6Hyd7S_A;NepW>=#aMu9@R}}9
zXQL=`(liBtKQlu6VJkwdWAV1TLS7++xb_Rw6~Txs%M|BaF~(FAg$Y~q_M0S$VvH%q
zm}<RAYB^u1YTidt)LV5~r-5$I(S1ryl+2%kh^kcsHCfIV>To!;;~yegO|h;y91hB4
zJA69@q?AyWrJYwD!Z|m(|Er6mP4Kn=x<mBS$@BbaKjS0b7N9K4uP8?sMPZx<Z_($T
oZ^}3MN)QA=5ClOG1VQw{ZzWzTln_8AEC2ui07*qoM6N<$g7C9&H2?qr

diff --git a/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/hugbot.png b/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/hugbot.png
deleted file mode 100644
index 4d3dbcfa0753daa939d4cc4f3ae889fad4d02d0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 342
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|j01c^Tn!8i
z9%Lji{9xFyVZ(s~2R_W0aO1{}6$Kdy2?-wx5;`IRUKC_xI9LEdKtKRc6A-LmaQp+L
z1WSVag8!oehX1p>yXOKWw|KfZhFJ8zy>y$eS%HV`fxMQk(z);Tx2GPKU>D9W-)L{h
z`1_(l(`&^a&GM{9YG)koOb}2vSkHcendLdlF`0Hlx9ZHh-x=&)Sa<KT^4$~O7#7Zu
ztsCK7!q2jFom0#NoeQrx3)UK^FPNR-aGdkQzUk_XR~EgVa4_yOqjx)FLUL9^#q7pw
z><743bo~)su+({h(ksh`71r#FRy_aSd!&N*zmt05iR``n%k8g!ERa7p`{U!O)y$7}
V=&Lf6m97GL($m$?Wt~$(69B<wk39eY

diff --git a/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/meta.json b/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/meta.json
deleted file mode 100644
index 07ab40378d..0000000000
--- a/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-4.0",
-  "copyright": "Original sprite made by compilatron (Discord) for SS13, relicensed for SS14/Moffstation; modified by Centronias (GitHub) to have two arms",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-    "states": [
-        {
-            "name": "hugbot"
-        }
-    ]
-}
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json
index ddc468082b..a9112535f8 100644
--- a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "brain, ears, eyeball-l, eyeball-r, heart-on, heart-off, kidney-l, kidney-r, liver, lung-l, lung-r, stomach, tongue, taken from /tg/station 13 at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 | appendix, appendix-inflamed, muscle, nerve, vessel taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af | inhands by mubururu_ (github)",
+  "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af, inhands by mubururu_ (github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png
index ca3c4a5510b899b957b58ad6621d6831f74613a2..ebf1d5f5141efea3d613ee4a659f6e4f6c6b9dd7 100644
GIT binary patch
delta 175
zcmZo*-p@EeqMn7Bfq|hhB>gy$5(@AMaXoP0z)~Bl6Olg8>a)Hs>G*$QO~Tpw9Y9&e
zk|4ie28U-i(tw<3PZ!4!jfrQ^T@-9k;9<TnPtU>JA%Q`4E<*wHoqEywOtA|!`@E|K
ze;S;cpncHHA>>`<uP)oO%x9XPI0mrQnl{yb>*gv*kk#mT?Z}iB5uV}IK3g>8dXvYL
b|Ib-}v~q6D-%xoSXb*#@tDnm{r-UW|B6UT;

delta 369
zcmV-%0gnE^0e}OL7=H)`0001UdV2H#0004VQb$4nuFf3k0003xNkl<ZScUDDF;Buk
z7>1u3cSCe?chC?Pe!|&=i4`^{T;x9h6DvbqjDNtz!O4U$I<gR=gS*$XG!3iE=U@&i
z7;Sq^2&T`}e(l}+-u1mNg_4pI3q0k@R>j}%Z^hQcp3Pv17JoLw?F|&c?iz?fjSl>8
zHBY&jGqIo7KyNm80J&(L0|>z7Rm(h<?quwwnJ3jtzcHv)rP-)+c5?bT;o%VgH`jNh
zF=3s7-fZqXP2X1cSx?69hS1<CR}$YIGVVgA5SoN{Cu7H4uZsidz$XfIu?EaaC0Y=L
zS~_jD3S4r<&uXtPJUmX#DJjN)5g+zP05lu*4PhPl#LGC7cq#*)a;4K&4Ev+x!~#$`
zr~s^l`RWg;Nwov(9nUnOA8MKT(?Aqz;^py1J+ELc2DR$;emqJ_O8z|`NUn#=Y`i3Y
P00000NkvXXu0mjfSM8@^

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png
index b65261aea9709cf43c27ba1f88b1d1bfeb85e924..57f172d54fe8403a0e397a59d128e37d7f10d53a 100644
GIT binary patch
delta 296
zcmV+@0oVR%!~&2ce+h6%S#tmY4#WTe4#WYKD-Ig~008z$L_t(|ob8i64#F@Dg&&f|
z3A!P5Vd*Wpa1X8q_h9KQvanQQ;{+_whK9P-O_QR~#ZQW4<;U-fEz|R`JK?cEVtYLU
zFwLsF)#{F3Jhs|gZg#K9kzuS%i1Th0&Xa6VRX|xfh#F~Ce{fH-roFjAdKvCXpN+o!
zsrB~gJPE^|1A+YyQ2QqPird^d_jCaN)WDB~3rl_*BA0hCF%)1Zp1Tor@x&<dHi-G8
z3e1{EN`mkLq-X)p8Qp@Bc=`F>L>qiCvn@!jXaMQ={4B5v@c=$!>0T&^7a-Jh?yV1o
uelb}BGXlWMB2oYaPyhu`00mHh)d60fV`$m*fbTc}0000<MNUMnLSTY9Plf*g

delta 75
zcmX@YlsQ4gm9aR;-HBn{IhmIX3=GPiE{-7)t#8j7@-i@RFmL#|{S2eov<p%hml7uZ
fEns3`a9GZKRg3wnM}<)eP&tFAtDnm{r-UW|+9?^u

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png
index 116926929f4840945a9685c49cfbd3418b430e24..fdf7952dd871fb4979d05e775229ece70449e714 100644
GIT binary patch
delta 298
zcmV+_0oDF$(*lq&e*|YiO+f$vv5yP<VFdsH010qNS#tmY4#NNd4#NS*Z>VGd008Jo
zL_t(oN9~ib5yCJGMHLo+f|{CXU<6hpBS6U{)YKF(0r)FcaB{Na_+l!(JDrUZ^uMLJ
z`CQg#B09NfUEEzfe1NB4LAYm{<C}A?#+DO9!kp}PKK3qHe{;o~!^<t4z=PU!;$9O5
zTDorVLpo3!X!M#e&?SEDuMISMO&CDp=2wt4{|vPMhZ?LY2EwS#Ko17Sz-`Hir%>zS
z8cu!rsu{V0LgXrfSf0^35VAxkk~LBzSVCNg*2D;sEz%gbUnr?HHG=BQHV`{KNIi>@
wJ%YK#v+Jf_BrG|RM#;Bf7=~dOhVdtezR$>4DS5Xd!vFvP07*qoM6N<$g6cYfg8%>k

delta 63
zcmcc2lr_Q7QpMB7F(jh(?O8`&1_ln61+V9y3fi}|ZFWGzlcsfN+JzYy81kZYnprbV
S<`o0k3=E#GelF{r5}E)5Oct>K

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing.png
index d4d288e299f25d8251afa00f76a933a43813f283..3f88010d627ae7ab4d5ed648ec53fe75500d1daa 100644
GIT binary patch
literal 2938
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

delta 2553
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
P00000NkvXXu0mjfb|CD@

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png
index f74a94b60a5a896e245d74d1ddae82535fa9681b..a2f351482b5147599893d422d32e7422d8dbd24c 100644
GIT binary patch
delta 1129
zcmV-v1eW{30gDNcF@FSSK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#000Ca
zNkl<ZcwX(Bv2xom42I>5J&*00*=yg#dxkzhr@l<?y0t@h&v}Wio-=p!bxrj%f)1id
z3Zww?D(So9k&+qw6hJ~&OdZZ|pMP9#*DvSe>1Wq<*S@?C1%Lb*YQWo$%i*^>*W38$
zPE6tFsQoyU6VvRrtp9+<+wrd(1U^77W1Ki?Ze9NYQ8?T_bZiD#bLE;_*MFcBsQW@o
z&k|^G%}whg066h7)PU+_{u2=Td#*v6ybY+{ggym;7i)YyzgQE}<i(na9s=NlXq7~K
z4yoNu>EmnY+<%=vI2ig0Mnt}ff!KK|tJV*#08UUmlO;A*ub)am8sbEb&78hca%|@G
zl@hgy6qLP0{pClL*eYR7`g190$C&H@#G(&UpJ}l+eQ^rPHLjfw)~cTjKuJVHlse;o
z))xn0sCSgeozQy#6p_q&KM0!$0C$X5TJs4wpC3;&`F|Kz9e~_)umn#lq&w<uA^;`n
zpp=O7`8m?L3qth=F$|W<a7vwkZ5&e>F&qQg#qYl$s#7fhA*Wjgf#GXdYI56;m)rFh
z>i0v(opzM~RC2V#)1o$NDuDOV2DY8^hacW42tiHr00f+mV=6Tuo!NAt&2#sCXvL|0
z5AZME(tjD;wkRDaft%~=`FMKzdi#c*4^KEA&fj4g0AV_?1RCOWpa6HW3j*r*L&seZ
zTCD(@iNRT6fg~L$Lf1vkk6vf30Pq<{>ENpUFcbjxqv=3P-?Kw))KtLOhxf0!0>*UE
zJK|F%=M#77px4JnEGztLi(YH(6ogq=!}%Q28h_J)h4TZ~gkvfre!rRlfbfg8^F902
zM(v7)^NG1@3w>_-zaak^z}opl<k<uImT6}KA4BT8_xA&OTI%ob2Q=2--w$Z4kDGAQ
z{qbIVbNUDXPHc96zSjm+SJ9^c@M4Xx=ND^2n!H#u(F;8XAX+66pF?VQQ~LY+0rQyZ
z&wo7$2gNg4Vq^9CsT8CkPUP6k=_@72W=>xzQJeew0R?F4&!wOpW3mGfi#|wwrbP{n
z6d`@g{L<B@_I`l%@=xhoYlE2nQf-y@1FRe%(YJJd!KCBIBHu0kJs@Wg(tt{7sSP}R
ze=J~DQ~M^Ia)>omwIj|)O$G2iK^6rdcYhFp8Cy(C?FeKaKezyqp4AG-8iW$9w7E`l
z2OiR(U$g=s9)tlcwFziA?ctX$@eVxA6;M0~1zKuP$lZaboq`;dw*gLQq>XPo;tjbR
z%>Wb+LV?!W#N7_Op5z#`0<dTh3u&p%Asx~d>1wB-qCqH8RU6-6h9;mkYARst<6`w6
zSrh=RL6p!^JA!Xtq-V7P2<waHRM!p!6~|OYQo&c*8!CCqw3>k}wTaXi=Csu|=Pnt<
vQd(+r_&B7x>bs*$2BAeu?VX*Se7f!*0Gio$g{V1q00000NkvXXu0mjf`ZgA4

delta 152
zcmeC?Jjgh~u)f;U#WAE}&f8mxd<_mfEDi@ga{l{o&BDaVceXRxJMS5D?xiJZ<+C&%
zM67>t=Hhc^1_<blV|jmCyqYK5U!S3Wk?owqxC!M93;}+-<n4deK$QIGKelAGzp<X=
x_N9yW9b=1|&#aQ&@RI9M*|~?jKotu%NbibP7c5=<{Q7l}22WQ%mvv4FO#tCdJ1+nL

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png
index f4851a0ea0dd0d8e5f1d981157ba3ce9151cf5d7..ba26f190cb16705c846d33568e6f6898b8e77769 100644
GIT binary patch
delta 889
zcmV-<1BU$i0i6esF@FSSK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#0009r
zNkl<ZcwX(BJ96AG42HQ|_yp-P<Hk*H;U>3mkz2Wrixj>>CXH|5#*Jsv<pgdL|B~Qf
zIi&aypa;lrhC?k^%bx&5ELU2d{(k-Z-M!s>b5}19&bjCJ@_#xN@Mo$4KOQ*!`aQJ0
z_wi|HxP-US@%2=`FiqF8{&_ffdKw3TH}o0BNwabN^AP#lTgR>dZJsYQ8`nR7G>qaj
z^)!J7*KArJ0YJmgsRmTf=D!R=pXVB+$&UfmP3Thqc+tk!^NThiO<uIQ&_e)x5UrYs
zr^xNMDSa$MQ-9z5!NJfHjEF47K&(9%)B2$qzzK>MvZN35`g18rLYye+v*g@dO8P80
zH<xIiNI}I@)SrGtO<y%w(odzJjxxmoh(&)b=JeMXo3uuD3Q7rUPybTGrN^UX|7-wq
zjSlp|Usqo-Qde8Gb5^kbG}Vjn1`skfItVEzZ^;t-7k_^VN5oN60sI_OEVW-_6+~iq
z@BpIXMk%siG5}oY+P&TU80!CgypOa)WooiOmHpB)03xIK_{4_>!3SrVV*52x(8&G$
zbkHc7_Dcr<Ddp8&z1+FSM?7-78(uG1iXMz&`y~UwMaDsl;)L}eRN1eQf=GzOtvlYQ
z$o|!Th<_Pd`3x+vUvmZ!<{X}&$bOL-0KBUph{da)sI^}#0AOwqmYq-3*e@CYf)Atx
z$NRKyf2Y$q41Iq9*igUk57=10?+@5mAHRe*{eQf7+?+lFfQDxOpYI(5s#npc0Pv!X
zujdzSLYlm2bD<Zy8HZ@qL_9@qzfI}){Q+rI^?y^hql4mwEa}6%{#*)@5GP9dEIBuq
zl0Hk$%_Z7r-ycwcq<$&|b(AR%KrH%T?ma2i(3nHoezE-lKGNwRrLUcSwCoqzACRKf
zIl20Q{`u=_8`iL2<&ostcm{@yjXF}w$+aB*OE}_u)KmaJXIEHU1(CDy-~;T|`M^>D
zxN@Tpvp>Pw41kjlwLigP3K}`c{se0QKuS5({sc<_;7&fw{sfCDh#XDM-|f{8n)@NP
zhm{Y<@(dvQ3|ND?`z^%Yu6|%90ATi}*AATzOa*}8f!M3#JDpBvbDaAJbDi81@om6V
P00000NkvXXu0mjf<BhHx

delta 209
zcmV;?051QX2l@e!F@Lm4L_t(|obB6D3WG2V0MKUlzv~V#q5B%h5Uit;Y2G`4F-=-Q
z($>iLYOQC+tR5c#0002EqTXx&<U5*woE<!3YKXtLUW1X`A7{P{`=%A3`qA^N({{iT
z(W@OlYfHpXM@}igR`)+=Jov&!^PkqD-$kg}{hxJ6&A<Bhph|lF00026BYQr+dVBx?
z004mFt~L~PyZOPR^ZD7_4@jl}$!=SK(fRyrw=F>R`w0L5000}_6Td`$ke9?s00000
LNkvXXu0mjfMnGi&

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png
index ea36a649ace2f70a6f379ee2d75743ef2ea75099..6a122fbcfd02a8c3420543f52be2cbcde5bc5779 100644
GIT binary patch
delta 312
zcmd11!Zbmpp0mIsvY3H^?+6GpPSxg<W?*1s^K@|xshIP2vMt{s1D@92C$eql=2lBt
zFoicOU$|WI?hJ!^gUPCu-giwjxnl24)`|T2@pqE;pIvYDT}sLdOE2!o`2C_}xuezh
zTXW~toxQ4&vFgx?({@@PQ|8OayL@$2h&r{}t9p~U>>26$Q|sNTKcy#T)aP}!e@~G*
zA0y9k&fe+n+(+8)v!>q)X85;qqP#TwwLNBTLFHePEe>6{GhJWf=b7*;$p)_@Wg|@d
zr?3jLoG@gHHLhe4e);Y7)|rMa31aROVox$$d;K*oMf?(@)3IwiBPJ*~ta*9qt^m*f
qq)lvTOb*iA3?N_xCb1GZd>`04ETVPZtlV1;QsC+8=d#Wzp$P!hM0`2`

delta 80
zcmcb@ls7@ei?KM!-HBn{IhmIX3=A5cE{-7?jc?C7@-i@Ruq=2z|5VVvt!=Xd8lE(*
gJJT)<R00BdQF(h<Gpk?E{|n-Iy85}Sb4q9e0FK-o(f|Me

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json
index 09b1c5c0b5..394df8c221 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json
@@ -1,198 +1,198 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise Station 13 at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d. assembly, closed, closing, open, opening, panel_open modified by K-Dynamic (github).",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "assembly"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Paradise Station 13 at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d. assembly, closed, closing, open, opening, panel_open modified by K-Dynamic (github).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "bolted_unlit"
-    },
-    {
-      "name": "closed"
-    },
-    {
-      "name": "closed_unlit"
-    },
-    {
-      "name": "closing",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "closing_unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "deny_unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "open",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "opening",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "opening_unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "panel_closing",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "panel_open",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "panel_opening",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sparks",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sparks_broken",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sparks_damaged",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          1.7
-        ]
-      ]
-    },
-    {
-      "name": "sparks_open",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "welded"
-    },
-    {
-      "name": "emergency_unlit",
-      "delays": [
-        [
-          0.4,
-          0.4
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "assembly"
+        },
+        {
+            "name": "bolted_unlit"
+        },
+        {
+            "name": "closed"
+        },
+        {
+            "name": "closed_unlit"
+        },
+        {
+            "name": "closing",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "closing_unlit",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "deny_unlit",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "open",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "opening",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "opening_unlit",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "panel_closing",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "panel_open",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "panel_opening",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "sparks",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "sparks_broken",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "sparks_damaged",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    1.7
+                ]
+            ]
+        },
+        {
+            "name": "sparks_open",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "welded"
+        },
+        {
+            "name": "emergency_unlit",
+            "delays": [
+                [
+                    0.4,
+                    0.4
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open.png
index 0228b8af4cca67aa457f030c36d9bf2eaff2fc6c..9e38a33a3d9e2cf9896cfd159459a38fdef054d5 100644
GIT binary patch
delta 460
zcmdnVbc$tyAumh1qpu?a!^VE@KZ&dp^`h%J3p^r=85sBufiR<}hF1dv1A|0~YeY$K
zep*R+Vo@qXKw@TIiJqTph=Qq}p`L|w=BpJzHQQ1nJkvZqwHP>n999M?Mpgz!Aj=Dg
zrJ?K~AX|fx87$5OWE(OvF$e(ZC?L*kX90=VGh_idAn>V-k>Le1f=08I0Vp+roq+|Y
z(!j{rfN=rDSdf*h3&2J(OaZb%fC*?Y6If-Cr3H`$)n#a40FphECsyMX{6YrET<Gai
z?-*j?|8{bq&>;g3mxWstkF5B<f342T>9Kno-npv_$2FdL<K<OqT)EHNEHot5e%37E
z16yRPnIhlIbf|2qzbu&36xpNmj47EV`vE7<nv2yJIOpjqW%-tyF&V9o|GY&{pQ%L7
z{uRH@U#<^Vb$`r~T%a9V*L-TrnJIFz%XDvleqeIvnQiX=ro#<0_*vL5K0etMc`^E7
ks)POEZqpaa1^S<u&L$f^_1S3zj2;FCPgg&ebxsLQ0HWf6=l}o!

delta 187
zcmV;s07U=F1i1o`F_A%7f161}K~y-6?UPXs!Y~X&?PYD6GT8lZi;_*61cnPhKAYDj
zmHYsJTnzhbVIh&VwoY>a7<*d*w9cV{U~d3BXQ&BgG1&=n&QK4y#hkgu7$GOPSwz&D
z?rKDqd0hqG`xo`0buoY7r+}|%Il^m@ROKzJLaRdQF*39jdo9jwF}steI0}gEk>aF!
p+N{`0y+d9Fj8ooRLw=&p@dV9dG3CY;`(ywB002ovPDHLkV1lVfRO$c#

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening.png
index 1181882743b4272087a807015357829b64563996..f5ffa5ca8d8a3769123c5da1f27c25857c4f9524 100644
GIT binary patch
literal 3052
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

delta 2491
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
FV1hk`#mxW!

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png
index 05add9c5dc5c58f6126e5dca3c6ac04a02ecddf5..051f78f757d23fb2a2f8326c572427004c038296 100644
GIT binary patch
delta 1128
zcmV-u1eg280g4HbF@FSSK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#000CZ
zNkl<ZcwX(Bv2vU+5QaII8J9`x+HKy%y^B0Rs=SP6(j`TD*M5n#SG#t3lh)yv`I$u)
zAc<WG1K*5Bg5&hBc2_#?IGyfZzy5l>oWI>&-~Miz=G>O&u77}+t_HI0cs%`e=h{9#
zyAwm?Iks=Qaw{~OJ?meg@p}Ew8G#pYl`&47ntRv3LKIGyPmRa`YtB-0@A_9ffx0c6
zdX_*#YVKMe0l<l;t_G|p*S`ot@0S|Xlx@Iz7y1l<EY|pXez7K`DT_4&Jp{l9(aMSV
z9I^fGN*}kObAO-wL1TCeMn-PMz}Wd%Hmx6;0g|A2B1`(%y#CY@q#;gH`b@btmXtnI
zu8n21Pb@*nQ`Db+B&V+&wxmC|1RWTY9Dq>t5&7ELSBfe99NVIoAkAr)!_?qP*f8hZ
zTpK0>kRd9Mle57mCZjB!AEOVJ*l_CVEIi?m5win`9e-qqlmu9!GsRLHvOk1JoR69X
z$ZM?ewMuG}WE(W^f+&Uu4#3m_sR<Cs)WvAnpb-Gs>CNNi{0H^hp`(8tQ_wHnOBzt8
zNCJ$IY=hPefRJ;3_oRnGDB%RDF_{2{WZR&*1UVj>pIxgc7+|dgAXzqO1prIQ^WF9B
z{rAfcJb!At$8mSQD3uamK#C0-0gz61K|uX>=qM3{H6%cm4Vp_3h3NcJgO@rr6M!Vy
zkR1T;4u);iETF$e`Hm+9`!AgUl4Kh!W&kmDz#0-j!-hox2y{r{!Fh|p2MF0xnq(Um
z{T4)~zGYfFKjs_mnr%=C0Fj0i%6do51R%LKsDB2aHnkE!vIZLt4n7XY{(zR6`p5o&
z%KFFtfXe##B3AYP@m_m(`Un6{?DqfpUK_A3qR#-xVvVoo7i&VAvRE_F3;h;^XyrtF
zj@W*8rGM-Xn8#Fq?$^+ucp^*s*u4JK5~LwcQu<7}HkOn=Q?89=w9jLIKn9xnb4$>H
zF@MPc7>hobdQFS1=`Y?NFoyPWuvPs<`va!XaKI9MNv<s=^wpn;Sp{^fm^~97;|RhK
zwEzU1FOLUKFC7GF+u9PqDgdFG&=0(n6F$Ons1kq?=gV^(Y_T9rIiIW{2v%RjICwn&
z1hdZ2B;b4;v-HFSNgHUg;8;5VazM3qtAF_Tnl)_b9p4=~aBMLHAX06&iZ@8MQL_Mf
zjXA#KC8oaxtzoxH3kSc-<<KGk_+YEOTLs90uXZ`q4uEuWt=%dT40zScq16&ZN7MPG
z9siD%E{88F0r2jp*+$I*`fCc_e?w<<IV@-g9S^u1o}q6&14yZXN~Gqy<**$*{$Yq!
z5(L3HzqREHgRd5VKsMo+rKe!l5$g5JVFl;+Naq9988GME63+KD*hcM2Mdw5R$@hW!
u^8h0607^JsGIH+?JBm8rx8uDZn&v+mwA<oScj0sZ0000<MNUMnLSTaGx)con

delta 156
zcmeC;Jjyu1u)f~Y#WAE}&fD9Dd<_O13<q94Q~&e-y^M@Z>Dwe8&Sets<rq{{b*5a?
zNQghT(DMI0c?J+@(BJrybLM5`yqAK>S|$z)+WxRd^lRFt9eKf)vDS?jq@>*KfB*mL
zIuH{GI5t<*O{rJBT&&3yDk9tdzHfn7k2Ax9a#2RtXX>T?arr7BRi3VXF6*2UngE+V
BITHW?

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/assembly.png
index 953f60ef69bd021a749b7dbc69f38338b5963418..9e8954bfee9459faf822c81bc3110820c7ba80be 100644
GIT binary patch
literal 752
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCik_0(?STWo2dc_4VcC<T`5|fgmq0FDWT0A|k@r*x1L%CnO|f+kBhS($bl|
z4o6oS3T@)j)6-kZ&Mwf+mBz%Rq@)BiMrUmW&{PJok|4j}|JVQn<D~;nfGRi(JR*x3
z82Ao=Fk{xWPEMepM2TxeNpOBzNqJ&XDnmeGW?qS&pKFMMsh**pg>>et6+kuHQX@Rm
zJUz7-IDi~h1}R2X21X#u3y7tmY>@9Y7@5K1OhC3FBNKxFkd6Z4%yt&AcovWi0{hDt
z8D0Pb2}Yw?$^ev_z|Oz|RB2#jY{0kxVk*c+)&&rgrU2O>zyvgx39K^6(gMhW>M}Gi
z0Ll7fEcz*Xj_WBf8uUF~978Pp_fCF2>5u_OYbWmlw$-n%eXqZ2`y^>{-m&@f{N_sR
z3#wvbX)TDFrn>3EX;&?og~1$hOFuuAQduhEyGBrkmFxOxNrp!&nQWN+6zm@vI}|o@
zXfPb)oG?MLbNa)Bk`HDpx$M(nkT?3F`jPp;`U`Rr_QDNvMl-hUi1_Kl;ZP#JdGcG{
zL(lxg1n*xf6}@9#J$*sWnY14VooD@R3%RWwW68mFdJku*w?^=V)%WMT(so$;EFdxV
z=cI>=?pwPSSpIL`B5^cN#A*ps#;I2(=kmAT`Vhmq=y%8;Ils+}Nk#R4o|s&|d}QbG
z=Z~-Zm%M3bGib=Y&G6zzpmjj@35V-jtQ-1PecJh(Wx?Cs2Y>Sacu=y~oMFalqpIH@
t_H`d&dCF5-v6n~d@qLahd#gKY7ujzU(Uf)-Jy{3}Mo(8imvv4FO#m+5{8#`0

delta 883
zcmV-(1C0Fe1^)(+8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00TKmL_t(oh3%KWixX)W
z$3Iyj11~YVL>Mm7L9@zQ#36W@?sdvV%Uf8E0l~t?)=mVmwYBqKNFjK|6$`m54tI-#
zM8S|Ei!wztITp6K+}sOc!C1`BWM-0VChA&<Ul`tb-XG8NoqzZJz7Nl248s_cfDnSa
zzm`IKXBSM<#Pd8FjRw75FOytj7{*vii4cNZE=RlFj*a*GeUwtkWvl?`x=yuP#kOq<
zg#uDa%=M%20njuJ0LO8dMY`APW%l;=VnNE~a`;FoDHICWwoSEKMc4HSfnu>pKA)%4
z>G0(K*(sJ$jDJR>6UR?NtyZJc>5$LoDHe+p0%?PP4uTyC+9-*Tz-a{sxO4M8;Oh!t
z+ujdJ0IUchsMTtx5<I}Ry&r4A-w7cEE2UCt-ntmR<m{in++f?@=lRQxSbwQh@{izK
zAQ?Q+L}~)TH4NI%LG+3Sn#eBeAWb5Ql8k=25MpX4vVQ=s>(V}dChSbw;A<dA9`g`n
z!Kj}_$eN}}<>DKzUHCWb?0&e;jccz%du?r%xBqAhg{YK5DTS`<Se6yekM2m)NA}?0
zfEO>`C0sRVG$xjmSApJ%!H-jMEJZtx!)P>`NnF!3>h(Gq!!X9P&NPZ>?q4)_-nx0D
z)B5^>?|&B=__|_QMzDrqjI)MejJLM7xOM$iII#2j=a_x(F*7TmSq?WhHvvB<B(G%>
zQcAKy2r3ufuqytK4My!p_b>BzXC0*!LI@hsB#}TcN7r=%GV_qj<@{7!|2@O48*AY}
zyWQse>crmJ1<N`Y23Q2wb+Iff)~9J2&1Q3IZhsd1;?Z266bs!C8!>xl_srD7c@RQi
zSr&(fhy3<SoePhy@Sxk}&)c`d$~sDPse0h}T<4y@<2W(rAG`khUq?r{t{V%!bUly;
z$(&z!_7k4x@yDf0vHn0OutYtuOi9*kHnA)V(=@}rKm+A+IW{*nfn_Qo(=?}od7c;A
z!ED#}`+ZiFQnXsF)Xu*aTCEmJDPIGXN`;3{|NExFE0qdxEW+V%cxoh)c_Rou91bT0
z27|#u5@|#@ODDm3CxZ_L0|37wnzd-&@A;x!Af-gt_0+%Tp8!Q^h{YYMBOL$$002ov
JPDHLkV1kaUst^DG

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png
index b65261aea9709cf43c27ba1f88b1d1bfeb85e924..57f172d54fe8403a0e397a59d128e37d7f10d53a 100644
GIT binary patch
delta 296
zcmV+@0oVR%!~&2ce+h6%S#tmY4#WTe4#WYKD-Ig~008z$L_t(|ob8i64#F@Dg&&f|
z3A!P5Vd*Wpa1X8q_h9KQvanQQ;{+_whK9P-O_QR~#ZQW4<;U-fEz|R`JK?cEVtYLU
zFwLsF)#{F3Jhs|gZg#K9kzuS%i1Th0&Xa6VRX|xfh#F~Ce{fH-roFjAdKvCXpN+o!
zsrB~gJPE^|1A+YyQ2QqPird^d_jCaN)WDB~3rl_*BA0hCF%)1Zp1Tor@x&<dHi-G8
z3e1{EN`mkLq-X)p8Qp@Bc=`F>L>qiCvn@!jXaMQ={4B5v@c=$!>0T&^7a-Jh?yV1o
uelb}BGXlWMB2oYaPyhu`00mHh)d60fV`$m*fbTc}0000<MNUMnLSTY9Plf*g

delta 75
zcmX@YlsQ4gm9aR;-HBn{IhmIX3=GPiE{-7)t#8j7@-i@RFmL#|{S2eov<p%hml7uZ
fEns3`a9GZKRg3wnM}<)eP&tFAtDnm{r-UW|+9?^u

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed.png
index 3a55b68a2faecc49346d2ff8a4aad8be463028af..bbcd9f09adc2ddb5ae376f977352f9cacbb6cc1b 100644
GIT binary patch
literal 775
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCik_0(?STWo2dc_4VcC<hISXiHL|uN=h;|HumxH2?+@~y3#N&FK=eALuaic
z5R{gdCPzmLZQ|0?(_6~UF3`=D#>Awgq;%`<tdBs`I14-?iy0XB4uUY_j)~cCfr1hx
zt`Q}{`DrEPiAAXl0g0J;C3=3YAqu8?hI$s#nXgs=)oe?R@J#dc)MDTOa#$Ip7+Dz@
zfh;c|mWHxHe$!xN28%NR*@lcv3<5wp3Wzh?S-|31KsE^6EMsJN0Sp2djb<qWP-+4@
z0}D{4fswHR;{u4OARAd1KunqfWP<<`&|D_4${<S%APcI?(7*sB`?NN*H7RiFK42hc
zc)B=-SoqgY?k+o|z~kU3v~}ZyJJ0_Af0f6yb=zw({;ej{_jr1oTOPDzgUjSk0dk9$
z&xxIVZhCgvQhnA4)p-4MhA$fGvzNVGHmN~}#aQ5m`})*buWim>6*-XQp>D)jkT$FP
z(IT^4&oyn$egbUox9`+x*xR6BqPjC#_$iw}o#P!_4ZAmuO|zbw{bQ)%zTnZlChS0*
z*q`tE5A;+T=626hYbfFVE%C=eI@4{!UDpsptxV6gU%hr&JlMMbBKy}k6DNV}w6z~Q
z>Jl7Pc6D8N@`GPBBqv7dU$3aNz3CD6!`~k!ZLwY?XZXw8|FdYyli0h?{a+SbVY&L{
z@khxtJ}%YHsH^LbZ@>O%#iU6*4}R7#ooHk&PB?O*@&3|f@!2c;WA`w6ue?6-Hp4ts
z*T=cCw-|r8w9Q+1x5w7esPwMWob)&4;_UNxcW>TXWxIC5h2pQ%PQTVGc=k6wB_@tv
m`Ri@p0tO$}+BB0N^DgnPRg$zUnyRV|3V%;mKbLh*2~7Y2zXLe{

delta 1000
zcmV<E0~h><2J;7y8Gix*008_L?V|ty00DDSM?wIu&K&6g00XT_L_t(YiM3Y0Ya2-v
zep*W`jMm=e0^@9Kb6F+WD61(FHl&bTq%cX5;))atforc#cTKqV{)FqVQjy|{13NfZ
z9QG1SL;{(tjY7y06Qi(TVsFL+!f?Lg`NrdsEX$C42=QiT=70O%uX!`2xw$#egb)H}
zi<ENo0$igH%K$(r^?iS8YAQ|BUms86#P82$f4uie>Bzmhy4q|u5kfI3L_&y^a%*cV
z48x)*dc9tr=Vbs;==FLX;1dA2<bYD@k}mGNd;9Z7T0<b^gyT3ks}vywA*5cfr)e67
zApjf`D0JNEl7EBsw;tzw#`SRL$~rLS=#D#%!#OvC!x$UnumE5Xoz)J5AYipa`~iS%
z+W-*9agrn|Cc$apoTE320{|=>Ao`u~1EQamz<$4f))ev?9E1={_qzROX$1OEQHdGk
zK(Q1$=R6343!wu5RvHH2;o>`;13y}$_m3lpi~mY&+kZy4EI99Qp^S+B)3y1Bi|?MU
z%@3XZ1|A@X(v6dB4SpIbSf=<tRP^(#E9LRclu}}=AcQC;Wji56_oLtMBV}3V%(9Hn
zR0eh2Kq<w=stU6#JJ+nT@{TbUe*dO1yN?syotv%3Yt%i@egE0UJWDC1l$6paitvl_
zMlS>*1b-@}g@pyxAd@5+YDKfzM8#MT$MIlw*|yzox7Dzu-v@CV-@Wky^_ADR?%#Zc
z`cJ=n)FGCZme7^a1`$G%Bq<X@&;v^8^~*0^a-h~J{mJ8N*sk$PK!s9@OoQS$ju7G`
z$%xK5=e%^kb=;zjb{$2RK&!<p%c3aK!_w(=bbk)U7%HdAGzbD#J3jH<oq46NtXK49
zgpeqTc6WFG_@O=f<oeIu?q81{;boxcZQIWC94>T{G3ap|E0lk_004g<9%fml(1)Dl
z3yEGf-~D!32=V;tRow`qvyFR_jdJXCI#Cp<Kw}P!Zhx^>VRRwJn2sofKwUTgq+S0X
zqJKQLlnIQnaeB+Sl4Y4*Q70Y<A>s!|{6po8jl;#L83P>vEPRXMx{b8fYU~Z=P%azE
z(1Wg{E7%Fwb)zWS+}!j$uTrU8yYh8@=4+>0?Y!BWnw-eLOyplC-fzS7^z_luk?;G<
z%ges+SF6=L&-YG?fgXn8_V#ue0E(gr!(s5hrz7mkYOArgv%lDCtf6V1=We7zw-<9}
zcxj*)MFCi*y<QIhkOS^bB1fL*`?88VRi{(WUc43bK&her_ywa~!x%4&b6@aA+W!R#
W-!mv{a3Q7u0000<MNUMnLSTY8bMi$1

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png
index 116926929f4840945a9685c49cfbd3418b430e24..fdf7952dd871fb4979d05e775229ece70449e714 100644
GIT binary patch
delta 298
zcmV+_0oDF$(*lq&e*|YiO+f$vv5yP<VFdsH010qNS#tmY4#NNd4#NS*Z>VGd008Jo
zL_t(oN9~ib5yCJGMHLo+f|{CXU<6hpBS6U{)YKF(0r)FcaB{Na_+l!(JDrUZ^uMLJ
z`CQg#B09NfUEEzfe1NB4LAYm{<C}A?#+DO9!kp}PKK3qHe{;o~!^<t4z=PU!;$9O5
zTDorVLpo3!X!M#e&?SEDuMISMO&CDp=2wt4{|vPMhZ?LY2EwS#Ko17Sz-`Hir%>zS
z8cu!rsu{V0LgXrfSf0^35VAxkk~LBzSVCNg*2D;sEz%gbUnr?HHG=BQHV`{KNIi>@
wJ%YK#v+Jf_BrG|RM#;Bf7=~dOhVdtezR$>4DS5Xd!vFvP07*qoM6N<$g6cYfg8%>k

delta 63
zcmcc2lr_Q7QpMB7F(jh(?O8`&1_ln61+V9y3fi}|ZFWGzlcsfN+JzYy81kZYnprbV
S<`o0k3=E#GelF{r5}E)5Oct>K

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing.png
index 8f654457325c9d337e2cfda1ce9c61e241828d70..11aa3300fad3bec0ddea3c77647a890d5d2d6349 100644
GIT binary patch
literal 1643
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

literal 2738
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

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png
index f74a94b60a5a896e245d74d1ddae82535fa9681b..a2f351482b5147599893d422d32e7422d8dbd24c 100644
GIT binary patch
delta 1129
zcmV-v1eW{30gDNcF@FSSK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#000Ca
zNkl<ZcwX(Bv2xom42I>5J&*00*=yg#dxkzhr@l<?y0t@h&v}Wio-=p!bxrj%f)1id
z3Zww?D(So9k&+qw6hJ~&OdZZ|pMP9#*DvSe>1Wq<*S@?C1%Lb*YQWo$%i*^>*W38$
zPE6tFsQoyU6VvRrtp9+<+wrd(1U^77W1Ki?Ze9NYQ8?T_bZiD#bLE;_*MFcBsQW@o
z&k|^G%}whg066h7)PU+_{u2=Td#*v6ybY+{ggym;7i)YyzgQE}<i(na9s=NlXq7~K
z4yoNu>EmnY+<%=vI2ig0Mnt}ff!KK|tJV*#08UUmlO;A*ub)am8sbEb&78hca%|@G
zl@hgy6qLP0{pClL*eYR7`g190$C&H@#G(&UpJ}l+eQ^rPHLjfw)~cTjKuJVHlse;o
z))xn0sCSgeozQy#6p_q&KM0!$0C$X5TJs4wpC3;&`F|Kz9e~_)umn#lq&w<uA^;`n
zpp=O7`8m?L3qth=F$|W<a7vwkZ5&e>F&qQg#qYl$s#7fhA*Wjgf#GXdYI56;m)rFh
z>i0v(opzM~RC2V#)1o$NDuDOV2DY8^hacW42tiHr00f+mV=6Tuo!NAt&2#sCXvL|0
z5AZME(tjD;wkRDaft%~=`FMKzdi#c*4^KEA&fj4g0AV_?1RCOWpa6HW3j*r*L&seZ
zTCD(@iNRT6fg~L$Lf1vkk6vf30Pq<{>ENpUFcbjxqv=3P-?Kw))KtLOhxf0!0>*UE
zJK|F%=M#77px4JnEGztLi(YH(6ogq=!}%Q28h_J)h4TZ~gkvfre!rRlfbfg8^F902
zM(v7)^NG1@3w>_-zaak^z}opl<k<uImT6}KA4BT8_xA&OTI%ob2Q=2--w$Z4kDGAQ
z{qbIVbNUDXPHc96zSjm+SJ9^c@M4Xx=ND^2n!H#u(F;8XAX+66pF?VQQ~LY+0rQyZ
z&wo7$2gNg4Vq^9CsT8CkPUP6k=_@72W=>xzQJeew0R?F4&!wOpW3mGfi#|wwrbP{n
z6d`@g{L<B@_I`l%@=xhoYlE2nQf-y@1FRe%(YJJd!KCBIBHu0kJs@Wg(tt{7sSP}R
ze=J~DQ~M^Ia)>omwIj|)O$G2iK^6rdcYhFp8Cy(C?FeKaKezyqp4AG-8iW$9w7E`l
z2OiR(U$g=s9)tlcwFziA?ctX$@eVxA6;M0~1zKuP$lZaboq`;dw*gLQq>XPo;tjbR
z%>Wb+LV?!W#N7_Op5z#`0<dTh3u&p%Asx~d>1wB-qCqH8RU6-6h9;mkYARst<6`w6
zSrh=RL6p!^JA!Xtq-V7P2<waHRM!p!6~|OYQo&c*8!CCqw3>k}wTaXi=Csu|=Pnt<
vQd(+r_&B7x>bs*$2BAeu?VX*Se7f!*0Gio$g{V1q00000NkvXXu0mjf`ZgA4

delta 152
zcmeC?Jjgh~u)f;U#WAE}&f8mxd<_mfEDi@ga{l{o&BDaVceXRxJMS5D?xiJZ<+C&%
zM67>t=Hhc^1_<blV|jmCyqYK5U!S3Wk?owqxC!M93;}+-<n4deK$QIGKelAGzp<X=
x_N9yW9b=1|&#aQ&@RI9M*|~?jKotu%NbibP7c5=<{Q7l}22WQ%mvv4FO#tCdJ1+nL

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png
index f4851a0ea0dd0d8e5f1d981157ba3ce9151cf5d7..ba26f190cb16705c846d33568e6f6898b8e77769 100644
GIT binary patch
delta 889
zcmV-<1BU$i0i6esF@FSSK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#0009r
zNkl<ZcwX(BJ96AG42HQ|_yp-P<Hk*H;U>3mkz2Wrixj>>CXH|5#*Jsv<pgdL|B~Qf
zIi&aypa;lrhC?k^%bx&5ELU2d{(k-Z-M!s>b5}19&bjCJ@_#xN@Mo$4KOQ*!`aQJ0
z_wi|HxP-US@%2=`FiqF8{&_ffdKw3TH}o0BNwabN^AP#lTgR>dZJsYQ8`nR7G>qaj
z^)!J7*KArJ0YJmgsRmTf=D!R=pXVB+$&UfmP3Thqc+tk!^NThiO<uIQ&_e)x5UrYs
zr^xNMDSa$MQ-9z5!NJfHjEF47K&(9%)B2$qzzK>MvZN35`g18rLYye+v*g@dO8P80
zH<xIiNI}I@)SrGtO<y%w(odzJjxxmoh(&)b=JeMXo3uuD3Q7rUPybTGrN^UX|7-wq
zjSlp|Usqo-Qde8Gb5^kbG}Vjn1`skfItVEzZ^;t-7k_^VN5oN60sI_OEVW-_6+~iq
z@BpIXMk%siG5}oY+P&TU80!CgypOa)WooiOmHpB)03xIK_{4_>!3SrVV*52x(8&G$
zbkHc7_Dcr<Ddp8&z1+FSM?7-78(uG1iXMz&`y~UwMaDsl;)L}eRN1eQf=GzOtvlYQ
z$o|!Th<_Pd`3x+vUvmZ!<{X}&$bOL-0KBUph{da)sI^}#0AOwqmYq-3*e@CYf)Atx
z$NRKyf2Y$q41Iq9*igUk57=10?+@5mAHRe*{eQf7+?+lFfQDxOpYI(5s#npc0Pv!X
zujdzSLYlm2bD<Zy8HZ@qL_9@qzfI}){Q+rI^?y^hql4mwEa}6%{#*)@5GP9dEIBuq
zl0Hk$%_Z7r-ycwcq<$&|b(AR%KrH%T?ma2i(3nHoezE-lKGNwRrLUcSwCoqzACRKf
zIl20Q{`u=_8`iL2<&ostcm{@yjXF}w$+aB*OE}_u)KmaJXIEHU1(CDy-~;T|`M^>D
zxN@Tpvp>Pw41kjlwLigP3K}`c{se0QKuS5({sc<_;7&fw{sfCDh#XDM-|f{8n)@NP
zhm{Y<@(dvQ3|ND?`z^%Yu6|%90ATi}*AATzOa*}8f!M3#JDpBvbDaAJbDi81@om6V
P00000NkvXXu0mjf<BhHx

delta 209
zcmV;?051QX2l@e!F@Lm4L_t(|obB6D3WG2V0MKUlzv~V#q5B%h5Uit;Y2G`4F-=-Q
z($>iLYOQC+tR5c#0002EqTXx&<U5*woE<!3YKXtLUW1X`A7{P{`=%A3`qA^N({{iT
z(W@OlYfHpXM@}igR`)+=Jov&!^PkqD-$kg}{hxJ6&A<Bhph|lF00026BYQr+dVBx?
z004mFt~L~PyZOPR^ZD7_4@jl}$!=SK(fRyrw=F>R`w0L5000}_6Td`$ke9?s00000
LNkvXXu0mjfMnGi&

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png
index ea36a649ace2f70a6f379ee2d75743ef2ea75099..6a122fbcfd02a8c3420543f52be2cbcde5bc5779 100644
GIT binary patch
delta 312
zcmd11!Zbmpp0mIsvY3H^?+6GpPSxg<W?*1s^K@|xshIP2vMt{s1D@92C$eql=2lBt
zFoicOU$|WI?hJ!^gUPCu-giwjxnl24)`|T2@pqE;pIvYDT}sLdOE2!o`2C_}xuezh
zTXW~toxQ4&vFgx?({@@PQ|8OayL@$2h&r{}t9p~U>>26$Q|sNTKcy#T)aP}!e@~G*
zA0y9k&fe+n+(+8)v!>q)X85;qqP#TwwLNBTLFHePEe>6{GhJWf=b7*;$p)_@Wg|@d
zr?3jLoG@gHHLhe4e);Y7)|rMa31aROVox$$d;K*oMf?(@)3IwiBPJ*~ta*9qt^m*f
qq)lvTOb*iA3?N_xCb1GZd>`04ETVPZtlV1;QsC+8=d#Wzp$P!hM0`2`

delta 80
zcmcb@ls7@ei?KM!-HBn{IhmIX3=A5cE{-7?jc?C7@-i@Ruq=2z|5VVvt!=Xd8lE(*
gJJT)<R00BdQF(h<Gpk?E{|n-Iy85}Sb4q9e0FK-o(f|Me

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json
index de3724e657..394df8c221 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json
@@ -1,198 +1,198 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d. Modified by Hyenh",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "assembly"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Paradise Station 13 at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d. assembly, closed, closing, open, opening, panel_open modified by K-Dynamic (github).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "bolted_unlit"
-    },
-    {
-      "name": "closed"
-    },
-    {
-      "name": "closed_unlit"
-    },
-    {
-      "name": "closing",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "closing_unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "deny_unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "open",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "opening",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "opening_unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "panel_closing",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "panel_open",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "panel_opening",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sparks",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sparks_broken",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sparks_damaged",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          1.7
-        ]
-      ]
-    },
-    {
-      "name": "sparks_open",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "welded"
-    },
-    {
-      "name": "emergency_unlit",
-      "delays": [
-        [
-          0.4,
-          0.4
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "assembly"
+        },
+        {
+            "name": "bolted_unlit"
+        },
+        {
+            "name": "closed"
+        },
+        {
+            "name": "closed_unlit"
+        },
+        {
+            "name": "closing",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "closing_unlit",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "deny_unlit",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "open",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "opening",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "opening_unlit",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "panel_closing",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "panel_open",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "panel_opening",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "sparks",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "sparks_broken",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "sparks_damaged",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    1.7
+                ]
+            ]
+        },
+        {
+            "name": "sparks_open",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "welded"
+        },
+        {
+            "name": "emergency_unlit",
+            "delays": [
+                [
+                    0.4,
+                    0.4
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open.png
index 16e4017e9ce327f0bad7e9a45b17c092d7f848b2..8a5b20078cfca4d502b4fc367a624445ecdb7f00 100644
GIT binary patch
literal 593
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijK0(?STWo2dc_4VcC<nr?JjE#+be0)MeLXwh_A|fJ6OG_Oc9Xo3skFGSF
z+3T=vz70^5-UZi*KuVw_$S?RmDqwh^94iTw<1FxqEM{QfI|#yzJ0@no1qw=(xJHx&
z=ckpFCl;kL1SDqWmFW4ohA5co8R}U`XTDkiRI@EL!ZXd&Q;UHE$YEuWVq|4t1hTw<
zSQ^R(`BH<C87$5OWE(OvF$e(ZC?L*kX90_60ofpMvy7491u!sRG@7LhK&c7r3@kvE
z21dpPj0+&9f^1}605NF_kPQM%Ky#VEDuXO7fGnskLjwbl?9<xJ)}+9x`+&?9o-U3d
z7XEK12l5>@;BZddVtQfS?*F;zm%Jv2ZR5`Q*P--hk^m?7(kkQ1J>Ge%o}Mz%@8T<n
zeb&kF*P*0g;)B24X%)|vC#gwCT;3&~FflSW=eF%Fu{%xb-tX=TFIDRM8@Ol1g5uwS
z^$#wrXNX_E^jhtG?p;AlKME|i6qqy|Za8&!mg6^_{VMYkWqu3J5p!73WW4D5&ohrZ
o?s4R^OPufj5GH+Bea$N+|70#B;{$&~bU^O+boFyt=akR{05USO&;S4c

delta 548
zcmV+<0^9x31hNE>8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00HbtL_t(oh3%IytJ+W)
zhM!!7z#-&Hgg}N+=;ClD(Jh0Mx^)iy1BLq&I&`>0e?p;4$KocGF6tyULkDrW!KL6}
zAtj&`kpo$3hv-4CTxc=Sp?S71=bXGR=i|Wl8ouxEd4v#xUVpF0U@%~{S{aYm{}$i(
z_d*DiQWt9#0M~W#JP+HpiQ|}Nvw5xN1&v07#bSY!lI?a&k|d;Q$_;QP-tBe)Fio>?
z6YX}JIF7Mx8_)9qasx+k$8i8qO40B43%mXx2oOSGnkJ6pXcO8%9LKzTk&9<phU>c5
z>YgElz_Kh|AAd~%RD=+`dwm1^q*}e@+Ygg0%L+B1ltL+m>$<dBE&c!DaENjG3W6Ze
zhoUGdqy><-;j|9JP@6EG+E|qMpBO4BDJdx_Dfz!K{>2b-s#AG?|4eUs^@fW{rKric
z)9C>Dd>BQM)-me!`u@Yc0N~;KEnnm3D5VfWFdmN!AAij)%VM|N0r}i{qm<(A?JvGO
zROx><sMTsb6{D_Yxm;qJCYEI}o6S&4<+(sg$;VHd!UazeLeOfpSg+SiCKIHTz#*7y
zw_Bu?Y&N-xL!Sz}{xA%6J)6yRKGX)1B+({DqtUgR7aTLdXf!$tr*KHeX_}IzsXj2D
m&kHvZMI8}JDW=ou+4tX1ec+Hk<Z1T+0000<MNUMnLSTaDKn1D*

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening.png
index 2509cf1a3be092c3783f74174851381f1994bad4..bbfed3b3a45fcb568ff764e1ac6f69a461709369 100644
GIT binary patch
literal 1639
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

literal 2686
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

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png
index 05add9c5dc5c58f6126e5dca3c6ac04a02ecddf5..051f78f757d23fb2a2f8326c572427004c038296 100644
GIT binary patch
delta 1128
zcmV-u1eg280g4HbF@FSSK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#000CZ
zNkl<ZcwX(Bv2vU+5QaII8J9`x+HKy%y^B0Rs=SP6(j`TD*M5n#SG#t3lh)yv`I$u)
zAc<WG1K*5Bg5&hBc2_#?IGyfZzy5l>oWI>&-~Miz=G>O&u77}+t_HI0cs%`e=h{9#
zyAwm?Iks=Qaw{~OJ?meg@p}Ew8G#pYl`&47ntRv3LKIGyPmRa`YtB-0@A_9ffx0c6
zdX_*#YVKMe0l<l;t_G|p*S`ot@0S|Xlx@Iz7y1l<EY|pXez7K`DT_4&Jp{l9(aMSV
z9I^fGN*}kObAO-wL1TCeMn-PMz}Wd%Hmx6;0g|A2B1`(%y#CY@q#;gH`b@btmXtnI
zu8n21Pb@*nQ`Db+B&V+&wxmC|1RWTY9Dq>t5&7ELSBfe99NVIoAkAr)!_?qP*f8hZ
zTpK0>kRd9Mle57mCZjB!AEOVJ*l_CVEIi?m5win`9e-qqlmu9!GsRLHvOk1JoR69X
z$ZM?ewMuG}WE(W^f+&Uu4#3m_sR<Cs)WvAnpb-Gs>CNNi{0H^hp`(8tQ_wHnOBzt8
zNCJ$IY=hPefRJ;3_oRnGDB%RDF_{2{WZR&*1UVj>pIxgc7+|dgAXzqO1prIQ^WF9B
z{rAfcJb!At$8mSQD3uamK#C0-0gz61K|uX>=qM3{H6%cm4Vp_3h3NcJgO@rr6M!Vy
zkR1T;4u);iETF$e`Hm+9`!AgUl4Kh!W&kmDz#0-j!-hox2y{r{!Fh|p2MF0xnq(Um
z{T4)~zGYfFKjs_mnr%=C0Fj0i%6do51R%LKsDB2aHnkE!vIZLt4n7XY{(zR6`p5o&
z%KFFtfXe##B3AYP@m_m(`Un6{?DqfpUK_A3qR#-xVvVoo7i&VAvRE_F3;h;^XyrtF
zj@W*8rGM-Xn8#Fq?$^+ucp^*s*u4JK5~LwcQu<7}HkOn=Q?89=w9jLIKn9xnb4$>H
zF@MPc7>hobdQFS1=`Y?NFoyPWuvPs<`va!XaKI9MNv<s=^wpn;Sp{^fm^~97;|RhK
zwEzU1FOLUKFC7GF+u9PqDgdFG&=0(n6F$Ons1kq?=gV^(Y_T9rIiIW{2v%RjICwn&
z1hdZ2B;b4;v-HFSNgHUg;8;5VazM3qtAF_Tnl)_b9p4=~aBMLHAX06&iZ@8MQL_Mf
zjXA#KC8oaxtzoxH3kSc-<<KGk_+YEOTLs90uXZ`q4uEuWt=%dT40zScq16&ZN7MPG
z9siD%E{88F0r2jp*+$I*`fCc_e?w<<IV@-g9S^u1o}q6&14yZXN~Gqy<**$*{$Yq!
z5(L3HzqREHgRd5VKsMo+rKe!l5$g5JVFl;+Naq9988GME63+KD*hcM2Mdw5R$@hW!
u^8h0607^JsGIH+?JBm8rx8uDZn&v+mwA<oScj0sZ0000<MNUMnLSTaGx)con

delta 156
zcmeC;Jjyu1u)f~Y#WAE}&fD9Dd<_O13<q94Q~&e-y^M@Z>Dwe8&Sets<rq{{b*5a?
zNQghT(DMI0c?J+@(BJrybLM5`yqAK>S|$z)+WxRd^lRFt9eKf)vDS?jq@>*KfB*mL
zIuH{GI5t<*O{rJBT&&3yDk9tdzHfn7k2Ax9a#2RtXX>T?arr7BRi3VXF6*2UngE+V
BITHW?

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_open.png
index bd90e262c86787feb40809704fb7d22a2e538ef2..cf917e3e00e5b6c8d45be78914722a22c26db50c 100644
GIT binary patch
literal 514
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCilo1AIbU9UUD@OH0jlb@TG_R&8L{H)OGtlQT9pwq{|8h=}mx;Yna;2db6n
z?e_svyd^<?!T*r}gY65YHlPG&fk$L90|Va?5N4dJ%_j{MlqhkHC<)F_D=AMbN@WO0
z%*-p%^K%VRFx4~EvyjewwF0PSTWW-7ny0500|$`9${@wa%D@O@c>%FBlnwHk1|u_A
zoC(M_WMpCx0Mb!FoY~F-7S95*L4c>6k>Ld}0AMtlr3^r+3G56kK$QkY#s-WFAf|$B
zWL*F;X$p`H0!%=2nZPQ8EG>X6s4hbT1CZ>R{lARkJ3<10%v4Vo#}Etuw|(Ax2NXD1
z|2l~Nepi1l>&P<hEuNF#$%uV8)bilNAu+4y7d3)&@_Skpe_Z%5i$^g?VVU#f(ne-u
zb>D0JPhPd!O!~&IdEJYfae`6=*M#7%zHJwH=BhCrtJAvkM~^}LvzlJhk{g90Aj>^n
L{an^LB{Ts5D-D5>

delta 138
zcmZo-*}*tLl7o$bfuXpn>dQn$g>udUkH}&M2EHR8%s5q>PZ}uc>*?Yc65;;#{6^jb
z1{^MdlWOlMF8vnZb1-G4E$>ui#k2#O|FZj5`*8r(GCbI_dehN4#jCUKy}P$-?wK6>
o<TtBcuFDY={Iu@s|DXMxHNJazeLWs|-vKH1boFyt=akR{08$1wT>t<8

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/assembly.png
deleted file mode 100644
index 65ca749e5c94a406a2bd7cc628f63aeec00ccd73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 871
zcmV-t1DO1YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&AxT6*R9J=WSI=t`K@|R){gE;>WXU3pwGUcii69Xd7QFQ6q5p{givNNXJ$m!#
zB?l=LJO<hbh3=&h<{)AwZrHGpU7Pi=o#|%X{HU$D=m!ItnfK;>GxPT4n>8Xzkb`Ae
z*#F|G{?XPhhzR|DA3_Ll&e!rjM3mUJ4aOK4W8j>_G|ed+-}m!w&}G0%rJ@`)O#?Fx
zWh56e3<Hki06>x_an(-@!%#k&rcDK7jDd&{h9QC=fbaV$fo$->V1T{7Jyet54h8@a
zhGF5jL>$Lc0rLbn=O7|=BBkuaU@(}w_-$}-eu{(hQ`oi*&bcC|16WD$_M@j$zd7ds
zfRbfdux<OV1<ykgv27ccWu;fJilFie@>mH0NkS626@h$a=OI7CEQ)q6q2DBU9LG30
zIhk9CiU?$PE^|N;h@uEV5FiKwH5dc|zQ#XQKZ>HI2xf!JbtT?CXvoE<Y;+<*x7)?`
z_O_bX+}y;I;WyR4|DB^fV|Q7^ajXgv5uscz&$S<q$I!zt#QOR=#^bS?@H`JMaqUcx
z9xkkavJ?Y=5CQ<uY&Pfmc%BEHb6$9-IjFik&$eK$xSlVu)_?pvSOd}`GSBEH$&y`b
zkslEyIuRv}MgwPOXKKQ69PD>Kss8H%f{SF?73OY?h@dx{O?10mRI61rF_}zoZ(~FC
zUyKCaHy#5>i;euwi(nXrBCx0q07&aVy<W$~#f2KI)oS?s<61x-ZS8`p)rG}K61=>;
zgzLIf#jRW}qtof2-|wrjD2h;$;?Xb+)uJc@GY!?U>NczSX2Eq`2qEzH`5PP`ALH5K
zA%qZUwOY_LO*PXruQg$o0Amc*BvDNw48ysy+;JTBf6?ppFu79pALAIkUJs+uNXd42
zO?N6t@>f)QRmW&F!iSxmnLant1Iwb*>A-bev|24SCUamV1T;-UyWK{mQdwxL`@X-l
z;J8Z&ArOXPngc|HTCKLy;PQ1;0@CDJ6$u$!CaexXX*bF0Pr(?&a5!8lxQwX-=_4`w
xbT&=1P?TnC{H)ipd}ZZDDUhDD=Xq0OzW|jCkxXOfNe=)3002ovPDHLkV1j?-keC1f

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/bolted_unlit.png
deleted file mode 100644
index b65261aea9709cf43c27ba1f88b1d1bfeb85e924..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}%APKcArY-_
z&l>VFFmNz$___TIquI0zQW=*LCjBj7VqkDs&U{si`Kw2TQ3_BwgQu&X%Q~loCIB9<
B9U}k$

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed.png
deleted file mode 100644
index b67f2ac91f5024a4f88aed57503447805cda64fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 400
zcmV;B0dM|^P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw00001b5ch_0Itp)
z=>Px#JWxzjMF0Q*Gcz+xOiWr@T0=ugOG{ByR9Y}FHd<O>5fK+bK|ytOb#88MVq#(v
zvI;IPE~N(t5Q_?C0s<l;BCvqK+yDRp0!c(cR5*=|lgk#vAP7VyJ4jM&{QrOLpd|6p
z*v{#~$~{702y9AUl|zA*#EueUBqF9;Nk{=8PI$wBSOCc?1OUW|Q_$l$>;mzmra}NH
zaV7w`T=1gi1cl&`?9IST$bdV!04EF(<pHpIj4%Kf0}%5M|0e)Vft+FrJf>KF)nJVp
zQX~yw>?D-L`(V?oXR)}%0b<vA6qgwx<Wc*$8>$?K6v!dBs49|5kp`^Wwykm(>7QA~
z4Pf108u#s?lf2L>Z#`sx0tA4SGy%MZ381H~{{<S$)xc@F#<UgSroC)`eP(C-ZgH%W
u-Qu*XmkrUbo-Z$zc)h*8yxsb9xBefTCL{_Y4^$NZ0000<MNUMnLSTaBJDf8B

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed_unlit.png
deleted file mode 100644
index 116926929f4840945a9685c49cfbd3418b430e24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}DxNNmArY-_
z&pPrlFmSLecs>7A(7vs0vjZBQG_5<+E(}zX7p2q8nrSkx7|3Q|@O1TaS?83{1OQky
B9nJs%

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing.png
deleted file mode 100644
index d7e02df93fe790fbf716ab117b9702727684346b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2613
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
XOAUXgW98o800000NkvXXu0mjfsr>x~

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing_unlit.png
deleted file mode 100644
index f74a94b60a5a896e245d74d1ddae82535fa9681b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTN?DaPU;cPEB*=VV?2In|ynjv*Cu
z-riE=YjEIUaX9di^WT4K7A8)<vz^J_dC!=0FD*$cpQZ62V*QIV7oRf&wSYix9LxLD
z;?+Fa{`w64i)`l<#!V<^U<mNrC2#+$2BPFg|FI>j{f+e`w=Z41?-*O$d}fvGhL>EA
h%FaFH1*%xEL3&rTdg<!t*RO-rd%F6$taD0e0s#F-L3{uJ

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/deny_unlit.png
deleted file mode 100644
index f4851a0ea0dd0d8e5f1d981157ba3ce9151cf5d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTN?DaPU;cPEB*=VV?2Ia@qk978JR
zyuBUB)oj4Sa3Ssc{?~j43x7+U5LmN#QszDD21DN{$4l2ve9u~&er%1LJWvnAjz#yf
z|39&wRX<18CMm09|Ms}%iFf4F_woE*Cc5C)#m}oRmmLtgxLVde+xtj>yPxKPu<!Qi
zHa`xzeV%`9(S6qyxBkvA^*Fo#*Y^cg|A5AAP_DMyS5*Ttx#96TGm+BWKMyYc{PX4=
uevf4gC-b5kF8=(Jvt8HW>u*kw8tHq&`(5fLOh4iY;(5CIxvX<aXaWFi?P|;b

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/emergency_unlit.png
deleted file mode 100644
index ea36a649ace2f70a6f379ee2d75743ef2ea75099..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 110
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2IU1fWjv*P1
zZ_hgNGB9wkEO<TtRM5VyZL<R!o;0mH(=H5D0s?tad3#tht6$Im3*vdY`njxgN@xNA
D*!3U>

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/meta.json
deleted file mode 100644
index aff7c8e57a..0000000000
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/meta.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Hyenh",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "assembly"
-    },
-    {
-      "name": "bolted_unlit"
-    },
-    {
-      "name": "closed"
-    },
-    {
-      "name": "closed_unlit"
-    },
-    {
-      "name": "closing",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "closing_unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "deny_unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "open",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "opening",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "opening_unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "panel_closing",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "panel_open",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "panel_opening",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sparks",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sparks_broken",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sparks_damaged",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          1.7
-        ]
-      ]
-    },
-    {
-      "name": "sparks_open",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "welded"
-    },
-    {
-      "name": "emergency_unlit",
-      "delays": [
-        [
-          0.4,
-          0.4
-        ]
-      ]
-    }
-  ]
-}
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/open.png
deleted file mode 100644
index c56c1f88908ce40084bc41f8a1dd598c46bdf815..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 528
zcmV+r0`L8aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$%1J~)R9J=WmqBXVKoo{Q7fHrLj9l!38+eP*f(u<4bO4ikc$rJ&0J%hO;clu;
z@WyMewaQ{3n<9`=JH--4T{s#`i4Aol=%V^|(wou$YaRpd?}$jjGsfdFzV8!75nAic
z^ZL1nNHH7^iR1W1%>ft;2K4)Vlu~G|U#oW#r4%B9F@`ivNs?r5peimRY&IK|QfGa9
zxm=z+srh`4>$;3aBdY-%43y%Y=K+xCIqUWMtmB`}W-nR^hvRo$7XZ)mY9`(QXsx+^
zd?3rRKh-;nQXC-5GHU|Bx$SJ>*B0Imc>i7Vt>U&R@;oQca{xqyZntY|&RubMkWU{m
z#xyGa)W!m^w_q}v*m|wU)hpS=^*hC}tKZVn($dn>^8eEL7eh!@$GQ1=2n%11Oe#$V
zlgg-Xb)0t>7k1&zkC?9?J_Gwf@>r7jTU^(*2C6fmb60dxN^$-8!2RVF;`@ycrm+8^
z-EKz^1Z=lk!Z5@bv(E)0!u{oy4JPG=rU`<8IF1R!upUf|F^Gr_CdL@zIBu-})9KV^
zjn!&p^C3Ki(=<)X#b~YR^?I+>tx<|C7K>UqwFZ(TAxRRup=kqEBT*F9-u(u3G|`9w
S$zNsw0000<MNUMnLSTZA74wMz

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening.png
deleted file mode 100644
index 2932611c4e16d1b2a8f5e17e44bf18fb04e83f12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2547
zcmV<P2@Lj$P)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*00001b5ch_0Itp)
z=>Px;tw}^dRCt{2T;FRO*%kh5&B*q2ZMhyVvUfAo#w%nnu46FtWgkN5Lmmr#40+7o
z(3d{%zfhL;v4z6El;p*RHn^cCPz;U}0#OZdL9mjrN3|^Z*7hWEAH3)K&effnJHMnY
z@dv`vXlA~nbIv_8bMALN;yBI~Bv_UuZ^{IWF|Ga1&(Hb$m6a9TfAvrPd2{(LJkNt^
znyA<7a2yAo=Y^inG);J(hi0=Gi$99HUayZhj&r4JL%m+_+in2B^z<|)CnsT97V7mn
z+U+*qAxj4Ufa5q|jG^1@;^gE6Dt>Z6sZ@et82J3N&-l3>ynV@S0Kjblf)j@^2GcZQ
zS(Y}x4mUy91{J>nz(+ncHN^vvwF9Q6rg+c*a0iI|wr!)`ZlhExq0wkyVqyZX{&T|5
z_3Vp9IF^Ou<6|E`9bYUK`}oV{G8kj9Z99@b4!0bDC>sFu@f+kgay~gT4+p4%AoAO`
zje~;&&TX0|3WWl!qRIEA^P8rL_4Re^?d@@!i^U=eg+d>HtJMk&g2*pAUxypORlQyx
z0dS>jgB*lW+Ca_^asa(#BV5<zqk+ifSF6?HqeBb=ft(KjYinzqn*v+9y5cVpbWIUU
zf@N8KFWCkPg3O<Un-Iqak>9W^%a{3UYioG%;zgekDg-$|wV#-U6a)gjw=4^-R*Q3|
z#e=sm0bF0VWE+T+etXv3Q8p0wsJL?;4tVhPr7{aehz=+e3Yl?lF5kuG@?E73#E}Pg
z92-XSGD6n@K=cSoi_PV`ediW$BJ$*pvSD-(Mua&aFHqpA1PlW@HjD;-GXV0uA&$Tw
zs|~pYK!-dn#5*e)QJiVZtXwIQ+F)d1L=ZWZo*;77dtG>*hrPW$*tV@aUJSg-4l03Z
zxTzJ9#s(v;5osMDzQ4S@M7P^Tx7+34b-P_Oy!ZU`<>jUCJR&z8Px$W3B|1sq@oBiT
zu)#=cL|O+B7-Mi82mAZ`xO3+Y-(D`4@$*iLf1W?8V^ava=Xt(9)7aRU^8AF0iwnGe
z|K7JPDK{aF4I|ZR^-6pg+27wssZ`=SFDxwJ*Z+FOKOgmaycg7LHu)1QJ@M(1pPilI
z^z;+}d=G-Ej-d!@W&wcfx_#eQtJTosYqc7GFF%CF<^G`!0lA|b#|GaufH8*g@o`*S
zT=;hW1~*Q1mcQ~nhLaQMZ(Ik|YPAvZ2hfiSLDatL$M%3@vfx%6r)|SXwOYLr9lEr%
zgg0;A@Xzb(>-c*2AN=$0e`5EY(6()ULDtD4;Ck4eo}Qvss|7kF%6Qc=QBDloHwkxI
z8w>!Lo0|(PK_5SU^tGcO_gp+(S^;qFMAvosu|V_)0Q`-t*a@I;l9&L9$UZRvEXzvG
zE#3(wv4NK$YRS&c&Eeg<cYNoWnVJ4}bgATXqUU+|@ZkeCHa2|aYiw)`ySux-{`uwQ
zB^<{=r_<rvhM53qxd};a@LdC_oh;wksCwdL1Yu)i1Fq}hFTeUT?)>&E{H9jJ-yS~1
z>gp<<KY!kLynH7y%mhfooz@24j1!HaZfICfoG}L1b+Nv_&W}GlJjBNzuCagjJRBY#
zqSx#B`r@L&GQ<R+7bSo^A0eNE65x-&`~$YPxABW_zlH0%SY2K9%}oR)KpO5eHuN>)
z;zG`bncvN!*X!Z03k%xk7-j;b;imeZ#)ed_2obxxyV%&+!0PHM-$uhP3YjMWt`p#A
z8pmhRl}%$qW&tP^3fSD-#N^~;R;P@GGzl<F8xr?|(jsflVJARR8~8PVF@|!v?Ca%Z
zjc&Kg=VZm9Kg<Le2DfN~Z$5y6psQeu1JU_1hM53^;tsN5lre_W(^GEH{{BAZ=jXM9
zpfiOjJD=JRj4=>DFxUhj{${fY*L8E{R@vaXE}G5e^$2hrhX<ijsi4#8@E}k-nqJgS
zCVk7^-k!3ZExuIF7ll!d<M5}-K_r0dx=Q}I+(~T^`3>NvA5H=-06YjmJ#oNaN9i0Y
zsGKkUNRhu%so>z?0Q2+nXfzsu^AYr;X;O&3Q<V{w^Hux+&~CT2xgjXybZwCN4FLQA
zasr{#>3}hYqh611d%Cm&6aGmE65ooC_u_Vf=zMw7N9NBX0mL64#1GsAL5ExXtx-0p
z_(xPN*f`P@QvK@gs{>J<Ua3@kliN?1R(N2kAr_?2mJ=YZJY9!7N}?{>pyF2sV0wBQ
zU;q1N;^f&Ei*OtV$H&LMnII8jOEyTTOKRjOJU(;r-Iq%!m&@pMIw+M&sMTsZ6DEE3
z%+AiD)oNjKax!wRf-pBXmxwdU7S#-%a(zGyRWOH+N?2E)kF$P5vw${#PS9E(&~CR;
zsZ=5bxj_h1*%3#WKL6oSeh$!CA3$y5xC+7T?d`yk^61ecn5K!@+1c>*0piM-tRYHN
zg7o=$I-d}>K7dBLsQb}9@4b8Xlo>1QhKj|adVN6N&KFg3LHhhbLB)Un`@=xVOj^hj
zToeQVFsT0J82}L^(z0zE#bOc7W)tV<=b-^eDi{t^?Af-Bhe!46DaZd_06(1$)cvGI
zm~JSuc61n`RB~ZRQV!zC1;vpdOK!3N-JAew>CQj`0NglU){N2viLMM#7rKf)DX?)g
zLfQz^4aE*XR5^$%)FmmPt_)BYx^ltSuV3@`SvoxoB2TOUgq4G&Dq&I(L@Ds%AZpnE
zm|&z)1<Obx)D6kHROKM9TyR)0(x`%EBvA>AT2T>MmxDo-m$)#J2y#_OGVFt#|0%(s
ze>xGdpH?|YqY}QwEpBm(TioJPgK~|NjJSOm-Qyg`>6_U3)L=M{bCq;uh`cSyN|8Kg
zp#C3VRIAlgD??<&T`BUZ!$`X_L`H&@BFa&c)ns^<=gR{|nq^5rh_hUYCW4Zdy&&k8
z!(j)8&k4&bMO2gW;>r;DJ6b8yXfyz*SBfkyF8bQp-ENnczBFYo2s-6(*w>&;CuEYW
z6rq5nDSJWCDTjk9Q$akr%!tKVDMBMJZP^P#R5^SsXpqvDy&!~@!(0LoXQc=QAW7K^
zLY#7#b=eC-P&qVCPEK-@V}yY;`Qzi`x%`{7sB*ZovjfH$zQGtQ%fkKd4>KuyL6FPg
z*47pnW7i`<R0R(LB&enNfIJ__RON7MYpaj{8L}&TL7;NDv$Mnbed_~&{DTmt&;JvU
zxjIfRhhhAb1WC$X5ae=5&L{p+;QDrujF_33NlX@1O2YK{JP4nw_4Qdmhd+;zNX~xp
z<VhdD0bGkjMd^64Skzq^!lAQLgfXU^hLrj9f-e8W#Kge({|8qyeFDd3>M#HR002ov
JPDHLkV1jVT-qZj9

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening_unlit.png
deleted file mode 100644
index 05add9c5dc5c58f6126e5dca3c6ac04a02ecddf5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTN?DaPU;cPEB*=VV?2IrW|{jv*Cu
z-rhFkYcSwoIPmJ3`k(*rWn^SZ-zM>JE|YjK$DpFBGv%5_Lj1XfmjCC;1NAU4H0W=9
z$vN|~a^6e9WGxei1#N%WBl<OM(~i7g%UJ8i3sO?<_P_ssbsdNa1RR?y>Za5yUM|*T
l3KfxUf8V#jtH+sPK{=!AGxbvcxO^3mB2QO8mvv4FO#sinKUn|(

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_closing.png
deleted file mode 100644
index c53b5a692ba4c3cd0f814351fc4b8b8a22df2471..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 451
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3-oXy=t-nQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`)dPG&Tpb-9OG``5b#?Rd@>XqN*EeLbl#??yHnwJAiHL~s<KanQX9ud4
z>FxIcQoJQWe!>5d0E6udr8b}hXMsm#F#`kNVGw3Kp1&dmXgQCki(^QH``c-^`I;33
zTo@O|o%&y&FYf$C$bH$xUkRI*^XJ4o=Da+;@MoHjgCXNl77^h95aa1Wrsv$Rx4#$s
z5%3{(kGsJUf#8~{AD2llnGhs(x*}>p(!IxvCQJLg-eG6a*j0Jn;$;3FwE#oqXQ}5x
z6g01JE=X!S^S)9u-T#5JtbkTpkHo2q!aQGFR?Og!*kAw8KESYir^1b-cSWurgw+<z
zXh>q};?w{#7%r6ADZH5G)cE%HIre+6p$wKKBA04!|GdEKp_%e~+h;~b?be+8K!piQ
zCxFzk>=C(iX@!-%$b}#e@8q@Dn8a3y8|1{V-ddpWV_yNo?R*)|f5$GfTGli4Xi3B;
TE`2Ek3@ipuS3j3^P6<r_PFb(-

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_open.png
deleted file mode 100644
index bd90e262c86787feb40809704fb7d22a2e538ef2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DinK$vl=HlH+5(AU$&F(ktM?fH$o2Mjn|0w>kpQC#{hz~^Af
zN?YEk%8F?RH2-Dyt@h&ps%3bvW%Z_`bBb4I-FtU$*W5EX_Q`Kny<C?gDEMjJ)&D>H
ZJ8OLR@cMc@^1cI7?CI*~vd$@?2>>n0KL7v#

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_opening.png
deleted file mode 100644
index 02b488b9c921c2f2794c7111b8458de2894eb889..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3-oXy=t-nQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`)dPG&Tpb-9OG``5b#?Rd@>XqN*EeLbl#??yHnwJAiHL~s<KanQX9ud4
z>FxIcQoJQWe!>5d0E6udr8b}hXMsm#F#`kNVGw3Kp1&dmDEQOU#W5tp{q6MIT!$3|
zSc@;JE&Kidel)L>@;j@ATl7=a1(f9G^ya5el7Gx}gtdcPKwLr3;a`x!+1C7-Q;VN1
zHMkzi&v$`k${nd`0*4o`tIB9FTkzL0CaEVn_Ui?PTn9m)#8bbkq3oRMI<sg8<}Hk_
z3X}R&zA>6ONC&V^n)h<We5uEbM$;SgG}?YGWnzwDZgXgR{+MBUgQ~)VKjjaC59Y=+
z>|iKle1znL2#3)3dE%zRAzwFeh50as+OBC5{msANRida(exbsGRqdf0?j+UCWLj0V
vWq#!8(;`p$m_qqiKRD^o0HhXloZx=9P$IKXbY3Sg5EwjN{an^LB{Ts57%ZQ{

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks.png
deleted file mode 100644
index dd67e88a315f674a061fb3b27660b8c761c88f38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*0007jNkl<Zc%1E<
zO-sW-5QZmK!CnfUs`L+d5CqR2s=wQVKS6r(EEKdCp<V>7E0M--(oM3v-T6o|50rvB
z?(X|$_9K~q!b>Jme`5^XKVF&j%`2QtMsN-@c!MQ;uYX{&xPXV-MV4h*a7^*H)mTo%
z^duKBlw8QrI7#Az6a!+!k42gRM*{jVXw(2^)BtAG0A@rO5W6r+TTo*dR0c>itn&u=
ziYhf*#29dhKzXbye)sb`x`T#9jF|@skRQx^J~1)&r}u;k?=m8#VH_qLszE1c7I|*U
z-vi17+kNaSp<Z~tEGWiY{U(RPh_)<%k1<OIw2im>Cz%9yQ#rS&sN2x0`#dRVZ$Zo3
z(YozxD(tDJ*Nd^#9ngM11*`#hZL|qqUX-aA#5S}G^!n=WLLU@GQ4~c{6dSK|xP5Tx
z!-H@vnhtn%y49-Lc3NyR!WG{&^FjpmIbAy+o5nPrx)V}}E%fz`bB+BtcI@^)8^rTf
zBx((Ky3EXU1aLM2IGxVm^KA+58-UdY;QHA(FXNaPN!aD?zV8}<6&DioA6qwm%&S`B
zG(?rf)v;@BC^IYu=$f%ZGhhqXw5SF!qXsa;V!%*uXSl{qZh&O*G5ePMUQntINQ83i
z$upoRb}H)fv5TKDu*ZP$-hvmY3!Atq6ENBh(WYFFM67|7l05p#?E1nmayZKasmvEs
z4%uF#@2=U$hCc&#<3^>qaoRUjD5t(Q@!@5>eLn%YPa&y@Wk6F&Jf;Amr=S&p`TF~H
zKQmyzZBbK@-3j_NfaCqFrZteLVgLD`ViBgsl+FQ!832*%0DhkaTq4i015y-4Q4~c{
f6h%=KHvsSpwHV1KmpgiI00000NkvXXu0mjf++aJ5

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_broken.png
deleted file mode 100644
index c41fa18ca1a5201b580b0194415c120f2980ad94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB-~~??$B>G+x3?U*4jBlrUYO^z=YQuNR}pT-
zBWy>`xct87wfm=W{jN74OBfgq^lLtiinBjCrM4q_XUp^LGankKO#7F2v&Y%y%Ff{Q
z3~%|r^L0N9BrdH_`lfiRRhipD%PysF@10#wUYOUjy0=@j2J7*HO#%`BwVxio(s#yR
z<n@~=mY3L9xIFDI3aY+wIGxY%REO4rbCPGjgzkNyv3Jjjr?-1v{GDIL{e9lqDVu&A
q=rZ;dudRsa-!2a~3&coRm%E#}EB}=G#r$v$kbtMFpUXO@geCxFwRX(_

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_damaged.png
deleted file mode 100644
index f16a028dee5bbe41a7f4e35f686043e8a112ce4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0Z<#e`9lQK{p_au_VYZ
zn8D%MjWi%9!PCVtL_+fI!HvAl4m=D8Hh=XH6ZQR;XyVo{y01gP^_0k+pXD$8l*-N4
z&iUk!V5<=?maE{?*yyS)-udN6;H*Pi5*L(-Fs)pAdDY$x8SUGCM{GTG-~v<Ug|=>&
dN}IerjGt7Q1>7HnEC$-e;OXk;vd$@?2>`@EK-2&L

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_open.png
deleted file mode 100644
index 40d559f7a3312504e49f41ccd899850ca59b3980..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 281
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3-oXy=t-nQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`IRkt`T>t-f`0?Kk$m_OstpifbB|(0{|Nk>wKgA1F%fMOS5n0T@z;_sg
z8IR|$NC66VdAc};M7Y15X2^BGK;UrE&;N_7IVHPIx5Rc$QDkj)wW>VRAK0MbAfmt}
zz}ms&!nlax=iUc9=Syj<FTNkVxrp&fd9_%HoK~2L$Hy0}$@3kqt2-`d-T#6WNdrWG
z<b>mInTllg8=T*qkh)`CG2`A1pH*)B{#SE<!|!Cf^sB5nG5Uu+xvh=>UB%$(>gTe~
HDWM4fZCPKD

diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/welded.png
deleted file mode 100644
index f19a0b8caf237d0020b9a06d1f0ab1160dfd9481..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCil&0(?STWo2beO-&;rB1}w7+}zx3Y;00eQUU`5!^6XYO6uNlp9E4|B|(0{
z|6zb((;1!fKvB*DkH}&M2EM}}%y>M1MG8=Gm8Xkih=u>u$+!6qEATisw%q>z|AT~S
z#*JA4e<zvDQEQua!T;lC5v50B%$$YYjLvtG4#=LIG~-l<H<N@QQ-vc_CcDu>*>w)C
zOnbittY~ET?=N&O;{eMY+ugILMztM{deeAm#Zn2Uj<ZtV%*5EQyskKU=abGR_W!dq
zm?Jk!2nh4UY(M$>7Gq&|<86I&^TH0sUpK5CaoHUIuKe=C1Rc%;dhz8GZfhTieDRlg
Y;SMFcnyprxKvy$(y85}Sb4q9e0EDN1yZ`_I

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_ARACHNID.png
deleted file mode 100644
index c1ea06389c67676f2006ef972513cb1e1b6a8655..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3858
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

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_MOTH.png
deleted file mode 100644
index 08cabeb4c6d4d0ce2c2d872b974a1640f7ed887b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3775
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
ItN;)F4|xLf_W%F@

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_ARACHNID.png
deleted file mode 100644
index c8ed6a3dafbdeef3d10e8a4d9b6c6281784a568b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3567
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
R#mTn-#s+sFAN1gn{{lMtqFw+1

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_MOTH.png
deleted file mode 100644
index ae0c2e7bebb6d2d2bf53a7e60852639f20b0dc6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3541
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
Wvfv(Ok^b%{01Z_gmA{qXVgCdvii?W?

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_ARACHNID.png
deleted file mode 100644
index 5549b1481d4a73a196eeb64c7296a3b339119edd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4232
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

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_MOTH.png
deleted file mode 100644
index a912a1671217680bd274a1a05d122c999c101eba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4127
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

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_ARACHNID.png
deleted file mode 100644
index 36a9a8520e24c0451b40ac730004a39dfaca1282..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4776
zcmb`J^;gv0_QyZ8fOLr<14t<iN=gqflr%$!lqfJrNX`t>EhQn{0uLb4F$_GUB3)7v
zN=P@uFu>*c-tRwf*S$aNv)4Z7thG<QUuQ?_Jy)k7yH5rH0EGqwY;fy4Z!P!^@oj4r
z=Jfj35jrdBC;>q2dvcr|5de@$x~Qn=c^RlHvumiTNQg>HNC=7vi2?v5Iw#H7$Z(c1
zas(xb(o3d}NgaLt(f}Vqfr2CnJr*UU*6d6KI3>VF9$@{X(mP^&%fUq|Nwu6Y;duJB
z+l0*E$u}PKENL1JRm@B6{`*5&OQ3Va>paxRqVqm{x)n&og%bU(ZAuz^x4@KsWurGL
zKGxZm1n=$vK;Q~2d(_n_Gh)>6Gx39d#JOhDVVF>@l<XImk0%u3x`3O!)D|;NQ9v&v
zZsQ0uYst*?RZ0$;&E2H?HKXx~&ajB)FsE6Fm`RG)k$^?eS*9bE^s!jjGv-0B;Z?_j
z-wV9I;-zUj;*xBcnKtfVTEsed>_fdZA{6^zziXL;o=X6H$qPd3UWN{?g7(RLVj+UR
z{DEc2SDS-zVbkv;bc0mA!{5z?Xt~Own0YJ>BjQu&Vpm2+bT(ppzl%^x#y?yY{gKIR
z#=7DOIE~=U=>6T8zi`U_kdl@XaT9dw;G0BR;j)s?-=<lIA@`WUAWZie6p={*d@glt
zn8ilAxiA1$+jx3ySCK=u!a&TI4j)SR8@ARUYlEIu0cZZog#}A3yu8<sgg5uGd6Y;M
zo1hVcj>Y{oJHO);sbp_a6>CX%r+`v$&%p4i$Hm?Cyhsd)<l2Xgkp{=r5ha|e3LY%g
zX4g(@uo$3=BFa>bP{ibY#87o#7tgk&MbBYqM$=63OE~T;BG>@F$29Dufe!qm`*89;
zb%Kkb*s;uvoXe4rYdEx7`+9(p3z=ZA4i;;s)gRvZh%?83!Vah^5^O25Y!c9Q5;k_y
zGy_!21o%pPQG{=7MVCY96Y;?8O!UDG`S(&os%&{b5&PuRJPDQXxaa-Oe))+MiO{=2
zTfzlA0};yH;712!-xaCD!Uw1s3?jYRRR&nUgqtR^{3ak$q0wVay~C}d48dnm+|D=n
z#99%tRp7K~vB~FszZIZRY0B4sNsDC&AbBW4TH0m)nZ}i<&Q@3IPC^({*Vh9vDUeV|
zQ|AW{f*|U>Fx~F-Wg1g5g?D8%!PGP|g|Q+ujDM>sC;4%a(r{EJ(iY>pD9$Ca6@yx0
zAW3Bd7WBlbs-k+@spQ{44B@MVX$2+)5=9mIBzifY<R^_M`CgHo(&(tYE*u&g-UPe_
zWSDbeh18(=S)&g&>o#dlq_7Ocp#}DFq6znq+N?Ybb@+A6bu1GJ(&5Z~adxG(rhmyy
zvu?*w^m=}N;VRll7DydP8%QLZ01th*>g~}eWn=m5c@%$-@v^xGuLsnFu9>-=_9yjz
z998e}!Qi1IMlFa6aYrE`kAsgcj<h-qqWsuSupoI<O-id-%TI}m_B85wk4Ir}bA+kJ
zGw?HAR_+dNeTWm6#G`jy9Bv%Dyg8hUoGA8`uWAldp3ls*e=584<Z&$VqV@A1n?5Gw
zJD@k=pXBp?Y^m>88U=k~bYf)rS4NF#fgkt{<glF9`YR;5sz=|v#Hh&I=ugCWy_oT=
znzWI$ihrGF>=DtLI=w(|)T+vgehl9wpEIAmQCNkpqhZUW&!pOx*_ITAig+o}sDVpK
zJ?v#@{Ue5$m>kV|&0Nj+Z*LeLJt$xqBiQ_NB8IiY`e0>^1&wu$JGOYHB&PT)YNpmd
z`F}c`(wv-|Qk(o)E<OpLoS1AX_bp$VP;|*~348tf)y|ky<)JsFTf!jgUUsr{<i^5u
z*wdjW51&9^?oF_cW>1e#A5DB4uNappIyK6w-Yv+fK&f1YofT6W_v@(V*Qsn258FqO
zb*Cf^e{whxE%kotbLGR`dfFP=Djv`mpdSz(up4lGLW&i*;<|c(MPUtzWr#V5iHNI+
zn<x$=1iI<Fts<@>YU1PKU&Kk=^I?_~GZCj08J2W^+VNUh;*F%4)3~kY5WW33F&*(m
zw}9EZ5_OVVqLrd7Vv$1+z7wst4Mhr$GCpTijwOy|(Wae9$?SG@OfVl83>737Y!k>c
zV>a!zaI4#D!oGBa<+v}tg!f0hpnGZfa>D+&vMN(>rm^pA&hp4|sikt`?Fii6*}cDM
z-rjd2_Z8>`x~pU6IyAH>bf93!ZhWj$bgXvzkT|xF%-+o@$5&a_U%Kk8%=*dnY?s+i
z(2olyrc$ksTCsyg{(Z-o<NF)&En6*~mfKb(?suEOO(=H*Un}2)z|czqDmYcHdP;v-
zS-Eq?hSG?$^|Uo-4Q0)YtMi%W*&|rb{773*;ArG3-J0R9*AjF@a<*y8_uI%%SoqQ-
zWIZzRM&gDA&m3<dcs;mWvA^@fJGfGDK9SOt5>?1hh-#M{hX=%V;4HE2m|}x`!#6x+
zG<bBk;Qa5n?zC_?D1nrUyoMBc&yG%?dJG-hYWp=Lji`nb#W~2i56%Q@6b2MA6wwuC
z71{Lr^{4hj?5kct`>bOoqUd^j`t5%e{mNP`W5Nn7w0J!0k}r^2!E*jm^^X-2m^RJs
zz+h;5xwE;|X~&{PqXnb)r3<o&hfl_XOB%GwnqBvV_ULj+U?i~Q{cpk>x?C+hA9&?7
z-|GC#eU`bJYmjtg)X8W>o?C`3n=a{iPOdYbclJn*2PH?4o|N&%2trdzdMVZ*ek>MQ
z_q{Hru6Qszeb-Wgn~e6UqsnaTm$u#~vm=wiJ>W0aVjq8{8KxZbNXnc;ay@fJV74u@
zM>>PNNAP2`^*i$}t1*jwi_eX=-X$B~u*RbmC6xit?HVC-xsE>A(7T4P2A9`JzIq`6
z;h+{FCoA0~ld+G5wWo+}i&%yj)m}-7X4g;iQFDAhq?%p!N-K0gT7KM2T2)&7noF>C
z_YTa5A?ODi_*`<m<LB=Mt|KPjO;)D2=NFnD@Ii$}ghBIcUr=5o_Uc~~(q+?k+V$+9
z`c1K)wZ3SXGh5DDIqEeuY{7jrPa*M8oxm!m-O{<4HvhJoox>j!CS}G@^K<ta+x?*c
zG<KM{C?W=)0hhjHlTed9Lk?kETQrKw>;H5kRuF&QMG?S<5{8BZKMFclc~lnr9NGTe
zHMr!5oLKC0t%Q{|rL*Bjaz(NsvoO1--Aa*x?>{Hh!<{i!ZX^vw#dKSiKc%NWjC1cM
zY_rMV_p5K}FDd&KIJkcfnvgT`vRw0<CH*_PkS_1}dS15t2cNA!e|}HcqqG9{v!ms_
zs)XBN2d<;D#~VQ-Ie*S~6#Rdl;%do<nG&oWtae&|dz5>1BJzKcT!LhX9}vq%vPQNF
z%UbO*=Sl{x#$0}wfTC)0+Za7|#|LmpE8F@ru%D1-4%FASi%k=3)kc$-`^bWs7Zbec
zckVbU=JMk?3*yODt<@I0ocxxY%z<rJsI2`$Ew6&(%?YA?ljFj!H*6Su{BT~qp9jt>
ztYD4t!)Z*XWR~?R@ZVToe*Zn|i}u5bi7?1My|z5TP1I!Bd_w=Y8Q*i<_x^Em1!b;r
zvQBT;M|v#_ZoA#IW%$yGx9r#M^DAT^HZSg-9PX9H>E<B_&clu``^RMcZc9pbdx(J!
z00i*dmYQJzfc>ZB+ynq05dhe-1pt{00ATXSZq<KwJ3#6IG4lcda@v0kZ+sDfyX|E0
zRyFlDggJTp+IczxDvqvR{$A{c-aZa4Fm@vt%(bg*B?tgW>NUVhMt<45ISRV0>h~gT
zxR~4pbErS?Q)|9yCDuw!qoyy;ml`Cx03cnbhs+6cLKvV0KXWyv8Q{=2_l(J|jw&oJ
z{31|XTu-l_g^x;4w|fh_7Vf_cyw7s5C@w3G&RLYh4I3C669${4Q3LtRguo{rDFAgk
zHA~KmzG+GQOZA}JW)wspyy9n&gO<yHqmI|Z63zm8W$+Lf!wVFF2&--d)M9Dua&T#L
z;tw9m53Y>!iGCi8j>{YQygu7-a+tLX**zyyguxrk=QkIUzV+b_2X&^`M0#u_6RYJp
z3$K2O%gk*HemEKAmhS_RwfzoEV?)+aNaN1&N1xc<F6Gq?CT@#X>i)@oyU?l6i>M`5
zFqDcWX?C_qDNplaMndMq`-0TRrX%)<F8myRn`djUTJL<V%?yC!L??+v8kX(@jC5DX
zvz0uU8_Yx&w#R#b+r_i84$6L-8uh8IP1yz=bo>zzd-4c3L6sNE1EN{{L$GJbgsu{X
zC)k`JUC<W+(kr*Set!L9`7m(c;P4!d(>9d-D_zmRU5iOFWCS80Ig(wZgmfp+7S6kf
z;)_;rI6D3<o{q?c9OJZoeZ!*$_`@2%(yi9KZhLJ5X}ZgvWO1Wlh49>HhO5{`2s_})
zppjm>oek%}5%&D{9IsBp_p<F88zn0TW8Z7x%5WXppZ4RU-H7<sYFLVYVqZ=9|9o?%
zU{N{?V5${;c8^X68Mqv{Q}-I;6QDOsmP@18hqF7FXm?)6ffCyt%zNT1wey9n<;1l(
zmfWrK|GNz?bdW((Aw@yI0!oI96V1REZo`HiH1o^N;&Z=#iXxFG9q#dXR<0?}BDpB-
zt_`2>lpF@{2AQto;~zj=#DilA@d2Yy0GMJ26rbJ!^eFyk;eeWjYHd(El^Ea#rHehK
z>QDLBB;ui2jINUCVO$ejtFEFPLh2gNEN!6XcG^wREuqn7E^}oR95q^I>EfxkZ?)v{
zUDlZGd(*^<Y0W%jEO+F|!%c|SEBa~?rC`8O`c2`yJ#XQ%9R7=|g$RRQ7sDy;)AB=`
z8On5OnRInuxs*(wMf+jGFVEh_<wdm*hq20Yek4kC34kwF^MLnKKL3$Z#vPpsxnJxz
zgPQj(m%0~pJDI#9voj9!W)k`WflQ})N-hZpIPS;xvJryEfoK&^WP3vL0#@C9P9_eO
zFPuN<!CHw(-dXttqQE-r>5l&1xFUTq&(7<)i6L1efM5(b9o|>b&maq~jrK<4B@A4t
zz~DMk(=E*Q885#NuF;CaYZ&dI`)*FCKWA_s+fjbic-5kLu}1i68v`djRVT6?13`sC
z&@Q%5S&{BYZ$M^5w%3;|5_D~Jy{VNyd1=>0h15VM2mZgZ^GD054!W1p6r_Nox%&9m
zN|+Vh6=WisoKW%6Eg0_Kf`J$hs89leU;Rg6G9kP112)Wx@a}uc&gnC!hU4{~7EkD_
z<w%7-kQJjUBMj>uptz5GJVScW4cfk)G^ZA6-7Zi1xPXZqw}xxH@%!0#IQX{sz@F&f
zgl5s?yZpalK{n=g;bvT^b&hsbNn)_I{z}?G{JK)gfD|q8#y!_f^J1H9I&BAOCYmKz
zg7Ya^vcGzcm&jdrvGeeTLXxwTCn&`Ru^3_F?%Cy*SWSy~n|_w%R?Dy>xY88<KKfAB
z3SYy2v5&xFKFfHk3^@9(4z9Ww8e(>JE@DNz)$nyeSIIR}h<ILZxCPN{`F4<q_{P0i
z{LH~PPp0?H#`mIM)ok8xXQnZ)8~O^T<GXcu-a+c##wF2&hse2}Jf=dE;r*|rLr9|N
z<wA)8y;tA^Vy)@e5E$ltpdD*hmrV4+Yo;g+be)aZ2k!Q#Xr>iORGzLA-vS&9S|dxW
z3;M;0@jCi})8`M~y|2w!H#8<Hgs^zvuY)KIYOvV2@Jg8j8L|4_V0Ln|Wjp@O%Rvb|
z%YSHDH(lOzu{PpGyj+0QV$jLmaJHPM!P0MT+;VG4OLRY1?EVSrK6S`nM6lxxHo~mD
zKYP{GG>#N@IcS%gkOjogekC^FYP~1%H#Hjy;|j=|?VueE`8yMzb;h6F)HxP1)#$zq
z@X7EwlDt?G5^I4fPawVEDwqAvb-#F9b5gn8lZOs(B{aO}kVkktZWM4NM~`loa4Vt+
z!cA1FaDHpUpH2J+aNh%%UAtM4GgBmJvZTaYLdb;yX$Y~0^PO!_+J?6182&q*4-1C?
fp~wFv$%c?ttdc$a$*92FZywN4eGaZxwhj3g8BFUW

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_MOTH.png
deleted file mode 100644
index d6e96dc028fe4d43c0b2fd60826da2e897f4648f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4692
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

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_ARACHNID.png
deleted file mode 100644
index a12a57e578b3992b85569a3355b988c55ed1ed53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5145
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

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_MOTH.png
deleted file mode 100644
index 9f20329d789160de94bc8c8810a2e6c36ceda738..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5018
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
F`7hk>YsCNn

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_ARACHNID.png
deleted file mode 100644
index 057fce5807cf272a65f4cb8389ed8a0bd7974c7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5253
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
HI^_QV((B}3

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_MOTH.png
deleted file mode 100644
index 01dc58d1922d5bdcb82873dc751d74fd67dcfae9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5304
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
bngo_?SJ~a`&p5f1eSm?^edq@*r||y=P^<Z2

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json
index e1e3a0f546..4aa15c86cd 100644
--- a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json
+++ b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json
@@ -1,1288 +1,656 @@
 {
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station 14",
+  "states": [
+    {
+      "name": "bluespace",
+      "directions": 4,
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Created by TheShuEd (github) for Space Station 14, originals modified by HTMLSystem to fit arachnids and moths",
-    "states": [
-        {
-            "name": "bluespace",
-            "directions": 4,
-            "delays": [
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "bluespace_VOX",
-            "directions": 4,
-            "delays": [
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "bluespace_ARACHNID",
-            "directions": 4,
-            "delays": [
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "bluespace_MOTH",
-            "directions": 4,
-            "delays": [
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "fire",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "fire_VOX",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "fire_ARACHNID",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "fire_MOTH",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "flesh",
-            "directions": 4,
-            "delays": [
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "flesh_VOX",
-            "directions": 4,
-            "delays": [
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "flesh_ARACHNID",
-            "directions": 4,
-            "delays": [
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "flesh_MOTH",
-            "directions": 4,
-            "delays": [
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.8,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "flora",
-            "directions": 4,
-            "delays": [
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "flora_VOX",
-            "directions": 4,
-            "delays": [
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "flora_ARACHNID",
-            "directions": 4,
-            "delays": [
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "flora_MOTH",
-            "directions": 4,
-            "delays": [
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "frost",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "frost_VOX",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "frost_ARACHNID",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "frost_MOTH",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "grav",
-            "directions": 4,
-            "delays": [
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "grav_VOX",
-            "directions": 4,
-            "delays": [
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "grav_ARACHNID",
-            "directions": 4,
-            "delays": [
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "grav_MOTH",
-            "directions": 4,
-            "delays": [
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ],
-                [
-                    0.3,
-                    0.3,
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "rock",
-            "directions": 4,
-            "delays": [
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "rock_VOX",
-            "directions": 4,
-            "delays": [
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "rock_ARACHNID",
-            "directions": 4,
-            "delays": [
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "rock_MOTH",
-            "directions": 4,
-            "delays": [
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.9,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "santa",
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "shadow",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "shadow_VOX",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "shadow_ARACHNID",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "shadow_MOTH",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "shock",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "shock_VOX",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "shock_ARACHNID",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "shock_MOTH",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "tech",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ],
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ],
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ],
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ]
-            ]
-        },
-        {
-            "name": "tech_VOX",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ],
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ],
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ],
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ]
-            ]
-        },
-        {
-            "name": "tech_ARACHNID",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ],
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ],
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ],
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ]
-            ]
-        },
-        {
-            "name": "tech_MOTH",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ],
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ],
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ],
-                [
-                    0.2,
-                    0.4,
-                    0.2,
-                    0.4
-                ]
-            ]
-        }
-    ]
+    {
+      "name": "bluespace_VOX",
+      "directions": 4,
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "fire",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "fire_VOX",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "flesh",
+      "directions": 4,
+      "delays": [
+        [
+          0.8,
+          0.2,
+          0.2
+        ],
+        [
+          0.8,
+          0.2,
+          0.2
+        ],
+        [
+          0.8,
+          0.2,
+          0.2
+        ],
+        [
+          0.8,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "flesh_VOX",
+      "directions": 4,
+      "delays": [
+        [
+          0.8,
+          0.2,
+          0.2
+        ],
+        [
+          0.8,
+          0.2,
+          0.2
+        ],
+        [
+          0.8,
+          0.2,
+          0.2
+        ],
+        [
+          0.8,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "flora",
+      "directions": 4,
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "flora_VOX",
+      "directions": 4,
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "frost",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "frost_VOX",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "grav",
+      "directions": 4,
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "grav_VOX",
+      "directions": 4,
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "rock",
+      "directions": 4,
+      "delays": [
+        [
+          0.9,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.9,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.9,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.9,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "rock_VOX",
+      "directions": 4,
+      "delays": [
+        [
+          0.9,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.9,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.9,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.9,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "santa",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "shadow",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "shadow_VOX",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "shock",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "shock_VOX",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "tech",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.4,
+          0.2,
+          0.4
+        ],
+        [
+          0.2,
+          0.4,
+          0.2,
+          0.4
+        ],
+        [
+          0.2,
+          0.4,
+          0.2,
+          0.4
+        ],
+        [
+          0.2,
+          0.4,
+          0.2,
+          0.4
+        ]
+      ]
+    },
+    {
+      "name": "tech_VOX",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.4,
+          0.2,
+          0.4
+        ],
+        [
+          0.2,
+          0.4,
+          0.2,
+          0.4
+        ],
+        [
+          0.2,
+          0.4,
+          0.2,
+          0.4
+        ],
+        [
+          0.2,
+          0.4,
+          0.2,
+          0.4
+        ]
+      ]
+    }
+  ]
 }
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_ARACHNID.png
deleted file mode 100644
index c01cb92e341a5d552c8b7b355f6762d477b489e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4456
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
Q`=$Ub^=E2dRc%B63p^KJr~m)}

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_MOTH.png
deleted file mode 100644
index ac492e7626a6b88ab70adf3d0a134da1a1e86509..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4454
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

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_ARACHNID.png
deleted file mode 100644
index 8fb0836e52c076dc5a071b8a20d87c5e7b04f10b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3807
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
WGli%iChObp0D#qX)&5a|hWsCf5D`EC

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_MOTH.png
deleted file mode 100644
index e9a592a85f10a8182861cdcaf0b5f65cc7fdf0d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3749
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

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_ARACHNID.png
deleted file mode 100644
index cfead742e3750aeb356cf720a964e72f8b48015a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3795
zcmb7GWl+?M7XJg%(&Y+L(%mW2uyo4O;R=WXi?CdB0qMS!NOuTa1O%j9LRw-ektHNA
zOGwC)OFizqc^}`0`{A53^E+ow&Ybzh85?R-kUb;=0DwXVtYLa*i|!<hgy>EuLZ36=
znR~9P2C4wi@F)3|6CnVQ$-1el8~d1QtFh~7s>_JW%g6{zh=>CKI4(ca&)f{n7=uE}
zB8}6i<1;2+zcj@MQy{^qA_C&1)Vkd%0H=(GxtE4XY6Xb|-%41idTIk_d=#EZ!|pwh
z#>^Wpdge@>7qy_}F98Q*xyx*4A+HOOs3q3}#B4i|auq@NRo{{{?0&H&{VJwEHYvf?
zkr?m(Awb{`tavpxsxh8x;b-Fq&n3EN)15OR+bP*EE(NBQ6MKN$!i+X6PI16ED-m;a
zj<y9c4a+G(^0-@!hO<6P8H|hRj&oXtOIW1)90}P3pJqE#$zvrVpMXYu#@Cz=Hx_x<
zljLbT6H^^QOc;{$Hi=FiXarm*T4eyX(EtiIlmYnC7DYCF%wD()L(}*q!iCoZfEDnt
z!{L;u<tU17gsOjh)LMj=t1=eEV`~<jlunnhib5G+68cBQC}oo#uZhoPgREFqy#W{0
zl@)z}2j~;0;+&kkoS28OM<?G*sNGd=+SwnO_K~6cAPu(j-cv|OHU&^$;oOYI#dx?e
z0Cu~0#vRu&V~(Og{HIP|O2ix1_F#L{zBM6N!J5TITRptO*ZiVe2e?AYP<4l3lxgSE
z!QW2)*mSuxxVXB#tfxz0g+|}d_?p+n{msIdb2j1|Usgt%E3VF1(F{$EkqUiw{mf>Y
zA-Y(?Y_({W^TM2Ss@|J2bX#WJ{5j1;rX_wk$3vA6R)9}{hMhF%h2X>if_y-m;9@Lc
zGCM2(5*2=ffVAr03^8(rCPTF~BwA@r#((8pS>sEw1DYxXJ1Wdu1a#f^K6lf!0#qvm
z_^N!d_ue>)uY}X5;AyZk(T6n`J;(^Jb>#g(<Xc1|6(QsG0R9%bA|*#G@^-}W-Xfl<
z7-c~i{~_6^3Uy@E5H*8o44hqkh~-n1WeW2K0iimLF-rysx4Ie_pFw4}$n*nCb@WcL
z%a+X+AN*lEK%w4JWb%?0#}G*TSd6ry$GV=zov_i-NRA{qlBs9-P(qGPB)p~jofknc
z^?syL@B0-ROETrRl{8`0GzujNVl<3jwbWAmxkza^YEo#+@ZD7AQ&`K`+Ty{fl|wf4
zM4Fo7#`+oL-`E(U)=DyqEsAAIt4)ZF^FKVDc{aoMitL2OK<jnM*yQ*Y02fjK<tK<}
zL5gxG9&I&l(HzU+7>FW@p^4(j4?^`>co-V-8$pfC)5-Etpn*iEiU!NS6lPg=<0<;R
z>z})ee<ll}4x$YrR7^%hJYIu)eU@{uePS3Z*!OJ3+Kbl<;zidA`a=7Y`XG_2AA30R
z+xc88m@0%sIk}L7k1mn)V<cEjz)83`Z9+><uT{@qm5cTy*09g3B&;>sQs;@r6C)Px
zPHq#h3zrQ4TP_X{jy>Ld&LvJHd-|}}3o7p?R{B5HJb4N^mU+8OiUceL?(rScTL{kZ
z!3Ath{3~K1Qs&3zwtr>SSr+?iyaE5NqO~6e$JO?kSeKiZ!p*m%r<x?5p|#}A<<$ck
zy%UZI|JJ4#>W^JhUp0y6yX14_gPKQH8#$Y`&G^n}?O5%|QK(B+5Kfr7l{dj&Ml|s=
z#K-6BHt81VCVhLu!2hV2d6Hmj`&a_!g!9EIJ`;Xs^sIA-=ex{z!Ros2n;!x`{Qj;x
zGyh#{=4X}U3}R+_rlrcSYI$14Ez2$P^~S4TlX5k`;glZ9BP{!QY4S0c#o0*dF{#H=
zkeB<@EE9RNQ?p0Y-=?ak6iQFbb3g7C=T{@uFC$OOD4z`)XcslAW6H*%(PX{pspB7B
z9E(@LrG2k`x!X_LBibbc2Leq3qXPE=&yGoPLf2f^k8ntw8Ib}J2N5ArEl~@_?`WZ3
z`d+)}>*%_q#H8nmG7o$~N)i^5lw#wup3<GK)nwktTDeR)dXLdVzeyNKE_no^@5?mG
z>WSBgGfTvbJsKt4>==s?o?tX&R7)UAVAiLdPS5UjcTTpR5{?ii7w!-$v;tZ7+junY
zwBTNP!16tpULppgpVPfGdpQlo*3@PT|M)y`I&XVqyWCcT`2&UUboCr;S%CUY7rbJ7
z-qq9j<0c}aG-9ZD%xP+}TYR!%_BT<&02$Q7CErg?F+jfd4~5O+S#*!pui&{0CZ-C#
z9KD2*(trW%IrbqYscomt+jiHk-1B~mMhnu@)X&Z@IVj?ifC@oXpq)M#Sy|;;jZsCp
z+Rxf^)=}2|aCbe`J>`e>EucF3f+k|t=>9g_^I3+VWYI0({l1}o!lIV>Lz_ZVZe?zn
z@vQL{!#2aJR0g}>y+x>&6%nd_SEULc3)k#X;_w1H4xOfSU@0)<7{93SiLi;i;<K-b
zy_r!6wq#N&@;cJc2TpV*)RSFd?T*9YnS^zmNX`+?1C4AAosz&(hElqc+){@@|G|tw
zFtqkLWWYXtI+m`_cM!T>x}LjM$%GSHZ1Z~3^R!rQ700=*8IT|%G;5jHd45jY&z;Au
zO*<JU9w!`kAYYtEG=4l4R^F^v+3LP8vQJk)3?qi69efkT7;&}nyyI2U{lnmA!ISK@
z0@KtZ^KM3S@`6fS<!pJUA-Taq;VHio4^oNXeQMSlb1+Q>>7_)oBvvA(akMeMv1}yo
z{hqB1HyN$8vpPEAQ%AoP8Z{Hvr}4>NB4<6*EFH@ut8fM`@GcO8IkusX3`Tg55ZEsJ
zx7Iy&lQu;*^`9N#<(O}{XA{-sHGz=bIuUE7&H>oi+vdn-x7VS3O(H^~!EGWgc1Ecd
zlQ|^~Cn38w2@LU?{jxHx?jIIn=lSO3THW?5stwrm{JEL*YV`zlmtmWpo#*eyAnzOy
z^Jz`a^`ph^D2q{x)!E&J#g<2W5D}Cp+XCw+qz^GvdpP;M;`?7;jGZ7REeZ8{pY*Ij
zwrD$N<L2fags<)iI0<49RO_-=G5@0@prh{B@40D<%4ZPkGtWB5gR#Ia+&EEbbUY#p
zA%Dp#qa}M9I)-a+(<!ZL+U^Zm4cUGhOMn<l9vc(R5q7Tiswwk5a{Ssevg{u^y)@un
z1FLL#&x#+z6~h{ud%kzls~QvZXMJ)L!u8zFgSff0jBdyFr~LPKQ`~#WyR1(i`Zu)<
zmRGI^jU1e@O)FXW*#7O0CjA;$LRV<GS(x|qo$t=}_Qo_6sTX*V7pLS?EBXa?=stnQ
zVuDfm+h@O&1Ad-dHIR=pCELHS`_;bTRprwiQnXHd$)-T`h)6MpC8k|e(QY49ARD|E
zfB9}2f~+g(VD#FX8oEkd-8K0E`w4F4Kn{0YY+2xHF)coxs6{IuCPd3d!4xw7GUtpr
zMC!W1Ziijz>5h`Zp<_>kB6P8VSK0aYIONL~$AwdW<hTa*@q+ds4}w=z+5X)BN@q4b
zyRu(d@YeQnbOY_z<$on1#-J#DV|#oxU6<?dp=<7TYTx+)K6iW#0oA$KzyD$q>a!xe
z>v7wW<wqykcF=GjsGJqDb@AZ%_kLxfQDF$dStRyya8l9#j#9Ei!KMZP5Xf^!H6sB4
z_YdXV0svnz0N8N^0EH|7VDidqH+gdBAoT)U`2YYp?LUGywG?u72QtGoE#YP`7r393
zw=<yb?Culb!)^xmec=XUH;2L8dn#9h0f1mxM?=-zKW}eQRgd0@W$<_5u%ue6pawhz
z!KAxV^^s8xo)c7bz-N58NJJCuTc-}U5=BP$tCU0pzG3YX5y`HSZ<NI5g1QP5NE&Vf
zT)Gq`MUF@F^7E_OaF3G;uO}Q^H=oj)Lo3jDCA%cl7E$<#Xt7AHBnB2LEKI`CPx`?}
zU$^Tvf;$wPlMbg%lPb7<D!Sd8obJ7T6_J1TPD#|>A6u7SSoY@VKtP^oY3-^5gUJx=
z9zIMNW$ph3H<?N;vj@AJLI0S~WikI5F(j$XwYyxlS3ZI*hXjc)SXZ5@*NerYH>Y=J
z+0v3kAJ*+d7*y!SL($j-dpx!RD!aU^jN`^5!4<isq(AMyG>yFvxPFwkoGs}12wNV7
z%<_1;J;gAj)O9GivcbL+goPEbrJbOrR=u4gM3o4vXKyi-6RlVWc*tZ|_<>$K@3saL
zE7+&YSoOzv-4Wi^*VhhRH#Z-qsCwi_a4^X(pp#h0#()M+h?kiJ_;9FL(y;$^x0ib)
zg7}dPcwgfIC(W>W&VK{jNf>HByf3(%U97)HHgQqd2~+H-hPpf1woHBm_HJ6v^pt{n
z;iUh|{R$H1F&9uxF*wJ57amtHp!zTC{lD&V1iG^*FkFN>N;=vcI)9ERh;1$>T{z!6
zXXk3X6j!v%fOGLjb1Cs(mB?daUR>8SAvdx_Pqgn&<nz&C6RW&;RR!x2XCBwvv6G8+
zI3eu5`iv62CbPtNtW*m+B3p_>>%x5N{u?<}fcL0SWwRwTgg=zfNTj#=8kBh9QHc5>
z_W!#3S1bJ|2?JTZj*V($1Qkr$AG;{+V0xce@j&Xq$0hWI*_YckeD`@5xv7D(EM&;9
z#YA2%W;SX2rMkyq75TRkn@ptj-xuDBcUfV5mcti1IXJPo(xE$oMTs_FqhG9>jmkjg
zo4AFsw-)ChV*@mOP~QIR2@rCEyL`Oug_c?FyxBgK)(5>xEP72+fB&B4ga6&`Uk`Cj
Z#5F9V|8?by_}xbUbTkb$KB_r}{|AA_1X2J1

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_MOTH.png
deleted file mode 100644
index 459709829dceea44475f73075a5348cef184cddd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3615
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
aV=hd3zvOZ`TgKIQ0s1<|+V3@C;r|CGma#ej

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_ARACHNID.png
deleted file mode 100644
index b8e251e02e6f9ed6e746b808b0a3f9330a2d6a6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4136
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

diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_MOTH.png
deleted file mode 100644
index a3ea54713a437d83539340f6b7b69e43173e8c2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4073
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
W;c>|F<n-mA1a!3?Lf>m5BL4%Fj(_j~

diff --git a/Resources/migration.yml b/Resources/migration.yml
index bbf331d5b6..d05795def4 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -726,7 +726,5 @@ PrefilledSyringe: Syringe
 BibleTanakh: null
 BibleSatanic: null
 
-
-# 2025-10-08
+# 2025-10-8
 ClothingBeltAssault: ClothingBeltMilitaryWebbing
-WarpPointBombing: null
diff --git a/Tools/dump_patrons.ps1 b/Tools/dump_patrons.ps1
index 21b8b7b1cb..d08e095421 100755
--- a/Tools/dump_patrons.ps1
+++ b/Tools/dump_patrons.ps1
@@ -5,4 +5,4 @@ param([string]$csvPath)
 # Dumps Patreon's CSV download into a YAML file the game reads.
 
 # Have to trim patron names because apparently Patreon doesn't which is quite ridiculous.
-Get-content $csvPath | ConvertFrom-Csv -Delimiter "," | select @{l="Name";e={$_.Name.Trim()}},Tier | where-object Tier -ne "" | where-object Tier -ne "Free" | ConvertTo-Yaml
+Get-content $csvPath | ConvertFrom-Csv -Delimiter "," | select @{l="Name";e={$_.Name.Trim()}},Tier | where-object Tier -ne "" | ConvertTo-Yaml
diff --git a/Tools/mapping-merge-driver.sh b/Tools/mapping-merge-driver.sh
index fe114ac9cd..0421278f31 100755
--- a/Tools/mapping-merge-driver.sh
+++ b/Tools/mapping-merge-driver.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 # Add this to .git/config:
 # [merge "mapping-merge-driver"]
diff --git a/runclient-Tools.sh b/runclient-Tools.sh
index b564c35438..cc0c958b86 100755
--- a/runclient-Tools.sh
+++ b/runclient-Tools.sh
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/sh
 dotnet run --project Content.Client --configuration Tools
 read -p "Press enter to continue"
diff --git a/runclient.sh b/runclient.sh
index 5df80bb08e..9417cc9218 100755
--- a/runclient.sh
+++ b/runclient.sh
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/sh
 dotnet run --project Content.Client
 read -p "Press enter to continue"
diff --git a/runserver-Tools.sh b/runserver-Tools.sh
index 3a786920a7..6280dc4279 100755
--- a/runserver-Tools.sh
+++ b/runserver-Tools.sh
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/sh
 dotnet run --project Content.Server --configuration Tools
 read -p "Press enter to continue"
diff --git a/runserver.sh b/runserver.sh
index 33638d6bb5..33258e3190 100755
--- a/runserver.sh
+++ b/runserver.sh
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/sh
 dotnet run --project Content.Server
 read -p "Press enter to continue"