From 067321141758e3fa7042b8a8226e97b39c1f2681 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 18 Jun 2024 21:19:32 -0400
Subject: [PATCH 01/84] Two new CVars and height slider now shows actual height
 in CM

---
 .../UI/HumanoidProfileEditor.xaml.cs          | 24 +++++++++----------
 Content.Shared/CCVar/CCVars.cs                | 10 ++++++++
 .../HeightAdjust/HeightAdjustSystem.cs        | 11 +++++----
 .../Humanoid/Prototypes/SpeciesPrototype.cs   | 12 ++++++++++
 .../ui/humanoid-profile-editor.ftl            |  4 ++--
 5 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 537b19479c..c203995fa4 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -1,9 +1,7 @@
-using System.Globalization;
 using System.Linq;
 using System.Numerics;
 using System.Text;
 using Content.Client.Guidebook;
-using System.Text.RegularExpressions;
 using Content.Client.Humanoid;
 using Content.Client.Lobby.UI;
 using Content.Client.Message;
@@ -217,7 +215,8 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _heightSlider.MinValue = prototype.MinHeight;
             _heightSlider.MaxValue = prototype.MaxHeight;
             _heightSlider.Value = Profile?.Height ?? prototype.DefaultHeight;
-            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", _heightSlider.Value));
+            var height = MathF.Round(prototype.AverageHeight * _heightSlider.Value);
+            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", (int) height));
 
             _heightSlider.OnValueChanged += args =>
             {
@@ -227,8 +226,8 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 prototype = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First(); // Just in case
 
                 var value = Math.Clamp(args.Value, prototype.MinHeight, prototype.MaxHeight);
-                var height = value.ToString(CultureInfo.InvariantCulture);
-                CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", height.Length > 4 ? height[..4] : height));
+                var height = MathF.Round(prototype.AverageHeight * value);
+                CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", (int) height));
                 SetProfileHeight(value);
             };
 
@@ -242,7 +241,8 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _widthSlider.MinValue = prototype.MinWidth;
             _widthSlider.MaxValue = prototype.MaxWidth;
             _widthSlider.Value = Profile?.Width ?? prototype.DefaultWidth;
-            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", _widthSlider.Value));
+            var width = MathF.Round(prototype.AverageWidth * _widthSlider.Value);
+            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width));
 
             _widthSlider.OnValueChanged += args =>
             {
@@ -252,8 +252,8 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 prototype = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First(); // Just in case
 
                 var value = Math.Clamp(args.Value, prototype.MinWidth, prototype.MaxWidth);
-                var width = value.ToString(CultureInfo.InvariantCulture);
-                CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width.Length > 4 ? width[..4] : width));
+                var width = MathF.Round(prototype.AverageWidth * value);
+                CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width));
                 SetProfileWidth(value);
             };
 
@@ -1200,8 +1200,8 @@ private void UpdateHeightControls()
             _heightSlider.Value = Profile.Height;
             _heightSlider.MaxValue = species.MaxHeight;
 
-            var height = Profile.Height.ToString(CultureInfo.InvariantCulture);
-            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", height.Length > 4 ? height[..4] : height));
+            var height = MathF.Round(species.AverageHeight * _heightSlider.Value);
+            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", (int) height));
         }
 
         private void UpdateWidthControls()
@@ -1215,8 +1215,8 @@ private void UpdateWidthControls()
             _widthSlider.Value = Profile.Width;
             _widthSlider.MaxValue = species.MaxWidth;
 
-            var width = Profile.Width.ToString(CultureInfo.InvariantCulture);
-            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width.Length > 4 ? width[..4] : width));
+            var width = MathF.Round(species.AverageWidth * _widthSlider.Value);
+            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width));
         }
 
         private void UpdateHairPickers()
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 891c790d52..3ece4b48de 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -2106,5 +2106,15 @@ public static readonly CVarDef<float>
         /// </summary>
         public static readonly CVarDef<bool> PsionicRollsEnabled =
             CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY);
+
+        /*
+         * Miscellaneous
+         */
+
+        public static readonly CVarDef<bool> HeightAdjustModifiesHitbox =
+            CVarDef.Create("heightadjust.modifies_hitbox", true, CVar.SERVERONLY);
+
+        public static readonly CVarDef<bool> HeightAdjustModifiesZoom =
+            CVarDef.Create("heightadjust.modifies_zoom", true, CVar.SERVERONLY);
     }
 }
diff --git a/Content.Shared/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
index ef97272073..f7d917545a 100644
--- a/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
+++ b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
@@ -1,7 +1,9 @@
 using System.Numerics;
+using Content.Shared.CCVar;
 using Content.Shared.Humanoid;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
+using Robust.Shared.Configuration;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Systems;
 
@@ -12,6 +14,7 @@ public sealed class HeightAdjustSystem : EntitySystem
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedContentEyeSystem _eye = default!;
     [Dependency] private readonly SharedHumanoidAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
 
 
     /// <summary>
@@ -23,12 +26,12 @@ public sealed class HeightAdjustSystem : EntitySystem
     public bool SetScale(EntityUid uid, float scale)
     {
         var succeeded = true;
-        if (EntityManager.TryGetComponent<ContentEyeComponent>(uid, out var eye))
+        if (_config.GetCVar(CCVars.HeightAdjustModifiesZoom) && EntityManager.TryGetComponent<ContentEyeComponent>(uid, out var eye))
             _eye.SetMaxZoom(uid, eye.MaxZoom * scale);
         else
             succeeded = false;
 
-        if (EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
+        if (_config.GetCVar(CCVars.HeightAdjustModifiesHitbox) && EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
         {
             foreach (var fixture in fixtures.Fixtures)
             {
@@ -61,12 +64,12 @@ public bool SetScale(EntityUid uid, Vector2 scale)
         var succeeded = true;
         var avg = (scale.X + scale.Y) / 2;
 
-        if (EntityManager.TryGetComponent<ContentEyeComponent>(uid, out var eye))
+        if (_config.GetCVar(CCVars.HeightAdjustModifiesZoom) && EntityManager.TryGetComponent<ContentEyeComponent>(uid, out var eye))
             _eye.SetMaxZoom(uid, eye.MaxZoom * avg);
         else
             succeeded = false;
 
-        if (EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
+        if (_config.GetCVar(CCVars.HeightAdjustModifiesHitbox) && EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
         {
             foreach (var fixture in fixtures.Fixtures)
             {
diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index 6184ba5839..8268d0d7c7 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -162,6 +162,18 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// </summary>
     [DataField]
     public float MaxWidth = 1.3f;
+
+    /// <summary>
+    ///     The average height in centimeters for this species, used to calculate player facing height values in UI elements
+    /// </summary>
+    [DataField]
+    public float AverageHeight = 176.1f;
+
+    /// <summary>
+    ///     The average shoulder-to-shoulder width in cm for this species, used to calculate player facing width values in UI elements
+    /// </summary>
+    [DataField]
+    public float AverageWidth = 40f;
 }
 
 public enum SpeciesNaming : byte
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index cf0957b894..d767a3ddf3 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -12,8 +12,8 @@ humanoid-profile-editor-sex-unsexed-text = None
 humanoid-profile-editor-age-label = Age:
 humanoid-profile-editor-skin-color-label = Skin color:
 # Parkstation-HeightSlider
-humanoid-profile-editor-height-label = Height: {$height}x
-humanoid-profile-editor-width-label = Width: {$width}x
+humanoid-profile-editor-height-label = Height: {$height}cm
+humanoid-profile-editor-width-label = Width: {$width}cm
 humanoid-profile-editor-species-label = Species:
 humanoid-profile-editor-pronouns-label = Pronouns:
 humanoid-profile-editor-pronouns-male-text = He / Him

From 639a17ee0f94bf0532587bef0f599f86aa5749c1 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 18 Jun 2024 22:38:53 -0400
Subject: [PATCH 02/84] Height sliders now include weight

---
 .../Preferences/UI/HumanoidProfileEditor.xaml |  4 ++
 .../UI/HumanoidProfileEditor.xaml.cs          | 43 ++++++++++++++++++-
 .../ui/humanoid-profile-editor.ftl            |  2 +-
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index 2242720dac..a6b3266a84 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -121,6 +121,10 @@
                                     <Slider Name="CWidthSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
                                     <Button Name="CWidthReset" Text="{Loc 'ui-options-bind-reset'}" />
                                 </BoxContainer>
+                                <!--Weight -->
+                                <BoxContainer HorizontalExpand="True">
+                                    <Label Name="CWeightLabel" />
+                                </BoxContainer>
                             </BoxContainer>
                             <!-- Skin -->
                             <BoxContainer Margin="10" HorizontalExpand="True" Orientation="Vertical">
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index c203995fa4..7cdeee7ccd 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -30,6 +30,7 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
+using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -229,12 +230,14 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 var height = MathF.Round(prototype.AverageHeight * value);
                 CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", (int) height));
                 SetProfileHeight(value);
+                UpdateWeight();
             };
 
             CHeightReset.OnPressed += _ =>
             {
                 _heightSlider.Value = prototype.DefaultHeight;
                 SetProfileHeight(prototype.DefaultHeight);
+                UpdateWeight();
             };
 
 
@@ -255,14 +258,34 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 var width = MathF.Round(prototype.AverageWidth * value);
                 CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width));
                 SetProfileWidth(value);
+                UpdateWeight();
             };
 
             CWidthReset.OnPressed += _ =>
             {
                 _widthSlider.Value = prototype.DefaultWidth;
                 SetProfileWidth(prototype.DefaultWidth);
+                UpdateWeight();
             };
 
+            prototypeManager.Index(prototype.Prototype).TryGetComponent<FixturesComponent>(out var fixture);
+            if (fixture != null)
+            {
+                var radius = fixture.Fixtures["fix1"].Shape.Radius;
+                var density = fixture.Fixtures["fix1"].Density;
+                var avg = (_widthSlider.Value + _heightSlider.Value) / 2;
+                var weight = MathF.Round(MathF.PI * MathF.Pow(radius * avg, 2) * density);
+                CWeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) weight));
+            }
+            else
+            {
+                //Whelp, the fixture doesn't exist, guesstimate it instead
+                CWeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) 71));
+            }
+
+
+
+
             #endregion Height
 
             #region Skin
@@ -943,6 +966,7 @@ private void SetSpecies(string newSpecies)
             UpdateSexControls(); // update sex for new species
             UpdateHeightControls();// - Changing species provides inaccurate sliders
             UpdateWidthControls();// - Changing species provides inaccurate sliders
+            UpdateWeight();
             RebuildSpriteView(); // they might have different inv so we need a new dummy
             UpdateSpeciesGuidebookIcon();
             IsDirty = true;
@@ -1216,7 +1240,23 @@ private void UpdateWidthControls()
             _widthSlider.MaxValue = species.MaxWidth;
 
             var width = MathF.Round(species.AverageWidth * _widthSlider.Value);
-            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width));
+            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", (int) width));
+        }
+
+        private void UpdateWeight()
+        {
+            if (Profile == null)
+                return;
+            var species = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First();
+            _prototypeManager.Index(species.Prototype).TryGetComponent<FixturesComponent>(out var fixture);
+            if (fixture != null)
+            {
+                var radius = fixture.Fixtures["fix1"].Shape.Radius;
+                var density = fixture.Fixtures["fix1"].Density;
+                var avg = (Profile.Width + Profile.Height) / 2;
+                var weight = MathF.Round(MathF.PI * MathF.Pow(radius * avg, 2) * density);
+                CWeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) weight));
+            }
         }
 
         private void UpdateHairPickers()
@@ -1376,6 +1416,7 @@ public void UpdateControls()
             UpdateCMarkingsFacialHair();
             UpdateHeightControls();
             UpdateWidthControls();
+            UpdateWeight();
 
             _preferenceUnavailableButton.SelectId((int) Profile.PreferenceUnavailable);
         }
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index d767a3ddf3..043fd4ca3d 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -11,9 +11,9 @@ humanoid-profile-editor-sex-female-text = Female
 humanoid-profile-editor-sex-unsexed-text = None
 humanoid-profile-editor-age-label = Age:
 humanoid-profile-editor-skin-color-label = Skin color:
-# Parkstation-HeightSlider
 humanoid-profile-editor-height-label = Height: {$height}cm
 humanoid-profile-editor-width-label = Width: {$width}cm
+humanoid-profile-editor-weight-label = Weight: {$weight}kg
 humanoid-profile-editor-species-label = Species:
 humanoid-profile-editor-pronouns-label = Pronouns:
 humanoid-profile-editor-pronouns-male-text = He / Him

From 254521887964222f08e8b056517e1e1316ffbffa Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 18 Jun 2024 23:49:51 -0400
Subject: [PATCH 03/84] UI now automatically resizes the preview

---
 Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 7cdeee7ccd..87b3989205 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -1257,6 +1257,7 @@ private void UpdateWeight()
                 var weight = MathF.Round(MathF.PI * MathF.Pow(radius * avg, 2) * density);
                 CWeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) weight));
             }
+            _previewSpriteView.InvalidateMeasure();
         }
 
         private void UpdateHairPickers()

From 69ec1a873cafa297f89145cd86ae51fcd416f6d3 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 19 Jun 2024 01:02:30 -0400
Subject: [PATCH 04/84] More Exciting Shell Casings

---
 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs | 2 +-
 .../Guns/Ammunition/Cartridges/base_cartridge.yml        | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index d3aee5a48e..f1daa700e8 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -441,7 +441,7 @@ protected void EjectCartridge(
         {
             Angle ejectAngle = angle.Value;
             ejectAngle += 3.7f; // 212 degrees; casings should eject slightly to the right and behind of a gun
-            ThrowingSystem.TryThrow(entity, ejectAngle.ToVec().Normalized() / 100, 5f);
+            ThrowingSystem.TryThrow(entity, ejectAngle.ToVec(), 625f);
         }
         if (playSound && TryComp<CartridgeAmmoComponent>(entity, out var cartridge))
         {
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
index e188ee8c65..3bef413dff 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
@@ -11,10 +11,10 @@
         shape:
           !type:PhysShapeAabb
           bounds: "-0.10,-0.05,0.10,0.05"
-        density: 20
+        density: 0.5
         mask:
           - ItemMask
-        restitution: 0.3  # fite me
+        restitution: 0.7  # Small and bouncy
         friction: 0.2
   - type: Tag
     tags:
@@ -23,6 +23,11 @@
     size: Tiny
   - type: SpaceGarbage
   - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Weapons/Guns/Casings/casing_fall_1.ogg
+      params:
+        volume: -1
+  - type: EmitSoundOnCollide
     sound:
       path: /Audio/Weapons/Guns/Casings/casing_fall_2.ogg
       params:

From eb9d2da3ff035469e25c6eb7ee6afc989be92380 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 17:04:32 -0400
Subject: [PATCH 05/84] Mass Contests Remake

---
 .../Weapons/Melee/MeleeWeaponSystem.cs        |   4 +-
 .../Weapons/Ranged/Systems/GunSystem.cs       |   9 +-
 Content.Shared/CCVar/CCVars.cs                |  13 ++
 .../Contests/ContestsSystem.CVars.cs          |  19 +++
 Content.Shared/Contests/ContestsSystem.cs     | 116 ++++++++++++++++++
 .../Cuffs/Components/HandcuffComponent.cs     |  31 ++---
 Content.Shared/Cuffs/SharedCuffableSystem.cs  |   4 +-
 .../Entities/Objects/Misc/handcuffs.yml       |   2 +
 8 files changed, 179 insertions(+), 19 deletions(-)
 create mode 100644 Content.Shared/Contests/ContestsSystem.CVars.cs
 create mode 100644 Content.Shared/Contests/ContestsSystem.cs

diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index 31c9b0d2b8..4749fd8b4b 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Actions.Events;
 using Content.Shared.Administration.Components;
 using Content.Shared.CombatMode;
+using Content.Shared.Contests;
 using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
@@ -43,6 +44,7 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
     [Dependency] private readonly SolutionContainerSystem _solutions = default!;
     [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly ContestsSystem _contests = default!;
 
     public override void Initialize()
     {
@@ -138,7 +140,7 @@ protected override bool DoDisarm(EntityUid user, DisarmAttackEvent ev, EntityUid
         if (attemptEvent.Cancelled)
             return false;
 
-        var chance = CalculateDisarmChance(user, target, inTargetHand, combatMode);
+        var chance = CalculateDisarmChance(user, target, inTargetHand, combatMode) * _contests.MassContest(user, target);
 
         if (_random.Prob(chance))
         {
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index b8f8f12211..ff3116a8fd 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stunnable;
 using Content.Server.Weapons.Ranged.Components;
+using Content.Shared.Contests;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
@@ -39,6 +40,7 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StaminaSystem _stamina = default!;
     [Dependency] private readonly StunSystem _stun = default!;
+    [Dependency] private readonly ContestsSystem _contests = default!;
 
     public const float DamagePitchVariation = SharedMeleeWeaponSystem.DamagePitchVariation;
     public const float GunClumsyChance = 0.5f;
@@ -97,7 +99,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         var toMap = toCoordinates.ToMapPos(EntityManager, TransformSystem);
         var mapDirection = toMap - fromMap.Position;
         var mapAngle = mapDirection.ToAngle();
-        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle());
+        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle(), user);
 
         // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
         var fromEnt = MapManager.TryFindGridAt(fromMap, out var gridUid, out var grid)
@@ -311,7 +313,7 @@ private Angle[] LinearSpread(Angle start, Angle end, int intervals)
         return angles;
     }
 
-    private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction)
+    private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction, EntityUid? shooter)
     {
         var timeSinceLastFire = (curTime - component.LastFire).TotalSeconds;
         var newTheta = MathHelper.Clamp(component.CurrentAngle.Theta + component.AngleIncreaseModified.Theta - component.AngleDecayModified.Theta * timeSinceLastFire, component.MinAngleModified.Theta, component.MaxAngleModified.Theta);
@@ -319,7 +321,8 @@ private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle dir
         component.LastFire = component.NextFire;
 
         // Convert it so angle can go either side.
-        var random = Random.NextFloat(-0.5f, 0.5f);
+
+        var random = Random.NextFloat(-0.5f, 0.5f) / _contests.MassContest(shooter);
         var spread = component.CurrentAngle.Theta * random;
         var angle = new Angle(direction.Theta + component.CurrentAngle.Theta * random);
         DebugTools.Assert(spread <= component.MaxAngleModified.Theta);
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 5aaf967dd1..a8cd60a0e3 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -2118,5 +2118,18 @@ public static readonly CVarDef<float>
         /// </summary>
         public static readonly CVarDef<float> StationGoalsChance =
             CVarDef.Create("game.station_goals_chance", 0.1f, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Toggles all MassContest functions. All mass contests output 1f when false
+        /// </summary>
+        public static readonly CVarDef<bool> DoMassContests =
+            CVarDef.Create("contests.do_mass_contests", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     The maximum amount that Mass Contests can modify a physics multiplier, given as a +/- percentage
+        ///     Default of 0.25f outputs between * 0.75f and 1.25f
+        /// </summary>
+        public static readonly CVarDef<float> MassContestsMaxPercentage =
+            CVarDef.Create("contests.max_percentage", 0.25f, CVar.REPLICATED | CVar.SERVER);
     }
 }
diff --git a/Content.Shared/Contests/ContestsSystem.CVars.cs b/Content.Shared/Contests/ContestsSystem.CVars.cs
new file mode 100644
index 0000000000..2775c8adb4
--- /dev/null
+++ b/Content.Shared/Contests/ContestsSystem.CVars.cs
@@ -0,0 +1,19 @@
+using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.Contests
+{
+    public sealed partial class ContestsSystem
+    {
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+        public bool DoMassContests { get; private set; }
+        public float MassContestsMaxPercentage { get; private set; }
+
+        private void InitializeCVars()
+        {
+            Subs.CVar(_cfg, CCVars.DoMassContests, value => DoMassContests = value, true);
+            Subs.CVar(_cfg, CCVars.MassContestsMaxPercentage, value => MassContestsMaxPercentage = value, true);
+        }
+    }
+}
diff --git a/Content.Shared/Contests/ContestsSystem.cs b/Content.Shared/Contests/ContestsSystem.cs
new file mode 100644
index 0000000000..2a105816b4
--- /dev/null
+++ b/Content.Shared/Contests/ContestsSystem.cs
@@ -0,0 +1,116 @@
+using Robust.Shared.Physics.Components;
+
+namespace Content.Shared.Contests
+{
+    public sealed partial class ContestsSystem : EntitySystem
+    {
+        // Defaulted to the average mass of an adult human
+        /// <summary>
+        ///     The presumed average mass of a player entity
+        /// </summary>
+        private const float AverageMass = 71f;
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            InitializeCVars();
+
+        }
+        // REGION
+        // Mass Contests
+        /// <summary>
+        ///     Outputs the ratio of mass between a performer and the average human mass
+        /// </summary>
+        /// <param name="performerUid">Uid of Performer</param>
+        /// <returns></returns>
+        public float MassContest(EntityUid performerUid, float otherMass = AverageMass)
+        {
+            if (DoMassContests
+                && TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
+                && performerPhysics.Mass != 0)
+                return Math.Clamp(performerPhysics.Mass / otherMass, 1 - MassContestsMaxPercentage, 1 + MassContestsMaxPercentage);
+
+            return 1f;
+        }
+
+        public float MassContest(EntityUid? performerUid, float otherMass = AverageMass)
+        {
+            if (DoMassContests)
+            {
+                var ratio = performerUid is { } uid ? MassContest(uid, otherMass) : 1f;
+                return ratio;
+            }
+
+            return 1f;
+        }
+
+        /// <summary>
+        ///     Outputs the ratio of mass between a performer and the average human mass
+        ///     If a function already has the performer's physics component, this is faster
+        /// </summary>
+        /// <param name="performerPhysics"></param>
+        /// <returns></returns>
+        public float MassContest(PhysicsComponent performerPhysics, float otherMass = AverageMass)
+        {
+            if (DoMassContests
+                && performerPhysics.Mass != 0)
+                return Math.Clamp(performerPhysics.Mass / otherMass, 1 - MassContestsMaxPercentage, 1 + MassContestsMaxPercentage);
+
+            return 1f;
+        }
+
+        /// <summary>
+        ///     Outputs the ratio of mass between a performer and a target, accepts either EntityUids or PhysicsComponents in any combination
+        ///     If you have physics components already in your function, use those instead
+        /// </summary>
+        /// <param name="performerUid"></param>
+        /// <param name="targetUid"></param>
+        /// <returns></returns>
+        public float MassContest(EntityUid performerUid, EntityUid targetUid)
+        {
+            if (DoMassContests
+                && TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
+                && TryComp<PhysicsComponent>(targetUid, out var targetPhysics)
+                && performerPhysics.Mass != 0
+                && targetPhysics.InvMass != 0)
+                return Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass, 1 - MassContestsMaxPercentage, 1 + MassContestsMaxPercentage);
+
+            return 1f;
+        }
+
+        /// <inheritdoc cref="MassContest(EntityUid, EntityUid)"/>
+        public float MassContest(EntityUid performerUid, PhysicsComponent targetPhysics)
+        {
+            if (DoMassContests
+                && TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
+                && performerPhysics.Mass != 0
+                && targetPhysics.InvMass != 0)
+                return Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass, 1 - MassContestsMaxPercentage, 1 + MassContestsMaxPercentage);
+
+            return 1f;
+        }
+
+        /// <inheritdoc cref="MassContest(EntityUid, EntityUid)"/>
+        public float MassContest(PhysicsComponent performerPhysics, EntityUid targetUid)
+        {
+            if (DoMassContests
+                && TryComp<PhysicsComponent>(targetUid, out var targetPhysics)
+                && performerPhysics.Mass != 0
+                && targetPhysics.InvMass != 0)
+                return Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass, 1 - MassContestsMaxPercentage, 1 + MassContestsMaxPercentage);
+
+            return 1f;
+        }
+
+        /// <inheritdoc cref="MassContest(EntityUid, EntityUid)"/>
+        public float MassContest(PhysicsComponent performerPhysics, PhysicsComponent targetPhysics)
+        {
+            if (DoMassContests
+                && performerPhysics.Mass != 0
+                && targetPhysics.InvMass != 0)
+                return Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass, 1 - MassContestsMaxPercentage, 1 + MassContestsMaxPercentage);
+
+            return 1f;
+        }
+    }
+}
diff --git a/Content.Shared/Cuffs/Components/HandcuffComponent.cs b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
index 77a77cf2f8..dac1f347e5 100644
--- a/Content.Shared/Cuffs/Components/HandcuffComponent.cs
+++ b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
@@ -12,37 +12,37 @@ public sealed partial class HandcuffComponent : Component
     /// <summary>
     ///     The time it takes to cuff an entity.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float CuffTime = 3.5f;
 
     /// <summary>
     ///     The time it takes to uncuff an entity.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float UncuffTime = 3.5f;
 
     /// <summary>
     ///     The time it takes for a cuffed entity to uncuff itself.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float BreakoutTime = 15f;
 
     /// <summary>
     ///     If an entity being cuffed is stunned, this amount of time is subtracted from the time it takes to add/remove their cuffs.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float StunBonus = 2f;
 
     /// <summary>
     ///     Will the cuffs break when removed?
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public bool BreakOnRemove;
 
     /// <summary>
     ///     Will the cuffs break when removed?
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public EntProtoId? BrokenPrototype;
 
     /// <summary>
@@ -55,35 +55,38 @@ public sealed partial class HandcuffComponent : Component
     /// <summary>
     ///     The path of the RSI file used for the player cuffed overlay.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public string? CuffedRSI = "Objects/Misc/handcuffs.rsi";
 
     /// <summary>
     ///     The iconstate used with the RSI file for the player cuffed overlay.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public string? BodyIconState = "body-overlay";
 
     /// <summary>
     /// An opptional color specification for <see cref="BodyIconState"/>
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public Color Color = Color.White;
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier StartCuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_start.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier EndCuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_end.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier StartBreakoutSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_breakout_start.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier StartUncuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_takeoff_start.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier EndUncuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_takeoff_end.ogg");
+
+    [DataField]
+    public float UncuffMassModifier = 0f;
 }
 
 /// <summary>
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index fc005fd30f..f5754641b3 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Alert;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Buckle.Components;
+using Content.Shared.Contests;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
@@ -58,6 +59,7 @@ public abstract partial class SharedCuffableSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly UseDelaySystem _delay = default!;
+        [Dependency] private readonly ContestsSystem _contests = default!;
 
         public override void Initialize()
         {
@@ -559,7 +561,7 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove
                 return;
             }
 
-            var uncuffTime = isOwner ? cuff.BreakoutTime : cuff.UncuffTime;
+            var uncuffTime = (isOwner ? cuff.BreakoutTime : cuff.UncuffTime) / (_contests.MassContest(user) * Math.Abs(cuff.UncuffMassModifier));
 
             if (isOwner)
             {
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index 5f970da184..32269d3888 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -52,6 +52,7 @@
       path: /Audio/Items/Handcuffs/rope_breakout.ogg
     startBreakoutSound:
       path: /Audio/Items/Handcuffs/rope_takeoff.ogg
+    uncuffMassModifier: 1
   - type: Construction
     graph: makeshifthandcuffs
     node: cuffscable
@@ -93,6 +94,7 @@
       path: /Audio/Items/Handcuffs/rope_breakout.ogg
     startBreakoutSound:
       path: /Audio/Items/Handcuffs/rope_takeoff.ogg
+    uncuffMassModifier: 1
   - type: Sprite
     sprite: Objects/Misc/zipties.rsi
     state: cuff

From 1701dedfa4a15c3577fa894a26969f2d21fb09b1 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 17:20:36 -0400
Subject: [PATCH 06/84] Update SharedCuffableSystem.cs

---
 Content.Shared/Cuffs/SharedCuffableSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index f5754641b3..0fa77b182c 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -561,7 +561,7 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove
                 return;
             }
 
-            var uncuffTime = (isOwner ? cuff.BreakoutTime : cuff.UncuffTime) / (_contests.MassContest(user) * Math.Abs(cuff.UncuffMassModifier));
+            var uncuffTime = (isOwner ? cuff.BreakoutTime : cuff.UncuffTime) * (_contests.MassContest(user) * Math.Abs(cuff.UncuffMassModifier));
 
             if (isOwner)
             {

From f149d46b3d4d903972ffa2db2d110fb5af36026f Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 18:07:28 -0400
Subject: [PATCH 07/84] Harpy Peacock Tail (#428)

Courtesy of @StillIcarus

# Description

This adds a new Peacock tail marking to Harpies. I'm also taking this
time to update them to the recent DeltaV changes to the birbs.

# Media

![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/4f776006-700e-4d92-802c-03e6dd201491)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/5fd143ab-069f-4d1c-b5e0-ee982a95b4b6)

The backside is semi cursed, but that's something I can't do within the
scope of this PR due to sprite system limitations that Death has planned
improvements for. Just ignore them. :)

Have a birb as consolation.

![faridaiscute](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/09373a57-f32f-48eb-b52b-6d12143f62ff)

:cl: VMSolidus
- add: Peacock Tails have been added for Harpies

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
---
 .../Locale/en-US/deltav/markings/harpy.ftl    |   4 ++
 .../Mobs/Customization/Markings/harpy.yml     |  64 +++++++++++-------
 .../DeltaV/Entities/Mobs/Species/harpy.yml    |   9 ++-
 .../digitigrade_inventory_template.yml        |   7 --
 .../Harpy/harpy_chest.rsi/lower.png           | Bin
 .../Harpy/harpy_chest.rsi/meta.json           |   0
 .../Harpy/harpy_chest.rsi/upper.png           | Bin
 .../harpy_ears.rsi/harpy_ears_default.png     | Bin
 .../Harpy/harpy_ears.rsi/meta.json            |   0
 .../Harpy/harpy_legs.rsi/feet.png             | Bin
 .../Harpy/harpy_legs.rsi/meta.json            |   0
 .../Harpy/harpy_legs.rsi/talons.png           | Bin
 .../Harpy/harpy_legs.rsi/thighs.png           | Bin
 .../Harpy/harpy_tails.rsi/meta.json           |   0
 .../Harpy/harpy_tails.rsi/phoenix_tail.png    | Bin
 .../Harpy/harpy_tails.rsi/rooster_tail.png    | Bin
 .../harpy_tails36x36.rsi}/finch_tail.png      | Bin
 .../Harpy/harpy_tails36x36.rsi}/meta.json     |   0
 .../Harpy/harpy_tails48x48.rsi/meta.json      |  19 ++++++
 .../peacock_tail_eyes.png                     | Bin 0 -> 772 bytes
 .../peacock_tail_feathers.png                 | Bin 0 -> 1669 bytes
 .../Customization/Harpy/harpy_wingcover.png   | Bin
 .../Harpy/harpy_wings.rsi/classicharpy.png    | Bin
 .../Harpy/harpy_wings.rsi/harpy.png           | Bin
 .../Harpy/harpy_wings.rsi/harpy2tone1.png     | Bin
 .../Harpy/harpy_wings.rsi/harpy2tone2.png     | Bin
 .../Harpy/harpy_wings.rsi/harpy3tone1.png     | Bin
 .../Harpy/harpy_wings.rsi/harpy3tone2.png     | Bin
 .../Harpy/harpy_wings.rsi/harpy3tone3.png     | Bin
 .../Harpy/harpy_wings.rsi/harpyfolded.png     | Bin
 .../Harpy/harpy_wings.rsi/harpyspeckled1.png  | Bin
 .../Harpy/harpy_wings.rsi/harpyspeckled2.png  | Bin
 .../Harpy/harpy_wings.rsi/harpyundertone1.png | Bin
 .../Harpy/harpy_wings.rsi/harpyundertone2.png | Bin
 .../Harpy/harpy_wings.rsi/harpywingtip1.png   | Bin
 .../Harpy/harpy_wings.rsi/harpywingtip2.png   | Bin
 .../Harpy/harpy_wings.rsi/meta.json           |   0
 37 files changed, 71 insertions(+), 32 deletions(-)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png (100%)
 rename Resources/Textures/{DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi => Mobs/Customization/Harpy/harpy_tails36x36.rsi}/finch_tail.png (100%)
 rename Resources/Textures/{DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi => Mobs/Customization/Harpy/harpy_tails36x36.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wingcover.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json (100%)

diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/deltav/markings/harpy.ftl
index 3c1a2e3b9b..871f2f1729 100644
--- a/Resources/Locale/en-US/deltav/markings/harpy.ftl
+++ b/Resources/Locale/en-US/deltav/markings/harpy.ftl
@@ -40,6 +40,10 @@ marking-HarpyTailRooster-rooster_tail = Tail
 marking-HarpyTailFinch = Finch Tail
 marking-HarpyTailFinch-finch_tail = Tail
 
+marking-HarpyTailPeacock = Peacock Tail
+marking-HarpyTailPeacock-peacock_tail_feathers = Feathers
+marking-HarpyTailPeacock-peacock_tail_eyes = Eyes
+
 marking-HarpyChestDefault = Wing & Groin Under-Clothes
 marking-HarpyChestDefault-upper = Wing Under-Clothes
 marking-HarpyChestDefault-lower = Groin Under-Clothes
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
index 4f65046ce9..bd1ad12a32 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
@@ -15,7 +15,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy
 
 - type: marking
@@ -32,7 +32,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: classicharpy
 
 - type: marking
@@ -49,7 +49,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyfolded
 
 - type: marking
@@ -66,7 +66,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_ears.rsi
       state: harpy_ears_default
 
 - type: marking
@@ -83,7 +83,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: phoenix_tail
 
 - type: marking
@@ -99,7 +99,7 @@
       fallbackTypes:
         - !type:SimpleColoring
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: rooster_tail
 
 
@@ -116,18 +116,36 @@
       fallbackTypes:
         - !type:SimpleColoring
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails36x36.rsi
       state: finch_tail
 
+- type: marking
+  id: HarpyTailPeacock
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Harpy]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:SimpleColoring
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
+      state: peacock_tail_feathers
+    - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
+      state: peacock_tail_eyes
+
 - type: marking
   id: HarpyWing2ToneClassic
   bodyPart: RArm
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy2tone1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy2tone2
 
 - type: marking
@@ -136,11 +154,11 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone2
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone3
 
 - type: marking
@@ -149,9 +167,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyspeckled1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyspeckled2
 
 - type: marking
@@ -160,9 +178,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyundertone1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyundertone2
 
 - type: marking
@@ -171,9 +189,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpywingtip1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpywingtip2
 
 - type: marking
@@ -190,9 +208,9 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
       state: upper
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
       state: lower
 
 - type: marking
@@ -209,7 +227,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: thighs
 
 - type: marking
@@ -223,7 +241,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: feet
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: talons
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index 18437e074d..0ddce8b0e6 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -54,7 +54,6 @@
         visible: false
       - map: [ "id" ]
       - map: [ "gloves" ]
-      - map: [ "shoes" ]
       - map: [ "ears" ]
       - map: [ "outerClothing" ]
       - map: [ "eyes" ]
@@ -127,6 +126,12 @@
     templateId: digitigrade
   - type: HarpyVisuals
   - type: UltraVision
+  - type: Tag
+    tags:
+    - CanPilot
+    - FootstepSound
+    - DoorBumpOpener
+    - ShoesRequiredStepTriggerImmune
   - type: LanguageSpeaker
     speaks:
     - GalacticCommon
@@ -147,6 +152,7 @@
     species: Harpy
   - type: Inventory
     speciesId: harpy
+    templateId: digitigrade
   - type: Sprite
     scale: 0.9, 0.9
     layers:
@@ -167,7 +173,6 @@
       - map: ["enum.HumanoidVisualLayers.RHand"]
       - map: [ "id" ]
       - map: [ "gloves" ]
-      - map: [ "shoes" ]
       - map: [ "ears" ]
       - map: [ "outerClothing" ]
       - map: [ "eyes" ]
diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml b/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml
index 158541571a..fc7dbda932 100644
--- a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml
+++ b/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml
@@ -1,13 +1,6 @@
 - type: inventoryTemplate
   id: digitigrade
   slots:
-    - name: shoes
-      slotTexture: shoes
-      slotFlags: FEET
-      stripTime: 3
-      uiWindowPos: 1,0
-      strippingWindowPos: 1,3
-      displayName: Shoes
     - name: jumpsuit
       slotTexture: uniform
       slotFlags: INNERCLOTHING
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/finch_tail.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/finch_tail.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json
new file mode 100644
index 0000000000..2961db3707
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Peacock by stillxicarus (Discord)",
+    "size": {
+        "x": 48,
+        "y": 48
+    },
+    "states": [
+        {
+            "name": "peacock_tail_feathers",
+            "directions": 4
+        },
+        {
+            "name": "peacock_tail_eyes",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png
new file mode 100644
index 0000000000000000000000000000000000000000..71af693afd78b3c3a6c81ca03fc2f9db5913e590
GIT binary patch
literal 772
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!Wi-X*q7}lMWc?smOq&xaLGB9lH
z=l+w(3gjyW_=LDtRW-hRc_J~f)7Q5xIl1%y|NjRL)R&hxZQ4}w>eVTrswZhYEkKI9
zB*-rqC<_G)UjB@qfWn*w9+AZi419+`m{C;2tAT-mDb&-&F(kwJ?aYg1hZQ*5k~e10
z{$Brpago!NU2e0xW%tk3W#hDWniRY{_rH<%g404TKGm}><1}Z=edpY|?DrC%?a|r+
ziTh6)CY;Y=;b(Y|{L<d@!LuhP>P=f6PN*cE&-(I*n^FCEgYD{zpYy*y3!b(03e(!E
zKL`01i1hql(XgD6?f9(?EOWQBzM3eNHgmzM_EX0vel@o(`2AOc=Uq`{@2{S%a<gL8
zZhOtYc_}B0QATOi<!8MYW;kl^n9;C=ceiu%w{WJnF|Umec1b0A>=%h`o2b+9s8C>H
zpx0*yEwdB-39}Z23B0Y`x5Z?^jjt+SxTNGfYPsrC93*qJxYysE%<w=uu+9C0Z=@DW
zecd^M<7*WzB>nl!b?@pzv*U&iA`jFQoxf?#_u}_@Wt{T0h<V3@W^*phta{Z3ji)YW
z#SU7o*W!~qEdQtXK-w)~hWz4=f{P#boxi#~IA+2P<!4z1{F141r+)H${i3#sWtUE)
z9ykDD%x*!6-wl%t67|F`$ZPp0+pmnh+3d-x6tdzqOGdDjtBQ-K^-YxzPi&90=oO26
zpJIGFWls0(b(b&5`L_9pJ$UtF$4jejmJ>^_`Kmq5-Qe-3bVZ$zPv?|c7GX8cfPYi|
zF5rmun;0aqnJMW_X<*)qO$>Wd3>w3)UDTFX<LAb1#8lCKH?>BJC*Z#k%g2a+7tPH~
z8~6Kli1^Msdz2|;NuW<-AJbu7wHyIefqy3r9y)gaUz_lS%i`Mur58n?E#mK{Sn_>b
rcXDyRWMReq*qBB78xS7c@P5B*c|60ulNK9*sgA+Z)z4*}Q$iB}zuHxD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png
new file mode 100644
index 0000000000000000000000000000000000000000..d56b093d6ca8a5584adf01c6e4e1d6aeca3c48ec
GIT binary patch
literal 1669
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
P00000NkvXXu0mjfjI1Qj

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json

From 896627df10c3ce2d211d3d2e443616e718c5bd49 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Thu, 20 Jun 2024 22:07:52 +0000
Subject: [PATCH 08/84] Automatic Changelog Update (#428)

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 99c2f6482e..9cf28c91be 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4192,3 +4192,9 @@ Entries:
         start of every shift
   id: 6123
   time: '2024-06-17T21:42:13.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: Peacock Tails have been added for Harpies
+  id: 6124
+  time: '2024-06-20T22:07:29.0000000+00:00'

From b353d958ecb2a744db12b198a6a1e27d2a8f7809 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 18:17:02 -0400
Subject: [PATCH 09/84] Port Randomly Fire Dropped Weapons (#471)

# Description

Ports
https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/pull/19

I have added a new stat for firearms, the "Reliability" stat, which is a
number between 0 and 1. It's used as a percentage chance for the weapon
to fire itself when violently thrown into anyone. This PR differs from
the original one slightly in that to get it to actually work without
crashing, I set the system to listen to an event that triggers whenever
the gun collides with another entity, not necessarily just the floor.
This is the same event responsible for the clown's cream pie system, or
for glass shards embedding in an entity.

# Changelog

:cl:
- add: NanoTrasen has disabled the unneeded safeties on your guns- Make
sure you're careful with them!
- tweak: All Firearms now have a reliability stat, some are more
reliable than others. The more reliable a weapon is, the less likely it
is to accidentally discharge when yeeted.
---
 .../Ranged/Systems/FireOnDropSystem.cs        | 27 +++++++++++++++++++
 .../Weapons/Ranged/Components/GunComponent.cs |  6 +++++
 .../Objects/Weapons/Guns/Basic/base_pka.yml   |  1 +
 .../Weapons/Guns/Battery/battery_guns.yml     |  1 +
 .../Objects/Weapons/Guns/Pistols/pistols.yml  | 14 +++++++++-
 .../Weapons/Guns/Revolvers/revolvers.yml      |  3 +++
 .../Objects/Weapons/Guns/Rifles/rifles.yml    |  2 ++
 .../Objects/Weapons/Guns/SMGs/smgs.yml        |  5 ++++
 .../Weapons/Guns/Shotguns/shotguns.yml        |  7 +++++
 .../Objects/Weapons/Guns/Snipers/snipers.yml  | 10 +++++++
 10 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs

diff --git a/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs b/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs
new file mode 100644
index 0000000000..a6112ad49c
--- /dev/null
+++ b/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Throwing;
+using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.Random;
+
+namespace Content.Server.Weapons.Ranged.Systems;
+
+public sealed class FireOnDropSystem : EntitySystem
+{
+    [Dependency] private readonly SharedGunSystem _gun = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GunComponent, ThrowDoHitEvent>(HandleLand);
+    }
+
+
+    private void HandleLand(EntityUid uid, GunComponent component, ref ThrowDoHitEvent args)
+    {
+        if (_random.Prob(component.FireOnDropChance))
+            _gun.AttemptShoot(uid, uid, component, Transform(uid).Coordinates.Offset(Transform(uid).LocalRotation.ToVec()));
+    }
+}
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index 0183a30a73..a18aac80ab 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -229,6 +229,12 @@ public sealed partial class GunComponent : Component
     /// </summary>
     [DataField]
     public bool ClumsyProof = false;
+
+    /// <summary>
+    ///     The percentage chance of a given gun to accidentally discharge if violently thrown into a wall or person
+    /// </summary>
+    [DataField]
+    public float FireOnDropChance = 0.1f;
 }
 
 [Flags]
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
index f85e93b893..93621bc3a2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
@@ -22,6 +22,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
+    fireOnDropChance: 1
   - type: AmmoCounter
   - type: Appearance
   - type: GenericVisualizer
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 202604b8bf..bf0c51849a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -18,6 +18,7 @@
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
+    fireOnDropChance: 0.15
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser.ogg
   - type: Battery
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 16cacb79df..410664e46e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -99,6 +99,15 @@
     containers:
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
+  - type: Gun
+    fireRate: 6
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
+    fireOnDropChance: 0.3
 
 - type: entity
   name: cobra
@@ -125,6 +134,7 @@
         volume: -14
     availableModes:
     - SemiAuto
+    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -169,6 +179,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
+    fireOnDropChance: 0.5
 
 - type: entity
   id: WeaponPistolMk58Nonlethal
@@ -198,7 +209,7 @@
   name: N1984
   parent: BaseWeaponPistol
   id: WeaponPistolN1984 # the spaces in description are for formatting.
-  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber. 
+  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/N1984.rsi
@@ -219,6 +230,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
+    fireOnDropChance: 0.6
   - type: ItemSlots
     slots:
       gun_magazine:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index bd043c997d..c5237cdad9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -29,6 +29,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
+    fireOnDropChance: 0.5
   - type: UseDelay
     delay: 0.66
   - type: ContainerContainer
@@ -127,6 +128,7 @@
       path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
       params:
         volume: 2.25
+    fireOnDropChance: 0.3
 
 - type: entity
   name: Python
@@ -155,6 +157,7 @@
     sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
   - type: Gun
     fireRate: 1
+    fireOnDropChance: 1
   - type: ContainerContainer
     containers:
       revolver-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index 5bc8125eba..c55b2b6b09 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -67,6 +67,7 @@
     fireRate: 5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
+    fireOnDropChance: 0.5
   - type: ChamberMagazineAmmoProvider
     soundRack:
       path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
@@ -159,6 +160,7 @@
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
+    fireOnDropChance: 0.2
   - type: ItemSlots
     slots:
       gun_magazine:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index b693bdba37..2dfc833bad 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -72,6 +72,7 @@
     fireRate: 10
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
+    fireOnDropChance: 0.3
   - type: MagazineVisuals
     magState: mag
     steps: 1
@@ -96,6 +97,7 @@
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg
+    fireOnDropChance: 0.3
   - type: ChamberMagazineAmmoProvider
     autoEject: true
   - type: MagazineVisuals
@@ -126,6 +128,7 @@
         path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
       availableModes:
         - FullAuto
+      fireOnDropChance: 0.2
     - type: ItemSlots
       slots:
         gun_magazine:
@@ -173,6 +176,7 @@
       path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
     availableModes:
     - FullAuto
+    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -225,6 +229,7 @@
     selectedMode: FullAuto
     availableModes:
     - FullAuto
+    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index a8d9f53991..52b05b6d60 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -28,6 +28,7 @@
       path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
+    fireOnDropChance: 0.2
   - type: BallisticAmmoProvider
     whitelist:
       tags:
@@ -75,6 +76,7 @@
       path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
+    fireOnDropChance: 0.3
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -115,6 +117,7 @@
     heldPrefix: db
   - type: Gun
     fireRate: 2
+    fireOnDropChance: 0.5
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -190,6 +193,7 @@
     heldPrefix: sawn
   - type: Gun
     fireRate: 4
+    fireOnDropChance: 0.5
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -226,6 +230,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/hm_pistol.rsi
   - type: Gun
     fireRate: 4
+    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
   - type: Construction
@@ -250,6 +255,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi
   - type: Gun
     fireRate: 2
+    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
   - type: StaticPrice
@@ -273,6 +279,7 @@
     heldPrefix: improvised
   - type: Gun
     fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
+    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
     proto: null
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index c97459629c..adb8e323f4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -46,6 +46,14 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
+  - type: Gun
+    fireRate: 0.75
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
+    fireOnDropChance: 1
 
 - type: entity
   name: Hristov
@@ -82,6 +90,7 @@
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
+    fireOnDropChance: 1
   - type: UseDelayOnShoot
   - type: UseDelay
     delay: 8 #it's a musket
@@ -111,6 +120,7 @@
   - type: Gun
     minAngle: 0
     maxAngle: 30 #miss him entirely because the barrel is smoothbore
+    fireOnDropChance: 1
   - type: Item
     size: Small
     storedRotation: 90

From ff6e9b7424c150f0c2d3854f1a5d2c0d7eb61d2d Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Thu, 20 Jun 2024 22:17:23 +0000
Subject: [PATCH 10/84] Automatic Changelog Update (#471)

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 9cf28c91be..454311cbd1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4198,3 +4198,16 @@ Entries:
       message: Peacock Tails have been added for Harpies
   id: 6124
   time: '2024-06-20T22:07:29.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        NanoTrasen has disabled the unneeded safeties on your guns- Make sure
+        you're careful with them!
+    - type: Tweak
+      message: >-
+        All Firearms now have a reliability stat, some are more reliable than
+        others. The more reliable a weapon is, the less likely it is to
+        accidentally discharge when yeeted.
+  id: 6125
+  time: '2024-06-20T22:17:03.0000000+00:00'

From 1a1263f1a88e979f44068e92a88bba35102d7adb Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 18:23:17 -0400
Subject: [PATCH 11/84] Update HandcuffComponent.cs

---
 Content.Shared/Cuffs/Components/HandcuffComponent.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Content.Shared/Cuffs/Components/HandcuffComponent.cs b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
index dac1f347e5..a5593cd271 100644
--- a/Content.Shared/Cuffs/Components/HandcuffComponent.cs
+++ b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
@@ -85,6 +85,10 @@ public sealed partial class HandcuffComponent : Component
     [DataField]
     public SoundSpecifier EndUncuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_takeoff_end.ogg");
 
+    /// <summary>
+    ///     Both a bool and a multiplier combined. If it is 0, handcuffs are unaffected by mass contests. The absolute value of any nonzero acts as a multiplier on how much mass affects uncuff speed.
+    ///     A value of 1 provides the full modifier from MassContest. 0.5 is half the effect of mass contests, and so on.
+    /// </summary>
     [DataField]
     public float UncuffMassModifier = 0f;
 }

From bc0e2e608e18aeaa093b1366f75048678be09912 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 18:24:30 -0400
Subject: [PATCH 12/84] Port Random Bark System (#466)

# Description

https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/pull/11

Later, I would like to have this system not just for animals, but for
implementations of humanoid NPCs, since it can just as easily be used
for human NPCs.
I could make space bandits that CHEEKI BREEKI at people.

# Changelog

:cl: DEATHB4DEFEAT
- add: Animals will no longer be a silent, soulless shell

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
---
 .../Speech/Components/RandomBarkComponent.cs  | 63 ++++++++++++++++++
 .../Speech/Systems/RandomBarkSystem.cs        | 47 ++++++++++++++
 .../Prototypes/Entities/Mobs/NPCs/animals.yml | 65 +++++++++++++++++++
 .../Prototypes/Entities/Mobs/NPCs/pets.yml    |  4 ++
 .../Entities/Mobs/NPCs/simplemob.yml          |  1 +
 5 files changed, 180 insertions(+)
 create mode 100644 Content.Server/Speech/Components/RandomBarkComponent.cs
 create mode 100644 Content.Server/Speech/Systems/RandomBarkSystem.cs

diff --git a/Content.Server/Speech/Components/RandomBarkComponent.cs b/Content.Server/Speech/Components/RandomBarkComponent.cs
new file mode 100644
index 0000000000..7229428f53
--- /dev/null
+++ b/Content.Server/Speech/Components/RandomBarkComponent.cs
@@ -0,0 +1,63 @@
+namespace Content.Server.Speech.Components;
+
+/// <summary>
+///     Sends a random message from a list with a provided min/max time.
+/// </summary>
+[RegisterComponent]
+public sealed partial class RandomBarkComponent : Component
+{
+    /// <summary>
+    ///     Should the message be sent to the chat log?
+    /// </summary>
+    [DataField]
+    public bool ChatLog = false;
+
+    /// <summary>
+    ///     Minimum time an animal will go without speaking
+    /// </summary>
+    [DataField]
+    public int MinTime = 45;
+
+    /// <summary>
+    ///     Maximum time an animal will go without speaking
+    /// </summary>
+    [DataField]
+    public int MaxTime = 350;
+
+    /// <summary>
+    ///     Accumulator for counting time since the last bark
+    /// </summary>
+    [DataField]
+    public float BarkAccumulator = 8f;
+
+    /// <summary>
+    ///     Multiplier applied to the random time. Good for changing the frequency without having to specify exact values
+    /// </summary>
+    [DataField]
+    public float BarkMultiplier = 1f;
+
+    /// <summary>
+    ///     List of things to be said. Filled with garbage to be modified by an accent, but can be specified in the .yml
+    /// </summary>
+    [DataField]
+    public IReadOnlyList<string> Barks = new[]
+    {
+        "Bark",
+        "Boof",
+        "Woofums",
+        "Rawrl",
+        "Eeeeeee",
+        "Barkums",
+        "Awooooooooooooooooooo awoo awoooo",
+        "Grrrrrrrrrrrrrrrrrr",
+        "Rarrwrarrwr",
+        "Goddamn I love gold fish crackers",
+        "Bork bork boof boof bork bork boof boof boof bork",
+        "Bark",
+        "Boof",
+        "Woofums",
+        "Rawrl",
+        "Eeeeeee",
+        "Barkums",
+    };
+}
diff --git a/Content.Server/Speech/Systems/RandomBarkSystem.cs b/Content.Server/Speech/Systems/RandomBarkSystem.cs
new file mode 100644
index 0000000000..4fc9dd420d
--- /dev/null
+++ b/Content.Server/Speech/Systems/RandomBarkSystem.cs
@@ -0,0 +1,47 @@
+using Content.Server.Chat.Systems;
+using Content.Shared.Mind.Components;
+using Robust.Shared.Random;
+using Content.Server.Speech.Components;
+
+namespace Content.Server.Speech.Systems;
+
+public sealed class RandomBarkSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly EntityManager _entity = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RandomBarkComponent, ComponentInit>(OnInit);
+    }
+
+
+    private void OnInit(EntityUid uid, RandomBarkComponent barker, ComponentInit args)
+    {
+        barker.BarkAccumulator = _random.NextFloat(barker.MinTime, barker.MaxTime) * barker.BarkMultiplier;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<RandomBarkComponent>();
+        while (query.MoveNext(out var uid, out var barker))
+        {
+            barker.BarkAccumulator -= frameTime;
+            if (barker.BarkAccumulator > 0)
+                continue;
+
+            barker.BarkAccumulator = _random.NextFloat(barker.MinTime, barker.MaxTime) * barker.BarkMultiplier;
+            if (_entity.TryGetComponent<MindContainerComponent>(uid, out var actComp) &&
+                actComp.HasMind)
+                continue;
+
+            _chat.TrySendInGameICMessage(uid, _random.Pick(barker.Barks), InGameICChatType.Speak, barker.ChatLog ? ChatTransmitRange.Normal : ChatTransmitRange.HideChat);
+        }
+    }
+}
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 369544fdc1..e311681ce5 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -64,6 +64,7 @@
   - type: Tag
     tags:
     - VimPilot
+  - type: RandomBark
 
 - type: entity
   name: bee
@@ -132,6 +133,13 @@
         - ReagentId: GroundBee
           Quantity: 5
   - type: ZombieImmune
+  - type: RandomBark
+    barks:
+      - Bzzzzz
+      - Bzzz bzzz
+      - Bzzzzzzzzzzzz
+      - Bzz
+    barkMultiplier: 1.5
 
 - type: entity
   name: bee
@@ -242,6 +250,7 @@
   - type: NpcFactionMember
     factions:
     - Passive
+  - type: RandomBark
 
 - type: entity
   parent: MobChicken
@@ -620,6 +629,8 @@
   - type: NpcFactionMember
     factions:
     - Passive
+  - type: RandomBark
+    barkMultiplier: 0.7
 
 - type: entity
   name: white duck #Quack
@@ -799,6 +810,16 @@
   - type: GuideHelp
     guides:
     - Chef
+  - type: RandomBark
+    barks:
+      - Mooooooo
+      - Moo
+      - Huff
+      - Mooooooooooo
+      - Moooooo
+      - Moooo
+    barkMultiplier: 3
+
 
 - type: entity
   name: crab
@@ -867,6 +888,12 @@
       task: RuminantCompound
   - type: Body
     prototype: AnimalHemocyanin
+  - type: RandomBark
+    barks:
+      - click clack
+      - clack
+      - clickity clack
+      - clack clack
 
 - type: entity
   name: goat
@@ -1479,6 +1506,8 @@
     makeSentient: true
     name: ghost-role-information-kobold-name
     description: ghost-role-information-kobold-description
+  - type: RandomBark
+    barkMultiplier: 0.65
 
 - type: entity
   name: guidebook monkey
@@ -1641,6 +1670,8 @@
   - type: BadFood
   - type: NonSpreaderZombie
   - type: PreventSpiller
+  - type: RandomBark
+    barkMultiplier: 0.3
 
 - type: entity
   parent: MobMouse
@@ -1876,6 +1907,18 @@
   - type: Tag
     tags:
     - VimPilot
+  - type: RandomBark
+    barkMultiplier: 1.3
+    barks:
+      - Croooaaaakkk
+      - Ribbit
+      - Ribbit
+      - Ribbit
+      - Crooaak
+      - Ribbit
+      - Ribbit
+      - Ribbit
+      - Bibbit
 
 # Would be cool to have some functionality for the parrot to be able to sit on stuff
 - type: entity
@@ -1994,6 +2037,10 @@
     heatDamage:
       types:
         Heat : 0.2 #per second, scales with temperature & other constants
+  - type: RandomBark
+    barks:
+      - Wank
+    barkMultiplier: 0.6
 
 - type: entity
   name: grenade penguin
@@ -2109,6 +2156,14 @@
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Scale
+  - type: RandomBark
+    barkMultiplier: 1.5
+    barks:
+      - Hsssssss
+      - Hss
+      - Hsssss
+      - Hisss
+      - Hshsss
 
 # Code unique spider prototypes or combine them all into one spider and get a
 # random sprite state when you spawn it.
@@ -2236,6 +2291,7 @@
       groups:
         Brute: -0.07
         Burn: -0.07
+  - type: RandomBark
 
 - type: entity
   name: tarantula
@@ -2588,6 +2644,7 @@
   - type: Tag
     tags:
     - VimPilot
+  - type: RandomBark
 
 - type: entity
   name: corrupted corgi
@@ -2747,6 +2804,7 @@
   - type: Tag
     tags:
     - VimPilot
+  - type: RandomBark
 
 - type: entity
   name: calico cat
@@ -2941,6 +2999,10 @@
   - type: Tag
     tags:
     - VimPilot
+  - type: RandomBark
+    barkMultiplier: 10
+    barks:
+      - Sloth
 
 - type: entity
   name: ferret
@@ -3140,6 +3202,8 @@
   - type: MobPrice
     price: 60
   - type: NonSpreaderZombie
+  - type: RandomBark
+    barkMultiplier: 0.45
 
 - type: entity
   name: pig
@@ -3309,3 +3373,4 @@
   components:
   - type: ReplacementAccent
     accent: nymph
+  - type: RandomBark
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 8ca1b2d2f0..5141811a8e 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -329,6 +329,8 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalMcGriff
+  - type: RandomBark
+    barkMultiplier: 1.3
 
 - type: entity
   name: Paperwork
@@ -432,6 +434,8 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalWalter
+  - type: RandomBark
+    barkMultiplier: 1.1
 
 - type: entity
   name: Morty
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 12ea40b1e3..8e84f46a69 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -104,3 +104,4 @@
   - type: MobPrice
     price: 150
   - type: FloatingVisuals
+  - type: Speech

From d42cd675232c9c54d7a26dd7d2f90028cdb04f2e Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Thu, 20 Jun 2024 22:24:53 +0000
Subject: [PATCH 13/84] Automatic Changelog Update (#466)

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 454311cbd1..2411ef27b0 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4211,3 +4211,9 @@ Entries:
         accidentally discharge when yeeted.
   id: 6125
   time: '2024-06-20T22:17:03.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Add
+      message: Animals will no longer be a silent, soulless shell
+  id: 6126
+  time: '2024-06-20T22:24:30.0000000+00:00'

From 4b8036c4946b16bbff51b91f707700d5aa15e354 Mon Sep 17 00:00:00 2001
From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com>
Date: Thu, 20 Jun 2024 15:25:18 -0700
Subject: [PATCH 14/84] Mirror 26250: Make all implants unable to be implanted
 more than once (#445)

## Mirror of PR #26250: [Make all implants unable to be implanted more
than once](https://github.com/space-wizards/space-station-14/pull/26250)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `771390bb6741074935e5f24c0aa9c87bc7b5ad09`

PR opened by <img
src="https://avatars.githubusercontent.com/u/63975668?v=4"
width="16"/><a href="https://github.com/Simyon264"> Simyon264</a> at
2024-03-19 00:44:21 UTC - merged at 2024-03-26 00:16:19 UTC

---

PR changed 3 files with 28 additions and 0 deletions.

The PR had the following labels:
- Status: Needs Review


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
>
> ## About the PR
> This PR makes mind shields unable to be implanted more than once.
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> PJB complained and people waste implants by injecting already injected
people.
>
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> Adds a new datafield to the Implanter component which is checked in
implanter system.
>
> ## Media
> <!--
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
>
> If you're unsure whether your PR will require media, ask a maintainer.
>
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
>
![image](https://github.com/space-wizards/space-station-14/assets/63975668/4907ddb2-de2f-490c-a35d-07c4f3b6c79b)
>
> - [x] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> N/A
>
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
>
> :cl: Simyon
> - tweak: All implants are now unable to be implanted more than once.
>


</details>

Co-authored-by: SimpleStation14 <Unknown>
---
 Content.Server/Implants/ImplanterSystem.cs    | 21 +++++++++++++++++++
 .../Implants/Components/ImplanterComponent.cs |  6 ++++++
 Resources/Locale/en-US/implant/implant.ftl    |  1 +
 3 files changed, 28 insertions(+)

diff --git a/Content.Server/Implants/ImplanterSystem.cs b/Content.Server/Implants/ImplanterSystem.cs
index 0d46241f41..3cfa3a9f5f 100644
--- a/Content.Server/Implants/ImplanterSystem.cs
+++ b/Content.Server/Implants/ImplanterSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Popups;
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
@@ -57,6 +58,17 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
                 return;
             }
 
+            // Check if we are trying to implant a implant which is already implanted
+            if (implant.HasValue && !component.AllowMultipleImplants && CheckSameImplant(target, implant.Value))
+            {
+                var name = Identity.Name(target, EntityManager, args.User);
+                var msg = Loc.GetString("implanter-component-implant-already", ("implant", implant), ("target", name));
+                _popup.PopupEntity(msg, target, args.User);
+                args.Handled = true;
+                return;
+            }
+
+
             //Implant self instantly, otherwise try to inject the target.
             if (args.User == target)
                 Implant(target, target, uid, component);
@@ -67,6 +79,15 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
         args.Handled = true;
     }
 
+    public bool CheckSameImplant(EntityUid target, EntityUid implant)
+    {
+        if (!TryComp<ImplantedComponent>(target, out var implanted))
+            return false;
+
+        var implantPrototype = Prototype(implant);
+        return implanted.ImplantContainer.ContainedEntities.Any(entity => Prototype(entity) == implantPrototype);
+    }
+
     /// <summary>
     /// Attempt to implant someone else.
     /// </summary>
diff --git a/Content.Shared/Implants/Components/ImplanterComponent.cs b/Content.Shared/Implants/Components/ImplanterComponent.cs
index 32a3636163..80330aa7e6 100644
--- a/Content.Shared/Implants/Components/ImplanterComponent.cs
+++ b/Content.Shared/Implants/Components/ImplanterComponent.cs
@@ -70,6 +70,12 @@ public sealed partial class ImplanterComponent : Component
     [DataField]
     public (string, string) ImplantData;
 
+    /// <summary>
+    /// Determines if the same type of implant can be implanted into an entity multiple times.
+    /// </summary>
+    [DataField]
+    public bool AllowMultipleImplants = false;
+
     /// <summary>
     /// The <see cref="ItemSlot"/> for this implanter
     /// </summary>
diff --git a/Resources/Locale/en-US/implant/implant.ftl b/Resources/Locale/en-US/implant/implant.ftl
index 22db4460af..2f6ab9e4e2 100644
--- a/Resources/Locale/en-US/implant/implant.ftl
+++ b/Resources/Locale/en-US/implant/implant.ftl
@@ -4,6 +4,7 @@ implanter-component-implanting-target = {$user} is trying to implant you with so
 implanter-component-implant-failed = The {$implant} cannot be given to {$target}!
 implanter-draw-failed-permanent = The {$implant} in {$target} is fused with them and cannot be removed!
 implanter-draw-failed = You tried to remove an implant but found nothing.
+implanter-component-implant-already = {$target} already has the {$implant}!
 
 ## UI
 implanter-draw-text = Draw

From 2961bf4375f21e7489bd6ccc35b4fb858f9d2f83 Mon Sep 17 00:00:00 2001
From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com>
Date: Thu, 20 Jun 2024 15:26:05 -0700
Subject: [PATCH 15/84] Mirror: Bumps LoneOps minimum required players to 20
 (#263)

## Mirror of PR #26244: [Bumps LoneOps minimum required players to
20](https://github.com/space-wizards/space-station-14/pull/26244) from
<img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `61e31f4062b568591448ff5be83ba8be851269e9`

PR opened by <img
src="https://avatars.githubusercontent.com/u/149967078?v=4"
width="16"/><a href="https://github.com/Boaz1111"> Boaz1111</a> at
2024-03-18 20:52:10 UTC

---

PR changed 1 files with 1 additions and 1 deletions.

The PR had the following labels:
- No C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
>
> ## About the PR
> <!-- What did you change in this PR? -->
> I bumped LoneOps minimum required players to 20
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> It was at 10, and loneops are extremely dangerous especially if
there's no sec.
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
>
> ## Media
> <!--
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
>
> If you're unsure whether your PR will require media, ask a maintainer.
>
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
>
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
>
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
>
> <!--
> Make sure to take this Changelog template out of the comment block in
order for it to show up.
> :cl:
> - add: Added fun!
> - remove: Removed fun!
> - tweak: Changed fun!
> - fix: Fixed fun!
> -->
> :cl: Boaz1111
> - tweak: Lone operatives now require a minimum of 20 players to spawn


</details>

Co-authored-by: SimpleStation14 <Unknown>
---
 Resources/Prototypes/GameRules/events.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 6812ca14f7..00ad5f54ea 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -418,9 +418,9 @@
   noSpawn: true
   components:
   - type: StationEvent
-    earliestStart: 60 # DeltaV - was 45
-    weight: 3 # DeltaV - was 5
-    minimumPlayers: 10
+    earliestStart: 60
+    weight: 3
+    minimumPlayers: 20
     reoccurrenceDelay: 30
     duration: 1
   - type: LoneOpsSpawnRule

From 282b207353233dc9182e39789303ae3ba49e3fb8 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 18:39:13 -0400
Subject: [PATCH 16/84] Apply suggestions from code review

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
---
 Content.Client/Humanoid/HumanoidAppearanceSystem.cs    | 4 ++--
 Content.Shared/Humanoid/HumanoidAppearanceComponent.cs | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index 22e2170c9f..8087d1833e 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -204,8 +204,8 @@ public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile
         humanoid.Species = profile.Species;
         humanoid.SkinColor = profile.Appearance.SkinColor;
         humanoid.EyeColor = profile.Appearance.EyeColor;
-        humanoid.Height = profile.Height; // Parkstation-HeightSlider
-        humanoid.Width = profile.Width; // Parkstation-HeightSlider
+        humanoid.Height = profile.Height;
+        humanoid.Width = profile.Width;
 
         UpdateSprite(humanoid, Comp<SpriteComponent>(uid));
     }
diff --git a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
index 09ddfb7d50..1d5e24bdda 100644
--- a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
+++ b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
@@ -85,7 +85,6 @@ public sealed partial class HumanoidAppearanceComponent : Component
     [ViewVariables(VVAccess.ReadOnly)]
     public Color? CachedFacialHairColor;
 
-    // Parkstation-HeightSlider Start
     /// <summary>
     /// DeltaV - let paradox anomaly be cloned
     /// </summary>
@@ -101,7 +100,6 @@ public sealed partial class HumanoidAppearanceComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public float Width = 1f;
-    // Parkstation-HeightSlider End
 }
 
 [DataDefinition]

From d3ed34ff4e91ea5d5a0c766711f865a6917bf394 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Date: Thu, 20 Jun 2024 16:39:30 -0700
Subject: [PATCH 17/84] Trait Points (#434)

# Description

Some improvements to loadouts too.

---

# TODO

- [x] Points logic
- [x] Server-side validation
- [x] Categorize traits
- [x] Assign points to traits
- [x] Header costs
- [x] Sort entries
- [x] Max traits
	- [x] Communicate max traits
- [x] Point bar
- [x] Group exclusivity
- Black outline on text
- [x] Fix existing component whitelists

---

<details><summary><h1>Media</h1></summary>
<p>

## Accurate except for small details


![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/c0ab2fbf-3bce-4e54-81d5-8e546d6b3c0b)

### Something to note:


![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/09a3948e-0c9f-4f57-b297-f62063b11845)


![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/35d76095-0714-4613-a17b-73df25a9a832)


![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/87149e5c-0af2-4ac0-bbde-52f317a008a0)

</p>
</details>

---

# Changelog

:cl:
- add: Added trait points
- add: Added categories for traits

---------

Co-authored-by: VMSolidus <evilexecutive@gmail.com>
---
 .../Preferences/UI/HumanoidProfileEditor.xaml |  21 +-
 .../UI/HumanoidProfileEditor.xaml.cs          | 555 ++++++++++++++----
 Content.Client/Traits/ParacusiaSystem.cs      |   3 +-
 Content.Server/Flash/FlashSystem.cs           |   2 +-
 .../Events/MassHallucinationsRule.cs          |   2 +-
 .../Traits/Assorted/ParacusiaSystem.cs        |   2 +
 Content.Server/Traits/TraitSystem.cs          |  40 +-
 .../Zombies/ZombieSystem.Transform.cs         |   2 +-
 Content.Shared/CCVar/CCVars.cs                |  24 +-
 .../Prototypes/LoadoutCategoryPrototype.cs    |   1 +
 .../Loadouts/Prototypes/LoadoutPrototype.cs   |   6 +-
 .../Loadouts/Systems/LoadoutRequirements.cs   | 375 ------------
 .../Loadouts/Systems/LoadoutSystem.cs         |  40 +-
 .../Systems/CharacterRequirements.cs          | 529 +++++++++++++++++
 .../Systems/CharacterRequirementsSystem.cs    |  43 ++
 Content.Shared/Drunk/DrunkSystem.cs           |   2 +-
 .../Preferences/HumanoidCharacterProfile.cs   |  53 +-
 .../{ => Components}/AccentlessComponent.cs   |   2 +-
 .../LegsParalyzedComponent.cs                 |   5 +-
 .../LightweightDrunkComponent.cs              |   4 +-
 .../{ => Components}/ParacusiaComponent.cs    |   3 +-
 .../PermanentBlindnessComponent.cs            |   2 +-
 .../Traits/Assorted/LegsParalyzedSystem.cs    |  58 --
 .../{ => Systems}/AccentlessSystem.cs         |   8 +-
 .../Assorted/Systems/LegsParalyzedSystem.cs   |  58 ++
 .../{ => Systems}/PermanentBlindnessSystem.cs |  20 +-
 .../{ => Systems}/SharedParacusiaSystem.cs    |   2 +-
 .../Prototypes/TraitCategoryPrototype.cs      |  14 +
 .../Traits/Prototypes/TraitPrototype.cs       |  39 ++
 Content.Shared/Traits/TraitPrototype.cs       |  55 --
 .../customization/character-requirements.ftl  |  39 ++
 .../Locale/en-US/deltav/traits/traits.ftl     |  16 +-
 .../Locale/en-US/loadouts/categories.ftl      |   5 +-
 .../en-US/loadouts/loadout-requirements.ftl   |  13 -
 .../ui/humanoid-profile-editor.ftl            |  26 +-
 .../simplestation14/Traits/disabilities.ftl   |   5 +-
 Resources/Locale/en-US/traits/categories.ftl  |   8 +
 Resources/Locale/en-US/traits/traits.ftl      |  47 +-
 .../Prototypes/DeltaV/Traits/altvision.yml    |   8 +-
 .../Prototypes/DeltaV/Traits/neutral.yml      |   7 +-
 .../Loadouts/Jobs/Heads/captain.yml           |  26 +-
 .../Loadouts/Jobs/Heads/chiefEngineer.yml     |   8 +-
 .../Jobs/Heads/chiefMedicalOfficer.yml        |  12 +-
 .../Loadouts/Jobs/Heads/headOfPersonnel.yml   |  18 +-
 .../Loadouts/Jobs/Heads/headOfSecurity.yml    |  30 +-
 .../Loadouts/Jobs/Heads/quarterMaster.yml     |  12 +-
 .../Loadouts/Jobs/Heads/researchDirector.yml  |  10 +-
 Resources/Prototypes/Loadouts/Jobs/cargo.yml  |   4 +-
 .../Prototypes/Loadouts/Jobs/engineering.yml  |  36 +-
 .../Prototypes/Loadouts/Jobs/medical.yml      |  46 +-
 .../Prototypes/Loadouts/Jobs/science.yml      |  18 +-
 .../Prototypes/Loadouts/Jobs/security.yml     |  26 +-
 .../Prototypes/Loadouts/Jobs/service.yml      |  30 +-
 Resources/Prototypes/Loadouts/categories.yml  |   9 +-
 Resources/Prototypes/Loadouts/uniform.yml     |   2 +-
 .../SimpleStation14/Traits/disabilities.yml   |  15 +-
 Resources/Prototypes/Traits/categories.yml    |  19 +
 Resources/Prototypes/Traits/disabilities.yml  |  73 ++-
 .../Prototypes/Traits/inconveniences.yml      |  18 +-
 Resources/Prototypes/Traits/neutral.yml       |  25 +-
 60 files changed, 1621 insertions(+), 960 deletions(-)
 delete mode 100644 Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
 create mode 100644 Content.Shared/Customization/Systems/CharacterRequirements.cs
 create mode 100644 Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
 rename Content.Shared/Traits/Assorted/{ => Components}/AccentlessComponent.cs (89%)
 rename Content.Shared/Traits/Assorted/{ => Components}/LegsParalyzedComponent.cs (65%)
 rename Content.Shared/Traits/Assorted/{ => Components}/LightweightDrunkComponent.cs (90%)
 rename Content.Shared/Traits/Assorted/{ => Components}/ParacusiaComponent.cs (93%)
 rename Content.Shared/Traits/Assorted/{ => Components}/PermanentBlindnessComponent.cs (81%)
 delete mode 100644 Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
 rename Content.Shared/Traits/Assorted/{ => Systems}/AccentlessSystem.cs (62%)
 create mode 100644 Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
 rename Content.Shared/Traits/Assorted/{ => Systems}/PermanentBlindnessSystem.cs (59%)
 rename Content.Shared/Traits/Assorted/{ => Systems}/SharedParacusiaSystem.cs (56%)
 create mode 100644 Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
 create mode 100644 Content.Shared/Traits/Prototypes/TraitPrototype.cs
 delete mode 100644 Content.Shared/Traits/TraitPrototype.cs
 create mode 100644 Resources/Locale/en-US/customization/character-requirements.ftl
 delete mode 100644 Resources/Locale/en-US/loadouts/loadout-requirements.ftl
 create mode 100644 Resources/Locale/en-US/traits/categories.ftl
 create mode 100644 Resources/Prototypes/Traits/categories.yml

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index 9a70d67831..38d4a411ff 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -142,18 +142,29 @@
                         <BoxContainer Name="CAntagList" Orientation="Vertical" />
                     </ScrollContainer>
                 </BoxContainer>
-                <BoxContainer Orientation="Vertical" Margin="10">
+                <BoxContainer Name="CTraitsTab" Orientation="Vertical" Margin="10">
                     <!-- Traits -->
-                    <ScrollContainer VerticalExpand="True">
-                        <BoxContainer Name="CTraitsList" Orientation="Vertical" />
-                    </ScrollContainer>
+                    <Label Name="TraitPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
+                    <ProgressBar Name="TraitPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
+
+                    <Button Name="TraitsShowUnusableButton"
+                            Text="{Loc 'humanoid-profile-editor-traits-show-unusable-button'}"
+                            ToolTip="{Loc 'humanoid-profile-editor-traits-show-unusable-button-tooltip'}"
+                            ToggleMode="True"
+                            Margin="0 0 0 5" />
+
+                    <TabContainer Name="CTraitsTabs" VerticalExpand="True" />
                 </BoxContainer>
                 <BoxContainer Name="CLoadoutsTab" Orientation="Vertical" Margin="10">
                     <!-- Loadouts -->
                     <Label Name="LoadoutPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
                     <ProgressBar Name="LoadoutPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
 
-                    <Button Name="CHideShowUnusableButton" Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}" ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}" ToggleMode="True" Margin="0 0 0 5" />
+                    <Button Name="LoadoutsShowUnusableButton"
+                            Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}"
+                            ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}"
+                            ToggleMode="True"
+                            Margin="0 0 0 5" />
 
                     <TabContainer Name="CLoadoutsTabs" VerticalExpand="True" />
                 </BoxContainer>
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 8b88fc1e9b..fd84b67522 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -12,6 +12,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Clothing.Loadouts.Prototypes;
 using Content.Shared.Clothing.Loadouts.Systems;
+using Content.Shared.Customization.Systems;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
@@ -61,6 +62,7 @@ public sealed partial class HumanoidProfileEditor : Control
         private readonly IConfigurationManager _configurationManager;
         private readonly MarkingManager _markingManager;
         private readonly JobRequirementsManager _requirements;
+        private readonly CharacterRequirementsSystem _characterRequirementsSystem;
         private readonly LoadoutSystem _loadoutSystem;
 
         private LineEdit _ageEdit => CAgeEdit;
@@ -83,10 +85,15 @@ public sealed partial class HumanoidProfileEditor : Control
         private TabContainer _tabContainer => CTabContainer;
         private BoxContainer _jobList => CJobList;
         private BoxContainer _antagList => CAntagList;
-        private BoxContainer _traitsList => CTraitsList;
+        private Label _traitPointsLabel => TraitPointsLabel;
+        private int _traitCount;
+        private ProgressBar _traitPointsBar => TraitPointsBar;
+        private Button _traitsShowUnusableButton => TraitsShowUnusableButton;
+        private BoxContainer _traitsTab => CTraitsTab;
+        private TabContainer _traitsTabs => CTraitsTabs;
         private Label _loadoutPointsLabel => LoadoutPointsLabel;
         private ProgressBar _loadoutPointsBar => LoadoutPointsBar;
-        private Button _loadoutsShowUnusableButton => CHideShowUnusableButton;
+        private Button _loadoutsShowUnusableButton => LoadoutsShowUnusableButton;
         private BoxContainer _loadoutsTab => CLoadoutsTab;
         private TabContainer _loadoutsTabs => CLoadoutsTabs;
         private readonly List<JobPrioritySelector> _jobPriorities;
@@ -124,6 +131,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _preferencesManager = preferencesManager;
             _configurationManager = configurationManager;
             _markingManager = IoCManager.Resolve<MarkingManager>();
+            _characterRequirementsSystem = EntitySystem.Get<CharacterRequirementsSystem>();
             _loadoutSystem = EntitySystem.Get<LoadoutSystem>();
 
             SpeciesInfoButton.ToolTip = Loc.GetString("humanoid-profile-editor-guidebook-button-tooltip");
@@ -444,33 +452,19 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             #region Traits
 
-            var traits = prototypeManager.EnumeratePrototypes<TraitPrototype>().OrderBy(t => Loc.GetString(t.Name)).ToList();
-            _traitPreferences = new List<TraitPreferenceSelector>();
+            // Set up the traits tab
             _tabContainer.SetTabTitle(3, Loc.GetString("humanoid-profile-editor-traits-tab"));
+            _traitPreferences = new List<TraitPreferenceSelector>();
 
-            if (traits.Count > 0)
-            {
-                foreach (var trait in traits)
-                {
-                    var selector = new TraitPreferenceSelector(trait);
-                    _traitsList.AddChild(selector);
-                    _traitPreferences.Add(selector);
+            // Show/Hide the traits tab if they ever get enabled/disabled
+            var traitsEnabled = _configurationManager.GetCVar(CCVars.GameTraitsEnabled);
+            _tabContainer.SetTabVisible(3, traitsEnabled);
+            _configurationManager.OnValueChanged(CCVars.GameTraitsEnabled,
+                enabled => _tabContainer.SetTabVisible(3, enabled));
 
-                    selector.PreferenceChanged += preference =>
-                    {
-                        Profile = Profile?.WithTraitPreference(trait.ID, preference);
-                        IsDirty = true;
-                    };
-                }
-            }
-            else
-            {
-                _traitsList.AddChild(new Label
-                {
-                    Text = "No traits available :(",
-                    FontColorOverride = Color.Gray,
-                });
-            }
+            _traitsShowUnusableButton.OnToggled += args => UpdateTraits(args.Pressed);
+
+            UpdateTraits(false);
 
             #endregion
 
@@ -480,14 +474,17 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _tabContainer.SetTabTitle(4, Loc.GetString("humanoid-profile-editor-loadouts-tab"));
             _loadoutPreferences = new List<LoadoutPreferenceSelector>();
 
-            // Show/Hide loadouts tab if they ever get enabled/disabled
+            // Show/Hide the loadouts tab if they ever get enabled/disabled
             var loadoutsEnabled = _configurationManager.GetCVar(CCVars.GameLoadoutsEnabled);
             _tabContainer.SetTabVisible(4, loadoutsEnabled);
             ShowLoadouts.Visible = loadoutsEnabled;
-            _configurationManager.OnValueChanged(CCVars.GameLoadoutsEnabled, enabled => LoadoutsChanged(enabled));
+            _configurationManager.OnValueChanged(CCVars.GameLoadoutsEnabled,
+                enabled => LoadoutsChanged(enabled));
 
             _loadoutsShowUnusableButton.OnToggled += args => UpdateLoadouts(args.Pressed);
 
+            UpdateLoadouts(false);
+
             #endregion
 
             #region Save
@@ -542,8 +539,6 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _previewDummy = _entMan.SpawnEntity(dollProto, MapCoordinates.Nullspace);
             _previewSpriteView.SetEntity(_previewDummy);
 
-            UpdateLoadouts(false); // Initial UpdateLoadouts call has to have a dummy to get information from
-
             #endregion Dummy
 
             #endregion Left
@@ -562,6 +557,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             IsDirty = false;
         }
 
+
         private void LoadoutsChanged(bool enabled)
         {
             _tabContainer.SetTabVisible(4, enabled);
@@ -1449,12 +1445,264 @@ private void UpdateAntagPreferences()
 
         private void UpdateTraitPreferences()
         {
+            var points = _configurationManager.GetCVar(CCVars.GameTraitsDefaultPoints);
+            _traitCount = 0;
+
             foreach (var preferenceSelector in _traitPreferences)
             {
                 var traitId = preferenceSelector.Trait.ID;
                 var preference = Profile?.TraitPreferences.Contains(traitId) ?? false;
 
                 preferenceSelector.Preference = preference;
+
+                if (!preference)
+                    continue;
+
+                points += preferenceSelector.Trait.Points;
+                _traitCount += 1;
+            }
+
+            _traitPointsBar.Value = points;
+            _traitPointsLabel.Text = Loc.GetString("humanoid-profile-editor-traits-header",
+                ("points", points), ("traits", _traitCount),
+                ("maxTraits", _configurationManager.GetCVar(CCVars.GameTraitsMax)));
+        }
+
+        // Yeah this is mostly just copied from UpdateLoadouts
+        // This whole file is bad though and a lot of loadout code came from traits originally
+        //TODO Make this file not hell
+        private void UpdateTraits(bool showUnusable)
+        {
+            // Reset trait points so you don't get -14 points or something for no reason
+            var points = _configurationManager.GetCVar(CCVars.GameTraitsDefaultPoints);
+            _traitPointsLabel.Text = Loc.GetString("humanoid-profile-editor-traits-header",
+                ("points", points), ("traits", 0),
+                ("maxTraits", _configurationManager.GetCVar(CCVars.GameTraitsMax)));
+            _traitPointsBar.MaxValue = points;
+            _traitPointsBar.Value = points;
+
+            // Clear current listings
+            _traitPreferences.Clear();
+            _traitsTabs.DisposeAllChildren();
+
+
+            // Get the highest priority job to use for trait filtering
+            var highJob = _jobPriorities.FirstOrDefault(j => j.Priority == JobPriority.High);
+
+            // Get all trait prototypes
+            var enumeratedTraits = _prototypeManager.EnumeratePrototypes<TraitPrototype>().ToList();
+            // Get all trait categories
+            var categories = _prototypeManager.EnumeratePrototypes<TraitCategoryPrototype>().ToList();
+
+            // If showUnusable is false filter out traits that are unusable based on your current character setup
+            var traits = enumeratedTraits.Where(trait =>
+                showUnusable || // Ignore everything if this is true
+                _characterRequirementsSystem.CheckRequirementsValid(
+                    trait,
+                    trait.Requirements,
+                    highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                    new Dictionary<string, TimeSpan>(), //TODO Make this use real playtimes
+                    _entMan,
+                    _prototypeManager,
+                    _configurationManager,
+                    out _
+                )
+            ).ToList();
+
+            // Traits to highlight red when showUnusable is true
+            var traitsUnusable = enumeratedTraits.Where(trait =>
+                _characterRequirementsSystem.CheckRequirementsValid(
+                    trait,
+                    trait.Requirements,
+                    highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                    new Dictionary<string, TimeSpan>(),
+                    _entMan,
+                    _prototypeManager,
+                    _configurationManager,
+                    out _
+                )
+            ).ToList();
+
+            // Every trait not in the traits list
+            var otherTraits = enumeratedTraits.Where(trait => !traits.Contains(trait)).ToList();
+
+
+            if (traits.Count == 0)
+            {
+                _traitsTab.AddChild(new Label { Text = Loc.GetString("humanoid-profile-editor-traits-no-traits") });
+                return;
+            }
+
+            // Make Uncategorized category
+            var uncategorized = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                VerticalExpand = true,
+                Name = "Uncategorized_0",
+                // I hate ScrollContainers
+                Children =
+                {
+                    new ScrollContainer
+                    {
+                        HScrollEnabled = false,
+                        HorizontalExpand = true,
+                        VerticalExpand = true,
+                        Children =
+                        {
+                            new BoxContainer
+                            {
+                                Orientation = LayoutOrientation.Vertical,
+                                HorizontalExpand = true,
+                                VerticalExpand = true,
+                            },
+                        },
+                    },
+                },
+            };
+
+            _traitsTabs.AddChild(uncategorized);
+            _traitsTabs.SetTabTitle(0, Loc.GetString("trait-category-Uncategorized"));
+
+
+            // Make categories
+            var currentCategory = 1; // 1 because we already made 0 as Uncategorized, I am not not zero-indexing :)
+            foreach (var category in categories.OrderBy(c => Loc.GetString($"trait-category-{c.ID}")))
+            {
+                // Check for existing category
+                BoxContainer? match = null;
+                foreach (var child in _traitsTabs.Children)
+                {
+                    if (string.IsNullOrEmpty(child.Name))
+                        continue;
+
+                    if (child.Name.Split("_")[0] == category.ID)
+                        match = (BoxContainer) child;
+                }
+
+                // If there is a category do nothing
+                if (match != null)
+                    continue;
+
+                // If not, make it
+                var box = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Vertical,
+                    VerticalExpand = true,
+                    Name = $"{category.ID}_{currentCategory}",
+                    // I hate ScrollContainers
+                    Children =
+                    {
+                        new ScrollContainer
+                        {
+                            HScrollEnabled = false,
+                            HorizontalExpand = true,
+                            VerticalExpand = true,
+                            Children =
+                            {
+                                new BoxContainer
+                                {
+                                    Orientation = LayoutOrientation.Vertical,
+                                    HorizontalExpand = true,
+                                    VerticalExpand = true,
+                                },
+                            },
+                        },
+                    },
+                };
+
+                _traitsTabs.AddChild(box);
+                _traitsTabs.SetTabTitle(currentCategory, Loc.GetString($"trait-category-{category.ID}"));
+                currentCategory++;
+            }
+
+
+            // Fill categories
+            foreach (var trait in traits.OrderBy(t => -t.Points).ThenBy(t => Loc.GetString($"trait-name-{t.ID}")))
+            {
+                var selector = new TraitPreferenceSelector(trait, highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                    traitsUnusable.Contains(trait) ? "" : "ButtonColorRed",
+                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
+
+                // Look for an existing trait category
+                BoxContainer? match = null;
+                foreach (var child in _traitsTabs.Children)
+                {
+                    if (string.IsNullOrEmpty(child.Name))
+                        continue;
+
+                    // This is fucked up
+                    if (child.Name.Split("_")[0] == trait.Category
+                        && child.Children.FirstOrDefault()?.Children.FirstOrDefault(g =>
+                            g.GetType() == typeof(BoxContainer)) is {} g != default)
+                        match = (BoxContainer) g;
+                }
+
+                // If there is no category put it in Uncategorized
+                if (string.IsNullOrEmpty(match?.Parent?.Parent?.Name)
+                    || match.Parent.Parent.Name.Split("_")[0] != trait.Category)
+                    uncategorized.AddChild(selector);
+                else
+                    match.AddChild(selector);
+
+
+                AddSelector(selector, trait.Points, trait.ID);
+            }
+
+            // Add the selected unusable traits to the point counter
+            foreach (var trait in otherTraits.OrderBy(t => -t.Points).ThenBy(t => Loc.GetString($"trait-name-{t.ID}")))
+            {
+                var selector = new TraitPreferenceSelector(trait, highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "",
+                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
+
+
+                AddSelector(selector, trait.Points, trait.ID);
+            }
+
+
+            // Hide Uncategorized tab if it's empty, other tabs already shouldn't exist if they're empty
+            _traitsTabs.SetTabVisible(0, uncategorized.Children.Any());
+
+            // Add fake tabs until tab container is happy
+            for (var i = _traitsTabs.ChildCount - 1; i < _traitsTabs.CurrentTab; i++)
+            {
+                _traitsTabs.AddChild(new BoxContainer());
+                _traitsTabs.SetTabVisible(i + 1, false);
+            }
+
+            UpdateTraitPreferences();
+            return;
+
+
+            void AddSelector(TraitPreferenceSelector selector, int points, string id)
+            {
+                if (points > 0)
+                    _traitPointsBar.MaxValue += points;
+
+                _traitPreferences.Add(selector);
+                selector.PreferenceChanged += preference =>
+                {
+                    // Make sure they have enough trait points
+                    preference = preference ? CheckPoints(points, preference) : CheckPoints(-points, preference);
+                    // Don't allow having too many traits
+                    preference = preference && _traitCount + 1 <= _configurationManager.GetCVar(CCVars.GameTraitsMax);
+
+                    // Update Preferences
+                    Profile = Profile?.WithTraitPreference(id, preference);
+                    IsDirty = true;
+                    UpdateTraitPreferences();
+                    UpdateTraits(_traitsShowUnusableButton.Pressed);
+                    UpdateLoadouts(_loadoutsShowUnusableButton.Pressed);
+                };
+            }
+
+            bool CheckPoints(int points, bool preference)
+            {
+                var temp = _traitPointsBar.Value + points;
+                return preference ? !(temp < 0) : temp < 0;
             }
         }
 
@@ -1498,15 +1746,18 @@ private void UpdateLoadouts(bool showUnusable)
 
             // Get all loadout prototypes
             var enumeratedLoadouts = _prototypeManager.EnumeratePrototypes<LoadoutPrototype>().ToList();
+            // Get all loadout categories
+            var categories = _prototypeManager.EnumeratePrototypes<LoadoutCategoryPrototype>().ToList();
 
             // If showUnusable is false filter out loadouts that are unusable based on your current character setup
             var loadouts = enumeratedLoadouts.Where(loadout =>
                 showUnusable || // Ignore everything if this is true
-                _loadoutSystem.CheckRequirementsValid(
+                _characterRequirementsSystem.CheckRequirementsValid(
+                    loadout,
                     loadout.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(),
+                    new Dictionary<string, TimeSpan>(), //TODO Make this use real playtimes
                     _entMan,
                     _prototypeManager,
                     _configurationManager,
@@ -1516,7 +1767,8 @@ out _
 
             // Loadouts to highlight red when showUnusable is true
             var loadoutsUnusable = enumeratedLoadouts.Where(loadout =>
-                _loadoutSystem.CheckRequirementsValid(
+                _characterRequirementsSystem.CheckRequirementsValid(
+                    loadout,
                     loadout.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
@@ -1544,23 +1796,47 @@ out _
                 Orientation = LayoutOrientation.Vertical,
                 VerticalExpand = true,
                 Name = "Uncategorized_0",
+                // I hate ScrollContainers
+                Children =
+                {
+                    new ScrollContainer
+                    {
+                        HScrollEnabled = false,
+                        HorizontalExpand = true,
+                        VerticalExpand = true,
+                        Children =
+                        {
+                            new BoxContainer
+                            {
+                                Orientation = LayoutOrientation.Vertical,
+                                HorizontalExpand = true,
+                                VerticalExpand = true,
+                            },
+                        },
+                    },
+                },
             };
 
             _loadoutsTabs.AddChild(uncategorized);
-            _loadoutsTabs.SetTabTitle(0, Loc.GetString("humanoid-profile-editor-loadouts-uncategorized-tab"));
+            _loadoutsTabs.SetTabTitle(0, Loc.GetString("loadout-category-Uncategorized"));
+
 
             // Make categories
             var currentCategory = 1; // 1 because we already made 0 as Uncategorized, I am not not zero-indexing :)
-            foreach (var loadout in loadouts.OrderBy(l => l.Category))
+            foreach (var category in categories.OrderBy(c => Loc.GetString($"loadout-category-{c.ID}")))
             {
                 // Check for existing category
                 BoxContainer? match = null;
                 foreach (var child in _loadoutsTabs.Children)
                 {
-                    if (match != null || child.Name == null)
+                    if (string.IsNullOrEmpty(child.Name))
                         continue;
-                    if (child.Name.Split("_")[0] == loadout.Category)
-                        match = (BoxContainer) child;
+
+                    // This is fucked up
+                    if (child.Name.Split("_")[0] == category.ID
+                        && child.Children.FirstOrDefault()?.Children.FirstOrDefault(g =>
+                            g.GetType() == typeof(BoxContainer)) is {} g != default)
+                        match = (BoxContainer) g;
                 }
 
                 // If there is a category do nothing
@@ -1572,7 +1848,7 @@ out _
                 {
                     Orientation = LayoutOrientation.Vertical,
                     VerticalExpand = true,
-                    Name = $"{loadout.Category}_{currentCategory}",
+                    Name = $"{category.ID}_{currentCategory}",
                     // I hate ScrollContainers
                     Children =
                     {
@@ -1595,23 +1871,24 @@ out _
                 };
 
                 _loadoutsTabs.AddChild(box);
-                _loadoutsTabs.SetTabTitle(currentCategory, Loc.GetString($"loadout-category-{loadout.Category}"));
+                _loadoutsTabs.SetTabTitle(currentCategory, Loc.GetString($"loadout-category-{category.ID}"));
                 currentCategory++;
             }
 
+
             // Fill categories
-            foreach (var loadout in loadouts.OrderBy(l => l.ID))
+            foreach (var loadout in loadouts.OrderBy(l => l.Cost).ThenBy(l => Loc.GetString($"loadout-{l.ID}-name")))
             {
                 var selector = new LoadoutPreferenceSelector(loadout, highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    loadoutsUnusable.Contains(loadout) ? "" : "ButtonColorRed", _entMan, _prototypeManager,
-                    _configurationManager, _loadoutSystem);
+                    loadoutsUnusable.Contains(loadout) ? "" : "ButtonColorRed",
+                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
 
                 // Look for an existing loadout category
                 BoxContainer? match = null;
                 foreach (var child in _loadoutsTabs.Children)
                 {
-                    if (match != null || child.Name == null)
+                    if (string.IsNullOrEmpty(child.Name))
                         continue;
 
                     if (child.Name.Split("_")[0] == loadout.Category)
@@ -1619,80 +1896,30 @@ out _
                 }
 
                 // If there is no category put it in Uncategorized
-                if (match?.Parent?.Parent?.Name == null)
+                if (string.IsNullOrEmpty(match?.Parent?.Parent?.Name)
+                    || match.Parent.Parent.Name.Split("_")[0] != loadout.Category)
                     uncategorized.AddChild(selector);
                 else
                     match.AddChild(selector);
 
-                _loadoutPreferences.Add(selector);
-                selector.PreferenceChanged += preference =>
-                {
-                    // Make sure they have enough loadout points
-                    if (preference)
-                    {
-                        var temp = _loadoutPointsBar.Value - loadout.Cost;
-                        if (temp < 0)
-                            preference = false;
-                        else
-                        {
-                            _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
-                                ("points", temp), ("max", _loadoutPointsBar.MaxValue));
-                            _loadoutPointsBar.Value = temp;
-                        }
-                    }
-                    else
-                    {
-                        _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
-                            ("points", _loadoutPointsBar.Value), ("max", _loadoutPointsBar.MaxValue));
-                        _loadoutPointsBar.Value += loadout.Cost;
-                    }
-                    // Update Preference
-                    Profile = Profile?.WithLoadoutPreference(loadout.ID, preference);
-                    IsDirty = true;
-                    UpdateLoadoutPreferences();
-                };
+
+                AddSelector(selector, loadout.Cost, loadout.ID);
             }
 
             // Add the selected unusable loadouts to the point counter
-            foreach (var loadout in otherLoadouts.OrderBy(l => l.ID))
+            foreach (var loadout in otherLoadouts.OrderBy(l => l.Cost).ThenBy(l => Loc.GetString($"loadout-{l.ID}-name")))
             {
                 var selector = new LoadoutPreferenceSelector(loadout, highJob?.Proto ?? new JobPrototype(),
-                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "", _entMan, _prototypeManager,
-                    _configurationManager, _loadoutSystem);
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "",
+                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
 
-                _loadoutPreferences.Add(selector);
-                selector.PreferenceChanged += preference =>
-                {
-                    // Make sure they have enough loadout points
-                    if (preference)
-                    {
-                        var temp = _loadoutPointsBar.Value - loadout.Cost;
-                        if (temp < 0)
-                            preference = false;
-                        else
-                        {
-                            _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
-                                ("points", temp), ("max", _loadoutPointsBar.MaxValue));
-                            _loadoutPointsBar.Value = temp;
-                        }
-                    }
-                    else
-                    {
-                        _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
-                            ("points", _loadoutPointsBar.Value), ("max", _loadoutPointsBar.MaxValue));
-                        _loadoutPointsBar.Value += loadout.Cost;
-                    }
-                    // Update Preference
-                    Profile = Profile?.WithLoadoutPreference(loadout.ID, preference);
-                    IsDirty = true;
-                    UpdateLoadoutPreferences();
-                };
+
+                AddSelector(selector, loadout.Cost, loadout.ID);
             }
 
 
             // Hide Uncategorized tab if it's empty, other tabs already shouldn't exist if they're empty
-            if (!uncategorized.Children.Any())
-                _loadoutsTabs.SetTabVisible(0, false);
+            _loadoutsTabs.SetTabVisible(0, uncategorized.Children.Any());
 
             // Add fake tabs until tab container is happy
             for (var i = _loadoutsTabs.ChildCount - 1; i < _loadoutsTabs.CurrentTab; i++)
@@ -1702,6 +1929,31 @@ out _
             }
 
             UpdateLoadoutPreferences();
+            return;
+
+
+            void AddSelector(LoadoutPreferenceSelector selector, int points, string id)
+            {
+                _loadoutPreferences.Add(selector);
+                selector.PreferenceChanged += preference =>
+                {
+                    // Make sure they have enough loadout points
+                    preference = preference ? CheckPoints(points, preference) : CheckPoints(-points, preference);
+
+                    // Update Preferences
+                    Profile = Profile?.WithLoadoutPreference(id, preference);
+                    IsDirty = true;
+                    UpdateLoadoutPreferences();
+                    UpdateLoadouts(_loadoutsShowUnusableButton.Pressed);
+                    UpdateTraits(_traitsShowUnusableButton.Pressed);
+                };
+            }
+
+            bool CheckPoints(int points, bool preference)
+            {
+                var temp = _loadoutPointsBar.Value + points;
+                return preference ? !(temp < 0) : temp < 0;
+            }
         }
 
 
@@ -1753,19 +2005,68 @@ public bool Preference
 
             public event Action<bool>? PreferenceChanged;
 
-            public TraitPreferenceSelector(TraitPrototype trait)
+            public TraitPreferenceSelector(TraitPrototype trait, JobPrototype highJob,
+                HumanoidCharacterProfile profile, string style, IEntityManager entityManager, IPrototypeManager prototypeManager,
+                IConfigurationManager configManager, CharacterRequirementsSystem characterRequirementsSystem)
             {
                 Trait = trait;
 
-                _button = new Button {Text = Loc.GetString(trait.Name)};
-                _button.ToggleMode = true;
+                // Create a checkbox to get the loadout
+                _button = new Button
+                {
+                    VerticalAlignment = VAlignment.Center,
+                    ToggleMode = true,
+                    StyleClasses = { StyleBase.ButtonOpenLeft },
+                    Children =
+                    {
+                        new BoxContainer
+                        {
+                            Children =
+                            {
+                                new Label
+                                {
+                                    Text = trait.Points.ToString(),
+                                    StyleClasses = { StyleBase.StyleClassLabelHeading },
+                                    MinWidth = 32,
+                                    MaxWidth = 32,
+                                    ClipText = true,
+                                    Margin = new Thickness(0, 0, 8, 0),
+                                },
+                                new Label { Text = Loc.GetString($"trait-name-{trait.ID}") },
+                            },
+                        },
+                    },
+                };
                 _button.OnToggled += OnButtonToggled;
+                _button.AddStyleClass(style);
+
+                var tooltip = new StringBuilder();
+                // Add the loadout description to the tooltip if there is one
+                var desc = Loc.GetString($"trait-description-{trait.ID}");
+                if (!string.IsNullOrEmpty(desc) && desc != $"trait-description-{trait.ID}")
+                    tooltip.Append(desc);
+
+
+                // Get requirement reasons
+                characterRequirementsSystem.CheckRequirementsValid(trait, trait.Requirements, highJob, profile,
+                    new Dictionary<string, TimeSpan>(),
+                    entityManager, prototypeManager, configManager,
+                    out var reasons);
 
-                if (trait.Description is { } desc)
+                // Add requirement reasons to the tooltip
+                foreach (var reason in reasons)
+                    tooltip.Append($"\n{reason.ToMarkup()}");
+
+                // Combine the tooltip and format it in the checkbox supplier
+                if (tooltip.Length > 0)
                 {
-                    _button.ToolTip = Loc.GetString(desc);
+                    var formattedTooltip = new Tooltip();
+                    formattedTooltip.SetMessage(FormattedMessage.FromMarkupPermissive(tooltip.ToString()));
+                    _button.TooltipSupplier = _ => formattedTooltip;
                 }
 
+
+                // Add the loadout preview and the checkbox to the control
                 AddChild(new BoxContainer
                 {
                     Orientation = LayoutOrientation.Horizontal,
@@ -1794,7 +2095,7 @@ public bool Preference
 
             public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
                 HumanoidCharacterProfile profile, string style, IEntityManager entityManager, IPrototypeManager prototypeManager,
-                IConfigurationManager configManager, LoadoutSystem loadoutSystem)
+                IConfigurationManager configManager, CharacterRequirementsSystem characterRequirementsSystem)
             {
                 Loadout = loadout;
 
@@ -1816,11 +2117,32 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
                 // Create a checkbox to get the loadout
                 _button = new Button
                 {
-                    Text = $"[{loadout.Cost}] {(Loc.GetString($"loadout-name-{loadout.ID}") == $"loadout-name-{loadout.ID}"
-                        ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityName
-                        : Loc.GetString($"loadout-name-{loadout.ID}"))}",
-                    VerticalAlignment = VAlignment.Center,
                     ToggleMode = true,
+                    StyleClasses = { StyleBase.ButtonOpenLeft },
+                    Children =
+                    {
+                        new BoxContainer
+                        {
+                            Children =
+                            {
+                                new Label
+                                {
+                                    Text = loadout.Cost.ToString(),
+                                    StyleClasses = { StyleBase.StyleClassLabelHeading },
+                                    MinWidth = 32,
+                                    MaxWidth = 32,
+                                    ClipText = true,
+                                    Margin = new Thickness(0, 0, 8, 0),
+                                },
+                                new Label
+                                {
+                                    Text = Loc.GetString($"loadout-name-{loadout.ID}") == $"loadout-name-{loadout.ID}"
+                                        ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityName
+                                        : Loc.GetString($"loadout-name-{loadout.ID}"),
+                                },
+                            },
+                        },
+                    },
                 };
                 _button.OnToggled += OnButtonToggled;
                 _button.AddStyleClass(style);
@@ -1835,7 +2157,10 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
 
 
                 // Get requirement reasons
-                loadoutSystem.CheckRequirementsValid(loadout.Requirements, highJob, profile, new Dictionary<string, TimeSpan>(), entityManager, prototypeManager, configManager, out var reasons);
+                characterRequirementsSystem.CheckRequirementsValid(loadout, loadout.Requirements, highJob, profile,
+                    new Dictionary<string, TimeSpan>(),
+                    entityManager, prototypeManager, configManager,
+                    out var reasons);
 
                 // Add requirement reasons to the tooltip
                 foreach (var reason in reasons)
diff --git a/Content.Client/Traits/ParacusiaSystem.cs b/Content.Client/Traits/ParacusiaSystem.cs
index 3789f24cb0..d01c7c0005 100644
--- a/Content.Client/Traits/ParacusiaSystem.cs
+++ b/Content.Client/Traits/ParacusiaSystem.cs
@@ -1,11 +1,12 @@
 using System.Numerics;
-using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Random;
 using Robust.Client.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Client.Traits;
 
diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
index fe7eb81d1e..013ee37a41 100644
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -14,13 +14,13 @@
 using Content.Shared.Inventory;
 using Content.Shared.Physics;
 using Content.Shared.Tag;
-using Content.Shared.Traits.Assorted;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Timing;
 using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Flash
 {
diff --git a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
index 722a489541..4fc158f864 100644
--- a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
+++ b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
@@ -2,7 +2,7 @@
 using Content.Server.StationEvents.Components;
 using Content.Server.Traits.Assorted;
 using Content.Shared.Mind.Components;
-using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/Traits/Assorted/ParacusiaSystem.cs b/Content.Server/Traits/Assorted/ParacusiaSystem.cs
index 4b0205ff53..cf08e09e90 100644
--- a/Content.Server/Traits/Assorted/ParacusiaSystem.cs
+++ b/Content.Server/Traits/Assorted/ParacusiaSystem.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Audio;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Traits.Assorted;
 
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 22ee0e4861..be2c3c0503 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -1,7 +1,13 @@
+using System.Linq;
 using Content.Server.GameTicking;
+using Content.Server.Players.PlayTimeTracking;
+using Content.Shared.Customization.Systems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Roles;
 using Content.Shared.Traits;
+using Pidgin.Configuration;
+using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager;
 
@@ -9,9 +15,12 @@ namespace Content.Server.Traits;
 
 public sealed class TraitSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly ISerializationManager _serializationManager = default!;
-    [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly ISerializationManager _serialization = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly CharacterRequirementsSystem _characterRequirements = default!;
+    [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
 
     public override void Initialize()
     {
@@ -25,16 +34,17 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
     {
         foreach (var traitId in args.Profile.TraitPreferences)
         {
-            if (!_prototypeManager.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
+            if (!_prototype.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
             {
                 Log.Warning($"No trait found with ID {traitId}!");
                 return;
             }
 
-            if (traitPrototype.Whitelist != null && !traitPrototype.Whitelist.IsValid(args.Mob))
-                continue;
-
-            if (traitPrototype.Blacklist != null && traitPrototype.Blacklist.IsValid(args.Mob))
+            if (!_characterRequirements.CheckRequirementsValid(traitPrototype, traitPrototype.Requirements,
+                _prototype.Index<JobPrototype>(args.JobId ?? _prototype.EnumeratePrototypes<JobPrototype>().First().ID),
+                args.Profile, _playTimeTracking.GetTrackerTimes(args.Player),
+                EntityManager, _prototype, _configuration,
+                out _))
                 continue;
 
             // Add all components required by the prototype
@@ -43,22 +53,10 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
                 if (HasComp(args.Mob, entry.Component.GetType()))
                     continue;
 
-                var comp = (Component) _serializationManager.CreateCopy(entry.Component, notNullableOverride: true);
+                var comp = (Component) _serialization.CreateCopy(entry.Component, notNullableOverride: true);
                 comp.Owner = args.Mob;
                 EntityManager.AddComponent(args.Mob, comp);
             }
-
-            // Add item required by the trait
-            if (traitPrototype.TraitGear != null)
-            {
-                if (!TryComp(args.Mob, out HandsComponent? handsComponent))
-                    continue;
-
-                var coords = Transform(args.Mob).Coordinates;
-                var inhandEntity = EntityManager.SpawnEntity(traitPrototype.TraitGear, coords);
-                _sharedHandsSystem.TryPickup(args.Mob, inhandEntity, checkActionBlocker: false,
-                    handsComp: handsComponent);
-            }
         }
     }
 }
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index daadd4b518..996d777223 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -35,8 +35,8 @@
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Zombies;
 using Content.Shared.Prying.Components;
-using Content.Shared.Traits.Assorted;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Zombies
 {
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 5aaf967dd1..ab36977efb 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -341,14 +341,34 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> DebugCoordinatesAdminOnly =
             CVarDef.Create("game.debug_coordinates_admin_only", true, CVar.SERVER | CVar.REPLICATED);
 
+
+        /// <summary>
+        ///     Whether to allow characters to select traits.
+        /// </summary>
+        public static readonly CVarDef<bool> GameTraitsEnabled =
+            CVarDef.Create("game.traits_enabled", true, CVar.REPLICATED);
+
+        /// <summary>
+        ///     How many traits a character can have at most.
+        /// </summary>
+        public static readonly CVarDef<int> GameTraitsMax =
+            CVarDef.Create("game.traits_max", 5, CVar.REPLICATED);
+
+        /// <summary>
+        ///     How many points a character should start with.
+        /// </summary>
+        public static readonly CVarDef<int> GameTraitsDefaultPoints =
+            CVarDef.Create("game.traits_default_points", 5, CVar.REPLICATED);
+
+
         /// <summary>
-        /// Whether or not to allow characters to select loadout items.
+        ///     Whether to allow characters to select loadout items.
         /// </summary>
         public static readonly CVarDef<bool> GameLoadoutsEnabled =
             CVarDef.Create("game.loadouts_enabled", true, CVar.REPLICATED);
 
         /// <summary>
-        /// How many points to give to each player for loadouts.
+        ///     How many points to give to each player for loadouts.
         /// </summary>
         public static readonly CVarDef<int> GameLoadoutsPoints =
             CVarDef.Create("game.loadouts_points", 14, CVar.REPLICATED);
diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
index 5dd880d3f1..445cbc10e6 100644
--- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
+++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
@@ -2,6 +2,7 @@
 
 namespace Content.Shared.Clothing.Loadouts.Prototypes;
 
+
 /// <summary>
 ///     A prototype defining a valid category for <see cref="LoadoutPrototype"/>s to go into.
 /// </summary>
diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
index bc31fc1570..9ca575fa72 100644
--- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
+++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
@@ -1,10 +1,12 @@
 using Content.Shared.Clothing.Loadouts.Systems;
+using Content.Shared.Customization.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Clothing.Loadouts.Prototypes;
 
+
 [Prototype("loadout")]
 public sealed class LoadoutPrototype : IPrototype
 {
@@ -17,7 +19,7 @@ public sealed class LoadoutPrototype : IPrototype
     /// <summary>
     ///     Which tab category to put this under
     /// </summary>
-    [DataField(customTypeSerializer:typeof(PrototypeIdSerializer<LoadoutCategoryPrototype>))]
+    [DataField, ValidatePrototypeId<LoadoutCategoryPrototype>]
     public string Category = "Uncategorized";
 
     /// <summary>
@@ -41,5 +43,5 @@ public sealed class LoadoutPrototype : IPrototype
 
 
     [DataField]
-    public List<LoadoutRequirement> Requirements = new();
+    public List<CharacterRequirement> Requirements = new();
 }
diff --git a/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs b/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
deleted file mode 100644
index b76a31e422..0000000000
--- a/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
+++ /dev/null
@@ -1,375 +0,0 @@
-using System.Linq;
-using Content.Shared.CCVar;
-using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.Players.PlayTimeTracking;
-using Content.Shared.Preferences;
-using Content.Shared.Roles;
-using Content.Shared.Roles.Jobs;
-using Content.Shared.Traits;
-using JetBrains.Annotations;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.Clothing.Loadouts.Systems;
-
-[ImplicitDataDefinitionForInheritors, MeansImplicitUse]
-[Serializable, NetSerializable]
-public abstract partial class LoadoutRequirement
-{
-    /// <summary>
-    ///     If true valid requirements will be treated as invalid and vice versa
-    /// </summary>
-    [DataField]
-    public bool Inverted = false;
-
-    /// <summary>
-    ///     Checks if this loadout requirement is valid for the given parameters
-    /// </summary>
-    /// <param name="reason">Description for the requirement, shown when not null</param>
-    public abstract bool IsValid(
-        JobPrototype job,
-        HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager,
-        IPrototypeManager prototypeManager,
-        IConfigurationManager configManager,
-        out FormattedMessage? reason
-    );
-}
-
-
-#region HumanoidCharacterProfile
-
-/// <summary>
-///     Requires the profile to be within an age range
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutAgeRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public int Min;
-
-    [DataField(required: true)]
-    public int Max;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-age-requirement",
-            ("min", Min), ("max", Max)));
-        return profile.Age >= Min && profile.Age <= Max;
-    }
-}
-
-/// <summary>
-///   Requires the profile to use either a Backpack, Satchel, or Duffelbag
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutBackpackTypeRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public BackpackPreference Preference;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-backpack-type-requirement",
-            ("type", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
-        return profile.Backpack == Preference;
-    }
-}
-
-/// <summary>
-///     Requires the profile to use either Jumpsuits or Jumpskirts
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutClothingPreferenceRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public ClothingPreference Preference;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-clothing-preference-requirement",
-            ("preference", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
-        return profile.Clothing == Preference;
-    }
-}
-
-/// <summary>
-///     Requires the profile to be a certain species
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutSpeciesRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public ProtoId<SpeciesPrototype> Species;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-species-requirement",
-            ("species", Loc.GetString($"species-name-{Species.ToString().ToLower()}"))));
-        return profile.Species == Species;
-    }
-}
-
-/// <summary>
-///     Requires the profile to have a certain trait
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutTraitRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public ProtoId<TraitPrototype> Trait;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-trait-requirement",
-            ("trait", Loc.GetString($"trait-{Trait.ToString().ToLower()}-name"))));
-        return profile.TraitPreferences.Contains(Trait.ToString());
-    }
-}
-
-#endregion
-
-#region Jobs
-
-/// <summary>
-///     Requires the selected job to be a certain one
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutJobRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public List<ProtoId<JobPrototype>> Jobs;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        // Join localized job names with a comma
-        var jobsString = string.Join(", ", Jobs.Select(j => Loc.GetString(prototypeManager.Index(j).Name)));
-        // Form the reason message
-        jobsString = Loc.GetString("loadout-job-requirement", ("job", jobsString));
-
-        reason = FormattedMessage.FromMarkup(jobsString);
-        return Jobs.Contains(job.ID);
-    }
-}
-
-/// <summary>
-///     Requires the playtime for a department to be within a certain range
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutDepartmentTimeRequirement : LoadoutRequirement
-{
-    [DataField]
-    public TimeSpan Min = TimeSpan.MinValue;
-
-    [DataField]
-    public TimeSpan Max = TimeSpan.MaxValue;
-
-    [DataField(required: true)]
-    public ProtoId<DepartmentPrototype> Department;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        // Disable the requirement if the role timers are disabled
-        if (!configManager.GetCVar(CCVars.GameRoleTimers))
-        {
-            reason = null;
-            return !Inverted;
-        }
-
-        var department = prototypeManager.Index(Department);
-
-        // Combine all of this department's job playtimes
-        var playtime = TimeSpan.Zero;
-        foreach (var other in department.Roles)
-        {
-            var proto = prototypeManager.Index<JobPrototype>(other).PlayTimeTracker;
-
-            playTimes.TryGetValue(proto, out var otherTime);
-            playtime += otherTime;
-        }
-
-        if (playtime > Max)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-department-too-high",
-                    ("time", playtime.Minutes - Max.Minutes),
-                    ("department", Loc.GetString($"department-{department.ID}")),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        if (playtime < Min)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-department-insufficient",
-                    ("time", Min.Minutes - playtime.Minutes),
-                    ("department", Loc.GetString($"department-{department.ID}")),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        reason = null;
-        return true;
-    }
-}
-
-/// <summary>
-///     Requires the player to have a certain amount of overall job time
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutOverallTimeRequirement : LoadoutRequirement
-{
-    [DataField]
-    public TimeSpan Min = TimeSpan.MinValue;
-
-    [DataField]
-    public TimeSpan Max = TimeSpan.MaxValue;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        // Disable the requirement if the role timers are disabled
-        if (!configManager.GetCVar(CCVars.GameRoleTimers))
-        {
-            reason = null;
-            return !Inverted;
-        }
-
-        // Get the overall time
-        var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
-
-        if (overallTime > Max)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-overall-too-high",
-                    ("time", overallTime.Minutes - Max.Minutes)));
-            return false;
-        }
-
-        if (overallTime < Min)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-overall-insufficient",
-                    ("time", Min.Minutes - overallTime.Minutes)));
-            return false;
-        }
-
-        reason = null;
-        return true;
-    }
-}
-
-/// <summary>
-///     Requires the playtime for a tracker to be within a certain range
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutPlaytimeRequirement : LoadoutRequirement
-{
-    [DataField]
-    public TimeSpan Min = TimeSpan.MinValue;
-
-    [DataField]
-    public TimeSpan Max = TimeSpan.MaxValue;
-
-    [DataField(required: true)]
-    public ProtoId<PlayTimeTrackerPrototype> Tracker;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        // Disable the requirement if the role timers are disabled
-        if (!configManager.GetCVar(CCVars.GameRoleTimers))
-        {
-            reason = null;
-            return !Inverted;
-        }
-
-        // Get SharedJobSystem
-        if (!entityManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
-        {
-            DebugTools.Assert("LoadoutRequirements: SharedJobSystem not found");
-            reason = null;
-            return false;
-        }
-
-        // Get the JobPrototype of the Tracker
-        var trackerJob = jobSystem.GetJobPrototype(Tracker);
-
-        // Get the primary department of the Tracker
-        if (!jobSystem.TryGetPrimaryDepartment(trackerJob, out var department) &&
-            !jobSystem.TryGetDepartment(trackerJob, out department))
-        {
-            DebugTools.Assert($"LoadoutRequirements: Department not found for job {trackerJob}");
-            reason = null;
-            return false;
-        }
-
-        // Get the time for the tracker
-        playTimes.TryGetValue(Tracker, out var time);
-        reason = null;
-
-        if (time > Max)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-role-too-high",
-                    ("time", time.Minutes - Max.Minutes),
-                    ("job", trackerJob),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        if (time < Min)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-role-insufficient",
-                    ("time", Min.Minutes - time.Minutes),
-                    ("job", trackerJob),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        return true;
-    }
-}
-
-#endregion
diff --git a/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs b/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
index eb9a5dcbc8..09e3db3793 100644
--- a/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
+++ b/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.Loadouts.Prototypes;
+using Content.Shared.Customization.Systems;
 using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
@@ -17,7 +18,8 @@ public sealed class LoadoutSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
+    [Dependency] private readonly CharacterRequirementsSystem _characterRequirements = default!;
 
     public override void Initialize()
     {
@@ -66,8 +68,9 @@ public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, JobPrototype job, Hu
                 continue;
 
 
-            if (!CheckRequirementsValid(loadoutProto.Requirements, job, profile,
-                playTimes ?? new Dictionary<string, TimeSpan>(), EntityManager, _prototype, _configurationManager,
+            if (!_characterRequirements.CheckRequirementsValid(loadoutProto, loadoutProto.Requirements, job, profile,
+                playTimes ?? new Dictionary<string, TimeSpan>(),
+                EntityManager, _prototype, _configuration,
                 out _))
                 continue;
 
@@ -115,35 +118,4 @@ public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, JobPrototype job, Hu
         // The server has more information about the inventory system than the client does and the client doesn't need to put loadouts in backpacks
         return failedLoadouts;
     }
-
-
-    public bool CheckRequirementsValid(List<LoadoutRequirement> requirements, JobPrototype job,
-        HumanoidCharacterProfile profile, Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager,
-        IPrototypeManager prototypeManager, IConfigurationManager configManager, out List<FormattedMessage> reasons)
-    {
-        reasons = new List<FormattedMessage>();
-        var valid = true;
-
-        foreach (var requirement in requirements)
-        {
-            // Set valid to false if the requirement is invalid and not inverted, if it's inverted set it to true when it's valid
-            if (!requirement.IsValid(job, profile, playTimes, entityManager, prototypeManager, configManager, out var reason))
-            {
-                if (valid)
-                    valid = requirement.Inverted;
-            }
-            else
-            {
-                if (valid)
-                    valid = !requirement.Inverted;
-            }
-
-            if (reason != null)
-            {
-                reasons.Add(reason);
-            }
-        }
-
-        return valid;
-    }
 }
diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.cs b/Content.Shared/Customization/Systems/CharacterRequirements.cs
new file mode 100644
index 0000000000..b7200c60e8
--- /dev/null
+++ b/Content.Shared/Customization/Systems/CharacterRequirements.cs
@@ -0,0 +1,529 @@
+using System.Linq;
+using Content.Shared.CCVar;
+using Content.Shared.Clothing.Loadouts.Prototypes;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
+using Content.Shared.Traits;
+using JetBrains.Annotations;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Customization.Systems;
+
+
+[ImplicitDataDefinitionForInheritors, MeansImplicitUse]
+[Serializable, NetSerializable]
+public abstract partial class CharacterRequirement
+{
+    /// <summary>
+    ///     If true valid requirements will be treated as invalid and vice versa
+    /// </summary>
+    [DataField]
+    public bool Inverted;
+
+    /// <summary>
+    ///     Checks if this character requirement is valid for the given parameters
+    /// </summary>
+    /// <param name="reason">Description for the requirement, shown when not null</param>
+    public abstract bool IsValid(
+        IPrototype prototype,
+        JobPrototype job,
+        HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager,
+        IPrototypeManager prototypeManager,
+        IConfigurationManager configManager,
+        out FormattedMessage? reason
+    );
+}
+
+
+#region HumanoidCharacterProfile
+
+/// <summary>
+///     Requires the profile to be within an age range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterAgeRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public int Min;
+
+    [DataField(required: true)]
+    public int Max;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-age-requirement",
+            ("inverted", Inverted), ("min", Min), ("max", Max)));
+        return profile.Age >= Min && profile.Age <= Max;
+    }
+}
+
+/// <summary>
+///   Requires the profile to use either a Backpack, Satchel, or Duffelbag
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterBackpackTypeRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public BackpackPreference Preference;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-backpack-type-requirement",
+            ("inverted", Inverted),
+            ("type", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
+        return profile.Backpack == Preference;
+    }
+}
+
+/// <summary>
+///     Requires the profile to use either Jumpsuits or Jumpskirts
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterClothingPreferenceRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public ClothingPreference Preference;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-clothing-preference-requirement",
+            ("inverted", Inverted),
+            ("preference", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
+        return profile.Clothing == Preference;
+    }
+}
+
+/// <summary>
+///     Requires the profile to be a certain species
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterSpeciesRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public ProtoId<SpeciesPrototype> Species;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-species-requirement",
+            ("inverted", Inverted),
+            ("species", Loc.GetString($"species-name-{Species.ToString().ToLower()}"))));
+        return profile.Species == Species;
+    }
+}
+
+/// <summary>
+///     Requires the profile to have one of the specified traits
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterTraitRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<TraitPrototype>> Traits;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-trait-requirement", ("inverted", Inverted),
+            ("traits", string.Join(", ", Traits.Select(t => Loc.GetString($"trait-name-{t}"))))));
+
+        return Traits.Any(t => profile.TraitPreferences.Contains(t.ToString()));
+    }
+}
+
+/// <summary>
+///     Requires the profile to have one of the specified loadouts
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterLoadoutRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<LoadoutPrototype>> Loadouts;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-loadout-requirement", ("inverted", Inverted),
+            ("loadouts", string.Join(", ", Loadouts.Select(l => Loc.GetString($"loadout-{l}"))))));
+
+        return Loadouts.Any(l => profile.LoadoutPreferences.Contains(l.ToString()));
+    }
+}
+
+#endregion
+
+#region Jobs
+
+/// <summary>
+///     Requires the selected job to be one of the specified jobs
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterJobRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<JobPrototype>> Jobs;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        var jobs = new List<FormattedMessage>();
+
+        // Get the job names and department colors
+        foreach (var j in Jobs)
+        {
+            var jobProto = prototypeManager.Index(j);
+            var color = Color.LightBlue;
+
+            foreach (var dept in prototypeManager.EnumeratePrototypes<DepartmentPrototype>()
+                .OrderBy(d => Loc.GetString($"department-{d.ID}")))
+            {
+                if (!dept.Roles.Contains(j))
+                    continue;
+
+                color = dept.Color;
+                break;
+            }
+
+            jobs.Add(FormattedMessage.FromMarkup($"[color={color.ToHex()}]{Loc.GetString(jobProto.Name)}[/color]"));
+        }
+
+        // Join the job names
+        var jobsList = string.Join(", ", jobs.Select(j => j.ToMarkup()));
+        var jobsString = Loc.GetString("character-job-requirement",
+            ("inverted", Inverted), ("jobs", jobsList));
+
+        reason = FormattedMessage.FromMarkup(jobsString);
+        return Jobs.Contains(job.ID);
+    }
+}
+
+/// <summary>
+///     Requires the selected job to be in one of the specified departments
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterDepartmentRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<DepartmentPrototype>> Departments;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        var departments = new List<FormattedMessage>();
+
+        // Get the department names and colors
+        foreach (var d in Departments)
+        {
+            var deptProto = prototypeManager.Index(d);
+            var color = deptProto.Color;
+
+            departments.Add(FormattedMessage.FromMarkup($"[color={color.ToHex()}]{Loc.GetString($"department-{deptProto.ID}")}[/color]"));
+        }
+
+        // Join the department names
+        var departmentsList = string.Join(", ", departments.Select(d => d.ToMarkup()));
+        var departmentsString = Loc.GetString("character-department-requirement",
+            ("inverted", Inverted), ("departments", departmentsList));
+
+        reason = FormattedMessage.FromMarkup(departmentsString);
+        return Departments.Any(d => prototypeManager.Index(d).Roles.Contains(job.ID));
+    }
+}
+
+/// <summary>
+///     Requires the playtime for a department to be within a certain range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterDepartmentTimeRequirement : CharacterRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    [DataField(required: true)]
+    public ProtoId<DepartmentPrototype> Department;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        var department = prototypeManager.Index(Department);
+
+        // Combine all of this department's job playtimes
+        var playtime = TimeSpan.Zero;
+        foreach (var other in department.Roles)
+        {
+            var proto = prototypeManager.Index<JobPrototype>(other).PlayTimeTracker;
+
+            playTimes.TryGetValue(proto, out var otherTime);
+            playtime += otherTime;
+        }
+
+        if (playtime > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-department-too-high",
+                    ("time", playtime.Minutes - Max.Minutes),
+                    ("department", Loc.GetString($"department-{department.ID}")),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        if (playtime < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-department-insufficient",
+                    ("time", Min.Minutes - playtime.Minutes),
+                    ("department", Loc.GetString($"department-{department.ID}")),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        reason = null;
+        return true;
+    }
+}
+
+/// <summary>
+///     Requires the player to have a certain amount of overall job time
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterOverallTimeRequirement : CharacterRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        // Get the overall time
+        var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
+
+        if (overallTime > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-overall-too-high",
+                    ("time", overallTime.Minutes - Max.Minutes)));
+            return false;
+        }
+
+        if (overallTime < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-overall-insufficient",
+                    ("time", Min.Minutes - overallTime.Minutes)));
+            return false;
+        }
+
+        reason = null;
+        return true;
+    }
+}
+
+/// <summary>
+///     Requires the playtime for a tracker to be within a certain range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterPlaytimeRequirement : CharacterRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    [DataField(required: true)]
+    public ProtoId<PlayTimeTrackerPrototype> Tracker;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        // Get SharedJobSystem
+        if (!entityManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
+        {
+            DebugTools.Assert("CharacterRequirements: SharedJobSystem not found");
+            reason = null;
+            return false;
+        }
+
+        // Get the JobPrototype of the Tracker
+        var trackerJob = jobSystem.GetJobPrototype(Tracker);
+
+        // Get the primary department of the Tracker
+        if (!jobSystem.TryGetPrimaryDepartment(trackerJob, out var department) &&
+            !jobSystem.TryGetDepartment(trackerJob, out department))
+        {
+            DebugTools.Assert($"CharacterRequirements: Department not found for job {trackerJob}");
+            reason = null;
+            return false;
+        }
+
+        // Get the time for the tracker
+        var time = playTimes.GetValueOrDefault(Tracker);
+        reason = null;
+
+        if (time > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-role-too-high",
+                    ("time", time.Minutes - Max.Minutes),
+                    ("job", trackerJob),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        if (time < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-role-insufficient",
+                    ("time", Min.Minutes - time.Minutes),
+                    ("job", trackerJob),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        return true;
+    }
+}
+
+#endregion
+
+#region Prototype Groups
+
+/// <summary>
+///     Requires the profile to not have any of the specified traits
+/// </summary>
+/// <remarks>
+///     Only works if you put this prototype in the denied prototypes' requirements too.
+///     Can't be inverted, use <see cref="CharacterTraitRequirement"/>
+/// </remarks>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class TraitGroupExclusionRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<TraitPrototype>> Prototypes;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        var invalid = profile.TraitPreferences.Any(t => Prototypes.Contains(t));
+
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-trait-group-exclusion-requirement",
+            ("traits", string.Join(", ", Prototypes.Select(t => Loc.GetString($"trait-name-{t}"))))));
+
+        return Inverted ? invalid : !invalid;
+    }
+}
+
+/// <summary>
+///     Requires the profile to not have any of the specified loadouts
+/// </summary>
+/// <remarks>
+///     Only works if you put this prototype in the denied prototypes' requirements too.
+///     Can't be inverted, use <see cref="CharacterLoadoutRequirement"/>
+/// </remarks>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutGroupExclusionRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<LoadoutPrototype>> Prototypes;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        var invalid = profile.LoadoutPreferences.Any(l => Prototypes.Contains(l));
+
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-loadout-group-exclusion-requirement",
+            ("loadouts", string.Join(", ", Prototypes.Select(l => Loc.GetString($"loadout-{l}"))))));
+
+        return Inverted ? invalid : !invalid;
+    }
+}
+
+#endregion
diff --git a/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs b/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
new file mode 100644
index 0000000000..e93c933a6a
--- /dev/null
+++ b/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Customization.Systems;
+
+
+public sealed class CharacterRequirementsSystem : EntitySystem
+{
+    public bool CheckRequirementsValid(IPrototype prototype, List<CharacterRequirement> requirements, JobPrototype job,
+        HumanoidCharacterProfile profile, Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out List<FormattedMessage> reasons)
+    {
+        reasons = new List<FormattedMessage>();
+        var valid = true;
+
+        foreach (var requirement in requirements)
+        {
+            // Set valid to false if the requirement is invalid and not inverted
+            // If it's inverted set valid to false when it's valid
+            if (!requirement.IsValid(prototype, job, profile, playTimes,
+                entityManager, prototypeManager, configManager,
+                out var reason))
+            {
+                if (valid)
+                    valid = requirement.Inverted;
+            }
+            else
+            {
+                if (valid)
+                    valid = !requirement.Inverted;
+            }
+
+            if (reason != null) // To appease the compiler
+                reasons.Add(reason);
+        }
+
+        return valid;
+    }
+}
diff --git a/Content.Shared/Drunk/DrunkSystem.cs b/Content.Shared/Drunk/DrunkSystem.cs
index 4f9429b6a6..161d4729ed 100644
--- a/Content.Shared/Drunk/DrunkSystem.cs
+++ b/Content.Shared/Drunk/DrunkSystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
-using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Shared.Drunk;
 
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index ece9a82bb2..8cf504582d 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -393,19 +393,19 @@ public HumanoidCharacterProfile WithLoadoutPreference(string loadoutId, bool pre
 
         public bool MemberwiseEquals(ICharacterProfile maybeOther)
         {
-            if (maybeOther is not HumanoidCharacterProfile other ||
-                Name != other.Name ||
-                Age != other.Age ||
-                Sex != other.Sex ||
-                Gender != other.Gender ||
-                PreferenceUnavailable != other.PreferenceUnavailable ||
-                Clothing != other.Clothing ||
-                Backpack != other.Backpack ||
-                SpawnPriority != other.SpawnPriority ||
-                !_jobPriorities.SequenceEqual(other._jobPriorities) ||
-                !_antagPreferences.SequenceEqual(other._antagPreferences) ||
-                !_traitPreferences.SequenceEqual(other._traitPreferences) ||
-                !_loadoutPreferences.SequenceEqual(other._loadoutPreferences))
+            if (maybeOther is not HumanoidCharacterProfile other
+                || Name != other.Name
+                || Age != other.Age
+                || Sex != other.Sex
+                || Gender != other.Gender
+                || PreferenceUnavailable != other.PreferenceUnavailable
+                || Clothing != other.Clothing
+                || Backpack != other.Backpack
+                || SpawnPriority != other.SpawnPriority
+                || !_jobPriorities.SequenceEqual(other._jobPriorities)
+                || !_antagPreferences.SequenceEqual(other._antagPreferences)
+                || !_traitPreferences.SequenceEqual(other._traitPreferences)
+                || !_loadoutPreferences.SequenceEqual(other._loadoutPreferences))
                 return false;
 
             return Appearance.MemberwiseEquals(other.Appearance);
@@ -545,23 +545,42 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
                 .Where(prototypeManager.HasIndex<TraitPrototype>)
                 .ToList();
 
+            var maxTraits = configManager.GetCVar(CCVars.GameTraitsMax);
+            var currentTraits = 0;
+            var traitPoints = configManager.GetCVar(CCVars.GameTraitsDefaultPoints);
+
+            foreach (var trait in traits.OrderBy(t => -prototypeManager.Index<TraitPrototype>(t).Points).ToList())
+            {
+                var proto = prototypeManager.Index<TraitPrototype>(trait);
+
+                if (traitPoints + proto.Points < 0 || currentTraits + 1 > maxTraits)
+                    traits.Remove(trait);
+                else
+                {
+                    traitPoints += proto.Points;
+                    currentTraits++;
+                }
+            }
+
+
             var loadouts = LoadoutPreferences
                 .Where(prototypeManager.HasIndex<LoadoutPrototype>)
                 .ToList();
 
-            var maxLoadouts = configManager.GetCVar(CCVars.GameLoadoutsPoints);
-            var currentLoadouts = 0;
+            var loadoutPoints = configManager.GetCVar(CCVars.GameLoadoutsPoints);
+            var currentPoints = 0;
 
             foreach (var loadout in loadouts.ToList())
             {
                 var proto = prototypeManager.Index<LoadoutPrototype>(loadout);
 
-                if (currentLoadouts + proto.Cost > maxLoadouts)
+                if (currentPoints + proto.Cost > loadoutPoints)
                     loadouts.Remove(loadout);
                 else
-                    currentLoadouts += proto.Cost;
+                    currentPoints += proto.Cost;
             }
 
+
             Name = name;
             FlavorText = flavortext;
             Age = age;
diff --git a/Content.Shared/Traits/Assorted/AccentlessComponent.cs b/Content.Shared/Traits/Assorted/Components/AccentlessComponent.cs
similarity index 89%
rename from Content.Shared/Traits/Assorted/AccentlessComponent.cs
rename to Content.Shared/Traits/Assorted/Components/AccentlessComponent.cs
index 96ebf4d83f..084a1e1d92 100644
--- a/Content.Shared/Traits/Assorted/AccentlessComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/AccentlessComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// This is used for the accentless trait
diff --git a/Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs b/Content.Shared/Traits/Assorted/Components/LegsParalyzedComponent.cs
similarity index 65%
rename from Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
rename to Content.Shared/Traits/Assorted/Components/LegsParalyzedComponent.cs
index 59f9ca758b..d0639e5933 100644
--- a/Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/LegsParalyzedComponent.cs
@@ -1,6 +1,7 @@
-using Robust.Shared.GameStates;
+using Content.Shared.Traits.Assorted.Systems;
+using Robust.Shared.GameStates;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// Set player speed to zero and standing state to down, simulating leg paralysis.
diff --git a/Content.Shared/Traits/Assorted/LightweightDrunkComponent.cs b/Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
similarity index 90%
rename from Content.Shared/Traits/Assorted/LightweightDrunkComponent.cs
rename to Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
index 5d353ac963..62d2f5899a 100644
--- a/Content.Shared/Traits/Assorted/LightweightDrunkComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
@@ -1,7 +1,7 @@
-using Robust.Shared.GameStates;
 using Content.Shared.Drunk;
+using Robust.Shared.GameStates;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// Used for the lightweight trait. DrunkSystem will check for this component and modify the boozePower accordingly if it finds it.
diff --git a/Content.Shared/Traits/Assorted/ParacusiaComponent.cs b/Content.Shared/Traits/Assorted/Components/ParacusiaComponent.cs
similarity index 93%
rename from Content.Shared/Traits/Assorted/ParacusiaComponent.cs
rename to Content.Shared/Traits/Assorted/Components/ParacusiaComponent.cs
index 1db698359b..ff62e55c2a 100644
--- a/Content.Shared/Traits/Assorted/ParacusiaComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/ParacusiaComponent.cs
@@ -1,8 +1,9 @@
+using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// This component is used for paracusia, which causes auditory hallucinations.
diff --git a/Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs b/Content.Shared/Traits/Assorted/Components/PermanentBlindnessComponent.cs
similarity index 81%
rename from Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs
rename to Content.Shared/Traits/Assorted/Components/PermanentBlindnessComponent.cs
index 76ff3e1005..c1bf7e1639 100644
--- a/Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/PermanentBlindnessComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// This is used for making something blind forever.
diff --git a/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs b/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
deleted file mode 100644
index 7c91366937..0000000000
--- a/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Content.Shared.Body.Systems;
-using Content.Shared.Buckle.Components;
-using Content.Shared.Movement.Events;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Standing;
-using Content.Shared.Throwing;
-
-namespace Content.Shared.Traits.Assorted;
-
-public sealed class LegsParalyzedSystem : EntitySystem
-{
-    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!;
-    [Dependency] private readonly StandingStateSystem _standingSystem = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<LegsParalyzedComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<LegsParalyzedComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<LegsParalyzedComponent, BuckleChangeEvent>(OnBuckleChange);
-        SubscribeLocalEvent<LegsParalyzedComponent, ThrowPushbackAttemptEvent>(OnThrowPushbackAttempt);
-        SubscribeLocalEvent<LegsParalyzedComponent, UpdateCanMoveEvent>(OnUpdateCanMoveEvent);
-    }
-
-    private void OnStartup(EntityUid uid, LegsParalyzedComponent component, ComponentStartup args)
-    {
-        // TODO: In future probably must be surgery related wound
-        _movementSpeedModifierSystem.ChangeBaseSpeed(uid, 0, 0, 20);
-    }
-
-    private void OnShutdown(EntityUid uid, LegsParalyzedComponent component, ComponentShutdown args)
-    {
-        _standingSystem.Stand(uid);
-        _bodySystem.UpdateMovementSpeed(uid);
-    }
-
-    private void OnBuckleChange(EntityUid uid, LegsParalyzedComponent component, ref BuckleChangeEvent args)
-    {
-        if (args.Buckling)
-        {
-            _standingSystem.Stand(args.BuckledEntity);
-        }
-        else
-        {
-            _standingSystem.Down(args.BuckledEntity);
-        }
-    }
-
-    private void OnUpdateCanMoveEvent(EntityUid uid, LegsParalyzedComponent component, UpdateCanMoveEvent args)
-    {
-        args.Cancel();
-    }
-
-    private void OnThrowPushbackAttempt(EntityUid uid, LegsParalyzedComponent component, ThrowPushbackAttemptEvent args)
-    {
-        args.Cancel();
-    }
-}
diff --git a/Content.Shared/Traits/Assorted/AccentlessSystem.cs b/Content.Shared/Traits/Assorted/Systems/AccentlessSystem.cs
similarity index 62%
rename from Content.Shared/Traits/Assorted/AccentlessSystem.cs
rename to Content.Shared/Traits/Assorted/Systems/AccentlessSystem.cs
index 2242bc6e52..f4e077bc1a 100644
--- a/Content.Shared/Traits/Assorted/AccentlessSystem.cs
+++ b/Content.Shared/Traits/Assorted/Systems/AccentlessSystem.cs
@@ -1,6 +1,4 @@
-using Robust.Shared.Serialization.Manager;
-
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Systems;
 
 /// <summary>
 /// This handles removing accents when using the accentless trait.
@@ -12,10 +10,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<AccentlessComponent, ComponentStartup>(RemoveAccents);
+        SubscribeLocalEvent<Components.AccentlessComponent, ComponentStartup>(RemoveAccents);
     }
 
-    private void RemoveAccents(EntityUid uid, AccentlessComponent component, ComponentStartup args)
+    private void RemoveAccents(EntityUid uid, Components.AccentlessComponent component, ComponentStartup args)
     {
         foreach (var accent in component.RemovedAccents.Values)
         {
diff --git a/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs b/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
new file mode 100644
index 0000000000..8ae0f251b8
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Body.Systems;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Standing;
+using Content.Shared.Throwing;
+
+namespace Content.Shared.Traits.Assorted.Systems;
+
+public sealed class LegsParalyzedSystem : EntitySystem
+{
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!;
+    [Dependency] private readonly StandingStateSystem _standingSystem = default!;
+    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, BuckleChangeEvent>(OnBuckleChange);
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, ThrowPushbackAttemptEvent>(OnThrowPushbackAttempt);
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, UpdateCanMoveEvent>(OnUpdateCanMoveEvent);
+    }
+
+    private void OnStartup(EntityUid uid, Components.LegsParalyzedComponent component, ComponentStartup args)
+    {
+        // TODO: In future probably must be surgery related wound
+        _movementSpeedModifierSystem.ChangeBaseSpeed(uid, 0, 0, 20);
+    }
+
+    private void OnShutdown(EntityUid uid, Components.LegsParalyzedComponent component, ComponentShutdown args)
+    {
+        _standingSystem.Stand(uid);
+        _bodySystem.UpdateMovementSpeed(uid);
+    }
+
+    private void OnBuckleChange(EntityUid uid, Components.LegsParalyzedComponent component, ref BuckleChangeEvent args)
+    {
+        if (args.Buckling)
+        {
+            _standingSystem.Stand(args.BuckledEntity);
+        }
+        else
+        {
+            _standingSystem.Down(args.BuckledEntity);
+        }
+    }
+
+    private void OnUpdateCanMoveEvent(EntityUid uid, Components.LegsParalyzedComponent component, UpdateCanMoveEvent args)
+    {
+        args.Cancel();
+    }
+
+    private void OnThrowPushbackAttempt(EntityUid uid, Components.LegsParalyzedComponent component, ThrowPushbackAttemptEvent args)
+    {
+        args.Cancel();
+    }
+}
diff --git a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs b/Content.Shared/Traits/Assorted/Systems/PermanentBlindnessSystem.cs
similarity index 59%
rename from Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
rename to Content.Shared/Traits/Assorted/Systems/PermanentBlindnessSystem.cs
index 9fd5db8497..113939f66b 100644
--- a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
+++ b/Content.Shared/Traits/Assorted/Systems/PermanentBlindnessSystem.cs
@@ -4,7 +4,7 @@
 using Content.Shared.IdentityManagement;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Systems;
 
 /// <summary>
 /// This handles permanent blindness, both the examine and the actual effect.
@@ -18,26 +18,26 @@ public sealed class PermanentBlindnessSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<PermanentBlindnessComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<PermanentBlindnessComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<PermanentBlindnessComponent, EyeDamageChangedEvent>(OnDamageChanged);
-        SubscribeLocalEvent<PermanentBlindnessComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<Components.PermanentBlindnessComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<Components.PermanentBlindnessComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<Components.PermanentBlindnessComponent, EyeDamageChangedEvent>(OnDamageChanged);
+        SubscribeLocalEvent<Components.PermanentBlindnessComponent, ExaminedEvent>(OnExamined);
     }
 
-    private void OnExamined(Entity<PermanentBlindnessComponent> blindness, ref ExaminedEvent args)
+    private void OnExamined(Entity<Components.PermanentBlindnessComponent> blindness, ref ExaminedEvent args)
     {
         if (args.IsInDetailsRange && !_net.IsClient)
         {
-            args.PushMarkup(Loc.GetString("permanent-blindness-trait-examined", ("target", Identity.Entity(blindness, EntityManager))));
+            args.PushMarkup(Loc.GetString("trait-examined-Blindness", ("target", Identity.Entity(blindness, EntityManager))));
         }
     }
 
-    private void OnShutdown(Entity<PermanentBlindnessComponent> blindness, ref ComponentShutdown args)
+    private void OnShutdown(Entity<Components.PermanentBlindnessComponent> blindness, ref ComponentShutdown args)
     {
         _blinding.UpdateIsBlind(blindness.Owner);
     }
 
-    private void OnStartup(Entity<PermanentBlindnessComponent> blindness, ref ComponentStartup args)
+    private void OnStartup(Entity<Components.PermanentBlindnessComponent> blindness, ref ComponentStartup args)
     {
         if (!_entityManager.TryGetComponent<BlindableComponent>(blindness, out var blindable))
             return;
@@ -50,7 +50,7 @@ private void OnStartup(Entity<PermanentBlindnessComponent> blindness, ref Compon
         _blinding.AdjustEyeDamage(blindness.Owner, damageToDeal);
     }
 
-    private void OnDamageChanged(Entity<PermanentBlindnessComponent> blindness, ref EyeDamageChangedEvent args)
+    private void OnDamageChanged(Entity<Components.PermanentBlindnessComponent> blindness, ref EyeDamageChangedEvent args)
     {
         if (args.Damage >= BlurryVisionComponent.MaxMagnitude)
             return;
diff --git a/Content.Shared/Traits/Assorted/SharedParacusiaSystem.cs b/Content.Shared/Traits/Assorted/Systems/SharedParacusiaSystem.cs
similarity index 56%
rename from Content.Shared/Traits/Assorted/SharedParacusiaSystem.cs
rename to Content.Shared/Traits/Assorted/Systems/SharedParacusiaSystem.cs
index 2bfb0da1f5..151e748445 100644
--- a/Content.Shared/Traits/Assorted/SharedParacusiaSystem.cs
+++ b/Content.Shared/Traits/Assorted/Systems/SharedParacusiaSystem.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Systems;
 
 public abstract class SharedParacusiaSystem : EntitySystem
 {
diff --git a/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs b/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
new file mode 100644
index 0000000000..efbac1ca7d
--- /dev/null
+++ b/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Traits;
+
+
+/// <summary>
+///     A prototype defining a valid category for <see cref="TraitPrototype"/>s to go into.
+/// </summary>
+[Prototype("traitCategory")]
+public sealed partial class TraitCategoryPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; } = default!;
+}
diff --git a/Content.Shared/Traits/Prototypes/TraitPrototype.cs b/Content.Shared/Traits/Prototypes/TraitPrototype.cs
new file mode 100644
index 0000000000..2e6b7cc066
--- /dev/null
+++ b/Content.Shared/Traits/Prototypes/TraitPrototype.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Customization.Systems;
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Traits;
+
+
+/// <summary>
+///     Describes a trait.
+/// </summary>
+[Prototype("trait")]
+public sealed partial class TraitPrototype : IPrototype
+{
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    ///     Which customization tab to place this entry in
+    /// </summary>
+    [DataField(required: true), ValidatePrototypeId<TraitCategoryPrototype>]
+    public string Category = "Uncategorized";
+
+    /// <summary>
+    ///     How many points this will give the character
+    /// </summary>
+    [DataField]
+    public int Points = 0;
+
+
+    [DataField]
+    public List<CharacterRequirement> Requirements = new();
+
+    /// <summary>
+    ///     The components that get added to the player when they pick this trait.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry Components { get; private set; } = default!;
+}
diff --git a/Content.Shared/Traits/TraitPrototype.cs b/Content.Shared/Traits/TraitPrototype.cs
deleted file mode 100644
index 34feb8da22..0000000000
--- a/Content.Shared/Traits/TraitPrototype.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Content.Shared.Whitelist;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-// don't worry about it
-
-namespace Content.Shared.Traits
-{
-    /// <summary>
-    ///     Describes a trait.
-    /// </summary>
-    [Prototype("trait")]
-    public sealed partial class TraitPrototype : IPrototype
-    {
-        [ViewVariables]
-        [IdDataField]
-        public string ID { get; private set; } = default!;
-
-        /// <summary>
-        ///     The name of this trait.
-        /// </summary>
-        [DataField("name")]
-        public string Name { get; private set; } = "";
-
-        /// <summary>
-        ///     The description of this trait.
-        /// </summary>
-        [DataField("description")]
-        public string? Description { get; private set; }
-
-        /// <summary>
-        ///     Don't apply this trait to entities this whitelist IS NOT valid for.
-        /// </summary>
-        [DataField("whitelist")]
-        public EntityWhitelist? Whitelist;
-
-        /// <summary>
-        ///     Don't apply this trait to entities this whitelist IS valid for. (hence, a blacklist)
-        /// </summary>
-        [DataField("blacklist")]
-        public EntityWhitelist? Blacklist;
-
-        /// <summary>
-        ///     The components that get added to the player, when they pick this trait.
-        /// </summary>
-        [DataField("components")]
-        public ComponentRegistry Components { get; private set; } = default!;
-
-        /// <summary>
-        ///     Gear that is given to the player, when they pick this trait.
-        /// </summary>
-        [DataField("traitGear", required: false, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? TraitGear;
-    }
-}
diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl
new file mode 100644
index 0000000000..b073bdb773
--- /dev/null
+++ b/Resources/Locale/en-US/customization/character-requirements.ftl
@@ -0,0 +1,39 @@
+character-age-requirement = You must {$inverted ->
+    [true] not be
+    *[other] be
+} be within [color=yellow]{$min}[/color] and [color=yellow]{$max}[/color] years old
+character-species-requirement = You must {$inverted ->
+    [true] not be
+    *[other] be
+} a [color=green]{$species}[/color]
+character-trait-requirement = You must {$inverted ->
+    [true] not have
+    *[other] have
+} the trait [color=lightblue]{$trait}[/color]
+character-backpack-type-requirement = You must {$inverted ->
+    [true] not use
+    *[other] use
+} a [color=lightblue]{$type}[/color] as your bag
+character-clothing-preference-requirement = You must {$inverted ->
+    [true] not wear
+    *[other] wear
+} a [color=lightblue]{$type}[/color]
+
+character-job-requirement = You must {$inverted ->
+    [true] not be
+    *[other] be
+} one of these jobs: {$jobs}
+character-department-requirement = You must {$inverted ->
+    [true] not be
+    *[other] be
+} in one of these departments: {$departments}
+
+character-timer-department-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of [color={$departmentColor}]{$department}[/color] department playtime
+character-timer-department-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes in [color={$departmentColor}]{$department}[/color] department
+character-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of playtime
+character-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime
+character-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color]
+character-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color]
+
+character-trait-group-exclusion-requirement = You cannot have one of the following traits if you select this: {$traits}
+character-loadout-group-exclusion-requirement = You cannot have one of the following loadouts if you select this: {$loadouts}
diff --git a/Resources/Locale/en-US/deltav/traits/traits.ftl b/Resources/Locale/en-US/deltav/traits/traits.ftl
index e00cec4707..914a5c9f1b 100644
--- a/Resources/Locale/en-US/deltav/traits/traits.ftl
+++ b/Resources/Locale/en-US/deltav/traits/traits.ftl
@@ -1,13 +1,13 @@
-trait-scottish-accent-name = Scottish Accent
-trait-scottish-accent-desc = Fer tha folk who come frae Hielan clan.
+trait-name-ScottishAccent = Scottish Accent
+trait-description-ScottishAccent = Fer tha folk who come frae Hielan clan.
 
-trait-ultravision-name = Ultraviolet Vision
-trait-ultravision-desc = Whether through custom bionic eyes, random mutation,
+trait-name-UltraVision = Ultraviolet Vision
+trait-description-UltraVision = Whether through custom bionic eyes, random mutation,
                          or being a Harpy, you perceive the world with ultraviolet light.
 
-trait-deuteranopia-name = Deuteranopia
-trait-deuteranopia-desc = Whether through custom bionic eyes, random mutation,
+trait-name-DogVision = Deuteranopia
+trait-description-DogVision = Whether through custom bionic eyes, random mutation,
                           or being a Vulpkanin, you have red–green colour blindness.
 
-trait-uncloneable-name = Uncloneable
-trait-uncloneable-desc = Cannot be cloned
+trait-name-Uncloneable = Uncloneable
+trait-description-Uncloneable = Cannot be cloned
diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index bdfa215e6a..685c5cbcbd 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -1,7 +1,8 @@
-# Alphabetically ordered
+# Alphabetically ordered, except for Uncategorized since it is always first
+
+loadout-category-Uncategorized = Uncategorized
 loadout-category-Accessories = Accessories
 loadout-category-Items = Items
 loadout-category-Jobs = Jobs
 loadout-category-Outer = Outer
-loadout-category-Uncategorized = Uncategorized
 loadout-category-Uniform = Uniform
diff --git a/Resources/Locale/en-US/loadouts/loadout-requirements.ftl b/Resources/Locale/en-US/loadouts/loadout-requirements.ftl
deleted file mode 100644
index 5a453ed5cb..0000000000
--- a/Resources/Locale/en-US/loadouts/loadout-requirements.ftl
+++ /dev/null
@@ -1,13 +0,0 @@
-loadout-age-requirement = You must be within {$min} and {$max} years old
-loadout-species-requirement = You must be a {$species}
-loadout-trait-requirement = You must have the trait {$trait}
-loadout-backpack-type-requirement = You must use a {$type} as your bag
-loadout-clothing-preference-requirement = You must wear a {$type}
-
-loadout-job-requirement = You must be one of these jobs: {$job}
-loadout-timer-department-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of [color={$departmentColor}]{$department}[/color] department playtime
-loadout-timer-department-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes in [color={$departmentColor}]{$department}[/color] department
-loadout-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of playtime
-loadout-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime
-loadout-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color]
-loadout-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color]
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index b929da9655..9b8eb74d96 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -44,20 +44,40 @@ humanoid-profile-editor-department-jobs-label = {$departmentName} jobs
 humanoid-profile-editor-antags-tab = Antags
 humanoid-profile-editor-antag-preference-yes-button = Yes
 humanoid-profile-editor-antag-preference-no-button = No
+
 humanoid-profile-editor-traits-tab = Traits
+humanoid-profile-editor-traits-header = You have {$points ->
+    [1] 1 point
+    *[other] {$points} points
+} and {$maxTraits ->
+    [2147483648] {$traits ->
+        [1] {$traits} trait
+        *[other] {$traits} traits
+    }
+    *[other] {$traits}/{$maxTraits} traits
+}
+humanoid-profile-editor-traits-show-unusable-button = Show Unusable
+humanoid-profile-editor-traits-show-unusable-button-tooltip =
+    When enabled, traits that your current character setup cannot use will be shown highlighted in red.
+    You will still not be able to use the invalid traits unless your character setup changes to fit the requirements.
+    This is most likely useful only if there's a bug hiding traits you actually can use or if you want to see other species' traits or something.
+humanoid-profile-editor-traits-no-traits = No traits found
+
 humanoid-profile-editor-job-priority-high-button = High
 humanoid-profile-editor-job-priority-medium-button = Medium
 humanoid-profile-editor-job-priority-low-button = Low
 humanoid-profile-editor-job-priority-never-button = Never
+
 humanoid-profile-editor-naming-rules-warning = Warning: Offensive or LRP IC names and descriptions will lead to admin intervention on this server. Read our \[Rules\] for more.
+
 humanoid-profile-editor-loadouts-tab = Loadout
-humanoid-profile-editor-loadouts-uncategorized-tab = Uncategorized
-humanoid-profile-editor-loadouts-no-loadouts = No loadouts found
 humanoid-profile-editor-loadouts-points-label = You have {$points}/{$max} points
 humanoid-profile-editor-loadouts-show-unusable-button = Show Unusable
 humanoid-profile-editor-loadouts-show-unusable-button-tooltip =
     When enabled, loadouts that your current character setup cannot use will be shown highlighted in red.
     You will still not be able to use the invalid loadouts unless your character setup changes to fit the requirements.
-    This may be useful if you like switching between multiple jobs and don't want to have to reselect your loadout every time.
+    This may be useful if you like switching between multiple jobs and don't want to have to reselect your loadout every
+humanoid-profile-editor-loadouts-no-loadouts = No loadouts foundtime.
+
 humanoid-profile-editor-markings-tab = Markings
 humanoid-profile-editor-flavortext-tab = Description
diff --git a/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl b/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl
index 3d8af06139..8360aaeb9d 100644
--- a/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl
+++ b/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl
@@ -1,3 +1,2 @@
-trait-nearsighted-name = Nearsighted
-trait-nearsighted-desc = You require glasses to see properly.
-trait-nearsighted-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are pretty unfocused. It doesn't seem like {SUBJECT($target)} can see things that well.[/color]
+trait-name-Nearsighted = Nearsighted
+trait-description-Nearsighted = You require glasses to see properly.
diff --git a/Resources/Locale/en-US/traits/categories.ftl b/Resources/Locale/en-US/traits/categories.ftl
new file mode 100644
index 0000000000..56f0adeb47
--- /dev/null
+++ b/Resources/Locale/en-US/traits/categories.ftl
@@ -0,0 +1,8 @@
+# Alphabetically ordered, except for Uncategorized since it is always first
+
+trait-category-Uncategorized = Uncategorized
+trait-category-Auditory = Auditory
+trait-category-Mental = Mental
+trait-category-Physical = Physical
+trait-category-Speech = Speech
+trait-category-Visual = Visual
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 7a3564edf6..e9163bdb54 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -1,34 +1,33 @@
-trait-blindness-name = Blindness
-trait-blindness-desc = You are legally blind, and can't see clearly past a few meters in front of you.
+trait-name-Blindness = Blindness
+trait-description-Blindness = You are legally blind, and can't see clearly past a few meters in front of you.
+trait-examined-Blindness = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are glassy and unfocused. It doesn't seem like {SUBJECT($target)} can see you well, if at all.[/color]
 
-trait-narcolepsy-name = Narcolepsy
-trait-narcolepsy-desc = You fall asleep randomly
+trait-name-Narcolepsy = Narcolepsy
+trait-description-Narcolepsy = You fall asleep randomly
 
-trait-pacifist-name = Pacifist
-trait-pacifist-desc = You cannot attack or hurt any living beings.
+trait-name-Pacifist = Pacifist
+trait-description-Pacifist = You cannot attack or hurt any living beings.
 
-permanent-blindness-trait-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are glassy and unfocused. It doesn't seem like {SUBJECT($target)} can see you well, if at all.[/color]
+trait-name-LightweightDrunk = Lightweight Drunk
+trait-description-LightweightDrunk = Alcohol has a stronger effect on you
 
-trait-lightweight-name = Lightweight Drunk
-trait-lightweight-desc = Alcohol has a stronger effect on you
+trait-name-Muted = Muted
+trait-description-Muted = You can't speak
 
-trait-muted-name = Muted
-trait-muted-desc = You can't speak
+trait-name-Paracusia = Paracusia
+trait-description-Paracusia = You hear sounds that aren't really there
 
-trait-paracusia-name = Paracusia
-trait-paracusia-desc = You hear sounds that aren't really there
+trait-name-PirateAccent = Pirate Accent
+trait-description-PirateAccent = You can't stop speaking like a pirate!
 
-trait-pirate-accent-name = Pirate Accent
-trait-pirate-accent-desc = You can't stop speaking like a pirate!
+trait-name-Accentless = Accentless
+trait-description-Accentless = You don't have the accent that your species would usually have
 
-trait-accentless-name = Accentless
-trait-accentless-desc = You don't have the accent that your species would usually have
+trait-name-FrontalLisp = Frontal Lisp
+trait-description-FrontalLisp = You thpeak with a lithp
 
-trait-frontal-lisp-name = Frontal Lisp
-trait-frontal-lisp-desc = You thpeak with a lithp
+trait-name-SocialAnxiety = Social Anxiety
+trait-description-SocialAnxiety = You are anxious when you speak and stutter.
 
-trait-socialanxiety-name = Social Anxiety
-trait-socialanxiety-desc = You are anxious when you speak and stutter.
-
-trait-snoring-name = Snoring
-trait-snoring-desc = You will snore while sleeping.
+trait-name-Snoring = Snoring
+trait-description-Snoring = You will snore while sleeping.
diff --git a/Resources/Prototypes/DeltaV/Traits/altvision.yml b/Resources/Prototypes/DeltaV/Traits/altvision.yml
index c361d1b51d..d1980bc23a 100644
--- a/Resources/Prototypes/DeltaV/Traits/altvision.yml
+++ b/Resources/Prototypes/DeltaV/Traits/altvision.yml
@@ -1,13 +1,13 @@
 - type: trait
   id: UltraVision
-  name: trait-ultravision-name
-  description: trait-ultravision-desc
+  category: Visual
+  points: -1
   components:
     - type: UltraVision
 
 - type: trait
   id: DogVision
-  name: trait-deuteranopia-name
-  description: trait-deuteranopia-desc
+  category: Visual
+  points: -1
   components:
     - type: DogVision
diff --git a/Resources/Prototypes/DeltaV/Traits/neutral.yml b/Resources/Prototypes/DeltaV/Traits/neutral.yml
index 79a6771a36..6168d7045a 100644
--- a/Resources/Prototypes/DeltaV/Traits/neutral.yml
+++ b/Resources/Prototypes/DeltaV/Traits/neutral.yml
@@ -1,7 +1,6 @@
 - type: trait
   id: ScottishAccent
-  name: trait-scottish-accent-name
-  description: trait-scottish-accent-desc
-  traitGear: BagpipeInstrument
+  category: Speech
+  points: 0
   components:
-    - type: ScottishAccent
\ No newline at end of file
+    - type: ScottishAccent
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
index 05f51baf1c..d8849472ff 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -28,7 +28,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -40,7 +40,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -52,7 +52,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -63,7 +63,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -74,7 +74,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -85,7 +85,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -96,7 +96,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -107,7 +107,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -118,7 +118,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -130,7 +130,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -141,7 +141,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
index e184e0a60a..c490559112 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefEngineer
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefEngineer
   items:
@@ -27,7 +27,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefEngineer
   items:
@@ -39,7 +39,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefEngineer
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
index 32e1a6e43e..c75c871b01 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -27,7 +27,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -38,7 +38,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -49,7 +49,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -61,7 +61,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
index f4a583e39a..3d3799c0ad 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -28,7 +28,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -40,7 +40,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -52,7 +52,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -63,7 +63,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -74,7 +74,7 @@
   category: Jobs
   cost: 4
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -85,7 +85,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -97,7 +97,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
index 60c6bbdb00..4f0d785b14 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -28,7 +28,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -40,7 +40,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -52,7 +52,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -64,7 +64,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -76,7 +76,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -88,7 +88,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -100,7 +100,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -112,7 +112,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -123,7 +123,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -134,7 +134,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -145,7 +145,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -156,7 +156,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -168,7 +168,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
index 802bc65de5..3359d8f5d7 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
@@ -5,7 +5,7 @@
 #   cost: 2
 #   exclusive: true
 #   requirements:
-#     - !type:LoadoutJobRequirement
+#     - !type:CharacterJobRequirement
 #       jobs:
 #         - Quartermaster
 #   items:
@@ -17,7 +17,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -29,7 +29,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -41,7 +41,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -52,7 +52,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -64,7 +64,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
index cf24ffd852..87cb0db179 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -27,7 +27,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -38,7 +38,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -50,7 +50,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/cargo.yml b/Resources/Prototypes/Loadouts/Jobs/cargo.yml
index fe835d6823..8746386201 100644
--- a/Resources/Prototypes/Loadouts/Jobs/cargo.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/cargo.yml
@@ -4,10 +4,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SalvageSpecialist
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobSalvageSpecialist
       min: 36000 # 10 hours
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
index 820825e236..44ef2262bc 100644
--- a/Resources/Prototypes/Loadouts/Jobs/engineering.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
   items:
@@ -28,16 +28,16 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobAtmosphericTechnician
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobStationEngineer
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Engineering
       min: 216000 # 60 hours
   items:
@@ -49,16 +49,16 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobAtmosphericTechnician
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobStationEngineer
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Engineering
       min: 216000 # 60 hours
   items:
@@ -70,7 +70,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - AtmosphericTechnician
   items:
@@ -83,7 +83,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -96,7 +96,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -110,7 +110,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -123,7 +123,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -136,7 +136,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -149,7 +149,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -162,7 +162,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml
index 37af839f3c..5e88006fce 100644
--- a/Resources/Prototypes/Loadouts/Jobs/medical.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml
@@ -4,7 +4,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Paramedic
@@ -18,7 +18,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -31,7 +31,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - ChiefMedicalOfficer
@@ -44,7 +44,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
   items:
@@ -56,7 +56,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
   items:
@@ -68,7 +68,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
   items:
@@ -80,7 +80,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Chemist
   items:
@@ -91,7 +91,7 @@
   category: Jobs
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Chemist
   items:
@@ -103,7 +103,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Paramedic
   items:
@@ -115,7 +115,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Paramedic
   items:
@@ -127,16 +127,16 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobMedicalDoctor
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 216000 # 60 hours
   items:
@@ -148,16 +148,16 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobMedicalDoctor
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 216000 # 60 hours
   items:
@@ -169,7 +169,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
   items:
@@ -181,16 +181,16 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobMedicalDoctor
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 216000 # 60 hours
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
index f65b69c46a..ad6f02e589 100644
--- a/Resources/Prototypes/Loadouts/Jobs/science.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -4,10 +4,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
   items:
@@ -19,10 +19,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
   items:
@@ -34,7 +34,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
@@ -48,7 +48,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
@@ -62,10 +62,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
   items:
@@ -77,7 +77,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index 47c4b040d3..ecf7e4893a 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - SecurityCadet
@@ -18,19 +18,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobWarden
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobDetective
       min: 7200 # 2 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobSecurityOfficer
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 216000 # 60 hours
   items:
@@ -42,19 +42,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobWarden
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobDetective
       min: 7200 # 2 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobSecurityOfficer
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 216000 # 60 hours
   items:
@@ -66,7 +66,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Warden
         - HeadOfSecurity
@@ -78,7 +78,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Detective
         - SecurityOfficer
diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml
index 4372f891ad..6ef3c3ad48 100644
--- a/Resources/Prototypes/Loadouts/Jobs/service.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/service.yml
@@ -4,7 +4,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Clown
   items:
@@ -18,7 +18,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Clown
   items:
@@ -32,7 +32,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Bartender
   items:
@@ -44,7 +44,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
      jobs:
         - Botanist
   items:
@@ -56,7 +56,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
      jobs:
         - Lawyer
   items:
@@ -68,7 +68,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -80,7 +80,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -92,7 +92,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -104,7 +104,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -116,7 +116,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -128,7 +128,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -140,7 +140,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -152,7 +152,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Reporter
   items:
@@ -164,7 +164,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Reporter
   items:
@@ -176,7 +176,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Reporter
   items:
diff --git a/Resources/Prototypes/Loadouts/categories.yml b/Resources/Prototypes/Loadouts/categories.yml
index b231b397f7..a4381941ac 100644
--- a/Resources/Prototypes/Loadouts/categories.yml
+++ b/Resources/Prototypes/Loadouts/categories.yml
@@ -1,4 +1,8 @@
-# Alphabetically ordered
+# Alphabetically ordered, except for Uncategorized since it is always first
+
+- type: loadoutCategory
+  id: Uncategorized
+
 - type: loadoutCategory
   id: Accessories
 
@@ -11,8 +15,5 @@
 - type: loadoutCategory
   id: Outer
 
-- type: loadoutCategory
-  id: Uncategorized
-
 - type: loadoutCategory
   id: Uniform
diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml
index 097577feba..5afdd303c0 100644
--- a/Resources/Prototypes/Loadouts/uniform.yml
+++ b/Resources/Prototypes/Loadouts/uniform.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Passenger
   items:
diff --git a/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml b/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml
index 25aa23a5af..b7aa00353c 100644
--- a/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml
+++ b/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml
@@ -1,11 +1,12 @@
 - type: trait
   id: Nearsighted
-  name: trait-nearsighted-name
-  description: You require glasses to see properly.
-  traitGear: ClothingEyesGlasses
+  category: Visual
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Nearsighted
-  whitelist: # Delta V fix to borgs spawning with it.
-    components:
-      - Blindable
-
diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml
new file mode 100644
index 0000000000..ba3fd7b345
--- /dev/null
+++ b/Resources/Prototypes/Traits/categories.yml
@@ -0,0 +1,19 @@
+# Alphabetically ordered, except for Uncategorized since it is always first
+
+- type: traitCategory
+  id: Uncategorized
+
+- type: traitCategory
+  id: Auditory
+
+- type: traitCategory
+  id: Mental
+
+- type: traitCategory
+  id: Physical
+
+- type: traitCategory
+  id: Speech
+
+- type: traitCategory
+  id: Visual
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index 2f1a7f92d2..eb96d37e01 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -1,18 +1,26 @@
 - type: trait
   id: Blindness
-  name: trait-blindness-name
-  description: trait-blindness-desc
-  traitGear: WhiteCane
-  whitelist:
-    components:
-      - Blindable
+  category: Visual
+  points: 2
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: PermanentBlindness
 
 - type: trait
   id: Narcolepsy
-  name: trait-narcolepsy-name
-  description: trait-narcolepsy-desc
+  category: Mental
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Narcolepsy
       timeBetweenIncidents: 300, 600
@@ -20,15 +28,15 @@
 
 - type: trait
   id: Pacifist
-  name: trait-pacifist-name
-  description: trait-pacifist-desc
+  category: Mental
+  points: 3
   components:
     - type: Pacified
 
 - type: trait
   id: Paracusia
-  name: trait-paracusia-name
-  description: trait-paracusia-desc
+  category: Auditory
+  points: 1
   components:
     - type: Paracusia
       minTimeBetweenIncidents: 0.1
@@ -39,31 +47,50 @@
 
 - type: trait
   id: Muted
-  name: trait-muted-name
-  description: trait-muted-desc
-  blacklist:
-    components:
-      - BorgChassis
+  category: Speech
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Muted
 
 - type: trait
   id: Uncloneable
-  name: trait-uncloneable-name
-  description: trait-uncloneable-desc
+  category: Physical
+  points: 2
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Uncloneable
 
 - type: trait
   id: FrontalLisp
-  name: trait-frontal-lisp-name
-  description: trait-frontal-lisp-desc
+  category: Speech
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: FrontalLisp
 
 - type: trait
   id: Snoring
-  name: trait-snoring-name
-  description: trait-snoring-desc
+  category: Auditory
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Snoring
diff --git a/Resources/Prototypes/Traits/inconveniences.yml b/Resources/Prototypes/Traits/inconveniences.yml
index 657781d1b5..dcf53d9ab7 100644
--- a/Resources/Prototypes/Traits/inconveniences.yml
+++ b/Resources/Prototypes/Traits/inconveniences.yml
@@ -1,15 +1,25 @@
 - type: trait
   id: LightweightDrunk
-  name: trait-lightweight-name
-  description: trait-lightweight-desc
+  category: Physical
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: LightweightDrunk
       boozeStrengthMultiplier: 2
 
 - type: trait
   id: SocialAnxiety
-  name: trait-socialanxiety-name
-  description: trait-socialanxiety-desc
+  category: Mental
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: StutteringAccent
       matchRandomProb: 0.1
diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml
index 9e7f765507..3a3dc943cd 100644
--- a/Resources/Prototypes/Traits/neutral.yml
+++ b/Resources/Prototypes/Traits/neutral.yml
@@ -1,18 +1,23 @@
 - type: trait
   id: PirateAccent
-  name: trait-pirate-accent-name
-  description: trait-pirate-accent-desc
+  category: Speech
   components:
     - type: PirateAccent
 
 - type: trait
   id: Accentless
-  name: trait-accentless-name
-  description: trait-accentless-desc
+  category: Speech
+  points: -1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
-  - type: Accentless
-    removes:
-    - type: LizardAccent
-    - type: MothAccent
-    - type: ReplacementAccent
-      accent: dwarf
+    - type: Accentless
+      removes:
+      - type: LizardAccent
+      - type: MothAccent
+      - type: ReplacementAccent
+        accent: dwarf

From 287f33cc3ec96bf444c91d5e3982ed27a7803790 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Thu, 20 Jun 2024 23:39:50 +0000
Subject: [PATCH 18/84] Automatic Changelog Update (#434)

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2411ef27b0..3e7799a745 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4217,3 +4217,11 @@ Entries:
       message: Animals will no longer be a silent, soulless shell
   id: 6126
   time: '2024-06-20T22:24:30.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Add
+      message: Added trait points
+    - type: Add
+      message: Added categories for traits
+  id: 6127
+  time: '2024-06-20T23:39:31.0000000+00:00'

From c3b54db10f6ee914e3d2ee48af6f8d8e3e0bae1b Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 3 May 2024 13:16:25 -0400
Subject: [PATCH 19/84] guh

---
 .../Abilities/Dispel/DispelPowerComponent.cs  |  5 ++-
 .../MassSleep/MassSleepPowerComponent.cs      |  3 ++
 .../Metapsionics/MetapsionicPowerComponent.cs | 30 ++++++++++++----
 .../MindSwap/MindSwapPowerComponent.cs        |  3 ++
 .../NoosphericZapPowerComponent.cs            |  3 ++
 .../PsionicInvisibilityPowerComponent.cs      |  6 ++++
 .../PsionicRegenerationPowerComponent.cs      |  6 ++++
 .../Pyrokinesis/PyrokinesisPowerComponent.cs  |  3 ++
 .../Telegnosis/TelegnosisPowerComponent.cs    |  5 ++-
 .../Abilities/Psionics/PsionicComponent.cs    | 12 +++++--
 .../Events/MetapsionicPowerActionEvent.cs     |  3 +-
 Content.Shared/Nyanotrasen/Psionics/Events.cs | 36 +++++++++++++++++++
 12 files changed, 104 insertions(+), 11 deletions(-)

diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
index cd88786636..837bdd96a8 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
@@ -9,12 +9,15 @@ public sealed partial class DispelPowerComponent : Component
     {
         [DataField("range")]
         public float Range = 10f;
-        
+
         [DataField("dispelActionId",
         customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? DispelActionId = "ActionDispel";
 
         [DataField("dispelActionEntity")]
         public EntityUid? DispelActionEntity;
+
+        [DataField("dispelFeedback")]
+        public string DispelFeedback = "dispel-feedback";
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
index 7d611c63da..c092cacd8b 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
@@ -14,5 +14,8 @@ public sealed partial class MassSleepPowerComponent : Component
 
         [DataField("massSleepActionEntity")]
         public EntityUid? MassSleepActionEntity;
+
+        [DataField("massSleepFeedback")]
+        public string MassSleepFeedback = "mass-sleep-feedback";
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
index c9d0130221..0e12d05dea 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
@@ -1,4 +1,6 @@
 using Content.Shared.Actions;
+using Content.Shared.DoAfter;
+using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
@@ -7,15 +9,31 @@ namespace Content.Shared.Abilities.Psionics
     [RegisterComponent]
     public sealed partial class MetapsionicPowerComponent : Component
     {
+        [DataField("doAfter")]
+        public DoAfterId? DoAfter;
+
+        [DataField("useDelay")]
+        public float UseDelay = 8f;
+        [DataField("soundUse")]
+
+        public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Nyanotrasen/heartbeat_fast.ogg");
+
         [DataField("range")]
         public float Range = 5f;
 
-        public InstantActionComponent? MetapsionicPowerAction = null;
-        [DataField("metapsionicActionId",
-        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? MetapsionicActionId = "ActionMetapsionic";
+        [DataField("actionWideMetapsionic", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string ActionWideMetapsionic = "ActionWideMetapsionic";
+
+        [DataField("actionWideMetapsionicEntity")]
+        public EntityUid? ActionWideMetapsionicEntity;
+
+        [DataField("actionFocusedMetapsionic", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string ActionFocusedMetapsionic = "ActionFocusedMetapsionic";
+
+        [DataField("actionFocusedMetapsionicEntity")]
+        public EntityUid? ActionFocusedMetapsionicEntity;
 
-        [DataField("metapsionicActionEntity")]
-        public EntityUid? MetapsionicActionEntity;
+        [DataField("metapsionicFeedback")]
+        public string MetapsionicFeedback = "metapsionic-feedback";
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
index 6a3fc811c8..e617c48cf2 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
@@ -12,5 +12,8 @@ public sealed partial class MindSwapPowerComponent : Component
 
         [DataField("mindSwapActionEntity")]
         public EntityUid? MindSwapActionEntity;
+
+        [DataField("mindSwapFeedback")]
+        public string MindSwapFeedback = "mind-swap-feedback";
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
index 0e91894b1d..24c144079e 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
@@ -13,5 +13,8 @@ public sealed partial class NoosphericZapPowerComponent : Component
 
         [DataField("noosphericZapActionEntity")]
         public EntityUid? NoosphericZapActionEntity;
+
+        [DataField("noosphericZapFeedback")]
+        public string NoosphericZapFeedback = "noospheric-zap-feedback";
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
index 3e198aa930..3b29a1e436 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
@@ -12,5 +12,11 @@ public sealed partial class PsionicInvisibilityPowerComponent : Component
 
         [DataField("psionicInvisibilityActionEntity")]
         public EntityUid? PsionicInvisibilityActionEntity;
+
+        [DataField("InvisibilityFeedback")]
+        public string InvisibilityFeedback = "invisibility-feedback";
+
+        [DataField("UseTimer")]
+        public float UseTimer = 30f;
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
index 4a62e84d19..2f86615b83 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
@@ -26,6 +26,12 @@ public sealed partial class PsionicRegenerationPowerComponent : Component
 
         [DataField("psionicRegenerationActionEntity")]
         public EntityUid? PsionicRegenerationActionEntity;
+
+        [DataField("regenerationFeedback")]
+        public string RegenerationFeedback = "regeneration-feedback";
+
+        [DataField("selfRevive")]
+        public bool SelfRevive { get; set; } = false;
     }
 }
 
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
index 28425afdb4..d2af000e26 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
@@ -14,5 +14,8 @@ public sealed partial class PyrokinesisPowerComponent : Component
 
         [DataField("pyrokinesisActionEntity")]
         public EntityUid? PyrokinesisActionEntity;
+
+        [DataField("pyrokinesisFeedback")]
+        public string PyrokinesisFeedback = "pyrokinesis-feedback";
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
index 51958822a4..cd298c3ec0 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
@@ -19,5 +19,8 @@ public sealed partial class TelegnosisPowerComponent : Component
 
         [DataField("telegnosisActionEntity")]
         public EntityUid? TelegnosisActionEntity;
+
+        [DataField("telegnosisFeedback")]
+        public string TelegnosisFeedback = "telegnosis-feedback";
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
index 9091e03cfc..7c7befa33c 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Actions;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Abilities.Psionics
@@ -15,6 +14,15 @@ public sealed partial class PsionicComponent : Component
         public bool Removable = true;
 
         [DataField("activePowers")]
-        public HashSet<Component> ActivePowers = new();
+        public List<Component> ActivePowers = new();
+
+        [DataField("psychicFeedback")]
+        public List<string> PsychicFeedback= new();
+
+        [DataField("amplification")]
+        public float Amplification = 1f;
+
+        [DataField("dampening")]
+        public float Dampening = 1f;
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
index b28801efe7..b7c3c8ad2d 100644
--- a/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
+++ b/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
@@ -1,2 +1,3 @@
 namespace Content.Shared.Actions.Events;
-public sealed partial class MetapsionicPowerActionEvent : InstantActionEvent {}
+public sealed partial class WideMetapsionicPowerActionEvent : InstantActionEvent { }
+public sealed partial class FocusedMetapsionicPowerActionEvent : EntityTargetActionEvent { }
diff --git a/Content.Shared/Nyanotrasen/Psionics/Events.cs b/Content.Shared/Nyanotrasen/Psionics/Events.cs
index cf9a50c6e1..45a00b5f04 100644
--- a/Content.Shared/Nyanotrasen/Psionics/Events.cs
+++ b/Content.Shared/Nyanotrasen/Psionics/Events.cs
@@ -21,6 +21,42 @@ public PsionicRegenerationDoAfterEvent(TimeSpan startedAt)
         public override DoAfterEvent Clone() => this;
     }
 
+    [Serializable, NetSerializable]
+    public sealed partial class PsionicInvisibilityTimerEvent : DoAfterEvent
+    {
+        [DataField("startedAt", required: true)]
+        public TimeSpan StartedAt;
+
+        private PsionicInvisibilityTimerEvent()
+        {
+        }
+
+        public PsionicInvisibilityTimerEvent(TimeSpan startedAt)
+        {
+            StartedAt = startedAt;
+        }
+
+        public override DoAfterEvent Clone() => this;
+    }
+
+    [Serializable, NetSerializable]
+    public sealed partial class FocusedMetapsionicDoAfterEvent : DoAfterEvent
+    {
+        [DataField("startedAt", required: true)]
+        public TimeSpan StartedAt;
+
+        private FocusedMetapsionicDoAfterEvent()
+        {
+        }
+
+        public FocusedMetapsionicDoAfterEvent(TimeSpan startedAt)
+        {
+            StartedAt = startedAt;
+        }
+
+        public override DoAfterEvent Clone() => this;
+    }
+
     [Serializable, NetSerializable]
     public sealed partial class GlimmerWispDrainDoAfterEvent : SimpleDoAfterEvent
     {

From 839eac1fb6f2f6f0955e434c2b9c17ccd62d0c99 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 3 May 2024 13:59:49 -0400
Subject: [PATCH 20/84] Psionic Refactor pt 1

---
 .../Psionics/Abilities/DispelPowerSystem.cs   | 41 ++++----
 .../Abilities/MetapsionicPowerSystem.cs       | 33 +++----
 .../Psionics/Abilities/MindSwapPowerSystem.cs | 93 +++++++++----------
 .../Abilities/MindSwappedComponent.cs         | 11 +--
 .../Abilities/NoosphericZapPowerSystem.cs     | 30 +++---
 .../PsionicInvisibilityPowerSystem.cs         | 56 ++++++-----
 .../PsionicRegenerationPowerSystem.cs         | 37 +++-----
 .../Abilities/PyrokinesisPowerSystem.cs       | 33 ++++---
 .../Abilities/TelegnosisPowerSystem.cs        | 32 +++----
 .../Psionics/PsionicAbilitiesSystem.cs        | 18 +---
 .../Invisibility/PsionicInvisibilitySystem.cs | 20 ++--
 .../Nyanotrasen/Psionics/PsionicsSystem.cs    |  8 +-
 .../Prototypes/Nyanotrasen/Actions/types.yml  | 22 ++++-
 13 files changed, 195 insertions(+), 239 deletions(-)

diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
index d338a5a5bc..f7d88f4cb8 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Actions;
+using Content.Shared.Actions.ActionTypes;
 using Content.Shared.StatusEffect;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Damage;
@@ -10,9 +11,6 @@
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
-using Content.Shared.Mind;
-using Content.Shared.Actions.Events;
-using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -28,7 +26,6 @@ public sealed class DispelPowerSystem : EntitySystem
         [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
 
 
         public override void Initialize()
@@ -48,25 +45,22 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, DispelPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.DispelActionEntity, component.DispelActionId );
-            _actions.TryGetActionData( component.DispelActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.DispelActionEntity);
+            if (!_prototypeManager.TryIndex<EntityTargetActionPrototype>("Dispel", out var action))
+                return;
+
+            component.DispelPowerAction = new EntityTargetAction(action);
+            if (action.UseDelay != null)
+                component.DispelPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) action.UseDelay);
+            _actions.AddAction(uid, component.DispelPowerAction, null);
+
             if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-            {
-                psionic.PsionicAbility = component.DispelActionEntity;
-                psionic.ActivePowers.Add(component);
-            }
+                psionic.PsionicAbility = component.DispelPowerAction;
         }
 
         private void OnShutdown(EntityUid uid, DispelPowerComponent component, ComponentShutdown args)
         {
-            _actions.RemoveAction(uid, component.DispelActionEntity);
-
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-            }
+            if (_prototypeManager.TryIndex<EntityTargetActionPrototype>("Dispel", out var action))
+                _actions.RemoveAction(uid, new EntityTargetAction(action), null);
         }
 
         private void OnPowerUsed(DispelPowerActionEvent args)
@@ -89,7 +83,7 @@ private void OnDispelled(EntityUid uid, DispellableComponent component, Dispelle
             QueueDel(uid);
             Spawn("Ash", Transform(uid).Coordinates);
             _popupSystem.PopupCoordinates(Loc.GetString("psionic-burns-up", ("item", uid)), Transform(uid).Coordinates, Filter.Pvs(uid), true, Shared.Popups.PopupType.MediumCaution);
-            _audioSystem.PlayEntity("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true);
+            _audioSystem.Play("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true);
             args.Handled = true;
         }
 
@@ -106,7 +100,7 @@ private void OnDmgDispelled(EntityUid uid, DamageOnDispelComponent component, Di
         private void OnGuardianDispelled(EntityUid uid, GuardianComponent guardian, DispelledEvent args)
         {
             if (TryComp<GuardianHostComponent>(guardian.Host, out var host))
-                _guardianSystem.ToggleGuardian(guardian.Host.Value, host);
+                _guardianSystem.ToggleGuardian(guardian.Host, host);
 
             DealDispelDamage(uid);
             args.Handled = true;
@@ -133,7 +127,7 @@ public void DealDispelDamage(EntityUid uid, DamageSpecifier? damage = null)
                 return;
 
             _popupSystem.PopupCoordinates(Loc.GetString("psionic-burn-resist", ("item", uid)), Transform(uid).Coordinates, Filter.Pvs(uid), true, Shared.Popups.PopupType.SmallCaution);
-            _audioSystem.PlayEntity("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true);
+            _audioSystem.Play("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true);
 
             if (damage == null)
             {
@@ -143,7 +137,8 @@ public void DealDispelDamage(EntityUid uid, DamageSpecifier? damage = null)
             _damageableSystem.TryChangeDamage(uid, damage, true, true);
         }
     }
-    public sealed class DispelledEvent : HandledEntityEventArgs {}
-}
 
+    public sealed class DispelPowerActionEvent : EntityTargetActionEvent {}
 
+    public sealed class DispelledEvent : HandledEntityEventArgs {}
+}
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
index b775117b71..ee3c9a58d9 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
@@ -1,11 +1,11 @@
 using Content.Shared.Actions;
+using Content.Shared.Actions.ActionTypes;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.StatusEffect;
 using Content.Shared.Popups;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
-using Content.Shared.Mind;
-using Content.Shared.Actions.Events;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -18,7 +18,6 @@ public sealed class MetapsionicPowerSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popups = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
 
 
         public override void Initialize()
@@ -31,26 +30,22 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, MetapsionicPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.MetapsionicActionEntity, component.MetapsionicActionId );
-            _actions.TryGetActionData( component.MetapsionicActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.MetapsionicActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-            {
-                psionic.PsionicAbility = component.MetapsionicActionEntity;
-                psionic.ActivePowers.Add(component);
-            }
+            if (!_prototypeManager.TryIndex<InstantActionPrototype>("MetapsionicPulse", out var metapsionicPulse))
+                return;
 
+            component.MetapsionicPowerAction = new InstantAction(metapsionicPulse);
+            if (metapsionicPulse.UseDelay != null)
+                component.MetapsionicPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) metapsionicPulse.UseDelay);
+            _actions.AddAction(uid, component.MetapsionicPowerAction, null);
+
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+                psionic.PsionicAbility = component.MetapsionicPowerAction;
         }
 
         private void OnShutdown(EntityUid uid, MetapsionicPowerComponent component, ComponentShutdown args)
         {
-            _actions.RemoveAction(uid, component.MetapsionicActionEntity);
-
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-            }
+            if (_prototypeManager.TryIndex<InstantActionPrototype>("MetapsionicPulse", out var metapsionicPulse))
+                _actions.RemoveAction(uid, new InstantAction(metapsionicPulse), null);
         }
 
         private void OnPowerUsed(EntityUid uid, MetapsionicPowerComponent component, MetapsionicPowerActionEvent args)
@@ -71,4 +66,6 @@ private void OnPowerUsed(EntityUid uid, MetapsionicPowerComponent component, Met
             args.Handled = true;
         }
     }
+
+    public sealed class MetapsionicPowerActionEvent : InstantActionEvent {}
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
index b23224cab4..5c83de2b52 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Actions;
+using Content.Shared.Actions.ActionTypes;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Speech;
 using Content.Shared.Stealth.Components;
@@ -6,14 +7,13 @@
 using Content.Shared.Mobs;
 using Content.Shared.Damage;
 using Content.Server.Mind;
+using Content.Server.Mind.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Server.Popups;
 using Content.Server.Psionics;
 using Content.Server.GameTicking;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Content.Shared.Mind;
-using Content.Shared.Actions.Events;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -26,7 +26,6 @@ public sealed class MindSwapPowerSystem : EntitySystem
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly MindSystem _mindSystem = default!;
-        [Dependency] private readonly MetaDataSystem _metaDataSystem = default!;
 
         public override void Initialize()
         {
@@ -44,24 +43,22 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.MindSwapActionEntity, component.MindSwapActionId );
-            _actions.TryGetActionData( component.MindSwapActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.MindSwapActionEntity);
+            if (!_prototypeManager.TryIndex<EntityTargetActionPrototype>("MindSwap", out var mindSwap))
+                return;
+
+            component.MindSwapPowerAction = new EntityTargetAction(mindSwap);
+            if (mindSwap.UseDelay != null)
+                component.MindSwapPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) mindSwap.UseDelay);
+            _actions.AddAction(uid, component.MindSwapPowerAction, null);
+
             if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-            {
-                psionic.PsionicAbility = component.MindSwapActionEntity;
-                psionic.ActivePowers.Add(component);
-            }
+                psionic.PsionicAbility = component.MindSwapPowerAction;
         }
 
         private void OnShutdown(EntityUid uid, MindSwapPowerComponent component, ComponentShutdown args)
         {
-            _actions.RemoveAction(uid, component.MindSwapActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-            }
+            if (_prototypeManager.TryIndex<EntityTargetActionPrototype>("MindSwap", out var action))
+                _actions.RemoveAction(uid, new EntityTargetAction(action), null);
         }
 
         private void OnPowerUsed(MindSwapPowerActionEvent args)
@@ -137,9 +134,8 @@ private void OnGhostAttempt(GhostAttemptHandleEvent args)
             if (!HasComp<MindSwappedComponent>(args.Mind.CurrentEntity))
                 return;
 
-            //No idea where the viaCommand went. It's on the internal OnGhostAttempt, but not this layer. Maybe unnecessary.
-            /*if (!args.viaCommand)
-                return;*/
+            if (!args.ViaCommand)
+                return;
 
             args.Result = false;
             args.Handled = true;
@@ -147,12 +143,12 @@ private void OnGhostAttempt(GhostAttemptHandleEvent args)
 
         private void OnSwapInit(EntityUid uid, MindSwappedComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.MindSwapReturnActionEntity, component.MindSwapReturnActionId );
-            _actions.TryGetActionData( component.MindSwapReturnActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.MindSwapReturnActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.MindSwapReturnActionEntity;
+            if (_prototypeManager.TryIndex<InstantActionPrototype>("MindSwapReturn", out var mindSwap))
+            {
+                var action = new InstantAction(mindSwap);
+                action.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(15));
+                _actions.AddAction(uid, action, null);
+            }
         }
 
         public void Swap(EntityUid performer, EntityUid target, bool end = false)
@@ -161,35 +157,30 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false)
                 return;
 
             // Get the minds first. On transfer, they'll be gone.
-            MindComponent? performerMind = null;
-            MindComponent? targetMind = null;
+            Mind.Mind? performerMind = null;
+            Mind.Mind? targetMind = null;
 
             // This is here to prevent missing MindContainerComponent Resolve errors.
-            if(!_mindSystem.TryGetMind(performer, out var performerMindId, out performerMind)){
-                performerMind = null;
-            };
-
-            if(!_mindSystem.TryGetMind(target, out var targetMindId, out targetMind)){
-                targetMind = null;
-            };
-            //This is a terrible way to 'unattach' minds. I wanted to use UnVisit but in TransferTo's code they say
-            //To unnatch the minds, do it like this.
-            //Have to unnattach the minds before we reattach them via transfer. Still feels weird, but seems to work well.
-            _mindSystem.TransferTo(performerMindId, null);
-            _mindSystem.TransferTo(targetMindId, null);
+            if (TryComp<MindContainerComponent>(performer, out var performerMindContainer))
+                performerMind = _mindSystem.GetMind(performer, performerMindContainer);
+
+            if (TryComp<MindContainerComponent>(target, out var targetMindContainer))
+                targetMind = _mindSystem.GetMind(target, targetMindContainer);
+
             // Do the transfer.
             if (performerMind != null)
-                _mindSystem.TransferTo(performerMindId, target, ghostCheckOverride: true, false, performerMind);
+                _mindSystem.TransferTo(performerMind, target, ghostCheckOverride: true);
 
             if (targetMind != null)
-                _mindSystem.TransferTo(targetMindId, performer, ghostCheckOverride: true, false, targetMind);
+                _mindSystem.TransferTo(targetMind, performer, ghostCheckOverride: true);
 
             if (end)
             {
-                var performerMindPowerComp = EntityManager.GetComponent<MindSwappedComponent>(performer);
-                var targetMindPowerComp = EntityManager.GetComponent<MindSwappedComponent>(target);
-                _actions.RemoveAction(performer, performerMindPowerComp.MindSwapReturnActionEntity);
-                _actions.RemoveAction(target, targetMindPowerComp.MindSwapReturnActionEntity);
+                if (_prototypeManager.TryIndex<InstantActionPrototype>("MindSwapReturn", out var mindSwap))
+                {
+                    _actions.RemoveAction(performer, new InstantAction(mindSwap), null);
+                    _actions.RemoveAction(target, new InstantAction(mindSwap), null);
+                }
 
                 RemComp<MindSwappedComponent>(performer);
                 RemComp<MindSwappedComponent>(target);
@@ -205,10 +196,11 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false)
 
         public void GetTrapped(EntityUid uid)
         {
+            if (!_prototypeManager.TryIndex<InstantActionPrototype>("MindSwapReturn", out var action))
+                return;
 
             _popupSystem.PopupEntity(Loc.GetString("mindswap-trapped"), uid, uid, Shared.Popups.PopupType.LargeCaution);
-            var perfComp = EnsureComp<MindSwappedComponent>(uid);
-            _actions.RemoveAction(uid, perfComp.MindSwapReturnActionEntity, null);
+            _actions.RemoveAction(uid, action);
 
             if (HasComp<TelegnosticProjectionComponent>(uid))
             {
@@ -216,9 +208,12 @@ public void GetTrapped(EntityUid uid)
                 RemComp<StealthComponent>(uid);
                 EnsureComp<SpeechComponent>(uid);
                 EnsureComp<DispellableComponent>(uid);
-                _metaDataSystem.SetEntityName(uid, Loc.GetString("telegnostic-trapped-entity-name"));
-                _metaDataSystem.SetEntityDescription(uid, Loc.GetString("telegnostic-trapped-entity-desc"));
+                MetaData(uid).EntityName = Loc.GetString("telegnostic-trapped-entity-name");
+                MetaData(uid).EntityDescription = Loc.GetString("telegnostic-trapped-entity-desc");
             }
         }
     }
+
+    public sealed class MindSwapPowerActionEvent : EntityTargetActionEvent {}
+    public sealed class MindSwapPowerReturnActionEvent : InstantActionEvent {}
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
index 72cd6a66ef..84d2909c1f 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
@@ -1,18 +1,9 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
 namespace Content.Server.Abilities.Psionics
 {
     [RegisterComponent]
-    public sealed partial class MindSwappedComponent : Component
+    public sealed class MindSwappedComponent : Component
     {
         [ViewVariables]
         public EntityUid OriginalEntity = default!;
-        [DataField("mindSwapReturnActionId",
-        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? MindSwapReturnActionId = "ActionMindSwapReturn";
-
-        [DataField("mindSwapReturnActionEntity")]
-        public EntityUid? MindSwapReturnActionEntity;
     }
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
index 0fd261ef12..c844030f1e 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Actions;
+using Content.Shared.Actions.ActionTypes;
 using Content.Shared.Abilities.Psionics;
 using Content.Server.Psionics;
 using Content.Shared.StatusEffect;
@@ -6,8 +7,6 @@
 using Content.Server.Beam;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Content.Server.Mind;
-using Content.Shared.Actions.Events;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -20,7 +19,6 @@ public sealed class NoosphericZapPowerSystem : EntitySystem
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly BeamSystem _beam = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
 
 
         public override void Initialize()
@@ -33,24 +31,22 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, NoosphericZapPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.NoosphericZapActionEntity, component.NoosphericZapActionId );
-            _actions.TryGetActionData( component.NoosphericZapActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.NoosphericZapActionEntity);
+            if (!_prototypeManager.TryIndex<EntityTargetActionPrototype>("NoosphericZap", out var noosphericZap))
+                return;
+
+            component.NoosphericZapPowerAction = new EntityTargetAction(noosphericZap);
+            if (noosphericZap.UseDelay != null)
+                component.NoosphericZapPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) noosphericZap.UseDelay);
+            _actions.AddAction(uid, component.NoosphericZapPowerAction, null);
+
             if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-            {
-                psionic.PsionicAbility = component.NoosphericZapActionEntity;
-                psionic.ActivePowers.Add(component);
-            }
+                psionic.PsionicAbility = component.NoosphericZapPowerAction;
         }
 
         private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, ComponentShutdown args)
         {
-            _actions.RemoveAction(uid, component.NoosphericZapActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-            }
+            if (_prototypeManager.TryIndex<EntityTargetActionPrototype>("NoosphericZap", out var noosphericZap))
+                _actions.RemoveAction(uid, new EntityTargetAction(noosphericZap), null);
         }
 
         private void OnPowerUsed(NoosphericZapPowerActionEvent args)
@@ -70,4 +66,6 @@ private void OnPowerUsed(NoosphericZapPowerActionEvent args)
             args.Handled = true;
         }
     }
+
+    public sealed class NoosphericZapPowerActionEvent : EntityTargetActionEvent {}
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
index 5ca1dc7a6d..3bbaf9d813 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Actions;
+using Content.Shared.Actions.ActionTypes;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Damage;
@@ -10,9 +11,6 @@
 using Robust.Shared.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Timing;
-using Content.Server.Mind;
-using Content.Shared.Actions.Events;
-using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -24,8 +22,6 @@ public sealed class PsionicInvisibilityPowerSystem : EntitySystem
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly SharedStealthSystem _stealth = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
 
         public override void Initialize()
         {
@@ -33,7 +29,7 @@ public override void Initialize()
             SubscribeLocalEvent<PsionicInvisibilityPowerComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<PsionicInvisibilityPowerComponent, ComponentShutdown>(OnShutdown);
             SubscribeLocalEvent<PsionicInvisibilityPowerComponent, PsionicInvisibilityPowerActionEvent>(OnPowerUsed);
-            SubscribeLocalEvent<RemovePsionicInvisibilityOffPowerActionEvent>(OnPowerOff);
+            SubscribeLocalEvent<PsionicInvisibilityPowerOffActionEvent>(OnPowerOff);
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ComponentInit>(OnStart);
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ComponentShutdown>(OnEnd);
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, DamageChangedEvent>(OnDamageChanged);
@@ -41,24 +37,22 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.PsionicInvisibilityActionEntity, component.PsionicInvisibilityActionId );
-            _actions.TryGetActionData( component.PsionicInvisibilityActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.PsionicInvisibilityActionEntity);
+            if (!_prototypeManager.TryIndex<InstantActionPrototype>("PsionicInvisibility", out var invis))
+                return;
+
+            component.PsionicInvisibilityPowerAction = new InstantAction(invis);
+            if (invis.UseDelay != null)
+                component.PsionicInvisibilityPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) invis.UseDelay);
+            _actions.AddAction(uid, component.PsionicInvisibilityPowerAction, null);
+
             if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-            {
-                psionic.PsionicAbility = component.PsionicInvisibilityActionEntity;
-                psionic.ActivePowers.Add(component);
-            }
+                psionic.PsionicAbility = component.PsionicInvisibilityPowerAction;
         }
 
         private void OnShutdown(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentShutdown args)
         {
-            _actions.RemoveAction(uid, component.PsionicInvisibilityActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-            }
+            if (_prototypeManager.TryIndex<InstantActionPrototype>("PsionicInvisibility", out var invis))
+                _actions.RemoveAction(uid, new InstantAction(invis), null);
         }
 
         private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityPowerActionEvent args)
@@ -67,17 +61,15 @@ private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent compon
                 return;
 
             ToggleInvisibility(args.Performer);
-            var action = Spawn(PsionicInvisibilityUsedComponent.PsionicInvisibilityUsedActionPrototype);
-            _actions.AddAction(uid, action, action);
-            _actions.TryGetActionData( action, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(action);
+
+            if (_prototypeManager.TryIndex<InstantActionPrototype>("PsionicInvisibilityOff", out var invis))
+                _actions.AddAction(args.Performer, new InstantAction(invis), null);
 
             _psionics.LogPowerUsed(uid, "psionic invisibility");
             args.Handled = true;
         }
 
-        private void OnPowerOff(RemovePsionicInvisibilityOffPowerActionEvent args)
+        private void OnPowerOff(PsionicInvisibilityPowerOffActionEvent args)
         {
             if (!HasComp<PsionicInvisibilityUsedComponent>(args.Performer))
                 return;
@@ -92,7 +84,7 @@ private void OnStart(EntityUid uid, PsionicInvisibilityUsedComponent component,
             EnsureComp<PacifiedComponent>(uid);
             var stealth = EnsureComp<StealthComponent>(uid);
             _stealth.SetVisibility(uid, 0.66f, stealth);
-            _audio.PlayPvs("/Audio/Effects/toss.ogg", uid);
+            SoundSystem.Play("/Audio/Effects/toss.ogg", Filter.Pvs(uid), uid);
 
         }
 
@@ -104,12 +96,13 @@ private void OnEnd(EntityUid uid, PsionicInvisibilityUsedComponent component, Co
             RemComp<PsionicallyInvisibleComponent>(uid);
             RemComp<PacifiedComponent>(uid);
             RemComp<StealthComponent>(uid);
-            _audio.PlayPvs("/Audio/Effects/toss.ogg", uid);
-            //Pretty sure this DOESN'T work as intended.
-            _actions.RemoveAction(uid, component.PsionicInvisibilityUsedActionEntity);
+            SoundSystem.Play("/Audio/Effects/toss.ogg", Filter.Pvs(uid), uid);
+
+            if (_prototypeManager.TryIndex<InstantActionPrototype>("PsionicInvisibilityOff", out var invis))
+                _actions.RemoveAction(uid, new InstantAction(invis), null);
 
             _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(8), false);
-            DirtyEntity(uid);
+            Dirty(uid);
         }
 
         private void OnDamageChanged(EntityUid uid, PsionicInvisibilityUsedComponent component, DamageChangedEvent args)
@@ -131,4 +124,7 @@ public void ToggleInvisibility(EntityUid uid)
             }
         }
     }
+
+    public sealed class PsionicInvisibilityPowerActionEvent : InstantActionEvent {}
+    public sealed class PsionicInvisibilityPowerOffActionEvent : InstantActionEvent {}
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
index 097a0cb750..f40465643d 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
@@ -4,10 +4,10 @@
 using Robust.Shared.Prototypes;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.DoAfter;
 using Content.Shared.Abilities.Psionics;
+using Content.Shared.Actions.ActionTypes;
 using Content.Shared.Actions;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.DoAfter;
@@ -18,10 +18,6 @@
 using Content.Shared.Examine;
 using static Content.Shared.Examine.ExamineSystemShared;
 using Robust.Shared.Timing;
-using Content.Server.Mind;
-using Content.Shared.Actions.Events;
-using Content.Shared.Chemistry.EntitySystems;
-using Robust.Server.Audio;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -37,8 +33,6 @@ public sealed class PsionicRegenerationPowerSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
-        [Dependency] private readonly ExamineSystemShared _examine = default!;
 
 
         public override void Initialize()
@@ -54,21 +48,22 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.PsionicRegenerationActionEntity, component.PsionicRegenerationActionId );
-            _actions.TryGetActionData( component.PsionicRegenerationActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.PsionicRegenerationActionEntity);
+            if (!_prototypeManager.TryIndex<InstantActionPrototype>("PsionicRegeneration", out var metapsionic))
+                return;
+
+            component.PsionicRegenerationPowerAction = new InstantAction(metapsionic);
+            if (metapsionic.UseDelay != null)
+                component.PsionicRegenerationPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) metapsionic.UseDelay);
+            _actions.AddAction(uid, component.PsionicRegenerationPowerAction, null);
+
             if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-            {
-                psionic.PsionicAbility = component.PsionicRegenerationActionEntity;
-                psionic.ActivePowers.Add(component);
-            }
+                psionic.PsionicAbility = component.PsionicRegenerationPowerAction;
         }
 
         private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationPowerActionEvent args)
         {
             var ev = new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime);
-            var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseDelay, ev, uid);
+            var doAfterArgs = new DoAfterArgs(uid, component.UseDelay, ev, uid);
 
             _doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId);
 
@@ -88,12 +83,8 @@ private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent compon
 
         private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentShutdown args)
         {
-            _actions.RemoveAction(uid, component.PsionicRegenerationActionEntity);
-
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-            }
+            if (_prototypeManager.TryIndex<InstantActionPrototype>("PsionicRegeneration", out var metapsionic))
+                _actions.RemoveAction(uid, new InstantAction(metapsionic), null);
         }
 
         private void OnDispelled(EntityUid uid, PsionicRegenerationPowerComponent component, DispelledEvent args)
@@ -125,5 +116,7 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen
             _bloodstreamSystem.TryAddToChemicals(uid, solution, stream);
         }
     }
+
+    public sealed class PsionicRegenerationPowerActionEvent : InstantActionEvent {}
 }
 
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
index 407b72c6b5..d86c3a346f 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -1,12 +1,12 @@
 using Content.Shared.Actions;
+using Content.Shared.Actions.ActionTypes;
 using Content.Shared.Abilities.Psionics;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Popups;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
-using Content.Server.Mind;
-using Content.Shared.Actions.Events;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -18,7 +18,6 @@ public sealed class PyrokinesisPowerSystem : EntitySystem
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
 
         public override void Initialize()
         {
@@ -30,24 +29,22 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.PyrokinesisActionEntity, component.PyrokinesisActionId );
-            _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.PyrokinesisActionEntity);
+            if (!_prototypeManager.TryIndex<EntityTargetActionPrototype>("Pyrokinesis", out var pyrokinesis))
+                return;
+
+            component.PyrokinesisPowerAction = new EntityTargetAction(pyrokinesis);
+            if (pyrokinesis.UseDelay != null)
+                component.PyrokinesisPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) pyrokinesis.UseDelay);
+            _actions.AddAction(uid, component.PyrokinesisPowerAction, null);
+
             if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-            {
-                psionic.PsionicAbility = component.PyrokinesisActionEntity;
-                psionic.ActivePowers.Add(component);
-            }
+                psionic.PsionicAbility = component.PyrokinesisPowerAction;
         }
 
         private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, ComponentShutdown args)
         {
-            _actions.RemoveAction(uid, component.PyrokinesisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-            }
+            if (_prototypeManager.TryIndex<EntityTargetActionPrototype>("Pyrokinesis", out var pyrokinesis))
+                _actions.RemoveAction(uid, new EntityTargetAction(pyrokinesis), null);
         }
 
         private void OnPowerUsed(PyrokinesisPowerActionEvent args)
@@ -56,11 +53,13 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args)
                 return;
 
             flammableComponent.FireStacks += 5;
-            _flammableSystem.Ignite(args.Target, args.Target);
+            _flammableSystem.Ignite(args.Target, flammableComponent);
             _popupSystem.PopupEntity(Loc.GetString("pyrokinesis-power-used", ("target", args.Target)), args.Target, Shared.Popups.PopupType.LargeCaution);
 
             _psionics.LogPowerUsed(args.Performer, "pyrokinesis");
             args.Handled = true;
         }
     }
+
+    public sealed class PyrokinesisPowerActionEvent : EntityTargetActionEvent {}
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
index f7ae04b61e..0d6adb7f9a 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
@@ -1,11 +1,10 @@
 using Content.Shared.Actions;
+using Content.Shared.Actions.ActionTypes;
 using Content.Shared.StatusEffect;
 using Content.Shared.Abilities.Psionics;
-using Content.Shared.Mind.Components;
+using Content.Server.Mind.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Content.Server.Mind;
-using Content.Shared.Actions.Events;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -17,7 +16,6 @@ public sealed class TelegnosisPowerSystem : EntitySystem
         [Dependency] private readonly MindSwapPowerSystem _mindSwap = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
 
         public override void Initialize()
         {
@@ -30,24 +28,22 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, TelegnosisPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.TelegnosisActionEntity, component.TelegnosisActionId );
-            _actions.TryGetActionData( component.TelegnosisActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.TelegnosisActionEntity);
+            if (!_prototypeManager.TryIndex<InstantActionPrototype>("Telegnosis", out var telegnosis))
+                return;
+
+            component.TelegnosisPowerAction = new InstantAction(telegnosis);
+            if (telegnosis.UseDelay != null)
+                component.TelegnosisPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) telegnosis.UseDelay);
+            _actions.AddAction(uid, component.TelegnosisPowerAction, null);
+
             if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-            {
-                psionic.PsionicAbility = component.TelegnosisActionEntity;
-                psionic.ActivePowers.Add(component);
-            }
+                psionic.PsionicAbility = component.TelegnosisPowerAction;
         }
 
         private void OnShutdown(EntityUid uid, TelegnosisPowerComponent component, ComponentShutdown args)
         {
-            _actions.RemoveAction(uid, component.TelegnosisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-            }
+            if (_prototypeManager.TryIndex<InstantActionPrototype>("Telegnosis", out var metapsionic))
+                _actions.RemoveAction(uid, new InstantAction(metapsionic), null);
         }
 
         private void OnPowerUsed(EntityUid uid, TelegnosisPowerComponent component, TelegnosisPowerActionEvent args)
@@ -64,4 +60,6 @@ private void OnMindRemoved(EntityUid uid, TelegnosticProjectionComponent compone
             QueueDel(uid);
         }
     }
+
+    public sealed class TelegnosisPowerActionEvent : InstantActionEvent {}
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
index ee16aaccfb..326be3e058 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
@@ -6,14 +6,12 @@
 using Content.Server.EUI;
 using Content.Server.Psionics;
 using Content.Server.Mind;
-using Content.Shared.Mind;
-using Content.Shared.Mind.Components;
+using Content.Server.Mind.Components;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Random;
 using Robust.Shared.Prototypes;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
-using Robust.Shared.Player;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -52,11 +50,8 @@ public void AddPsionics(EntityUid uid, bool warn = true)
             if (HasComp<PsionicComponent>(uid))
                 return;
 
-            //Don't know if this will work. New mind state vs old.
             if (!TryComp<MindContainerComponent>(uid, out var mindContainer) ||
-                !_mindSystem.TryGetMind(uid, out _, out var mind ))
-            //||
-            //!_mindSystem.TryGetMind(uid, out var mind, mindContainer))
+                !_mindSystem.TryGetMind(uid, out var mind, mindContainer))
             {
                 EnsureComp<PsionicAwaitingPlayerComponent>(uid);
                 return;
@@ -127,13 +122,8 @@ public void RemovePsionics(EntityUid uid)
                 if (EntityManager.TryGetComponent(uid, comp.GetType(), out var psionicPower))
                     RemComp(uid, psionicPower);
             }
-            if (psionic.PsionicAbility != null){
-                _actionsSystem.TryGetActionData( psionic.PsionicAbility, out var psiAbility );
-                if (psiAbility != null){
-                    var owner = psiAbility.Owner;
-                    _actionsSystem.RemoveAction(uid, psiAbility.Owner);
-                }
-            }
+            if (psionic.PsionicAbility != null)
+                _actionsSystem.RemoveAction(uid, psionic.PsionicAbility);
 
             _statusEffectsSystem.TryAddStatusEffect(uid, "Stutter", TimeSpan.FromMinutes(5), false, "StutteringAccent");
 
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
index 31e6b89f13..1c9cb55f2d 100644
--- a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
@@ -20,7 +20,6 @@ public override void Initialize()
             SubscribeLocalEvent<PotentialPsionicComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<PsionicInsulationComponent, ComponentInit>(OnInsulInit);
             SubscribeLocalEvent<PsionicInsulationComponent, ComponentShutdown>(OnInsulShutdown);
-            SubscribeLocalEvent<EyeComponent, ComponentInit>(OnEyeInit);
 
             /// Layer
             SubscribeLocalEvent<PsionicallyInvisibleComponent, ComponentInit>(OnInvisInit);
@@ -36,11 +35,15 @@ private void OnInit(EntityUid uid, PotentialPsionicComponent component, Componen
             SetCanSeePsionicInvisiblity(uid, false);
         }
 
+        /// <summary>
+        /// Being able to see invisible by default is no longer tracked by "Not having Potential Psionic".
+        /// Anything intended to be immune to invisibility(and mind magic in general) should instead have PsionicInsulation as a built-in component
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="component"></param>
+        /// <param name="args"></param>
         private void OnInsulInit(EntityUid uid, PsionicInsulationComponent component, ComponentInit args)
         {
-            if (!HasComp<PotentialPsionicComponent>(uid))
-                return;
-
             if (HasComp<PsionicInvisibilityUsedComponent>(uid))
                 _invisSystem.ToggleInvisibility(uid);
 
@@ -61,9 +64,6 @@ private void OnInsulInit(EntityUid uid, PsionicInsulationComponent component, Co
 
         private void OnInsulShutdown(EntityUid uid, PsionicInsulationComponent component, ComponentShutdown args)
         {
-            if (!HasComp<PotentialPsionicComponent>(uid))
-                return;
-
             SetCanSeePsionicInvisiblity(uid, false);
 
             if (!HasComp<PsionicComponent>(uid))
@@ -99,10 +99,6 @@ private void OnInvisShutdown(EntityUid uid, PsionicallyInvisibleComponent compon
             }
         }
 
-        private void OnEyeInit(EntityUid uid, EyeComponent component, ComponentInit args)
-        {
-            //SetCanSeePsionicInvisiblity(uid, true); //JJ Comment - Not allowed to modifies .yml on spawn any longer. See UninitializedSaveTest.
-        }
         private void OnEntInserted(EntityUid uid, PsionicallyInvisibleComponent component, EntInsertedIntoContainerMessage args)
         {
             DirtyEntity(args.Entity);
@@ -125,7 +121,7 @@ public void SetCanSeePsionicInvisiblity(EntityUid uid, bool set)
             {
                 if (EntityManager.TryGetComponent(uid, out EyeComponent? eye))
                 {
-                    _eye.SetVisibilityMask(uid, eye.VisibilityMask & ~ (int) VisibilityFlags.PsionicInvisibility, eye);
+                    _eye.SetVisibilityMask(uid, eye.VisibilityMask & ~(int) VisibilityFlags.PsionicInvisibility, eye);
                 }
             }
         }
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs b/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
index 5a96af2e96..9da293df0b 100644
--- a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
@@ -1,19 +1,14 @@
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.StatusEffect;
-using Content.Shared.Mobs;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Damage.Events;
-using Content.Shared.IdentityManagement;
 using Content.Shared.CCVar;
 using Content.Server.Abilities.Psionics;
-using Content.Server.Chat.Systems;
 using Content.Server.Electrocution;
 using Content.Server.NPC.Components;
 using Content.Server.NPC.Systems;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Random;
 
@@ -27,7 +22,6 @@ public sealed class PsionicsSystem : EntitySystem
         [Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!;
         [Dependency] private readonly MindSwapPowerSystem _mindSwapPowerSystem = default!;
         [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
-        [Dependency] private readonly ChatSystem _chat = default!;
         [Dependency] private readonly NpcFactionSystem _npcFactonSystem = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -151,7 +145,7 @@ public void RollPsionics(EntityUid uid, PotentialPsionicComponent component, boo
             chance = Math.Clamp(chance, 0, 1);
 
             if (_random.Prob(chance))
-                _psionicAbilitiesSystem.AddPsionics(uid, warn);
+                _psionicAbilitiesSystem.AddPsionics(uid);
         }
 
         public void RerollPsionics(EntityUid uid, PotentialPsionicComponent? psionic = null, float bonusMuliplier = 1f)
diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
index e6e4bdc5a7..376d92e3ef 100644
--- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml
+++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
@@ -103,15 +103,29 @@
     event: !type:PyrokinesisPowerActionEvent
 
 - type: entity
-  id: ActionMetapsionic
-  name: action-name-metapsionic
-  description: action-description-metapsionic
+  id: ActionWideMetapsionic
+  name: action-name-widemetapsionic
+  description: action-description-widemetapsionic
   noSpawn: true
   components:
   - type: InstantAction
     icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png
     useDelay: 45
-    event: !type:MetapsionicPowerActionEvent
+    event: !type:WideMetapsionicPowerActionEvent
+
+- type: entity
+  id: ActionFocusedMetapsionic
+  name: action-name-focusedmetapsionic
+  description: action-description-focusedmetapsionic
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png
+    useDelay: 45
+    range: 3
+    checkCanAccess: false
+    itemIconStyle: BigAction
+    event: !type:FocusedMetapsionicPowerActionEvent
 
 - type: entity
   id: ActionPsionicRegeneration

From ac830043bf6a53eaefd2079bcf048d3f5cff6704 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 3 May 2024 14:08:58 -0400
Subject: [PATCH 21/84] Last bit

---
 .../Nyanotrasen/Chat/NyanoChatSystem.cs       |   5 ++-
 .../BecomePsionicConditionComponent.cs        |  11 ------
 .../Systems/BecomePsionicConditionSystem.cs   |  32 ------------------
 .../Audio/Nyanotrasen/heartbeat_fast.ogg      | Bin 0 -> 39983 bytes
 .../nyanotrasen/psionics/psychic-feedback.ftl |   6 ++++
 .../DeltaV/Entities/Mobs/Player/harpy.yml     |   1 -
 .../DeltaV/Entities/Mobs/Player/vulpkanin.yml |   1 -
 .../Entities/Mobs/Player/arachnid.yml         |   1 -
 .../Prototypes/Entities/Mobs/Player/diona.yml |   1 -
 .../Prototypes/Entities/Mobs/Player/dwarf.yml |   2 --
 .../Prototypes/Entities/Mobs/Player/human.yml |   2 --
 .../Prototypes/Entities/Mobs/Player/moth.yml  |   2 --
 .../Entities/Mobs/Player/reptilian.yml        |   2 --
 .../Prototypes/Entities/Mobs/Player/slime.yml |   2 --
 .../Nyanotrasen/Entities/Mobs/Player/Oni.yml  |   1 -
 .../Entities/Mobs/Player/felinid.yml          |   2 --
 .../Nyanotrasen/Objectives/traitor.yml        |  23 -------------
 .../Nyanotrasen/Traits/psionics.yml           |   6 ++++
 .../Prototypes/Objectives/objectiveGroups.yml |   1 -
 19 files changed, 16 insertions(+), 85 deletions(-)
 delete mode 100644 Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs
 delete mode 100644 Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs
 create mode 100644 Resources/Audio/Nyanotrasen/heartbeat_fast.ogg
 create mode 100644 Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
 create mode 100644 Resources/Prototypes/Nyanotrasen/Traits/psionics.yml

diff --git a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs b/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
index 58ed178274..e0fb18fcae 100644
--- a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
+++ b/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Managers;
 using Content.Server.Chat.Systems;
+using Content.Server.Psionics;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Chat;
@@ -47,7 +48,9 @@ private IEnumerable<INetChannel> GetAdminClients()
         private List<INetChannel> GetDreamers(IEnumerable<INetChannel> removeList)
         {
             var filtered = Filter.Empty()
-                .AddWhereAttachedEntity(entity => HasComp<SleepingComponent>(entity) || HasComp<SeeingRainbowsComponent>(entity) && !HasComp<PsionicsDisabledComponent>(entity) && !HasComp<PsionicInsulationComponent>(entity))
+                .AddWhereAttachedEntity(entity => HasComp<SleepingComponent>(entity)
+                || HasComp<SeeingRainbowsComponent>(entity) && !HasComp<PsionicsDisabledComponent>(entity) && !HasComp<PsionicInsulationComponent>(entity)
+                || HasComp<PotentialPsionicComponent>(entity) && !HasComp<PsionicComponent>(entity) && !HasComp<PsionicInsulationComponent>(entity))
                 .Recipients
                 .Select(p => p.ConnectedClient);
 
diff --git a/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs b/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs
deleted file mode 100644
index 3b677bab2d..0000000000
--- a/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Content.Server.Objectives.Systems;
-
-namespace Content.Server.Objectives.Components;
-
-/// <summary>
-/// Requires that the player dies to be complete.
-/// </summary>
-[RegisterComponent, Access(typeof(BecomePsionicConditionSystem))]
-public sealed partial class BecomePsionicConditionComponent : Component
-{
-}
\ No newline at end of file
diff --git a/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs b/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs
deleted file mode 100644
index d090c320a4..0000000000
--- a/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Abilities.Psionics;
-using Content.Server.Objectives.Components;
-using Content.Shared.Mind;
-using Content.Shared.Objectives.Components;
-
-namespace Content.Server.Objectives.Systems
-{
-    public sealed class BecomePsionicConditionSystem : EntitySystem
-    {
-        private EntityQuery<MetaDataComponent> _metaQuery;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<BecomePsionicConditionComponent, ObjectiveGetProgressEvent>(OnGetProgress);
-        }
-
-        private void OnGetProgress(EntityUid uid, BecomePsionicConditionComponent comp, ref ObjectiveGetProgressEvent args)
-        {
-            args.Progress = GetProgress(args.Mind);
-        }
-
-        private float GetProgress(MindComponent mind)
-        {
-            var entMan = IoCManager.Resolve<IEntityManager>();
-            if (HasComp<PsionicComponent>(mind.CurrentEntity))
-                return 1;
-            return 0;
-        }
-    }
-}
diff --git a/Resources/Audio/Nyanotrasen/heartbeat_fast.ogg b/Resources/Audio/Nyanotrasen/heartbeat_fast.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..85a034d9bd0017dafea7df4128235c815babac0c
GIT binary patch
literal 39983
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

literal 0
HcmV?d00001

diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
new file mode 100644
index 0000000000..5e6626eb9c
--- /dev/null
+++ b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
@@ -0,0 +1,6 @@
+dispel-feedback = {CAPITALIZE($entity)} projects an aura of normality
+no-powers = {CAPITALIZE($entity)} will never awaken from the dream in this life
+psychic-potential = {CAPITALIZE($entity)} has a slim chance of awakening from the dream
+focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly, like a heat haze crawling across the endless desert
+psionic-regeneration-self-revive = As {CAPITALIZE($entity)} falls to the floor greviously wounded,
+                                   they begin visibly regenerating!
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
index 1f4eb696c6..e2541def03 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
@@ -26,4 +26,3 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
index 06abe8c45f..ea2357a5c0 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
@@ -24,7 +24,6 @@
     - type: NpcFactionMember
       factions:
         - NanoTrasen
-    - type: PotentialPsionic
     - type: Respirator
       damage:
        types:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
index 5ebd43ddf4..d9dea3c18d 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
@@ -11,4 +11,3 @@
     damageRecovery:
       types:
         Asphyxiation: -0.5
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
index 28687c68bf..dfd5e9a1be 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
@@ -11,7 +11,6 @@
       damageRecovery:
         types:
           Asphyxiation: -1.0
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
 
 # Reformed Diona
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
index fb84ad3650..d1de65df01 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
@@ -3,5 +3,3 @@
   name: Urist McHands The Dwarf
   parent: BaseMobDwarf
   id: MobDwarf
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
index 6197c82c02..9a7c2ee65e 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -3,8 +3,6 @@
   name: Urist McHands
   parent: BaseMobHuman
   id: MobHuman
-  components:
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 #Syndie
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/Player/moth.yml b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
index ffdb36d86b..72feba958a 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
@@ -3,5 +3,3 @@
   name: Urist McFluff
   parent: BaseMobMoth  
   id: MobMoth
-  components:
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
index 71d7422297..b9f265e0bc 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
@@ -3,7 +3,5 @@
   name: Urisst' Mzhand
   parent: BaseMobReptilian
   id: MobReptilian
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 #Weh
diff --git a/Resources/Prototypes/Entities/Mobs/Player/slime.yml b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
index 79669a8fe2..4e5974b308 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
@@ -2,5 +2,3 @@
   save: false
   parent: BaseMobSlimePerson
   id: MobSlimePerson
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
index 562b9c564e..1166d8a29f 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
@@ -32,4 +32,3 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
index db7936cc5b..94ac8403ad 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
@@ -49,5 +49,3 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
-
diff --git a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
index 53910a54a9..e6e497003d 100644
--- a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
+++ b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
@@ -9,29 +9,6 @@
     stealGroup: AntiPsychicKnife
     owner: job-name-mantis
 
-- type: entity
-  id: BecomePsionicObjective
-  parent: BaseTraitorObjective
-  name: Become psionic
-  description: We need you to acquire psionics and keep them until your mission is complete.
-  noSpawn: true
-  components:
-  - type: NotJobsRequirement
-    jobs:
-      - Mime
-      - ForensicMantis
-  - type: Objective
-    difficulty: 2.5
-    #unique: false
-    icon:
-      sprite: Nyanotrasen/Icons/psi.rsi
-      state: psi
-  - type: ObjectiveBlacklistRequirement
-    blacklist:
-      components:
-      - BecomeGolemCondition
-  - type: BecomePsionicCondition
-
 #- type: entity
 #  id: BecomeGolemObjective
 #  parent: BaseTraitorObjective
diff --git a/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml b/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml
new file mode 100644
index 0000000000..5fef342770
--- /dev/null
+++ b/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml
@@ -0,0 +1,6 @@
+- type: trait
+  id: LatentPsychic
+  name: Latent Psychic
+  description: trait-latent-psychic-desc
+  components:
+    - type: PotentialPsionic
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index fba2c4cc17..d711e9a1b1 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -39,7 +39,6 @@
     EscapeShuttleObjective: 1
     # DieObjective: 0.05 # DeltaV - Disable the lrp objective aka murderbone justification
     #HijackShuttleObjective: 0.02
-    BecomePsionicObjective: 1 # Nyanotrasen - Become Psionic objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
     #BecomeGolemObjective: 0.5 # Nyanotrasen - Become a golem objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
 
 - type: weightedRandom

From 4ad73d4c690ca18178e2a54ca099395be9854c58 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 3 May 2024 17:57:09 -0400
Subject: [PATCH 22/84] I accidentally sent the DeltaV legacy version of these

---
 .../Psionics/Abilities/DispelPowerSystem.cs   |  54 ++++---
 .../Abilities/MetapsionicPowerSystem.cs       | 144 +++++++++++++++---
 .../Psionics/Abilities/MindSwapPowerSystem.cs | 117 ++++++++------
 .../Abilities/MindSwappedComponent.cs         |  14 +-
 .../Abilities/NoosphericZapPowerSystem.cs     |  34 ++---
 .../PsionicInvisibilityPowerSystem.cs         | 102 ++++++++-----
 .../PsionicRegenerationPowerSystem.cs         | 106 +++++++++----
 .../Abilities/PyrokinesisPowerSystem.cs       |  35 +++--
 .../Abilities/TelegnosisPowerSystem.cs        |  34 +++--
 .../Psionics/PsionicAbilitiesSystem.cs        |  83 ++++------
 10 files changed, 468 insertions(+), 255 deletions(-)

diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
index f7d88f4cb8..8cde75f461 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Actions;
-using Content.Shared.Actions.ActionTypes;
 using Content.Shared.StatusEffect;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Damage;
@@ -7,16 +6,15 @@
 using Content.Server.Guardian;
 using Content.Server.Bible.Components;
 using Content.Server.Popups;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
+using Content.Shared.Actions.Events;
+using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Abilities.Psionics
 {
     public sealed class DispelPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly DamageableSystem _damageableSystem = default!;
@@ -25,7 +23,6 @@ public sealed class DispelPowerSystem : EntitySystem
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
 
         public override void Initialize()
@@ -45,28 +42,38 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, DispelPowerComponent component, ComponentInit args)
         {
-            if (!_prototypeManager.TryIndex<EntityTargetActionPrototype>("Dispel", out var action))
-                return;
-
-            component.DispelPowerAction = new EntityTargetAction(action);
-            if (action.UseDelay != null)
-                component.DispelPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) action.UseDelay);
-            _actions.AddAction(uid, component.DispelPowerAction, null);
-
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.DispelPowerAction;
+            _actions.AddAction(uid, ref component.DispelActionEntity, component.DispelActionId );
+            _actions.TryGetActionData( component.DispelActionEntity, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.DispelActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.DispelFeedback);
+                //It's fully intended that Dispel doesn't increase Amplification, and instead heavily spikes Dampening
+                //Antimage archetype.
+                psionic.Dampening += 1f;
+            }
         }
 
         private void OnShutdown(EntityUid uid, DispelPowerComponent component, ComponentShutdown args)
         {
-            if (_prototypeManager.TryIndex<EntityTargetActionPrototype>("Dispel", out var action))
-                _actions.RemoveAction(uid, new EntityTargetAction(action), null);
+            _actions.RemoveAction(uid, component.DispelActionEntity);
+
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.DispelFeedback);
+                psionic.Dampening -= 1f;
+            }
         }
 
         private void OnPowerUsed(DispelPowerActionEvent args)
         {
             if (HasComp<PsionicInsulationComponent>(args.Target))
                 return;
+            if (!TryComp<PsionicComponent>(args.Performer, out var psionic) || !HasComp<PsionicComponent>(args.Target))
+                return;
 
             var ev = new DispelledEvent();
             RaiseLocalEvent(args.Target, ev, false);
@@ -74,7 +81,7 @@ private void OnPowerUsed(DispelPowerActionEvent args)
             if (ev.Handled)
             {
                 args.Handled = true;
-                _psionics.LogPowerUsed(args.Performer, "dispel");
+                _psionics.LogPowerUsed(args.Performer, "dispel", (int) MathF.Round(psionic.Dampening * -2), (int) MathF.Round(psionic.Dampening * -4));
             }
         }
 
@@ -83,14 +90,14 @@ private void OnDispelled(EntityUid uid, DispellableComponent component, Dispelle
             QueueDel(uid);
             Spawn("Ash", Transform(uid).Coordinates);
             _popupSystem.PopupCoordinates(Loc.GetString("psionic-burns-up", ("item", uid)), Transform(uid).Coordinates, Filter.Pvs(uid), true, Shared.Popups.PopupType.MediumCaution);
-            _audioSystem.Play("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true);
+            _audioSystem.PlayEntity("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true);
             args.Handled = true;
         }
 
         private void OnDmgDispelled(EntityUid uid, DamageOnDispelComponent component, DispelledEvent args)
         {
             var damage = component.Damage;
-            var modifier = (1 + component.Variance) - (_random.NextFloat(0, component.Variance * 2));
+            var modifier = 1 + component.Variance - _random.NextFloat(0, component.Variance * 2);
 
             damage *= modifier;
             DealDispelDamage(uid, damage);
@@ -100,7 +107,7 @@ private void OnDmgDispelled(EntityUid uid, DamageOnDispelComponent component, Di
         private void OnGuardianDispelled(EntityUid uid, GuardianComponent guardian, DispelledEvent args)
         {
             if (TryComp<GuardianHostComponent>(guardian.Host, out var host))
-                _guardianSystem.ToggleGuardian(guardian.Host, host);
+                _guardianSystem.ToggleGuardian(guardian.Host.Value, host);
 
             DealDispelDamage(uid);
             args.Handled = true;
@@ -127,7 +134,7 @@ public void DealDispelDamage(EntityUid uid, DamageSpecifier? damage = null)
                 return;
 
             _popupSystem.PopupCoordinates(Loc.GetString("psionic-burn-resist", ("item", uid)), Transform(uid).Coordinates, Filter.Pvs(uid), true, Shared.Popups.PopupType.SmallCaution);
-            _audioSystem.Play("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true);
+            _audioSystem.PlayEntity("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true);
 
             if (damage == null)
             {
@@ -137,8 +144,5 @@ public void DealDispelDamage(EntityUid uid, DamageSpecifier? damage = null)
             _damageableSystem.TryChangeDamage(uid, damage, true, true);
         }
     }
-
-    public sealed class DispelPowerActionEvent : EntityTargetActionEvent {}
-
     public sealed class DispelledEvent : HandledEntityEventArgs {}
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
index ee3c9a58d9..44953767f1 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
@@ -1,23 +1,29 @@
 using Content.Shared.Actions;
-using Content.Shared.Actions.ActionTypes;
+using Content.Shared.Actions.Events;
 using Content.Shared.Abilities.Psionics;
-using Content.Shared.StatusEffect;
+using Content.Shared.DoAfter;
+using Content.Shared.Examine;
+using static Content.Shared.Examine.ExamineSystemShared;
 using Content.Shared.Popups;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Player;
+using Robust.Server.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.Timing;
+using Robust.Shared.Player;
+using Content.Server.DoAfter;
+using Content.Shared.Psionics.Events;
+using Content.Server.Psionics;
 
 namespace Content.Server.Abilities.Psionics
 {
     public sealed class MetapsionicPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly EntityLookupSystem _lookup = default!;
         [Dependency] private readonly SharedPopupSystem _popups = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
+        [Dependency] private readonly AudioSystem _audioSystem = default!;
 
 
         public override void Initialize()
@@ -25,31 +31,60 @@ public override void Initialize()
             base.Initialize();
             SubscribeLocalEvent<MetapsionicPowerComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<MetapsionicPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<MetapsionicPowerComponent, MetapsionicPowerActionEvent>(OnPowerUsed);
+            SubscribeLocalEvent<MetapsionicPowerComponent, WideMetapsionicPowerActionEvent>(OnWidePowerUsed);
+            SubscribeLocalEvent<FocusedMetapsionicPowerActionEvent>(OnFocusedPowerUsed);
+            SubscribeLocalEvent<MetapsionicPowerComponent, FocusedMetapsionicDoAfterEvent>(OnDoAfter);
         }
 
         private void OnInit(EntityUid uid, MetapsionicPowerComponent component, ComponentInit args)
         {
-            if (!_prototypeManager.TryIndex<InstantActionPrototype>("MetapsionicPulse", out var metapsionicPulse))
+            if (!TryComp(uid, out ActionsComponent? comp))
                 return;
+            _actions.AddAction(uid, ref component.ActionWideMetapsionicEntity, component.ActionWideMetapsionic, component: comp);
+            _actions.AddAction(uid, ref component.ActionFocusedMetapsionicEntity, component.ActionFocusedMetapsionic, component: comp);
+            _actions.TryGetActionData(component.ActionWideMetapsionicEntity, out var actionData);
+            if (actionData is { UseDelay: not null })
+            {
+                _actions.StartUseDelay(component.ActionWideMetapsionicEntity);
+                _actions.StartUseDelay(component.ActionFocusedMetapsionicEntity);
+            }
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.MetapsionicFeedback);
+                psionic.Amplification += 0.1f;
+                psionic.Dampening += 0.5f;
+            }
 
-            component.MetapsionicPowerAction = new InstantAction(metapsionicPulse);
-            if (metapsionicPulse.UseDelay != null)
-                component.MetapsionicPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) metapsionicPulse.UseDelay);
-            _actions.AddAction(uid, component.MetapsionicPowerAction, null);
+        }
 
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.MetapsionicPowerAction;
+        private void UpdateActions(EntityUid uid, MetapsionicPowerComponent? component = null)
+        {
+            if (!Resolve(uid, ref component))
+                return;
+            _actions.StartUseDelay(component.ActionWideMetapsionicEntity);
+            _actions.StartUseDelay(component.ActionFocusedMetapsionicEntity);
         }
 
         private void OnShutdown(EntityUid uid, MetapsionicPowerComponent component, ComponentShutdown args)
         {
-            if (_prototypeManager.TryIndex<InstantActionPrototype>("MetapsionicPulse", out var metapsionicPulse))
-                _actions.RemoveAction(uid, new InstantAction(metapsionicPulse), null);
+            _actions.RemoveAction(uid, component.ActionWideMetapsionicEntity);
+            _actions.RemoveAction(uid, component.ActionFocusedMetapsionicEntity);
+
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.MetapsionicFeedback);
+                psionic.Amplification -= 0.1f;
+                psionic.Dampening -= 0.5f;
+            }
         }
 
-        private void OnPowerUsed(EntityUid uid, MetapsionicPowerComponent component, MetapsionicPowerActionEvent args)
+        private void OnWidePowerUsed(EntityUid uid, MetapsionicPowerComponent component, WideMetapsionicPowerActionEvent args)
         {
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
             foreach (var entity in _lookup.GetEntitiesInRange(uid, component.Range))
             {
                 if (HasComp<PsionicComponent>(entity) && entity != uid && !HasComp<PsionicInsulationComponent>(entity) &&
@@ -61,11 +96,80 @@ private void OnPowerUsed(EntityUid uid, MetapsionicPowerComponent component, Met
                 }
             }
             _popups.PopupEntity(Loc.GetString("metapsionic-pulse-failure"), uid, uid, PopupType.Large);
-            _psionics.LogPowerUsed(uid, "metapsionic pulse", 2, 4);
+            _psionics.LogPowerUsed(uid, "metapsionic pulse", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 2), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 4));
+            UpdateActions(uid, component);
+            args.Handled = true;
+        }
+
+        private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args)
+        {
+            if (!TryComp<PsionicComponent>(args.Performer, out var psionic))
+                return;
+
+            if (HasComp<PsionicInsulationComponent>(args.Target))
+                return;
+
+            if (!TryComp<MetapsionicPowerComponent>(args.Performer, out var component))
+                return;
+
+            var ev = new FocusedMetapsionicDoAfterEvent(_gameTiming.CurTime);
+
+            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.Performer, component.UseDelay, ev, args.Performer, args.Target, args.Performer)
+            {
+                BlockDuplicate = true,
+                BreakOnUserMove = true,
+                BreakOnTargetMove = true,
+                BreakOnDamage = true,
+            }, out var doAfterId);
 
+            component.DoAfter = doAfterId;
+
+            _popups.PopupEntity(Loc.GetString("focused-metapsionic-pulse-begin", ("entity", args.Performer)),
+                args.Performer,
+                // TODO: Use LoS-based Filter when one is available.
+                Filter.Pvs(args.Performer).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(args.Performer, entity, ExamineRange, null)),
+                true,
+                PopupType.Medium);
+
+            _audioSystem.PlayPvs(component.SoundUse, component.Owner, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
+            _psionics.LogPowerUsed(args.Performer, "focused metapsionic pulse", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 3), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 6));
             args.Handled = true;
+
+            UpdateActions(args.Performer, component);
         }
-    }
 
-    public sealed class MetapsionicPowerActionEvent : InstantActionEvent {}
+        private void OnDoAfter(EntityUid uid, MetapsionicPowerComponent component, FocusedMetapsionicDoAfterEvent args)
+        {
+            if (!TryComp<PsionicComponent>(args.Target, out var psychic))
+                return;
+
+            component.DoAfter = null;
+
+            if (args.Target == null) return;
+
+            if (args.Target == uid)
+            {
+                _popups.PopupEntity(Loc.GetString("metapulse-self", ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
+                return;
+            }
+
+            if (!HasComp<PotentialPsionicComponent>(args.Target))
+            {
+                _popups.PopupEntity(Loc.GetString("no-powers", ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
+                return;
+            }
+
+            if (HasComp<PotentialPsionicComponent>(args.Target) & !HasComp<PsionicComponent>(args.Target))
+            {
+                _popups.PopupEntity(Loc.GetString("psychic-potential", ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
+                return;
+            }
+
+            foreach (var psychicFeedback in psychic.PsychicFeedback)
+            {
+                _popups.PopupEntity(Loc.GetString(psychicFeedback, ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
+            }
+
+        }
+    }
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
index 5c83de2b52..04b90fe4d4 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Actions;
-using Content.Shared.Actions.ActionTypes;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Speech;
 using Content.Shared.Stealth.Components;
@@ -7,25 +6,25 @@
 using Content.Shared.Mobs;
 using Content.Shared.Damage;
 using Content.Server.Mind;
-using Content.Server.Mind.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Server.Popups;
 using Content.Server.Psionics;
 using Content.Server.GameTicking;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using Content.Shared.Mind;
+using Content.Shared.Actions.Events;
 
 namespace Content.Server.Abilities.Psionics
 {
     public sealed class MindSwapPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly MindSystem _mindSystem = default!;
+        [Dependency] private readonly MetaDataSystem _metaDataSystem = default!;
 
         public override void Initialize()
         {
@@ -39,39 +38,50 @@ public override void Initialize()
             SubscribeLocalEvent<GhostAttemptHandleEvent>(OnGhostAttempt);
             //
             SubscribeLocalEvent<MindSwappedComponent, ComponentInit>(OnSwapInit);
+            SubscribeLocalEvent<MindSwappedComponent, ComponentShutdown>(OnSwapShutdown);
         }
 
         private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentInit args)
         {
-            if (!_prototypeManager.TryIndex<EntityTargetActionPrototype>("MindSwap", out var mindSwap))
-                return;
-
-            component.MindSwapPowerAction = new EntityTargetAction(mindSwap);
-            if (mindSwap.UseDelay != null)
-                component.MindSwapPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) mindSwap.UseDelay);
-            _actions.AddAction(uid, component.MindSwapPowerAction, null);
-
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.MindSwapPowerAction;
+            _actions.AddAction(uid, ref component.MindSwapActionEntity, component.MindSwapActionId);
+            _actions.TryGetActionData( component.MindSwapActionEntity, out var actionData);
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.MindSwapActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.PsionicAbility = component.MindSwapActionEntity;
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.MindSwapFeedback);
+                psionic.Amplification += 1f;
+            }
         }
 
         private void OnShutdown(EntityUid uid, MindSwapPowerComponent component, ComponentShutdown args)
         {
-            if (_prototypeManager.TryIndex<EntityTargetActionPrototype>("MindSwap", out var action))
-                _actions.RemoveAction(uid, new EntityTargetAction(action), null);
+            _actions.RemoveAction(uid, component.MindSwapActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.MindSwapFeedback);
+                psionic.Amplification -= 1f;
+            }
         }
 
         private void OnPowerUsed(MindSwapPowerActionEvent args)
         {
+
             if (!(TryComp<DamageableComponent>(args.Target, out var damageable) && damageable.DamageContainerID == "Biological"))
                 return;
 
             if (HasComp<PsionicInsulationComponent>(args.Target))
                 return;
 
+            if (!TryComp<PsionicComponent>(args.Performer, out var psionic))
+                return;
+
             Swap(args.Performer, args.Target);
 
-            _psionics.LogPowerUsed(args.Performer, "mind swap");
+            _psionics.LogPowerUsed(args.Performer, "mind swap", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 8), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 12));
             args.Handled = true;
         }
 
@@ -134,8 +144,9 @@ private void OnGhostAttempt(GhostAttemptHandleEvent args)
             if (!HasComp<MindSwappedComponent>(args.Mind.CurrentEntity))
                 return;
 
-            if (!args.ViaCommand)
-                return;
+            //No idea where the viaCommand went. It's on the internal OnGhostAttempt, but not this layer. Maybe unnecessary.
+            /*if (!args.viaCommand)
+                return;*/
 
             args.Result = false;
             args.Handled = true;
@@ -143,11 +154,24 @@ private void OnGhostAttempt(GhostAttemptHandleEvent args)
 
         private void OnSwapInit(EntityUid uid, MindSwappedComponent component, ComponentInit args)
         {
-            if (_prototypeManager.TryIndex<InstantActionPrototype>("MindSwapReturn", out var mindSwap))
+            _actions.AddAction(uid, ref component.MindSwapReturnActionEntity, component.MindSwapReturnActionId );
+            _actions.TryGetActionData( component.MindSwapReturnActionEntity, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.MindSwapReturnActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.MindSwappedFeedback);
+            }
+        }
+
+        private void OnSwapShutdown(EntityUid uid, MindSwappedComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.MindSwapReturnActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
             {
-                var action = new InstantAction(mindSwap);
-                action.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(15));
-                _actions.AddAction(uid, action, null);
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.MindSwappedFeedback);
             }
         }
 
@@ -157,30 +181,35 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false)
                 return;
 
             // Get the minds first. On transfer, they'll be gone.
-            Mind.Mind? performerMind = null;
-            Mind.Mind? targetMind = null;
+            MindComponent? performerMind = null;
+            MindComponent? targetMind = null;
 
             // This is here to prevent missing MindContainerComponent Resolve errors.
-            if (TryComp<MindContainerComponent>(performer, out var performerMindContainer))
-                performerMind = _mindSystem.GetMind(performer, performerMindContainer);
-
-            if (TryComp<MindContainerComponent>(target, out var targetMindContainer))
-                targetMind = _mindSystem.GetMind(target, targetMindContainer);
-
+            if(!_mindSystem.TryGetMind(performer, out var performerMindId, out performerMind)){
+                performerMind = null;
+            };
+
+            if(!_mindSystem.TryGetMind(target, out var targetMindId, out targetMind)){
+                targetMind = null;
+            };
+            //This is a terrible way to 'unattach' minds. I wanted to use UnVisit but in TransferTo's code they say
+            //To unnatch the minds, do it like this.
+            //Have to unnattach the minds before we reattach them via transfer. Still feels weird, but seems to work well.
+            _mindSystem.TransferTo(performerMindId, null);
+            _mindSystem.TransferTo(targetMindId, null);
             // Do the transfer.
             if (performerMind != null)
-                _mindSystem.TransferTo(performerMind, target, ghostCheckOverride: true);
+                _mindSystem.TransferTo(performerMindId, target, ghostCheckOverride: true, false, performerMind);
 
             if (targetMind != null)
-                _mindSystem.TransferTo(targetMind, performer, ghostCheckOverride: true);
+                _mindSystem.TransferTo(targetMindId, performer, ghostCheckOverride: true, false, targetMind);
 
             if (end)
             {
-                if (_prototypeManager.TryIndex<InstantActionPrototype>("MindSwapReturn", out var mindSwap))
-                {
-                    _actions.RemoveAction(performer, new InstantAction(mindSwap), null);
-                    _actions.RemoveAction(target, new InstantAction(mindSwap), null);
-                }
+                var performerMindPowerComp = EntityManager.GetComponent<MindSwappedComponent>(performer);
+                var targetMindPowerComp = EntityManager.GetComponent<MindSwappedComponent>(target);
+                _actions.RemoveAction(performer, performerMindPowerComp.MindSwapReturnActionEntity);
+                _actions.RemoveAction(target, targetMindPowerComp.MindSwapReturnActionEntity);
 
                 RemComp<MindSwappedComponent>(performer);
                 RemComp<MindSwappedComponent>(target);
@@ -196,11 +225,10 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false)
 
         public void GetTrapped(EntityUid uid)
         {
-            if (!_prototypeManager.TryIndex<InstantActionPrototype>("MindSwapReturn", out var action))
-                return;
 
             _popupSystem.PopupEntity(Loc.GetString("mindswap-trapped"), uid, uid, Shared.Popups.PopupType.LargeCaution);
-            _actions.RemoveAction(uid, action);
+            var perfComp = EnsureComp<MindSwappedComponent>(uid);
+            _actions.RemoveAction(uid, perfComp.MindSwapReturnActionEntity, null);
 
             if (HasComp<TelegnosticProjectionComponent>(uid))
             {
@@ -208,12 +236,9 @@ public void GetTrapped(EntityUid uid)
                 RemComp<StealthComponent>(uid);
                 EnsureComp<SpeechComponent>(uid);
                 EnsureComp<DispellableComponent>(uid);
-                MetaData(uid).EntityName = Loc.GetString("telegnostic-trapped-entity-name");
-                MetaData(uid).EntityDescription = Loc.GetString("telegnostic-trapped-entity-desc");
+                _metaDataSystem.SetEntityName(uid, Loc.GetString("telegnostic-trapped-entity-name"));
+                _metaDataSystem.SetEntityDescription(uid, Loc.GetString("telegnostic-trapped-entity-desc"));
             }
         }
     }
-
-    public sealed class MindSwapPowerActionEvent : EntityTargetActionEvent {}
-    public sealed class MindSwapPowerReturnActionEvent : InstantActionEvent {}
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
index 84d2909c1f..92fc94773d 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
@@ -1,9 +1,21 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
 namespace Content.Server.Abilities.Psionics
 {
     [RegisterComponent]
-    public sealed class MindSwappedComponent : Component
+    public sealed partial class MindSwappedComponent : Component
     {
         [ViewVariables]
         public EntityUid OriginalEntity = default!;
+        [DataField("mindSwapReturnActionId",
+        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string? MindSwapReturnActionId = "ActionMindSwapReturn";
+
+        [DataField("mindSwapReturnActionEntity")]
+        public EntityUid? MindSwapReturnActionEntity;
+
+        [DataField("mindSwappedFeedback")]
+        public string MindSwappedFeedback = "mindswapped-feedback";
     }
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
index c844030f1e..61917df3c7 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
@@ -1,23 +1,19 @@
 using Content.Shared.Actions;
-using Content.Shared.Actions.ActionTypes;
 using Content.Shared.Abilities.Psionics;
 using Content.Server.Psionics;
 using Content.Shared.StatusEffect;
 using Content.Server.Stunnable;
 using Content.Server.Beam;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
+using Content.Shared.Actions.Events;
 
 namespace Content.Server.Abilities.Psionics
 {
     public sealed class NoosphericZapPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly StunSystem _stunSystem = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly BeamSystem _beam = default!;
 
 
@@ -31,22 +27,26 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, NoosphericZapPowerComponent component, ComponentInit args)
         {
-            if (!_prototypeManager.TryIndex<EntityTargetActionPrototype>("NoosphericZap", out var noosphericZap))
-                return;
-
-            component.NoosphericZapPowerAction = new EntityTargetAction(noosphericZap);
-            if (noosphericZap.UseDelay != null)
-                component.NoosphericZapPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) noosphericZap.UseDelay);
-            _actions.AddAction(uid, component.NoosphericZapPowerAction, null);
-
+            _actions.AddAction(uid, ref component.NoosphericZapActionEntity, component.NoosphericZapActionId );
+            _actions.TryGetActionData( component.NoosphericZapActionEntity, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.NoosphericZapActionEntity);
             if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.NoosphericZapPowerAction;
+            {
+                psionic.PsionicAbility = component.NoosphericZapActionEntity;
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.NoosphericZapFeedback);
+            }
         }
 
         private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, ComponentShutdown args)
         {
-            if (_prototypeManager.TryIndex<EntityTargetActionPrototype>("NoosphericZap", out var noosphericZap))
-                _actions.RemoveAction(uid, new EntityTargetAction(noosphericZap), null);
+            _actions.RemoveAction(uid, component.NoosphericZapActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.NoosphericZapFeedback);
+            }
         }
 
         private void OnPowerUsed(NoosphericZapPowerActionEvent args)
@@ -66,6 +66,4 @@ private void OnPowerUsed(NoosphericZapPowerActionEvent args)
             args.Handled = true;
         }
     }
-
-    public sealed class NoosphericZapPowerActionEvent : EntityTargetActionEvent {}
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
index 3bbaf9d813..cf3da800ed 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
@@ -1,27 +1,31 @@
+using Content.Server.DoAfter;
 using Content.Shared.Actions;
-using Content.Shared.Actions.ActionTypes;
-using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Damage;
+using Content.Shared.DoAfter;
 using Content.Shared.Stunnable;
 using Content.Shared.Stealth;
 using Content.Shared.Stealth.Components;
 using Content.Server.Psionics;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Player;
-using Robust.Shared.Audio;
+using Content.Shared.Psionics.Events;
+using Content.Shared.Actions.Events;
+using Robust.Shared.Audio.Systems;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared.Throwing;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Abilities.Psionics
 {
     public sealed class PsionicInvisibilityPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly SharedStunSystem _stunSystem = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly SharedStealthSystem _stealth = default!;
+        [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
 
         public override void Initialize()
         {
@@ -29,47 +33,61 @@ public override void Initialize()
             SubscribeLocalEvent<PsionicInvisibilityPowerComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<PsionicInvisibilityPowerComponent, ComponentShutdown>(OnShutdown);
             SubscribeLocalEvent<PsionicInvisibilityPowerComponent, PsionicInvisibilityPowerActionEvent>(OnPowerUsed);
-            SubscribeLocalEvent<PsionicInvisibilityPowerOffActionEvent>(OnPowerOff);
+            SubscribeLocalEvent<RemovePsionicInvisibilityOffPowerActionEvent>(OnPowerOff);
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ComponentInit>(OnStart);
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ComponentShutdown>(OnEnd);
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, DamageChangedEvent>(OnDamageChanged);
+            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, AttackAttemptEvent>(OnAttackAttempt);
+            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ShotAttemptedEvent>(OnShootAttempt);
+            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ThrowAttemptEvent>(OnThrowAttempt);
         }
 
         private void OnInit(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentInit args)
         {
-            if (!_prototypeManager.TryIndex<InstantActionPrototype>("PsionicInvisibility", out var invis))
-                return;
-
-            component.PsionicInvisibilityPowerAction = new InstantAction(invis);
-            if (invis.UseDelay != null)
-                component.PsionicInvisibilityPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) invis.UseDelay);
-            _actions.AddAction(uid, component.PsionicInvisibilityPowerAction, null);
-
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.PsionicInvisibilityPowerAction;
+            _actions.AddAction(uid, ref component.PsionicInvisibilityActionEntity, component.PsionicInvisibilityActionId);
+            _actions.TryGetActionData( component.PsionicInvisibilityActionEntity, out var actionData);
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.PsionicInvisibilityActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.PsionicAbility = component.PsionicInvisibilityActionEntity;
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.InvisibilityFeedback);
+                psionic.Amplification += 0.5f;
+            }
         }
 
         private void OnShutdown(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentShutdown args)
         {
-            if (_prototypeManager.TryIndex<InstantActionPrototype>("PsionicInvisibility", out var invis))
-                _actions.RemoveAction(uid, new InstantAction(invis), null);
+            RemComp<PsionicInvisibilityUsedComponent>(uid);
+            RemComp<PsionicallyInvisibleComponent>(uid);
+            _actions.RemoveAction(uid, component.PsionicInvisibilityActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.InvisibilityFeedback);
+                psionic.Amplification -= 0.5f;
+            }
         }
 
         private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityPowerActionEvent args)
         {
-            if (HasComp<PsionicInvisibilityUsedComponent>(uid))
-                return;
+            var ev = new PsionicInvisibilityTimerEvent(_gameTiming.CurTime);
+            var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseTimer, ev, uid) { Hidden = true };
+            _doAfterSystem.TryStartDoAfter(doAfterArgs);
 
             ToggleInvisibility(args.Performer);
-
-            if (_prototypeManager.TryIndex<InstantActionPrototype>("PsionicInvisibilityOff", out var invis))
-                _actions.AddAction(args.Performer, new InstantAction(invis), null);
+            var action = Spawn(PsionicInvisibilityUsedComponent.PsionicInvisibilityUsedActionPrototype);
+            _actions.AddAction(uid, action, action);
+            _actions.TryGetActionData( action, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(action);
 
             _psionics.LogPowerUsed(uid, "psionic invisibility");
             args.Handled = true;
         }
 
-        private void OnPowerOff(PsionicInvisibilityPowerOffActionEvent args)
+        private void OnPowerOff(RemovePsionicInvisibilityOffPowerActionEvent args)
         {
             if (!HasComp<PsionicInvisibilityUsedComponent>(args.Performer))
                 return;
@@ -81,10 +99,9 @@ private void OnPowerOff(PsionicInvisibilityPowerOffActionEvent args)
         private void OnStart(EntityUid uid, PsionicInvisibilityUsedComponent component, ComponentInit args)
         {
             EnsureComp<PsionicallyInvisibleComponent>(uid);
-            EnsureComp<PacifiedComponent>(uid);
             var stealth = EnsureComp<StealthComponent>(uid);
             _stealth.SetVisibility(uid, 0.66f, stealth);
-            SoundSystem.Play("/Audio/Effects/toss.ogg", Filter.Pvs(uid), uid);
+            _audio.PlayPvs("/Audio/Effects/toss.ogg", uid);
 
         }
 
@@ -94,25 +111,34 @@ private void OnEnd(EntityUid uid, PsionicInvisibilityUsedComponent component, Co
                 return;
 
             RemComp<PsionicallyInvisibleComponent>(uid);
-            RemComp<PacifiedComponent>(uid);
             RemComp<StealthComponent>(uid);
-            SoundSystem.Play("/Audio/Effects/toss.ogg", Filter.Pvs(uid), uid);
+            _audio.PlayPvs("/Audio/Effects/toss.ogg", uid);
+            _actions.RemoveAction(uid, component.PsionicInvisibilityUsedActionEntity);
+            DirtyEntity(uid);
+        }
 
-            if (_prototypeManager.TryIndex<InstantActionPrototype>("PsionicInvisibilityOff", out var invis))
-                _actions.RemoveAction(uid, new InstantAction(invis), null);
+        private void OnAttackAttempt(EntityUid uid, PsionicInvisibilityUsedComponent component, AttackAttemptEvent args)
+        {
+            RemComp<PsionicInvisibilityUsedComponent>(uid);
+        }
 
-            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(8), false);
-            Dirty(uid);
+        private void OnShootAttempt(EntityUid uid, PsionicInvisibilityUsedComponent component, ShotAttemptedEvent args)
+        {
+            RemComp<PsionicInvisibilityUsedComponent>(uid);
         }
 
+        private void OnThrowAttempt(EntityUid uid, PsionicInvisibilityUsedComponent component, ThrowAttemptEvent args)
+        {
+            RemComp<PsionicInvisibilityUsedComponent>(uid);
+        }
         private void OnDamageChanged(EntityUid uid, PsionicInvisibilityUsedComponent component, DamageChangedEvent args)
         {
             if (!args.DamageIncreased)
                 return;
 
             ToggleInvisibility(uid);
+            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(4), false);
         }
-
         public void ToggleInvisibility(EntityUid uid)
         {
             if (!HasComp<PsionicInvisibilityUsedComponent>(uid))
@@ -123,8 +149,10 @@ public void ToggleInvisibility(EntityUid uid)
                 RemComp<PsionicInvisibilityUsedComponent>(uid);
             }
         }
-    }
 
-    public sealed class PsionicInvisibilityPowerActionEvent : InstantActionEvent {}
-    public sealed class PsionicInvisibilityPowerOffActionEvent : InstantActionEvent {}
+        public void OnDoAfter(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityTimerEvent args)
+        {
+            RemComp<PsionicInvisibilityUsedComponent>(uid);
+        }
+    }
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
index f40465643d..707e8d6129 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
@@ -1,39 +1,34 @@
 using Robust.Shared.Audio;
-using Robust.Server.GameObjects;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.DoAfter;
 using Content.Shared.Abilities.Psionics;
-using Content.Shared.Actions.ActionTypes;
 using Content.Shared.Actions;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
+using Content.Shared.Mobs;
 using Content.Shared.Popups;
 using Content.Shared.Psionics.Events;
-using Content.Shared.Tag;
 using Content.Shared.Examine;
 using static Content.Shared.Examine.ExamineSystemShared;
 using Robust.Shared.Timing;
+using Content.Shared.Actions.Events;
+using Robust.Server.Audio;
 
 namespace Content.Server.Abilities.Psionics
 {
     public sealed class PsionicRegenerationPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly SolutionContainerSystem _solutionSystem = default!;
         [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
         [Dependency] private readonly AudioSystem _audioSystem = default!;
-        [Dependency] private readonly TagSystem _tagSystem = default!;
         [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
 
         public override void Initialize()
         {
@@ -41,29 +36,34 @@ public override void Initialize()
             SubscribeLocalEvent<PsionicRegenerationPowerComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<PsionicRegenerationPowerComponent, ComponentShutdown>(OnShutdown);
             SubscribeLocalEvent<PsionicRegenerationPowerComponent, PsionicRegenerationPowerActionEvent>(OnPowerUsed);
-
+            SubscribeLocalEvent<PsionicRegenerationPowerComponent, MobStateChangedEvent>(OnMobStateChangedEvent);
             SubscribeLocalEvent<PsionicRegenerationPowerComponent, DispelledEvent>(OnDispelled);
             SubscribeLocalEvent<PsionicRegenerationPowerComponent, PsionicRegenerationDoAfterEvent>(OnDoAfter);
         }
 
         private void OnInit(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentInit args)
         {
-            if (!_prototypeManager.TryIndex<InstantActionPrototype>("PsionicRegeneration", out var metapsionic))
-                return;
-
-            component.PsionicRegenerationPowerAction = new InstantAction(metapsionic);
-            if (metapsionic.UseDelay != null)
-                component.PsionicRegenerationPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) metapsionic.UseDelay);
-            _actions.AddAction(uid, component.PsionicRegenerationPowerAction, null);
-
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.PsionicRegenerationPowerAction;
+            _actions.AddAction(uid, ref component.PsionicRegenerationActionEntity, component.PsionicRegenerationActionId );
+            _actions.TryGetActionData( component.PsionicRegenerationActionEntity, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.PsionicRegenerationActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.RegenerationFeedback);
+            }
         }
 
         private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationPowerActionEvent args)
         {
             var ev = new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime);
-            var doAfterArgs = new DoAfterArgs(uid, component.UseDelay, ev, uid);
+            var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseDelay, ev, uid);
+
+            //Prevent the power from ignoring its own cooldown
+            _actions.TryGetActionData(component.PsionicRegenerationActionEntity, out var actionData);
+            var curTime = _gameTiming.CurTime;
+            if (actionData != null && actionData.Cooldown.HasValue && actionData.Cooldown.Value.End > curTime)
+                return;
 
             _doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId);
 
@@ -76,15 +76,63 @@ private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent compon
                 true,
                 PopupType.Medium);
 
-            _audioSystem.PlayPvs(component.SoundUse, component.Owner, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
+            _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
             _psionics.LogPowerUsed(uid, "psionic regeneration");
             args.Handled = true;
         }
 
+        /// <summary>
+        /// Regenerators automatically activate upon crit, provided the power was off cooldown at that exact point in time.
+        /// Self-rescusitation is also far more costly, and extremely obvious
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="component"></param>
+        /// <param name="args"></param>
+        private void OnMobStateChangedEvent(EntityUid uid, PsionicRegenerationPowerComponent component, MobStateChangedEvent args)
+        {
+            if (HasComp<PsionicInsulationComponent>(uid))
+                return;
+
+            if (args.NewMobState is MobState.Critical)
+            {
+                _actions.TryGetActionData(component.PsionicRegenerationActionEntity, out var actionData);
+                var curTime = _gameTiming.CurTime;
+                if (actionData != null && actionData.Cooldown.HasValue && actionData.Cooldown.Value.End > curTime)
+                    return;
+
+                if (actionData is { UseDelay: not null })
+                {
+                    component.SelfRevive = true;
+                    _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.UseDelay, new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime), uid, args.Target, uid)
+                    {
+                        BreakOnUserMove = false,
+                        BreakOnTargetMove = false,
+                        BreakOnWeightlessMove = false,
+                        BreakOnDamage = false,
+                        RequireCanInteract = false,
+                    });
+                    _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-self-revive", ("entity", uid)),
+                        uid,
+                        // TODO: Use LoS-based Filter when one is available.
+                        Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)),
+                        true,
+                        PopupType.MediumCaution);
+                    _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
+                    _psionics.LogPowerUsed(uid, "psionic regeneration", 20, 40);
+                    _actions.StartUseDelay(component.PsionicRegenerationActionEntity);
+                }
+            }
+        }
+
         private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentShutdown args)
         {
-            if (_prototypeManager.TryIndex<InstantActionPrototype>("PsionicRegeneration", out var metapsionic))
-                _actions.RemoveAction(uid, new InstantAction(metapsionic), null);
+            _actions.RemoveAction(uid, component.PsionicRegenerationActionEntity);
+
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.RegenerationFeedback);
+            }
         }
 
         private void OnDispelled(EntityUid uid, PsionicRegenerationPowerComponent component, DispelledEvent args)
@@ -114,9 +162,13 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen
             var solution = new Solution();
             solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(component.EssenceAmount * percentageComplete));
             _bloodstreamSystem.TryAddToChemicals(uid, solution, stream);
+            if (component.SelfRevive == true)
+            {
+                var critSolution = new Solution();
+                critSolution.AddReagent("Epinephrine", 10);
+                _bloodstreamSystem.TryAddToChemicals(uid, critSolution, stream);
+                component.SelfRevive = false;
+            }
         }
     }
-
-    public sealed class PsionicRegenerationPowerActionEvent : InstantActionEvent {}
 }
-
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
index d86c3a346f..28b4d1b597 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -1,12 +1,12 @@
 using Content.Shared.Actions;
-using Content.Shared.Actions.ActionTypes;
 using Content.Shared.Abilities.Psionics;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Popups;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Player;
 using Robust.Shared.Timing;
+using Content.Server.Mind;
+using Content.Shared.Actions.Events;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -18,6 +18,7 @@ public sealed class PyrokinesisPowerSystem : EntitySystem
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly MindSystem _mindSystem = default!;
 
         public override void Initialize()
         {
@@ -29,22 +30,26 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, ComponentInit args)
         {
-            if (!_prototypeManager.TryIndex<EntityTargetActionPrototype>("Pyrokinesis", out var pyrokinesis))
-                return;
-
-            component.PyrokinesisPowerAction = new EntityTargetAction(pyrokinesis);
-            if (pyrokinesis.UseDelay != null)
-                component.PyrokinesisPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) pyrokinesis.UseDelay);
-            _actions.AddAction(uid, component.PyrokinesisPowerAction, null);
-
+            _actions.AddAction(uid, ref component.PyrokinesisActionEntity, component.PyrokinesisActionId );
+            _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.PyrokinesisActionEntity);
             if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.PyrokinesisPowerAction;
+            {
+                psionic.PsionicAbility = component.PyrokinesisActionEntity;
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.PyrokinesisFeedback);
+            }
         }
 
         private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, ComponentShutdown args)
         {
-            if (_prototypeManager.TryIndex<EntityTargetActionPrototype>("Pyrokinesis", out var pyrokinesis))
-                _actions.RemoveAction(uid, new EntityTargetAction(pyrokinesis), null);
+            _actions.RemoveAction(uid, component.PyrokinesisActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.PyrokinesisFeedback);
+            }
         }
 
         private void OnPowerUsed(PyrokinesisPowerActionEvent args)
@@ -53,13 +58,11 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args)
                 return;
 
             flammableComponent.FireStacks += 5;
-            _flammableSystem.Ignite(args.Target, flammableComponent);
+            _flammableSystem.Ignite(args.Target, args.Target);
             _popupSystem.PopupEntity(Loc.GetString("pyrokinesis-power-used", ("target", args.Target)), args.Target, Shared.Popups.PopupType.LargeCaution);
 
             _psionics.LogPowerUsed(args.Performer, "pyrokinesis");
             args.Handled = true;
         }
     }
-
-    public sealed class PyrokinesisPowerActionEvent : EntityTargetActionEvent {}
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
index 0d6adb7f9a..1000ff453f 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
@@ -1,10 +1,11 @@
 using Content.Shared.Actions;
-using Content.Shared.Actions.ActionTypes;
 using Content.Shared.StatusEffect;
 using Content.Shared.Abilities.Psionics;
-using Content.Server.Mind.Components;
+using Content.Shared.Mind.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using Content.Server.Mind;
+using Content.Shared.Actions.Events;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -16,6 +17,7 @@ public sealed class TelegnosisPowerSystem : EntitySystem
         [Dependency] private readonly MindSwapPowerSystem _mindSwap = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly MindSystem _mindSystem = default!;
 
         public override void Initialize()
         {
@@ -28,22 +30,26 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, TelegnosisPowerComponent component, ComponentInit args)
         {
-            if (!_prototypeManager.TryIndex<InstantActionPrototype>("Telegnosis", out var telegnosis))
-                return;
-
-            component.TelegnosisPowerAction = new InstantAction(telegnosis);
-            if (telegnosis.UseDelay != null)
-                component.TelegnosisPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) telegnosis.UseDelay);
-            _actions.AddAction(uid, component.TelegnosisPowerAction, null);
-
+            _actions.AddAction(uid, ref component.TelegnosisActionEntity, component.TelegnosisActionId );
+            _actions.TryGetActionData( component.TelegnosisActionEntity, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.TelegnosisActionEntity);
             if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.TelegnosisPowerAction;
+            {
+                psionic.PsionicAbility = component.TelegnosisActionEntity;
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.TelegnosisFeedback);
+            }
         }
 
         private void OnShutdown(EntityUid uid, TelegnosisPowerComponent component, ComponentShutdown args)
         {
-            if (_prototypeManager.TryIndex<InstantActionPrototype>("Telegnosis", out var metapsionic))
-                _actions.RemoveAction(uid, new InstantAction(metapsionic), null);
+            _actions.RemoveAction(uid, component.TelegnosisActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.TelegnosisFeedback);
+            }
         }
 
         private void OnPowerUsed(EntityUid uid, TelegnosisPowerComponent component, TelegnosisPowerActionEvent args)
@@ -60,6 +66,4 @@ private void OnMindRemoved(EntityUid uid, TelegnosticProjectionComponent compone
             QueueDel(uid);
         }
     }
-
-    public sealed class TelegnosisPowerActionEvent : InstantActionEvent {}
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
index 326be3e058..860b7baab2 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
@@ -6,12 +6,15 @@
 using Content.Server.EUI;
 using Content.Server.Psionics;
 using Content.Server.Mind;
-using Content.Server.Mind.Components;
+using Content.Shared.Mind.Components;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Random;
 using Robust.Shared.Prototypes;
-using Robust.Server.GameObjects;
-using Robust.Server.Player;
+using Robust.Shared.Player;
+using Content.Shared.Examine;
+using Content.Shared.Popups;
+using Content.Shared.Examine;
+using static Content.Shared.Examine.ExamineSystemShared;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -20,29 +23,26 @@ public sealed class PsionicAbilitiesSystem : EntitySystem
         [Dependency] private readonly IComponentFactory _componentFactory = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly EuiManager _euiManager = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
         [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly MindSystem _mindSystem = default!;
+        [Dependency] private readonly SharedPopupSystem _popups = default!;
 
         public override void Initialize()
         {
             base.Initialize();
-            SubscribeLocalEvent<PsionicAwaitingPlayerComponent, PlayerAttachedEvent>(OnPlayerAttached);
         }
 
-        private void OnPlayerAttached(EntityUid uid, PsionicAwaitingPlayerComponent component, PlayerAttachedEvent args)
-        {
-            if (TryComp<PsionicBonusChanceComponent>(uid, out var bonus) && bonus.Warn == true)
-                _euiManager.OpenEui(new AcceptPsionicsEui(uid, this), args.Player);
-            else
-                AddRandomPsionicPower(uid);
-            RemCompDeferred<PsionicAwaitingPlayerComponent>(uid);
-        }
-
-        public void AddPsionics(EntityUid uid, bool warn = true)
+        /// <summary>
+        /// Adds a psychic power once a character rolls one. This used to be a system you have to select for. However the opt-in is no longer the text window, but is now done at character creation.
+        /// This is going to get removed when I reach Part 3 of my reworks, when I touch upon the GlimmerSystem itself and overhaul how players get powers.
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="component"></param>
+        /// <param name="args"></param>
+        public void AddPsionics(EntityUid uid)
         {
             if (Deleted(uid))
                 return;
@@ -50,41 +50,11 @@ public void AddPsionics(EntityUid uid, bool warn = true)
             if (HasComp<PsionicComponent>(uid))
                 return;
 
-            if (!TryComp<MindContainerComponent>(uid, out var mindContainer) ||
-                !_mindSystem.TryGetMind(uid, out var mind, mindContainer))
-            {
-                EnsureComp<PsionicAwaitingPlayerComponent>(uid);
-                return;
-            }
-
-            if (!_mindSystem.TryGetSession(mind, out var client))
-                return;
-
-            if (warn && TryComp<ActorComponent>(uid, out var actor))
-                _euiManager.OpenEui(new AcceptPsionicsEui(uid, this), client);
-            else
-                AddRandomPsionicPower(uid);
+            AddRandomPsionicPower(uid);
         }
-
-        public void AddPsionics(EntityUid uid, string powerComp)
-        {
-            if (Deleted(uid))
-                return;
-
-            if (HasComp<PsionicComponent>(uid))
-                return;
-
-            AddComp<PsionicComponent>(uid);
-
-            var newComponent = (Component) _componentFactory.GetComponent(powerComp);
-            newComponent.Owner = uid;
-
-            EntityManager.AddComponent(uid, newComponent);
-        }
-
         public void AddRandomPsionicPower(EntityUid uid)
         {
-            AddComp<PsionicComponent>(uid);
+            EnsureComp<PsionicComponent>(uid, out var psionic);
 
             if (!_prototypeManager.TryIndex<WeightedRandomPrototype>("RandomPsionicPowerPool", out var pool))
             {
@@ -98,7 +68,7 @@ public void AddRandomPsionicPower(EntityUid uid)
 
             EntityManager.AddComponent(uid, newComponent);
 
-            _glimmerSystem.Glimmer += _random.Next(1, 5);
+            _glimmerSystem.Glimmer += _random.Next((int) MathF.Round(psionic.Amplification * psionic.Dampening * 1), (int) MathF.Round(psionic.Amplification * psionic.Dampening * 5));
         }
 
         public void RemovePsionics(EntityUid uid)
@@ -122,12 +92,25 @@ public void RemovePsionics(EntityUid uid)
                 if (EntityManager.TryGetComponent(uid, comp.GetType(), out var psionicPower))
                     RemComp(uid, psionicPower);
             }
-            if (psionic.PsionicAbility != null)
-                _actionsSystem.RemoveAction(uid, psionic.PsionicAbility);
+            if (psionic.PsionicAbility != null){
+                _actionsSystem.TryGetActionData( psionic.PsionicAbility, out var psiAbility );
+                if (psiAbility != null){
+                    _actionsSystem.RemoveAction(uid, psiAbility.Owner);
+                }
+            }
+
+            _popups.PopupEntity(Loc.GetString("mindbreaking-feedback", ("entity", uid)),
+                uid,
+                // TODO: Use LoS-based Filter when one is available.
+                Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)),
+                true,
+                PopupType.Medium);
 
             _statusEffectsSystem.TryAddStatusEffect(uid, "Stutter", TimeSpan.FromMinutes(5), false, "StutteringAccent");
 
+            _glimmerSystem.Glimmer += _random.Next((int) MathF.Round(psionic.Amplification * psionic.Dampening * -5), (int) MathF.Round(psionic.Amplification * psionic.Dampening * -10));
             RemComp<PsionicComponent>(uid);
+            RemComp<PotentialPsionicComponent>(uid);
         }
     }
 }

From 8c0fc8d3b8415d58f6b2072a9287360ba46afce0 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 16:02:58 -0400
Subject: [PATCH 23/84] Finishing Mind Swap rework

---
 .../Abilities/MetapsionicPowerSystem.cs       |  2 +-
 .../Psionics/Abilities/MindSwapPowerSystem.cs | 20 +++++++++++--------
 .../Abilities/NoosphericZapPowerSystem.cs     |  3 +--
 .../PsionicInvisibilityPowerSystem.cs         |  1 -
 .../Abilities/PyrokinesisPowerSystem.cs       |  3 +--
 .../Abilities/TelegnosisPowerSystem.cs        |  3 +--
 .../Psionics/SharedPsionicSystem.Insulated.cs | 19 ++++++++++++++++++
 7 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs

diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
index 44953767f1..fd9b810756 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
@@ -131,7 +131,7 @@ private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args)
                 true,
                 PopupType.Medium);
 
-            _audioSystem.PlayPvs(component.SoundUse, component.Owner, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
+            _audioSystem.PlayPvs(component.SoundUse, args.Performer, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
             _psionics.LogPowerUsed(args.Performer, "focused metapsionic pulse", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 3), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 6));
             args.Handled = true;
 
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
index 04b90fe4d4..8f19194947 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Actions;
 using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics;
 using Content.Shared.Speech;
 using Content.Shared.Stealth.Components;
 using Content.Shared.Mobs.Components;
@@ -10,8 +11,6 @@
 using Content.Server.Popups;
 using Content.Server.Psionics;
 using Content.Server.GameTicking;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 using Content.Shared.Mind;
 using Content.Shared.Actions.Events;
 
@@ -36,9 +35,9 @@ public override void Initialize()
             SubscribeLocalEvent<MindSwappedComponent, DispelledEvent>(OnDispelled);
             SubscribeLocalEvent<MindSwappedComponent, MobStateChangedEvent>(OnMobStateChanged);
             SubscribeLocalEvent<GhostAttemptHandleEvent>(OnGhostAttempt);
-            //
             SubscribeLocalEvent<MindSwappedComponent, ComponentInit>(OnSwapInit);
             SubscribeLocalEvent<MindSwappedComponent, ComponentShutdown>(OnSwapShutdown);
+            SubscribeLocalEvent<MindSwappedComponent, PsionicInsulationEvent>(OnInsulated);
         }
 
         private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentInit args)
@@ -49,7 +48,6 @@ private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentIn
                 _actions.StartUseDelay(component.MindSwapActionEntity);
             if (TryComp<PsionicComponent>(uid, out var psionic))
             {
-                psionic.PsionicAbility = component.MindSwapActionEntity;
                 psionic.ActivePowers.Add(component);
                 psionic.PsychicFeedback.Add(component.MindSwapFeedback);
                 psionic.Amplification += 1f;
@@ -132,8 +130,8 @@ private void OnDispelled(EntityUid uid, MindSwappedComponent component, Dispelle
 
         private void OnMobStateChanged(EntityUid uid, MindSwappedComponent component, MobStateChangedEvent args)
         {
-            if (args.NewMobState == MobState.Dead)
-                RemComp<MindSwappedComponent>(uid);
+            if (args.NewMobState == MobState.Dead || args.NewMobState == MobState.Critical)
+                Swap(uid, component.OriginalEntity, true);
         }
 
         private void OnGhostAttempt(GhostAttemptHandleEvent args)
@@ -185,11 +183,13 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false)
             MindComponent? targetMind = null;
 
             // This is here to prevent missing MindContainerComponent Resolve errors.
-            if(!_mindSystem.TryGetMind(performer, out var performerMindId, out performerMind)){
+            if (!_mindSystem.TryGetMind(performer, out var performerMindId, out performerMind))
+            {
                 performerMind = null;
             };
 
-            if(!_mindSystem.TryGetMind(target, out var targetMindId, out targetMind)){
+            if (!_mindSystem.TryGetMind(target, out var targetMindId, out targetMind))
+            {
                 targetMind = null;
             };
             //This is a terrible way to 'unattach' minds. I wanted to use UnVisit but in TransferTo's code they say
@@ -240,5 +240,9 @@ public void GetTrapped(EntityUid uid)
                 _metaDataSystem.SetEntityDescription(uid, Loc.GetString("telegnostic-trapped-entity-desc"));
             }
         }
+        public void OnInsulated(EntityUid uid, MindSwappedComponent component, PsionicInsulationEvent args)
+        {
+            Swap(uid, component.OriginalEntity, true);
+        }
     }
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
index 61917df3c7..cceb3ef207 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
@@ -31,9 +31,8 @@ private void OnInit(EntityUid uid, NoosphericZapPowerComponent component, Compon
             _actions.TryGetActionData( component.NoosphericZapActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.NoosphericZapActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            if (TryComp<PsionicComponent>(uid, out var psionic))
             {
-                psionic.PsionicAbility = component.NoosphericZapActionEntity;
                 psionic.ActivePowers.Add(component);
                 psionic.PsychicFeedback.Add(component.NoosphericZapFeedback);
             }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
index cf3da800ed..af2ae0c7f0 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
@@ -50,7 +50,6 @@ private void OnInit(EntityUid uid, PsionicInvisibilityPowerComponent component,
                 _actions.StartUseDelay(component.PsionicInvisibilityActionEntity);
             if (TryComp<PsionicComponent>(uid, out var psionic))
             {
-                psionic.PsionicAbility = component.PsionicInvisibilityActionEntity;
                 psionic.ActivePowers.Add(component);
                 psionic.PsychicFeedback.Add(component.InvisibilityFeedback);
                 psionic.Amplification += 0.5f;
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
index 28b4d1b597..8300b204dc 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -34,9 +34,8 @@ private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, Componen
             _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.PyrokinesisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            if (TryComp<PsionicComponent>(uid, out var psionic))
             {
-                psionic.PsionicAbility = component.PyrokinesisActionEntity;
                 psionic.ActivePowers.Add(component);
                 psionic.PsychicFeedback.Add(component.PyrokinesisFeedback);
             }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
index 1000ff453f..00d06e6dd2 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
@@ -34,9 +34,8 @@ private void OnInit(EntityUid uid, TelegnosisPowerComponent component, Component
             _actions.TryGetActionData( component.TelegnosisActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.TelegnosisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            if (TryComp<PsionicComponent>(uid, out var psionic))
             {
-                psionic.PsionicAbility = component.TelegnosisActionEntity;
                 psionic.ActivePowers.Add(component);
                 psionic.PsychicFeedback.Add(component.TelegnosisFeedback);
             }
diff --git a/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs b/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs
new file mode 100644
index 0000000000..c59f98db7f
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Abilities.Psionics;
+
+namespace Content.Shared.Psionics
+{
+    public sealed class PsionicInsulationSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<PsionicInsulationComponent, ComponentInit>(OnInsulated);
+        }
+
+        public void OnInsulated(EntityUid uid, PsionicInsulationComponent component, ComponentInit args)
+        {
+            RaiseLocalEvent(uid, new PsionicInsulationEvent());
+        }
+    }
+    public readonly record struct PsionicInsulationEvent;
+}

From fa213b7ef866982a152d3fc39df59c6e45565c24 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 16:58:05 -0400
Subject: [PATCH 24/84] Noospheric Zap updating

---
 .../Abilities/NoosphericZapPowerSystem.cs     | 26 ++++++++++++-------
 .../Prototypes/Nyanotrasen/psionicPowers.yml  |  3 ++-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
index cceb3ef207..d849d38303 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
@@ -1,7 +1,8 @@
 using Content.Shared.Actions;
 using Content.Shared.Abilities.Psionics;
-using Content.Server.Psionics;
+using Content.Shared.Damage;
 using Content.Shared.StatusEffect;
+using Content.Server.Electrocution;
 using Content.Server.Stunnable;
 using Content.Server.Beam;
 using Content.Shared.Actions.Events;
@@ -15,6 +16,8 @@ public sealed class NoosphericZapPowerSystem : EntitySystem
         [Dependency] private readonly StunSystem _stunSystem = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
         [Dependency] private readonly BeamSystem _beam = default!;
+        [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+        [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
 
 
         public override void Initialize()
@@ -35,6 +38,7 @@ private void OnInit(EntityUid uid, NoosphericZapPowerComponent component, Compon
             {
                 psionic.ActivePowers.Add(component);
                 psionic.PsychicFeedback.Add(component.NoosphericZapFeedback);
+                psionic.Amplification += 1f;
             }
         }
 
@@ -45,24 +49,26 @@ private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, Co
             {
                 psionic.ActivePowers.Remove(component);
                 psionic.PsychicFeedback.Remove(component.NoosphericZapFeedback);
+                psionic.Amplification += 1f;
             }
         }
 
         private void OnPowerUsed(NoosphericZapPowerActionEvent args)
         {
-            if (!HasComp<PotentialPsionicComponent>(args.Target))
+            if (!TryComp<PsionicComponent>(args.Performer, out var psionic))
                 return;
 
-            if (HasComp<PsionicInsulationComponent>(args.Target))
-                return;
-
-            _beam.TryCreateBeam(args.Performer, args.Target, "LightningNoospheric");
+            if (!HasComp<PsionicInsulationComponent>(args.Target) && !HasComp<PsionicInsulationComponent>(args.Performer))
+            {
+                _beam.TryCreateBeam(args.Performer, args.Target, "LightningNoospheric");
+                _stunSystem.TryParalyze(args.Target, TimeSpan.FromSeconds(1 * psionic.Amplification), false);
 
-            _stunSystem.TryParalyze(args.Target, TimeSpan.FromSeconds(5), false);
-            _statusEffectsSystem.TryAddStatusEffect(args.Target, "Stutter", TimeSpan.FromSeconds(10), false, "StutteringAccent");
+                _electrocution.TryDoElectrocution(args.Target, null, (int) MathF.Round(5f * psionic.Amplification), new TimeSpan((long) MathF.Round(1f * psionic.Amplification)), true, ignoreInsulation: true);
+                _statusEffectsSystem.TryAddStatusEffect(args.Target, "Stutter", TimeSpan.FromSeconds(2 * psionic.Amplification), false, "StutteringAccent");
 
-            _psionics.LogPowerUsed(args.Performer, "noospheric zap");
-            args.Handled = true;
+                _psionics.LogPowerUsed(args.Performer, "noopsheric zap", (int) MathF.Round(psionic.Dampening * -4), (int) MathF.Round(psionic.Dampening * -6));
+                args.Handled = true;
+            }
         }
     }
 }
diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
index f40b688fd1..cb3f88d6a4 100644
--- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
+++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
@@ -6,5 +6,6 @@
     TelegnosisPower: 1
     PsionicRegenerationPower: 1
     MassSleepPower: 0.3
-#    PsionicInvisibilityPower: 0.15
+    PsionicInvisibilityPower: 0.15
     MindSwapPower: 0.15
+    NoosphericZapPower: 0.15

From 2ef711cee8c027774eb9bdae2fedb17d19ab91a9 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 20:18:02 -0400
Subject: [PATCH 25/84] Almost done

---
 .../Components/IgniteOnCollideComponent.cs    |  4 +-
 .../Nyanotrasen/Chat/NyanoChatSystem.cs       |  8 +--
 .../Psionics/Abilities/DispelPowerSystem.cs   |  8 ++-
 .../Abilities/MetapsionicPowerSystem.cs       | 13 ++++-
 .../Psionics/Abilities/MindSwapPowerSystem.cs |  4 +-
 .../Abilities/MindSwappedComponent.cs         |  2 +-
 .../Abilities/NoosphericZapPowerSystem.cs     | 15 +++--
 .../Abilities}/PsionicAbilitiesSystem.cs      |  2 +-
 .../PsionicInvisibilityPowerSystem.cs         | 30 ++++++++--
 .../PsionicRegenerationPowerSystem.cs         | 36 +++++++++---
 .../Abilities/PyrokinesisPowerSystem.cs       | 54 +++++++++++------
 .../Abilities/TelegnosisPowerSystem.cs        | 58 +++++++++++++++----
 .../Psionics/AcceptPsionicsEui.cs             |  2 +-
 .../Psionics/AntiPsychicWeaponComponent.cs    |  0
 .../Audio/GlimmerSoundComponent.cs            |  6 +-
 .../Psionics/Dreams/DreamSystem.cs            |  1 -
 .../Psionics/Glimmer/GlimmerCommands.cs       |  0
 .../Psionics/Glimmer/GlimmerReactiveSystem.cs |  0
 .../Glimmer/PassiveGlimmerReductionSystem.cs  |  2 -
 .../Structures/GlimmerSourceComponent.cs      |  0
 .../Structures/GlimmerStructuresSystem.cs     |  0
 .../Invisibility/PsionicInvisibilitySystem.cs |  3 +
 .../PsionicInvisibleContactsComponent.cs      |  0
 .../PsionicInvisibleContactsSystem.cs         |  0
 .../PsionicallyInvisibleComponent.cs          |  0
 .../Psionics/PotentialPsionicComponent.cs     |  0
 .../PsionicAwaitingPlayerComponent.cs         |  0
 .../Psionics/PsionicBonusChanceComponent.cs   |  0
 .../Psionics/PsionicsCommands.cs              |  0
 .../Psionics/PsionicsSystem.cs                | 39 ++++++++++++-
 .../PsionicRegenerationPowerComponent.cs      |  2 +-
 .../Telegnosis/TelegnosisPowerComponent.cs    |  3 +
 .../TelegnosticProjectionComponent.cs         |  6 +-
 .../Abilities/Psionics/PsionicComponent.cs    |  6 +-
 .../Events/PyrokinesisPowerActionEvent.cs     |  4 +-
 .../Psionics/SharedPsionicSystem.Insulated.cs | 15 -----
 .../Prototypes/Nyanotrasen/Actions/types.yml  |  2 +-
 .../Prototypes/Nyanotrasen/psionicPowers.yml  |  1 +
 38 files changed, 229 insertions(+), 97 deletions(-)
 rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/DispelPowerSystem.cs (95%)
 rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/MetapsionicPowerSystem.cs (93%)
 rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/MindSwapPowerSystem.cs (98%)
 rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/MindSwappedComponent.cs (94%)
 rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/NoosphericZapPowerSystem.cs (87%)
 rename Content.Server/{Nyanotrasen/Abilities/Psionics => Psionics/Abilities}/PsionicAbilitiesSystem.cs (99%)
 rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs (84%)
 rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicRegenerationPowerSystem.cs (86%)
 rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/PyrokinesisPowerSystem.cs (50%)
 rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/TelegnosisPowerSystem.cs (52%)
 rename Content.Server/{Nyanotrasen => }/Psionics/AcceptPsionicsEui.cs (95%)
 rename Content.Server/{Nyanotrasen => }/Psionics/AntiPsychicWeaponComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => Psionics}/Audio/GlimmerSoundComponent.cs (80%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Dreams/DreamSystem.cs (98%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/GlimmerCommands.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/GlimmerReactiveSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs (94%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Invisibility/PsionicInvisibilitySystem.cs (98%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Invisibility/PsionicallyInvisibleComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/PotentialPsionicComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/PsionicAwaitingPlayerComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/PsionicBonusChanceComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/PsionicsCommands.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/PsionicsSystem.cs (79%)

diff --git a/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs b/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs
index a58d3a3c12..710c37b62f 100644
--- a/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs
+++ b/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs
@@ -1,8 +1,6 @@
-using Content.Server.Atmos.EntitySystems;
-
 namespace Content.Server.Atmos.Components;
 
-[RegisterComponent, Access(typeof(FlammableSystem))]
+[RegisterComponent]
 public sealed partial class IgniteOnCollideComponent : Component
 {
     /// <summary>
diff --git a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs b/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
index e0fb18fcae..62d8032df1 100644
--- a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
+++ b/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
@@ -64,7 +64,7 @@ private List<INetChannel> GetDreamers(IEnumerable<INetChannel> removeList)
 
         private bool IsEligibleForTelepathy(EntityUid entity)
         {
-            return HasComp<PsionicComponent>(entity)
+            return TryComp<PsionicComponent>(entity, out var psionic) && psionic.Telepath
                 && !HasComp<PsionicsDisabledComponent>(entity)
                 && !HasComp<PsionicInsulationComponent>(entity)
                 && (!TryComp<MobStateComponent>(entity, out var mobstate) || mobstate.CurrentState == MobState.Alive);
@@ -95,9 +95,9 @@ public void SendTelepathicChat(EntityUid source, string message, bool hideChat)
             if (_random.Prob(0.1f))
                 _glimmerSystem.Glimmer++;
 
-            if (_random.Prob(Math.Min(0.33f + ((float) _glimmerSystem.Glimmer / 1500), 1)))
+            if (_random.Prob(Math.Min(0.33f + (float) _glimmerSystem.Glimmer / 1500, 1)))
             {
-                float obfuscation = (0.25f + (float) _glimmerSystem.Glimmer / 2000);
+                float obfuscation = 0.25f + (float) _glimmerSystem.Glimmer / 2000;
                 var obfuscated = ObfuscateMessageReadability(message, obfuscation);
                 _chatManager.ChatMessageToMany(ChatChannel.Telepathic, obfuscated, messageWrap, source, hideChat, false, GetDreamers(clients), Color.PaleVioletRed);
             }
@@ -114,7 +114,7 @@ private string ObfuscateMessageReadability(string message, float chance)
 
             for (var i = 0; i < message.Length; i++)
             {
-                if (char.IsWhiteSpace((modifiedMessage[i])))
+                if (char.IsWhiteSpace(modifiedMessage[i]))
                 {
                     continue;
                 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
similarity index 95%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
rename to Content.Server/Psionics/Abilities/DispelPowerSystem.cs
index 8cde75f461..14e3ea14ae 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
@@ -11,7 +11,7 @@
 using Content.Shared.Actions.Events;
 using Robust.Shared.Audio.Systems;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class DispelPowerSystem : EntitySystem
     {
@@ -70,7 +70,7 @@ private void OnShutdown(EntityUid uid, DispelPowerComponent component, Component
 
         private void OnPowerUsed(DispelPowerActionEvent args)
         {
-            if (HasComp<PsionicInsulationComponent>(args.Target))
+            if (HasComp<PsionicInsulationComponent>(args.Target) || HasComp<PsionicInsulationComponent>(args.Performer))
                 return;
             if (!TryComp<PsionicComponent>(args.Performer, out var psionic) || !HasComp<PsionicComponent>(args.Target))
                 return;
@@ -81,7 +81,9 @@ private void OnPowerUsed(DispelPowerActionEvent args)
             if (ev.Handled)
             {
                 args.Handled = true;
-                _psionics.LogPowerUsed(args.Performer, "dispel", (int) MathF.Round(psionic.Dampening * -2), (int) MathF.Round(psionic.Dampening * -4));
+                _psionics.LogPowerUsed(args.Performer, "dispel",
+                    (int) MathF.Round(-2 * psionic.Dampening + psionic.Amplification),
+                    (int) MathF.Round(-4 * psionic.Dampening + psionic.Amplification));
             }
         }
 
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
similarity index 93%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
rename to Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
index fd9b810756..6279aa8862 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
@@ -13,7 +13,7 @@
 using Content.Shared.Psionics.Events;
 using Content.Server.Psionics;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class MetapsionicPowerSystem : EntitySystem
     {
@@ -82,6 +82,9 @@ private void OnShutdown(EntityUid uid, MetapsionicPowerComponent component, Comp
 
         private void OnWidePowerUsed(EntityUid uid, MetapsionicPowerComponent component, WideMetapsionicPowerActionEvent args)
         {
+            if (HasComp<PsionicInsulationComponent>(uid))
+                return;
+
             if (!TryComp<PsionicComponent>(uid, out var psionic))
                 return;
 
@@ -96,7 +99,9 @@ private void OnWidePowerUsed(EntityUid uid, MetapsionicPowerComponent component,
                 }
             }
             _popups.PopupEntity(Loc.GetString("metapsionic-pulse-failure"), uid, uid, PopupType.Large);
-            _psionics.LogPowerUsed(uid, "metapsionic pulse", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 2), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 4));
+            _psionics.LogPowerUsed(uid, "metapsionic pulse",
+                (int) MathF.Round(2 * psionic.Amplification - psionic.Dampening),
+                (int) MathF.Round(4 * psionic.Amplification - psionic.Dampening));
             UpdateActions(uid, component);
             args.Handled = true;
         }
@@ -132,7 +137,9 @@ private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args)
                 PopupType.Medium);
 
             _audioSystem.PlayPvs(component.SoundUse, args.Performer, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
-            _psionics.LogPowerUsed(args.Performer, "focused metapsionic pulse", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 3), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 6));
+            _psionics.LogPowerUsed(args.Performer, "focused metapsionic pulse",
+                (int) MathF.Round(3 * psionic.Amplification - psionic.Dampening),
+                (int) MathF.Round(6 * psionic.Amplification - psionic.Dampening));
             args.Handled = true;
 
             UpdateActions(args.Performer, component);
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
similarity index 98%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
rename to Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
index 8f19194947..0beea77aa5 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
@@ -14,7 +14,7 @@
 using Content.Shared.Mind;
 using Content.Shared.Actions.Events;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class MindSwapPowerSystem : EntitySystem
     {
@@ -222,7 +222,7 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false)
             perfComp.OriginalEntity = target;
             targetComp.OriginalEntity = performer;
         }
-
+        //It shouldn't actually be possible anymore to get trapped under most circumstances, but for niche edge cases, I am leaving this here
         public void GetTrapped(EntityUid uid)
         {
 
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs b/Content.Server/Psionics/Abilities/MindSwappedComponent.cs
similarity index 94%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
rename to Content.Server/Psionics/Abilities/MindSwappedComponent.cs
index 92fc94773d..82c0313bca 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
+++ b/Content.Server/Psionics/Abilities/MindSwappedComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class MindSwappedComponent : Component
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
similarity index 87%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
rename to Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
index d849d38303..7e4ba64afd 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
@@ -1,13 +1,12 @@
 using Content.Shared.Actions;
 using Content.Shared.Abilities.Psionics;
-using Content.Shared.Damage;
 using Content.Shared.StatusEffect;
 using Content.Server.Electrocution;
 using Content.Server.Stunnable;
 using Content.Server.Beam;
 using Content.Shared.Actions.Events;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class NoosphericZapPowerSystem : EntitySystem
     {
@@ -16,7 +15,6 @@ public sealed class NoosphericZapPowerSystem : EntitySystem
         [Dependency] private readonly StunSystem _stunSystem = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
         [Dependency] private readonly BeamSystem _beam = default!;
-        [Dependency] private readonly DamageableSystem _damageableSystem = default!;
         [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
 
 
@@ -63,10 +61,17 @@ private void OnPowerUsed(NoosphericZapPowerActionEvent args)
                 _beam.TryCreateBeam(args.Performer, args.Target, "LightningNoospheric");
                 _stunSystem.TryParalyze(args.Target, TimeSpan.FromSeconds(1 * psionic.Amplification), false);
 
-                _electrocution.TryDoElectrocution(args.Target, null, (int) MathF.Round(5f * psionic.Amplification), new TimeSpan((long) MathF.Round(1f * psionic.Amplification)), true, ignoreInsulation: true);
+                _electrocution.TryDoElectrocution(args.Target, null,
+                    (int) MathF.Round(5f * psionic.Amplification),
+                    new TimeSpan((long) MathF.Round(1f * psionic.Amplification)),
+                    true,
+                    ignoreInsulation: true);
+
                 _statusEffectsSystem.TryAddStatusEffect(args.Target, "Stutter", TimeSpan.FromSeconds(2 * psionic.Amplification), false, "StutteringAccent");
 
-                _psionics.LogPowerUsed(args.Performer, "noopsheric zap", (int) MathF.Round(psionic.Dampening * -4), (int) MathF.Round(psionic.Dampening * -6));
+                _psionics.LogPowerUsed(args.Performer, "noopsheric zap",
+                    (int) MathF.Round(6 * psionic.Amplification - psionic.Dampening),
+                    (int) MathF.Round(8 * psionic.Amplification - psionic.Dampening));
                 args.Handled = true;
             }
         }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
similarity index 99%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
rename to Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
index 860b7baab2..1bfacb0f11 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
@@ -16,7 +16,7 @@
 using Content.Shared.Examine;
 using static Content.Shared.Examine.ExamineSystemShared;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class PsionicAbilitiesSystem : EntitySystem
     {
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
similarity index 84%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
rename to Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
index af2ae0c7f0..77690c49f4 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
@@ -14,8 +14,9 @@
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Throwing;
 using Robust.Shared.Timing;
+using Content.Shared.Psionics;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class PsionicInvisibilityPowerSystem : EntitySystem
     {
@@ -40,6 +41,7 @@ public override void Initialize()
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, AttackAttemptEvent>(OnAttackAttempt);
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ShotAttemptedEvent>(OnShootAttempt);
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ThrowAttemptEvent>(OnThrowAttempt);
+            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, PsionicInsulationEvent>(OnInsulated);
         }
 
         private void OnInit(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentInit args)
@@ -71,6 +73,12 @@ private void OnShutdown(EntityUid uid, PsionicInvisibilityPowerComponent compone
 
         private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityPowerActionEvent args)
         {
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
+            if (HasComp<PsionicInsulationComponent>(uid))
+                return;
+
             var ev = new PsionicInvisibilityTimerEvent(_gameTiming.CurTime);
             var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseTimer, ev, uid) { Hidden = true };
             _doAfterSystem.TryStartDoAfter(doAfterArgs);
@@ -78,11 +86,13 @@ private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent compon
             ToggleInvisibility(args.Performer);
             var action = Spawn(PsionicInvisibilityUsedComponent.PsionicInvisibilityUsedActionPrototype);
             _actions.AddAction(uid, action, action);
-            _actions.TryGetActionData( action, out var actionData );
+            _actions.TryGetActionData(action, out var actionData);
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(action);
 
-            _psionics.LogPowerUsed(uid, "psionic invisibility");
+            _psionics.LogPowerUsed(uid, "psionic invisibility",
+                (int) MathF.Round(8 * psionic.Amplification - 2 * psionic.Dampening),
+                (int) MathF.Round(12 * psionic.Amplification - 2 * psionic.Dampening));
             args.Handled = true;
         }
 
@@ -132,11 +142,14 @@ private void OnThrowAttempt(EntityUid uid, PsionicInvisibilityUsedComponent comp
         }
         private void OnDamageChanged(EntityUid uid, PsionicInvisibilityUsedComponent component, DamageChangedEvent args)
         {
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
             if (!args.DamageIncreased)
                 return;
 
             ToggleInvisibility(uid);
-            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(4), false);
+            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(4f / psionic.Dampening + psionic.Amplification), false);
         }
         public void ToggleInvisibility(EntityUid uid)
         {
@@ -153,5 +166,14 @@ public void OnDoAfter(EntityUid uid, PsionicInvisibilityPowerComponent component
         {
             RemComp<PsionicInvisibilityUsedComponent>(uid);
         }
+
+        private void OnInsulated(EntityUid uid, PsionicInvisibilityUsedComponent component, PsionicInsulationEvent args)
+        {
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
+            RemComp<PsionicInvisibilityUsedComponent>(uid);
+            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(4f / psionic.Dampening + psionic.Amplification), false);
+        }
     }
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
similarity index 86%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
rename to Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
index 707e8d6129..995bebb0fb 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
@@ -17,7 +17,7 @@
 using Content.Shared.Actions.Events;
 using Robust.Server.Audio;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class PsionicRegenerationPowerSystem : EntitySystem
     {
@@ -28,7 +28,6 @@ public sealed class PsionicRegenerationPowerSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly ExamineSystemShared _examine = default!;
 
         public override void Initialize()
         {
@@ -51,11 +50,16 @@ private void OnInit(EntityUid uid, PsionicRegenerationPowerComponent component,
             {
                 psionic.ActivePowers.Add(component);
                 psionic.PsychicFeedback.Add(component.RegenerationFeedback);
+                psionic.Amplification += 0.5f;
+                psionic.Dampening += 0.5f;
             }
         }
 
         private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationPowerActionEvent args)
         {
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
             var ev = new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime);
             var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseDelay, ev, uid);
 
@@ -72,12 +76,16 @@ private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent compon
             _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-begin", ("entity", uid)),
                 uid,
                 // TODO: Use LoS-based Filter when one is available.
-                Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)),
+                Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)),
                 true,
                 PopupType.Medium);
 
             _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
-            _psionics.LogPowerUsed(uid, "psionic regeneration");
+
+            _psionics.LogPowerUsed(uid, "psionic regeneration",
+            (int) Math.Round(6 * psionic.Amplification - psionic.Dampening),
+            (int) Math.Round(8 * psionic.Amplification - psionic.Dampening));
+
             args.Handled = true;
         }
 
@@ -90,6 +98,9 @@ private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent compon
         /// <param name="args"></param>
         private void OnMobStateChangedEvent(EntityUid uid, PsionicRegenerationPowerComponent component, MobStateChangedEvent args)
         {
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
             if (HasComp<PsionicInsulationComponent>(uid))
                 return;
 
@@ -114,11 +125,15 @@ private void OnMobStateChangedEvent(EntityUid uid, PsionicRegenerationPowerCompo
                     _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-self-revive", ("entity", uid)),
                         uid,
                         // TODO: Use LoS-based Filter when one is available.
-                        Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)),
+                        Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)),
                         true,
                         PopupType.MediumCaution);
                     _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
-                    _psionics.LogPowerUsed(uid, "psionic regeneration", 20, 40);
+
+                    _psionics.LogPowerUsed(uid, "psionic regeneration",
+                        (int) Math.Round(10 * psionic.Amplification - 2 * psionic.Dampening),
+                        (int) Math.Round(20 * psionic.Amplification - 2 * psionic.Dampening));
+
                     _actions.StartUseDelay(component.PsionicRegenerationActionEntity);
                 }
             }
@@ -132,6 +147,8 @@ private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent compone
             {
                 psionic.ActivePowers.Remove(component);
                 psionic.PsychicFeedback.Remove(component.RegenerationFeedback);
+                psionic.Amplification += 0.5f;
+                psionic.Dampening -= 0.5f;
             }
         }
 
@@ -150,6 +167,9 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen
         {
             component.DoAfter = null;
 
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
             if (!TryComp<BloodstreamComponent>(uid, out var stream))
                 return;
 
@@ -160,12 +180,12 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen
             var percentageComplete = Math.Min(1f, (_gameTiming.CurTime - args.StartedAt).TotalSeconds / component.UseDelay);
 
             var solution = new Solution();
-            solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(component.EssenceAmount * percentageComplete));
+            solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(component.EssenceAmount * percentageComplete + 10f * psionic.Dampening));
             _bloodstreamSystem.TryAddToChemicals(uid, solution, stream);
             if (component.SelfRevive == true)
             {
                 var critSolution = new Solution();
-                critSolution.AddReagent("Epinephrine", 10);
+                critSolution.AddReagent("Epinephrine", MathF.MinMagnitude(5 + 5 * psionic.Dampening, 15));
                 _bloodstreamSystem.TryAddToChemicals(uid, critSolution, stream);
                 component.SelfRevive = false;
             }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
similarity index 50%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
rename to Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
index 8300b204dc..d93b17f55c 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -1,24 +1,20 @@
 using Content.Shared.Actions;
 using Content.Shared.Abilities.Psionics;
 using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Popups;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using Content.Server.Mind;
+using Content.Server.Weapons.Ranged.Systems;
+using Robust.Server.GameObjects;
 using Content.Shared.Actions.Events;
+using Content.Server.Explosion.Components;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class PyrokinesisPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly FlammableSystem _flammableSystem = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
+        [Dependency] private readonly GunSystem _gunSystem = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+        [Dependency] private readonly PhysicsSystem _physics = default!;
 
         public override void Initialize()
         {
@@ -30,14 +26,15 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.PyrokinesisActionEntity, component.PyrokinesisActionId );
-            _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData );
+            _actions.AddAction(uid, ref component.PyrokinesisActionEntity, component.PyrokinesisActionId);
+            _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData);
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.PyrokinesisActionEntity);
             if (TryComp<PsionicComponent>(uid, out var psionic))
             {
                 psionic.ActivePowers.Add(component);
                 psionic.PsychicFeedback.Add(component.PyrokinesisFeedback);
+                psionic.Amplification += 1f;
             }
         }
 
@@ -48,20 +45,39 @@ private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, Comp
             {
                 psionic.ActivePowers.Remove(component);
                 psionic.PsychicFeedback.Remove(component.PyrokinesisFeedback);
+                psionic.Amplification += 1f;
             }
         }
 
         private void OnPowerUsed(PyrokinesisPowerActionEvent args)
         {
-            if (!TryComp<FlammableComponent>(args.Target, out var flammableComponent))
+            if (!TryComp<PsionicComponent>(args.Performer, out var psionic))
                 return;
 
-            flammableComponent.FireStacks += 5;
-            _flammableSystem.Ignite(args.Target, args.Target);
-            _popupSystem.PopupEntity(Loc.GetString("pyrokinesis-power-used", ("target", args.Target)), args.Target, Shared.Popups.PopupType.LargeCaution);
+            if (!HasComp<PsionicInsulationComponent>(args.Performer))
+            {
+                var ent = Spawn("ProjectileAnomalyFireball");
+
+                if (TryComp<ExplosiveComponent>(ent, out var fireball))
+                {
+                    fireball.MaxIntensity = (int) MathF.Round(20 * psionic.Amplification - 10 * psionic.Dampening);
+
+                    if (psionic.Amplification > 5 && EnsureComp<IgniteOnCollideComponent>(ent, out var ignite))
+                    {
+                        ignite.FireStacks = 0.1f * psionic.Amplification - 0.1f * psionic.Dampening;
+                    }
+                }
 
-            _psionics.LogPowerUsed(args.Performer, "pyrokinesis");
-            args.Handled = true;
+                var userVelocity = _physics.GetMapLinearVelocity(args.Performer);
+                var direction = args.Target.ToMapPos(EntityManager, _transformSystem);
+
+                _gunSystem.ShootProjectile(ent, direction, userVelocity, args.Performer, args.Performer, 20f);
+
+                _psionics.LogPowerUsed(args.Performer, "pyrokinesis",
+                    (int) MathF.Round(6f * psionic.Amplification - psionic.Dampening),
+                    (int) MathF.Round(8f * psionic.Amplification - psionic.Dampening));
+                args.Handled = true;
+            }
         }
     }
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
similarity index 52%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
rename to Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
index 00d06e6dd2..aa0f5487c0 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
@@ -1,23 +1,17 @@
 using Content.Shared.Actions;
-using Content.Shared.StatusEffect;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Mind.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using Content.Server.Mind;
 using Content.Shared.Actions.Events;
+using Content.Shared.Mobs;
+using Content.Shared.Storage.Components;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class TelegnosisPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly MindSwapPowerSystem _mindSwap = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
 
         public override void Initialize()
         {
@@ -26,6 +20,9 @@ public override void Initialize()
             SubscribeLocalEvent<TelegnosisPowerComponent, ComponentShutdown>(OnShutdown);
             SubscribeLocalEvent<TelegnosisPowerComponent, TelegnosisPowerActionEvent>(OnPowerUsed);
             SubscribeLocalEvent<TelegnosticProjectionComponent, MindRemovedMessage>(OnMindRemoved);
+            SubscribeLocalEvent<TelegnosisPowerComponent, DispelledEvent>(OnDispelled);
+            SubscribeLocalEvent<TelegnosisPowerComponent, MobStateChangedEvent>(OnMobstateChanged);
+            SubscribeLocalEvent<TelegnosisPowerComponent, InsertIntoEntityStorageAttemptEvent>(OnStorageInsertAttempt);
         }
 
         private void OnInit(EntityUid uid, TelegnosisPowerComponent component, ComponentInit args)
@@ -38,6 +35,8 @@ private void OnInit(EntityUid uid, TelegnosisPowerComponent component, Component
             {
                 psionic.ActivePowers.Add(component);
                 psionic.PsychicFeedback.Add(component.TelegnosisFeedback);
+                psionic.Amplification += 0.3f;
+                psionic.Dampening += 0.3f;
             }
         }
 
@@ -48,21 +47,60 @@ private void OnShutdown(EntityUid uid, TelegnosisPowerComponent component, Compo
             {
                 psionic.ActivePowers.Remove(component);
                 psionic.PsychicFeedback.Remove(component.TelegnosisFeedback);
+                psionic.Amplification -= 0.3f;
+                psionic.Dampening -= 0.3f;
             }
         }
 
         private void OnPowerUsed(EntityUid uid, TelegnosisPowerComponent component, TelegnosisPowerActionEvent args)
         {
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
+            if (HasComp<PsionicInsulationComponent>(uid))
+                return;
+
             var projection = Spawn(component.Prototype, Transform(uid).Coordinates);
             Transform(projection).AttachToGridOrMap();
+            component.OriginalEntity = uid;
+            component.IsProjecting = true;
+            component.ProjectionUid = projection;
             _mindSwap.Swap(uid, projection);
 
-            _psionics.LogPowerUsed(uid, "telegnosis");
+            if (EnsureComp<TelegnosticProjectionComponent>(projection, out var projectionComponent))
+                projectionComponent.OriginalEntity = uid;
+
+            _psionics.LogPowerUsed(uid, "telegnosis",
+            (int) Math.Round(8f * psionic.Amplification - psionic.Dampening),
+            (int) Math.Round(12f * psionic.Amplification - psionic.Dampening));
+
             args.Handled = true;
         }
         private void OnMindRemoved(EntityUid uid, TelegnosticProjectionComponent component, MindRemovedMessage args)
         {
+            if (TryComp<TelegnosisPowerComponent>(component.OriginalEntity, out var originalEntity))
+                originalEntity.IsProjecting = false;
+
             QueueDel(uid);
         }
+
+        private void OnDispelled(EntityUid uid, TelegnosisPowerComponent component, DispelledEvent args)
+        {
+            if (component.IsProjecting)
+                _mindSwap.Swap(uid, component.ProjectionUid);
+        }
+
+        private void OnMobstateChanged(EntityUid uid, TelegnosisPowerComponent component, MobStateChangedEvent args)
+        {
+            if (component.IsProjecting && args.NewMobState is MobState.Critical
+            || component.IsProjecting && args.NewMobState is MobState.Dead)
+                _mindSwap.Swap(uid, component.ProjectionUid);
+        }
+
+        private void OnStorageInsertAttempt(EntityUid uid, TelegnosisPowerComponent component, InsertIntoEntityStorageAttemptEvent args)
+        {
+            if (component.IsProjecting)
+                _mindSwap.Swap(uid, component.ProjectionUid);
+        }
     }
 }
diff --git a/Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs b/Content.Server/Psionics/AcceptPsionicsEui.cs
similarity index 95%
rename from Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs
rename to Content.Server/Psionics/AcceptPsionicsEui.cs
index 80fd8946f2..7c652664c6 100644
--- a/Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs
+++ b/Content.Server/Psionics/AcceptPsionicsEui.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Psionics;
 using Content.Shared.Eui;
 using Content.Server.EUI;
-using Content.Server.Abilities.Psionics;
+using Content.Server.Psionics.Abilities;
 
 namespace Content.Server.Psionics
 {
diff --git a/Content.Server/Nyanotrasen/Psionics/AntiPsychicWeaponComponent.cs b/Content.Server/Psionics/AntiPsychicWeaponComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/AntiPsychicWeaponComponent.cs
rename to Content.Server/Psionics/AntiPsychicWeaponComponent.cs
diff --git a/Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs b/Content.Server/Psionics/Audio/GlimmerSoundComponent.cs
similarity index 80%
rename from Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs
rename to Content.Server/Psionics/Audio/GlimmerSoundComponent.cs
index 850be3e831..9a6c62381b 100644
--- a/Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs
+++ b/Content.Server/Psionics/Audio/GlimmerSoundComponent.cs
@@ -2,12 +2,8 @@
 using Content.Shared.Audio;
 using Content.Shared.Psionics.Glimmer;
 using Robust.Shared.Audio;
-using Robust.Shared.ComponentTrees;
-using Robust.Shared.GameStates;
-using Robust.Shared.Physics;
-using Robust.Shared.Serialization;
 
-namespace Content.Server.Audio
+namespace Content.Server.Psionics.Audio
 {
     [RegisterComponent]
     [Access(typeof(SharedAmbientSoundSystem), typeof(GlimmerReactiveSystem))]
diff --git a/Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs b/Content.Server/Psionics/Dreams/DreamSystem.cs
similarity index 98%
rename from Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs
rename to Content.Server/Psionics/Dreams/DreamSystem.cs
index d6067717c9..15e1593a85 100644
--- a/Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs
+++ b/Content.Server/Psionics/Dreams/DreamSystem.cs
@@ -4,7 +4,6 @@
 using Content.Server.Chat.Managers;
 using Robust.Shared.Random;
 using Robust.Shared.Prototypes;
-using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 
 namespace Content.Server.Psionics.Dreams
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs b/Content.Server/Psionics/Glimmer/GlimmerCommands.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs
rename to Content.Server/Psionics/Glimmer/GlimmerCommands.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs
rename to Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs b/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
similarity index 94%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
rename to Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
index f0da85ce45..57c74398b0 100644
--- a/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
+++ b/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
@@ -4,7 +4,6 @@
 using Content.Shared.CCVar;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.GameTicking;
-using Content.Server.CartridgeLoader.Cartridges;
 
 namespace Content.Server.Psionics.Glimmer
 {
@@ -17,7 +16,6 @@ public sealed class PassiveGlimmerReductionSystem : EntitySystem
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
-        [Dependency] private readonly GlimmerMonitorCartridgeSystem _cartridgeSys = default!;
 
         /// List of glimmer values spaced by minute.
         public List<int> GlimmerValues = new();
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
rename to Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
rename to Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
similarity index 98%
rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
rename to Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
index 1c9cb55f2d..f85460a69f 100644
--- a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
+++ b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics;
 using Content.Server.Abilities.Psionics;
 using Content.Shared.Eye;
 using Content.Server.NPC.Systems;
@@ -44,6 +45,8 @@ private void OnInit(EntityUid uid, PotentialPsionicComponent component, Componen
         /// <param name="args"></param>
         private void OnInsulInit(EntityUid uid, PsionicInsulationComponent component, ComponentInit args)
         {
+            RaiseLocalEvent(uid, new PsionicInsulationEvent());
+
             if (HasComp<PsionicInvisibilityUsedComponent>(uid))
                 _invisSystem.ToggleInvisibility(uid);
 
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
rename to Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
rename to Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs b/Content.Server/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
rename to Content.Server/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs b/Content.Server/Psionics/PotentialPsionicComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs
rename to Content.Server/Psionics/PotentialPsionicComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicAwaitingPlayerComponent.cs b/Content.Server/Psionics/PsionicAwaitingPlayerComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/PsionicAwaitingPlayerComponent.cs
rename to Content.Server/Psionics/PsionicAwaitingPlayerComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicBonusChanceComponent.cs b/Content.Server/Psionics/PsionicBonusChanceComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/PsionicBonusChanceComponent.cs
rename to Content.Server/Psionics/PsionicBonusChanceComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs b/Content.Server/Psionics/PsionicsCommands.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs
rename to Content.Server/Psionics/PsionicsCommands.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
similarity index 79%
rename from Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
rename to Content.Server/Psionics/PsionicsSystem.cs
index 9da293df0b..7920a09844 100644
--- a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -4,13 +4,14 @@
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Damage.Events;
 using Content.Shared.CCVar;
-using Content.Server.Abilities.Psionics;
+using Content.Server.Psionics.Abilities;
 using Content.Server.Electrocution;
 using Content.Server.NPC.Components;
 using Content.Server.NPC.Systems;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Random;
+using Content.Shared.Psionics;
 
 namespace Content.Server.Psionics
 {
@@ -49,6 +50,9 @@ public override void Initialize()
 
             SubscribeLocalEvent<PsionicComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<PsionicComponent, ComponentRemove>(OnRemove);
+
+            SubscribeLocalEvent<InnatePsicasterComponent, ComponentInit>(OnInnatePsiInit);
+            SubscribeLocalEvent<InnatePsicasterComponent, ComponentShutdown>(OnInnatePsiShutdown);
         }
 
         private void OnStartup(EntityUid uid, PotentialPsionicComponent component, MapInitEvent args)
@@ -84,6 +88,16 @@ private void OnMeleeHit(EntityUid uid, AntiPsionicWeaponComponent component, Mel
 
         private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit args)
         {
+            component.Amplification = _random.NextFloat(0.3f, 1.2f);
+            component.Dampening = _random.NextFloat(0.3f, 1.2f);
+
+            if (TryComp<InnatePsicasterComponent>(uid, out var innatePsicaster))
+            {
+                component.Amplification += innatePsicaster.Amplification;
+                component.Dampening += innatePsicaster.Dampening;
+                component.InnatePsiChecked = true;
+            }
+
             if (!component.Removable)
                 return;
 
@@ -98,7 +112,7 @@ private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit arg
 
         private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove args)
         {
-            if (!TryComp<NpcFactionMemberComponent>(uid, out var factions))
+            if (!HasComp<NpcFactionMemberComponent>(uid))
                 return;
 
             _npcFactonSystem.RemoveFaction(uid, "PsionicInterloper");
@@ -138,7 +152,7 @@ public void RollPsionics(EntityUid uid, PotentialPsionicComponent component, boo
             }
 
             if (applyGlimmer)
-                chance += ((float) _glimmerSystem.Glimmer / 1000);
+                chance += (float) _glimmerSystem.Glimmer / 1000;
 
             chance *= multiplier;
 
@@ -159,5 +173,24 @@ public void RerollPsionics(EntityUid uid, PotentialPsionicComponent? psionic = n
             RollPsionics(uid, psionic, multiplier: bonusMuliplier);
             psionic.Rerolled = true;
         }
+
+        private void OnInnatePsiInit(EntityUid uid, InnatePsicasterComponent component, ComponentInit args)
+        {
+            if (EnsureComp<PsionicComponent>(uid, out var psionic) && !psionic.InnatePsiChecked)
+            {
+                psionic.Amplification += component.Amplification;
+                psionic.Dampening += component.Dampening;
+                psionic.InnatePsiChecked = true;
+            }
+        }
+
+        private void OnInnatePsiShutdown(EntityUid uid, InnatePsicasterComponent component, ComponentShutdown args)
+        {
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.Amplification -= component.Amplification;
+                psionic.Dampening -= component.Amplification;
+            }
+        }
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
index 2f86615b83..a4fc8b632c 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
@@ -12,7 +12,7 @@ public sealed partial class PsionicRegenerationPowerComponent : Component
         public DoAfterId? DoAfter;
 
         [DataField("essence")]
-        public float EssenceAmount = 20;
+        public float EssenceAmount = 10;
 
         [DataField("useDelay")]
         public float UseDelay = 8f;
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
index cd298c3ec0..e1a523c50d 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
@@ -22,5 +22,8 @@ public sealed partial class TelegnosisPowerComponent : Component
 
         [DataField("telegnosisFeedback")]
         public string TelegnosisFeedback = "telegnosis-feedback";
+        public EntityUid OriginalEntity = default!;
+        public EntityUid ProjectionUid = default!;
+        public bool IsProjecting = false;
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
index 9d627cb42d..93359f2758 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
@@ -2,5 +2,7 @@ namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class TelegnosticProjectionComponent : Component
-    {}
-}
\ No newline at end of file
+    {
+        public EntityUid OriginalEntity = default!;
+    }
+}
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
index 7c7befa33c..cdccee393c 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
@@ -20,9 +20,11 @@ public sealed partial class PsionicComponent : Component
         public List<string> PsychicFeedback= new();
 
         [DataField("amplification")]
-        public float Amplification = 1f;
+        public float Amplification = default!;
 
         [DataField("dampening")]
-        public float Dampening = 1f;
+        public float Dampening = default!;
+        public bool Telepath = false;
+        public bool InnatePsiChecked = false;
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
index 896ec0bb63..4639aadd55 100644
--- a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
+++ b/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
@@ -1,2 +1,4 @@
 namespace Content.Shared.Actions.Events;
-public sealed partial class PyrokinesisPowerActionEvent : EntityTargetActionEvent {}
+public sealed partial class PyrokinesisPowerActionEvent : WorldTargetActionEvent {}
+
+
diff --git a/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs b/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs
index c59f98db7f..5c89f39354 100644
--- a/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs
+++ b/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs
@@ -1,19 +1,4 @@
-using Content.Shared.Abilities.Psionics;
-
 namespace Content.Shared.Psionics
 {
-    public sealed class PsionicInsulationSystem : EntitySystem
-    {
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<PsionicInsulationComponent, ComponentInit>(OnInsulated);
-        }
-
-        public void OnInsulated(EntityUid uid, PsionicInsulationComponent component, ComponentInit args)
-        {
-            RaiseLocalEvent(uid, new PsionicInsulationEvent());
-        }
-    }
     public readonly record struct PsionicInsulationEvent;
 }
diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
index 376d92e3ef..71a92ec451 100644
--- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml
+++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
@@ -94,7 +94,7 @@
   description: action-description-pyrokinesis
   noSpawn: true
   components:
-  - type: EntityTargetAction
+  - type: WorldTargetAction
     icon: Nyanotrasen/Interface/VerbIcons/pyrokinesis.png
     useDelay: 50
     range: 6
diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
index cb3f88d6a4..b577d419e3 100644
--- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
+++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
@@ -9,3 +9,4 @@
     PsionicInvisibilityPower: 0.15
     MindSwapPower: 0.15
     NoosphericZapPower: 0.15
+    PyrokinesisPower: 0.15

From 4e919eea09ea3888d0b43b26ee635126c929af05 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 20:23:41 -0400
Subject: [PATCH 26/84] guh

---
 Content.Server/Psionics/PsionicsSystem.cs     | 33 ++-----------------
 .../Abilities/Psionics/PsionicComponent.cs    |  4 +--
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
index 7920a09844..06d0a51c84 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -50,9 +50,6 @@ public override void Initialize()
 
             SubscribeLocalEvent<PsionicComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<PsionicComponent, ComponentRemove>(OnRemove);
-
-            SubscribeLocalEvent<InnatePsicasterComponent, ComponentInit>(OnInnatePsiInit);
-            SubscribeLocalEvent<InnatePsicasterComponent, ComponentShutdown>(OnInnatePsiShutdown);
         }
 
         private void OnStartup(EntityUid uid, PotentialPsionicComponent component, MapInitEvent args)
@@ -88,15 +85,8 @@ private void OnMeleeHit(EntityUid uid, AntiPsionicWeaponComponent component, Mel
 
         private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit args)
         {
-            component.Amplification = _random.NextFloat(0.3f, 1.2f);
-            component.Dampening = _random.NextFloat(0.3f, 1.2f);
-
-            if (TryComp<InnatePsicasterComponent>(uid, out var innatePsicaster))
-            {
-                component.Amplification += innatePsicaster.Amplification;
-                component.Dampening += innatePsicaster.Dampening;
-                component.InnatePsiChecked = true;
-            }
+            component.Amplification = _random.NextFloat(0.3f, 1.1f);
+            component.Dampening = _random.NextFloat(0.3f, 1.1f);
 
             if (!component.Removable)
                 return;
@@ -173,24 +163,5 @@ public void RerollPsionics(EntityUid uid, PotentialPsionicComponent? psionic = n
             RollPsionics(uid, psionic, multiplier: bonusMuliplier);
             psionic.Rerolled = true;
         }
-
-        private void OnInnatePsiInit(EntityUid uid, InnatePsicasterComponent component, ComponentInit args)
-        {
-            if (EnsureComp<PsionicComponent>(uid, out var psionic) && !psionic.InnatePsiChecked)
-            {
-                psionic.Amplification += component.Amplification;
-                psionic.Dampening += component.Dampening;
-                psionic.InnatePsiChecked = true;
-            }
-        }
-
-        private void OnInnatePsiShutdown(EntityUid uid, InnatePsicasterComponent component, ComponentShutdown args)
-        {
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.Amplification -= component.Amplification;
-                psionic.Dampening -= component.Amplification;
-            }
-        }
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
index cdccee393c..e157448507 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
@@ -20,10 +20,10 @@ public sealed partial class PsionicComponent : Component
         public List<string> PsychicFeedback= new();
 
         [DataField("amplification")]
-        public float Amplification = default!;
+        public float Amplification = 0.1f;
 
         [DataField("dampening")]
-        public float Dampening = default!;
+        public float Dampening = 0.1f;
         public bool Telepath = false;
         public bool InnatePsiChecked = false;
     }

From ca07c5cd9d2ae5584e7d4d5405689c0fb3de1bcf Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 20:36:35 -0400
Subject: [PATCH 27/84] More migrations

---
 Content.Server/Psionics/Abilities/DispelPowerSystem.cs         | 2 +-
 Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs    | 2 +-
 Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs       | 2 +-
 Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs  | 2 +-
 Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs    | 2 +-
 .../Psionics/Abilities/PsionicInvisibilityPowerSystem.cs       | 2 +-
 .../Psionics/Abilities/PsionicRegenerationPowerSystem.cs       | 2 +-
 Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs    | 2 +-
 Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs     | 2 +-
 Content.Server/Psionics/PsionicsSystem.cs                      | 2 +-
 .../Psionics/Abilities/AcceptPsionicsEuiMessage.cs             | 0
 .../Psionics/Abilities/Dispel/DamageOnDispelComponent.cs       | 2 +-
 .../Psionics/Abilities/Dispel/DispelPowerComponent.cs          | 2 +-
 .../Psionics/Abilities/Dispel/DispellableComponent.cs          | 2 +-
 .../Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs    | 2 +-
 .../Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs       | 2 +-
 .../Abilities/Metapsionics/MetapsionicPowerComponent.cs        | 2 +-
 .../Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs      | 2 +-
 .../Abilities/NoosphericZap/NoosphericZapPowerComponent.cs     | 2 +-
 .../PsionicInvisibility/PsionicInvisibilityPowerComponent.cs   | 2 +-
 .../PsionicInvisibility/PsionicInvisibilityUsedComponent.cs    | 3 ++-
 .../PsionicRegeneration/PsionicRegenerationPowerComponent.cs   | 2 +-
 .../Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs         | 2 +-
 .../Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs  | 2 +-
 .../Abilities/Telegnosis/TelegnosticProjectionComponent.cs     | 2 +-
 Content.Shared/{Nyanotrasen => }/Psionics/Events.cs            | 0
 .../{Nyanotrasen => }/Psionics/Glimmer/GlimmerSystem.cs        | 0
 .../Psionics/Glimmer/SharedGlimmerReactiveComponent.cs         | 0
 .../Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs           | 0
 .../Psionics/Items/ClothingGrantPsionicPowerComponent.cs       | 2 +-
 .../Abilities => }/Psionics/Items/HeadCageComponent.cs         | 2 +-
 .../Abilities => }/Psionics/Items/HeadCagedComponent.cs        | 2 +-
 .../Abilities => }/Psionics/Items/PsionicItemsSystem.cs        | 2 +-
 .../Abilities => }/Psionics/Items/TinfoilHatComponent.cs       | 2 +-
 .../{Nyanotrasen/Abilities => }/Psionics/PsionicComponent.cs   | 2 +-
 .../Abilities => }/Psionics/PsionicInsulationComponent.cs      | 2 +-
 .../Abilities => }/Psionics/PsionicsDisabledComponent.cs       | 2 +-
 .../Abilities => }/Psionics/SharedPsionicAbilitiesSystem.cs    | 3 ++-
 .../Psionics/SharedPsionicSystem.Insulated.cs                  | 0
 39 files changed, 35 insertions(+), 33 deletions(-)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/AcceptPsionicsEuiMessage.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs (89%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Dispel/DispelPowerComponent.cs (93%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Dispel/DispellableComponent.cs (69%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs (93%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs (98%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs (96%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs (93%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs (93%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs (94%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs (94%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs (96%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs (94%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs (96%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs (79%)
 rename Content.Shared/{Nyanotrasen => }/Psionics/Events.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Psionics/Glimmer/GlimmerSystem.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/ClothingGrantPsionicPowerComponent.cs (84%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/HeadCageComponent.cs (96%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/HeadCagedComponent.cs (81%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/PsionicItemsSystem.cs (98%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/TinfoilHatComponent.cs (90%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/PsionicComponent.cs (95%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/PsionicInsulationComponent.cs (82%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/PsionicsDisabledComponent.cs (84%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/SharedPsionicAbilitiesSystem.cs (98%)
 rename Content.Shared/{Nyanotrasen => }/Psionics/SharedPsionicSystem.Insulated.cs (100%)

diff --git a/Content.Server/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
index 14e3ea14ae..cb7ef8313c 100644
--- a/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Actions;
 using Content.Shared.StatusEffect;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Damage;
 using Content.Shared.Revenant.Components;
 using Content.Server.Guardian;
diff --git a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
index 6279aa8862..c30abd84f5 100644
--- a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Actions;
 using Content.Shared.Actions.Events;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
 using static Content.Shared.Examine.ExamineSystemShared;
diff --git a/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
index 0beea77aa5..1e50a586b4 100644
--- a/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Actions;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Psionics;
 using Content.Shared.Speech;
 using Content.Shared.Stealth.Components;
diff --git a/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
index 7e4ba64afd..ce55cb3bb7 100644
--- a/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Actions;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.StatusEffect;
 using Content.Server.Electrocution;
 using Content.Server.Stunnable;
diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
index 1bfacb0f11..74e6ed3b09 100644
--- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Actions;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Random;
diff --git a/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
index 77690c49f4..9422dfb9ac 100644
--- a/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.DoAfter;
 using Content.Shared.Actions;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.Stunnable;
diff --git a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
index 995bebb0fb..e6ef1ac6d7 100644
--- a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
@@ -3,7 +3,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.DoAfter;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Actions;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.DoAfter;
diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
index d93b17f55c..444675d9b3 100644
--- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Actions;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Server.Atmos.Components;
 using Content.Server.Weapons.Ranged.Systems;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
index aa0f5487c0..f03b001fc7 100644
--- a/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Actions;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Mind.Components;
 using Content.Shared.Actions.Events;
 using Content.Shared.Mobs;
diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
index 06d0a51c84..f2cb875432 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.StatusEffect;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Weapons.Melee.Events;
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/AcceptPsionicsEuiMessage.cs b/Content.Shared/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
rename to Content.Shared/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
similarity index 89%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
rename to Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
index ce86111fc4..89168d2b25 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Damage;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     /// <summary>
     /// Takes damage when dispelled.
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
similarity index 93%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
index 837bdd96a8..1426712cf9 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class DispelPowerComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
similarity index 69%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs
rename to Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
index 4035200418..4bb5ee653d 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class DispellableComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
similarity index 93%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
index c092cacd8b..dcd1d2c1c4 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class MassSleepPowerComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
similarity index 98%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
rename to Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
index e36a3c70e8..1f2f6954e7 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
+++ b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
@@ -8,7 +8,7 @@
 using Content.Shared.Mind;
 using Content.Shared.Actions.Events;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     public sealed class MassSleepPowerSystem : EntitySystem
     {
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
similarity index 96%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
index 0e12d05dea..8570668f74 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
@@ -4,7 +4,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class MetapsionicPowerComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs b/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
similarity index 93%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
index e617c48cf2..94b73c41e3 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class MindSwapPowerComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs b/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
similarity index 93%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
index 24c144079e..997db65e1b 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class NoosphericZapPowerComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
similarity index 94%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
index 3b29a1e436..d9c36f5b22 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class PsionicInvisibilityPowerComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
similarity index 94%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
rename to Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
index 9037b8bcdf..2a9dd7642b 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
+++ b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
@@ -1,6 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-namespace Content.Shared.Abilities.Psionics
+
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class PsionicInvisibilityUsedComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs b/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
similarity index 96%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
index a4fc8b632c..3184bf7de5 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
@@ -3,7 +3,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class PsionicRegenerationPowerComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs b/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
similarity index 94%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
index d2af000e26..1f88741b9a 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class PyrokinesisPowerComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
similarity index 96%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
index e1a523c50d..f1a71332b1 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
@@ -3,7 +3,7 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class TelegnosisPowerComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
similarity index 79%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
rename to Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
index 93359f2758..bc18ff9f3c 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class TelegnosticProjectionComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Psionics/Events.cs b/Content.Shared/Psionics/Events.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Psionics/Events.cs
rename to Content.Shared/Psionics/Events.cs
diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
rename to Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs b/Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
rename to Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs b/Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
rename to Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs b/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
similarity index 84%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
rename to Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
index 4cbb05c839..f09efc3064 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
+++ b/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class ClothingGrantPsionicPowerComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs b/Content.Shared/Psionics/Items/HeadCageComponent.cs
similarity index 96%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs
rename to Content.Shared/Psionics/Items/HeadCageComponent.cs
index acaa832860..c03241e47c 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs
+++ b/Content.Shared/Psionics/Items/HeadCageComponent.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using Robust.Shared.Audio;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class HeadCageComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs b/Content.Shared/Psionics/Items/HeadCagedComponent.cs
similarity index 81%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs
rename to Content.Shared/Psionics/Items/HeadCagedComponent.cs
index f8af46b887..0f826f7a05 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs
+++ b/Content.Shared/Psionics/Items/HeadCagedComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     /// <summary>
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs b/Content.Shared/Psionics/Items/PsionicItemsSystem.cs
similarity index 98%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs
rename to Content.Shared/Psionics/Items/PsionicItemsSystem.cs
index f88acf61f3..950353c5df 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs
+++ b/Content.Shared/Psionics/Items/PsionicItemsSystem.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.StatusEffect;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     public sealed class PsionicItemsSystem : EntitySystem
     {
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs b/Content.Shared/Psionics/Items/TinfoilHatComponent.cs
similarity index 90%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs
rename to Content.Shared/Psionics/Items/TinfoilHatComponent.cs
index 5086b9f497..6ef7bdc823 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs
+++ b/Content.Shared/Psionics/Items/TinfoilHatComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class TinfoilHatComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs
similarity index 95%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
rename to Content.Shared/Psionics/PsionicComponent.cs
index e157448507..76e629f083 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
+++ b/Content.Shared/Psionics/PsionicComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent, NetworkedComponent]
     public sealed partial class PsionicComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs b/Content.Shared/Psionics/PsionicInsulationComponent.cs
similarity index 82%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs
rename to Content.Shared/Psionics/PsionicInsulationComponent.cs
index 12370da5ae..2ab054b1f8 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs
+++ b/Content.Shared/Psionics/PsionicInsulationComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class PsionicInsulationComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs b/Content.Shared/Psionics/PsionicsDisabledComponent.cs
similarity index 84%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs
rename to Content.Shared/Psionics/PsionicsDisabledComponent.cs
index 28e7157a9d..00cf550652 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs
+++ b/Content.Shared/Psionics/PsionicsDisabledComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     /// <summary>
     /// Only use this for the status effect, please.
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
similarity index 98%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs
rename to Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
index 2739d5ba31..a4b283f59c 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs
+++ b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
@@ -4,10 +4,11 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
 using Content.Shared.Psionics.Glimmer;
+using Content.Shared.Psionics.Abilities;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     public sealed class SharedPsionicAbilitiesSystem : EntitySystem
     {
diff --git a/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs b/Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs
rename to Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs

From 2cbcfb9e36fd711c29090af4deee5d2dd52228ad Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 20:45:39 -0400
Subject: [PATCH 28/84] Final migrations

---
 .../Psionics/Glimmer/GlimmerReactiveVisuals.cs              | 0
 .../Chat => Psionics/Telepathy}/PsionicChatUpdateSystem.cs  | 4 ++--
 .../UI => Psionics/UserInterface}/AcceptPsionicsEUI.cs      | 0
 .../UI => Psionics/UserInterface}/AcceptPsionicsWindow.cs   | 0
 .../{Nyanotrasen => Psionics}/UserInterface/GlimmerGraph.cs | 2 +-
 Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs | 3 ---
 Content.Server/Psionics/PsionicsCommands.cs                 | 3 +--
 Content.Server/Psionics/PsionicsSystem.cs                   | 1 -
 .../{Nyanotrasen/Chat => Psionics/Telepathy}/TSayCommand.cs | 2 +-
 .../Telepathy}/TelepathicRepeaterComponent.cs               | 2 +-
 .../Telepathy/TelepathyChatSystem.cs}                       | 6 +++---
 11 files changed, 9 insertions(+), 14 deletions(-)
 rename Content.Client/{Nyanotrasen => }/Psionics/Glimmer/GlimmerReactiveVisuals.cs (100%)
 rename Content.Client/{Nyanotrasen/Chat => Psionics/Telepathy}/PsionicChatUpdateSystem.cs (92%)
 rename Content.Client/{Nyanotrasen/Psionics/UI => Psionics/UserInterface}/AcceptPsionicsEUI.cs (100%)
 rename Content.Client/{Nyanotrasen/Psionics/UI => Psionics/UserInterface}/AcceptPsionicsWindow.cs (100%)
 rename Content.Client/{Nyanotrasen => Psionics}/UserInterface/GlimmerGraph.cs (97%)
 rename Content.Server/{Nyanotrasen/Chat => Psionics/Telepathy}/TSayCommand.cs (96%)
 rename Content.Server/{Nyanotrasen/Chat => Psionics/Telepathy}/TelepathicRepeaterComponent.cs (82%)
 rename Content.Server/{Nyanotrasen/Chat/NyanoChatSystem.cs => Psionics/Telepathy/TelepathyChatSystem.cs} (97%)

diff --git a/Content.Client/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveVisuals.cs b/Content.Client/Psionics/Glimmer/GlimmerReactiveVisuals.cs
similarity index 100%
rename from Content.Client/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveVisuals.cs
rename to Content.Client/Psionics/Glimmer/GlimmerReactiveVisuals.cs
diff --git a/Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs b/Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs
similarity index 92%
rename from Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs
rename to Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs
index 84602052fe..7bb88764a1 100644
--- a/Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs
+++ b/Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs
@@ -1,8 +1,8 @@
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Client.Chat.Managers;
 using Robust.Client.Player;
 
-namespace Content.Client.Nyanotrasen.Chat
+namespace Content.Client.Psionics.Chat
 {
     public sealed class PsionicChatUpdateSystem : EntitySystem
     {
diff --git a/Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsEUI.cs b/Content.Client/Psionics/UserInterface/AcceptPsionicsEUI.cs
similarity index 100%
rename from Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsEUI.cs
rename to Content.Client/Psionics/UserInterface/AcceptPsionicsEUI.cs
diff --git a/Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsWindow.cs b/Content.Client/Psionics/UserInterface/AcceptPsionicsWindow.cs
similarity index 100%
rename from Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsWindow.cs
rename to Content.Client/Psionics/UserInterface/AcceptPsionicsWindow.cs
diff --git a/Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs b/Content.Client/Psionics/UserInterface/GlimmerGraph.cs
similarity index 97%
rename from Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs
rename to Content.Client/Psionics/UserInterface/GlimmerGraph.cs
index c4a9109dcd..111c810acb 100644
--- a/Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs
+++ b/Content.Client/Psionics/UserInterface/GlimmerGraph.cs
@@ -4,7 +4,7 @@
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.Nyanotrasen.UserInterface;
+namespace Content.Client.Psionics.UI;
 
 public sealed class GlimmerGraph : Control
 {
diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
index 74e6ed3b09..b6ab74627d 100644
--- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
@@ -4,16 +4,13 @@
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
 using Content.Server.EUI;
-using Content.Server.Psionics;
 using Content.Server.Mind;
-using Content.Shared.Mind.Components;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Random;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Player;
 using Content.Shared.Examine;
 using Content.Shared.Popups;
-using Content.Shared.Examine;
 using static Content.Shared.Examine.ExamineSystemShared;
 
 namespace Content.Server.Psionics.Abilities
diff --git a/Content.Server/Psionics/PsionicsCommands.cs b/Content.Server/Psionics/PsionicsCommands.cs
index 959251d1fb..2eda2cd2bc 100644
--- a/Content.Server/Psionics/PsionicsCommands.cs
+++ b/Content.Server/Psionics/PsionicsCommands.cs
@@ -1,9 +1,8 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Mobs.Components;
 using Robust.Shared.Console;
-using Robust.Server.GameObjects;
 using Content.Shared.Actions;
 using Robust.Shared.Player;
 
diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
index f2cb875432..5c10e4160c 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -11,7 +11,6 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Random;
-using Content.Shared.Psionics;
 
 namespace Content.Server.Psionics
 {
diff --git a/Content.Server/Nyanotrasen/Chat/TSayCommand.cs b/Content.Server/Psionics/Telepathy/TSayCommand.cs
similarity index 96%
rename from Content.Server/Nyanotrasen/Chat/TSayCommand.cs
rename to Content.Server/Psionics/Telepathy/TSayCommand.cs
index 9ba27b65d7..378789ccbf 100644
--- a/Content.Server/Nyanotrasen/Chat/TSayCommand.cs
+++ b/Content.Server/Psionics/Telepathy/TSayCommand.cs
@@ -5,7 +5,7 @@
 using Robust.Shared.Enums;
 using Robust.Shared.Player;
 
-namespace Content.Server.Chat.Commands
+namespace Content.Server.Psionics.Telepathy
 {
     [AnyCommand]
     internal sealed class TSayCommand : IConsoleCommand
diff --git a/Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs b/Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs
similarity index 82%
rename from Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs
rename to Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs
index fc199f4332..6e194f76c8 100644
--- a/Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs
+++ b/Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Nyanotrasen.Chat
+namespace Content.Server.Psionics.Telepathy
 {
     /// <summary>
     /// Repeats whatever is happening in telepathic chat.
diff --git a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs b/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
similarity index 97%
rename from Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
rename to Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
index 62d8032df1..565e7c7f0e 100644
--- a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
+++ b/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
@@ -3,7 +3,7 @@
 using Content.Server.Chat.Managers;
 using Content.Server.Chat.Systems;
 using Content.Server.Psionics;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Chat;
 using Content.Shared.Database;
@@ -17,10 +17,10 @@
 using System.Linq;
 using System.Text;
 
-namespace Content.Server.Nyanotrasen.Chat
+namespace Content.Server.Psionics.Telepathy
 {
     /// <summary>
-    /// Extensions for nyano's chat stuff
+    /// Extensions for Telepathic Chat
     /// </summary>
 
     public sealed class NyanoChatSystem : EntitySystem

From 6bb70936a5e1104976b4195add47966ed1447d00 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 21:05:43 -0400
Subject: [PATCH 29/84] Last set of migrations

---
 .../GlimmerMonitor}/GlimmerMonitorUi.cs                  | 3 ++-
 .../GlimmerMonitor}/GlimmerMonitorUiFragment.xaml        | 2 +-
 .../GlimmerMonitor}/GlimmerMonitorUiFragment.xaml.cs     | 4 ++--
 .../UserInterface/Systems/Chat/ChatUIController.cs       | 9 ++++-----
 Content.Server/Abilities/Mime/MimePowersSystem.cs        | 2 +-
 Content.Server/Anomaly/AnomalySystem.Psionics.cs         | 4 ++--
 Content.Server/Chat/Systems/ChatSystem.cs                | 2 +-
 .../DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs   | 2 +-
 .../Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs   | 2 +-
 .../Nyanotrasen/Research/Oracle/OracleSystem.cs          | 2 +-
 .../Research/SophicScribe/SophicScribeSystem.cs          | 2 +-
 .../StationEvents/Events/GlimmerWispSpawnRule.cs         | 2 +-
 .../Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs | 5 ++---
 .../StationEvents/Events/NoosphericFryRule.cs            | 2 +-
 .../StationEvents/Events/NoosphericStormRule.cs          | 4 ++--
 .../StationEvents/Events/NoosphericZapRule.cs            | 2 +-
 .../StationEvents/Events/PsionicCatGotYourTongueRule.cs  | 2 +-
 Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs | 2 +-
 .../Psionics/Invisibility/PsionicInvisibilitySystem.cs   | 4 ++--
 .../Singularity/EntitySystems/EventHorizonSystem.cs      | 4 ++--
 Content.Server/Zombies/ZombieSystem.Transform.cs         | 2 +-
 21 files changed, 31 insertions(+), 32 deletions(-)
 rename Content.Client/{Nyanotrasen/CartridgeLoader/Cartridges => Psionics/GlimmerMonitor}/GlimmerMonitorUi.cs (92%)
 rename Content.Client/{Nyanotrasen/CartridgeLoader/Cartridges => Psionics/GlimmerMonitor}/GlimmerMonitorUiFragment.xaml (93%)
 rename Content.Client/{Nyanotrasen/CartridgeLoader/Cartridges => Psionics/GlimmerMonitor}/GlimmerMonitorUiFragment.xaml.cs (96%)

diff --git a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs
similarity index 92%
rename from Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
rename to Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs
index 0b5fc7ad38..0d8accb9f8 100644
--- a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
+++ b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs
@@ -1,10 +1,11 @@
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
+using Content.Client.Psionics.UI;
 using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Content.Shared.CartridgeLoader;
 
-namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
+namespace Content.Client.Psionics.GlimmerMonitor;
 
 public sealed partial class GlimmerMonitorUi : UIFragment
 {
diff --git a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml
similarity index 93%
rename from Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
rename to Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml
index 119a1831e6..3044680e27 100644
--- a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
+++ b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml
@@ -1,4 +1,4 @@
-<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Nyanotrasen.CartridgeLoader.Cartridges"
+<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Psionics.GlimmerMonitor"
                                  xmlns="https://spacestation14.io" Margin="1 0 2 0">
     <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
     <BoxContainer Name="SettingsBox" Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="False">
diff --git a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs
similarity index 96%
rename from Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
rename to Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs
index 43d9202aa4..58bbee38a2 100644
--- a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
+++ b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Numerics;
-using Content.Client.Nyanotrasen.UserInterface;
+using Content.Client.Psionics.UI;
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
+namespace Content.Client.Psionics.GlimmerMonitor;
 
 [GenerateTypedNameReferences]
 public sealed partial class GlimmerMonitorUiFragment : BoxContainer
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 0ad78f974e..57b22e3f33 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -20,7 +20,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Input;
 using Content.Shared.Radio;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
@@ -37,7 +36,7 @@
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Client.Nyanotrasen.Chat; //Nyano - Summary: chat namespace.
+using Content.Client.Psionics.Chat;
 
 namespace Content.Client.UserInterface.Systems.Chat;
 
@@ -61,7 +60,7 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly GhostSystem? _ghost = default;
     [UISystemDependency] private readonly TypingIndicatorSystem? _typingIndicator = default;
     [UISystemDependency] private readonly ChatSystem? _chatSys = default;
-    [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //Nyano - Summary: makes the psionic chat available.
+    [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //EE - Summary: makes the psionic chat available.
 
     [ValidatePrototypeId<ColorPalettePrototype>]
     private const string ChatNamePalette = "ChatNames";
@@ -82,7 +81,7 @@ public sealed class ChatUIController : UIController
         {SharedChatSystem.AdminPrefix, ChatSelectChannel.Admin},
         {SharedChatSystem.RadioCommonPrefix, ChatSelectChannel.Radio},
         {SharedChatSystem.DeadPrefix, ChatSelectChannel.Dead},
-        {SharedChatSystem.TelepathicPrefix, ChatSelectChannel.Telepathic} //Nyano - Summary: adds the telepathic prefix =.
+        {SharedChatSystem.TelepathicPrefix, ChatSelectChannel.Telepathic} //EE - Summary: adds the telepathic prefix =.
     };
 
     public static readonly Dictionary<ChatSelectChannel, char> ChannelPrefixes = new()
@@ -96,7 +95,7 @@ public sealed class ChatUIController : UIController
         {ChatSelectChannel.Admin, SharedChatSystem.AdminPrefix},
         {ChatSelectChannel.Radio, SharedChatSystem.RadioCommonPrefix},
         {ChatSelectChannel.Dead, SharedChatSystem.DeadPrefix},
-        {ChatSelectChannel.Telepathic, SharedChatSystem.TelepathicPrefix } //Nyano - Summary: associates telepathic with =.
+        {ChatSelectChannel.Telepathic, SharedChatSystem.TelepathicPrefix } //EE - Summary: associates telepathic with =.
     };
 
     /// <summary>
diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs
index c1d2643d6f..3e7605a07d 100644
--- a/Content.Server/Abilities/Mime/MimePowersSystem.cs
+++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs
@@ -10,7 +10,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
-using Content.Shared.Abilities.Psionics; //Nyano - Summary: Makes Mime psionic.
+using Content.Shared.Psionics.Abilities; //EE - Summary: Makes Mime psionic.
 using Content.Shared.Speech.Muting;
 
 namespace Content.Server.Abilities.Mime
diff --git a/Content.Server/Anomaly/AnomalySystem.Psionics.cs b/Content.Server/Anomaly/AnomalySystem.Psionics.cs
index 95fda1d503..3a5a55c0bd 100644
--- a/Content.Server/Anomaly/AnomalySystem.Psionics.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Psionics.cs
@@ -1,4 +1,4 @@
-using Content.Server.Abilities.Psionics; //Nyano - Summary: the psniocs bin where dispel is located.
+using Content.Server.Psionics.Abilities; //EE - Summary: the psionics bin where dispel is located.
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
 using Robust.Shared.Random;
@@ -15,7 +15,7 @@ private void InitializePsionics()
         SubscribeLocalEvent<AnomalyComponent, DispelledEvent>(OnDispelled);
     }
 
-    //Nyano - Summary: gives dispellable behavior to Anomalies. 
+    //Nyano - Summary: gives dispellable behavior to Anomalies.
     private void OnDispelled(EntityUid uid, AnomalyComponent component, DispelledEvent args)
     {
         _dispel.DealDispelDamage(uid);
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 7eecaa32b4..7190b94e14 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -9,7 +9,7 @@
 using Content.Server.Speech;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.EntitySystems;
-using Content.Server.Nyanotrasen.Chat;
+using Content.Server.Psionics.Telepathy;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.EntitySystems;
 using Content.Server.Station.Components;
diff --git a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs
index ec9ec77031..22d96a5414 100644
--- a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs
+++ b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs
@@ -5,7 +5,7 @@
 using Content.Server.Psionics.Glimmer;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Psionics.Glimmer;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
index a23a5b3d77..0ce3f9d7c6 100644
--- a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
+++ b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Chemistry.Reagent;
-using Content.Server.Abilities.Psionics;
+using Content.Server.Psionics.Abilities;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
index 148598fe2c..24459d29e2 100644
--- a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
+++ b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
@@ -5,7 +5,7 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Psionics;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Chat;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
diff --git a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
index bc3c22cc35..b8cdcb56d4 100644
--- a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
+++ b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Abilities.Psionics;
+using Content.Server.Psionics.Abilities;
 using Content.Server.Chat.Systems;
 using Content.Server.Radio.Components;
 using Content.Server.Radio.EntitySystems;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs
index 66eea988ae..89b5a176f2 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs
@@ -5,7 +5,7 @@
 using Content.Server.Psionics.Glimmer;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Psionics.Glimmer;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
index 6394456326..89f3bc9750 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
@@ -1,10 +1,9 @@
-using Robust.Server.GameObjects;
 using Robust.Shared.Random;
-using Content.Server.Abilities.Psionics;
+using Content.Server.Psionics.Abilities;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Psionics;
 using Content.Server.StationEvents.Components;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.Player;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
index c04543d219..6a2c1c3ba7 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
@@ -10,7 +10,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.Psionics.Glimmer;
 using Content.Server.StationEvents.Components;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Damage;
 using Content.Shared.Inventory;
 using Content.Shared.Mobs.Components;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
index 175318e15b..8812ed1fe3 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
@@ -1,9 +1,9 @@
 using Robust.Shared.Random;
-using Content.Server.Abilities.Psionics;
+using Content.Server.Psionics.Abilities;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.Psionics;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Zombies;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
index 82c3d72b13..3672d317d9 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
@@ -3,7 +3,7 @@
 using Content.Server.Psionics;
 using Content.Server.StationEvents.Components;
 using Content.Server.Stunnable;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.StatusEffect;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
index 63e0a435cb..753b2e2572 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
@@ -4,7 +4,7 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Mobs.Components;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.StatusEffect;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
index da3b07d6da..db61a3753a 100644
--- a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
+++ b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Audio;
+using Content.Server.Psionics.Audio;
 using Content.Server.Power.Components;
 using Content.Server.Electrocution;
 using Content.Server.Lightning;
diff --git a/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
index f85460a69f..9583f45fdc 100644
--- a/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
+++ b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
@@ -1,6 +1,6 @@
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Psionics;
-using Content.Server.Abilities.Psionics;
+using Content.Server.Psionics.Abilities;
 using Content.Shared.Eye;
 using Content.Server.NPC.Systems;
 using Robust.Shared.Containers;
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index 7784db015d..ba07375699 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -13,7 +13,7 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Timing;
-using Content.Shared.Abilities.Psionics; //Nyano - Summary: for the telegnostic projection.
+using Content.Shared.Psionics.Abilities; //EE - Summary: for the telegnostic projection.
 
 namespace Content.Server.Singularity.EntitySystems;
 
@@ -39,7 +39,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<MapGridComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume);
         SubscribeLocalEvent<GhostComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume);
-        SubscribeLocalEvent<TelegnosticProjectionComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume); ///Nyano - Summary: the telegnositic projection has the same trait as ghosts. 
+        SubscribeLocalEvent<TelegnosticProjectionComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume); ///EE - Summary: the telegnositic projection has the same trait as ghosts.
         SubscribeLocalEvent<StationDataComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume);
         SubscribeLocalEvent<EventHorizonComponent, MapInitEvent>(OnHorizonMapInit);
         SubscribeLocalEvent<EventHorizonComponent, StartCollideEvent>(OnStartCollide);
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index daadd4b518..09a4489cf4 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -16,7 +16,7 @@
 using Content.Server.Roles;
 using Content.Server.Speech.Components;
 using Content.Server.Temperature.Components;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.CombatMode;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage;

From 51d4c1ba11b45e8f6ab61fc1d91eead440fd14e9 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 21:25:46 -0400
Subject: [PATCH 30/84] Update PsionicsSystem.cs

---
 Content.Server/Psionics/PsionicsSystem.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
index 5c10e4160c..f51d89200f 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -48,6 +48,7 @@ public override void Initialize()
             SubscribeLocalEvent<AntiPsionicWeaponComponent, StaminaMeleeHitEvent>(OnStamHit);
 
             SubscribeLocalEvent<PsionicComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<PsionicComponent, ComponentStartup>(OnStartup);
             SubscribeLocalEvent<PsionicComponent, ComponentRemove>(OnRemove);
         }
 
@@ -81,12 +82,13 @@ private void OnMeleeHit(EntityUid uid, AntiPsionicWeaponComponent component, Mel
                     _electrocutionSystem.TryDoElectrocution(args.User, null, 20, TimeSpan.FromSeconds(5), false);
             }
         }
-
-        private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit args)
+        private void OnStartup(EntityUid uid, PsionicComponent component, ComponentStartup args)
         {
             component.Amplification = _random.NextFloat(0.3f, 1.1f);
             component.Dampening = _random.NextFloat(0.3f, 1.1f);
-
+        }
+        private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit args)
+        {
             if (!component.Removable)
                 return;
 

From 90ebdb56fcf843d233faed5b251fe34b9102fec2 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 22:05:31 -0400
Subject: [PATCH 31/84] Almost got it, one last bug to squash

---
 .../Abilities/PyrokinesisPowerSystem.cs         | 17 ++++++++++++++---
 Content.Server/Psionics/PsionicsSystem.cs       |  4 ++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
index 444675d9b3..64621313db 100644
--- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -5,17 +5,20 @@
 using Robust.Server.GameObjects;
 using Content.Shared.Actions.Events;
 using Content.Server.Explosion.Components;
+using Content.Shared.Mobs.Components;
+using Robust.Shared.Map;
 
 namespace Content.Server.Psionics.Abilities
 {
     public sealed class PyrokinesisPowerSystem : EntitySystem
     {
+        [Dependency] private readonly TransformSystem _xform = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly GunSystem _gunSystem = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly PhysicsSystem _physics = default!;
-
+        [Dependency] private readonly IMapManager _mapManager = default!;
         public override void Initialize()
         {
             base.Initialize();
@@ -56,7 +59,15 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args)
 
             if (!HasComp<PsionicInsulationComponent>(args.Performer))
             {
-                var ent = Spawn("ProjectileAnomalyFireball");
+                var xformQuery = GetEntityQuery<TransformComponent>();
+                var xform = xformQuery.GetComponent(args.Performer);
+
+                var mapPos = xform.Coordinates.ToMap(EntityManager, _xform);
+                var spawnCoords = _mapManager.TryFindGridAt(mapPos, out var gridUid, out _)
+                    ? xform.Coordinates.WithEntityId(gridUid, EntityManager)
+                    : new(_mapManager.GetMapEntityId(mapPos.MapId), mapPos.Position);
+
+                var ent = Spawn("ProjectileAnomalyFireball", spawnCoords);
 
                 if (TryComp<ExplosiveComponent>(ent, out var fireball))
                 {
@@ -69,7 +80,7 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args)
                 }
 
                 var userVelocity = _physics.GetMapLinearVelocity(args.Performer);
-                var direction = args.Target.ToMapPos(EntityManager, _transformSystem);
+                var direction = args.Target.Position;
 
                 _gunSystem.ShootProjectile(ent, direction, userVelocity, args.Performer, args.Performer, 20f);
 
diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
index f51d89200f..bf82947760 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -48,7 +48,7 @@ public override void Initialize()
             SubscribeLocalEvent<AntiPsionicWeaponComponent, StaminaMeleeHitEvent>(OnStamHit);
 
             SubscribeLocalEvent<PsionicComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<PsionicComponent, ComponentStartup>(OnStartup);
+            SubscribeLocalEvent<PsionicComponent, MapInitEvent>(OnStartup);
             SubscribeLocalEvent<PsionicComponent, ComponentRemove>(OnRemove);
         }
 
@@ -82,7 +82,7 @@ private void OnMeleeHit(EntityUid uid, AntiPsionicWeaponComponent component, Mel
                     _electrocutionSystem.TryDoElectrocution(args.User, null, 20, TimeSpan.FromSeconds(5), false);
             }
         }
-        private void OnStartup(EntityUid uid, PsionicComponent component, ComponentStartup args)
+        private void OnStartup(EntityUid uid, PsionicComponent component, MapInitEvent args)
         {
             component.Amplification = _random.NextFloat(0.3f, 1.1f);
             component.Dampening = _random.NextFloat(0.3f, 1.1f);

From 52ea8372c6e77b78de89dde086aca8adbd821b0b Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 22:22:29 -0400
Subject: [PATCH 32/84] slightly more acccurate but still not quite right

---
 Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
index 64621313db..4659ca0f46 100644
--- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -79,10 +79,9 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args)
                     }
                 }
 
-                var userVelocity = _physics.GetMapLinearVelocity(args.Performer);
                 var direction = args.Target.Position;
 
-                _gunSystem.ShootProjectile(ent, direction, userVelocity, args.Performer, args.Performer, 20f);
+                _gunSystem.ShootProjectile(ent, direction, new System.Numerics.Vector2(0, 0), args.Performer, args.Performer, 20f);
 
                 _psionics.LogPowerUsed(args.Performer, "pyrokinesis",
                     (int) MathF.Round(6f * psionic.Amplification - psionic.Dampening),

From 4f8a6b8806b9efbf5fa7e42a28868a7b133de430 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 22:28:42 -0400
Subject: [PATCH 33/84] Update PyrokinesisPowerSystem.cs

---
 Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
index 4659ca0f46..c0b35ae616 100644
--- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -75,7 +75,7 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args)
 
                     if (psionic.Amplification > 5 && EnsureComp<IgniteOnCollideComponent>(ent, out var ignite))
                     {
-                        ignite.FireStacks = 0.1f * psionic.Amplification - 0.1f * psionic.Dampening;
+                        ignite.FireStacks = 0.2f * psionic.Amplification - 0.1f * psionic.Dampening;
                     }
                 }
 

From 577e51a1eb8d89fd85a47b1bf5ce80c6724b10c7 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 22:35:26 -0400
Subject: [PATCH 34/84] removing some errant instances of potentialpsionic

---
 Resources/Prototypes/Entities/Mobs/Player/skeleton.yml | 1 -
 Resources/Prototypes/Entities/Mobs/Player/vox.yml      | 2 --
 2 files changed, 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
index bf41f2dda6..f9132ce0ea 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
@@ -8,7 +8,6 @@
     interactSuccessString: hugging-success-generic
     interactSuccessSound: /Audio/Effects/thudswoosh.ogg
     messagePerceivedByOthers: hugging-success-generic-others
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 - type: entity
   name: skeleton pirate
diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
index 0a6f4f4364..de1e3da2be 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
@@ -3,5 +3,3 @@
   name: Vox
   parent: BaseMobVox
   id: MobVox
-  components:
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 

From a6f8d40046f204a7df9c09c07db91803e436e8c2 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 14 May 2024 22:37:03 -0400
Subject: [PATCH 35/84] Revert "removing some errant instances of
 potentialpsionic"

This reverts commit 0597405a48a588c9127e1bdbdca1b3d8aae81732.
---
 Resources/Prototypes/Entities/Mobs/Player/skeleton.yml | 1 +
 Resources/Prototypes/Entities/Mobs/Player/vox.yml      | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
index f9132ce0ea..bf41f2dda6 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
@@ -8,6 +8,7 @@
     interactSuccessString: hugging-success-generic
     interactSuccessSound: /Audio/Effects/thudswoosh.ogg
     messagePerceivedByOthers: hugging-success-generic-others
+  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 - type: entity
   name: skeleton pirate
diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
index de1e3da2be..0a6f4f4364 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
@@ -3,3 +3,5 @@
   name: Vox
   parent: BaseMobVox
   id: MobVox
+  components:
+  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 

From f677d5aa7e07f3ead3acf25cc9a7c1f107c0f70b Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 15 May 2024 17:31:32 -0400
Subject: [PATCH 36/84] Final power update

---
 .../Abilities/MetapsionicPowerSystem.cs       |  6 ++
 .../Abilities/NoosphericZapPowerSystem.cs     |  2 +-
 .../Abilities/PsionicAbilitiesSystem.cs       |  4 -
 .../PsionicInvisibilityPowerSystem.cs         |  1 -
 .../PsionicRegenerationPowerSystem.cs         | 10 +--
 .../Abilities/PyrokinesisPowerSystem.cs       |  2 +-
 .../RegenerativeStasisPowerSystem.cs          | 76 +++++++++++++++++++
 Content.Server/Psionics/Dreams/DreamSystem.cs |  2 -
 .../Psionics/Glimmer/GlimmerReactiveSystem.cs |  3 -
 .../PsionicInvisibleContactsComponent.cs      |  1 -
 .../PsionicInvisibleContactsSystem.cs         |  2 -
 Content.Server/Psionics/PsionicsCommands.cs   |  3 +-
 .../Psionics/Telepathy/TSayCommand.cs         |  1 -
 .../Psionics/Telepathy/TelepathyChatSystem.cs |  1 -
 .../Zombies/ZombieSystem.Transform.cs         |  2 -
 .../Events/MassSleepPowerActionEvent.cs       |  2 -
 .../RegenerativeStasisPowerActionEvent.cs     |  2 +
 .../Dispel/DamageOnDispelComponent.cs         |  2 +-
 .../Abilities/Dispel/DispelPowerComponent.cs  |  1 -
 .../MassSleep/MassSleepPowerComponent.cs      | 21 -----
 .../MassSleep/MassSleepPowerSystem.cs         | 59 --------------
 .../Metapsionics/MetapsionicPowerComponent.cs |  1 -
 .../RegenerativeStasisPowerComponent.cs       | 20 +++++
 .../Psionics/Glimmer/GlimmerSystem.cs         |  2 +-
 Content.Shared/Psionics/PsionicComponent.cs   |  2 +-
 .../Psionics/SharedPsionicAbilitiesSystem.cs  |  3 +-
 .../nyanotrasen/psionics/psychic-feedback.ftl | 21 ++++-
 .../Prototypes/Nyanotrasen/Actions/types.yml  | 10 +--
 .../Machines/metempsychoticMachine.yml        |  2 +
 .../Entities/Structures/Research/oracle.yml   |  2 +
 .../Structures/Research/sophicscribe.yml      |  2 +
 31 files changed, 143 insertions(+), 125 deletions(-)
 create mode 100644 Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs
 delete mode 100644 Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs
 create mode 100644 Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs
 delete mode 100644 Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
 delete mode 100644 Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
 create mode 100644 Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs

diff --git a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
index c30abd84f5..ffe8ab00c2 100644
--- a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
@@ -154,6 +154,12 @@ private void OnDoAfter(EntityUid uid, MetapsionicPowerComponent component, Focus
 
             if (args.Target == null) return;
 
+            if (TryComp<MindSwappedComponent>(args.Target, out var swapped))
+            {
+                _popups.PopupEntity(Loc.GetString(swapped.MindSwappedFeedback, ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
+                return;
+            }
+
             if (args.Target == uid)
             {
                 _popups.PopupEntity(Loc.GetString("metapulse-self", ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
diff --git a/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
index ce55cb3bb7..c935bc0123 100644
--- a/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
@@ -47,7 +47,7 @@ private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, Co
             {
                 psionic.ActivePowers.Remove(component);
                 psionic.PsychicFeedback.Remove(component.NoosphericZapFeedback);
-                psionic.Amplification += 1f;
+                psionic.Amplification -= 1f;
             }
         }
 
diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
index b6ab74627d..5124aff068 100644
--- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
@@ -3,8 +3,6 @@
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
-using Content.Server.EUI;
-using Content.Server.Mind;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Random;
 using Robust.Shared.Prototypes;
@@ -20,11 +18,9 @@ public sealed class PsionicAbilitiesSystem : EntitySystem
         [Dependency] private readonly IComponentFactory _componentFactory = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-        [Dependency] private readonly EuiManager _euiManager = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
         [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
         [Dependency] private readonly SharedPopupSystem _popups = default!;
 
         public override void Initialize()
diff --git a/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
index 9422dfb9ac..0c50efb5cf 100644
--- a/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
@@ -6,7 +6,6 @@
 using Content.Shared.Stunnable;
 using Content.Shared.Stealth;
 using Content.Shared.Stealth.Components;
-using Content.Server.Psionics;
 using Content.Shared.Psionics.Events;
 using Content.Shared.Actions.Events;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
index e6ef1ac6d7..882eb9e0b1 100644
--- a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
@@ -147,7 +147,7 @@ private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent compone
             {
                 psionic.ActivePowers.Remove(component);
                 psionic.PsychicFeedback.Remove(component.RegenerationFeedback);
-                psionic.Amplification += 0.5f;
+                psionic.Amplification -= 0.5f;
                 psionic.Dampening -= 0.5f;
             }
         }
@@ -173,19 +173,15 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen
             if (!TryComp<BloodstreamComponent>(uid, out var stream))
                 return;
 
-            // DoAfter has no way to run a callback during the process to give
-            // small doses of the reagent, so we wait until either the action
-            // is cancelled (by being dispelled) or complete to give the
-            // appropriate dose. A timestamp delta is used to accomplish this.
             var percentageComplete = Math.Min(1f, (_gameTiming.CurTime - args.StartedAt).TotalSeconds / component.UseDelay);
 
             var solution = new Solution();
-            solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(component.EssenceAmount * percentageComplete + 10f * psionic.Dampening));
+            solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(Math.Min(component.EssenceAmount * percentageComplete + 10f * psionic.Dampening, 15f)));
             _bloodstreamSystem.TryAddToChemicals(uid, solution, stream);
             if (component.SelfRevive == true)
             {
                 var critSolution = new Solution();
-                critSolution.AddReagent("Epinephrine", MathF.MinMagnitude(5 + 5 * psionic.Dampening, 15));
+                critSolution.AddReagent("Epinephrine", MathF.Min(5 + 5 * psionic.Dampening, 15));
                 _bloodstreamSystem.TryAddToChemicals(uid, critSolution, stream);
                 component.SelfRevive = false;
             }
diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
index c0b35ae616..77075dab20 100644
--- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -48,7 +48,7 @@ private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, Comp
             {
                 psionic.ActivePowers.Remove(component);
                 psionic.PsychicFeedback.Remove(component.PyrokinesisFeedback);
-                psionic.Amplification += 1f;
+                psionic.Amplification -= 1f;
             }
         }
 
diff --git a/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs b/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs
new file mode 100644
index 0000000000..e184b19396
--- /dev/null
+++ b/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs
@@ -0,0 +1,76 @@
+using Content.Server.Body.Systems;
+using Content.Server.Body.Components;
+using Content.Shared.Actions;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Bed.Sleep;
+using Content.Shared.Psionics.Abilities;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Content.Shared.Mind;
+using Content.Shared.Actions.Events;
+using Content.Shared.FixedPoint;
+
+namespace Content.Server.Psionics.Abilities
+{
+    public sealed class MassSleepPowerSystem : EntitySystem
+    {
+        [Dependency] private readonly SharedActionsSystem _actions = default!;
+        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+        [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<RegenerativeStasisPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<RegenerativeStasisPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<RegenerativeStasisPowerComponent, RegenerativeStasisPowerActionEvent>(OnPowerUsed);
+        }
+
+        private void OnInit(EntityUid uid, RegenerativeStasisPowerComponent component, ComponentInit args)
+        {
+            _actions.AddAction(uid, ref component.RegenerativeStasisActionEntity, component.RegenerativeStasisActionId);
+            _actions.TryGetActionData(component.RegenerativeStasisActionEntity, out var actionData);
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.RegenerativeStasisActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.RegenerativeStasisFeedback);
+                psionic.Amplification += 0.5f;
+                psionic.Dampening += 0.5f;
+            }
+        }
+
+        private void OnShutdown(EntityUid uid, RegenerativeStasisPowerComponent component, ComponentShutdown args)
+        {
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.RegenerativeStasisFeedback);
+                psionic.Amplification -= 0.5f;
+                psionic.Dampening -= 0.5f;
+            }
+            _actions.RemoveAction(uid, component.RegenerativeStasisActionEntity);
+        }
+
+        private void OnPowerUsed(EntityUid uid, RegenerativeStasisPowerComponent component, RegenerativeStasisPowerActionEvent args)
+        {
+            if (TryComp<PsionicComponent>(uid, out var psionic)
+            && !HasComp<PsionicInsulationComponent>(uid)
+            && !HasComp<PsionicInsulationComponent>(args.Target)
+            && TryComp<BloodstreamComponent>(args.Target, out var stream))
+            {
+                var solution = new Solution();
+                solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(MathF.Min(2.5f * psionic.Amplification + psionic.Dampening, 15f)));
+                solution.AddReagent("Epinephrine", FixedPoint2.New(MathF.Min(2.5f * psionic.Dampening + psionic.Amplification, 15f)));
+                _bloodstreamSystem.TryAddToChemicals(args.Target, solution, stream);
+                EnsureComp<SleepingComponent>(args.Target);
+
+                _psionics.LogPowerUsed(uid, "regenerative stasis",
+                (int) Math.Round(4 * psionic.Amplification - psionic.Dampening),
+                (int) Math.Round(6 * psionic.Amplification - psionic.Dampening));
+                args.Handled = true;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Psionics/Dreams/DreamSystem.cs b/Content.Server/Psionics/Dreams/DreamSystem.cs
index 15e1593a85..1731c7a9bf 100644
--- a/Content.Server/Psionics/Dreams/DreamSystem.cs
+++ b/Content.Server/Psionics/Dreams/DreamSystem.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Dataset;
 using Content.Shared.Bed.Sleep;
-using Content.Server.Chat.Systems;
 using Content.Server.Chat.Managers;
 using Robust.Shared.Random;
 using Robust.Shared.Prototypes;
@@ -10,7 +9,6 @@ namespace Content.Server.Psionics.Dreams
 {
     public sealed class DreamsSystem : EntitySystem
     {
-        [Dependency] private readonly ChatSystem _chat = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IChatManager _chatManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
diff --git a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
index db61a3753a..c0802c8b67 100644
--- a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
+++ b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
@@ -3,12 +3,10 @@
 using Content.Server.Electrocution;
 using Content.Server.Lightning;
 using Content.Server.Explosion.EntitySystems;
-using Content.Server.Construction;
 using Content.Server.Ghost;
 using Content.Server.Revenant.EntitySystems;
 using Content.Shared.Audio;
 using Content.Shared.Construction.EntitySystems;
-using Content.Shared.Coordinates.Helpers;
 using Content.Shared.GameTicking;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Verbs;
@@ -16,7 +14,6 @@
 using Content.Shared.Damage;
 using Content.Shared.Destructible;
 using Content.Shared.Construction.Components;
-using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Weapons.Melee.Components;
 using Robust.Shared.Audio;
diff --git a/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
index 859ceb7b83..268deddf6d 100644
--- a/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
+++ b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Whitelist;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Psionics
 {
diff --git a/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
index cec755e326..403e059261 100644
--- a/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
+++ b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Stealth.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Psionics
 {
@@ -12,7 +11,6 @@ namespace Content.Server.Psionics
     public sealed class PsionicInvisibleContactsSystem : EntitySystem
     {
         [Dependency] private readonly SharedStealthSystem _stealth = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         public override void Initialize()
         {
diff --git a/Content.Server/Psionics/PsionicsCommands.cs b/Content.Server/Psionics/PsionicsCommands.cs
index 2eda2cd2bc..3f9ee794b3 100644
--- a/Content.Server/Psionics/PsionicsCommands.cs
+++ b/Content.Server/Psionics/PsionicsCommands.cs
@@ -18,7 +18,8 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         SharedActionsSystem actions = default!;
         var entMan = IoCManager.Resolve<IEntityManager>();
-        foreach (var (actor, mob, psionic, meta) in entMan.EntityQuery<ActorComponent, MobStateComponent, PsionicComponent, MetaDataComponent>()){
+        foreach (var (actor, psionic, meta) in entMan.EntityQuery<ActorComponent, PsionicComponent, MetaDataComponent>())
+        {
             // filter out xenos, etc, with innate telepathy
             actions.TryGetActionData( psionic.PsionicAbility, out var actionData );
             if (actionData == null || actionData.ToString() == null)
diff --git a/Content.Server/Psionics/Telepathy/TSayCommand.cs b/Content.Server/Psionics/Telepathy/TSayCommand.cs
index 378789ccbf..8fbaa5e17b 100644
--- a/Content.Server/Psionics/Telepathy/TSayCommand.cs
+++ b/Content.Server/Psionics/Telepathy/TSayCommand.cs
@@ -1,6 +1,5 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Administration;
-using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 using Robust.Shared.Player;
diff --git a/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs b/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
index 565e7c7f0e..ad49075e65 100644
--- a/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
+++ b/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Managers;
 using Content.Server.Chat.Systems;
-using Content.Server.Psionics;
 using Content.Shared.Psionics.Abilities;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Chat;
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 09a4489cf4..53128aade3 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -59,9 +59,7 @@ public sealed partial class ZombieSystem
         [Dependency] private readonly IChatManager _chatMan = default!;
         [Dependency] private readonly MindSystem _mind = default!;
         [Dependency] private readonly SharedRoleSystem _roles = default!;
-        [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly ActionsSystem _actions = default!; // DeltaV - No psionic zombies
 
         /// <summary>
         /// Handles an entity turning into a zombie when they die or go into crit
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs
deleted file mode 100644
index 6666ee48d6..0000000000
--- a/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-namespace Content.Shared.Actions.Events;
-public sealed partial class MassSleepPowerActionEvent : WorldTargetActionEvent {}
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs
new file mode 100644
index 0000000000..4435f475a4
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs
@@ -0,0 +1,2 @@
+namespace Content.Shared.Actions.Events;
+public sealed partial class RegenerativeStasisPowerActionEvent : EntityTargetActionEvent {}
diff --git a/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
index 89168d2b25..c370288037 100644
--- a/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Shared.Psionics.Abilities
     public sealed partial class DamageOnDispelComponent : Component
     {
         [DataField("damage", required: true)]
-        public DamageSpecifier  Damage = default!;
+        public DamageSpecifier Damage = default!;
 
         [DataField("variance")]
         public float Variance = 0.5f;
diff --git a/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
index 1426712cf9..518a28b096 100644
--- a/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Actions;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
diff --git a/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
deleted file mode 100644
index dcd1d2c1c4..0000000000
--- a/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Actions;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Psionics.Abilities
-{
-    [RegisterComponent]
-    public sealed partial class MassSleepPowerComponent : Component
-    {
-        public float Radius = 1.25f;
-        [DataField("massSleepActionId",
-        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? MassSleepActionId = "ActionMassSleep";
-
-        [DataField("massSleepActionEntity")]
-        public EntityUid? MassSleepActionEntity;
-
-        [DataField("massSleepFeedback")]
-        public string MassSleepFeedback = "mass-sleep-feedback";
-    }
-}
diff --git a/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
deleted file mode 100644
index 1f2f6954e7..0000000000
--- a/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Bed.Sleep;
-using Content.Shared.Magic.Events;
-using Content.Shared.Damage;
-using Content.Shared.Mobs.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using Content.Shared.Mind;
-using Content.Shared.Actions.Events;
-
-namespace Content.Shared.Psionics.Abilities
-{
-    public sealed class MassSleepPowerSystem : EntitySystem
-    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly EntityLookupSystem _lookup = default!;
-        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<MassSleepPowerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<MassSleepPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<MassSleepPowerComponent, MassSleepPowerActionEvent>(OnPowerUsed);
-        }
-
-        private void OnInit(EntityUid uid, MassSleepPowerComponent component, ComponentInit args)
-        {
-            _actions.AddAction(uid, ref component.MassSleepActionEntity, component.MassSleepActionId );
-            _actions.TryGetActionData( component.MassSleepActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.MassSleepActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.MassSleepActionEntity;
-        }
-
-        private void OnShutdown(EntityUid uid, MassSleepPowerComponent component, ComponentShutdown args)
-        {
-            _actions.RemoveAction(uid, component.MassSleepActionEntity);
-        }
-
-        private void OnPowerUsed(EntityUid uid, MassSleepPowerComponent component, MassSleepPowerActionEvent args)
-        {
-            foreach (var entity in _lookup.GetEntitiesInRange(args.Target, component.Radius))
-            {
-                if (HasComp<MobStateComponent>(entity) && entity != uid && !HasComp<PsionicInsulationComponent>(entity))
-                {
-                    if (TryComp<DamageableComponent>(entity, out var damageable) && damageable.DamageContainerID == "Biological")
-                        EnsureComp<SleepingComponent>(entity);
-                }
-            }
-            _psionics.LogPowerUsed(uid, "mass sleep");
-            args.Handled = true;
-        }
-    }
-}
diff --git a/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
index 8570668f74..2fbfe18327 100644
--- a/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Actions;
 using Content.Shared.DoAfter;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs b/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs
new file mode 100644
index 0000000000..27a0903e22
--- /dev/null
+++ b/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Actions;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.Psionics.Abilities
+{
+    [RegisterComponent]
+    public sealed partial class RegenerativeStasisPowerComponent : Component
+    {
+        [DataField("regenerativeStasisActionId",
+        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string? RegenerativeStasisActionId = "ActionRegenerativeStasis";
+
+        [DataField("regenerativeStasisActionEntity")]
+        public EntityUid? RegenerativeStasisActionEntity;
+
+        [DataField("regenerativeStasisFeedback")]
+        public string RegenerativeStasisFeedback = "regenerative-stasis-feedback";
+    }
+}
diff --git a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
index 31af85bbb5..8be02f936a 100644
--- a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
+++ b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
@@ -40,7 +40,7 @@ public GlimmerTier GetGlimmerTier(int? glimmer = null)
             if (glimmer == null)
                 glimmer = Glimmer;
 
-            return (glimmer) switch
+            return glimmer switch
             {
                 <= 49 => GlimmerTier.Minimal,
                 >= 50 and <= 99 => GlimmerTier.Low,
diff --git a/Content.Shared/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs
index 76e629f083..9a06e54cb3 100644
--- a/Content.Shared/Psionics/PsionicComponent.cs
+++ b/Content.Shared/Psionics/PsionicComponent.cs
@@ -17,7 +17,7 @@ public sealed partial class PsionicComponent : Component
         public List<Component> ActivePowers = new();
 
         [DataField("psychicFeedback")]
-        public List<string> PsychicFeedback= new();
+        public List<string> PsychicFeedback = new();
 
         [DataField("amplification")]
         public float Amplification = 0.1f;
diff --git a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
index a4b283f59c..603c5188a5 100644
--- a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
+++ b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
@@ -4,7 +4,6 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
 using Content.Shared.Psionics.Glimmer;
-using Content.Shared.Psionics.Abilities;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 
@@ -74,7 +73,7 @@ public void SetPsionicsThroughEligibility(EntityUid uid)
             if (actionData == null)
                 return;
 
-            _actions.SetEnabled(actionData.Owner, IsEligibleForPsionics(uid));
+            _actions.SetEnabled(uid, IsEligibleForPsionics(uid));
         }
 
         private bool IsEligibleForPsionics(EntityUid uid)
diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
index 5e6626eb9c..6bdc84dc3e 100644
--- a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
@@ -1,6 +1,19 @@
-dispel-feedback = {CAPITALIZE($entity)} projects an aura of normality
+# Feedback messages for Focused Metapsionic Pulse
+metapulse-self = I AM.
 no-powers = {CAPITALIZE($entity)} will never awaken from the dream in this life
 psychic-potential = {CAPITALIZE($entity)} has a slim chance of awakening from the dream
-focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly, like a heat haze crawling across the endless desert
-psionic-regeneration-self-revive = As {CAPITALIZE($entity)} falls to the floor greviously wounded,
-                                   they begin visibly regenerating!
+dispel-feedback = {CAPITALIZE($entity)} is a mighty stone, standing against the currents of fate
+metasionic-feedback = {CAPITALIZE($entity)} gazes back upon thee
+mind-swap-feedback = {CAPITALIZE($entity)}'s vessel seems fit for other souls
+mindswapped-feedback = Cursed flesh! {CAPITALIZE($entity)} dwells within the wrong vessel!
+noospheric-zap-feedback = {CAPITALIZE($entity)}'s soul writhes with thunder from beyond the veil
+pyrokinesis-feedback = The Secret of Fire dwells within {CAPITALIZE($entity)}
+invisibility-feedback = {CAPITALIZE($entity)}'s wyrd seeks to hide from thine gaze
+telegnosis-feedback = {CAPITALIZE($entity)}'s soul travels across bridges composed of dreamlight.
+sophic-grammateus-feedback = SEEKER, YOU NEED ONLY ASK FOR MY WISDOM.
+oracle-feedback = WHY DO YOU BOTHER ME SEEKER? HAVE I NOT MADE MY DESIRES CLEAR?
+metempsychotic-machine-feedback = The sea of fate flows through this machine
+
+# Power PVS Messages
+focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly
+psionic-regeneration-self-revive = {CAPITALIZE($entity)} begins to visibly regenerate
diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
index 71a92ec451..55dd48e547 100644
--- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml
+++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
@@ -36,18 +36,18 @@
     event: !type:DispelPowerActionEvent
 
 - type: entity
-  id: ActionMassSleep
-  name: action-name-mass-sleep
-  description: action-description-mass-sleep
+  id: ActionRegenerativeStasis
+  name: action-name-regenerative-stasis
+  description: action-description-regenerative-stasis
   noSpawn: true
   components:
-  - type: WorldTargetAction
+  - type: EntityTargetAction
     icon: Nyanotrasen/Interface/VerbIcons/mass_sleep.png
     useDelay: 60
     checkCanAccess: false
     range: 8
     itemIconStyle: BigAction
-    event: !type:MassSleepPowerActionEvent
+    event: !type:RegenerativeStasisPowerActionEvent
 
 - type: entity
   id: ActionMindSwap
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
index d8e791af1e..5018a1da8f 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
@@ -23,3 +23,5 @@
             Gore: { state: pod_1 }
             Idle: { state: pod_0 }
     - type: Psionic
+      psychicFeedback:
+      - "metempsychotic-machine-feedback"
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
index f7481abf1e..4e2183ef0b 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
@@ -17,6 +17,8 @@
   - type: Speech
     speechSounds: Tenor
   - type: Psionic
+    psychicFeedback:
+    - "oracle-feedback"
   - type: SolutionContainerManager
     solutions:
       fountain:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
index ae85cd25e0..8e34a07ea5 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
@@ -29,6 +29,8 @@
     - Science
   - type: PotentialPsionic #this makes her easier to access for glimmer events, dw about it
   - type: Psionic
+    psychicFeedback:
+    - "sophic-grammateus-feedback"
   - type: Grammar
     attributes:
       gender: female

From 5ac883e6c112c0e8213bfc815a8d1900fd883071 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 15 May 2024 17:34:34 -0400
Subject: [PATCH 37/84] Update psionicPowers.yml

---
 Resources/Prototypes/Nyanotrasen/psionicPowers.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
index b577d419e3..ca1764e204 100644
--- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
+++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
@@ -5,7 +5,7 @@
     DispelPower: 1
     TelegnosisPower: 1
     PsionicRegenerationPower: 1
-    MassSleepPower: 0.3
+    RegenerativeStasisPower: 0.3
     PsionicInvisibilityPower: 0.15
     MindSwapPower: 0.15
     NoosphericZapPower: 0.15

From e9f1ae0db41c6db3c9f76f96b95a1e5227d057ae Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 15 May 2024 17:40:52 -0400
Subject: [PATCH 38/84] Update psionic.ftl

---
 .../Locale/en-US/nyanotrasen/abilities/psionic.ftl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
index 91ae21233a..a27803aa6f 100644
--- a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
@@ -3,8 +3,11 @@ cage-resist-third-person = {CAPITALIZE(THE($user))} starts removing {POSS-ADJ($u
 
 cage-uncage-verb = Uncage
 
-action-name-metapsionic = Metapsionic Pulse
-action-description-metapsionic = Send a mental pulse through the area to see if there are any psychics nearby.
+action-name-widemetapsionic = Wide Metapsionic Pulse
+action-description-widemetapsionic = Send a mental pulse through the area to see if there are any psychics nearby.
+
+action-name-focusedmetapsionic = Focused Metapsionic Pulse
+action-description-focusedmetapsionic = Probe an entity at close range to glean metaphorical information about any powers they may have
 
 metapsionic-pulse-success = You detect psychic presence nearby.
 metapsionic-pulse-failure = You don't detect any psychic presence nearby.
@@ -13,8 +16,8 @@ metapsionic-pulse-power = You detect that {$power} was used nearby.
 action-name-dispel = Dispel
 action-description-dispel = Dispel summoned entities such as familiars or forcewalls.
 
-action-name-mass-sleep = Mass Sleep
-action-description-mass-sleep = Put targets in a small area to sleep.
+action-name-regenerative-stasis = Regenerative Stasis
+action-description-regenerative-stasis = Puts the target into a brief stasis, during which time their wounds rapidly heal.
 
 accept-psionics-window-title = Psionic!
 accept-psionics-window-prompt-text-part = You rolled a psionic power!
@@ -63,8 +66,7 @@ action-name-noospheric-zap = Noospheric Zap
 action-description-noospheric-zap = Shocks the conciousness of the target and leaves them stunned and stuttering.
 
 action-name-pyrokinesis = Pyrokinesis
-action-description-pyrokinesis = Light a flammable target on fire.
-pyrokinesis-power-used = A wisp of flame engulfs {THE($target)}, igniting {OBJECT($target)}!
+action-description-pyrokinesis = Hurl a small gateway to the plane of Gehenna at your target.
 
 action-name-psychokinesis = Psychokinesis
 action-description-psychokinesis = Bend the fabric of space to instantly move across it.

From f951e229630f51d2f87e1eae0d757c077d19b642 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 15 May 2024 18:00:14 -0400
Subject: [PATCH 39/84] some more small tweaks

---
 Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs   | 4 ++--
 Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl      | 4 ++++
 .../Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl    | 3 ++-
 .../Entities/Structures/Machines/metempsychoticMachine.yml    | 1 +
 .../Nyanotrasen/Entities/Structures/Research/oracle.yml       | 1 +
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
index ffe8ab00c2..7b3a417c53 100644
--- a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
@@ -119,7 +119,7 @@ private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args)
 
             var ev = new FocusedMetapsionicDoAfterEvent(_gameTiming.CurTime);
 
-            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.Performer, component.UseDelay, ev, args.Performer, args.Target, args.Performer)
+            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.Performer, component.UseDelay - psionic.Amplification, ev, args.Performer, args.Target, args.Performer)
             {
                 BlockDuplicate = true,
                 BreakOnUserMove = true,
@@ -129,7 +129,7 @@ private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args)
 
             component.DoAfter = doAfterId;
 
-            _popups.PopupEntity(Loc.GetString("focused-metapsionic-pulse-begin", ("entity", args.Performer)),
+            _popups.PopupEntity(Loc.GetString("focused-metapsionic-pulse-begin", ("entity", args.Target)),
                 args.Performer,
                 // TODO: Use LoS-based Filter when one is available.
                 Filter.Pvs(args.Performer).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(args.Performer, entity, ExamineRange, null)),
diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
index a27803aa6f..5b368e822f 100644
--- a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
@@ -73,3 +73,7 @@ action-description-psychokinesis = Bend the fabric of space to instantly move ac
 
 action-name-rf-sensitivity = Toggle RF Sensitivity
 action-desc-rf-sensitivity = Toggle your ability to interpret radio waves on and off.
+
+trait-latent-psychic-desc = Your mind and soul are open to the noosphere, allowing for a limited use of Telepathy.
+                            Thus, you are eligible for potentially receiving psychic powers.
+                            It is possible that you may be hunted by otherworldly forces, so consider keeping your powers a secret.
diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
index 6bdc84dc3e..d398c717c0 100644
--- a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
@@ -3,7 +3,7 @@ metapulse-self = I AM.
 no-powers = {CAPITALIZE($entity)} will never awaken from the dream in this life
 psychic-potential = {CAPITALIZE($entity)} has a slim chance of awakening from the dream
 dispel-feedback = {CAPITALIZE($entity)} is a mighty stone, standing against the currents of fate
-metasionic-feedback = {CAPITALIZE($entity)} gazes back upon thee
+metapsionic-feedback = {CAPITALIZE($entity)} gazes back upon thee
 mind-swap-feedback = {CAPITALIZE($entity)}'s vessel seems fit for other souls
 mindswapped-feedback = Cursed flesh! {CAPITALIZE($entity)} dwells within the wrong vessel!
 noospheric-zap-feedback = {CAPITALIZE($entity)}'s soul writhes with thunder from beyond the veil
@@ -17,3 +17,4 @@ metempsychotic-machine-feedback = The sea of fate flows through this machine
 # Power PVS Messages
 focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly
 psionic-regeneration-self-revive = {CAPITALIZE($entity)} begins to visibly regenerate
+mindbreaking-feedback = The light of life vanishes from {CAPITALIZE($entity)}'s eyes, leaving behind a husk pretending at sapience
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
index 5018a1da8f..d773cf87c7 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
@@ -22,6 +22,7 @@
             NoMind: { state: pod_1 }
             Gore: { state: pod_1 }
             Idle: { state: pod_0 }
+    - type: PotentialPsionic
     - type: Psionic
       psychicFeedback:
       - "metempsychotic-machine-feedback"
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
index 4e2183ef0b..58189e49ce 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
@@ -16,6 +16,7 @@
   - type: Oracle
   - type: Speech
     speechSounds: Tenor
+  - type: PotentialPsionic
   - type: Psionic
     psychicFeedback:
     - "oracle-feedback"

From 2fc2351d8cb3033ab68026160adc6c494c4289bb Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 15 May 2024 18:04:27 -0400
Subject: [PATCH 40/84] Update PotentialPsionicComponent.cs

---
 Content.Server/Psionics/PotentialPsionicComponent.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Psionics/PotentialPsionicComponent.cs b/Content.Server/Psionics/PotentialPsionicComponent.cs
index 9499497cd1..e874296a4c 100644
--- a/Content.Server/Psionics/PotentialPsionicComponent.cs
+++ b/Content.Server/Psionics/PotentialPsionicComponent.cs
@@ -3,8 +3,15 @@ namespace Content.Server.Psionics
     [RegisterComponent]
     public sealed partial class PotentialPsionicComponent : Component
     {
+        /// <summary>
+        /// The base chance of an entity rolling psychic powers, which is increased by other modifiers such as glimmer.
+        /// </summary>
+        /// <remarks>
+        /// I have increased this to 10% up from its original value of 2%, because I estimate that most people won't take the Latent Psychic trait
+        /// Simply because they might not even know it exists
+        /// </remarks>
         [DataField("chance")]
-        public float Chance = 0.04f;
+        public float Chance = 0.10f;
 
         /// <summary>
         /// YORO (you only reroll once)

From 2e706d17b5bae6e28577fa3096470bcffd31f145 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 15 May 2024 18:42:15 -0400
Subject: [PATCH 41/84] Update PsionicAbilitiesSystem.cs

---
 .../Abilities/PsionicAbilitiesSystem.cs       | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
index 5124aff068..3f55e23794 100644
--- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
@@ -66,6 +66,16 @@ public void AddRandomPsionicPower(EntityUid uid)
 
         public void RemovePsionics(EntityUid uid)
         {
+            if (RemComp<PotentialPsionicComponent>(uid))
+            {
+                _popups.PopupEntity(Loc.GetString("mindbreaking-feedback", ("entity", uid)),
+                    uid,
+                    // TODO: Use LoS-based Filter when one is available.
+                    Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)),
+                    true,
+                    PopupType.Medium);
+            }
+
             if (!TryComp<PsionicComponent>(uid, out var psionic))
                 return;
 
@@ -92,16 +102,9 @@ public void RemovePsionics(EntityUid uid)
                 }
             }
 
-            _popups.PopupEntity(Loc.GetString("mindbreaking-feedback", ("entity", uid)),
-                uid,
-                // TODO: Use LoS-based Filter when one is available.
-                Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)),
-                true,
-                PopupType.Medium);
-
             _statusEffectsSystem.TryAddStatusEffect(uid, "Stutter", TimeSpan.FromMinutes(5), false, "StutteringAccent");
 
-            _glimmerSystem.Glimmer += _random.Next((int) MathF.Round(psionic.Amplification * psionic.Dampening * -5), (int) MathF.Round(psionic.Amplification * psionic.Dampening * -10));
+            _glimmerSystem.Glimmer += _random.Next((int) MathF.Round(psionic.Amplification * psionic.Dampening * -10), (int) MathF.Round(psionic.Amplification * psionic.Dampening * -5));
             RemComp<PsionicComponent>(uid);
             RemComp<PotentialPsionicComponent>(uid);
         }

From 96174af2caf454e7cfc0e19b3a2a0434158b1a17 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 15 May 2024 18:41:37 -0400
Subject: [PATCH 42/84] Update
 Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
---
 Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
index 3f55e23794..915abd1222 100644
--- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
@@ -30,7 +30,7 @@ public override void Initialize()
 
         /// <summary>
         /// Adds a psychic power once a character rolls one. This used to be a system you have to select for. However the opt-in is no longer the text window, but is now done at character creation.
-        /// This is going to get removed when I reach Part 3 of my reworks, when I touch upon the GlimmerSystem itself and overhaul how players get powers.
+        /// TODO: This is going to get removed when I reach Part 3 of my reworks, when I touch upon the GlimmerSystem itself and overhaul how players get powers.
         /// </summary>
         /// <param name="uid"></param>
         /// <param name="component"></param>

From 60f76ea41d049de7492020f27c592f4400cc69fa Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 15 May 2024 18:44:54 -0400
Subject: [PATCH 43/84] remove downstream comments

---
 Content.Server/Abilities/Mime/MimePowersSystem.cs | 2 +-
 Content.Server/Anomaly/AnomalySystem.Psionics.cs  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs
index 3e7605a07d..b3bd339243 100644
--- a/Content.Server/Abilities/Mime/MimePowersSystem.cs
+++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs
@@ -10,7 +10,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
-using Content.Shared.Psionics.Abilities; //EE - Summary: Makes Mime psionic.
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Speech.Muting;
 
 namespace Content.Server.Abilities.Mime
diff --git a/Content.Server/Anomaly/AnomalySystem.Psionics.cs b/Content.Server/Anomaly/AnomalySystem.Psionics.cs
index 3a5a55c0bd..84f200f47b 100644
--- a/Content.Server/Anomaly/AnomalySystem.Psionics.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Psionics.cs
@@ -1,4 +1,4 @@
-using Content.Server.Psionics.Abilities; //EE - Summary: the psionics bin where dispel is located.
+using Content.Server.Psionics.Abilities;
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
 using Robust.Shared.Random;
@@ -14,8 +14,6 @@ private void InitializePsionics()
     {
         SubscribeLocalEvent<AnomalyComponent, DispelledEvent>(OnDispelled);
     }
-
-    //Nyano - Summary: gives dispellable behavior to Anomalies.
     private void OnDispelled(EntityUid uid, AnomalyComponent component, DispelledEvent args)
     {
         _dispel.DealDispelDamage(uid);

From a5c621049392c8270fbb659a81dd20d4b8a176d9 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 15 May 2024 19:32:40 -0400
Subject: [PATCH 44/84] Giving pyrokinesis back to ifrit, and setting up base
 caster stat bonuses to roundstart casters

---
 .../nyanotrasen/psionics/psychic-feedback.ftl |  3 +-
 .../DeltaV/Entities/Mobs/NPCs/familiars.yml   |  7 +++--
 .../Roles/Jobs/Epistemics/forensicmantis.yml  | 15 +++++-----
 .../Roles/Jobs/Science/research_director.yml  | 28 +++++++++----------
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
index d398c717c0..26d2acb87c 100644
--- a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
@@ -9,10 +9,11 @@ mindswapped-feedback = Cursed flesh! {CAPITALIZE($entity)} dwells within the wro
 noospheric-zap-feedback = {CAPITALIZE($entity)}'s soul writhes with thunder from beyond the veil
 pyrokinesis-feedback = The Secret of Fire dwells within {CAPITALIZE($entity)}
 invisibility-feedback = {CAPITALIZE($entity)}'s wyrd seeks to hide from thine gaze
-telegnosis-feedback = {CAPITALIZE($entity)}'s soul travels across bridges composed of dreamlight.
+telegnosis-feedback = {CAPITALIZE($entity)}'s soul travels across bridges composed of dreamlight
 sophic-grammateus-feedback = SEEKER, YOU NEED ONLY ASK FOR MY WISDOM.
 oracle-feedback = WHY DO YOU BOTHER ME SEEKER? HAVE I NOT MADE MY DESIRES CLEAR?
 metempsychotic-machine-feedback = The sea of fate flows through this machine
+ifrit-feedback = A spirit of Gehenna, bound by the will of a powerful psychic
 
 # Power PVS Messages
 focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
index fa51b99325..7aed6d80e1 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -84,7 +84,10 @@
   - type: PotentialPsionic
   - type: Psionic
     removable: false
-  # - type: PyrokinesisPower # Pending psionic rework
+    amplification: 5
+    psychicFeedback:
+    - "ifrit-feedback"
+  - type: PyrokinesisPower
   - type: Grammar
     attributes:
       proper: true
@@ -108,7 +111,7 @@
     requirements:
     - !type:DepartmentTimeRequirement
       department: Epistemics
-      time: 14400 # DeltaV - 4 hours
+      time: 14400
 
 - type: entity
   parent: WelderExperimental
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
index c3e682e02a..15b2cdd4fa 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -7,22 +7,24 @@
     - !type:OverallPlaytimeRequirement
       time: 18000
     - !type:DepartmentTimeRequirement
-      department: Epistemics # DeltaV - Epistemics Department replacing Science
+      department: Epistemics
       time: 3600
   startingGear: ForensicMantisGear
   icon: "JobIconForensicMantis"
   supervisors: job-supervisors-rd
-  antagAdvantage: 5 # DeltaV - From 4 to 5
-  canBeAntag: true # DeltaV - Mantis is no longer a Detective
-  # whitelistRequired: true
+  antagAdvantage: 5
+  canBeAntag: true
   access:
   - Research
   - Maintenance
-  - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
+  - Mantis
   special:
   - !type:AddComponentSpecial
     components:
+    - type: PotentialPsionic
     - type: Psionic
+      amplification: 0.3
+      dampening: 0.3
     - type: MetapsionicPower
 
 - type: startingGear
@@ -34,11 +36,10 @@
     head: ClothingHeadHatFezMantis
     id: ForensicMantisPDA
     eyes: ClothingEyesGlassesSunglasses
-    ears: ClothingHeadsetScience # DeltaV - Mantis is part of Epistemics
+    ears: ClothingHeadsetScience
     gloves: ClothingHandsGlovesColorWhite
     outerClothing: ClothingOuterCoatMantis
     belt: ClothingBeltMantis
-    # pocket2: ForensicScanner # DeltaV - Mantis is no longer a Detective
   innerClothingSkirt: ClothingUniformSkirtMantis
   satchel: ClothingBackpackSatchelMantisFilled
   duffelbag: ClothingBackpackDuffelMantisFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index 19cf141911..ddb779669e 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -3,13 +3,13 @@
   name: job-name-rd
   description: job-description-rd
   playTimeTracker: JobResearchDirector
-  antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
+  antagAdvantage: 6
   requirements:
     - !type:DepartmentTimeRequirement
-      department: Epistemics # DeltaV - Epistemics Department replacing Science
-      time: 54000 # DeltaV - 15 hours
+      department: Epistemics
+      time: 54000
     - !type:OverallPlaytimeRequirement
-      time: 72000 # DeltaV - 20 hours
+      time: 72000
   weight: 10
   startingGear: ResearchDirectorGear
   icon: "JobIconResearchDirector"
@@ -21,20 +21,20 @@
   - Command
   - Maintenance
   - ResearchDirector
-  - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
-  - Chapel # DeltaV - Chaplain is in Epistemics
+  - Mantis
+  - Chapel
   - Cryogenics
-  special: # Nyanotrasen - Mystagogue can use the Bible
+  special:
   - !type:AddComponentSpecial
     components:
-    - type: BibleUser # Nyano - Lets them heal with bibles
-    - type: Psionic # Nyano - They start with telepathic chat
-    - type: DispelPower # Nyano - They get the Dispel psionic power on spawn
+    - type: BibleUser
+    - type: PotentialPsionic
+    - type: Psionic
+      dampening: 1 #Mystagogue gets a significant buff to his antimage abilities, making him better at dispelling than other people
+    - type: DispelPower
+    - type: CommandStaff
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
-  - !type:AddComponentSpecial
-    components:
-      - type: CommandStaff
 
 - type: startingGear
   id: ResearchDirectorGear
@@ -44,7 +44,7 @@
     shoes: ClothingShoesColorBrown
     id: RnDPDA
     ears: ClothingHeadsetRD
-    belt: BibleMystagogue # Nyanotrasen - Mystagogue book for their Ifrit
+    belt: BibleMystagogue
   innerClothingSkirt: ClothingUniformJumpskirtResearchDirector
   satchel: ClothingBackpackSatchelResearchDirectorFilled
   duffelbag: ClothingBackpackDuffelResearchDirectorFilled

From c7037665e97a26a9cacb2e8ababb201b7bb6c0ed Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 15 May 2024 19:42:58 -0400
Subject: [PATCH 45/84] Update familiars.yml

---
 Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
index 7aed6d80e1..003c899fc5 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -84,7 +84,7 @@
   - type: PotentialPsionic
   - type: Psionic
     removable: false
-    amplification: 5
+    amplification: 4
     psychicFeedback:
     - "ifrit-feedback"
   - type: PyrokinesisPower

From e4163c621925d7df90509102b4d1b9275f2daa00 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 28 May 2024 21:40:16 -0400
Subject: [PATCH 46/84] Update PsionicRegenerationPowerSystem.cs

---
 .../Abilities/PsionicRegenerationPowerSystem.cs | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
index 882eb9e0b1..6958170a5c 100644
--- a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
@@ -12,7 +12,6 @@
 using Content.Shared.Popups;
 using Content.Shared.Psionics.Events;
 using Content.Shared.Examine;
-using static Content.Shared.Examine.ExamineSystemShared;
 using Robust.Shared.Timing;
 using Content.Shared.Actions.Events;
 using Robust.Server.Audio;
@@ -28,6 +27,7 @@ public sealed class PsionicRegenerationPowerSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
 
         public override void Initialize()
         {
@@ -73,13 +73,7 @@ private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent compon
 
             component.DoAfter = doAfterId;
 
-            _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-begin", ("entity", uid)),
-                uid,
-                // TODO: Use LoS-based Filter when one is available.
-                Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)),
-                true,
-                PopupType.Medium);
-
+            _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-begin", ("entity", uid)), uid, PopupType.Medium);
             _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
 
             _psionics.LogPowerUsed(uid, "psionic regeneration",
@@ -122,12 +116,7 @@ private void OnMobStateChangedEvent(EntityUid uid, PsionicRegenerationPowerCompo
                         BreakOnDamage = false,
                         RequireCanInteract = false,
                     });
-                    _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-self-revive", ("entity", uid)),
-                        uid,
-                        // TODO: Use LoS-based Filter when one is available.
-                        Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)),
-                        true,
-                        PopupType.MediumCaution);
+                    _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-self-revive", ("entity", uid)), uid, PopupType.MediumCaution);
                     _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
 
                     _psionics.LogPowerUsed(uid, "psionic regeneration",

From 65397130e868a420741e2ba1a987fcca0a6f39f6 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 29 May 2024 02:37:00 -0400
Subject: [PATCH 47/84] Revert "Merge branch 'master' of
 https://github.com/VMSolidus/Einstein-Engines"

This reverts commit 872b30147da98728d3c1b3c6fb7b90865c7bd7f8, reversing
changes made to 15fc457e8f1ffa3a05966566dff93dbe6994310a.
---
 .vscode/extensions.json                       |   8 +-
 .../CardboardBox/CardboardBoxSystem.cs        |   5 +-
 .../Cargo/UI/CargoConsoleMenu.xaml.cs         |   4 +-
 .../Construction/ConstructionSystem.cs        |   3 +-
 .../ContextMenu/UI/EntityMenuUIController.cs  |   2 +-
 Content.Client/Gameplay/GameplayStateBase.cs  |   2 +-
 Content.Client/NPC/PathfindingSystem.cs       |  10 +-
 Content.Client/Popups/PopupOverlay.cs         |  11 +-
 Content.Client/Popups/PopupSystem.cs          |   5 -
 .../Overlays/RadiationPulseOverlay.cs         |   5 +-
 Content.Client/Sandbox/SandboxSystem.cs       |   3 +-
 .../Systems/Chat/ChatUIController.cs          |   2 +-
 Content.Client/Verbs/VerbSystem.cs            |   8 +-
 .../Tests/Wires/WireLayoutTest.cs             | 103 ----------
 .../Systems/AdminVerbSystem.Tools.cs          |  16 +-
 .../Administration/Systems/AdminVerbSystem.cs |   3 +-
 .../AtmosphereSystem.HighPressureDelta.cs     |   2 +-
 .../AtmosphereSystem.Monstermos.cs            |   2 +-
 .../Bed/Components/SnoringComponent.cs        |  10 -
 Content.Server/Bed/Sleep/SleepingSystem.cs    |   5 +-
 .../TypingIndicator/TypingIndicatorSystem.cs  |   2 +-
 .../Chemistry/EntitySystems/VaporSystem.cs    |   4 +-
 .../Conditions/ComponentInTile.cs             |   3 +-
 .../ConstructionSystem.Initial.cs             |   7 +-
 .../Systems/DeviceNetworkJammerSystem.cs      |  38 ----
 .../Systems/DeviceNetworkSystem.cs            |  11 +-
 .../Systems/SingletonDeviceNetServerSystem.cs |   5 +-
 Content.Server/Dragon/DragonSystem.cs         |   3 +-
 .../EntitySystems/ExplosionSystem.cs          |   2 +-
 .../GameTicking/GameTicker.Spawning.cs        |   2 +-
 .../GameTicking/Rules/PiratesRuleSystem.cs    |   4 +-
 Content.Server/Guardian/GuardianSystem.cs     |   3 +-
 Content.Server/Hands/Systems/HandsSystem.cs   |   3 +-
 .../Implants/SubdermalImplantSystem.cs        |   2 +-
 Content.Server/Magic/MagicSystem.cs           |   2 +-
 .../CoordinatesInRangePrecondition.cs         |   2 +-
 .../CoordinatesNotInRangePrecondition.cs      |   2 +-
 .../TargetInRangePrecondition.cs              |   2 +-
 .../NPC/Pathfinding/PathfindingSystem.cs      |   2 +-
 .../NPC/Systems/NPCSteeringSystem.Context.cs  |  25 +--
 .../NPC/Systems/NPCUtilitySystem.cs           |   5 +-
 .../Pointing/EntitySystems/PointingSystem.cs  |  10 +-
 .../EntitySystems/PowerReceiverSystem.cs      |  17 +-
 .../Radio/EntitySystems/JammerSystem.cs       |  17 --
 Content.Server/Remotes/DoorRemoteSystem.cs    |   3 +-
 .../Respawn/SpecialRespawnSystem.cs           |   5 +-
 .../EntitySystems/GravityWellSystem.cs        |   8 +-
 .../SingularityAttractorSystem.cs             |  11 +-
 .../EntitySystems/BluespaceLockerSystem.cs    |   3 +-
 .../Store/Systems/StoreSystem.Ui.cs           |   9 +-
 .../Tabletop/TabletopSystem.Session.cs        |   2 +-
 Content.Server/Wires/WireLayout.cs            |   2 -
 .../Systems/Carvers/NoiseRangeCarverSystem.cs |   3 +-
 Content.Shared.Database/LogType.cs            |   1 -
 Content.Shared/Anomaly/SharedAnomalySystem.cs |   2 +-
 .../Audio/SharedAmbientSoundSystem.cs         |  11 +-
 .../Chemistry/Components/InjectorComponent.cs |  14 +-
 .../Conditions/WallmountCondition.cs          |   3 +-
 .../DeviceNetworkJammerComponent.cs           |  24 ---
 Content.Shared/Examine/ExamineSystemShared.cs |  12 +-
 .../EntitySystems/SharedHandsSystem.Pickup.cs |   2 +-
 .../Interaction/SharedInteractionSystem.cs    |   6 +-
 .../Spawning/EntitySystemExtensions.cs        |   2 +-
 Content.Shared/Store/ListingPrototype.cs      |   5 +-
 .../Systems/SharedGunSystem.Ballistic.cs      |   2 +-
 Resources/Changelog/Changelog.yml             |   2 +-
 .../Locale/en-US/paper/book-authorbooks.ftl   |   8 -
 .../catalog/cargo/cargoproduct-categories.ftl |  16 --
 .../Locale/en-US/speech/speech-chatsan.ftl    |   3 -
 Resources/Locale/en-US/traits/traits.ftl      |   3 -
 .../Prototypes/Accents/word_replacements.yml  |  17 +-
 Resources/Prototypes/Actions/types.yml        |   2 +-
 .../Prototypes/Catalog/Cargo/cargo_armory.yml |  12 +-
 .../Catalog/Cargo/cargo_atmospherics.yml      |  22 +-
 .../Prototypes/Catalog/Cargo/cargo_botany.yml |  10 +-
 .../Prototypes/Catalog/Cargo/cargo_cargo.yml  |   4 +-
 .../Catalog/Cargo/cargo_circuitboards.yml     |   2 +-
 .../Catalog/Cargo/cargo_emergency.yml         |  16 +-
 .../Catalog/Cargo/cargo_engineering.yml       |  28 +--
 .../Catalog/Cargo/cargo_engines.yml           |  36 ++--
 .../Prototypes/Catalog/Cargo/cargo_food.yml   |  16 +-
 .../Prototypes/Catalog/Cargo/cargo_fun.yml    |  58 +++---
 .../Catalog/Cargo/cargo_livestock.yml         |  46 ++---
 .../Catalog/Cargo/cargo_materials.yml         |  22 +-
 .../Catalog/Cargo/cargo_medical.yml           |  30 +--
 .../Catalog/Cargo/cargo_science.yml           |   6 +-
 .../Catalog/Cargo/cargo_security.yml          |  18 +-
 .../Catalog/Cargo/cargo_service.yml           |  38 ++--
 .../Catalog/Cargo/cargo_shuttle.yml           |   6 +-
 .../Catalog/Cargo/cargo_vending.yml           |  50 ++---
 .../VendingMachines/Inventories/theater.yml   |   1 -
 .../Prototypes/Catalog/uplink_catalog.yml     |  12 +-
 .../Entities/Clothing/Head/hats.yml           |   5 +-
 .../Entities/Clothing/Masks/masks.yml         |  10 -
 .../Entities/Clothing/Shoes/misc.yml          |   3 -
 .../Prototypes/Entities/Mobs/Species/vox.yml  |   2 -
 .../reinforcement_teleporter.yml              |   2 +-
 .../Fun/Instruments/instruments_misc.yml      |   3 -
 .../Instruments/instruments_percussion.yml    |   2 -
 .../Fun/Instruments/instruments_wind.yml      |   5 +-
 .../Prototypes/Entities/Objects/Fun/toys.yml  |   3 -
 .../Entities/Objects/Misc/authorbooks.yml     |  14 --
 .../Objects/Specific/Medical/healing.yml      |  28 +--
 .../Entities/Objects/Specific/chemistry.yml   |   7 -
 .../Entities/Objects/Specific/syndicate.yml   |   4 +-
 .../Structures/Doors/Airlocks/access.yml      | 189 +-----------------
 .../Doors/Airlocks/base_structureairlocks.yml |   3 +
 .../Doors/MaterialDoors/material_doors.yml    |   3 +
 .../Structures/Doors/Shutter/shutters.yml     |   3 +
 .../Entities/Structures/Furniture/chairs.yml  |  14 +-
 .../Entities/Structures/Windows/window.yml    |   4 +-
 .../Markers/Spawners/Random/books.yml         |   1 -
 .../Markers/Spawners/Random/boxes.yml         |   8 -
 .../Markers/Spawners/Random/devices.yml       |  34 +---
 .../Entities/Markers/Spawners/Random/hats.yml |  20 --
 .../Markers/Spawners/Random/machineparts.yml  |   2 +-
 .../Markers/Spawners/Random/seeds.yml         |   3 -
 .../Graphs/clothing/ducky_slippers.yml        |  22 --
 .../Recipes/Construction/clothing.yml         |  11 -
 .../Prototypes/Recipes/Reactions/drinks.yml   |   6 +-
 Resources/Prototypes/Traits/disabilities.yml  |   7 -
 Resources/Prototypes/Wires/layouts.yml        |  20 --
 Resources/Prototypes/tags.yml                 |   3 -
 .../ServerInfo/Guidebook/Engineering/TEG.xml  | 179 ++---------------
 .../Guidebook/Science/ArtifactReports.xml     |   2 +-
 .../Clothing/Ears/Headsets/base.rsi/icon.png  | Bin 387 -> 309 bytes
 .../Clothing/Ears/Headsets/base.rsi/meta.json |   2 +-
 .../Ears/Headsets/base_syndicate.rsi/icon.png | Bin 332 -> 288 bytes
 .../Headsets/base_syndicate.rsi/meta.json     |   2 +-
 .../Clothing/Ears/Headsets/cargo.rsi/icon.png | Bin 402 -> 326 bytes
 .../Ears/Headsets/cargo.rsi/icon_alt.png      | Bin 366 -> 516 bytes
 .../Ears/Headsets/cargo.rsi/meta.json         |   2 +-
 .../Ears/Headsets/centcom.rsi/icon.png        | Bin 307 -> 315 bytes
 .../Ears/Headsets/centcom.rsi/icon_alt.png    | Bin 371 -> 469 bytes
 .../Ears/Headsets/centcom.rsi/meta.json       |   2 +-
 .../Ears/Headsets/command.rsi/icon.png        | Bin 396 -> 325 bytes
 .../Ears/Headsets/command.rsi/icon_alt.png    | Bin 576 -> 504 bytes
 .../Ears/Headsets/command.rsi/meta.json       |   2 +-
 .../Ears/Headsets/engineering.rsi/icon.png    | Bin 405 -> 282 bytes
 .../Headsets/engineering.rsi/icon_alt.png     | Bin 366 -> 490 bytes
 .../Ears/Headsets/engineering.rsi/meta.json   |   2 +-
 .../Ears/Headsets/freelance.rsi/icon.png      | Bin 402 -> 799 bytes
 .../Ears/Headsets/freelance.rsi/icon_alt.png  | Bin 366 -> 991 bytes
 .../Ears/Headsets/freelance.rsi/meta.json     |   2 +-
 .../Ears/Headsets/medical.rsi/icon.png        | Bin 392 -> 287 bytes
 .../Ears/Headsets/medical.rsi/icon_alt.png    | Bin 453 -> 469 bytes
 .../Ears/Headsets/medical.rsi/meta.json       |   2 +-
 .../Ears/Headsets/medicalscience.rsi/icon.png | Bin 418 -> 316 bytes
 .../Headsets/medicalscience.rsi/meta.json     |   2 +-
 .../Ears/Headsets/mining.rsi/icon.png         | Bin 469 -> 396 bytes
 .../Ears/Headsets/mining.rsi/meta.json        |   2 +-
 .../Ears/Headsets/robotics.rsi/icon.png       | Bin 324 -> 296 bytes
 .../Ears/Headsets/robotics.rsi/meta.json      |   2 +-
 .../Ears/Headsets/science.rsi/icon.png        | Bin 396 -> 311 bytes
 .../Ears/Headsets/science.rsi/icon_alt.png    | Bin 361 -> 498 bytes
 .../Ears/Headsets/science.rsi/meta.json       |   2 +-
 .../Ears/Headsets/security.rsi/icon.png       | Bin 408 -> 283 bytes
 .../Ears/Headsets/security.rsi/icon_alt.png   | Bin 570 -> 455 bytes
 .../Ears/Headsets/security.rsi/meta.json      |   2 +-
 .../Ears/Headsets/service.rsi/icon.png        | Bin 418 -> 311 bytes
 .../Ears/Headsets/service.rsi/meta.json       |   2 +-
 .../Headsets/servicesecurity.rsi/icon.png     | Bin 418 -> 294 bytes
 .../Headsets/servicesecurity.rsi/meta.json    |   2 +-
 .../Ears/Headsets/syndicate.rsi/icon_alt.png  | Bin 515 -> 485 bytes
 .../Ears/Headsets/syndicate.rsi/meta.json     |   2 +-
 .../equipped-MASK-reptilian.png               | Bin 442 -> 0 bytes
 .../Mask/neckgaiterred.rsi/equipped-MASK.png  | Bin 409 -> 0 bytes
 .../Clothing/Mask/neckgaiterred.rsi/icon.png  | Bin 307 -> 0 bytes
 .../Mask/neckgaiterred.rsi/inhand-left.png    | Bin 332 -> 0 bytes
 .../Mask/neckgaiterred.rsi/inhand-right.png   | Bin 349 -> 0 bytes
 .../Clothing/Mask/neckgaiterred.rsi/meta.json |  30 ---
 .../Ears/Headsets/prisoner.rsi/icon.png       | Bin 317 -> 390 bytes
 .../Ears/Headsets/prisoner.rsi/meta.json      |   2 +-
 .../Headsets/securitymedical.rsi/icon.png     | Bin 408 -> 371 bytes
 .../Headsets/securitymedical.rsi/meta.json    |   2 +-
 .../Ears/Headsets/service.rsi/icon_alt.png    | Bin 576 -> 915 bytes
 .../Ears/Headsets/service.rsi/meta.json       |   2 +-
 .../syndicate_listening.rsi/icon_alt.png      | Bin 515 -> 531 bytes
 .../syndicate_listening.rsi/meta.json         |   2 +-
 .../Devices/communication.rsi/beacon.png      | Bin 447 -> 317 bytes
 .../Devices/communication.rsi/beacon_dead.png | Bin 274 -> 253 bytes
 .../Devices/communication.rsi/meta.json       |  36 ++--
 .../old-radio-inhand-left.png                 | Bin 0 -> 215 bytes
 .../old-radio-inhand-right.png                | Bin 0 -> 243 bytes
 .../Devices/communication.rsi/old-radio.png   | Bin 0 -> 401 bytes
 .../communication.rsi/radio-inhand-left.png   | Bin 215 -> 311 bytes
 .../communication.rsi/radio-inhand-right.png  | Bin 243 -> 263 bytes
 .../Devices/communication.rsi/radio.png       | Bin 1365 -> 536 bytes
 .../Devices/communication.rsi/signaller.png   | Bin 456 -> 369 bytes
 .../communication.rsi/walkietalkie-off.png    | Bin 348 -> 290 bytes
 .../communication.rsi/walkietalkie-on.png     | Bin 207 -> 116 bytes
 .../communication.rsi/walkietalkie.png        | Bin 509 -> 299 bytes
 .../Objects/Devices/jammer.rsi/jammer-on.png  | Bin 537 -> 0 bytes
 .../Objects/Devices/jammer.rsi/jammer.png     | Bin 329 -> 495 bytes
 .../Objects/Devices/jammer.rsi/meta.json      |  16 +-
 .../Objects/Devices/signaller.rsi/meta.json   |   4 +-
 .../Devices/signaller.rsi/signaller.png       | Bin 456 -> 280 bytes
 .../Devices/station_beacon.rsi/blink.png      | Bin 447 -> 373 bytes
 .../Devices/station_beacon.rsi/icon.png       | Bin 274 -> 302 bytes
 .../Devices/station_beacon.rsi/meta.json      |   2 +-
 .../Objects/Tools/crowbar.rsi/icon.png        | Bin 371 -> 174 bytes
 .../Objects/Tools/crowbar.rsi/meta.json       |   2 +-
 .../Objects/Tools/crowbar.rsi/red-icon.png    | Bin 446 -> 200 bytes
 .../Objects/Tools/drill.rsi/drill_bolt.png    | Bin 702 -> 886 bytes
 .../Objects/Tools/drill.rsi/drill_screw.png   | Bin 691 -> 887 bytes
 .../Objects/Tools/drill.rsi/meta.json         |   2 +-
 .../Objects/Tools/geiger.rsi/geiger_base.png  | Bin 467 -> 427 bytes
 .../Tools/geiger.rsi/geiger_on_ext.png        | Bin 260 -> 228 bytes
 .../Tools/geiger.rsi/geiger_on_high.png       | Bin 218 -> 176 bytes
 .../Tools/geiger.rsi/geiger_on_idle.png       | Bin 218 -> 173 bytes
 .../Tools/geiger.rsi/geiger_on_low.png        | Bin 218 -> 176 bytes
 .../Tools/geiger.rsi/geiger_on_med.png        | Bin 218 -> 176 bytes
 .../Objects/Tools/geiger.rsi/meta.json        |   2 +-
 .../Tools/hand_labeler.rsi/hand_labeler.png   | Bin 479 -> 273 bytes
 .../Objects/Tools/hand_labeler.rsi/meta.json  |   2 +-
 .../Tools/multitool.rsi/green-unlit.png       | Bin 176 -> 123 bytes
 .../Objects/Tools/multitool.rsi/icon.png      | Bin 540 -> 359 bytes
 .../Objects/Tools/multitool.rsi/meta.json     |   2 +-
 .../Objects/Tools/multitool.rsi/red-unlit.png | Bin 175 -> 117 bytes
 .../Tools/multitool.rsi/yellow-unlit.png      | Bin 174 -> 121 bytes
 .../Textures/Objects/Tools/rcd.rsi/icon.png   | Bin 857 -> 638 bytes
 .../Objects/Tools/screwdriver.rsi/meta.json   |   2 +-
 .../Tools/screwdriver.rsi/screwdriver-map.png | Bin 310 -> 262 bytes
 .../screwdriver-screwybits.png                | Bin 225 -> 152 bytes
 .../Tools/screwdriver.rsi/screwdriver.png     | Bin 223 -> 227 bytes
 .../Objects/Tools/seclite.rsi/meta.json       |   2 +-
 .../Objects/Tools/seclite.rsi/seclite-on.png  | Bin 260 -> 287 bytes
 .../Tools/seclite.rsi/seclite-overlay.png     | Bin 279 -> 121 bytes
 .../Objects/Tools/seclite.rsi/seclite.png     | Bin 321 -> 286 bytes
 .../Objects/Tools/spray_painter.rsi/meta.json |   2 +-
 .../Tools/spray_painter.rsi/spray_painter.png | Bin 772 -> 518 bytes
 .../Objects/Tools/welder.rsi/icon.png         | Bin 568 -> 290 bytes
 .../Objects/Tools/welder.rsi/meta.json        |   2 +-
 .../Objects/Tools/welder.rsi/welder_flame.png | Bin 255 -> 181 bytes
 .../Tools/welder_experimental.rsi/icon.png    | Bin 907 -> 564 bytes
 .../Tools/welder_experimental.rsi/meta.json   |   2 +-
 .../welder_experimental.rsi/welder_flame.png  | Bin 247 -> 295 bytes
 .../Tools/welder_industrial.rsi/icon.png      | Bin 462 -> 345 bytes
 .../Tools/welder_industrial.rsi/meta.json     |   2 +-
 .../welder_industrial.rsi/welder_flame.png    | Bin 247 -> 296 bytes
 .../Tools/welder_industrialadv.rsi/icon.png   | Bin 548 -> 396 bytes
 .../Tools/welder_industrialadv.rsi/meta.json  |   2 +-
 .../welder_industrialadv.rsi/welder_flame.png | Bin 247 -> 297 bytes
 .../wirecutters.rsi/cutters-cutty-thingy.png  | Bin 239 -> 217 bytes
 .../Tools/wirecutters.rsi/cutters-map.png     | Bin 411 -> 331 bytes
 .../Objects/Tools/wirecutters.rsi/cutters.png | Bin 231 -> 228 bytes
 .../Objects/Tools/wirecutters.rsi/meta.json   |   2 +-
 .../Objects/Tools/wrench.rsi/icon.png         | Bin 484 -> 230 bytes
 .../Objects/Tools/wrench.rsi/meta.json        |   2 +-
 .../Doors/secret_door.rsi/assembly.png        | Bin 178 -> 305 bytes
 .../Doors/secret_door.rsi/closed.png          | Bin 117 -> 171 bytes
 .../Doors/secret_door.rsi/closing.png         | Bin 563 -> 516 bytes
 .../Doors/secret_door.rsi/meta.json           |  24 +--
 .../Structures/Doors/secret_door.rsi/open.png | Bin 170 -> 219 bytes
 .../Doors/secret_door.rsi/opening.png         | Bin 582 -> 530 bytes
 .../Walls/reinforced_diagonal.rsi/meta.json   |   2 +-
 .../Walls/reinforced_diagonal.rsi/state0.png  | Bin 5943 -> 666 bytes
 .../Walls/reinforced_diagonal.rsi/state1.png  | Bin 5829 -> 639 bytes
 .../Structures/Walls/shuttle.rsi/meta.json    |  20 +-
 .../Walls/shuttle.rsi/shuttle_construct-0.png | Bin 632 -> 0 bytes
 .../Walls/shuttle.rsi/shuttle_construct-1.png | Bin 652 -> 0 bytes
 .../Walls/shuttle.rsi/shuttle_construct-2.png | Bin 689 -> 0 bytes
 .../Walls/shuttle.rsi/shuttle_construct-3.png | Bin 690 -> 0 bytes
 .../Walls/shuttle.rsi/shuttle_construct-4.png | Bin 675 -> 0 bytes
 .../Walls/shuttle.rsi/shuttle_construct-5.png | Bin 671 -> 0 bytes
 .../Structures/Walls/solid.rsi/full.png       | Bin 168 -> 547 bytes
 .../Structures/Walls/solid.rsi/meta.json      |   2 +-
 .../Walls/solid.rsi/reinf_construct-0.png     | Bin 225 -> 891 bytes
 .../Walls/solid.rsi/reinf_construct-1.png     | Bin 266 -> 863 bytes
 .../Walls/solid.rsi/reinf_construct-2.png     | Bin 264 -> 956 bytes
 .../Walls/solid.rsi/reinf_construct-3.png     | Bin 262 -> 956 bytes
 .../Walls/solid.rsi/reinf_construct-4.png     | Bin 265 -> 963 bytes
 .../Walls/solid.rsi/reinf_construct-5.png     | Bin 258 -> 1016 bytes
 .../Walls/solid.rsi/reinf_over0.png           | Bin 481 -> 1128 bytes
 .../Walls/solid.rsi/reinf_over1.png           | Bin 395 -> 994 bytes
 .../Walls/solid.rsi/reinf_over2.png           | Bin 481 -> 1128 bytes
 .../Walls/solid.rsi/reinf_over3.png           | Bin 395 -> 994 bytes
 .../Walls/solid.rsi/reinf_over4.png           | Bin 393 -> 991 bytes
 .../Walls/solid.rsi/reinf_over5.png           | Bin 352 -> 880 bytes
 .../Walls/solid.rsi/reinf_over6.png           | Bin 393 -> 991 bytes
 .../Walls/solid.rsi/reinf_over7.png           | Bin 204 -> 763 bytes
 .../Structures/Walls/solid.rsi/rgeneric.png   | Bin 225 -> 864 bytes
 .../Structures/Walls/solid.rsi/solid0.png     | Bin 391 -> 782 bytes
 .../Structures/Walls/solid.rsi/solid1.png     | Bin 274 -> 415 bytes
 .../Structures/Walls/solid.rsi/solid2.png     | Bin 391 -> 782 bytes
 .../Structures/Walls/solid.rsi/solid3.png     | Bin 274 -> 415 bytes
 .../Structures/Walls/solid.rsi/solid4.png     | Bin 280 -> 423 bytes
 .../Structures/Walls/solid.rsi/solid5.png     | Bin 352 -> 448 bytes
 .../Structures/Walls/solid.rsi/solid6.png     | Bin 280 -> 423 bytes
 .../Structures/Walls/solid.rsi/solid7.png     | Bin 204 -> 261 bytes
 .../Walls/solid_diagonal.rsi/state0.png       | Bin 316 -> 316 bytes
 .../Walls/solid_diagonal.rsi/state1.png       | Bin 292 -> 297 bytes
 .../Windows/plasma_diagonal.rsi/state0.png    | Bin 729 -> 15748 bytes
 .../Windows/plasma_diagonal.rsi/state1.png    | Bin 704 -> 15665 bytes
 .../Windows/plasma_window.rsi/full.png        | Bin 430 -> 1597 bytes
 .../Windows/plasma_window.rsi/meta.json       |   2 +-
 .../Windows/plasma_window.rsi/pwindow0.png    | Bin 762 -> 2063 bytes
 .../Windows/plasma_window.rsi/pwindow1.png    | Bin 735 -> 1099 bytes
 .../Windows/plasma_window.rsi/pwindow2.png    | Bin 762 -> 2063 bytes
 .../Windows/plasma_window.rsi/pwindow3.png    | Bin 735 -> 1099 bytes
 .../Windows/plasma_window.rsi/pwindow4.png    | Bin 734 -> 1161 bytes
 .../Windows/plasma_window.rsi/pwindow5.png    | Bin 680 -> 1064 bytes
 .../Windows/plasma_window.rsi/pwindow6.png    | Bin 734 -> 1161 bytes
 .../Windows/plasma_window.rsi/pwindow7.png    | Bin 270 -> 247 bytes
 .../reinforced_plasma_diagonal.rsi/state0.png | Bin 764 -> 15911 bytes
 .../reinforced_plasma_diagonal.rsi/state1.png | Bin 737 -> 15885 bytes
 .../reinforced_plasma_window.rsi/full.png     | Bin 443 -> 2495 bytes
 .../reinforced_plasma_window.rsi/meta.json    |   2 +-
 .../rpwindow0.png                             | Bin 776 -> 2930 bytes
 .../rpwindow1.png                             | Bin 877 -> 1696 bytes
 .../rpwindow2.png                             | Bin 776 -> 2930 bytes
 .../rpwindow3.png                             | Bin 877 -> 1696 bytes
 .../rpwindow4.png                             | Bin 874 -> 1745 bytes
 .../rpwindow5.png                             | Bin 721 -> 1695 bytes
 .../rpwindow6.png                             | Bin 874 -> 1745 bytes
 .../rpwindow7.png                             | Bin 270 -> 910 bytes
 .../state0.png                                | Bin 765 -> 15734 bytes
 .../state1.png                                | Bin 739 -> 15695 bytes
 .../reinforced_uranium_window.rsi/full.png    | Bin 452 -> 2067 bytes
 .../reinforced_uranium_window.rsi/meta.json   |  90 ++++-----
 .../ruwindow0.png                             | Bin 750 -> 2366 bytes
 .../ruwindow1.png                             | Bin 872 -> 1169 bytes
 .../ruwindow2.png                             | Bin 750 -> 2342 bytes
 .../ruwindow3.png                             | Bin 872 -> 1138 bytes
 .../ruwindow4.png                             | Bin 874 -> 1133 bytes
 .../ruwindow5.png                             | Bin 704 -> 1088 bytes
 .../ruwindow6.png                             | Bin 874 -> 1129 bytes
 .../ruwindow7.png                             | Bin 270 -> 267 bytes
 .../Windows/reinforced_window.rsi/full.png    | Bin 437 -> 2063 bytes
 .../Windows/reinforced_window.rsi/meta.json   |   2 +-
 .../reinforced_window.rsi/rwindow0.png        | Bin 758 -> 2229 bytes
 .../reinforced_window.rsi/rwindow1.png        | Bin 620 -> 1148 bytes
 .../reinforced_window.rsi/rwindow2.png        | Bin 758 -> 2229 bytes
 .../reinforced_window.rsi/rwindow3.png        | Bin 620 -> 1148 bytes
 .../reinforced_window.rsi/rwindow4.png        | Bin 615 -> 1130 bytes
 .../reinforced_window.rsi/rwindow5.png        | Bin 706 -> 1025 bytes
 .../reinforced_window.rsi/rwindow6.png        | Bin 615 -> 1130 bytes
 .../reinforced_window.rsi/rwindow7.png        | Bin 268 -> 272 bytes
 .../reinforced_window_diagonal.rsi/state0.png | Bin 768 -> 16179 bytes
 .../reinforced_window_diagonal.rsi/state1.png | Bin 741 -> 16152 bytes
 .../Windows/tinted_window.rsi/full.png        | Bin 387 -> 9436 bytes
 .../Windows/tinted_window.rsi/meta.json       |   2 +-
 .../Windows/tinted_window.rsi/twindow0.png    | Bin 2397 -> 10814 bytes
 .../Windows/tinted_window.rsi/twindow1.png    | Bin 2230 -> 8214 bytes
 .../Windows/tinted_window.rsi/twindow2.png    | Bin 2397 -> 10815 bytes
 .../Windows/tinted_window.rsi/twindow3.png    | Bin 2230 -> 8477 bytes
 .../Windows/tinted_window.rsi/twindow4.png    | Bin 2236 -> 8217 bytes
 .../Windows/tinted_window.rsi/twindow5.png    | Bin 2336 -> 6896 bytes
 .../Windows/tinted_window.rsi/twindow6.png    | Bin 2236 -> 8464 bytes
 .../Windows/tinted_window.rsi/twindow7.png    | Bin 1915 -> 4882 bytes
 .../Windows/uranium_window.rsi/full.png       | Bin 432 -> 1321 bytes
 .../Windows/uranium_window.rsi/meta.json      |  90 ++++-----
 .../Windows/uranium_window.rsi/uwindow0.png   | Bin 773 -> 1688 bytes
 .../Windows/uranium_window.rsi/uwindow1.png   | Bin 739 -> 1225 bytes
 .../Windows/uranium_window.rsi/uwindow2.png   | Bin 773 -> 1688 bytes
 .../Windows/uranium_window.rsi/uwindow3.png   | Bin 739 -> 1225 bytes
 .../Windows/uranium_window.rsi/uwindow4.png   | Bin 739 -> 1216 bytes
 .../Windows/uranium_window.rsi/uwindow5.png   | Bin 664 -> 795 bytes
 .../Windows/uranium_window.rsi/uwindow6.png   | Bin 739 -> 1229 bytes
 .../Windows/uranium_window.rsi/uwindow7.png   | Bin 270 -> 297 bytes
 .../uranium_window_diagonal.rsi/state0.png    | Bin 729 -> 15629 bytes
 .../uranium_window_diagonal.rsi/state1.png    | Bin 703 -> 15604 bytes
 .../Structures/Windows/window.rsi/full.png    | Bin 427 -> 1224 bytes
 .../Structures/Windows/window.rsi/meta.json   |   2 +-
 .../Structures/Windows/window.rsi/window0.png | Bin 714 -> 1632 bytes
 .../Structures/Windows/window.rsi/window1.png | Bin 518 -> 1183 bytes
 .../Structures/Windows/window.rsi/window2.png | Bin 714 -> 1632 bytes
 .../Structures/Windows/window.rsi/window3.png | Bin 518 -> 1183 bytes
 .../Structures/Windows/window.rsi/window4.png | Bin 523 -> 1187 bytes
 .../Structures/Windows/window.rsi/window5.png | Bin 666 -> 800 bytes
 .../Structures/Windows/window.rsi/window6.png | Bin 523 -> 1187 bytes
 .../Structures/Windows/window.rsi/window7.png | Bin 268 -> 301 bytes
 .../Windows/window_diagonal.rsi/state0.png    | Bin 735 -> 15988 bytes
 .../Windows/window_diagonal.rsi/state1.png    | Bin 702 -> 15966 bytes
 Resources/engineCommandPerms.yml              |   1 -
 375 files changed, 562 insertions(+), 1451 deletions(-)
 delete mode 100644 Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs
 delete mode 100644 Content.Server/Bed/Components/SnoringComponent.cs
 delete mode 100644 Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs
 delete mode 100644 Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs
 delete mode 100644 Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl
 delete mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml
 delete mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png
 delete mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png
 delete mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/icon.png
 delete mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png
 delete mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-right.png
 delete mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio.png
 delete mode 100644 Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png
 delete mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-0.png
 delete mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-1.png
 delete mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-2.png
 delete mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-3.png
 delete mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-4.png
 delete mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-5.png

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 737b90563e..83bca6f97b 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,12 +1,6 @@
 {
     "recommendations": [
         "ms-dotnettools.csharp",
-        "editorconfig.editorconfig",
-        "aaron-bond.better-comments",
-        "tamasfe.even-better-toml",
-        "slava0135.robust-yaml",
-        "slevesque.shader",
-        "macabeus.vscode-fluent",
-        "redhat.vscode-yaml"
+        "editorconfig.editorconfig"
     ]
 }
diff --git a/Content.Client/CardboardBox/CardboardBoxSystem.cs b/Content.Client/CardboardBox/CardboardBoxSystem.cs
index 90a21d8e41..50f9de239d 100644
--- a/Content.Client/CardboardBox/CardboardBoxSystem.cs
+++ b/Content.Client/CardboardBox/CardboardBoxSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Shared.CardboardBox;
 using Content.Shared.CardboardBox.Components;
 using Content.Shared.Examine;
@@ -11,7 +11,6 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
-    [Dependency] private readonly ExamineSystemShared _examine = default!;
 
     public override void Initialize()
     {
@@ -56,7 +55,7 @@ private void OnBoxEffect(PlayBoxEffectMessage msg)
         foreach (var mob in mobMoverEntities)
         {
             var mapPos = _transform.GetMapCoordinates(mob);
-            if (!_examine.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null))
+            if (!ExamineSystemShared.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null))
                 continue;
 
             var ent = Spawn(box.Effect, mapPos);
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index e60335bc45..baf0d31f1f 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -93,7 +93,7 @@ public void PopulateProducts()
                 if (search.Length == 0 && _category == null ||
                     search.Length != 0 && prototype.Name.ToLowerInvariant().Contains(search) ||
                     search.Length != 0 && prototype.Description.ToLowerInvariant().Contains(search) ||
-                    search.Length == 0 && _category != null && Loc.GetString(prototype.Category).Equals(_category))
+                    search.Length == 0 && _category != null && prototype.Category.Equals(_category))
                 {
                     var button = new CargoProductRow
                     {
@@ -122,7 +122,7 @@ public void PopulateCategories()
 
             foreach (var prototype in ProductPrototypes)
             {
-                if (!_categoryStrings.Contains(Loc.GetString(prototype.Category)))
+                if (!_categoryStrings.Contains(prototype.Category))
                 {
                     _categoryStrings.Add(Loc.GetString(prototype.Category));
                 }
diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs
index 66000a8457..ae1724c3bf 100644
--- a/Content.Client/Construction/ConstructionSystem.cs
+++ b/Content.Client/Construction/ConstructionSystem.cs
@@ -27,7 +27,6 @@ public sealed class ConstructionSystem : SharedConstructionSystem
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
-        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
 
         private readonly Dictionary<int, EntityUid> _ghosts = new();
@@ -196,7 +195,7 @@ public bool TrySpawnGhost(
                 return false;
 
             // This InRangeUnobstructed should probably be replaced with "is there something blocking us in that tile?"
-            var predicate = GetPredicate(prototype.CanBuildInImpassable, loc.ToMap(EntityManager, _transformSystem));
+            var predicate = GetPredicate(prototype.CanBuildInImpassable, loc.ToMap(EntityManager));
             if (!_interactionSystem.InRangeUnobstructed(user, loc, 20f, predicate: predicate))
                 return false;
 
diff --git a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
index a60619baa3..ae1b3ec3bf 100644
--- a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
+++ b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
@@ -170,7 +170,7 @@ private bool HandleOpenEntityMenu(in PointerInputCmdHandler.PointerInputCmdArgs
             if (_combatMode.IsInCombatMode(args.Session?.AttachedEntity))
                 return false;
 
-            var coords = args.Coordinates.ToMap(_entityManager, _xform);
+            var coords = args.Coordinates.ToMap(_entityManager);
 
             if (_verbSystem.TryGetEntityMenuEntities(coords, out var entities))
                 OpenRootMenu(entities);
diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs
index 6236cd8e95..bdbd69d108 100644
--- a/Content.Client/Gameplay/GameplayStateBase.cs
+++ b/Content.Client/Gameplay/GameplayStateBase.cs
@@ -104,7 +104,7 @@ private bool HandleInspect(ICommonSession? session, EntityCoordinates coords, En
 
         public IEnumerable<EntityUid> GetClickableEntities(EntityCoordinates coordinates)
         {
-            return GetClickableEntities(coordinates.ToMap(_entityManager, _entitySystemManager.GetEntitySystem<SharedTransformSystem>()));
+            return GetClickableEntities(coordinates.ToMap(_entityManager));
         }
 
         public IEnumerable<EntityUid> GetClickableEntities(MapCoordinates coordinates)
diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs
index 7bf3df1f0b..548edd601c 100644
--- a/Content.Client/NPC/PathfindingSystem.cs
+++ b/Content.Client/NPC/PathfindingSystem.cs
@@ -23,7 +23,6 @@ public sealed class PathfindingSystem : SharedPathfindingSystem
         [Dependency] private readonly IResourceCache _cache = default!;
         [Dependency] private readonly NPCSteeringSystem _steering = default!;
         [Dependency] private readonly MapSystem _mapSystem = default!;
-        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
         public PathfindingDebugMode Modes
         {
@@ -40,7 +39,7 @@ public PathfindingDebugMode Modes
                 }
                 else if (!overlayManager.HasOverlay<PathfindingOverlay>())
                 {
-                    overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem, _transformSystem));
+                    overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem));
                 }
 
                 if ((value & PathfindingDebugMode.Steering) != 0x0)
@@ -141,7 +140,6 @@ public sealed class PathfindingOverlay : Overlay
         private readonly IMapManager _mapManager;
         private readonly PathfindingSystem _system;
         private readonly MapSystem _mapSystem;
-        private readonly SharedTransformSystem _transformSystem;
 
         public override OverlaySpace Space => OverlaySpace.ScreenSpace | OverlaySpace.WorldSpace;
 
@@ -155,8 +153,7 @@ public PathfindingOverlay(
             IMapManager mapManager,
             IResourceCache cache,
             PathfindingSystem system,
-            MapSystem mapSystem,
-            SharedTransformSystem transformSystem)
+            MapSystem mapSystem)
         {
             _entManager = entManager;
             _eyeManager = eyeManager;
@@ -164,7 +161,6 @@ public PathfindingOverlay(
             _mapManager = mapManager;
             _system = system;
             _mapSystem = mapSystem;
-            _transformSystem = transformSystem;
             _font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
         }
 
@@ -484,7 +480,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
                                     if (neighborPoly.NetEntity != poly.GraphUid)
                                     {
                                         color = Color.Green;
-                                        var neighborMap = _entManager.GetCoordinates(neighborPoly).ToMap(_entManager, _transformSystem);
+                                        var neighborMap = _entManager.GetCoordinates(neighborPoly).ToMap(_entManager);
 
                                         if (neighborMap.MapId != args.MapId)
                                             continue;
diff --git a/Content.Client/Popups/PopupOverlay.cs b/Content.Client/Popups/PopupOverlay.cs
index fb6bb3bf56..1305d8bb94 100644
--- a/Content.Client/Popups/PopupOverlay.cs
+++ b/Content.Client/Popups/PopupOverlay.cs
@@ -21,8 +21,7 @@ public sealed class PopupOverlay : Overlay
     private readonly IUserInterfaceManager _uiManager;
     private readonly PopupSystem _popup;
     private readonly PopupUIController _controller;
-    private readonly ExamineSystemShared _examine;
-    private readonly SharedTransformSystem _transform;
+
     private readonly ShaderInstance _shader;
 
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
@@ -34,16 +33,12 @@ public PopupOverlay(
         IPrototypeManager protoManager,
         IUserInterfaceManager uiManager,
         PopupUIController controller,
-        ExamineSystemShared examine,
-        SharedTransformSystem transform,
         PopupSystem popup)
     {
         _configManager = configManager;
         _entManager = entManager;
         _playerMgr = playerMgr;
         _uiManager = uiManager;
-        _examine = examine;
-        _transform = transform;
         _popup = popup;
         _controller = controller;
 
@@ -78,7 +73,7 @@ private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, fl
 
         foreach (var popup in _popup.WorldLabels)
         {
-            var mapPos = popup.InitialPos.ToMap(_entManager, _transform);
+            var mapPos = popup.InitialPos.ToMap(_entManager);
 
             if (mapPos.MapId != args.MapId)
                 continue;
@@ -86,7 +81,7 @@ private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, fl
             var distance = (mapPos.Position - args.WorldBounds.Center).Length();
 
             // Should handle fade here too wyci.
-            if (!args.WorldBounds.Contains(mapPos.Position) || !_examine.InRangeUnOccluded(viewPos, mapPos, distance,
+            if (!args.WorldBounds.Contains(mapPos.Position) || !ExamineSystemShared.InRangeUnOccluded(viewPos, mapPos, distance,
                     e => e == popup.InitialPos.EntityId || e == ourEntity, entMan: _entManager))
                 continue;
 
diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index 479fb02906..cf96c41241 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Content.Shared.Examine;
 using Content.Shared.GameTicking;
 using Content.Shared.Popups;
 using Robust.Client.Graphics;
@@ -27,8 +26,6 @@ public sealed class PopupSystem : SharedPopupSystem
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
         [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
-        [Dependency] private readonly ExamineSystemShared _examine = default!;
-        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         public IReadOnlyList<WorldPopupLabel> WorldLabels => _aliveWorldLabels;
         public IReadOnlyList<CursorPopupLabel> CursorLabels => _aliveCursorLabels;
@@ -54,8 +51,6 @@ public override void Initialize()
                     _prototype,
                     _uiManager,
                     _uiManager.GetUIController<PopupUIController>(),
-                    _examine,
-                    _transform,
                     this));
         }
 
diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
index 9012767ef3..adc535b268 100644
--- a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
+++ b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
@@ -121,10 +121,7 @@ private void RadiationQuery(IEye? currentEye)
 
         private bool PulseQualifies(EntityUid pulseEntity, MapCoordinates currentEyeLoc)
         {
-            var transformComponent = _entityManager.GetComponent<TransformComponent>(pulseEntity);
-            var transformSystem = _entityManager.System<SharedTransformSystem>();
-            return transformComponent.MapID == currentEyeLoc.MapId
-                && transformComponent.Coordinates.InRange(_entityManager, transformSystem, EntityCoordinates.FromMap(transformComponent.ParentUid, currentEyeLoc, transformSystem, _entityManager), MaxDist);
+            return _entityManager.GetComponent<TransformComponent>(pulseEntity).MapID == currentEyeLoc.MapId && _entityManager.GetComponent<TransformComponent>(pulseEntity).Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, _entityManager.GetComponent<TransformComponent>(pulseEntity).ParentUid, currentEyeLoc), MaxDist);
         }
 
         private sealed record RadiationShaderInstance(MapCoordinates CurrentMapCoords, float Range, TimeSpan Start, float Duration)
diff --git a/Content.Client/Sandbox/SandboxSystem.cs b/Content.Client/Sandbox/SandboxSystem.cs
index 6a1129bb75..d16751e371 100644
--- a/Content.Client/Sandbox/SandboxSystem.cs
+++ b/Content.Client/Sandbox/SandboxSystem.cs
@@ -16,7 +16,6 @@ public sealed class SandboxSystem : SharedSandboxSystem
         [Dependency] private readonly IMapManager _map = default!;
         [Dependency] private readonly IPlacementManager _placement = default!;
         [Dependency] private readonly ContentEyeSystem _contentEye = default!;
-        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         private bool _sandboxEnabled;
         public bool SandboxAllowed { get; private set; }
@@ -109,7 +108,7 @@ public bool Copy(ICommonSession? session, EntityCoordinates coords, EntityUid ui
             }
 
             // Try copy tile.
-            if (!_map.TryFindGridAt(coords.ToMap(EntityManager, _transform), out _, out var grid) || !grid.TryGetTileRef(coords, out var tileRef))
+            if (!_map.TryFindGridAt(coords.ToMap(EntityManager), out _, out var grid) || !grid.TryGetTileRef(coords, out var tileRef))
                 return false;
 
             if (_placement.Eraser)
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 57b22e3f33..79c1909eba 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -626,7 +626,7 @@ private void UpdateQueuedSpeechBubbles(FrameEventArgs delta)
 
             var otherPos = EntityManager.GetComponent<TransformComponent>(ent).MapPosition;
 
-            if (occluded && !_examine.InRangeUnOccluded(
+            if (occluded && !ExamineSystemShared.InRangeUnOccluded(
                     playerPos,
                     otherPos, 0f,
                     (ent, player), predicate))
diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
index 77f46a3fc9..329a8977a6 100644
--- a/Content.Client/Verbs/VerbSystem.cs
+++ b/Content.Client/Verbs/VerbSystem.cs
@@ -20,7 +20,7 @@ namespace Content.Client.Verbs
     public sealed class VerbSystem : SharedVerbSystem
     {
         [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly ExamineSystem _examine = default!;
+        [Dependency] private readonly ExamineSystem _examineSystem = default!;
         [Dependency] private readonly TagSystem _tagSystem = default!;
         [Dependency] private readonly IStateManager _stateManager = default!;
         [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
@@ -77,7 +77,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
                 bool Predicate(EntityUid e) => e == player || entitiesUnderMouse.Contains(e);
 
                 // first check the general location.
-                if (!_examine.CanExamine(player.Value, targetPos, Predicate))
+                if (!_examineSystem.CanExamine(player.Value, targetPos, Predicate))
                     return false;
 
                 TryComp(player.Value, out ExaminerComponent? examiner);
@@ -86,7 +86,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
                 entities = new();
                 foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize))
                 {
-                    if (_examine.CanExamine(player.Value, targetPos, Predicate, ent, examiner))
+                    if (_examineSystem.CanExamine(player.Value, targetPos, Predicate, ent, examiner))
                         entities.Add(ent);
                 }
             }
@@ -147,7 +147,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
                 {
                     var entity = entities[i];
 
-                    if (!_examine.InRangeUnOccluded(
+                    if (!ExamineSystemShared.InRangeUnOccluded(
                         playerPos,
                         xformQuery.GetComponent(entity).MapPosition,
                         ExamineSystemShared.ExamineRange,
diff --git a/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs b/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs
deleted file mode 100644
index 920dc08818..0000000000
--- a/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using Content.Server.Doors;
-using Content.Server.Power;
-using Content.Server.Wires;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-
-namespace Content.IntegrationTests.Tests.Wires;
-
-[TestFixture]
-[Parallelizable(ParallelScope.All)]
-[TestOf(typeof(WiresSystem))]
-public sealed class WireLayoutTest
-{
-    [TestPrototypes]
-    public const string Prototypes = """
-        - type: wireLayout
-          id: WireLayoutTest
-          dummyWires: 2
-          wires:
-          - !type:PowerWireAction
-          - !type:DoorBoltWireAction
-
-        - type: wireLayout
-          id: WireLayoutTest2
-          parent: WireLayoutTest
-          wires:
-          - !type:PowerWireAction
-
-        - type: wireLayout
-          id: WireLayoutTest3
-          parent: WireLayoutTest
-
-        - type: entity
-          id: WireLayoutTest
-          components:
-          - type: Wires
-            layoutId: WireLayoutTest
-
-        - type: entity
-          id: WireLayoutTest2
-          components:
-          - type: Wires
-            layoutId: WireLayoutTest2
-
-        - type: entity
-          id: WireLayoutTest3
-          components:
-          - type: Wires
-            layoutId: WireLayoutTest3
-        """;
-
-    [Test]
-    public async Task TestLayoutInheritance()
-    {
-        await using var pair = await PoolManager.GetServerClient();
-        var server = pair.Server;
-        var testMap = await pair.CreateTestMap();
-
-        await server.WaitAssertion(() =>
-        {
-            var wires = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<WiresSystem>();
-
-            // Need to spawn these entities to make sure the wire layouts are initialized.
-            var ent1 = SpawnWithComp<WiresComponent>(server.EntMan, "WireLayoutTest", testMap.MapCoords);
-            var ent2 = SpawnWithComp<WiresComponent>(server.EntMan, "WireLayoutTest2", testMap.MapCoords);
-            var ent3 = SpawnWithComp<WiresComponent>(server.EntMan, "WireLayoutTest3", testMap.MapCoords);
-
-            // Assert.That(wires.TryGetLayout("WireLayoutTest", out var layout1));
-            // Assert.That(wires.TryGetLayout("WireLayoutTest2", out var layout2));
-            // Assert.That(wires.TryGetLayout("WireLayoutTest3", out var layout3));
-
-            Assert.Multiple(() =>
-            {
-                // Entity 1.
-                Assert.That(ent1.Comp.WiresList, Has.Count.EqualTo(4));
-                Assert.That(ent1.Comp.WiresList, Has.Exactly(2).With.Property("Action").Null, "2 dummy wires");
-                Assert.That(ent1.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<PowerWireAction>(), "1 power wire");
-                Assert.That(ent1.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<DoorBoltWireAction>(), "1 door bolt wire");
-
-                Assert.That(ent2.Comp.WiresList, Has.Count.EqualTo(5));
-                Assert.That(ent2.Comp.WiresList, Has.Exactly(2).With.Property("Action").Null, "2 dummy wires");
-                Assert.That(ent2.Comp.WiresList, Has.Exactly(2).With.Property("Action").InstanceOf<PowerWireAction>(), "2 power wire");
-                Assert.That(ent2.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<DoorBoltWireAction>(), "1 door bolt wire");
-
-                Assert.That(ent3.Comp.WiresList, Has.Count.EqualTo(4));
-                Assert.That(ent3.Comp.WiresList, Has.Exactly(2).With.Property("Action").Null, "2 dummy wires");
-                Assert.That(ent3.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<PowerWireAction>(), "1 power wire");
-                Assert.That(ent3.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<DoorBoltWireAction>(), "1 door bolt wire");
-            });
-        });
-
-        await pair.CleanReturnAsync();
-    }
-
-    private static Entity<T> SpawnWithComp<T>(IEntityManager entityManager, string prototype, MapCoordinates coords)
-        where T : IComponent, new()
-    {
-        var ent = entityManager.Spawn(prototype, coords);
-        var comp = entityManager.EnsureComponent<T>(ent);
-        return new Entity<T>(ent, comp);
-    }
-}
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 9d66338c8b..c68336deab 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -718,21 +718,9 @@ private void AddTricksVerbs(GetVerbsEvent<Verb> args)
                 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, "Set Bullet Amount", $"Amount (max {ballisticAmmo.Capacity}):", (int amount) =>
                     {
-                        if (!int.TryParse(amount, out var result))
-                            return;
-
-                        if (result > 0)
-                        {
-                            ballisticAmmo.UnspawnedCount = result;
-                        }
-                        else
-                        {
-                            ballisticAmmo.UnspawnedCount = 0;
-                        }
-
-                        _gun.UpdateBallisticAppearance(args.Target, ballisticAmmo);
+                        ballisticAmmo.UnspawnedCount = amount;
                     });
                 },
                 Impact = LogImpact.Medium,
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index f5b237b449..c4754af934 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -66,7 +66,6 @@ public sealed partial class AdminVerbSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly StationSystem _stations = default!;
         [Dependency] private readonly StationSpawningSystem _spawning = default!;
-        [Dependency] private readonly ExamineSystemShared _examine = default!;
 
         private readonly Dictionary<ICommonSession, List<EditSolutionsEui>> _openSolutionUis = new();
 
@@ -417,7 +416,7 @@ private void AddDebugVerbs(GetVerbsEvent<Verb> args)
                     Act = () =>
                     {
 
-                        var message = _examine.InRangeUnOccluded(args.User, args.Target)
+                        var message = ExamineSystemShared.InRangeUnOccluded(args.User, args.Target)
                             ? Loc.GetString("in-range-unoccluded-verb-on-activate-not-occluded")
                             : Loc.GetString("in-range-unoccluded-verb-on-activate-occluded");
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
index cb50ff114e..77b5bf18af 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
@@ -236,7 +236,7 @@ public void ExperiencePressureDifference(
                     // TODO: Technically these directions won't be correct but uhh I'm just here for optimisations buddy not to fix my old bugs.
                     if (throwTarget != EntityCoordinates.Invalid)
                     {
-                        var pos = ((throwTarget.ToMap(EntityManager, _transformSystem).Position - xform.WorldPosition).Normalized() + dirVec).Normalized();
+                        var pos = ((throwTarget.ToMap(EntityManager).Position - xform.WorldPosition).Normalized() + dirVec).Normalized();
                         _physics.ApplyLinearImpulse(uid, pos * moveForce, body: physics);
                     }
                     else
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
index dcbc1e86ee..f156125b0f 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
@@ -661,7 +661,7 @@ private void AdjustEqMovement(TileAtmosphere tile, AtmosDirection direction, flo
             // Turns out: no they don't. Temporary debug checks to figure out which caller is causing problems:
             if (tile == null)
             {
-                Log.Error($"Encountered null-tile in {nameof(AdjustEqMovement)}. Trace: {Environment.StackTrace}");
+                Logger.Error($"Encountered null-tile in {nameof(AdjustEqMovement)}. Trace: {Environment.StackTrace}");
                 return;
             }
             var adj = tile.AdjacentTiles[direction.ToIndex()];
diff --git a/Content.Server/Bed/Components/SnoringComponent.cs b/Content.Server/Bed/Components/SnoringComponent.cs
deleted file mode 100644
index 09f80327ba..0000000000
--- a/Content.Server/Bed/Components/SnoringComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Server.Bed.Sleep;
-
-/// <summary>
-/// This is used for the snoring trait.
-/// </summary>
-[RegisterComponent]
-public sealed partial class SnoringComponent : Component
-{
-
-}
diff --git a/Content.Server/Bed/Sleep/SleepingSystem.cs b/Content.Server/Bed/Sleep/SleepingSystem.cs
index b497254433..685b1087d7 100644
--- a/Content.Server/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Server/Bed/Sleep/SleepingSystem.cs
@@ -67,10 +67,7 @@ private void OnSleepStateChanged(EntityUid uid, MobStateComponent component, Sle
                 if (TryComp<SleepEmitSoundComponent>(uid, out var sleepSound))
                 {
                     var emitSound = EnsureComp<SpamEmitSoundComponent>(uid);
-                    if (HasComp<SnoringComponent>(uid))
-                    {
-                        emitSound.Sound = sleepSound.Snore;
-                    }
+                    emitSound.Sound = sleepSound.Snore;
                     emitSound.PlayChance = sleepSound.Chance;
                     emitSound.RollInterval = sleepSound.Interval;
                     emitSound.PopUp = sleepSound.PopUp;
diff --git a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
index c923738930..761e9456bc 100644
--- a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
+++ b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
@@ -39,7 +39,7 @@ private void OnClientTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs
         var uid = args.SenderSession.AttachedEntity;
         if (!Exists(uid))
         {
-            Log.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity.");
+            Logger.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity.");
             return;
         }
 
diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
index 1415b6cad3..7d3f70bc0d 100644
--- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
@@ -22,8 +22,8 @@ namespace Content.Server.Chemistry.EntitySystems
     [UsedImplicitly]
     internal sealed class VaporSystem : EntitySystem
     {
+        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IPrototypeManager _protoManager = default!;
-        [Dependency] private readonly SharedMapSystem _map = default!;
         [Dependency] private readonly SharedPhysicsSystem _physics = default!;
         [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
         [Dependency] private readonly ThrowingSystem _throwing = default!;
@@ -115,7 +115,7 @@ private void Update(float frameTime, Entity<VaporComponent> ent, Entity<Solution
             {
                 vapor.ReactTimer = 0;
 
-                var tile = _map.GetTileRef(xform.GridUid.Value, gridComp, xform.Coordinates);
+                var tile = gridComp.GetTileRef(xform.Coordinates.ToVector2i(EntityManager, _mapManager));
                 foreach (var reagentQuantity in contents.Contents.ToArray())
                 {
                     if (reagentQuantity.Quantity == FixedPoint2.Zero) continue;
diff --git a/Content.Server/Construction/Conditions/ComponentInTile.cs b/Content.Server/Construction/Conditions/ComponentInTile.cs
index 429c4fdabf..36705e4c0e 100644
--- a/Content.Server/Construction/Conditions/ComponentInTile.cs
+++ b/Content.Server/Construction/Conditions/ComponentInTile.cs
@@ -47,8 +47,7 @@ public bool Condition(EntityUid uid, IEntityManager entityManager)
             if (transform.GridUid == null)
                 return false;
 
-            var transformSys = entityManager.System<SharedTransformSystem>();
-            var indices = transform.Coordinates.ToVector2i(entityManager, IoCManager.Resolve<IMapManager>(), transformSys);
+            var indices = transform.Coordinates.ToVector2i(entityManager, IoCManager.Resolve<IMapManager>());
             var lookup = entityManager.EntitySysManager.GetEntitySystem<EntityLookupSystem>();
 
 
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index 39705fc197..e0bdf09629 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Construction.Components;
+using Content.Server.Storage.EntitySystems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Construction;
 using Content.Shared.Construction.Prototypes;
@@ -14,6 +15,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
 using Content.Shared.Storage;
+using Content.Shared.Tag;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
@@ -28,7 +30,8 @@ public sealed partial class ConstructionSystem
         [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
-        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+        [Dependency] private readonly StorageSystem _storageSystem = default!;
+        [Dependency] private readonly TagSystem _tagSystem = default!;
 
         // --- WARNING! LEGACY CODE AHEAD! ---
         // This entire file contains the legacy code for initial construction.
@@ -463,7 +466,7 @@ void Cleanup()
                 return;
             }
 
-            var mapPos = location.ToMap(EntityManager, _transformSystem);
+            var mapPos = location.ToMap(EntityManager);
             var predicate = GetPredicate(constructionPrototype.CanBuildInImpassable, mapPos);
 
             if (!_interactionSystem.InRangeUnobstructed(user, mapPos, predicate: predicate))
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs
deleted file mode 100644
index 3d3820562d..0000000000
--- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Server.DeviceNetwork.Components;
-using Content.Shared.DeviceNetwork.Components;
-using Robust.Server.GameObjects;
-
-namespace Content.Server.DeviceNetwork.Systems;
-
-public sealed class DeviceNetworkJammerSystem : EntitySystem
-{
-    [Dependency] private TransformSystem _transform = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<TransformComponent, BeforePacketSentEvent>(BeforePacketSent);
-    }
-
-    private void BeforePacketSent(EntityUid uid, TransformComponent xform, BeforePacketSentEvent ev)
-    {
-        if (ev.Cancelled)
-            return;
-
-        var query = EntityQueryEnumerator<DeviceNetworkJammerComponent, TransformComponent>();
-
-        while (query.MoveNext(out _, out var jammerComp, out var jammerXform))
-        {
-            if (!jammerComp.JammableNetworks.Contains(ev.NetworkId))
-                continue;
-
-            if (jammerXform.Coordinates.InRange(EntityManager, _transform, ev.SenderTransform.Coordinates, jammerComp.Range)
-                || jammerXform.Coordinates.InRange(EntityManager, _transform, xform.Coordinates, jammerComp.Range))
-            {
-                ev.Cancel();
-                return;
-            }
-        }
-    }
-
-}
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
index 20ee7a5dd1..83967c9bbd 100644
--- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
@@ -351,14 +351,13 @@ private void SendToConnections(ReadOnlySpan<DeviceNetworkComponent> connections,
 
             var xform = Transform(packet.Sender);
 
-            var senderPos = _transformSystem.GetWorldPosition(xform);
+            BeforePacketSentEvent beforeEv = new(packet.Sender, xform, _transformSystem.GetWorldPosition(xform));
 
             foreach (var connection in connections)
             {
                 if (connection.Owner == packet.Sender)
                     continue;
 
-                BeforePacketSentEvent beforeEv = new(packet.Sender, xform, senderPos, connection.NetIdEnum.ToString());
                 RaiseLocalEvent(connection.Owner, beforeEv, false);
 
                 if (!beforeEv.Cancelled)
@@ -387,17 +386,11 @@ public sealed class BeforePacketSentEvent : CancellableEntityEventArgs
         /// </summary>
         public readonly Vector2 SenderPosition;
 
-        /// <summary>
-        /// The network the packet will be sent to.
-        /// </summary>
-        public readonly string NetworkId;
-
-        public BeforePacketSentEvent(EntityUid sender, TransformComponent xform, Vector2 senderPosition, string networkId)
+        public BeforePacketSentEvent(EntityUid sender, TransformComponent xform, Vector2 senderPosition)
         {
             Sender = sender;
             SenderTransform = xform;
             SenderPosition = senderPosition;
-            NetworkId = networkId;
         }
     }
 
diff --git a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
index cdc083feac..fd62514d00 100644
--- a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
-using Content.Server.DeviceNetwork.Components;
+using Content.Server.DeviceNetwork.Components;
 using Content.Server.Medical.CrewMonitoring;
 using Content.Server.Power.Components;
 using Content.Server.Station.Systems;
@@ -39,7 +38,7 @@ public bool IsActiveServer(EntityUid serverId, SingletonDeviceNetServerComponent
     /// <param name="address">The address of the active server if it exists</param>
     /// <typeparam name="TComp">The component type that determines what type of server you're getting the address of</typeparam>
     /// <returns>True if there is an active serve. False otherwise</returns>
-    public bool TryGetActiveServerAddress<TComp>(EntityUid stationId, [NotNullWhen(true)] out string? address) where TComp : IComponent
+    public bool TryGetActiveServerAddress<TComp>(EntityUid stationId, out string? address) where TComp : IComponent
     {
         var servers = EntityQueryEnumerator<
             SingletonDeviceNetServerComponent,
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 6400472d03..93d6bc8db0 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -28,7 +28,6 @@ public sealed partial class DragonSystem : EntitySystem
     [Dependency] private readonly RoleSystem _role = default!;
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     private EntityQuery<CarpRiftsConditionComponent> _objQuery;
 
@@ -147,7 +146,7 @@ private void OnSpawnRift(EntityUid uid, DragonComponent component, DragonSpawnRi
         // cant stack rifts near eachother
         foreach (var (_, riftXform) in EntityQuery<DragonRiftComponent, TransformComponent>(true))
         {
-            if (riftXform.Coordinates.InRange(EntityManager, _transform, xform.Coordinates, RiftRange))
+            if (riftXform.Coordinates.InRange(EntityManager, xform.Coordinates, RiftRange))
             {
                 _popup.PopupEntity(Loc.GetString("carp-rift-proximity", ("proximity", RiftRange)), uid, uid);
                 return;
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 6351d999a9..1a5a5c4011 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -331,7 +331,7 @@ public void QueueExplosion(MapCoordinates epicenter,
         CameraShake(iterationIntensity.Count * 4f, epicenter, totalIntensity);
 
         //For whatever bloody reason, sound system requires ENTITY coordinates.
-        var mapEntityCoords = EntityCoordinates.FromMap(_mapManager.GetMapEntityId(epicenter.MapId), epicenter, _transformSystem, EntityManager);
+        var mapEntityCoords = EntityCoordinates.FromMap(EntityManager, _mapManager.GetMapEntityId(epicenter.MapId), epicenter);
 
         // play sound.
         // for the normal audio, we want everyone in pvs range
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index bf69b4b909..54587e95be 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -394,7 +394,7 @@ public EntityCoordinates GetObserverSpawnPoint()
                 // Ideally engine would just spawn them on grid directly I guess? Right now grid traversal is handling it during
                 // update which means we need to add a hack somewhere around it.
                 var spawn = _robustRandom.Pick(_possiblePositions);
-                var toMap = spawn.ToMap(EntityManager, _transform);
+                var toMap = spawn.ToMap(EntityManager);
 
                 if (_mapManager.TryFindGridAt(toMap, out var gridUid, out _))
                 {
diff --git a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
index 98926536b9..f83d719c21 100644
--- a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
@@ -201,7 +201,7 @@ private void OnPlayerSpawningEvent(RulePlayerSpawningEvent ev)
 
             if (!gridId.HasValue)
             {
-                Log.Error($"Gridid was null when loading \"{map}\", aborting.");
+                Logger.ErrorS("pirates", $"Gridid was null when loading \"{map}\", aborting.");
                 foreach (var session in ops)
                 {
                     ev.PlayerPool.Add(session);
@@ -230,7 +230,7 @@ private void OnPlayerSpawningEvent(RulePlayerSpawningEvent ev)
             if (spawns.Count == 0)
             {
                 spawns.Add(Transform(pirates.PirateShip).Coordinates);
-                Log.Warning($"Fell back to default spawn for pirates!");
+                Logger.WarningS("pirates", $"Fell back to default spawn for pirates!");
             }
 
             for (var i = 0; i < ops.Length; i++)
diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs
index d3a717c74a..627c336a36 100644
--- a/Content.Server/Guardian/GuardianSystem.cs
+++ b/Content.Server/Guardian/GuardianSystem.cs
@@ -34,7 +34,6 @@ public sealed class GuardianSystem : EntitySystem
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly BodySystem _bodySystem = default!;
         [Dependency] private readonly SharedContainerSystem _container = default!;
-        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         public override void Initialize()
         {
@@ -329,7 +328,7 @@ private void CheckGuardianMove(
             if (!guardianComponent.GuardianLoose)
                 return;
 
-            if (!guardianXform.Coordinates.InRange(EntityManager, _transform, hostXform.Coordinates, guardianComponent.DistanceAllowed))
+            if (!guardianXform.Coordinates.InRange(EntityManager, hostXform.Coordinates, guardianComponent.DistanceAllowed))
                 RetractGuardian(hostUid, hostComponent, guardianUid, guardianComponent);
         }
 
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index a0e872dbeb..a783a9e096 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -31,7 +31,6 @@ public sealed class HandsSystem : SharedHandsSystem
         [Dependency] private readonly VirtualItemSystem _virtualItemSystem = default!;
         [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
-        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly PullingSystem _pullingSystem = default!;
         [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
 
@@ -192,7 +191,7 @@ hands.ActiveHandEntity is not { } throwEnt ||
                 throwEnt = splitStack.Value;
             }
 
-            var direction = coordinates.ToMapPos(EntityManager, _transformSystem) - Transform(player).WorldPosition;
+            var direction = coordinates.ToMapPos(EntityManager) - Transform(player).WorldPosition;
             if (direction == Vector2.Zero)
                 return true;
 
diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs
index 8eb2741448..ac415a0434 100644
--- a/Content.Server/Implants/SubdermalImplantSystem.cs
+++ b/Content.Server/Implants/SubdermalImplantSystem.cs
@@ -99,7 +99,7 @@ private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component,
             return;
 
         var xform = Transform(ent);
-        var entityCoords = xform.Coordinates.ToMap(EntityManager, _xform);
+        var entityCoords = xform.Coordinates.ToMap(EntityManager);
 
         // try to find a valid position to teleport to, teleport to whatever works if we can't
         var targetCoords = new MapCoordinates();
diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs
index 92cd794ce2..2c9b11dbd3 100644
--- a/Content.Server/Magic/MagicSystem.cs
+++ b/Content.Server/Magic/MagicSystem.cs
@@ -168,7 +168,7 @@ private void OnProjectileSpell(ProjectileSpellEvent ev)
         foreach (var pos in GetSpawnPositions(xform, ev.Pos))
         {
             // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
-            var mapPos = pos.ToMap(EntityManager, _transformSystem);
+            var mapPos = pos.ToMap(EntityManager);
             var spawnCoords = _mapManager.TryFindGridAt(mapPos, out var gridUid, out _)
                 ? pos.WithEntityId(gridUid, EntityManager)
                 : new(_mapManager.GetMapEntityId(mapPos.MapId), mapPos.Position);
diff --git a/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs
index 3485bd2a18..3e030aa819 100644
--- a/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs
@@ -22,6 +22,6 @@ public override bool IsMet(NPCBlackboard blackboard)
         if (!blackboard.TryGetValue<EntityCoordinates>(TargetKey, out var target, _entManager))
             return false;
 
-        return coordinates.InRange(_entManager, _entManager.System<SharedTransformSystem>(), target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
+        return coordinates.InRange(_entManager, target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
     }
 }
diff --git a/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs
index 9d000ca2eb..6d8977bb7a 100644
--- a/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs
@@ -22,7 +22,7 @@ public override bool IsMet(NPCBlackboard blackboard)
         if (!blackboard.TryGetValue<EntityCoordinates>(TargetKey, out var target, _entManager))
             return false;
 
-        return !coordinates.InRange(_entManager, _entManager.System<SharedTransformSystem>(), target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
+        return !coordinates.InRange(_entManager, target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
     }
 }
 
diff --git a/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs
index aaccb426d7..5d616ba630 100644
--- a/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs
@@ -23,6 +23,6 @@ public override bool IsMet(NPCBlackboard blackboard)
             !_entManager.TryGetComponent<TransformComponent>(target, out var targetXform))
             return false;
 
-        return coordinates.InRange(_entManager, _entManager.System<SharedTransformSystem>(), targetXform.Coordinates, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
+        return coordinates.InRange(_entManager, targetXform.Coordinates, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
     }
 }
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
index a59af88ff5..95f931cdd6 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
@@ -405,7 +405,7 @@ public async void GetPathEvent(
                 return null;
             }
 
-            var localPos = xform.InvWorldMatrix.Transform(coordinates.ToMapPos(EntityManager, _transform));
+            var localPos = xform.InvWorldMatrix.Transform(coordinates.ToMapPos(EntityManager));
             var origin = GetOrigin(localPos);
 
             if (!TryGetChunk(origin, comp, out var chunk))
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
index e7af2c9107..7ac6768e35 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
@@ -56,30 +56,7 @@ private bool IsFreeSpace(
             return true;
         }
 
-        // TODO: Ideally for "FreeSpace" we check all entities on the tile and build flags dynamically (pathfinder refactor in future).
-        var ents = _entSetPool.Get();
-        _lookup.GetLocalEntitiesIntersecting(node.GraphUid, node.ChunkOrigin, ents, flags: LookupFlags.Static);
-        var result = true;
-
-        if (ents.Count > 0)
-        {
-            var fixtures = _fixturesQuery.GetComponent(uid);
-            var physics = _physicsQuery.GetComponent(uid);
-
-            foreach (var intersecting in ents)
-            {
-                if (!_physics.IsCurrentlyHardCollidable((uid, fixtures, physics), intersecting))
-                {
-                    continue;
-                }
-
-                result = false;
-                break;
-            }
-        }
-
-        _entSetPool.Return(ents);
-        return result;
+        return false;
     }
 
     /// <summary>
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 33941be929..fc483f68c3 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -43,7 +43,6 @@ public sealed class NPCUtilitySystem : EntitySystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SolutionContainerSystem _solutions = default!;
     [Dependency] private readonly WeldableSystem _weldable = default!;
-    [Dependency] private readonly ExamineSystemShared _examine = default!;
 
     private EntityQuery<PuddleComponent> _puddleQuery;
     private EntityQuery<TransformComponent> _xformQuery;
@@ -297,7 +296,7 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
             {
                 var radius = blackboard.GetValueOrDefault<float>(NPCBlackboard.VisionRadius, EntityManager);
 
-                return _examine.InRangeUnOccluded(owner, targetUid, radius + 0.5f, null) ? 1f : 0f;
+                return ExamineSystemShared.InRangeUnOccluded(owner, targetUid, radius + 0.5f, null) ? 1f : 0f;
             }
             case TargetInLOSOrCurrentCon:
             {
@@ -314,7 +313,7 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
                     return 1f;
                 }
 
-                return _examine.InRangeUnOccluded(owner, targetUid, radius + bufferRange, null) ? 1f : 0f;
+                return ExamineSystemShared.InRangeUnOccluded(owner, targetUid, radius + bufferRange, null) ? 1f : 0f;
             }
             case TargetIsAliveCon:
             {
diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
index 9b2e14eff8..a7c455e6a5 100644
--- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -36,9 +36,7 @@ internal sealed class PointingSystem : SharedPointingSystem
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly VisibilitySystem _visibilitySystem = default!;
         [Dependency] private readonly SharedMindSystem _minds = default!;
-        [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly ExamineSystemShared _examine = default!;
 
         private static readonly TimeSpan PointDelay = TimeSpan.FromSeconds(0.5f);
 
@@ -98,11 +96,11 @@ public bool InRange(EntityUid pointer, EntityCoordinates coordinates)
         {
             if (HasComp<GhostComponent>(pointer))
             {
-                return Transform(pointer).Coordinates.InRange(EntityManager, _transform, coordinates, 15);
+                return Transform(pointer).Coordinates.InRange(EntityManager, coordinates, 15);
             }
             else
             {
-                return _examine.InRangeUnOccluded(pointer, coordinates, 15, predicate: e => e == pointer);
+                return ExamineSystemShared.InRangeUnOccluded(pointer, coordinates, 15, predicate: e => e == pointer);
             }
         }
 
@@ -143,7 +141,7 @@ public bool TryPoint(ICommonSession? session, EntityCoordinates coordsPointed, E
                 return false;
             }
 
-            var mapCoordsPointed = coordsPointed.ToMap(EntityManager, _transform);
+            var mapCoordsPointed = coordsPointed.ToMap(EntityManager);
             _rotateToFaceSystem.TryFaceCoordinates(player, mapCoordsPointed.Position);
 
             var arrow = EntityManager.SpawnEntity("PointingArrow", coordsPointed);
@@ -151,7 +149,7 @@ public bool TryPoint(ICommonSession? session, EntityCoordinates coordsPointed, E
             if (TryComp<PointingArrowComponent>(arrow, out var pointing))
             {
                 if (TryComp(player, out TransformComponent? xformPlayer))
-                    pointing.StartPosition = EntityCoordinates.FromMap(arrow, xformPlayer.Coordinates.ToMap(EntityManager, _transform), _transform).Position;
+                    pointing.StartPosition = EntityCoordinates.FromMap(arrow, xformPlayer.Coordinates.ToMap(EntityManager)).Position;
 
                 pointing.EndTime = _gameTiming.CurTime + PointDuration;
 
diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
index 048fda2355..5ed39d5178 100644
--- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
@@ -20,8 +20,6 @@ public sealed class PowerReceiverSystem : EntitySystem
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly AppearanceSystem _appearance = default!;
         [Dependency] private readonly AudioSystem _audio = default!;
-        private EntityQuery<ApcPowerReceiverComponent> _recQuery;
-        private EntityQuery<ApcPowerProviderComponent> _provQuery;
 
         public override void Initialize()
         {
@@ -37,9 +35,6 @@ public override void Initialize()
 
             SubscribeLocalEvent<ApcPowerReceiverComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
             SubscribeLocalEvent<PowerSwitchComponent, GetVerbsEvent<AlternativeVerb>>(AddSwitchPowerVerb);
-
-            _recQuery = GetEntityQuery<ApcPowerReceiverComponent>();
-            _provQuery = GetEntityQuery<ApcPowerProviderComponent>();
         }
 
         private void OnGetVerbs(EntityUid uid, ApcPowerReceiverComponent component, GetVerbsEvent<Verb> args)
@@ -82,7 +77,7 @@ private void OnProviderShutdown(EntityUid uid, ApcPowerProviderComponent compone
         private void OnProviderConnected(Entity<ApcPowerReceiverComponent> receiver, ref ExtensionCableSystem.ProviderConnectedEvent args)
         {
             var providerUid = args.Provider.Owner;
-            if (!_provQuery.TryGetComponent(providerUid, out var provider))
+            if (!EntityManager.TryGetComponent<ApcPowerProviderComponent>(providerUid, out var provider))
                 return;
 
             receiver.Comp.Provider = provider;
@@ -99,7 +94,7 @@ private void OnProviderDisconnected(Entity<ApcPowerReceiverComponent> receiver,
 
         private void OnReceiverConnected(Entity<ApcPowerProviderComponent> provider, ref ExtensionCableSystem.ReceiverConnectedEvent args)
         {
-            if (_recQuery.TryGetComponent(args.Receiver, out var receiver))
+            if (EntityManager.TryGetComponent(args.Receiver, out ApcPowerReceiverComponent? receiver))
             {
                 provider.Comp.AddReceiver(receiver);
             }
@@ -107,7 +102,7 @@ private void OnReceiverConnected(Entity<ApcPowerProviderComponent> provider, ref
 
         private void OnReceiverDisconnected(EntityUid uid, ApcPowerProviderComponent provider, ExtensionCableSystem.ReceiverDisconnectedEvent args)
         {
-            if (_recQuery.TryGetComponent(args.Receiver, out var receiver))
+            if (EntityManager.TryGetComponent(args.Receiver, out ApcPowerReceiverComponent? receiver))
             {
                 provider.RemoveReceiver(receiver);
             }
@@ -121,7 +116,7 @@ private void AddSwitchPowerVerb(EntityUid uid, PowerSwitchComponent component, G
             if (!HasComp<HandsComponent>(args.User))
                 return;
 
-            if (!_recQuery.TryGetComponent(uid, out var receiver))
+            if (!TryComp<ApcPowerReceiverComponent>(uid, out var receiver))
                 return;
 
             if (!receiver.NeedsPower)
@@ -157,7 +152,7 @@ private void ProviderChanged(Entity<ApcPowerReceiverComponent> receiver)
         /// </summary>
         public bool IsPowered(EntityUid uid, ApcPowerReceiverComponent? receiver = null)
         {
-            if (!_recQuery.Resolve(uid, ref receiver, false))
+            if (!Resolve(uid, ref receiver, false))
                 return true;
 
             return receiver.Powered;
@@ -169,7 +164,7 @@ public bool IsPowered(EntityUid uid, ApcPowerReceiverComponent? receiver = null)
         /// </summary>
         public bool TogglePower(EntityUid uid, bool playSwitchSound = true, ApcPowerReceiverComponent? receiver = null, EntityUid? user = null)
         {
-            if (!_recQuery.Resolve(uid, ref receiver, false))
+            if (!Resolve(uid, ref receiver, false))
                 return true;
 
             // it'll save a lot of confusion if 'always powered' means 'always powered'
diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs
index 53e0409af0..fdf02f94df 100644
--- a/Content.Server/Radio/EntitySystems/JammerSystem.cs
+++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs
@@ -1,13 +1,8 @@
-using Content.Server.DeviceNetwork.Components;
-using Content.Server.DeviceNetwork.Systems;
-using Content.Server.Medical.CrewMonitoring;
 using Content.Server.Medical.SuitSensors;
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
 using Content.Server.PowerCell;
 using Content.Server.Radio.Components;
-using Content.Server.Station.Systems;
-using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.PowerCell.Components;
@@ -20,8 +15,6 @@ public sealed class JammerSystem : EntitySystem
     [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly StationSystem _stationSystem = default!;
-    [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!;
 
     public override void Initialize()
     {
@@ -43,7 +36,6 @@ public override void Update(float frameTime)
                 !_battery.TryUseCharge(batteryUid.Value, jam.Wattage * frameTime, battery))
             {
                 RemComp<ActiveRadioJammerComponent>(uid);
-                RemComp<DeviceNetworkJammerComponent>(uid);
             }
         }
     }
@@ -56,19 +48,10 @@ private void OnActivate(EntityUid uid, RadioJammerComponent comp, ActivateInWorl
         if (activated)
         {
             EnsureComp<ActiveRadioJammerComponent>(uid);
-            var stationId = _stationSystem.GetOwningStation(uid);
-            if (stationId != null && _singletonServerSystem.TryGetActiveServerAddress<CrewMonitoringServerComponent>(stationId.Value, out var netId))
-            {
-                EnsureComp<DeviceNetworkJammerComponent>(uid, out var jammingComp);
-                jammingComp.Range = comp.Range;
-                jammingComp.JammableNetworks.Add(netId);
-                Dirty(uid, jammingComp);
-            }
         }
         else
         {
             RemComp<ActiveRadioJammerComponent>(uid);
-            RemComp<DeviceNetworkJammerComponent>(uid);
         }
         var state = Loc.GetString(activated ? "radio-jammer-component-on-state" : "radio-jammer-component-off-state");
         var message = Loc.GetString("radio-jammer-component-on-use", ("state", state));
diff --git a/Content.Server/Remotes/DoorRemoteSystem.cs b/Content.Server/Remotes/DoorRemoteSystem.cs
index d335911901..6403c41add 100644
--- a/Content.Server/Remotes/DoorRemoteSystem.cs
+++ b/Content.Server/Remotes/DoorRemoteSystem.cs
@@ -22,7 +22,6 @@ public sealed class DoorRemoteSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly DoorSystem _doorSystem = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
-        [Dependency] private readonly ExamineSystemShared _examine = default!;
         // I'm so sorry [Dependency] private readonly SharedAirlockSystem _sharedAirlockSystem = default!;
 
         public override void Initialize()
@@ -68,7 +67,7 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo
                 || !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it
                 // Only able to control doors if they are within your vision and within your max range.
                 // Not affected by mobs or machines anymore.
-                || !_examine.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
+                || !ExamineSystemShared.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
             {
                 return;
             }
diff --git a/Content.Server/Respawn/SpecialRespawnSystem.cs b/Content.Server/Respawn/SpecialRespawnSystem.cs
index 2822c94093..51c092be18 100644
--- a/Content.Server/Respawn/SpecialRespawnSystem.cs
+++ b/Content.Server/Respawn/SpecialRespawnSystem.cs
@@ -20,7 +20,6 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
     [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
     [Dependency] private readonly IChatManager _chat = default!;
 
@@ -130,11 +129,11 @@ private void OnTermination(EntityUid uid, SpecialRespawnComponent component, ref
     private void Respawn(EntityUid oldEntity, string prototype, EntityCoordinates coords)
     {
         var entity = Spawn(prototype, coords);
-        _adminLog.Add(LogType.Respawn, LogImpact.High, $"{ToPrettyString(oldEntity)} was deleted and was respawned at {coords.ToMap(EntityManager, _transform)} as {ToPrettyString(entity)}");
+        _adminLog.Add(LogType.Respawn, LogImpact.High, $"{ToPrettyString(oldEntity)} was deleted and was respawned at {coords.ToMap(EntityManager)} as {ToPrettyString(entity)}");
         _chat.SendAdminAlert($"{MetaData(oldEntity).EntityName} was deleted and was respawned as {ToPrettyString(entity)}");
     }
 
-    /// <summary>
+        /// <summary>
     /// Try to find a random safe tile on the supplied grid
     /// </summary>
     /// <param name="targetGrid">The grid that you're looking for a safe tile on</param>
diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
index f1d0af6f90..ce4334391d 100644
--- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
@@ -18,13 +18,13 @@ namespace Content.Server.Singularity.EntitySystems;
 /// </summary>
 public sealed class GravityWellSystem : SharedGravityWellSystem
 {
-    #region Dependencies
+#region Dependencies
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IViewVariablesManager _vvManager = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-    #endregion Dependencies
+#endregion Dependencies
 
     /// <summary>
     /// The minimum range at which gravpulses will act.
@@ -155,7 +155,7 @@ public void GravPulse(EntityUid uid, float maxRange, float minRange, float baseR
     /// <param name="minRange">The minimum distance at which entities can be affected by the gravity pulse.</param>
     /// <param name="baseMatrixDeltaV">The base velocity added to any entities within affected by the gravity pulse scaled by the displacement of those entities from the epicenter.</param>
     public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, in Matrix3 baseMatrixDeltaV)
-        => GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, in baseMatrixDeltaV);
+        => GravPulse(entityPos.ToMap(EntityManager), maxRange, minRange, in baseMatrixDeltaV);
 
     /// <summary>
     /// Greates a gravitational pulse, shoving around all entities within some distance of an epicenter.
@@ -166,7 +166,7 @@ public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRang
     /// <param name="baseRadialDeltaV">The base radial velocity that will be added to entities within range towards the center of the gravitational pulse.</param>
     /// <param name="baseTangentialDeltaV">The base tangential velocity that will be added to entities within countrclockwise around the center of the gravitational pulse.</param>
     public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, float baseRadialDeltaV = 0.0f, float baseTangentialDeltaV = 0.0f)
-        => GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, baseRadialDeltaV, baseTangentialDeltaV);
+        => GravPulse(entityPos.ToMap(EntityManager), maxRange, minRange, baseRadialDeltaV, baseTangentialDeltaV);
 
     /// <summary>
     /// Causes a gravitational pulse, shoving around all entities within some distance of an epicenter.
diff --git a/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs
index bc0de7c8c6..3c44a7fc7a 100644
--- a/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs
@@ -2,7 +2,12 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.Singularity.Components;
 using Content.Shared.Singularity.Components;
+using Content.Shared.Singularity.EntitySystems;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Systems;
 using Robust.Shared.Timing;
 using System.Numerics;
 
@@ -13,8 +18,8 @@ namespace Content.Server.Singularity.EntitySystems;
 /// </summary>
 public sealed class SingularityAttractorSystem : EntitySystem
 {
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     /// <summary>
     /// The minimum range at which the attraction will act.
@@ -64,7 +69,7 @@ private void Update(EntityUid uid, SingularityAttractorComponent? attractor = nu
 
         attractor.LastPulseTime = _timing.CurTime;
 
-        var mapPos = xform.Coordinates.ToMap(EntityManager, _transform);
+        var mapPos = xform.Coordinates.ToMap(EntityManager);
 
         if (mapPos == MapCoordinates.Nullspace)
             return;
@@ -72,7 +77,7 @@ private void Update(EntityUid uid, SingularityAttractorComponent? attractor = nu
         var query = EntityQuery<SingularityComponent, RandomWalkComponent, TransformComponent>();
         foreach (var (singulo, walk, singuloXform) in query)
         {
-            var singuloMapPos = singuloXform.Coordinates.ToMap(EntityManager, _transform);
+            var singuloMapPos = singuloXform.Coordinates.ToMap(EntityManager);
 
             if (singuloMapPos.MapId != mapPos.MapId)
                 continue;
diff --git a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
index 356768769b..9995ed40c1 100644
--- a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
+++ b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
@@ -26,7 +26,6 @@ public sealed class BluespaceLockerSystem : EntitySystem
     [Dependency] private readonly WeldableSystem _weldableSystem = default!;
     [Dependency] private readonly LockSystem _lockSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
 
     public override void Initialize()
@@ -387,7 +386,7 @@ private void DestroyAfterLimit(EntityUid uid, BluespaceLockerComponent component
         switch (component.BehaviorProperties.DestroyType)
         {
             case BluespaceLockerDestroyType.Explode:
-                _explosionSystem.QueueExplosion(uid.ToCoordinates().ToMap(EntityManager, _transformSystem),
+                _explosionSystem.QueueExplosion(uid.ToCoordinates().ToMap(EntityManager),
                     ExplosionSystem.DefaultExplosionPrototypeId, 4, 1, 2, maxTileBreak: 0);
                 goto case BluespaceLockerDestroyType.Delete;
             case BluespaceLockerDestroyType.Delete:
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index 49db980451..281d8f5726 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -5,7 +5,6 @@
 using Content.Server.Stack;
 using Content.Server.Store.Components;
 using Content.Shared.Actions;
-using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands.EntitySystems;
@@ -249,12 +248,10 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
                 HandleRefundComp(uid, component, upgradeActionId.Value);
         }
 
+        //broadcast event
         if (listing.ProductEvent != null)
         {
-            if (!listing.RaiseProductEventOnUser)
-                RaiseLocalEvent(listing.ProductEvent);
-            else
-                RaiseLocalEvent(buyer, listing.ProductEvent);
+            RaiseLocalEvent(listing.ProductEvent);
         }
 
         //log dat shit.
@@ -324,8 +321,6 @@ private void OnRequestRefund(EntityUid uid, StoreComponent component, StoreReque
         if (!component.RefundAllowed || component.BoughtEntities.Count == 0)
             return;
 
-        _admin.Add(LogType.StoreRefund, LogImpact.Low, $"{ToPrettyString(buyer):player} has refunded their purchases from {ToPrettyString(uid):store}");
-
         for (var i = component.BoughtEntities.Count - 1; i >= 0; i--)
         {
             var purchase = component.BoughtEntities[i];
diff --git a/Content.Server/Tabletop/TabletopSystem.Session.cs b/Content.Server/Tabletop/TabletopSystem.Session.cs
index c2bb8426fc..f16f3f01e9 100644
--- a/Content.Server/Tabletop/TabletopSystem.Session.cs
+++ b/Content.Server/Tabletop/TabletopSystem.Session.cs
@@ -31,7 +31,7 @@ public TabletopSession EnsureSession(TabletopGameComponent tabletop)
             // Since this is the first time opening this session, set up the game
             tabletop.Setup.SetupTabletop(session, EntityManager);
 
-            Log.Info($"Created tabletop session number {tabletop} at position {session.Position}.");
+            Logger.Info($"Created tabletop session number {tabletop} at position {session.Position}.");
 
             return session;
         }
diff --git a/Content.Server/Wires/WireLayout.cs b/Content.Server/Wires/WireLayout.cs
index 621992c915..ecafba013e 100644
--- a/Content.Server/Wires/WireLayout.cs
+++ b/Content.Server/Wires/WireLayout.cs
@@ -28,13 +28,11 @@ public sealed partial class WireLayoutPrototype : IPrototype, IInheritingPrototy
     ///     initialization)
     /// </summary>
     [DataField("dummyWires")]
-    [NeverPushInheritance]
     public int DummyWires { get; private set; } = default!;
 
     /// <summary>
     ///     All the valid IWireActions currently in this layout.
     /// </summary>
     [DataField("wires")]
-    [NeverPushInheritance]
     public List<IWireAction>? Wires { get; private set; }
 }
diff --git a/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs b/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs
index f2e051669a..aed32bc89c 100644
--- a/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs
+++ b/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs
@@ -9,7 +9,6 @@ namespace Content.Server.Worldgen.Systems.Carvers;
 public sealed class NoiseRangeCarverSystem : EntitySystem
 {
     [Dependency] private readonly NoiseIndexSystem _index = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     /// <inheritdoc />
     public override void Initialize()
@@ -20,7 +19,7 @@ public override void Initialize()
     private void OnPrePlaceDebris(EntityUid uid, NoiseRangeCarverComponent component,
         ref PrePlaceDebrisFeatureEvent args)
     {
-        var coords = WorldGen.WorldToChunkCoords(args.Coords.ToMapPos(EntityManager, _transform));
+        var coords = WorldGen.WorldToChunkCoords(args.Coords.ToMapPos(EntityManager));
         var val = _index.Evaluate(uid, component.NoiseChannel, coords);
 
         foreach (var (low, high) in component.Ranges)
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index ba94b0f373..70a6119130 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -98,5 +98,4 @@ public enum LogType
     ChatRateLimited = 87,
     AtmosTemperatureChanged = 88,
     DeviceNetwork = 89,
-    StoreRefund = 90
 }
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index c335cd7b85..a3bb1e1467 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -129,7 +129,7 @@ public void StartSupercriticalEvent(EntityUid uid)
         if (HasComp<AnomalySupercriticalComponent>(uid))
             return;
 
-        AdminLog.Add(LogType.Anomaly, LogImpact.Extreme, $"Anomaly {ToPrettyString(uid)} began to go supercritical.");
+        AdminLog.Add(LogType.Anomaly, LogImpact.High, $"Anomaly {ToPrettyString(uid)} began to go supercritical.");
         if (_net.IsServer)
             Log.Info($"Anomaly is going supercritical. Entity: {ToPrettyString(uid)}");
 
diff --git a/Content.Shared/Audio/SharedAmbientSoundSystem.cs b/Content.Shared/Audio/SharedAmbientSoundSystem.cs
index 5f17261825..6318ba2557 100644
--- a/Content.Shared/Audio/SharedAmbientSoundSystem.cs
+++ b/Content.Shared/Audio/SharedAmbientSoundSystem.cs
@@ -5,19 +5,16 @@ namespace Content.Shared.Audio;
 
 public abstract class SharedAmbientSoundSystem : EntitySystem
 {
-    private EntityQuery<AmbientSoundComponent> _query;
-
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<AmbientSoundComponent, ComponentGetState>(GetCompState);
         SubscribeLocalEvent<AmbientSoundComponent, ComponentHandleState>(HandleCompState);
-        _query = GetEntityQuery<AmbientSoundComponent>();
     }
 
     public virtual void SetAmbience(EntityUid uid, bool value, AmbientSoundComponent? ambience = null)
     {
-        if (!_query.Resolve(uid, ref ambience, false) || ambience.Enabled == value)
+        if (!Resolve(uid, ref ambience, false) || ambience.Enabled == value)
             return;
 
         ambience.Enabled = value;
@@ -27,7 +24,7 @@ public virtual void SetAmbience(EntityUid uid, bool value, AmbientSoundComponent
 
     public virtual void SetRange(EntityUid uid, float value, AmbientSoundComponent? ambience = null)
     {
-        if (!_query.Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Range, value))
+        if (!Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Range, value))
             return;
 
         ambience.Range = value;
@@ -42,7 +39,7 @@ protected virtual void QueueUpdate(EntityUid uid, AmbientSoundComponent ambience
 
     public virtual void SetVolume(EntityUid uid, float value, AmbientSoundComponent? ambience = null)
     {
-        if (!_query.Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Volume, value))
+        if (!Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Volume, value))
             return;
 
         ambience.Volume = value;
@@ -51,7 +48,7 @@ public virtual void SetVolume(EntityUid uid, float value, AmbientSoundComponent?
 
     public virtual void SetSound(EntityUid uid, SoundSpecifier sound, AmbientSoundComponent? ambience = null)
     {
-        if (!_query.Resolve(uid, ref ambience, false) || ambience.Sound == sound)
+        if (!Resolve(uid, ref ambience, false) || ambience.Sound == sound)
             return;
 
         ambience.Sound = sound;
diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs
index 437c5e327d..188028c8f8 100644
--- a/Content.Shared/Chemistry/Components/InjectorComponent.cs
+++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs
@@ -30,7 +30,7 @@ public sealed partial class InjectorComponent : Component
     /// Whether or not the injector is able to draw from containers or if it's a single use
     /// device that can only inject.
     /// </summary>
-    [DataField]
+    [DataField("injectOnly")]
     public bool InjectOnly;
 
     /// <summary>
@@ -39,26 +39,28 @@ public sealed partial class InjectorComponent : Component
     /// <remarks>
     ///     for example: droppers would ignore mobs
     /// </remarks>
-    [DataField]
+    [DataField("ignoreMobs")]
     public bool IgnoreMobs;
 
     /// <summary>
     ///     The minimum amount of solution that can be transferred at once from this solution.
     /// </summary>
     [DataField("minTransferAmount")]
+    [ViewVariables(VVAccess.ReadWrite)]
     public FixedPoint2 MinimumTransferAmount = FixedPoint2.New(5);
 
     /// <summary>
     ///     The maximum amount of solution that can be transferred at once from this solution.
     /// </summary>
     [DataField("maxTransferAmount")]
-    public FixedPoint2 MaximumTransferAmount = FixedPoint2.New(50);
+    public FixedPoint2 MaximumTransferAmount = FixedPoint2.New(15);
 
     /// <summary>
     /// Amount to inject or draw on each usage. If the injector is inject only, it will
     /// attempt to inject it's entire contents upon use.
     /// </summary>
-    [DataField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("transferAmount")]
     [AutoNetworkedField]
     public FixedPoint2 TransferAmount = FixedPoint2.New(5);
 
@@ -69,7 +71,8 @@ public sealed partial class InjectorComponent : Component
     /// The base delay has a minimum of 1 second, but this will still be modified if the target is incapacitated or
     /// in combat mode.
     /// </remarks>
-    [DataField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("delay")]
     public TimeSpan Delay = TimeSpan.FromSeconds(5);
 
     /// <summary>
@@ -77,6 +80,7 @@ public sealed partial class InjectorComponent : Component
     /// right SolutionCaps to support injection/drawing. For InjectOnly injectors this should
     /// only ever be set to Inject
     /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]
     [DataField]
     public InjectorToggleMode ToggleState = InjectorToggleMode.Draw;
diff --git a/Content.Shared/Construction/Conditions/WallmountCondition.cs b/Content.Shared/Construction/Conditions/WallmountCondition.cs
index fe4336e6fc..bf3016d497 100644
--- a/Content.Shared/Construction/Conditions/WallmountCondition.cs
+++ b/Content.Shared/Construction/Conditions/WallmountCondition.cs
@@ -19,9 +19,8 @@ public bool Condition(EntityUid user, EntityCoordinates location, Direction dire
             var entManager = IoCManager.Resolve<IEntityManager>();
 
             // get blueprint and user position
-            var transformSystem = entManager.System<SharedTransformSystem>();
             var userWorldPosition = entManager.GetComponent<TransformComponent>(user).WorldPosition;
-            var objWorldPosition = location.ToMap(entManager, transformSystem).Position;
+            var objWorldPosition = location.ToMap(entManager).Position;
 
             // find direction from user to blueprint
             var userToObject = (objWorldPosition - userWorldPosition);
diff --git a/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs b/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs
deleted file mode 100644
index 75de0cb8a2..0000000000
--- a/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.DeviceNetwork.Components;
-
-/// <summary>
-/// Allow entities to jam DeviceNetwork packets.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class DeviceNetworkJammerComponent : Component
-{
-    /// <summary>
-    /// Range where packets will be jammed. This is checked both against the sender and receiver.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float Range = 5.0f;
-
-    /// <summary>
-    /// Device networks that can be jammed. For a list of default NetworkIds see DeviceNetIdDefaults on Content.Server.
-    /// Network ids are not guaranteed to be limited to DeviceNetIdDefaults.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public HashSet<string> JammableNetworks = [];
-
-}
diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs
index f792862be1..5a3fb87229 100644
--- a/Content.Shared/Examine/ExamineSystemShared.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -144,7 +144,7 @@ public bool IsOccluded(EntityUid uid)
             return TryComp<EyeComponent>(uid, out var eye) && eye.DrawFov;
         }
 
-        public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
+        public static bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
         {
             // No, rider. This is better.
             // ReSharper disable once ConvertToLocalFunction
@@ -154,7 +154,7 @@ public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float
             return InRangeUnOccluded(origin, other, range, predicate, wrapped, ignoreInsideBlocker, entMan);
         }
 
-        public bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates other, float range,
+        public static bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates other, float range,
             TState state, Func<EntityUid, TState, bool> predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
         {
             if (other.MapId != origin.MapId ||
@@ -171,7 +171,7 @@ public bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates othe
 
             if (length > MaxRaycastRange)
             {
-                Log.Warning("InRangeUnOccluded check performed over extreme range. Limiting CollisionRay size.");
+                Logger.Warning("InRangeUnOccluded check performed over extreme range. Limiting CollisionRay size.");
                 length = MaxRaycastRange;
             }
 
@@ -207,7 +207,7 @@ public bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates othe
             return true;
         }
 
-        public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
+        public static bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
             var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
@@ -216,7 +216,7 @@ public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = E
             return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
         }
 
-        public bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
+        public static bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
             var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
@@ -225,7 +225,7 @@ public bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float r
             return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
         }
 
-        public bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
+        public static bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
             var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
index 20e08b2767..bbae03e45b 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
@@ -114,7 +114,7 @@ public bool TryPickup(
                 && (itemPos.Position - xform.MapPosition.Position).Length() <= MaxAnimationRange
                 && MetaData(entity).VisibilityMask == MetaData(uid).VisibilityMask) // Don't animate aghost pickups.
             {
-                var initialPosition = EntityCoordinates.FromMap(coordinateEntity, itemPos, TransformSystem, EntityManager);
+                var initialPosition = EntityCoordinates.FromMap(coordinateEntity, itemPos, EntityManager);
                 _storage.PlayPickupAnimation(entity, initialPosition, xform.Coordinates, itemXform.LocalRotation, uid);
             }
         }
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 0e390ecea4..7d5e390b6f 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -459,7 +459,7 @@ protected bool ValidateInteractAndFace(EntityUid user, EntityCoordinates coordin
                 return false;
 
             if (!HasComp<NoRotateOnInteractComponent>(user))
-                _rotateToFaceSystem.TryFaceCoordinates(user, coordinates.ToMapPos(EntityManager, _transform));
+                _rotateToFaceSystem.TryFaceCoordinates(user, coordinates.ToMapPos(EntityManager));
 
             return true;
         }
@@ -612,7 +612,7 @@ public bool InRangeUnobstructed(
             Ignored combinedPredicate = e => e == origin || (predicate?.Invoke(e) ?? false);
             var inRange = true;
             MapCoordinates originPos = default;
-            var targetPos = otherCoordinates.ToMap(EntityManager, _transform);
+            var targetPos = otherCoordinates.ToMap(EntityManager);
             Angle targetRot = default;
 
             // So essentially:
@@ -785,7 +785,7 @@ public bool InRangeUnobstructed(
             Ignored? predicate = null,
             bool popup = false)
         {
-            return InRangeUnobstructed(origin, other.ToMap(EntityManager, _transform), range, collisionMask, predicate, popup);
+            return InRangeUnobstructed(origin, other.ToMap(EntityManager), range, collisionMask, predicate, popup);
         }
 
         /// <summary>
diff --git a/Content.Shared/Spawning/EntitySystemExtensions.cs b/Content.Shared/Spawning/EntitySystemExtensions.cs
index 507a0f4aa2..14b171baeb 100644
--- a/Content.Shared/Spawning/EntitySystemExtensions.cs
+++ b/Content.Shared/Spawning/EntitySystemExtensions.cs
@@ -16,7 +16,7 @@ public static class EntitySystemExtensions
             SharedPhysicsSystem? physicsManager = null)
         {
             physicsManager ??= entityManager.System<SharedPhysicsSystem>();
-            var mapCoordinates = coordinates.ToMap(entityManager, entityManager.System<SharedTransformSystem>());
+            var mapCoordinates = coordinates.ToMap(entityManager);
 
             return entityManager.SpawnIfUnobstructed(prototypeName, mapCoordinates, collisionLayer, box, physicsManager);
         }
diff --git a/Content.Shared/Store/ListingPrototype.cs b/Content.Shared/Store/ListingPrototype.cs
index 25245327ce..2f067afbee 100644
--- a/Content.Shared/Store/ListingPrototype.cs
+++ b/Content.Shared/Store/ListingPrototype.cs
@@ -98,9 +98,6 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
     [DataField("productEvent")]
     public object? ProductEvent;
 
-    [DataField]
-    public bool RaiseProductEventOnUser;
-
     /// <summary>
     /// used internally for tracking how many times an item was purchased.
     /// </summary>
@@ -123,7 +120,7 @@ public bool Equals(ListingData? listing)
             Description != listing.Description ||
             ProductEntity != listing.ProductEntity ||
             ProductAction != listing.ProductAction ||
-            ProductEvent?.GetType() != listing.ProductEvent?.GetType() ||
+            ProductEvent != listing.ProductEvent ||
             RestockTime != listing.RestockTime)
             return false;
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index 91aad89582..a8f7ee2395 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -261,7 +261,7 @@ private void OnBallisticAmmoCount(EntityUid uid, BallisticAmmoProviderComponent
         args.Capacity = component.Capacity;
     }
 
-    public void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component)
+    private void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component)
     {
         if (!Timing.IsFirstTimePredicted || !TryComp<AppearanceComponent>(uid, out var appearance))
             return;
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1f876cf9a7..89dcd2f582 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4051,7 +4051,7 @@ Entries:
     - type: Add
       message: >-
         Glass/Crystal shards and floor tiles now deal damage and embed in
-        victims when colliding with them. 
+        victims when colliding with them.
   id: 6107
   time: '2024-05-11T01:23:00.0000000+00:00'
 - author: FoxxoTrystan
diff --git a/Resources/Locale/en-US/paper/book-authorbooks.ftl b/Resources/Locale/en-US/paper/book-authorbooks.ftl
index ae886e835a..b1981d9e15 100644
--- a/Resources/Locale/en-US/paper/book-authorbooks.ftl
+++ b/Resources/Locale/en-US/paper/book-authorbooks.ftl
@@ -253,11 +253,3 @@ book-text-inspiration = As a freelance writer, Sarah was always in search of ins
       Without a moment's hesitation, Sarah took out her pen and notebook and began to write. She wrote about the beauty of the scene, the peacefulness she felt, and the surreal quality of the moment. She wanted to capture this feeling and share it with others through her words.
       As she finished writing, Sarah heard the snap of a twig and looked up to see a man approaching her with a camera. He introduced himself as a nature photographer and asked if she had seen the waterfall. They struck up a conversation, and soon they were both laughing and sharing stories of their adventures.
       As the sun began to set, the two of them packed up their gear and said their goodbyes. Sarah felt grateful for this unexpected encounter and the inspiration it brought her. She knew that this moment would stay with her forever, and she felt a sense of serenity knowing that there was still so much beauty in the world waiting to be discovered.
-
-book-text-janitor = [bold][color=black][head=3]The Tales of a Tired Janitor[/head][/bold]
-      Cleaning a space station as a janitor is like being trapped in a cosmic custodial nightmare. You'd think floating through the vastness of space would be glamorous, but no, I'm stuck scrubbing space grime and extraterrestrial goop off the walls. It's a thankless job in a zero-gravity abyss.
-      First off, let's talk about the mess. Space dust, alien gunk, and who knows what else accumulates faster than a rocket launch. It's not just about sweeping up the crumbs; it's about battling interstellar filth that seems to have a life of its own. You'd hope for a sleek, futuristic space station, but you get a swirling vortex of space garbage waiting for you around every corner.
-      And the tools they give us! You'd expect state-of-the-art cleaning gadgets, but nope. They raided a dollar store on Earth before launching us into the cosmos. Mops that barely work in microgravity, spray bottles that run out in one use, and don't even get me started on the space janitor jumpsuit. I feel like a reject from a sci-fi B-movie.
-      Speaking of jumpsuits, the lack of respect is astronomical. The scientists and astronauts zoom past in their sleek suits, utterly oblivious to the fact that I'm the unsung hero keeping this place from turning into a cosmic trash heap. I bet they don't even know my name. "Hey, Space Janitor!" That's what I get. No appreciation for the elbow grease I put into keeping their precious station spick and span.
-      And let's remember the hazards. Cleaning up alien slime? Yeah, that's a regular Tuesday for me. One wrong move and I'm dealing with an intergalactic biohazard. It's like playing Russian roulette with space critters that could burst out of some hidden nook and cranny. I signed up to mop floors, not play host to extraterrestrial invaders.
-      Being a janitor on this so-called Space Station 14 is a cosmic joke. Where did the other 13 stations go? It's not all spacewalks and futuristic gadgets; it's scrubbing toilets and battling alien goo. If anyone thinks space is glamorous, they clearly haven't seen the mess we space janitors deal with every single day. It's time they appreciate the unsung heroes of the space station – the custodians of the cosmos.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl
deleted file mode 100644
index f2451527b0..0000000000
--- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-cargoproduct-category-name-armory = Armory
-cargoproduct-category-name-atmospherics = Atmospherics
-cargoproduct-category-name-cargo = Cargo
-cargoproduct-category-name-circuitboards = Circuitboards
-cargoproduct-category-name-emergency = Emergency
-cargoproduct-category-name-engineering = Engineering
-cargoproduct-category-name-food = Food
-cargoproduct-category-name-fun = Fun
-cargoproduct-category-name-hydroponics = Hydroponics
-cargoproduct-category-name-livestock = Livestock
-cargoproduct-category-name-materials = Materials
-cargoproduct-category-name-medical = Medical
-cargoproduct-category-name-science = Science
-cargoproduct-category-name-security = Security
-cargoproduct-category-name-service = Service
-cargoproduct-category-name-shuttle = Shuttle
diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl
index 6ce575e648..4c8cf5db54 100644
--- a/Resources/Locale/en-US/speech/speech-chatsan.ftl
+++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl
@@ -114,6 +114,3 @@ chatsan-replacement-41 = what are you doing
 
 chatsan-word-42 = ofc
 chatsan-replacement-42 = of course
-
-chatsan-word-43 = ig
-chatsan-replacement-43 = i guess
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 7a3564edf6..c097a689dd 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -29,6 +29,3 @@ trait-frontal-lisp-desc = You thpeak with a lithp
 
 trait-socialanxiety-name = Social Anxiety
 trait-socialanxiety-desc = You are anxious when you speak and stutter.
-
-trait-snoring-name = Snoring
-trait-snoring-desc = You will snore while sleeping.
diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml
index 92b3d7de9b..147aebb5c5 100644
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -1,4 +1,4 @@
-# Accents that work off of word replacements.
+# Accents that work off of word replacements.
 
 # this is kind of dumb but localization demands it.
 # i guess you could just specify the prefix ('mobster') and count and let the system fill it
@@ -263,7 +263,7 @@
     accent-pirate-replaced-30: accent-pirate-replacement-30
     accent-pirate-replaced-31: accent-pirate-replacement-31
     accent-pirate-replaced-32: accent-pirate-replacement-32
-
+    
 - type: accent
   id: cowboy
   wordReplacements:
@@ -366,7 +366,7 @@
     accent-cowboy-words-97: accent-cowboy-replacement-97
     accent-cowboy-words-98: accent-cowboy-replacement-98
     accent-cowboy-words-99: accent-cowboy-replacement-99
-
+  
 
 # For the chat sanitization system
 - type: accent
@@ -409,9 +409,8 @@
     # chatsan-word-35: chatsan-replacement-35
     # chatsan-word-36: chatsan-replacement-36
     chatsan-word-37: chatsan-replacement-37
-    chatsan-word-38: chatsan-replacement-38
-    chatsan-word-39: chatsan-replacement-etcetera
-    chatsan-word-40: chatsan-replacement-etcetera
-    chatsan-word-41: chatsan-replacement-41
-    chatsan-word-42: chatsan-replacement-42
-    chatsan-word-43: chatsan-replacement-43
+    # chatsan-word-38: chatsan-replacement-38
+    # chatsan-word-39: chatsan-replacement-etcetera
+    # chatsan-word-40: chatsan-replacement-etcetera
+    # chatsan-word-41: chatsan-replacement-41
+    # chatsan-word-42: chatsan-replacement-42
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index 22f16bd956..b91b26e357 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -120,7 +120,7 @@
     priority: -20
     icon:
       sprite: Objects/Devices/communication.rsi
-      state: radio
+      state: old-radio
     event: !type:OpenUplinkImplantEvent
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
index 6341042bf8..399181b4fa 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -5,7 +5,7 @@
     state: icon
   product: CrateArmorySMG
   cost: 9000
-  category: cargoproduct-category-name-armory
+  category: Armory
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: icon
   product: CrateArmoryShotgun
   cost: 7000
-  category: cargoproduct-category-name-armory
+  category: Armory
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: implanter0
   product: CrateTrackingImplants
   cost: 1000
-  category: cargoproduct-category-name-armory
+  category: Armory
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: training-bomb
   product: CrateTrainingBombs
   cost: 3000
-  category: cargoproduct-category-name-armory
+  category: Armory
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: icon
   product: CrateArmoryLaser
   cost: 4800
-  category: cargoproduct-category-name-armory
+  category: Armory
   group: market
 
 - type: cargoProduct
@@ -55,5 +55,5 @@
     state: icon
   product: CrateArmoryPistols
   cost: 5200
-  category: cargoproduct-category-name-armory
+  category: Armory
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
index c85210adf6..0aa4938399 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
@@ -5,7 +5,7 @@
     state: grey
   product: AirCanister
   cost: 1100
-  category: cargoproduct-category-name-atmospherics
+  category: Atmospherics
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: blue
   product: OxygenCanister
   cost: 1100
-  category: cargoproduct-category-name-atmospherics
+  category: Atmospherics
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: blue
   product: LiquidOxygenCanister
   cost: 2500
-  category: cargoproduct-category-name-atmospherics
+  category: Atmospherics
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: red
   product: NitrogenCanister
   cost: 1100
-  category: cargoproduct-category-name-atmospherics
+  category: Atmospherics
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: red
   product: LiquidNitrogenCanister
   cost: 2500
-  category: cargoproduct-category-name-atmospherics
+  category: Atmospherics
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: black
   product: CarbonDioxideCanister
   cost: 2200 # Until someone fixes it co2 can be used to oneshot people so it's more expensive
-  category: cargoproduct-category-name-atmospherics
+  category: Atmospherics
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: black
   product: LiquidCarbonDioxideCanister
   cost: 4000
-  category: cargoproduct-category-name-atmospherics
+  category: Atmospherics
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: yellow
   product: StorageCanister
   cost: 1010 # No gases in it so it's cheaper
-  category: cargoproduct-category-name-atmospherics
+  category: Atmospherics
   group: market
 
 #- type: cargoProduct
@@ -87,7 +87,7 @@
 #    state: water_vapor
 #  product: WaterVaporCanister
 #  cost: 2600
-#  category: cargoproduct-category-name-atmospherics
+#  category: Atmospherics
 #  group: market
 
 - type: cargoProduct
@@ -97,7 +97,7 @@
     state: orange
   product: PlasmaCanister
   cost: 4000
-  category: cargoproduct-category-name-atmospherics
+  category: Atmospherics
   group: market
 
 #- type: cargoProduct
@@ -109,5 +109,5 @@
 #    state: green
 #  product: TritiumCanister
 #  cost: 15500
-#  category: cargoproduct-category-name-atmospherics
+#  category: Atmospherics
 #  group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
index a6671ff099..4a80b76a3f 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
@@ -5,7 +5,7 @@
     state: seed
   product: CrateHydroponicsSeedsExotic
   cost: 1000
-  category: cargoproduct-category-name-hydroponics
+  category: Hydroponics
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: seed
   product: CrateHydroponicsSeedsMedicinal
   cost: 500
-  category: cargoproduct-category-name-hydroponics
+  category: Hydroponics
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: icon
   product: CrateHydroponicsTools
   cost: 500
-  category: cargoproduct-category-name-hydroponics
+  category: Hydroponics
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: seed
   product: CrateHydroponicsSeeds
   cost: 550
-  category: cargoproduct-category-name-hydroponics
+  category: Hydroponics
   group: market
 
 - type: cargoProduct
@@ -45,5 +45,5 @@
     state: jug
   product: CratePlantBGone
   cost: 750
-  category: cargoproduct-category-name-hydroponics
+  category: Hydroponics
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
index fb3b2da41a..9dac47b6f1 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
@@ -15,7 +15,7 @@
     state: orebox
   product: OreBox
   cost: 500
-  category: cargoproduct-category-name-cargo
+  category: Logistics # DeltaV - Logistics Department replacing Cargo
   group: market
 
 - type: cargoProduct
@@ -25,5 +25,5 @@
     state: icon
   product: CrateCargoLuxuryHardsuit
   cost: 15000
-  category: cargoproduct-category-name-cargo
+  category: Logistics # DeltaV - Logistics Department replacing Cargo
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
index a96780fc3e..0af5b5db01 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
@@ -5,5 +5,5 @@
     state: cpuboard
   product: CrateCrewMonitoringBoards
   cost: 2000
-  category: cargoproduct-category-name-circuitboards
+  category: Circuitboards
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
index 2715e0c350..2777f859a0 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
@@ -5,7 +5,7 @@
     state: icon
   product: CrateEmergencyExplosive
   cost: 650
-  category: cargoproduct-category-name-emergency
+  category: Emergency
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: fire_extinguisher_closed
   product: CrateEmergencyFire
   cost: 1500
-  category: cargoproduct-category-name-emergency
+  category: Emergency
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: icon
   product: CrateEmergencyInternals
   cost: 500
-  category: cargoproduct-category-name-emergency
+  category: Emergency
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon
   product: CrateEmergencyInternalsLarge
   cost: 2000
-  category: cargoproduct-category-name-emergency
+  category: Emergency
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: radiation
   product: CrateEmergencyRadiation
   cost: 1000
-  category: cargoproduct-category-name-emergency
+  category: Emergency
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: item_wall
   product: CrateEmergencyInflatablewall
   cost: 500
-  category: cargoproduct-category-name-emergency
+  category: Emergency
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: icon
   product: CrateSlimepersonLifeSupport
   cost: 300
-  category: cargoproduct-category-name-emergency
+  category: Emergency
   group: market
 
 - type: cargoProduct
@@ -75,5 +75,5 @@
     state: icon
   product: CrateGenericBiosuit
   cost: 800
-  category: cargoproduct-category-name-emergency
+  category: Emergency
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
index 754e30f133..b5468fd982 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
@@ -5,7 +5,7 @@
     state: coillv-30
   product: CrateEngineeringCableLV
   cost: 300
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: coilmv-30
   product: CrateEngineeringCableMV
   cost: 300
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: coilhv-30
   product: CrateEngineeringCableHV
   cost: 300
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: coilall-30
   product: CrateEngineeringCableBulk
   cost: 750
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: icon
   product: CrateEngineeringElectricalSupplies
   cost: 4500
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: icon
   product: CrateEngineeringStationBeaconBundle
   cost: 500
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: icon
   product: CrateEngineeringJetpack
   cost: 1000
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: icon
   product: CrateEngineeringMiniJetpack
   cost: 750
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: icon
   product: CrateAirlockKit
   cost: 1100
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: icon
   product: CrateEvaKit
   cost: 5000
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: ammo
   product: CrateRCDAmmo
   cost: 2500
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: icon
   product: CrateRCD
   cost: 800
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: base
   product: CrateParticleDecelerators
   cost: 15000
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -135,5 +135,5 @@
     state: sheaterOff
   product: SpaceHeaterAnchored
   cost: 300
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
index bd00b0c2d4..ece817b746 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -5,7 +5,7 @@
     state: jar
   product: CrateEngineeringAMEJar
   cost: 2000
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: icon
   product: CrateEngineeringSingularityGenerator
   cost: 4000
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: icon
   product: CrateEngineeringSingularityContainment
   cost: 1000
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 #- type: cargoProduct
@@ -37,7 +37,7 @@
 #    state: emitter2
 #  product: CrateEngineeringSingularityEmitter
 #  cost: 3000
-#  category: cargoproduct-category-name-engineering
+#  category: Engineering
 #  group: market
 
 - type: cargoProduct
@@ -47,7 +47,7 @@
     state: ca_on
   product: CrateEngineeringSingularityCollector
   cost: 1000
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -57,7 +57,7 @@
     state: completed
   product: CrateEngineeringParticleAccelerator
   cost: 2000
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -67,18 +67,18 @@
     state: solar-assembly-part
   product: CrateEngineeringSolar
   cost: 500
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
-- type: cargoProduct
-  id: EngineTeslaGenerator
-  icon:
-    sprite: Structures/Power/Generation/Tesla/generator.rsi
-    state: icon
-  product: CrateEngineeringTeslaGenerator
-  cost: 4000
-  category: cargoproduct-category-name-engineering
-  group: market
+#- type: cargoProduct
+#  id: EngineTeslaGenerator
+#  icon:
+#    sprite: Structures/Power/Generation/Tesla/generator.rsi
+#    state: icon
+#  product: CrateEngineeringTeslaGenerator
+#  cost: 4000
+#  category: Engineering
+#  group: market
 
 - type: cargoProduct
   id: EngineTeslaCoil
@@ -87,7 +87,7 @@
     state: coil
   product: CrateEngineeringTeslaCoil
   cost: 1200
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -97,5 +97,5 @@
     state: grounding_rod
   product: CrateEngineeringTeslaGroundingRod
   cost: 400
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
index 1a6f838096..e506995929 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
@@ -5,7 +5,7 @@
     state: margherita-slice
   product: CrateFoodPizza
   cost: 450
-  category: cargoproduct-category-name-food
+  category: Food
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: margherita
   product: CrateFoodPizzaLarge
   cost: 1800
-  category: cargoproduct-category-name-food
+  category: Food
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: nutribrick
   product: CrateFoodMRE
   cost: 1000
-  category: cargoproduct-category-name-food
+  category: Food
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: flour-big
   product: CrateFoodCooking
   cost: 750
-  category: cargoproduct-category-name-food
+  category: Food
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: tin
   product: CrateFoodDinnerware
   cost: 750
-  category: cargoproduct-category-name-food
+  category: Food
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: icon
   product: CrateFoodBarSupply
   cost: 750
-  category: cargoproduct-category-name-food
+  category: Food
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: icon
   product: CrateFoodSoftdrinks
   cost: 1200
-  category: cargoproduct-category-name-food
+  category: Food
   group: market
 
 - type: cargoProduct
@@ -75,5 +75,5 @@
     state: icon
   product: CrateFoodSoftdrinksLarge
   cost: 2400
-  category: cargoproduct-category-name-food
+  category: Food
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index c29458a1ee..d84fedd543 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -5,7 +5,7 @@
     state: icon
   product: CrateFunInstrumentsVariety
   cost: 2000
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: tuba
   product: CrateFunInstrumentsBrass
   cost: 2500
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: icon
   product: CrateFunInstrumentsString
   cost: 2500
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon
   product: CrateFunInstrumentsWoodwind
   cost: 2500
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: icon
   product: CrateFunInstrumentsKeyedPercussion
   cost: 2500
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: icon
   product: CrateFunInstrumentsSpecial
   cost: 10000
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: box
   product: CrateFunArtSupplies
   cost: 500
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: birthday
   product: CrateFunParty
   cost: 1000
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: display
   product: CrateFunWaterGuns
   cost: 750
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: plushie_h
   product: CrateFunPlushie
   cost: 1000
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: plushie_lizard
   product: CrateFunLizardPlushieBulk
   cost: 500
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: d6_6
   product: CrateFunBoardGames
   cost: 1500
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: implanter0
   product: CrateFunSadTromboneImplants
   cost: 1000
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -145,7 +145,7 @@
     state: implanter0
   product: CrateFunLightImplants
   cost: 1000
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -155,7 +155,7 @@
     state: icon
   product: CrateFunBoxing
   cost: 500
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -165,7 +165,7 @@
     state: crate_icon
   product: CrateFunPirate
   cost: 400
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -175,7 +175,7 @@
     state: crate_icon
   product: CrateFunToyBox
   cost: 900
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -185,7 +185,7 @@
     state: implanter0
   product: CrateFunBikeHornImplants
   cost: 1000
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -195,7 +195,7 @@
     state: fig_box
   product: CrateFunMysteryFigurines
   cost: 4000
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
 - type: cargoProduct
@@ -205,15 +205,15 @@
     state: icon
   product: CrateFunDartsSet
   cost: 900
-  category: cargoproduct-category-name-fun
+  category: Fun
   group: market
 
-- type: cargoProduct
-  id: FunCrateGambling
-  icon:
-    sprite: Objects/Economy/cash.rsi
-    state: cash_1000000
-  product: CrateCargoGambling
-  cost: 10000
-  category: cargoproduct-category-name-fun
-  group: market
+#- type: cargoProduct
+#  id: FunCrateGambling
+#  icon:
+#    sprite: Objects/Economy/cash.rsi
+#    state: cash_1000000
+#  product: CrateCargoGambling
+#  cost: 10000
+#  category: Fun
+#  group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index 922e2951b6..6ef0ab4e21 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -5,7 +5,7 @@
     state: 0
   product: CrateNPCBee
   cost: 7000
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: butterfly
   product: CrateNPCButterflies
   cost: 4400
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: cat
   product: CrateNPCCat
   cost: 1200
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon-1
   product: CrateNPCChicken
   cost: 4000
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: crab
   product: CrateNPCCrab
   cost: 3000
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: icon-0
   product: CrateNPCDuck
   cost: 6000
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: corgi
   product: CrateNPCCorgi
   cost: 1200
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: puppy
   product: CrateNPCPuppyCorgi
   cost: 1200
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: cow
   product: CrateNPCCow
   cost: 3200
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: goat
   product: CrateNPCGoat
   cost: 1200
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: goose
   product: CrateNPCGoose
   cost: 2100
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: icon
   product: CrateNPCGorilla
   cost: 1100
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: box
   product: CrateNPCMonkeyCube
   cost: 2000
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: box_kobold
   product: CrateNPCKoboldCube
   cost: 2000
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -145,7 +145,7 @@
     state: icon-0
   product: CrateNPCMouse
   cost: 4400
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -155,7 +155,7 @@
     state: parrot
   product: CrateNPCParrot
   cost: 3000
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -165,7 +165,7 @@
     state: penguin
   product: CrateNPCPenguin
   cost: 2100
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -175,7 +175,7 @@
     state: pig
   product: CrateNPCPig
   cost: 1100
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -185,7 +185,7 @@
     state: snake
   product: CrateNPCSnake
   cost: 3000
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -195,7 +195,7 @@
     state: icon-0
   product: CrateNPCHamster
   cost: 2800
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -205,7 +205,7 @@
     state: lizard
   product: CrateNPCLizard
   cost: 1100
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -215,7 +215,7 @@
     state: kangaroo
   product: CrateNPCKangaroo
   cost: 2800
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
 
 - type: cargoProduct
@@ -225,5 +225,5 @@
     state: mothroach
   product: CrateNPCMothroach
   cost: 5000
-  category: cargoproduct-category-name-livestock
+  category: Livestock
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
index 6f945001d9..e3b07af13b 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
@@ -5,7 +5,7 @@
     state: glass_3
   product: CrateMaterialGlass
   cost: 1000
-  category: cargoproduct-category-name-materials
+  category: Materials
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: steel_3
   product: CrateMaterialSteel
   cost: 1000
-  category: cargoproduct-category-name-materials
+  category: Materials
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: plastic_3
   product: CrateMaterialPlastic
   cost: 1500
-  category: cargoproduct-category-name-materials
+  category: Materials
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: brass_3
   product: CrateMaterialBrass
   cost: 2500
-  category: cargoproduct-category-name-materials
+  category: Materials
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: plasteel_3
   product: CrateMaterialPlasteel
   cost: 3000
-  category: cargoproduct-category-name-materials
+  category: Materials
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: cloth_3
   product: CrateMaterialTextiles
   cost: 1000
-  category: cargoproduct-category-name-materials
+  category: Materials
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: plasma_3
   product: CrateMaterialPlasma
   cost: 2000
-  category: cargoproduct-category-name-materials
+  category: Materials
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: cardboard_3
   product: CrateMaterialCardboard
   cost: 750
-  category: cargoproduct-category-name-materials
+  category: Materials
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: paper_3
   product: CrateMaterialPaper
   cost: 1000
-  category: cargoproduct-category-name-materials
+  category: Materials
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: fueltank
   product: WeldingFuelTankFull
   cost: 1500
-  category: cargoproduct-category-name-materials
+  category: Materials
   group: market
 
 - type: cargoProduct
@@ -105,5 +105,5 @@
     state: watertank
   product: WaterTankFull
   cost: 1000
-  category: cargoproduct-category-name-materials
+  category: Materials
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
index 1addf523e4..01a7192b35 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
@@ -5,7 +5,7 @@
     state: firstaid
   product: CrateMedicalSupplies
   cost: 2400
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: beaker
   product: CrateChemistrySupplies
   cost: 750
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: vial
   product: CrateChemistryVials
   cost: 1000
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: burnkit
   product: CrateEmergencyBurnKit
   cost: 700
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: toxinkit
   product: CrateEmergencyToxinKit
   cost: 600
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: o2kit
   product: CrateEmergencyO2Kit
   cost: 600
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: brutekit
   product: CrateEmergencyBruteKit
   cost: 600
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: advkit
   product: CrateEmergencyAdvancedKit
   cost: 1200
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: radkit
   product: CrateEmergencyRadiationKit
   cost: 600
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: bag_folded
   product: CrateBodyBags
   cost: 700
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: icon
   product: CrateVirologyBiosuit
   cost: 800
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: implanter0
   product: CrateMindShieldImplants
   cost: 3000
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: icon
   product: CrateChemistryP
   cost: 850
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: icon
   product: CrateChemistryS
   cost: 750
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -145,5 +145,5 @@
     state: icon
   product: CrateChemistryD
   cost: 750
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
index 756a223e74..f370155e07 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
@@ -5,7 +5,7 @@
     state: artifact_container_icon
   product: CrateArtifactContainer
   cost: 500
-  category: cargoproduct-category-name-science
+  category: Epistemics # DeltaV - Epistemics Department replacing Science
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: ano13
   product: RandomArtifactSpawner
   cost: 2000
-  category: cargoproduct-category-name-science
+  category: Epistemics # DeltaV - Epistemics Department replacing Science
   group: market
 
 - type: cargoProduct
@@ -25,5 +25,5 @@
     state: icon
   product: CrateScienceBiosuit
   cost: 800
-  category: cargoproduct-category-name-science
+  category: Epistemics # DeltaV - Epistemics Department replacing Science
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
index 2ad7628ddb..a616202bdb 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
@@ -4,8 +4,8 @@
     sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi # DeltaV - resprite
     state: icon
   product: CrateSecurityArmor
-  cost: 800
-  category: cargoproduct-category-name-security
+  cost: 1000 # DeltaV - raise price for buffed armour
+  category: Security
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: icon
   product: CrateSecurityHelmet
   cost: 550
-  category: cargoproduct-category-name-security
+  category: Security
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: base
   product: CrateSecurityNonlethal
   cost: 4000
-  category: cargoproduct-category-name-security
+  category: Security
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon
   product: CrateSecurityRiot
   cost: 5500
-  category: cargoproduct-category-name-security
+  category: Security
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: box_security
   product: CrateSecuritySupplies
   cost: 500
-  category: cargoproduct-category-name-security
+  category: Security
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: handcuff
   product: CrateRestraints
   cost: 1000
-  category: cargoproduct-category-name-security
+  category: Security
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: icon
   product: CrateSecurityBiosuit
   cost: 800
-  category: cargoproduct-category-name-security
+  category: Security
   group: market
 
 - type: cargoProduct
@@ -75,5 +75,5 @@
     state: idle
   product: DeployableBarrier
   cost: 1000
-  category: cargoproduct-category-name-security
+  category: Security
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index f27adb65a4..a2c0af9ce7 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -5,7 +5,7 @@
     state: cleaner
   product: CrateServiceJanitorialSupplies
   cost: 560
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: normal
   product: CrateServiceReplacementLights
   cost: 600
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: mousetrap
   product: CrateMousetrapBoxes
   cost: 500
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon
   product: CrateServiceTheatre
   cost: 1800
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: closed
   product: CrateServiceSmokeables
   cost: 1500
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: closed
   product: CrateServiceCustomSmokable
   cost: 1000
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: pen
   product: CrateServiceBureaucracy
   cost: 1000
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: default
   product: CrateServicePersonnel
   cost: 1000
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: book0
   product: CrateServiceBooks
   cost: 1000
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: book_engineering2
   product: CrateServiceGuidebooks
   cost: 1300
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: icon
   product: CrateServiceSodaDispenser
   cost: 850
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: icon
   product: CrateServiceBoozeDispenser
   cost: 750
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: box
   product: CrateServiceBox
   cost: 400
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: icon
   product: CrateJanitorBiosuit
   cost: 800
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -145,7 +145,7 @@
     state: icon-hot
   product: FoodCartHot
   cost: 2000
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -155,7 +155,7 @@
     state: icon-cold
   product: FoodCartCold
   cost: 2000
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -165,7 +165,7 @@
     state: icon
   product: PetCarrier
   cost: 500
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -175,7 +175,7 @@
     state: icon
   product: CrateJanitorExplosive
   cost: 1000
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -185,6 +185,6 @@
     state: icon-cart
   product: JanitorialTrolley
   cost: 300
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
index 278104caed..96a193881e 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
@@ -5,7 +5,7 @@
     state: base
   product: CrateEngineeringThruster
   cost: 1500
-  category: cargoproduct-category-name-shuttle
+  category: Shuttle
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: base
   product: CrateEngineeringGyroscope
   cost: 4000
-  category: cargoproduct-category-name-shuttle
+  category: Shuttle
   group: market
 
 # - type: cargoProduct
@@ -25,6 +25,6 @@
     # state: avionics-systems
   # product: CrateEngineeringShuttle
   # cost: 3000
-  # category: cargoproduct-category-name-shuttle
+  # category: Shuttle
   # group: market
 #  locked: true   # only the QM has permission to order by default
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 3e303c3212..d0ae444bf7 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -13,7 +13,7 @@
     state: base
   product: CrateVendingMachineRestockBoozeFilled
   cost: 3500
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -24,7 +24,7 @@
     state: base
   product: CrateVendingMachineRestockChefvendFilled
   cost: 680
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -44,7 +44,7 @@
     state: base
   product: CrateVendingMachineRestockDinnerwareFilled
   cost: 2000
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: base
   product: CrateVendingMachineRestockCondimentStationFilled
   cost: 300
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: base
   product: CrateVendingMachineRestockEngineeringFilled
   cost: 3200
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: base
   product: CrateVendingMachineRestockGamesFilled
   cost: 750
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: base
   product: CrateVendingMachineRestockHotDrinksFilled
   cost: 1200
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: base
   product: CrateVendingMachineRestockMedicalFilled
   cost: 1750
-  category: cargoproduct-category-name-medical
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -104,8 +104,8 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockChemVendFilled
-  cost: 3820
-  category: cargoproduct-category-name-medical
+  cost: 6300 #Delta V - was 3820, see rebase PR #53
+  category: Medical
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: base
   product: CrateVendingMachineRestockNutriMaxFilled
   cost: 2400
-  category: cargoproduct-category-name-hydroponics
+  category: Hydroponics
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: base
   product: CrateVendingMachineRestockPTechFilled
   cost: 1200
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: base
   product: CrateVendingMachineRestockRobustSoftdrinksFilled
   cost: 1200
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -145,7 +145,7 @@
     state: base
   product: CrateVendingMachineRestockSalvageEquipmentFilled
   cost: 1000
-  category: cargoproduct-category-name-engineering
+  category: Engineering
   group: market
 
 - type: cargoProduct
@@ -155,7 +155,7 @@
     state: base
   product: CrateVendingMachineRestockSecTechFilled
   cost: 2200
-  category: cargoproduct-category-name-security
+  category: Security
   group: market
 
 - type: cargoProduct
@@ -165,7 +165,7 @@
     state: base
   product: CrateVendingMachineRestockSeedsFilled
   cost: 3375
-  category: cargoproduct-category-name-hydroponics
+  category: Hydroponics
   group: market
 
 - type: cargoProduct
@@ -175,7 +175,7 @@
     state: base
   product: CrateVendingMachineRestockSmokesFilled
   cost: 1200
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -185,7 +185,7 @@
     state: base
   product: CrateVendingMachineRestockVendomatFilled
   cost: 1200
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -195,7 +195,7 @@
     state: base
   product: CrateVendingMachineRestockRoboticsFilled
   cost: 1600
-  category: cargoproduct-category-name-science
+  category: Epistemics # DeltaV - Epistemics Department replacing Science
   group: market
 
 - type: cargoProduct
@@ -205,7 +205,7 @@
     state: base
   product: CrateVendingMachineRestockTankDispenserFilled
   cost: 1000
-  category: cargoproduct-category-name-atmospherics
+  category: Atmospherics
   group: market
 
 - type: cargoProduct
@@ -215,7 +215,7 @@
     state: base
   product: CrateVendingMachineRestockHappyHonkFilled
   cost: 2100
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -225,7 +225,7 @@
     state: base
   product: CrateVendingMachineRestockGetmoreChocolateCorpFilled
   cost: 1200
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -235,7 +235,7 @@
     state: base
   product: CrateVendingMachineRestockChangFilled
   cost: 1200
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -245,7 +245,7 @@
     state: base
   product: CrateVendingMachineRestockDiscountDansFilled
   cost: 1200
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
 
 - type: cargoProduct
@@ -255,5 +255,5 @@
     state: base
   product: CrateVendingMachineRestockDonutFilled
   cost: 1200
-  category: cargoproduct-category-name-service
+  category: Service
   group: market
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index bb21bc36d4..92e4032b0c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -87,7 +87,6 @@
     ClothingShoesBootsCowboyBrown: 1
     ClothingShoesBootsCowboyBlack: 1
     ClothingShoesBootsCowboyWhite: 1
-    ClothingMaskNeckGaiterRed: 2
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingShoesBootsCowboyFancy: 1
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 1e81cdf2dd..7f64ebbd23 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -428,7 +428,7 @@
   name: uplink-reinforcement-radio-name
   description: uplink-reinforcement-radio-desc
   productEntity: ReinforcementRadioSyndicate
-  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
   cost:
     Telecrystal: 16
   categories:
@@ -444,7 +444,7 @@
   name: uplink-reinforcement-radio-name
   description: uplink-reinforcement-radio-desc
   productEntity: ReinforcementRadioSyndicateNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
   cost:
     Telecrystal: 16
   categories:
@@ -476,7 +476,7 @@
   name: uplink-reinforcement-radio-monkey-name
   description: uplink-reinforcement-radio-monkey-desc
   productEntity: ReinforcementRadioSyndicateMonkey
-  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
   cost:
     Telecrystal: 8
   categories:
@@ -492,9 +492,9 @@
   name: uplink-reinforcement-radio-monkey-name
   description: uplink-reinforcement-radio-monkey-desc
   productEntity: ReinforcementRadioSyndicateMonkeyNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
   cost:
-    Telecrystal: 6
+    Telecrystal: 8
   categories:
   - UplinkUtility
   conditions:
@@ -724,7 +724,7 @@
   id: UplinkUplinkImplanter # uplink uplink real
   name: uplink-uplink-implanter-name
   description: uplink-uplink-implanter-desc
-  icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: radio }
+  icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: old-radio }
   productEntity: UplinkImplanter
   cost:
     Telecrystal: 2
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index c845d7cc4a..43d6c7c9b7 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -809,8 +809,8 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatMagician
-  name: magician's tophat
-  description: "A magician's tophat."
+  name: magician's top hat.
+  description: "A magician's top hat."
   components:
   - type: Icon
     sprite: Clothing/Head/Hats/magician.rsi
@@ -827,7 +827,6 @@
   - type: Item
     size: Small
     sprite: Clothing/Head/Hats/magician.rsi
-    storedRotation: 0
   - type: Storage
     grid:
     - 0,0,0,0
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index ad738792a7..1f70211caa 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -514,16 +514,6 @@
     tags:
     - WhitelistChameleon
 
-- type: entity
-  parent: ClothingMaskNeckGaiter
-  id: ClothingMaskNeckGaiterRed
-  name: red neck gaiter
-  components:
-  - type: Sprite
-    sprite: Clothing/Mask/neckgaiterred.rsi
-  - type: Clothing
-    sprite: Clothing/Mask/neckgaiterred.rsi
-
 - type: entity
   parent: ClothingMaskClownBase
   id: ClothingMaskSexyClown
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
index d1f6e083f4..ee1708caef 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -47,9 +47,6 @@
       collection: FootstepDuck
       params:
         variation: 0.07
-  - type: Construction
-    graph: ClothingShoeSlippersDuck
-    node: shoes
 
 - type: entity
   parent: ClothingShoesBaseButcherable
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index a271e9d084..5e40254e3a 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -14,8 +14,6 @@
   - type:  HumanoidAppearance
     species: Vox
     #- type: VoxAccent # Not yet coded
-  - type: Inventory
-    speciesId: vox
   - type: Speech
     speechVerb: Vox
     speechSounds: Vox
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
index a8489866fc..f6d57f53a5 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -7,7 +7,7 @@
   - type: Sprite
     sprite: Objects/Devices/communication.rsi
     layers:
-    - state: radio
+    - state: old-radio
   - type: GhostRole
     name: ghost-role-information-syndicate-reinforcement-name
     description: ghost-role-information-syndicate-reinforcement-description
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
index edad2b4063..8c3aed0d06 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -89,7 +89,6 @@
     program: 125
   - type: Item
     size: Small
-    storedRotation: -90
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -119,7 +118,6 @@
   - type: Item
     size: Small
     sprite: Objects/Fun/Instruments/gunpet.rsi
-    storedRotation: -90
   - type: Tag
     tags:
     - Sidearm
@@ -143,7 +141,6 @@
   - type: Item
     sprite: Objects/Fun/Instruments/bike_horn.rsi
     size: Small
-    storedRotation: -90
   - type: Clothing
     sprite: Objects/Fun/Instruments/bike_horn.rsi
     slots: [Belt]
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
index b09ea96f7b..a255ab4a32 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -98,8 +98,6 @@
   - type: Tag
     tags:
     - KeyedInstrument
-  - type: Item
-    size: Small
 
 - type: entity
   parent: BaseHandheldInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
index e99f825d48..3b89d1075b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
@@ -141,7 +141,7 @@
     sprite: Objects/Fun/Instruments/panflute.rsi
     state: icon
   - type: Item
-    size: Small
+    size: Normal
     sprite: Objects/Fun/Instruments/panflute.rsi
   - type: Tag
     tags:
@@ -160,9 +160,8 @@
     sprite: Objects/Fun/Instruments/ocarina.rsi
     state: icon
   - type: Item
-    size: Small
+    size: Normal
     sprite: Objects/Fun/Instruments/ocarina.rsi
-    storedRotation: -90
   - type: Tag
     tags:
     - WoodwindInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 67c6e1194b..6697aa711e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -643,9 +643,6 @@
     requiresSpecialDigestion: true
     useSound:
       path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: Tag
-    tags:
-    - ToyRubberDuck
 
 - type: entity
   parent: BasePlushie
diff --git a/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml b/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
index 70d984240e..c3f5170001 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
@@ -387,17 +387,3 @@
         - state: book6
     - type: Paper
       content: book-text-inspiration
-
-- type: entity
-  parent: BookBase
-  id: BookJanitorTale
-  name: the tales of a tired janitor
-  description: A clean looking book, smelling vaguely of soap and bleach. 
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book0 
-  - type: Paper
-    content: book-text-janitor
-
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 9fde67afb4..bd789214f9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -786,7 +786,7 @@
 # Syringes
 - type: entity
   name: ephedrine syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeEphedrine
   components:
   - type: SolutionContainerManager
@@ -799,7 +799,7 @@
 
 - type: entity
   name: inaprovaline syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeInaprovaline
   components:
   - type: SolutionContainerManager
@@ -812,7 +812,7 @@
 
 - type: entity
   name: tranexamic acid syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeTranexamicAcid
   components:
   - type: SolutionContainerManager
@@ -825,7 +825,7 @@
 
 - type: entity
   name: bicaridine syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeBicaridine
   components:
   - type: SolutionContainerManager
@@ -838,7 +838,7 @@
 
 - type: entity
   name: dermaline syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeDermaline
   components:
   - type: SolutionContainerManager
@@ -851,7 +851,7 @@
 
 - type: entity
   name: hyronalin syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeHyronalin
   components:
   - type: SolutionContainerManager
@@ -864,7 +864,7 @@
 
 - type: entity
   name: ipecac syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeIpecac
   components:
   - type: SolutionContainerManager
@@ -877,7 +877,7 @@
 
 - type: entity
   name: ambuzol syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeAmbuzol
   components:
     - type: SolutionContainerManager
@@ -890,7 +890,7 @@
 
 - type: entity
   name: sigynate syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeSigynate
   components:
     - type: SolutionContainerManager
@@ -903,7 +903,7 @@
 
 - type: entity
   name: ethylredoxrazine syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeEthylredoxrazine
   components:
     - type: SolutionContainerManager
@@ -916,7 +916,7 @@
 
 - type: entity
   name: phalanximine syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringePhalanximine
   components:
     - type: SolutionContainerManager
@@ -929,7 +929,7 @@
 
 - type: entity
   name: saline syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeSaline
   components:
     - type: SolutionContainerManager
@@ -943,7 +943,7 @@
 #this is where all the syringes are so i didn't know where to put it
 - type: entity
   name: romerol syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeRomerol
   components:
   - type: SolutionContainerManager
@@ -956,7 +956,7 @@
 
 - type: entity
   name: stimulants syringe
-  parent: PrefilledSyringe
+  parent: BaseSyringe
   id: SyringeStimulants
   components:
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index ae4aaed7d2..ab65940fab 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -364,13 +364,6 @@
     - Syringe
     - Trash
 
-- type: entity
-  parent: BaseSyringe
-  id: PrefilledSyringe
-  components:
-  - type: Injector
-    toggleState: Inject
-
 - type: entity
   id: SyringeBluespace
   parent: BaseSyringe
diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
index 883f66816d..2b5762aaef 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
@@ -57,10 +57,10 @@
   - type: Sprite
     sprite: Objects/Devices/communication.rsi
     layers:
-    - state: radio
+    - state: old-radio
   - type: Item
     sprite: Objects/Devices/communication.rsi
-    heldPrefix: radio
+    heldPrefix: old-radio
   - type: UserInterface
     interfaces:
     - key: enum.StoreUiKey.Key
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index d07a73b022..51f121c64f 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -6,8 +6,6 @@
   components:
   - type: AccessReader
     access: [["Service"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -16,8 +14,6 @@
   components:
   - type: AccessReader
     access: [["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -26,8 +22,6 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockScience # DeltaV - Chapel is in Epistemics
@@ -36,8 +30,6 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -46,8 +38,6 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -56,8 +46,6 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -66,8 +54,6 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -76,8 +62,6 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -86,8 +70,6 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockExternal
@@ -104,8 +86,6 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockExternal
@@ -114,8 +94,6 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockExternal
@@ -124,8 +102,6 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockExternal
@@ -150,8 +126,6 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockFreezer
@@ -160,8 +134,6 @@
   components:
   - type: AccessReader
     access: [["Kitchen"], ["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockFreezer
@@ -170,8 +142,6 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockEngineering
@@ -180,8 +150,6 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockAtmospherics
@@ -190,8 +158,6 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockCargo
@@ -200,8 +166,6 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockCargo
@@ -210,8 +174,6 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMining
@@ -220,8 +182,6 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMedical
@@ -230,8 +190,6 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMedical
@@ -248,8 +206,6 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockChemistry
@@ -258,8 +214,6 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
-  - type: Wires
-    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockScience
@@ -268,8 +222,6 @@
   components:
   - type: AccessReader
     access: [["Research"]]
-  - type: Wires
-    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockScience
@@ -278,8 +230,6 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
-  - type: Wires
-    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockCentralCommand
@@ -308,8 +258,6 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -318,8 +266,6 @@
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -328,8 +274,6 @@
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -338,8 +282,6 @@
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -348,8 +290,6 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -358,8 +298,6 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -368,8 +306,6 @@
   components:
   - type: AccessReader
     access: [["Quartermaster"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurity
@@ -429,8 +365,6 @@
   components:
   - type: AccessReader
     access: [["Security", "Command"]]
-  - type: Wires
-    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockCommand
@@ -439,8 +373,6 @@
   components:
   - type: AccessReader
     access: [["External"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 # Glass Airlocks
 - type: entity
@@ -450,8 +382,6 @@
   components:
   - type: AccessReader
     access: [["Service"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -460,8 +390,6 @@
   components:
   - type: AccessReader
     access: [["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -470,8 +398,6 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -480,8 +406,6 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockExternalGlass
@@ -498,8 +422,6 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockExternalGlass
@@ -524,8 +446,6 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockExternalGlass
@@ -534,8 +454,6 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockGlass
@@ -544,8 +462,6 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -554,8 +470,6 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -564,8 +478,6 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockScienceGlass  # DeltaV - Chapel is in Epistemics
@@ -574,8 +486,6 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockEngineeringGlass
@@ -584,8 +494,6 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockAtmosphericsGlass
@@ -594,8 +502,6 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockCargoGlass
@@ -604,8 +510,6 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockCargoGlass
@@ -614,8 +518,6 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMiningGlass
@@ -624,8 +526,6 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockChemistryGlass
@@ -634,8 +534,6 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
-  - type: Wires
-    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMedicalGlass
@@ -644,8 +542,6 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMedicalGlass
@@ -662,8 +558,6 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockScienceGlass
@@ -672,8 +566,6 @@
   components:
   - type: AccessReader
     access: [["Research"]]
-  - type: Wires
-    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockScienceGlass
@@ -682,8 +574,6 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
-  - type: Wires
-    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockCentralCommandGlass
@@ -702,8 +592,6 @@
   components:
   - type: AccessReader
     access: [["Command"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -712,8 +600,6 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -722,8 +608,6 @@
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -732,8 +616,6 @@
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -742,8 +624,6 @@
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -752,8 +632,6 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -762,8 +640,6 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -772,8 +648,6 @@
   components:
   - type: AccessReader
     access: [["Quartermaster"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -782,8 +656,6 @@
   components:
   - type: AccessReader
     access: [["Security"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -792,9 +664,8 @@
   components:
   - type: AccessReader
     access: [["Detective"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
+#Delta V: Removed Brig Access
 #- type: entity
 #  parent: AirlockSecurityGlass
 #  id: AirlockBrigGlassLocked
@@ -802,8 +673,6 @@
 #  components:
 #  - type: AccessReader
 #    access: [["Brig"]]
-#  - type: Wires
-#    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -812,8 +681,6 @@
   components:
   - type: AccessReader
     access: [["Security"], ["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -822,8 +689,6 @@
   components:
   - type: AccessReader
     access: [["Armory"]]
-  - type: Wires
-    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockCommandGlassLocked
@@ -873,8 +738,6 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMaint
@@ -883,8 +746,6 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMaint
@@ -893,8 +754,6 @@
   components:
   - type: AccessReader
     access: [["Command"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -911,8 +770,6 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockMaint
@@ -921,8 +778,6 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockMaint
@@ -931,8 +786,6 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -941,8 +794,6 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -951,8 +802,6 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -961,8 +810,6 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -971,8 +818,6 @@
   components:
   - type: AccessReader
     access: [["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -981,8 +826,6 @@
   components:
   - type: AccessReader
     access: [["Service"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -991,8 +834,6 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -1001,8 +842,6 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
-  - type: Wires
-    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -1019,8 +858,6 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMaint
@@ -1029,8 +866,6 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
-  - type: Wires
-    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMaint
@@ -1039,8 +874,6 @@
   components:
   - type: AccessReader
     access: [["Research"]]
-  - type: Wires
-    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockMaint
@@ -1049,8 +882,6 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
-  - type: Wires
-    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockMaint
@@ -1059,8 +890,6 @@
   components:
   - type: AccessReader
     access: [["Security"]]
-  - type: Wires
-    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockMaint
@@ -1069,8 +898,6 @@
   components:
   - type: AccessReader
     access: [["Detective"]]
-  - type: Wires
-    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockMaint
@@ -1079,8 +906,6 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -1089,8 +914,6 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -1099,8 +922,6 @@
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -1109,8 +930,6 @@
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -1119,8 +938,6 @@
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -1129,8 +946,6 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
-  - type: Wires
-    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -1139,8 +954,6 @@
   components:
   - type: AccessReader
     access: [["Armory"]]
-  - type: Wires
-    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockSyndicate
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index 476e715175..53a32e0f6f 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -130,6 +130,9 @@
     - board
   - type: PlacementReplacement
     key: walls
+  - type: IconSmooth
+    key: walls
+    mode: NoSprite
   - type: PaintableAirlock
     group: Standard
     department: Civilian
diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index 3709b739a3..8dfe2f62a5 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -51,6 +51,9 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: IconSmooth
+    key: walls
+    mode: NoSprite
   - type: Occluder
   - type: BlockWeather
 
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
index 55010eea51..1819c9d0ef 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -72,6 +72,9 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: IconSmooth
+    key: walls
+    mode: NoSprite
   - type: DoorSignalControl
   - type: DeviceNetwork
     deviceNetId: Wireless
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 0b3c291af2..518ff2f066 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -4,7 +4,7 @@
   abstract: true
   description: You sit in this. Either by will or force.
   placement:
-    mode: PlaceFree
+    mode: SnapgridCenter
   components:
   - type: Clickable
   - type: InteractionOutline
@@ -65,8 +65,6 @@
   id: ChairBase
   abstract: true
   parent: UnanchoredChairBase
-  placement:
-    mode: SnapgridCenter
   components:
   - type: Physics
     bodyType: Static
@@ -89,8 +87,6 @@
   id: StoolBase
   parent: OfficeChairBase
   abstract: true
-  placement:
-    mode: SnapgridCenter
   components:
   - type: Physics
     bodyType: Static
@@ -120,7 +116,7 @@
 - type: entity
   name: stool
   id: Stool
-  parent: UnanchoredChairBase
+  parent: ChairBase
   description: Apply butt.
   components:
   - type: Sprite
@@ -245,7 +241,7 @@
 
 - type: entity
   id: ChairMeat
-  parent: UnanchoredChairBase
+  parent: ChairBase
   name: meat chair
   description: Uncomfortably sweaty.
   components:
@@ -289,7 +285,7 @@
   name: web chair
   id: ChairWeb
   description: For true web developers.
-  parent: UnanchoredChairBase
+  parent: ChairBase
   components:
   - type: Sprite
     sprite: Structures/Web/chair.rsi
@@ -353,6 +349,8 @@
   parent: ChairFolding
   id: ChairFoldingSpawnFolded
   suffix: folded
+  placement:
+    mode: PlaceFree
   components:
   - type: Foldable
     folded: true
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index ee2ad6bc28..fca0b975e9 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -69,7 +69,7 @@
         acts: [ "Destruction" ]
   - type: Airtight
   - type: IconSmooth
-    key: walls
+    key: windows
     base: window
   - type: InteractionPopup
     interactSuccessString: comp-window-knock
@@ -242,4 +242,4 @@
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: windowDiagonal
+    node: windowDiagonal
\ No newline at end of file
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
index 59e3690b6b..28340ead40 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
@@ -45,7 +45,6 @@
       - BookMap
       - BookJourney
       - BookInspiration
-      - BookJanitorTale
       # Guidebook Books
       - BookSpaceEncyclopedia
       - BookTheBookOfControl
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
index 181bacca45..a75f31cf0f 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
@@ -36,7 +36,6 @@
       - BoxCandle
       - BoxCandleSmall
       - BoxDarts
-      - BoxCartridgeBB
     chance: 0.7
     rarePrototypes:
       - BoxHugHealing
@@ -50,7 +49,6 @@
       - PresentRandom
       - BoxHolyWater
       - MysteryFigureBox
-      - BoxCleanerGrenades
     rareChance: 0.05
 
 
@@ -102,8 +100,6 @@
       - BoxMagazineCaselessRifleRubber
       - BoxMagazineUniversalMagnumPractice
       - BoxMagazineUniversalMagnumRubber
-      - MagazineBoxSpecialRubber
-      - MagazineBoxSpecialPractice
     chance: 0.15
     rarePrototypes:
       - BoxMagazinePistolCaselessRifle
@@ -125,8 +121,4 @@
       - BoxShellSoulbreaker
       - BoxMagazineUniversalMagnum
       - BoxSpeedLoaderLightRifle
-      - MagazineBoxSpecial
-      - MagazineBoxSpecialIncendiary
-      - MagazineBoxSpecialUranium
-      - MagazineBoxSpecialMindbreaker
     rareChance: 0.015
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
index abd4d86a1e..c8efdbdc8c 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: MarkerBase
   id: RandomBoards
-  name: random device & board spawner
+  name: random machine board spawner
   components:
   - type: Sprite
     layers:
@@ -71,16 +71,6 @@
       - HotplateMachineCircuitboard
       - ElectricGrillMachineCircuitboard
       - FatExtractorMachineCircuitboard
-      - SpaceHeaterMachineCircuitBoard
-      - StationMapCircuitboard
-      - Igniter
-      - IntercomElectronics
-      - DoorRemoteFirefight
-      - RadiationCollectorFlatpack
-      - ContainmentFieldGeneratorFlatpack
-      - SolarAssemblyFlatpack
-      - StationBeaconPart
-      - HandheldStationMap
     chance: 0.8
     rarePrototypes:
       - TraversalDistorterMachineCircuitboard
@@ -117,26 +107,4 @@
       - ShockCollar
       - GlimmerMonitorCartridge
       - PotatoAIChip
-      - CargoTelepadMachineCircuitboard
-      - FlatpackerMachineCircuitboard
-      - OreProcessorIndustrialMachineCircuitboard
-      - TurboItemRechargerCircuitboard
-      - PowerCageRechargerCircuitboard
-      - HellfireHeaterMachineCircuitBoard
-      - HellfireFreezerMachineCircuitBoard
-      - BiofabricatorMachineCircuitboard
-      - SalvageExpeditionsComputerCircuitboard
-      - RadarConsoleCircuitboard
-      - RipleyCentralElectronics
-      - RipleyPeripheralsElectronics
-      - HamtrCentralElectronics
-      - HamtrPeripheralsElectronics
-      - HonkerCentralElectronics
-      - HonkerPeripheralsElectronics
-      - HonkerTargetingElectronics
-      - RemoteSignallerAdvanced
-      - SignalTimerElectronics
-      - LogProbeCartridge
-      - HoloprojectorField
-      - DeviceQuantumSpinInverter
     rareChance: 0.25
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
index f0dd470903..b9def15132 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
@@ -42,18 +42,6 @@
         - ClothingHeadCage
         - ClothingHeadHelmetKendoMen
         - ClothingHeadBandMerc
-        - ClothingHeadHatCowboyWhite
-        - ClothingHeadHatCowboyGrey
-        - ClothingHeadHatCowboyBrown
-        - ClothingHeadHatBrownFlatcap
-        - ClothingHeadHatGreyFlatcap
-        - ClothingHeadHatPartyRed
-        - ClothingHeadHatPartyYellow
-        - ClothingHeadHatPartyGreen
-        - ClothingHeadHatPartyBlue
-        - ClothingHeadHatWatermelon
-        - WaterDropletHat
-        - ClothingHeadHatRedRacoon
       rareChance: 0.03
       prototypes:
         - ClothingHeadHatAnimalCat
@@ -110,13 +98,5 @@
         - ClothingHeadHatFlatBrown
         - ClothingHeadTinfoil
         - ClothingHeadHatStrawHat
-        - ClothingHeadHatCowboyBountyHunter
-        - ClothingHeadHatCowboyRed
-        - ClothingHeadHatCowboyBlack
-        - ClothingHeadHatGladiator
-        - ClothingHeadHatMagician
-        - ClothingHeadHatHetmanHat
-        - ClothingHeadHatTacticalMaidHeadband
-        - ClothingHeadHatPirateTricord
       chance: 0.5
       offset: 0.2
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
index 61a99faa2f..7785e5aaa8 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
@@ -36,5 +36,5 @@
         - MatterBinStockPart
         - CrateMaterialSteel
         - CrateMaterialGlass
-      chance: 0.50
+      chance: 0.45
       offset: 0.0
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
index 0c3370890c..9f183dcefb 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
@@ -48,7 +48,6 @@
         - PeaSeeds
         - PumpkinSeeds
         - CottonSeeds
-        - LilySeeds
       chance: 0.95
       offset: 0.0
       rarePrototypes:
@@ -65,6 +64,4 @@
         - LemoonSeeds
         - SteelcapSeeds
         - KoibeanSeeds
-        - SpacemansTrumpetSeeds
-        - LaughinPeaSeeds
       rareChance: 0.05
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml
deleted file mode 100644
index e017096fa9..0000000000
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-- type: constructionGraph
-  id: ClothingShoeSlippersDuck
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: shoes
-          steps:
-            - tag: ToyRubberDuck
-              name: a rubber ducky
-              icon:
-                sprite: Objects/Fun/ducky.rsi
-                state: icon
-              doAfter: 1
-            - tag: ToyRubberDuck
-              name: a rubber ducky
-              icon:
-                sprite: Objects/Fun/ducky.rsi
-                state: icon
-              doAfter: 1
-    - node: shoes
-      entity: ClothingShoeSlippersDuck
diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml
index f1eb270af7..4fe2c474bb 100644
--- a/Resources/Prototypes/Recipes/Construction/clothing.yml
+++ b/Resources/Prototypes/Recipes/Construction/clothing.yml
@@ -85,14 +85,3 @@
   description: Two huds joined by arms
   icon: { sprite: Clothing/Eyes/Hud/medsec.rsi, state: icon }
   objectType: Item
-
-- type: construction
-  name: ducky slippers
-  id: ClothingShoeSlippersDuck
-  graph: ClothingShoeSlippersDuck
-  startNode: start
-  targetNode: shoes
-  category: construction-category-clothing
-  description: Comfy, yet haunted by the ghosts of ducks you fed bread to as a child.
-  icon: { sprite: Clothing/Shoes/Misc/duck-slippers.rsi, state: icon }
-  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 7608369b2c..e5afdbd6de 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -454,11 +454,11 @@
   id: IrishCoffee
   reactants:
     Coffee:
-      amount: 1
+      amount: 2
     IrishCream:
-      amount: 1
+      amount: 2
   products:
-    IrishCoffee: 2
+    IrishCoffee: 4
 
 - type: reaction
   id: IrishCream
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index 2f1a7f92d2..064b34adba 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -60,10 +60,3 @@
   description: trait-frontal-lisp-desc
   components:
     - type: FrontalLisp
-
-- type: trait
-  id: Snoring
-  name: trait-snoring-name
-  description: trait-snoring-desc
-  components:
-    - type: Snoring
diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index b30e68545d..338bf188ba 100644
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -15,26 +15,6 @@
 
 - type: wireLayout
   parent: Airlock
-  id: AirlockService
-
-- type: wireLayout
-  parent: Airlock
-  id: AirlockCargo
-
-- type: wireLayout
-  parent: Airlock
-  id: AirlockEngineering
-
-- type: wireLayout
-  parent: Airlock
-  id: AirlockMedical
-
-- type: wireLayout
-  parent: Airlock
-  id: AirlockScience
-
-- type: wireLayout
-  parent: HighSec
   id: AirlockCommand
 
 - type: wireLayout
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index c6a0ab3f8f..2694cbeaf3 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1190,9 +1190,6 @@
 - type: Tag
   id: Torch
 
-- type: Tag
-  id: ToyRubberDuck
-
 - type: Tag
   id: ToySidearm
 
diff --git a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml
index 9e8697a9e1..a2a04e03ef 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml
@@ -1,18 +1,18 @@
-<Document>
+<Document>
   # Thermo-electric Engine (TEG)
 
-  The TEG generates power by exchanging heat between hot and cold gases. On the station, hot gas is usually created by burning plasma, and an array of heat-exchanging pipes in space radiates away heat to cool down circulated gases.
+  The TEG generates power by exchanging heat between hot and cold gases. On station, hot gas is usually created by burning plasma, and an array of heat-exchanging pipes in space radiates away heat to make a cold side.
 
-  The TEG relies heavily on atmospherics piping. The only truly special component about it is the generator core and circulators; the rest is all off-the-shelf atmospherics equipment. Note that while the exact layout may vary significantly depending on station, the general components and setup are usually the same.
+  The TEG relies heavily on atmospherics piping. The only truly special component about it is the generator core, the rest is all off-the-shelf atmospherics equipment. Note that while the exact layout may vary significantly depending on station, the general components and setup are usually the same.
 
   ## Generator
 
-  The main generator itself is a machine made up of 3 major parts: the central generator and two "circulators", in this arrangement:
+  The main generator itself is a machine made up of multiple parts: the core generator and two "circulators", in this arrangement:
 
   <Box>
-    <GuideEntityEmbed Entity="TegCirculator" Rotation="180" Caption="" Margin="0"/>
-    <GuideEntityEmbed Entity="TegCenter" Rotation="90" Caption="" Margin="0"/>
-    <GuideEntityEmbed Entity="TegCirculator" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="TegCirculator" Rotation="180" Caption="" Margin="0" />
+    <GuideEntityEmbed Entity="TegCenter" Rotation="90" Caption="" Margin="0" />
+    <GuideEntityEmbed Entity="TegCirculator" Caption="" Margin="0" />
   </Box>
 
   The circulators take in either a hot or cold gas, and pass it through the machine to exchange heat. The gas then gets output on the other end of the circulator. The generator produces the actual power and outputs it over an HV wire.
@@ -21,172 +21,19 @@
 
   There is no preference for which side must be hot or cold, there need only be a difference in temperature between them. The gases in the two "loops" are never mixed, only energy is exchanged between them. The hot side will cool down, the cold side will heat up.
 
-  ## The Pipes
-
-  There are 2 major pipenets to worry about here: The Hot Loop (where gas will be burnt for heat), and The Cold Loop (where circulated, heated waste gas will either be removed into space or cooled back down). Make sure that [bold]both pipenets do NOT mix[/bold], as only heat should be transferred between the two through the TEG.
-
-  # The Hot Loop
-
-  As I'm sure a wise person once said: the best way to make something hot is to light it on fire. Well, depending on context, that may not be very wise, but luckily your engineering department has just what's needed to do it wisely after all.
-
-  As stated above, there are many different layouts one can follow to heat up (or cool down) gases; this part of the guide will cover 2 common methods one will often see for the hot loop when the TEG is setup: The Pipe Burn, and the Burn chamber.
-
-  Side note: Plasma fires burn relatively cool compared to, for example, Tritium fires. It may be viable to extract Tritium from an extraction setup (using a 97/3 ratio of O2/Plasma) and react it with Oxygen to get truly hellish temperatures for power. Although, this is just a recommendation; I'm not ya mum.
-
-  ## The Pipe Burn
-
-  Also known as the naive method, this is generally discouraged when working for efficiency. However, if all you need is a smidge of power to run the station, and you don't feel like setting up the burn chamber, this method will do.
-
-  TODO: Remove this section when atmos pipes are updated to have pressure/temperature limits in a future atmos refactor.
-
-  Most (if not all) pipe burns follow this general layout:
-  <Box>
-    Gas input -> High-pressure pump -> Pipe segment (with heater) -> Low-pressure pump -> Circulator
-  </Box>
-  <Box>
-    <GuideEntityEmbed Entity="GasMixer" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPressurePump" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPressurePump" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="TegCirculator" Rotation="90" Caption="" Margin="-3"/>
-  </Box>
-  <Box>
-    <GuideEntityEmbed Entity="GasThermoMachineHeaterEnabled" Caption="" Rotation="180" Margin="0"/>
-  </Box>
-  - The Gas input is pretty self-explanatory; this is where you will input the O2-Plasma mix to be burnt. A 2:1 (67/33) ratio of Oxygen to Plasma is recommended for the hottest burn.
-  - The High-pressure pump serves 2 purposes; first, it prevents the burn from backwashing into the supply pipe, which would be.. bad, for many reasons. Second, it maintains a positive pressure in the following pipe segment, which is important to allow the burn to continue, especially since hot gases expand.
-  - The Pipe segment is where the burn actually occurs; to start it off, one can use a heater to increase the temperature up to the ignition temperature of Plasma. Afterwards, the reaction should be self-sustaining, so long as the Pressure and Moles supplied remains high enough. Be warned; if you wish to remove the heater, it will carry some of this superheated gas with it, transferring it to the next pipenet you connect it to. Best to space the gas through a space vent, if you must.
-  - The Low-pressure pump (whose pressure should be [italics]slightly lower[/italics] than the input pump) prevents [italics]all[/italics] the gas from passing through the circulator, which could result in the loss of the Moles required to sustain a burn.
-  - The Circulator is where this generated heat will flow to the cold loop; afterwards, feel free to space the waste gases.
-
-  Note: Pressure pumps are used here as, while they pump on pressure (not flow-rate, which is comparatively faster), they are a bit easier to control when it comes to the limited Plasma supply on-station. However, the steps shown can be followed with volumetric pumps too.
-
-  ## The Burn Chamber
-
-  The burn chamber is the preferred method for heating up gases, and it is commonly used for other purposes too. (see: Tritium production)
-
-  Most (if not all) stations have the burn chamber separated from the main atmospherics block by a 1-wide spaced grid, presumably to prevent conduction. The chambers consist of 3(+1) important parts:
-  - The Air Injector/Passive Vent
-  - The Space Vent
-  - The Radiator Loop
-
-  Most normal burn chambers don't come with Heat-Exchangers; instead, they have air scrubbers (and optionally, an air alarm) to help filter for Tritium, which is a highly reactive, hot-burning gas that can also be used to heat the TEG efficiently.
-  However, this is a slightly more advanced setup than just burning plasma, as it needs 2 burn chambers instead of 1 (one for tritium production, one for burning said tritium), so remove the scrubbers and retrofit the burn chamber with a parallel array of heat-exchangers instead.
-  
-  The air injector (or Passive Vent) injects air (or allows air to flow) into the burn chamber. Either should be supplemented with a pump before it, to keep pressures high.
-  There is a notable difference between the passive vent and the air injector; the air injector can only keep injecting air up to 9MPa, which can be reached very easily with a good burn. Ideally, switch out the air injector for a passive vent connected to a volume pump.
-
-  The space vent (designated as a blast door to space on one side of the burn chamber) allows waste gases to be expelled and destroyed. Open this to keep the pressure under control.
-
-  The radiator loop collects heat from the burnt gases and brings it to the TEG. To maximize efficiency, hook up the heat-exchangers [italics]in parallel to each other[/italics], with a pressure pump at max pressure after the array and a volumetric pump before the array.
-  The pressure of the volumetric pump should be set to ( 200 / number of heat-exchangers ) L/s. For example, having 2 heat-exchangers would mean you should set the pressure to 100 L/s. 
-  Finally, fill the whole loop with (ideally) a high heat capacity gas, like Frezon or Plasma. (Yes, Frezon =/= Cold. Frezon has one of the highest heat capacities in the game; so long as it isn't reacting with Nitrogen, it can actually be heated and can store heat really well!)
-
-  # The Cold Loop
-
-  As with the Hot Loop, the Cold Loop must also be setup in order to operate the TEG. However, the Cold Loop is usually a lot more low-tech than the Hot Loop; in reality, the Cold Loop only has to be "relatively" cooler -- hey, room temperature is technically cooler than the surface of the sun, right?
-
-  There are 3 main methods you will see used for the Cold Loop: The Water Cooler (see: Liltenhead's video on the TEG), the Coolant Array and the Freezer Loop.
-
-  ## The Water Cooler
+  ## Burn Chamber
 
-  An equally naive method as the Pipe Burn, this simply involves taking some useless gas (in this case, Water Vapour) and flowing it through the TEG and into space. It's dirt-cheap and simple, at the cost of efficiency and permanant loss of gas.
+  As I'm sure a wise person once said: the best way to make something hot is to light it on fire. Well, depending on context that may not be very wise, but luckily your engineering department has just what's needed to do it wisely after all.
 
-  Setting this up is so simple, even Hamlet could manage it. Just take an output of a gas (here, Water Vapour), send it through the Cold side of the TEG, and then vent it into space.
-
-  <Box>
-    <GuideEntityEmbed Entity="GasPressurePump" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="TegCirculator" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="WallReinforced" Rotation="0" Caption="" Margin="0"/>
-    <GuideEntityEmbed Entity="GasPassiveVent" Rotation="270" Caption="" Margin="-1"/>
-  </Box>
-
-  TODO: Remove this section when gas miners are removed in a future atmos refactor.
+  TODO: somebody fill this out once we settle on a general mapped layout for burn chambers.
 
   ## Coolant Array
 
-  This is the default method for the Cold Loop you will see on a variety of stations. Being of moderate complexity and having no losses of any resource, this [italics]should[/italics] be the main method of cooling down the TEG. However, every station at the moment somehow has their heat exchangers hooked up wrong, reducing efficiency greatly. (Thanks a bunch, NT!)
+  A whole bunch of heat-exchanger piping in space. There's not much to say here: gas goes through and cools down.
 
-  To use heat-exchangers properly, they must be setup in [italics]parallel[/italics], not in series (like what you see on most stations). A gas pump at max pressure should be placed after, and a volumetric pump before the heat-exchangers.
-  The flow-rate of the volumetric pump should be set to ( 200 / number of heat-exchangers ) L/s.
-
-  Simply speaking, the Coolant Array consists of 3 major parts: An input connector port, a few pumps and the heat-exchanger array out in space. It can be setup like so:
-
-  <Box>
-    <GuideEntityEmbed Entity="GasPipeBend" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeBend" Rotation="0" Caption="" Margin="-1"/>
-  </Box>
-  <Box>
-    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="0" Caption="" Margin="-1"/>
-  </Box>
-  <Box>
-    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeBend" Rotation="270" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="0" Caption="" Margin="-1"/>
-  </Box>
-  <Box>
-    <GuideEntityEmbed Entity="WallReinforced" Rotation="0" Caption="" Margin="0"/>
-    <GuideEntityEmbed Entity="ReinforcedWindow" Rotation="0" Caption="" Margin="0"/>
-    <GuideEntityEmbed Entity="ReinforcedWindow" Rotation="0" Caption="" Margin="0"/>
-    <GuideEntityEmbed Entity="ReinforcedWindow" Rotation="0" Caption="" Margin="0"/>
-    <GuideEntityEmbed Entity="ReinforcedWindow" Rotation="0" Caption="" Margin="0"/>
-    <GuideEntityEmbed Entity="WallReinforced" Rotation="0" Caption="" Margin="0"/>
-  </Box>
-  <Box>
-    <GuideEntityEmbed Entity="GasPipeBend" Rotation="180" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPressurePump" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="TegCirculator" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasVolumePump" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeBend" Rotation="270" Caption="" Margin="-1"/>
-  </Box>
-  <Box>
-    <GuideEntityEmbed Entity="TegCenter" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPort" Rotation="180" Caption="" Margin="-1"/>
-  </Box>
-
-  - Connector Port: Use this to input a gas with high heat capacity; most of the time, Plasma or Frezon is used to do so, as they both have very high specific heat capacities (although most any gas will do). (Yes, Plasma =/= Hot. You can cool it down, and it acts as a really good heat exchange medium.)
-  - Input/Output Pumps: Used to make sure gas keeps flowing through both the Circulator and the Heat-Exchanger array. As the gas cools down and heats up (and as it flows through the Exchanger), pressure must be applied for it to keep flowing.
-  - Heat-Exchanger: Basically, just a bunch of heat-exchanger pipes in space. Not much to say, besides the fact that it cools down the gas inside it. Make sure the heat-exchangers are placed on lattice, not plating! Otherwise, the heat-exchange efficiency will be greatly reduced, as the heat-exchangers aren't directly exposed to space below them.
-
-  ## The Freezer Loop
+  ## The Pipes
 
-  Most of the time, you will see this method being used in efficient TEG setups. It's basically just the Coolant array, but replacing the Heat-Exchangers with a freezer. Even though the freezer does use power, it is only a small fraction of what the TEG can generate, and it's better than the default Coolant array at the moment, so go fish.
+  TODO: somebody fill this out once we settle on a general mapped layout for burn chambers.
 
-  Just follow the steps for the Coolant array, but use a freezer in place of the Heat-Exchangers. As so:
-  <Box>
-    <GuideEntityEmbed Entity="GasPort" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeBend" Rotation="0" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasThermoMachineFreezerEnabled" Caption="" Rotation="0" Margin="0"/>
-  </Box>
-  <Box>
-    <GuideEntityEmbed Entity="GasPipeBend" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasVolumePump" Rotation="270" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeBend" Rotation="0" Caption="" Margin="-1"/>
-  </Box>
-  <Box>
-    <GuideEntityEmbed Entity="GasPipeBend" Rotation="180" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="TegCirculator" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="90" Caption="" Margin="-1"/>
-    <GuideEntityEmbed Entity="GasPipeBend" Rotation="270" Caption="" Margin="-1"/>
-  </Box>
 
-  Once again, use Plasma or Frezon in the loop for max efficiency (although most any gas will do).
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
index a377c980e5..b7ba3d4c8b 100644
--- a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
+++ b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
@@ -14,7 +14,7 @@ A large portion of Xenoarchaeology gameplay revolves around the interpretation o
 
 - [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]Current value:[/color] the amount of research points an artifact is currently worth. Extracting will set this to zero and traversing new nodes will increase it.
+- [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>
diff --git a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png
index 76cf88f02e7da24dc4e0c870d0f97c23a378dec1..44e093f26ad03f1554ba2c82804912058ee2d74b 100644
GIT binary patch
delta 282
zcmV+#0p<RK1GNH>B!B!#L_t(|ob8l7io-AvM!#%2gIozT7f4vL2^iGn7Os32pTHN$
zjRs88smL~)PL<uppjN3iBt@1e{(&WWoj}998O;cYL?Z9bEaWl~`BVs;yADm$1jY6i
zAR=EB1ppw+GL&UGh{Q)|a%P4x231voi2Ni1zc4d)`vaJ{Z-3s`1e|l&&gO8=!5A~W
zz!>~50j)JYH!EnZ0RX8G(+OB>A*Do;B#=_VT8nen^%i(~kC%&u|5~rF=kMbYKc~}O
zyi)4AmTlV(@=@JEL_W`R|7ib}QvO!r8G>dY6#{i#|M~W#RDR2&3PUR&RH9Gvm)kY^
gz(pdF$W&Yae-q<UC?|Ml`v3p{07*qoM6N<$f_K}0rvLx|

delta 360
zcmV-u0hj)@0)qpPB!3BTNLh0L01m_e01m_fl`9S#0003sNkl<Zc${Nl7+^5!fKdmG
zI$+cRBs;*%JK{f#efIPrhL^9NG1AQeAj{?D6j8*0j`&ZBBZzhY%yMHh19S&4Py$Gf
zf<1ef!L*CZU$~fvsMP;AugMDqq8;$?!8L|g&p$E5t*>KP6n_}ZAjqfBaOluhu$-iX
zB#0u*5md<q++5sXM*tl_vR;xLASTHN_B}edbMFoVxqxT~ym|cwNM2*Gv-8FxM~7Sh
z&1(N)@lGv3QWU@(fkg}q<Q3HZfBpJ}ft#C$0YnoMG9)L$zd-9%lvEg=zkC7A8Mja@
zmlT&^NXf_s^I<E>3W+k0tX%N*+gApVWeiB60pf$iVHOjcE=YC&)ZqW1YzK7&+)>Y8
zJSRCpk`)3lN8k`A36Nb7QIhqj;s9!aQ3s4VVAKHv?f?L_T728mW+AZv0000<MNUMn
GLSTYn@R*PQ

diff --git a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json
index 50d4add03c..df6ee47d08 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/base.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png
index 805de4537d102c42f4d287b8f28954374e3b733e..608b9ef7a0a787b53eddbfd9d8f25b67c1187e72 100644
GIT binary patch
delta 231
zcmX@Zw18=XW4%g%Pl&68goK)^YJPtH{Q2{ZjEwFsn5&_oaW^wLIyyQqFi>1voPmKM
zQAYJLkm4x`@(cct01QI+&z%E`a~60+7BevL9R^{><M}I6fP%T6E{-7<{%`vog&Gt%
zTpQ20ysN+8Gl!`(=jy6|=l;v_G$q(PX=ZxhU@j`4ySLE1wY@R1bwk@uf$bjp+?r~K
ze(g$P(cAyvB%5Q}HCD@XU6V4VS9_lN9jJ***eR@4c!&FxO+HKg{AGf_{u~mVD7&;r
W^Y-kT+24RRGkCiCxvX<aXaWG!gI(7E

delta 276
zcmZ3$bcShyW4&>JPl&6RcZ9f@RAy%7ocSy3GfOt5R29e05fPQr*4AtF3A>w_tgCBm
zVQ!Zc5b0y-E3cr&z`)R{tneO436=!;1^-6_4618qCIKZm3p^r=85sDEfH31!Z9ZwB
zV5_H#V~B<S+w*~ZhZK0~8y*H-X$m?0*FSrrTlC2fOuyyLX4NvX{q<L$!OFmJa@u?w
z2A7x?<_633JB_EmE^ElyBBSv&ZsQWMqg*>~+I)TxIG^i9L3_v-{Zr2-X>E~x;dy!b
zgqnWNhKMhkb3O}Z=qTO!W6Lbj^mVuId!-j9o4&qbUo$u1%5Uzu|7_&yI^B5dflgxZ
MboFyt=akR{06h$KCjbBd

diff --git a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json
index 687531cde5..774e33fbe7 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Edited by Flareguy for Space Station 14. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Edited by Flareguy for Space Station 14. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png
index fa790f7e9908db0be117835f39c7dcf37e749983..671111e4bc651c86eee58143c75981fba5a05cea 100644
GIT binary patch
delta 300
zcmV+{0n`4H1I7Z7BYy!6Nkl<Zc${Nk7zLwX6pVDhNQz<!35oxFyu1vbK7VF-@!|zZ
zdMS2*goMQZEtBHme4o69RB;3osg|d8>}HVG^<>yGDV{+>LgGJN8~_7p9lIII%E}nL
zql+lDmpli2`}U1t&6+g~-@bht7zfY-3@r!bx(YH}xpIXe*MC)zfq{X6fsdD$Vh6Ag
ztMKIELktokTnt=XKN%!MxEM|zKE&|p^Jj`3Ky*G<Q&s&RX~6^G{Qb?a{Pa(TTeokc
z=oc3khiA)|FJDrnph5u>5)%LGqjdh`%Kzfx;{TByK@1=%4e;^uGR)Zf8gJaw#OKHW
ymk&wxIaM7&i6!M^2N%r~+$b0YqhJ)!3jhFIX;GoKhVf|t0000<MNUMnLSTYv1BY+`

delta 376
zcmV-;0f+v^0+IueBYyx1a7bBm000ie000ie0hKEb8vp<SL`g(JRCt_YVHjXA>VQ!P
zj5=V{0VF#>UeMq_GXLTG3ygGg0Lb#b0%17+)TuWND~=ibr^FFNI{;?6yom{t=oz2`
z-ZD@ENREP@Wu{=dB<eI=Ohi=b|C`s($O;9L9I*OUCWBR*H-E#Tz+i@lXMTdCfPsOL
zK~h2zBu$nhsFDk~xwyfO06KtVy(BpxRBbv#d*D0<70o0dZ#rE3&b>Pf<N}f$01EO-
ze-RYRL4e%&C&>YztOm+*K<gN&2}lY7gd<SJU~G8>wf|qgeqrF|=3xNQ#DomViSR4S
zD+U!M6^7?8UvV%zd~gfJa!GLshLntKFu$U#kSO!W$^~D)ePsYy1_bcX0P#WMFpG&z
z7bH6XYVdzhwu3qX?x^Q4o|Bv)$qE6OBXEe51jsIkD9L(MaR9Zzr~^hFFzSE-cK`sL
Wa(=4DC}uVQ0000<MNUMnLSTZgJ(|)0

diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon_alt.png
index d943c6341894bbb5e80d5364580876e348130608..439a4b6e52966af9972f6e49cd53d7c4798f2afe 100644
GIT binary patch
delta 501
zcmV<R0Sf-^0)zyR8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00Fj1L_t(o
zh3%EGPr^VH#y^Znv9UEENpF`jHBH={9Eh;^7Z{^1CMF~-4vhLgIGB*IyD*sGgoHsC
zT}dZO!YB|zVk-ws=hUVMO<PKE>9;h!d-uLy-@Cg4ks?L<XMe?lF389-1AsWk*<&qD
z3!G;q098?#^L;v-A<l93a}^NZ3o^3IEVH(*$J~IdxwQgVMs5bGqA+JQf<Sl%=CfHw
zCld^Y!@0f#^S!qq00aWq@(QRon=yW8XTe+)1mv?>y9I;c5Qb^OFim@-`q9d}S5*`y
z3IYJ2)9s>BDSy~=C)bY<1;JM(JS*TPtNc#$%e!an9~`4mDZnsIUwKvru*_c`u59yC
zsf5$>TL3_#QUD>uvlXELtQJh^7?e^}t5r}+1LX(>005uwZwq5nI^G-rN%5f|LIboq
zBajr2VlDwq(@@MM0<GT;W8T*FSlJ}(27sDQg6C%-DQ+IMS{>!rFZ6mn&tvErAW4$F
zll%St()f%lv$LaJsOcnHoe`cseggj!JRzJQ%R~ra_ZNrE&(U+rH>D&=Y)=%IewlUk
rejA2sl|lpjHFIjM<&G37(x&wb&nUgko0fn-00000NkvXXu0mjfMLO2r

delta 336
zcmZo+dB-$CvYwfNfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=$Dz$e62
zSJzlxLCwP4&dW1UL{v&%(BRCf^0kf5p1!&Dv4$ZbAuCp_C@O21Gk+ye$IjaiL5A~}
z1o;L3M*$31?#x&Sl;SM#n5ZsT&#>Op#WBRf|Ln!re1{b{SQ7#+Y`t6a|M=aDH$~sP
zeO@+6&9r8t$cj5p_!$MiZ#R_-;7AnUyYj1|mEBN?{}5B3pm+>(l3?K>hSZV;U2bb`
zG^jE7RSLu}c*#7=f-Q1}>ilLMewR-rjL()beqYX~^O^U>d<(|lV?6=x{LA(=s=2MW
zc3!<Ra8;K5T0@4@FHUchE_PVK$#wp^VMf!38D=&sn6#(Xt&(&&Xm{gUdBXJj%|Z97
X@9L|+oOnGR=m!Q*S3j3^P6<r_Ic$lX

diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json
index 84f0203236..1e84b43d94 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/cargo.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon.png
index 070bbfd16a652c755399db14a4928134b3ee8f80..4ee60687d09860657556e171f9ae70c31a1d19a7 100644
GIT binary patch
delta 299
zcmV+`0o4Ap0=oi`8Gi-<0047(dh`GQ0Rl-xK~#90?Ub>K0x=MVf0wHk3|Jf)u#;oa
z)`$qci>2@3W9)lea}OX~VO}8k0NF}dF@=a@rD&mS-0Z?}`MN+R^Gz}tAQFlEcRD_s
ziHJqFi*mn*wbm=PHblfK2df;6jbb9=5a%XUllNB^0KoYeOMeB}?><6ER1&zt`50Pj
zY*diq{RNzJ=wJfp9F*4W3pBys5;#r`hNA<HQv(1HLbNBaTPNtv&q&i0z4;ltb%L@i
zYYS8!CRvv8X|}zsKYqVpjCqKcQr^BtQ54|^6%p}ZkvttjQcAv;sDf7y2qAFz`F#2I
xjZ}WmvkHAH4<ss4C;8jg)p)~2B9Ta2TmaedQ%NfWa1H<f002ovPDHLkV1n?ifv^Ao

delta 291
zcmdnZw3%swWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hcfKQ04
zh^UnDOa=>cJBBmHUY>y_MqUj6jpYRmbajoD;+W(W)aJ}z2~;aRyJ9Pl;w=gC3;vG;
z7;IlCwE-nK3p^r=85sDEFfi2f9bufR%_j{Mt?_hm46*Qkdm&n=L4kucU`LwN&i`NA
z`lU9kG`sLO;Ns&G9#56+UlcZ&Bv&5I6EHU54i;_~m=-RuxXCj@;QEmTZ;r|;^zS-u
zJ8@CdOI~iXG_m?O4PCx*2Y&`SwN)})4BYVEU%}aBLhgLN5Jp@1&~Em%-7jU%&5-}x
cJS&K=d96<B+9w}FfDU2sboFyt=akR{0761+Qvd(}

diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon_alt.png
index c1dbd8ca3ce636aba48266c7f5597faba7223078..0927232ed58b88f8950812184a9ca5006c90873d 100644
GIT binary patch
delta 454
zcmV;%0XhEj0@VYM8Gi-<0047(dh`GQ0h~!hK~#90?Uk`g!$26v|8YqxB%%~^P;fFu
zAyjCz50Igg&(ZhrF?^3s9lE*o7U>{up_7o5U@^g~Ey6jJ3u$f0C8@gPw}eaXzVDas
zyGwwQl9GQ$$-1Cnnj8Qssv6yU9*r``$tBRVEFK?!u2!h1YJYUiBO<+^VVYbd8&4)m
zl8|_IPyvxBDM8b+c)S`}BvL1K9EY>z5_8|*>N~LAdm#ZJlfY5hg#KWl99OG9lIxm=
zj^jivnEO70FhmfB(MFXa_wH?47S}Zm05F}+P=9biZ5seU?q8v6np7oHE0BaJzeo-M
ztu9B`2Haj9L4O!Z#mOzOo18zkKq<x0-c;Z1)j<eJZABpgUDL35+Js<?LBTB;W3VZO
zO{r9jLIMIIk%z(p!He{U{~ZA#v2KrXb^U>Ldz@))?qet*gz&Em4**bG-C=z*1OTx9
zIb7FGjh{NfFpQ|ip6BhI-!M)7b~=s5XN$|s|AbVDxIf4~2qC=IR=CX3iz97m7zRJl
w^}TN<KE3ZjkXWU{0=voL9JJgeB_)5&HzFOiY6t0a&;S4c07*qoM6N<$f^)~uMF0Q*

delta 355
zcmcc0{F!NjWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g&fKQ04
zuCB4Xf|`Z7otI~zh^UmBsw%@7W8;|&N^wk{zPTc1jQ{`tXZUYiRMs$O{z{;x^vQpY
z04afzAirRs6f$6Vpd2g7z);V?S>O>_%)r10RLFOPajG_-G*HI|PZ!4!3;(khU-LB^
zaIhw1I9iv!{=NUL-)^gg_v-T04L3gYc3n_2*`CGa&b@0D4vH;)76GsRipm}FxWmb9
z;TBWC+u?eIlX=R;MlGq0Nz7IZ9}LPKahLpP(CRy=amHv~vkJe<r4q(xF-w`gFXz+w
z%$qUaf-(3|Pk=lBvVDzOE3TYZ?+jd(Wxdvr;dI97ZPLXKE4aAMUpHLQ^kIgXjRuqU
p)H1D?4#(_nTq{qQe!qFnegAx;vb$cp{sA4&;OXk;vd$@?2>_FWj7tCj

diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json
index 84f0203236..1e84b43d94 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/centcom.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png
index 9023333660826fa40f4c0b68a142dc4e12b17aa6..30e1697c3ce082b64e96a81d29505423503e98e7 100644
GIT binary patch
delta 299
zcmV+`0o4AC1H}T6BYy!5Nkl<Zc${Nk7zLwX6pVDhNQz<!35oxFyu1vbK7VF-@!|zZ
zdMS2*goMO@|Eg971_lO(nW|C@5{Zdaa|BVAr%#&uKYh~N|3*ee{~7-O|Ie^}`+o@u
ziT{+E%|wdg(+j3DoIQJ%!N}N{QhUjBz_)MT7#Mf#VEFd!8-GLk?Pv6N04>1Ka)7S2
zH-koDA%m{9Hv<C$0|Or)AN?Hg@X%2RgPjk~|Mck-#SS1kAFHXU{a4bnf%ETOI>K=4
z)-4qM;^N})Z29u#OX`;q5)u;sJwlRj=6`W<@&Cw<AO?_>2Ke~+7|tKwiZ||Q;&Wtx
x%ZH@;oT`qX#3XXEgNx<~ZWN4yQ7{VV1pxH%RrLglhgbjr002ovPDHLkV1gqYlHC9R

delta 370
zcmV-&0ge8}0*nKYBYyx1a7bBm000ie000ie0hKEb8vp<SK1oDDRCt_YVHjXA>VQ!P
zj5=V{0VF#>UeMq_GXLTG3ygGg0LXHWoLo5n_St(3496M%Q{o7s9RRaj#zGNA{O)lE
ziU7$`VAh`xrcV`4go}xYO8tNH`WacFK#~K3j!$4PsZeF8kAJ_-@cYDlNE85pq=Y1h
zBFhm}$pze8++arl9YC^Pk{qzkvVdW8`~(JHO&}Xd{LZ~Q4CDfm8~_S()uaLx%RzwL
z_$SE$;H(DBatsXK4AcZ9g#f}4Xkt(xub}q->(?&~+}u12AexwvAvqC#WqHM*qNKv`
z{N)RVhYxO{SZgjRF2RtJkqzcolob+X9$C5I>$k5AAj^ON9vUD%NE~J{vFU<j2S5$}
z56X5>N5CER{Ka#U6C_z70CNNmagqSp1ra4#k17tJ78rHFr~^hFFyIaV01k3`k;tpE
Qi~s-t07*qoM6N<$f>a=vmjD0&

diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png
index 51a87cef7994958a1e61f7f23301d9c5201d84ef..a01e0c6c13e9e939597ff9f756a3fcaa3073a6d2 100644
GIT binary patch
delta 479
zcmV<50U-Xs1o#7xBYy$ENkl<Zc%1E&u}i~16o-EiAy!D7<Zcuponn<biMn(sqJxXz
zTo=dU>f+?$q%IC31;IZ-S{%A`?ocTXZLyB6ElLweD-O@0T&UWbOQX2tTaLTj-TQLy
z-2ovXA^(ixcR|!J2mq#3)g8MpmwoRumO#ujX|UgWd&88fx_|9BBGL<@hCw1&rCL=+
z35jpNDj))l3J^0*8axd@5}p&2i3B;_E}q-%Pk9GE=Uzwv@Fg(eHQ_FwSEeJ8Z^3m<
zLo$(YQ}Enw!?JByw(S<G3}aVs%rr^YGyp)YUdQgy3C`wb0RTLeg05-4>%li`D=Wk~
zr~UIQN?%-4JbxZ15D~Ij;+#vJf@cbTqE@eC`|ub5P`Erru~<ZWc^LrE$YdZR5lBGS
zG`y4^0055TK*{CcI1bWJEu^1XQhNjv5C{oD@BLkRZD0Yr^Ez}~R$?-!fRI>N-2x5{
z`mGNF2~?_8#j<T$THEZOgsKDRr=)OugGQs_c?~@$Fj&UiN^UlrL+3{ggXS04-Tq^#
z@VjpSV~hqxhQT?fjh#K|`!A5TWQ@^_t`Ge)@$_~qYvd^f7Wf)$kUxKNLqbCSk`Huc
V#8~n?4VC}^002ovPDHLkV1k2E)|dbQ

delta 552
zcmV+@0@wZc1Hc53BYyx1a7bBm000ie000ie0hKEb8vp<S@<~KNRCt{2md{H9K@`Wo
zl9yb6kR4L6tc#=|1QAI0pok#wUyzVO=+w<ac<)jNi698C9fOYD>=JZ}D6A|=ODoFO
zj<#=bY$d~)RrBH(mf4*-d_QmA+j(O~kJSh00~iJf2B)huet(q9$lhI<{uO}C6^p{&
zYh%?YgfxKOoTOG%v?D`1;B*eN@gaB5Qed~);2rlF+65^9G8y%ZvG>>47j!~~i;%XS
zqF2>V_HaPiT@VKF4ozuQUulf|-2w#`*gXT#)rAy<5CEA+Qd`(ti`M5T`ba8?-03Zj
zceVkK${^e$E`KSAmH^!RFL^=}m`AJuLPo+Vphzj#`KJQ=rgxenfOaGVKt_kjIA%iO
zhIyI`BZ2F)o9+VWwf=R2!1g3oHeA2fs4lt=K;{>*OJLB2PDmPnMcyHEVF1c;IGSKN
z*Nf)#`KKdUwmY^2$iAJMkcM^$E!H92E;nYESL^1P^nVdl^D|JkqAMpMhsdP0_Uo{+
zf1UmJ`gKjEBBUi;1Kh;x@Ue>s9ly=Co7y$+kRs`jE<)CPDnBQlz5(&O!ra0V0)9Ud
zn{l*~G(f5NNM=>40}jEjXY@^Q2m8BF6tQ|R)Q+1$kjOk=$g_3PdN6z+;1CpP9Y9M@
qZC+SyT_MY5BJB!5C)5Y%Ilwm%yYQoVR*XFW0000<MNUMnLSTXwN&sm9

diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json
index 4a16d0c71f..1e84b43d94 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/command.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon.png
index 536a9911993df71b654fa48324f807d44d5bad3d..d39d3680dfa4434eae717731963bea3d5bfaf679 100644
GIT binary patch
delta 254
zcmV<a00IA%1DXPmB!A&aL_t(|ob8l73WGopM!%#~w4J%YdH}Z<av6IGc#9k$p20ih
z0+v?s0@^BUJ1G(*DJ1bXgzST5S=ixw#moQ}i{;<hjrq*X;(H$2u0vhdqiScv%p!$;
z90)VZSHi<E6p?r_iT#+*Iu@j93ayK|xzhxUG05{A#uxy4dv}2~_$`4Xa#5BglE?)B
z_@1|&K$hKa$8q|1+jX-AK3*n)QgS@_{rhxjajmMCdLrt_vT2&-7Zo$hIo5;oPek%8
zu{eQJLPQcMH7KxJ_`8rz!iU1<gimgi)f>)Yu~@d^1_r`e2H1rglmGw#07*qoM6N<$
Ef-{zO?EnA(

delta 378
zcmV-=0fqjW0+j=hB!3BTNLh0L01m_e01m_fl`9S#0003;Nkl<Zc${Nl7+^5!fKdmG
zI$+cRBs)M}(BMBZ|Ka-!jC6AV$nqnr#NhlZ+n+OJ%s2Q?i6e-10L*eO6)Cuwjwg_q
z|B8VUKynmh*Z6?xsV!UJVj`ka|KGfRMph`0<bcuzX$)3v-hT{>0)rX8-T4EK0tN<V
z21yA?kThA2ph_;_=HdoB0_Xse^^)X(?u1zkfr0ZFR5X)-yjgJZJNND|kPAq104T`U
zcS@pI4g%!HKS>S%Wi?Qio5Ap$ftrA%5P&%XT@1#SS5W)^_3IY~Zf+h15KT<Tkemp=
zvb<tYQBq-e{&VsL!@~!+P%M`emtaWA$OiK($_j}xkE~qq_1jklkYzvs4-F6>Bo4Ef
z*mOa%1E2=~2W2~`BjApD{^B{w36iW3fH?w(I7xu)f{2o=M->N93yeBo)B&Ro7;pyw
Y09Yn{%O~)p!vFvP07*qoM6N<$f~V4+{Qv*}

diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png
index 98259eb0700d261983bb1064ac563b845e8e7af4..f1559927e0c2fbfda565987acf5bcf246f14b74e 100644
GIT binary patch
delta 475
zcmV<10VMwJ0_p>h8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00EpyL_t(o
zh3%9vPr^VH$N$JsC}~Yd%pD(~Obr7}h;it^#J4aZeijEE^&>Da>f*rQ%w#%&k;w?y
zMH-47$aBD6K*9DX=+ghv^zPmLfA`+I0}>@l^v_DkE+`rX0e?V7QN-AzZA<U76+p=}
zY5D)d_mNQ)@!bX_@`9paP+->U_fwmIg1Man1V)<-N~TH6*^q$<4Xj%hd9xYDj<ZsC
zV72xE1OO?3gRp@6PA8>ivp>vrO+($XL<z=@gNf^6;<}<yqiE~yEtw|ing#%P8VvAy
zI}~$;28XU`(trIRt&?h%IOjxN5OqQ2a+!#lL|qW)JaQJc*226Z%v-J20^$oO3PflR
z{HCA;Kn0%Xq1|r7^E|0NVgUfa)wQx_wDNZVxwIb(A~wKut{|88(X8cR+cuiDywv(w
z0KI-cb#eDBAXHTq87VYgFdPm;uVH8aV@!1NXf#?IUsN;<IzK%^F70DFS8((2w%a#=
zF-FTE>%=*y%d=zY`yZK-F-C{FzV>9n)B8S|Y|K(@fbV9@+WV86C{dz)>JuxN!21^-
R>ka?_002ovPDHLkV1ks9*^~eP

delta 336
zcmaFG{ElgYWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hQfKQ04
zuCB4Xf|`Z7otI~zh^UmjpuyYw36FQXdHUvVFVda#@cW7tD~ie*=FDFS)M01)Zx@i_
zFA4Gs{*M9}uH2ci5Gci2;4x8Mu%2PPr;B5Vh5y-$ulWuuaIhu>T-bWI=Kt}#7jKHb
zdHcL<lA3AFMv)bFp71jYe&22?7r>Dyz<1?WMJv0Z5dR^jK0)yq<|M(wLky`U3%cCa
z+-Oi^@T(MvU+|K7mIYhn4AuF~I{Yr5N*JFlW&FOJPv<l5i}@Ce!N+<6-1(R7YgBVv
zaqYZ%XW*(V`?ZD)r(c}jCSB~Xf|Kj~b;FFN4>QbcRxoK#ty?AOaM13?wep1N_nU+6
YRo~TDe>w4bJkSpep00i_>zopr0Oin(B>(^b

diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json
index 84f0203236..1e84b43d94 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/engineering.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png
index fa790f7e9908db0be117835f39c7dcf37e749983..0ff3f2c989362d67e30f45835f939895d8ce6e62 100644
GIT binary patch
delta 777
zcmV+k1NQuq1D^(vBYy#IX+uL$X=7sm04R}lk-JO7P!z_0ZG99UDCi*K&_TsPK@`MM
zD(F%j+6q=(l9;qYTSJl};wrc}2o9o)ufhL7SHV?55EMbg&E3}`63=Z4710}R&X4cj
z?{M-3!il_5aBIe(Q1qPSWIQ&TnTypw(?BD2v=Y?}*PcpEq<{H$ecTdK^=3fz`v2aa
zt8vkE4G2YrM-1EXgk>5ME1s=*Q@Gv8X^X-K!u^g6D151OJ>VzB*?`{^JL%*&gjLU2
z_6O@f*vL5r;XdK+LcU~F=22hLWEN*qQafdL;gV#MI5BieERn}!Kx$Dk``b5I_D!=a
z9z)(Xt2pAwl7AC#zo;eYYD%?4H|5E*s&fCGr)v!l1>KwCQ2XfnuRTz|4PRTn|9R;9
zUq=vmfb(M2zbrY8zKgz9)w=hgWgSj0s+zt7XB*IQZ)=WLmLjslmIW^-(42v`YiO7c
zvZ|bOd<W?@`9)W-y9d2;zh&VYz4T}6S-7oN00009aDPZya{vGf5&!@T5&_cPe*6Fc
z0ar;xK~z`?V_+BsqaiRF0wX;H7)c2L2?>e+{CvC&A3uF&c=6%|NqR}K2di3jMd|+s
zI?Vr{Y`6OV^Zb<mAje=;NTMJUG3r5<ElQPV;Qq(Lkh%H?!{3i@7@lpfXP|~7h;jhP
zk&M6qPk&$Yo#E`+vkW#xn;8BBAvFN;4*1W=@a@|-hEInY!1U?uOQ>N#1Mv=kTF1o5
z3T81gP$vx%?Esi}S^j<pGa2dafG<pc7;?0qG8kp81=Aq^^YQV)+(kA`bO>BIeT~7$
zM2CT!i;Kb3M33Rv*^3OHK7AtFVwgsvBT`LG?SFr^?sIU!|6=^lF!!<~!}XiDQS^(8
zi^H?V%a<=v<X{$3M1%7E<X~Q$g%HRA$c`Y!GNPjZWEd#UTaIwyjeDB-9N8zhe27aN
zSufSt=$4`LNwJ9Rgo11-&4Zm3AC0OV4S~@R7!3hZLjV9v>|>}zz}$2I0000<MNUMn
HLIPldooR94

delta 376
zcmV-;0f+vd29g7iBYyx1a7bBm000ie000ie0hKEb8vp<SL`g(JRCt_YVHjXA>VQ!P
zj5=V{0VF#>UeMq_GXLTG3ygGg0Lb#b0%17+)TuWND~=ibr^FFNI{;?6yom{t=oz2`
z-ZD@ENREP@Wu{=dB<eI=Ohi=b|C`s($O;9L9I*OUCWBR*H-E#Tz+i@lXMTdCfPsOL
zK~h2zBu$nhsFDk~xwyfO06KtVy(BpxRBbv#d*D0<70o0dZ#rE3&b>Pf<N}f$01EO-
ze-RYRL4e%&C&>YztOm+*K<gN&2}lY7gd<SJU~G8>wf|qgeqrF|=3xNQ#DomViSR4S
zD+U!M6^7?8UvV%zd~gfJa!GLshLntKFu$U#kSO!W$^~D)ePsYy1_bcX0P#WMFpG&z
z7bH6XYVdzhwu3qX?x^Q4o|Bv)$qE6OBXEe51jsIkD9L(MaR9Zzr~^hFFzSE-cK`sL
Wa(=4DC}uVQ0000<MNUMnLSTY>(VDLS

diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png
index d943c6341894bbb5e80d5364580876e348130608..d3be4bc4972bb24a3d83d698ce2839f951ffa86d 100644
GIT binary patch
delta 980
zcmV;_11tRQ0^bLa8Gi-<0047(dh`GQ0d8qSLr`gBV*mgsk#&(hOT$nUh97ISVigA+
zL>xL)aZnKjag++Ws6$)9uO*31E2J?bEmB+s7YD&Xbn$EOALuH$DhPrih`71?wTQ%X
zn?gnOhMV*7-uoU--au&5GV)${6!Lb#O->|Yvvc#Y$TN*ZsedO-zh-#ORBAlUzw6_c
z8dY!lRImT<{kft`8P9;42H|1DaSOsS4U?+{NAad`n~~F&gb##!T^UgLQt5iYPl~ev
zzbSUp$uS72p0Vr?)_<^(bMwMI!tuOSG%E9`FKNoyGbyPZvODoeGC_hEIz^VTD9|U>
zmdyV44U~P;tbd5dkhen#R~%V#;_Vf+C|xsBP0=&*Sd>)mzw`9Wp~0YgQv&K9egCx!
zBHQq_<@=w9zW;RuwGVJ^SN$uJ)5yE%TU9N-4=w9(dQsK%9XQ*7_IpQjwX#$zJ7k*h
zasthB(0UDx3qe+ubB^yIy(Yit3U>FPTkf|kegpOfXnzHIGe))m000SaNLh0L01FZT
z01FZU(%pXi0006PNkl<ZSPAV^Jxe1&7=Fe?Vgw^riHL%NRw4&tbti&?om`{;z*0#e
zYGGr0g^2zA0Xadv>kcjm+6F}|#GItin2kon2<r#x-oB%67;ks86I0w3JFxrC%=_^?
z^UMbjw0}T>K!Ja(fT$L~r@PytoQ6oGoVtH-P<0(nt}3yww^xF5^4<NtB*OMRM6?Oe
z%4yXEc9hA;JU2q@W0HPWivR<u;A&y=vkG1@YP{O_B``WXY?-&WI4>68>^l`vC1(;e
zUyTZNlu)VtOr=C)H0l74H8p|AaV`-o-Q38J4}U8ADp_9zypn0fM1tDyY!=^>T^RWE
zS&myLmO(xpC43c-6<vNTKY?%B;9;u{{mE6_Jr;5FZCWbflIECtHvy_d;2X(K8(d&=
z%|tq##>bgosE5Ge+7uFrM0txG$gdM&FNe-N$(%ni(9zxo(=>6lH7D)v&JRSakWLBI
zq<;V*M1(;8G$+AY9>b^)2{hQ?x`(S~0>*jK277_C#EarIdV1|kW)*%l6ClXEO=4-}
z0fV#aSR67dz&Twt5uj_fu-ypDW|1{6aQWPfs0iUKcZRW*V;F|vyA!?v@p!y^k_&}`
zYdk$X^B)SJKnnP>7uR|NoO*c75DArtTTK{Uxv%3fOXupT`K~Kc1GrBFnqx87mGRSi
zT`Iv#C9d<g)h57+48~)!I!~?|AM^tS0tNmn1^xg$7Rv%XvT=q00000<MNUMnLSTZJ
CCB;?%

delta 350
zcmcc5{*GyaWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hQfKQ04
zuCB4Xf|`Z7otI~zh^Umjpuw3{<!c+AJ$-ZQV+}(>LRPF;QB>A2XZ}i{j-9t3f(+*`
z3Gxg6j{+F3+?lZuD8*UeQ6E{%z`%C|gc+x5^GO3m*L%7+hFJKYz4)5%umT5bLcoQs
zcWeG1zkBhf=$p6C%O<Ir)@&46apws?qu}@Lrg8xsi2{6AepR%x8w&9sV(JqVk6}&{
zEIh=JTC$+aZOx4aH3q**f%pY4nP*wBMb1#2->k#$@~MRJ*;2;u%lX1}KJ&hqZ^0OR
ztS7*of7!l9wH4RSt9J&j%CcW;$Z-0_>21=*4l6jh&R;joX!<b2%w`3X_SCvnk`4#$
iZd@x*n0~)G=w9_*ef5_Uug3%3&fw|l=d#Wzp$Pz@I*gnE

diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
index 8e58bce368..5567eaaf37 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon.png
index 5ba1c7269d76e8a0e994be0249510c7819d0accd..e18fee6225ea209546006648af9636058b1427b2 100644
GIT binary patch
delta 259
zcmV+e0sQ`m1D^trB!A{fL_t(|ob8k?j>A9<M!#Jcsi8I=-~)u_4B?}I9%0XrJCt>J
zuCX|1d3dCRrqTp@S=554P4iP#ohJ<#$=3IPZ6FW`d^%rqikVsC!vX!}g0^jE^)7~)
zwP~91F|)oTJV_EAhG8{{?>WU;mf?8*MVh8dbDtCN-lM82czo|)Bd`VUC19<^-{}X|
zS^z*C$NLF5=U|LM6h$z`z&VG$?-vU^d`v_{^E@B_Wm%%G>zjTe8rQPxy7dngGiy;4
zllxCZdM&X!BBDg3A~GqkS@^w>UBairmV`e&D4P#lAP@-b#Xm6GU!qP=N>~5@002ov
JPDHLkV1m(#b}|3}

delta 365
zcmV-z0h0co0*C{UB!3BTNLh0L01m_e01m_fl`9S#0003xNkl<Zc${Nl7+^5!fKdmG
zI$+cRBs)M}(BMBZ|Ka-!jC6AV$ntsXroj34A3SAfE^7Zzi6e-10L*eNEe!^00+OSk
zu;>7o?(cJei;0U#{eSuD8Cjt~k^^SXdBI@S=FPAuFqq-mHGc_k6o7!SsU5@F(}&1%
z1XXf@yqqGK-nMlG$$Ck0Kx&EvLpjj*Dw;_s;_KEfWFQxi<N#2RclK6ch?5)tBsl<-
z)j(OUwy%<bnt-GbfH?wP493>h*8BhF^&18eQ4t0ZO-#s;oCtrgzG4Upj%PS@Xe-0j
ztCvtLx3lwRFlIJ00Q0NM3yCt1tX%N$(R~JxWk3KA4G<qB4oi^4rVElC05TYq=V6v2
zI|?XHa)Kl)1YnK;S%@x9s##<gM3iJbsyKjJVAKJl4j6U7fI9#Hp2~#|**sZe00000
LNkvXXu0mjf^39o5

diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon_alt.png
index e68f78e061f33d0ee8d933defe0b6cba6aeb102b..1087400c3caa26d484116ed669440cb2ba91cbaf 100644
GIT binary patch
delta 444
zcmV;t0Ym=91JwhNBYy#$Nkl<Zc%1E&J8r^25Qcx!@R013yY)(@vM5Z26j4xc1}oel
zXW$5t(r^JdL<)MOphyvwiA=Q;AR0inLp7<qf&j4>L(=$bEbnVR&x{wy$;tU=3c4Gr
zmPG(iDi+n)$7G^?&P4(>+ot{ZuiXx%Vo^OW5lOwFYFQKq^M9t(!a1RM?y3TDpmPCg
zwoUul(2+=7*lx8bj3O*otAn}&hqaF-0B8x^B`tUz4hxlX`6#$)7-+Xzsszi`3Y+Z~
zo9$LLY8o!?-kNQbX&3;2&)E#)@mS5(>vfohq1_MKJTw}_IVUM4Nh!&39Ezfdq?E)t
zPo0H};hdA_d4DSS^V^yn$5BFQBocezH{ucmL4Ys}F&d2!hN0FOnFIh}Fc=(-1wrt4
z0z!yP5}5^j--i$auIu9c<q59qYVFS?;7zB6UazMlDwT@LNVD0*d_GV74HFkI##ARS
z7K@YXtCmHNoeqQ$@O>YHe*e060Aq~yMNYvvr*5~a{Wbrmwq%Uay=k8OviRy<Z#HMM
mlv&_suzhZR<>ut%+>&qQ6VQ*LWGm7D0000<MNUMnLSTZi%Fx^Z

delta 428
zcmV;d0aO0f1H}W7BYyx1a7bBm000ie000ie0hKEb8vp<ScS%G+RCt_YVHjXA>VTo;
z0C_=!{~-F|`wNT%;s8-aDF#t#Wrl~FFHp;V(j4&m{xb$@gQ1lM2HXL#G{A6f02~0y
z0iZMh!m!)`0+i+mq8wmi<n@0M=Sv39YkwK$t(yWDzyIJVLw|Eo`+rItL39YfEZ5S~
zV4x--$^mE2ZDWK5dtuQ5uvmYe16*EQOzQv3SI@`_1(Fis>^UzOtlGR876k?~T)QR#
zjsg%cHnn3od-@Prj-X05l$TQk)7!SLAXzU-4oFRrU?>OrUPUtrMSR`bg$(2Zk{kdE
z^3L8W3~_SfpMN9=fU+7W%hmQ(GEftc6ap|upo_uS+S+>m-@JaqAR;Ql0HTQr8Ilv>
z57t)<LBa71hYoFJxO(*xisg28-VDZO24H@5c_C5ek(CP`KDy5UvJ42|p#kE9#9;}N
z*mOa%13(6Y@;uB^WJdwTNluVtg#gSEAPdpONi~b?f+dKOtVb0GPz#JYVAKJl4gdgp
Ww4Y*9&3khI0000<MNUMnLSTYo?yvU%

diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json
index 4a16d0c71f..1e84b43d94 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/medical.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/icon.png
index 4b38069004aab227a1685514df1e8861642eb00d..5e773624bcfe8b92e53f0bd29d5b992f93aad3d6 100644
GIT binary patch
delta 290
zcmV+-0p0$h1H1x|BYyz{Nkl<Zc%1E&p-#j=5QcvUstId%$hj5s0>^3I0kx?hJi%FP
z?a2#{^?eNtrf2ZgByA01#o9q!xNxEey|!!E&;7|x{!h#-kVqu{I~PM96OkyT;JruN
zwu5H-xEfNvSv31_4LspSrjWQCTE3Mf?pA`$q5%;}6oGHHvVX+G%Pa18w_|(H69^%o
zsw#vK;tPCy%E>&tz~ftUGS4mm0M=T(Kd)h}1pp|e;t4qCV2nYQWiZCTIS23kXn{Z9
zF*8e^=Z9RDCF;69n%7z%7NhIBNj|D0h)9Z}kiPrZTFXy~$zf*ES_?Dx3d~miTS=7i
ozOpgpXD`a^3mcb6BoeXs0x@t}GjErB1ONa407*qoM6N<$f{v_)_W%F@

delta 393
zcmV;40e1ep0-^(uBYyx1a7bBm000ie000ie0hKEb8vp<SR7pfZRCt{2ls!wsP!xt=
zrHhS=XfbiAlu!{DUHc0JC-D!6L=c=*`~)XKanRo&?*4{u9j$XIH61jqpNrS^niG0M
zRfL?IV3+$YH|K@i^W=OahXKm~7ytuc0N4P<v3c1ax8LuE{(lXClJ6|u#PMyng=&3Q
zrh!NdppushBYkcORiqQU1y`@N=v*DI#NI?<O1?ZlYE^*+P#dnJa=L`;<rOq$7NQoA
z9NVEo3nG&(u<}*}5dyH^WdW>vHul4>cW2iy=LN|7Z{ZLE%~lh-VgcOy4>-R#`sM5P
zp9MgxcCvjYkAE)@k)>D_P!K;o^<11TOCdgBS)-scNoCkWC~{A5OD=+L2W`LcEx9vk
z!`s-5;)A`dME7ZJf%p`lWTE0}P)xo`oOCYO0KJPPtz8cyh6*|XdmyzcpdkM6S<?Oy
nrCGg90J4$+FaQQ%-~eAe&VS&jnBxZk0000<MNUMnLIPldZH%f2

diff --git a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json
index 37ee397b98..3d37ed5434 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/icon.png
index 498a0af6885eaf70bafea8842a6431adcecd420b..cdb552f140ec9f1a86c9333d6d16dc47859f7d61 100644
GIT binary patch
delta 370
zcmV-&0ge9E1B?TZBYy!?Nkl<Zc%1E(uTR536vw|1RCCv4$&z~s3b83rGZ=6a1Y{9_
zn422{QH!0P!lE#h6HUett6H#C>>ucb1jw2+SqM1{G#knKWBq~Y$6a%G@AK}xy8;z4
zD72J9OBJ>McHD&HBMs-qUQzMm1%wb_jQyWL(NqFEX(khq(tkO}-1p&m-c~6BQc5t!
zKtyUd=!D<TuJ2VI5|Je^3_}5cZQJ+_-tCXDdvJo`paUYx{60hqJdGb$#@+r1rfK5z
z>LzR4WCDK)f&i9fAqawU1m501a%r@U1<D{+z;T@L6ngC%T-QafT>}8<oM#qD{0>Z=
z38=0?(-xq*hHI%a!QA&V3nZ>_v(Zo&hd)21uTMNYFYq#(t*jS9gx69^nScKfk-ELy
zSL^P-5JD|WBq3E3>YU?l{2E#NLNZ@wU505h&s8Ez@QshF@P@0XsHiB5ZxOg<)UVlL
Qz5oCK07*qoM6N<$g7S;1RR910

delta 444
zcmV;t0Ym<b1JwhNBYyx1a7bBm000ie000ie0hKEb8vp<She<?1RCt_YVHjXA>VTo;
z0C_=!{~-F|`wNT%;s8-aDF#t#Wrl~FFHp;V(j4&m{xb$@gQ1lM2HXL#G{A6f02~0y
z0iZMh!m!)`0+i+mq8wmi<n@0M=SzmT@8S$IDs<uEYgX)ISbx6X;6EjfAUXs*ul;3M
zJ5!fIKuQuW782nEbihsqN&ry~ICE|rBP`f!rptiES~8!&<wZoL{=a$sjI2-~DG~N;
zG-a@A^JZ8S7|ihDnJzdAKtNIg94cfvf-2dNn~NLl2%rN<)=QEDO8ieVWCYG*P|-{R
z@=n9W@7%k?Kz}YE$pN4spHbn2VmSzq8~-FZ0F>20S&o5W9|JW3Ng;r61gaQ}Ew7;V
z|LfN;4BXs23?Q1AkRdq{er0*ZprWM0@ciWqhKCPsp;#^{F2RtJkqzcolob+X9$C5I
z>$k5AAj^ON9vUD%NE~J{vFU<j2S5$}56X5>N5CER{58dMk`p9ZApmm(4sntI*#!|L
mS&u3XpcWW)z^DU89RL7+LYE1kW>c;J0000<MNUMnLSTa98njIS

diff --git a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json
index 9c2f13fda0..df6ee47d08 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/mining.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/icon.png
index 4a67c2aa6e97c830fe27dea40f863cbba9df8282..3d247f05be59b6337a3999eb81040920379ee608 100644
GIT binary patch
delta 280
zcmV+z0q6e20;mFz8Gi-<0047(dh`GQ0PjgeK~#90?UcU`f-n$=e;OwUtapne#Fdnp
z$H5h!#2Md)U3~)F%L)nWIjF?M5cyMC?3Xm{aP99Kt_N5wmVak8rkI(<_dL{11FiL_
zyR%_tk+XU(2s4X`ch^J1qbLFZs8n!KIkGH+35h`hFH|bHo_{V#RX#U&nn2sO-Ch*M
z@&W*W_+%t_x`1Iu2^<m^yWJ6o#03EOp0}(30631*o$IEVEwC9<q_tk%%2KfPv5z0~
z=T?><!-$BwZ&_89`9a0ZlBcS72oaIIOBg2%0wE#^gP>R7XW`#M776bQn-e~{QGVWV
e7K_EQ6nDZmQxR<te=@iL0000<MNUMnLSTa4zj})R

delta 308
zcmZ3%bcAVwWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hQfKQ04
zyr4lxM~A1U=l?Sd5z%WzM5P$c{5LW3THENXt7~jwZddNDFR!3BXZ}i{4imQBtAG@L
zNswRge-yxQ<<5+SKq<}wkNU`B1_r((Aj~*bn@<`j+Un`z7-Hf7c0#n!VFeD?kB-eA
zcm5Z7E9ENATq1qqXTgpNHkrgf4+Yg68IGRP-^ZxAw8kW+EyT-nyVF`#<|var0rA|a
z85b?M@96mNaqtdhT(4fD^lIJ4$Hpa3{eIL;S@7o?3uELLk+|#H3peU^6nuW)qkT1D
q@AfUit&P%Q{(OgKy5Ep^%zN{wNyVqb8!dq@V(@hJb6Mw<&;$Tw(Rl*^

diff --git a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json
index 8182d05a8c..df6ee47d08 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/robotics.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon.png
index d55fc0798e5e84e8695ba6b88c8253bc78b37907..e292512c97db7090c86d9f4ef5772fdabc50903a 100644
GIT binary patch
delta 284
zcmV+%0ptFR1GfT@B!B)%L_t(|ob8mMZo@DThW|}Pk!I?f$_(xWy5YUUkQKDI7!7S$
zu~|T#WGIgiTqy||FfhG>Y1InSElpxFf9#ih`af`IAdyJ?ckZS<CL&Qv!F!Ls?<dWU
zv6)i7-*#W&0eHuwEFp0}wfrDEygUo`+YUq|Q3Sp@$PQIi;eWMxn%jGuKnMX%(;$Qp
zU*PyDSM%xuZy(*&yt)7YSZh(1C9Jgo0Hsts0p}cyG03tE#uzx~;Ju$M@aH>bX36vX
zoa?$q+qM_;TI=&-48yR<M|A-aNl_FscK=#y`6;nD%q&`KVdhbR)yjV>iBdjRHmCgN
iMOl5}5{X1278NIywOTV4Lxu|g0000<MNUMnLSTZDvw=GR

delta 369
zcmV-%0gnE+0*nKYB!3BTNLh0L01m_e01m_fl`9S#0003#Nkl<Zc${Nl7+^5!fKdmG
zI$+cRBs)M}(BMBZ|Ka-!jC6AV$ns*3wQ&Bqm-iU<pD+DSi6e-10L*eVQBEXLC5HVB
zlmU{XV8PpCU^+qA3N9uhD)s-(>t|$z0!a=y#&n*+s?D2WQGZ}C!!30~a1?-mq=Y1h
zBFhm}$pze8++arl9YC^Pk{n?5&k*c;70o0DhJOh0JNND|kPAq104T`g)F-1@4g%!H
zKS>S%Wi?QiV=(Mype7(G1mKQ96N9nk71aKJ{rZK0o12FLL=zJ-BqzeJEUy?;lvEg=
zzkI>)@WCw<%W5UXB^XjNvcdd{vO=QFBP$nt{q~gsWEl{^Lj%MIiNh==HeHbH0I0$L
zLD>%K2)Lu3zj#h^f+Q;hV2;2cP7)xyAfhDeQN;n&0;3KXb-<_t2HXJvQigqU&FZ8y
P00000NkvXXu0mjfY~7m2

diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png
index c935e5a13b7f8be499b366732f8364b81b156f69..c86c128c245c261460adbc2a919580c5a1a36759 100644
GIT binary patch
delta 464
zcmV;>0WbdP0`dcp83+ad0047(di0Tw7k>eyNkl<ZScUDCJx_x`9L679Xi2~kwA&?g
zB3;zkgrOh6iP*tU(Al+dYd7Q4xk>#H4*dX(rc*I=srDtLiI7kmhjY3MwI#eYy6`N7
zyZ_zu<M|%|lqyx~pCx2nP}g+|02NW>W3S_J=6!MjGz^1A@4vQNR78<q^MIsYP=D8T
z%FHH?Bg6r*xuXIwqd0?xVbEwASs)S%o2E&_%?2ya+vz*7+j|B9AQQkzQo+k;BuLfj
zp1C5+XqqN(!OHXC2Lb#b;0HC0a-ZIYVNgYu0RV5)DY~^epSyoQgCfhRl1NM-PAvYY
z`6Io+^%X_8HisVssrJbYz|7m#4}Wex7z}V@UjhKSwK+6ROKe3U0M>%pnj#EC*tU%@
z3^VOf2mk=S?;iHXX6w{vus8rAq!2`50M~Uv2!Ul;==FNAEGyIcLI4xT5&Hc;hma(R
zC-Ss8$6~Qad<_!|R8{3!E|<%L^>tmRx2+ZkA#hz6&%<Hne?lTe6y%UJO+BNXPKTy>
z^`c5msj4bHRg{BI#y-8Dz8{-XVSwLeQ5`kzQl(1$wSE9vn7)JLv0%CY0000<MNUMn
GLSTXi71QJZ

delta 335
zcmeyw{E}&cWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$h2fKQ04
zuCB4Xf|`Z7otI~zh^Umjpuvv3XOklDdiv%jIPISF@Ox2N!<_jmfy#X!?EL_w_)3EO
zg8w4}2G;|3P5@;%3p^r=85kyN^VT!0^K@|xvG6~8@ikww0S9YBhU2p6`~OSJZ(Zg5
z`mNZyvy(Soi)rfYKZ**E{%uoZ^3vp0YKW3w-=UEH$g$#p<>RJo2OT9xiv>M=As0Ku
zr7v(cs7oIafANLUSB6<QZDVo5Cx;`?xD&jYANn&#ykYy|Kd0fQf%27$&8zblaISLw
z`q?vS%Boxb*)j)=er@`Dj7cD?>C)#?o>>Yu>v}m>9q?K@KZ`A31OK<LvNxW7Uoge|
Y-g@nC;{J121HHlE>FVdQ&MBb@0KzAXEdT%j

diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json
index 50f9fe3394..1e84b43d94 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/science.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png
index 195117997db22a6b1c73cab9c4749c2bb21e1da8..cced512164758d3551c213d943a0c03ba3395d0f 100644
GIT binary patch
delta 255
zcmV<b0094(1DgVnB!A*bL_t(|ob8l73WG2hhF?1ham}{|V`)b>ui$OO8+rgeK()JB
zmAa-wQFO2v|DZI_k^~ao=gS{pu~_~c$7C`QX^$~9ZHv0Djn>X_F$oXD5WbX1k_1Gg
zPZQ|F0YE8*D2jHISiA#$c%C~*({yX@I)Se10O!+YS$4j_5qSKTfDi)r+Y3Sn0D#BX
zxdH&-y6(_#+IF+R;?Lw71lpH!7(c5DkFuPs=bR7EQYp2|M>T<nbR5Te?)`Jl^;lvF
zMn~W=hN39Gp8X+}kD05`wDMggwuG<VuEQ^!#bU9X#T%CuM;gwHH`o9G002ovPDHLk
FV1jYQcqjk>

delta 381
zcmV-@0fPRU0+<7kB!3BTNLh0L01m_e01m_fl`9S#0003>Nkl<Zc%1E(%}N6?6orq_
zg)~AJI&G)mFI8Ol1f>t+19Tw>f(u2T!H3X=g6P7X52Ho=0jEXBl^HA)VsF|^?LwHF
z4DBXoleu?D&NnwVnF3}k58wejfCpd$ECn_7H~##1pPL#0nSb9d?&#;!(vL|i7l_ON
z#(a5u7++!@2R#8iwc#T67VN$br(Cb}C*W+Wzydfb7I1eZ&}=;7Eh*!x6zhCg4Qa4~
z$mJA>qR<cn0QOuKz**AQUmvX3fMmP{ZHGQ!0o=zuTvW=bdDQLbaVn>POwI!+#G5+4
z5fSnbs{$zmNp_BN=Kbp0mXh)tLM(vBES0fp!um#Cm;dGYVZuDDRMFbo*YU~mVWzdL
z0AwOTW&@?yGR2fP###G<4KP|*(Xksrq)<^OVmG8!1q{SLd6uj%BG<p5GeBPQ03N^t
b%pBksO~-$4x4hT700000NkvXXu0mjf+;*so

diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png
index b47392ea071f0362afaf541887ac19cad27d8b0a..219918544cc972b58236a8a32cea039364ec37df 100644
GIT binary patch
delta 430
zcmV;f0a5<C1jhrABYy#oNkl<Zc%1E(J!|VQ6hMzdA#FhJD7|hOoKP?!Q&vHS{^&Op
z@&ihsWU32UTu4fmS`arGq7JQ$^In3#O1t<h!q%1U@x8JQEiEm-j8}ERAP6kLWw)E%
zdt59k?^8=)6oxi`{l43A+3jXy9g)%t20>t5vZpBW&I!4>Z+{hViOwY$g`v$?ql!df
z;N5g;w`t1jW^>ecIPSfZ04fP|iUR)L-+R5QtN)VwLU1>oW-WN#Y)FhDF(x~xWvG36
zM`37vApm$@F40<NbF<kDUx-qbD6GIaT=}1uOD2;EX_^v65dd0i5@Sm3Q(M3#ACJcX
z#Bt2SgLfpMlz%F0MI!;%g8hEacDn_S&#?lH1ORqlCqGY`ravdpRN|s(^26Z(fRvJ3
z*7W=RO6zOCh7P5a9S(;87-JAZ(ChV>&*!XGtHS*Y1EiGMNnWqlC*ub}VE^3Q0MO}l
zc!}f6|Aaz`yvQk(QdVni%e;DdN?S@P?X~Zpd@}dxeJ4wjvsG#=@Ncp_-&*dLmX@F9
Y1IM<tAE64B!2kdN07*qoM6N<$f~_~qbN~PV

delta 546
zcmV+-0^R+`1G)r|BYyx1a7bBm000ie000ie0hKEb8vp<S>`6pHRCt{2mcL5^VHn3B
zNie!p^1u|%bV)K4gvN%3XeelCXt$}qp`jrf+S_U=8g*}TY<F-FY0#AXd4|~uQegMI
z`d%j)zVDrvi(ioU?tQ`M^ZdBydF?P`%>m{Bh5=%+tv;^roqrA#3whhW0-$kWNg&U|
zwQm%H8$fRyrF0cABSR7Jcto<6$}c1ZE~gWMp|GJSZ~>r^fV4)QTP+!;A;U$8p-1l(
z<%9evAa4|y0fH-Wwd%WLJ@@<kpsNcm2qpkDp5F1oZl<8^q4(){2ueACM7a(iDFnj5
z>f?f#2tbYhrGLN%z&&_JAb7-_0`wGfU8z;cJ3iwc0+<mK02(@$vv30Is%3x!(E+eH
z*h}T2@F@4J1<>ns+X0R%H#{G;f1P1nSPp>dowZGQZ3^J#X*!0v0MOf%7$rH^3-|Pq
zz?RHA9VY@5-!ir&HX+%qL15##{uDLi$*(pjcJ(vtEPsO~osdE#Yiie%23;?auaBJL
z+H3%~m}`I<3A)2%9J{22vEjyXO(!HvI=G9F44>{#$I}lWdRN%nKZMOl1THVmC;lHd
zK(q0R#`^jJM6YM~j&Kimw;%{?^<bzEjDtX-@k+Hq&ROfh@O^+npr;yunx5f4vrJvf
kc|5fQU>h2m1I!%Y8)Jd<C)i(issI2007*qoM6N<$f@e?p;Q#;t

diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
index 4a16d0c71f..1e84b43d94 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/security.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/icon.png
index 87d994febb8eb12e10c6ab112d6dde73e9de1b1b..c1010a58da6611943dffdcafba5e19db63a50992 100644
GIT binary patch
delta 284
zcmV+%0ptFn1GfT@B!B)%L_t(|ob8l5j>0eyhJPp{Ih7?(l@7!Ts<_MrD3c>_0F(=G
z6U23L0=8MYsgf;;a7t4kMNoh+d2F%%BugG?tog<-z~k}!cP1{$L}WuDaIR~VW$CoG
zGel&WxgA7g|D<>v$F^yj-Xx|j$!VHmvp*n7lCE_>6EMbL`+r-)7&E>=p64&)!3Cly
zx=nWL$9OCO0MJ@varuJQ8UPRqF`fW3LrRGt2q2{dGvi#>odw?hOy;whU9MJb{Czy)
z=X82luas(^WmQ%Ee^f+dvn+f1{*_YpUg8~`?m#F6ilTUV_JeeO&$A9)JMUGZOYx7l
iYw!!_@pwFAaTNvIA7Z2|dw$jc0000<MNUMnLSTXcsezXO

delta 392
zcmV;30eAkl0-^(uB!3BTNLh0L01m_e01m_fl`9S#00040Nkl<Zc%1E&y-EW?5Xb)k
zExaqV$;FQYKM;h7c?Mf0_!5GoNuk(?51^e2BBEenE9x7FkT*CXol)^nbJr+xXSv=S
z*~JLL&E_!8{+rpEV&=zu>;U>K17H9QfB|3wxOQ3m^!=z=_<uJ5Dt>x(r2PBVGj=z3
zL@yAT0c7!oN*Q^IJ%aVM+tluzEUMV>NKt&ehgw}=0h}EMnAl&zO?4S}o|BG%RB}pW
zv>>#vV5x8kcs|_ZZ4X%~L;}Fh!veUdH&Ce_V{Wzv4-FM>Jv~5IybfIZ@DAp?ij#Eb
z&jO%RbI&1s<bNwx2PDMrn0$|oPl-5=U|BZEX6X!j2|ouz%uG(>Ee!Db^4L{;wCG^9
zR!{xyt&L3iw5}lfib2H^scw)@aalO)Ua$c=i3Ocq2SP!$gEo61wK^an{)n@r{SozY
mdbt4PB?Djp3_#xjz5#i+fJ79`{QCd^002ovPDHLkU;%>a!mXeH

diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json
index 9c2f13fda0..df6ee47d08 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/service.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png
index 87d994febb8eb12e10c6ab112d6dde73e9de1b1b..0b1f751416654df08f1a601633bc0a7b0a355984 100644
GIT binary patch
delta 267
zcmV+m0rdW&1EvCyB!BHmL_t(|ob8l74}vfdhF=^>%G9Jcv1v3q(UCs^zl49u=BA5o
zH^B-K#=01y1BA+lgME^wx#XIAu3vz|;rMqvn`9y~fe@(b8bwi9t(^=J8D{PV5t*M9
zkD|!5Z9AL9#wIyQ5}eN-;y9jK_d9{6X#npvuPu;e*<if5Kz|s9gYn`50HC$TVgG>E
z8UPRov7P`kLrMwX_aUVOGoz~O$pWK4lihY}j;B)>UoRKj?)Q)NN~!KymSs8rM@2*?
zP1D}@uaq+H5@WEs1A!38^L+5^7wP<+z7B0WpH*T?@vpaQ@eAj0I2>#71p4-0q*qZX
RE&u=k07*qoL<FuvV1iZ8eFXpj

delta 392
zcmV;30eAkU0-^(uB!3BTNLh0L01m_e01m_fl`9S#00040Nkl<Zc%1E&y-EW?5Xb)k
zExaqV$;FQYKM;h7c?Mf0_!5GoNuk(?51^e2BBEenE9x7FkT*CXol)^nbJr+xXSv=S
z*~JLL&E_!8{+rpEV&=zu>;U>K17H9QfB|3wxOQ3m^!=z=_<uJ5Dt>x(r2PBVGj=z3
zL@yAT0c7!oN*Q^IJ%aVM+tluzEUMV>NKt&ehgw}=0h}EMnAl&zO?4S}o|BG%RB}pW
zv>>#vV5x8kcs|_ZZ4X%~L;}Fh!veUdH&Ce_V{Wzv4-FM>Jv~5IybfIZ@DAp?ij#Eb
z&jO%RbI&1s<bNwx2PDMrn0$|oPl-5=U|BZEX6X!j2|ouz%uG(>Ee!Db^4L{;wCG^9
zR!{xyt&L3iw5}lfib2H^scw)@aalO)Ua$c=i3Ocq2SP!$gEo61wK^an{)n@r{SozY
mdbt4PB?Djp3_#xjz5#i+fJ79`{QCd^002ovPDHLkU;%>Ax~-1@

diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json
index 62fac00b4e..dd2fdcc360 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png
index 892f6d12f0e391ba8a708a1639f624d60de62ad1..f7cddb85c006bad87732439467c85c78cf62e1b3 100644
GIT binary patch
delta 460
zcmV;-0W<!C1my#eBYy#`Nkl<Zc%1E(K}*9h6vzJ^LRCmTChorNQg+-mu)`Q^2!h{o
zgF#Uk9)x{^Av-yt7lm%@Vhh&xka$@_ryET>MGyU5N}J@pAMYh8P*G9w$5=%dG#d>G
z0H?OCzdbG%h2xYGXuGb=zJDYMPHkI1%ZL~+Xf_&BC3{*ft$#y8YV1b^RH8!(+O8|J
z)hHs7JF(a8%J(?Ndb8Q-JFwe(B>|w2KrL^={lkNGes=aPxkCtg-L7uIdb2?oMF^uv
zZ&VXX@7}iSN{0{tz_agzbFRl`vl$#hj4F{^fkUYBKl?s9oettS)?=J=gi&M^r?fye
zxgw5Z3`Qd@!G9RbZN*Un4k1X>6lt0Q0B&w?F&+*J#W+d;0Fv#_A9x<d!yyKqx6_Va
z7f=$DejfwR!`;;t02oUgEg*z|5CYfJDJK2CZigwQkD-DwCR?o*0H9W@!QS2%^Z6V>
z5ah-`$(uka)jN5$T73%`1cBucA}{N82qBOp30_}bj75?gLn)P6k$o`6B<Eb39K9^Y
zmXuO?;W&G5H+A*Ch2h>R{fNNVWLb*-f-5R2{uQ5fOvV4I5VPU{0000<MNUMnLSTX(
CyU0-h

delta 490
zcmV<G0Tuq`1A_#RBYyx1a7bBm000ie000ie0hKEb8vp<SwMj%lRCt{2mdi@RKoo|L
z;6jXbQ5BowrAQEJ=}OTjaN)wG`@V<^@h#jaK9fa|BJqN$XuGgR+{OHdo-j&EXQqkW
z<cBbm3FLg|GIM5@rmO;>0I&vVHg_Y8AA<os_;)k^3IOBIynn;<;TYLM7z3!rq3|oD
zNn{m)a(Rizr{_mb!D6XIo3(ALC>R02$okp_&-?uzWg+V#MCjpt7=H32fTmH<23TIH
za@D7K?p9n<>cR*@3joIV_YSCi+fLTteWTuBpw4|KfpAwVMi65G#P}$oAia20Axxy5
z0(gpC2d`az$A27avLkGz1t4K|oCUg?tMOWkd|re10+k!UU$wsd)OFNF?f@{3D2#&0
z9Y9i$m9zkmV{gmjoS%d@$vW25{NqSA?T%vs-rrv0pH(9jLbjW_BOsgBtQ7%)P>o~$
z`#VN5mUaz@k$5X|I|fLa$7t8mA$1~RT!h?w;zlGVo@3g8<gRddbWA(-I-Q@Lj{To8
zz%UY#dhE*e4DW!uzP#W=OQ#;J4x%&&2*!hMz~6Q2!TLTR5b!hsh|?prqN|Cn<tCoy
g0+59YfT;ug04Xi=uL@&7wg3PC07*qoM6N<$f&g0QVE_OC

diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json
index 9a2c8fdc0e..a36cd58203 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/syndicate.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png
deleted file mode 100644
index 88542905cfcfe65b7cebca3fe31c4d573ba03577..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|R4@
zr;B4q#hkadHu^OOh_F3~f6U<Qd??826~o1a!PYx}vgz@zKL6lY@DHh2Uhnt=<`Yix
zvUfHfZ7FGZYi07hO;7DkoLA3(^MjrbWb*hfTQUd=Uff@r_$ffj?N#E&1M753-~4=i
z_(g26bWF)3_E#^TiOv7Lx9_QM^P=pJpJIFKI6CE5+$h}m$wvEUFPGmRhumiePoDHu
zty}P<%9ww`)v1Mbi}^Za#a*wznsI0TZst$RE`Hox?y$c@(<<TA9~Wd$KjCWSt+JhA
z2NIKVs^b-Sl~t8L9{+Bh{eGX+uZEsupO;-U{`LAM55op+Z;{yU8-=-7%T-ouAL;A9
zzPp;$;k|~3u3B=@V_w0TXHF@em||9T=i)ZkO9nxc7S9jQGCWzG8RT(stNZ4kYu0V}
zv?tJB&SK5O6UWm_mp(4~q2{Nz&3^UvpZWjNcE@N(S2McFUQlQKVx5#TsoPr+?#AZ7
Z47b#eG|Rk;$^u3PgQu&X%Q~loCIH^*!%hGI

diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png
deleted file mode 100644
index e34c9a995e155a3d0534937d13ed9f26168a208b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 409
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|TSC
zr;B4q#hkadHu^OOh#dR4zBDsiN{Rc(6~`d<<yOCW^p>nX|KM5h52<y$-tsPL+pRpN
z==tVJUAEHTdnQ!!ILYwX|9mBtJH-#=mc934V0f_q)s@<WSM5iy{&4xMbNR?;70;E1
zQ90(b)_%J6dgqn?s=u4cF8}i5_5Zt}qj^JNVR*2;&YM!17O!bLi))v2c2w2w-Lv0w
z(y`{odE3|TH)33A__X%=ue-bW&xBQ`Z@inafA{jw%=@oSUw_TNSF^r(o4NqdV-RrQ
z{^Kcp#~pvD&asi=Q}z6;b2~F2bMnLPiyo7{?1=LYy4mgR^X|%vuMZ0oAHUqj?^$E7
zkXY@}d-3e$!|xs!zBKMzm-hLj(e)#rMZW&hJAE}N-Y)XlQ`_GkV@>X@ebpCp@BY?F
y7w^xTCu(n6=qDVID!sz*$hw<RGF?#XvwkyNvfj#awBMKsB;x7n=d#Wzp$Pz(u(wM9

diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/icon.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/icon.png
deleted file mode 100644
index e1c0aecc28b60399549af6bab33d52822ec5aeed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 307
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQRV
z#W5tJ_3ac}z9t8O*7?U+)_CNwI5CTVP%=5Txq$0@QpTPR@dHkaypx?Y4sdbDa{V(}
ztQd7B+$jG$ukmJPjwS^T`?O=W0z2#O{+kw}%J85d{LSwZ>}A@!`Oc`yTz+vR@9N{n
zE*^&rKbI-pQF$g3n4qU=WU<WgTGolBm-fo9Zd%8%oRxc(0E5%{!-l@>kEKs%MLD#Z
zZk_o0`oia5kLkHKS_HqDeqhys2_MZT2w$kTPmxIHy1kW`;j4=Agpkx^x%5@WZ}UID
zjAQ(8i~ZJ${@{7Z^|qVerL6bcJLT7dS=>zue^~vm@kOwi|M*%B^e}^`tDnm{r-UW|
DT{(Is

diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png
deleted file mode 100644
index 5a37ace23e68bc693b636d6409220d71466ae9ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 332
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1G9p
zi(^Q|oVT|Oxehr9v_1^f*}}mcrWA2RFSJNJdi})iincBHT(!B6T7@c1Ez91j;K6ct
zX2yg6zxH^hi3gqO02%=T9UEur|Cvy9{8r=Zmp;~)Ov3jv?ko<{3)UB^&wBW?Xy&gw
zmc7@j4L5R}ojduIXkE2cPg2o0U)xoi4n29r{>nUIs)~|QQBL&KJrjhBwyrc+*l{nv
ze(Gh{y^On0M*@wz-ttZV^eb@=h-C~60!!a3y5;OW_=Y{=YH)7DQ<?qVZ|s_~n1B8I
z@qAZk*pJ%a`aS&%t~C^Jg%$tN+xVL!i+97k$I(~i&(s~*f2I0$cyY})c7_Mu{EVEg
UU+f!Rf<lSG)78&qol`;+0C3!g;s5{u

diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-right.png
deleted file mode 100644
index 47cfa5ae34c9f561744ba1cfc8a0ccd1dbb792e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|O(!
zr;B4q#hkad4EdT2M2>xIFTBvW=g7$k77w1alox)LiaTPwqe^_Pj7i_IlP#X+b7olx
zXaq!g{@X9=w13Z*)CzwVpvgesF!O9qT+6wH#hK?OzU@AJa!chbhFQ<n=rpW+rsvu1
zv(;Ir-YE2@YNle+cIjiG{Qc|GOCr{?Z~R)Hx~k|x>BhZt7VRp}?mu98-qj^V@HpS1
zujikb?0kJi?7_dva&M82+`QM`1@*hP@jVXKw`~8!ZPGSP9AYs815d+yHW&HVk=u`*
z`Y})PMe^QbtQ?lcA8!9HUs`0hz~{xxMxW3p58qX<?Q>W$lX3IB)3Fy;F)U1Hi&=O7
qrO+2!;}7A+Tnno{eEG+CV4?o;F1P-kci&%v4EJ>Pb6Mw<&;$TKbd<9I

diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json
deleted file mode 100644
index 9094fa918f..0000000000
--- a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Originally sprited by belay5 (Discord) then recolored by Nairod (Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-MASK",
-      "directions": 4
-    },
-    {
-      "name": "equipped-MASK-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png
index b6f68da96e1cc4016112b717a63d53ca7f79e94b..354b1eee71dbb1607d5667604e7fc502e768f105 100644
GIT binary patch
delta 346
zcmV-g0j2)E0)_*S83+ad0047(di0SYAb$yPNLh0L01m?d01m?e$8V@)00032Nkl<Z
zSV!%Yp$@_@5QY!b%&;r2djJfU7r>yfcoYiDiy%p`gqHw=!0-ZfbR-yN=0>h`qgyi4
zuAQQv`Fl;e`>(evcs!oJrzcelLP#D20c2SQoO7eIO=y1vli!zIMgYStablt`^?xU7
z@_0vuVvPGDut3W|0VZD`j-?3~7#ToTk8c}Xpl#rMl?zEdZi}{o$yhEnQz2z+iBSvo
zBL?&t3q=NDDAWd{78F&ZV*E<e&xQrsb4)4Ci^`G3jRIq=az2Wpax9Z1aq>`Az_~xo
zAa9y~G@zQ$!RQ~rXLx>zgf`Jh<wq(_6`EFVMLn5K^48a-Chh#%JsyvzI{@C>hf8f8
sQ-PZR000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f~e4lZU6uP

delta 272
zcmZo;-pe#Wl7pFnfx%@-*RhF;3iVn6J|V7N-Vx$rQb&9l{?{`^M6VGMmD1MMGcodF
z*uGs?*Vw|`PF_K6&is`?Z4DaH4nT^pB*-uLKQdr&J#gm)P=>R>BeEE%;0OpaPSxg<
z1`0NLx;Tbd_`f|L$ah$QqapFgBH>ei*ITbinOr+_7x$O?4AsAj#J>3RORzF9oSZ&C
zjiF;l2Pea`IfdMPhZ%mp@Lg~v{OF`85$y-hK4-8+STDFO8?<r1#%%9d8_FCer|K*I
zloMvycq90S&3lJr!G~t|jT`iC?E76J+8A{H`eOMF-x}t<k`5O#I5TnH6lb7w7(8A5
KT-G@yGywoT_-(@g

diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json
index d2bd34f483..33e08c9522 100644
--- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Resprited by DangerRevolution from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Resprited by DangerRevolution from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/icon.png
index 195117997db22a6b1c73cab9c4749c2bb21e1da8..0e1840978dafa6f2c7f52dcaebcc6cc4f1e4b7c4 100644
GIT binary patch
delta 344
zcmV-e0jK_$1M>oqB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0003M
zNkl<Zc-riiJqm+B5QS$#D#5gBDbe(HUcpP`3}Ta<C09tFl&NhzKz^{*lo4z<%z}~x
zqq88|?7*_C=+5WcnTIHZfH`9UGlvGy02*M)c?c2ZY}>Y2nSUm{stSstz`l35{=!y(
zk_SNmYtMr?j^*`aN6;jvD9aMUFdPj+sRk(d_HcnDNv1Et)A<Q?T|=6ta^CHax(!DO
z<g|<9IBgN;c@D1Y%Jt)ZhwJTzleA$IhGDd8@`FhfAS2rNz90{1qU-A|%W5|pGO91B
zhQ_BKL{TLE^-(_oG!UG9X($~5*>IL+a_;d8R5}9{1%74jyU$fX8K5g!7ZewOU4(rQ
qU9xlA5cO}l2G9T+U~Yi700RI8zZHRui_7r<0000<MNUMnLSTX{XP6@Z

delta 381
zcmV-@0fPSX0+<7kB!3BTNLh0L01m_e01m_fl`9S#0003>Nkl<Zc%1E(%}N6?6orq_
zg)~AJI&G)mFI8Ol1f>t+19Tw>f(u2T!H3X=g6P7X52Ho=0jEXBl^HA)VsF|^?LwHF
z4DBXoleu?D&NnwVnF3}k58wejfCpd$ECn_7H~##1pPL#0nSb9d?&#;!(vL|i7l_ON
z#(a5u7++!@2R#8iwc#T67VN$br(Cb}C*W+Wzydfb7I1eZ&}=;7Eh*!x6zhCg4Qa4~
z$mJA>qR<cn0QOuKz**AQUmvX3fMmP{ZHGQ!0o=zuTvW=bdDQLbaVn>POwI!+#G5+4
z5fSnbs{$zmNp_BN=Kbp0mXh)tLM(vBES0fp!um#Cm;dGYVZuDDRMFbo*YU~mVWzdL
z0AwOTW&@?yGR2fP###G<4KP|*(Xksrq)<^OVmG8!1q{SLd6uj%BG<p5GeBPQ03N^t
b%pBksO~-$4x4hT700000NkvXXu0mjfUwx?K

diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json
index 1a52b67cf0..529b60f838 100644
--- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by PuroSlavKing (github) for SS14 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Sprited by PuroSlavKing (github) for SS14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/icon_alt.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/icon_alt.png
index 51a87cef7994958a1e61f7f23301d9c5201d84ef..5052bcd78e42f142a57d831046d0ab0e04b22bd5 100644
GIT binary patch
delta 893
zcmV-@1A_d(1d|7lBYy#JX+uL$X=7sm04R}lk-ba9Kp4iKwo0W|I_MzMAww+=EffWD
zlnQpK4s8XiF3B}%g(MA^6e+HPi$lRdbn$EOKhRZhRS*P45OH(&YmpM)YYHvW-f?+<
zJh|uP?m57p)tO-rqyWQocrKHcR*P#=@EswVK|~RknQblQ7k>-rJANMF6ZIh}diCGe
za}1YMn*qKd;#p>Khj^YiyX9Dd_lU<>MJ^Ga5GObtkoZ>UipOt)%N~CT=7rn>;1@lm
zau+LI%qrX<o+6GJdX2TuBW@B_&6PaW30hIu$RUF?Bq*q16FM9ushX5oZ(pkATSk>U
zjJ_7?;N&QyLVw-_sWs}VQq@RTY3itp-2dlkYctbc_i!2*e0AN=Ng%inG#jq_d+NH)
zGa&E+T$>$#m2#T<CcV+oV#h#a2e`cHXvzU_wF`_tTQZkhQh=6U(}0f)V5A6)-UFd^
zFRS){oIe4DZF-_R;P42D)BecDAM})H1;A3KKmY&$34d@%S#tmY3labT3lag+-G2N4
z00FQ`L_t(o3GGxpOT$1IzPi*3jbk%qt0)GC4uyhK2jkiwBK-sX7ycWEu7!dK5*I5J
zG9{&pDJFJ`J_qmhtogW0DlRz)@0;BF-1FRXd5^Jr)DF}R{IdfMUH-FfHv#6j*%Z)c
z*VSH!z<*l6E8FJe1peG^xe$tFgeVKZ&arEdy)G6UmnMkjNMun|5<o;Uxx6su$%U*M
zxn9l-1>6jWNfgIywO;=?cPt`XP9pGK$Au#R^2Wn-+Bj*oevupPHiJ0ALSVSr@P~d>
zn#+rY4rGC`V~D_bTQ1prJ{P6^exG4Z#|Z(}Nq?>fgTyq=#PdA<^m@G{j$@wVyUtpr
zYC$p@jRg7q<5L0=BuGU>;Xjb43^rSq#m3_?i=v3#t$ZHyF#B_r1khp-QFc@o@NM^w
zdvd$W6|>3$zylGE<FNCO3m$PKs-uzswApMn<6PW{ronR@30l$j{lYdcEa-GPqMd>u
zNOrBq#dB%fV$(0Kd)PYwB4i<gNlK_CRa#GivD6*O1(ZX;sbQq<jIQ4IFl1RS(K`E4
zSpWfvjNTFd{K}Qd>b!QKcHqzsd;!33!ID2?rX&CW01jnXNoGw=04e|g00;m800000
T0Mb*F00000NkvXXu0mjfu5^_h

delta 552
zcmV+@0@wYM2fzf7BYyx1a7bBm000ie000ie0hKEb8vp<S@<~KNRCt{2md{H9K@`Wo
zl9yb6kR4L6tc#=|1QAI0pok#wUyzVO=+w<ac<)jNi698C9fOYD>=JZ}D6A|=ODoFO
zj<#=bY$d~)RrBH(mf4*-d_QmA+j(O~kJSh00~iJf2B)huet(q9$lhI<{uO}C6^p{&
zYh%?YgfxKOoTOG%v?D`1;B*eN@gaB5Qed~);2rlF+65^9G8y%ZvG>>47j!~~i;%XS
zqF2>V_HaPiT@VKF4ozuQUulf|-2w#`*gXT#)rAy<5CEA+Qd`(ti`M5T`ba8?-03Zj
zceVkK${^e$E`KSAmH^!RFL^=}m`AJuLPo+Vphzj#`KJQ=rgxenfOaGVKt_kjIA%iO
zhIyI`BZ2F)o9+VWwf=R2!1g3oHeA2fs4lt=K;{>*OJLB2PDmPnMcyHEVF1c;IGSKN
z*Nf)#`KKdUwmY^2$iAJMkcM^$E!H92E;nYESL^1P^nVdl^D|JkqAMpMhsdP0_Uo{+
zf1UmJ`gKjEBBUi;1Kh;x@Ue>s9ly=Co7y$+kRs`jE<)CPDnBQlz5(&O!ra0V0)9Ud
zn{l*~G(f5NNM=>40}jEjXY@^Q2m8BF6tQ|R)Q+1$kjOk=$g_3PdN6z+;1CpP9Y9M@
qZC+SyT_MY5BJB!5C)5Y%Ilwm%yYQoVR*XFW0000<MNUMnLSTYK4*&=N

diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/meta.json
index b62adfa1f3..5dd6839da5 100644
--- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428. Modified by TJohnson. // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428. Modified by TJohnson.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/icon_alt.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/icon_alt.png
index 892f6d12f0e391ba8a708a1639f624d60de62ad1..0354a3ad03e1d08370756b4ce6cdc5a866d57846 100644
GIT binary patch
delta 505
zcmV<V0S5kq1d{}iB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id
z000id0mpBsWB>pGs7XXYR9Hvtl`(6=Kp2M4TdW1sG1lF>NXM*#LlG3A&|lcqLP0D@
z2f=?J#i<rtESTa_h1xh6eLwP*6BF-Z+D>^O+{GMupZm_ch<}unl)vI$N<ZixB@?v9
zT$M`n;<Id)?!n7wbnqUGdmWFp@0USq#C4_OBbdX#J&#(1;The;#8`l5j!?`P7mIMq
zW8z>Wz%xg<T2>Z8AI~r*u7q}tZfZ6EYqb&|^ZDMo19j~o$xE_WE`^oP@5x4?t-y1?
zpE=Lv4#E)txqsl61QE>Ppin4itD!ZF0yE~Ix5-3Qt5xcQ!C*iVkeSV9M>AsW0u?Sl
z!X3vEtKBj&kU_W!Ckp@$XCTpNx2dmI<QRzrQ0Db|O&7T9cEv-pNqtii2>>tn=QlbX
z3P-ChhmOPo01}V&I)y*ATJ)Q#L}G!>W<%F)uSXKR9CD_dybT%b^>VpPeJQ2L2Is|a
zIMi-IpdDb__RnGBx^C!r9KV;vBK0BhKAjq!g2q5X6$t~C*lj)E<n&W9wuHciWrfa+
vKR}<0MP!wth+U?zuidYfJ0&IMe-UB}_IttEL&%HQ00000NkvXXu0mjfxw_|m

delta 489
zcmV<F0T%v~1cL;SB!3BTNLh0L01m_e01m_fl`9S#0005CNkl<Zc%1E)%SyvQ6o!xB
zLX34$6`SIvNDyl2O3^29;lic+zK9F)E!-$RlSPms@q(#nyRb&w#r%h!FiJ{iritC;
zhcJ@~<b3Bcb7q#NtOB3_um)&0cO#4+g8@DGcQgMA0OQWQ!+-PP7}-J?1E|KK@GGQA
zWEFvOd5OoT=SNP#VyQ%%wQZ{?7y-b@`q~E1`~4neA?qSU=;3`Be)1!LrcuxaSYD}e
z)u(yxR$Nl*!U#eO0LJ(C4yb+GPS)UkquyYk&V46=a91lv5Mu$v_$Z+uy?9h1Or)Ix
zc#2#HuU&q}9Di%FBW$GwAYpc#1-hE6@mh;~UW4}nl^eicwZ8q-b<{=f05FayjDpA=
zKvIyEv;dG}Z_DGHpM*EbI@Z+u<488`j$;Ad-(KRMRU;Kbwwt;mAe+{#6#;=zjbr}%
zJ4P~=b`6M;cq?){21uI6XxGvqbs}P1gxq}MMkFVm+G2p@u5fsCOgr^Dou8eK{hu+w
zFcOh^?8@~F?|{3$yx>Diryi^hqBIBy#)EFa-*xN3`aU2K@H7F4(<8N_tBJ1VCZ6U3
fkcA3>sRR4~DJ}D_3S&RE00000NkvXXu0mjfWXR_b

diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json
index c5495e43df..9879138a5c 100644
--- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Resprited by DangerRevolution (github) from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Resprited by DangerRevolution (github) from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/beacon.png b/Resources/Textures/Objects/Devices/communication.rsi/beacon.png
index cd94b9738a05ffbf12b4527479336fabaf91a047..fa3d280d0b74a373b33d68983e1d8ea66e8da22a 100644
GIT binary patch
literal 317
zcmV-D0mA-?P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00035Nkl<Zc%1Fl
zu}i~17zOZGv0$dIAw!|udegV&@2QhZXThR->F)n?n`R1vLw1LN;PQ>vMY>q!((6a8
zzTbLxdC9vw2tY(cM0BQNyk6$4zsP-oo7+juea5jqKmIYdge+B6jaC2vJU?wl%^$sh
z-2Ch-aPIzn0h6H%y!YQ8xwdTwKX2^(%c0>S0sy$0ejJ(-ElaS-A5?&<0sxw(!D2qc
z{oQImwtm>|$E{f8C%5IjkE)8gt^ok=efMR~%j+A8qA<A%R{2RMz&RI11R(^35PqC1
zB2d-Xb=}EIu*^@s0)5}3EX$;M7Oe7<cgZ=I{KIj|-Ty85L_|bHM1RZ<SIvhiwyx6M
P00000NkvXXu0mjfy+M^M

literal 447
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZnt_3_
z(9^{+q+-t78}{CZ69m{kXmivtI38RXG^gp2f}WH5NB+Ad#Vck%P<gSa+gUtT*5%bR
zb`LZ5h289axsF;hU1D4UE=R^l6>s(Ea{at7j^j|V_vPv8cl7foDVn=TiUVzBXyAHK
zl&BT6>h3cm<|)y+uZ#ab*DaXy(%_$c1@ErxefN#_@g8Hy4AGhP>zd8?IaS%mIFt{#
zB&zNDbZ-0Ct6O{bojLs1H_0XG!1Jl=1wOMr{oL9pnYQSu>&X(K_bpeA3yzvz(t5o;
z;rHF;H}{@=SNQlvUtjy&FN~YM&XacWw+)UIyY~3KeSPYTV1^T`)uQ)rj{a$=E_rel
z^O9MmVJ9OP=f%$}+RK(WX^z!_ZH-nAyFo67fDneauMeM{`19{(ABIbF?!CJDVtS51
zJ)6hnQ`cg?KDcr^jeUvV9rxG8hVlkXJ-vPWe>6JJv#TV3dYfP&ukqJPUchI{!5Rfw
mhG)z(_-~j5uxEfn;{bbL<^G@f$87F_Z1HsUb6Mw<&;$VXyS-!p

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png b/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png
index 7e25d7455d6d2c667c15b2b5ab706ef64d00e9f2..64e7a30d49f2bb604e4d85d41e7eb2748b1fec65 100644
GIT binary patch
delta 236
zcmV<I02BX`0{sDy8Gi-<0047(dh`GQ0K`c|K~#90?UX$W0x=AR-xCFIay@Pkq-&?F
z_m^Cp1x5dWzpCp^hv3lNp>W`mv2M5cL85{RdDgsbpCnMgFbw10S+0xxRe`#$-x3&o
zO2h<SrO+Pm-ap)V*LCXq#@fe;2mmmhT<%4(RzfAf%m9G4ZDp~T&#>F9hT3+280s3t
zw%+^9%xIbh0MMs+lR2KwD9ci{3eg0dbD4+`LO=-NX_kn<%sIv=k`S*TrG%=gL^%!O
mQ90+tKc2LE!!QivC%6JIdp+WT|L-;c0000<MNUMnLSTXro^d<?

delta 257
zcmey%IEiV3WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hWfKP~P
zLqmhOn3T4*US?*cqOw6}=NvEZ2m=EHp!}m0+e#qCSrX(I{2vM!g8eImK!ODxk;M!Q
zd`Cc-ajG_-G*B?x)5S5wqRRj61w+0A3LFlBjE?W?A1yL)*lK$Bw|MKGgAu<L%13DL
z$PHtttCDBTYOssoRLFGjbO}&bIP|JJkip}G@!lU^rybJr7fii0kFoi9HA9kr!n6<K
rf(^EgEZ-6YP9KkC+Fh3*>+oKjKTG!89e+_{puG&9u6{1-oD!M<{Fqr2

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
index e9350caad8..bfd0e069f3 100644
--- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6 // Radio, Beacon, Signaler Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6",
   "size": {
     "x": 32,
     "y": 32
@@ -31,28 +31,7 @@
       "directions": 4
     },
     {
-      "name": "radio",
-      "delays": [
-        [
-          1.8,
-          0.1,
-          0.1,
-          0.1,
-          1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          1.8,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+      "name": "radio"
     },
     {
       "name": "radio-inhand-right",
@@ -89,6 +68,17 @@
     {
       "name": "off-walkietalkie-inhand-left",
       "directions": 4
+    },
+	{
+      "name": "old-radio"
+    },
+    {
+      "name": "old-radio-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "old-radio-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-left.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1cb184a79c41bc605c32bdce52bfbcf245ce02a
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=^E_P~Ln`LHy|t0|kbwYeKyyS3
zZ-jz#OJUFk3D(x*iq;OUlZEcPTE5)NxKHPI`M<S{Kuv+~KL4>yx^~S{`^VmO?PqT7
za$)zoJmpi={yX=6YZ{p^W!(OJt4mtf8n%?w<t7g{>O5pWdm=~oB~#qq=_go#`WYA&
z%$oSu;g(&3zw+<K548v8Db;nKHeYZiPobG@%g4J8Ke;zZGcY``k8cgs;Xn2&HVvf5
M)78&qol`;+05O49IRF3v

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-right.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac3ef8ab79fb3fb4c6b95711cfdc62173f490985
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=yF6VSLn`LHy|t0|kbyw!L-tcj
zIR}{JlqA(zy8{C%WHvc#1W2V^xH+xR@8^E2u6gs<?Vb$O1~lcANniGRo}FuEo}bn~
z?{v`gWz5;n4*ohUa7fG3@K|u-vi&!TqGqZ&Oj`HdyKa`>tkko)+uPHG3uZsRYhO2c
z^3|9F%EvaD$X1*JIS&jr)XU|w1)W*F(H}&2aZk86JAz;Oar`Q-4<*JI&MZ_vaQW;3
i^HA0e?d%K;4e|PtD|HXgzpeHHq}kKe&t;ucLK6U7i(c{o

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio.png
new file mode 100644
index 0000000000000000000000000000000000000000..23315c58a2c7b98d3587c7696fd24ef507461066
GIT binary patch
literal 401
zcmV;C0dD?@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800044Nkl<Zc%1E&
zze~eV5P&~_BiN=!0u?Lh(8WO~7oFS${{ck@r{d@=f;g0blXE8rL7}tI&B;P>vTFwg
z6_IF42&F1$9ZG}9%gZB0>hQklcz5sa<Awu`M$;vgN~P6nhyNi_EEcsyEQvnV!pZ4b
zY2&B++n`sWP-x|HIpyA64;R(s^LeFBL|Up0kK*Tcelr*~+%PRx);3}fzq~jDXoX2g
z1v<PuKM3Dl|C*190by?V^%FC(7};A%!1wAr-qkQn3(s|!n#r~W-aU5r4~2h@cMcf(
zsspgSwT^Au@dbcjxM5ns+lVvD(dM48KJk`>Ogla~JrC`xEYKP5xejB=6acBr94Upr
zvJLdB3WzpPEtja4OVSwra0By8t3f_2jzUSG+3+!~GytZRrrGcTsNGxvkX={~jiZnr
vqRt&K#w}Ty6tC{!xlZUY>iH$qXf&E{dy$VBeQ!MQ00000NkvXXu0mjfVjZ)E

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png b/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png
index e1cb184a79c41bc605c32bdce52bfbcf245ce02a..ddd9d320f9dea2333626c80bd1963fb726f77038 100644
GIT binary patch
delta 284
zcmV+%0ptGH0k;B>B!B)%L_t(|obB2%3IZ_@K+(zS5$tU&1-IJL188AwYbEgjf(P*=
zdJ79rB7(4$FtVOtC1c32|G~CdGMOYW836zQ001COj8UyZsH(lbRF&nLw{2@VTo%Fd
zC-Y<VU6Sdxl571=8oTf6hLAP|(+ub)zI^TFQZFor^`kkDRDblO>-#u)bGkeOI`QyK
zPXC-t1Ms-1Y*wq{C;d0GU8R#Im|TUqwm`9|>hc!wXz&3500000000KYv?}~dnL4$a
zYi007QP%;m=tpoJ0E>PE*Jpr5KZ5HFD6Su&?}Mhrqox@3Be=f>Qu`5H2cWoqgxp)e
ivL68e004s`A{8IGP~iJo-Tf*60000<MNUMnLSTaMIDuLK

delta 187
zcmV;s07U<{0@neMB!8YsL_t(|obB4N4Z<)G1yF-ngbi3ALxgcsuowk}$00jFMUxWW
zMLFrc0lqBzcmAyb0000{?(_UPV%F9<EBL*xhs@f#L<dgOl=51?+}`^sGB>3Gx97D)
zW{Ru^WM!u`;IS;>2hGTAE$ISYy_d)Y000000HB(Y{Xp72U^Gu7`+@L%z@8$0i_15l
p%x)lq2DI_rK=})>8vp>{KVOAWEDy%&U1k6P002ovPDHLkV1oSMQ)B=D

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png b/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png
index ac3ef8ab79fb3fb4c6b95711cfdc62173f490985..fc5fdee22a317165e292d6dafffaf9aa41bf236d 100644
GIT binary patch
delta 235
zcmey&*v>RTrT(0!i(^Q|oVT|OxeghK9Q%0vmhz6>J8rLB%)X*|^Xkb<%wIU#G<1t!
zh%WiS73a|6q-OX?Z_>6YlcxXA=Tq5JlX6m>0R;Y}_Y~f8n^G2;vsU)Kitx#rZFlb&
zmD}%MI&tzY#tPL3lh&u)l}p+9T13KjAE!Y0?nf5gpLusYTc2_y<ori}W5)MB`KN>A
zdUrAWm@VEJ{qAxH#8{Bgi^Qwa6F!vZznIIozV3j2loj({VTW`F&-4Y~zh=JV;W?#0
im(hwDsE}iFM-9Wl-L~6zy0`U%bb7k_xvX<aXaWF7LuPCM

delta 215
zcmZo?`ph^%rGA&Ei(^Q|oVT|&@*Xk}Xnn|jN-5_6lbn*II%{`eK!waEXN>@<lnXbf
z75e?$Z`Cz#{<__h89>0{lu2Lqd!C(ZW}ctcKkszV^kvN1&kp`NEO1E6)9_eu;<EiW
zilSz!IZRsj-Mem<->lTLx!c>*gbQXrziVGNdGghm1IouXnFPpIoZ<qT2P8Js%jL5L
zomsunA4GR?Pq;Tbf?xV^{3@;wCB_%dEL1;m`RoDnP}U9Y><kPI@%oZ0bq~+Kt@Z+>
N-_zC4Wt~$(69Cc*TqOVi

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio.png b/Resources/Textures/Objects/Devices/communication.rsi/radio.png
index bbc73c505e5646dcea0c096c3b08b25513dcee3d..eb57264b858e705554298b886911a667fa507548 100644
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$(n&-?R9J=WR=rOGF&uqYhzcwOS#DyGgaL5i%Y@zK28oM_D}$qn6N`(6zraD`
zVjPW&VPSDq5(z;J#KZ_L4wZmNBoZZrI^gl)SFQyyQQp#P@7MQxef{0Fz!+ov1vs5f
zCOVf4LxA7!7oIy50Y;;7^a6Tquh;9s0`wx2ToJ;2ML&wBOJ;USKnt)2Bvwu`iI<Dp
zfxxzoEkwNlfR$4pmUg?()_}xaj9iLc5yEWC1Xo+FzVT{~!R(UYSZ%+{@3l1Za&3Xp
zCUp|p$sA-^hAhiSlQi<VGXOxV$-_865vs{4rSNz>qBML0Dyi-ktI5??6gsVe3|^+c
z*CSzj#6yOmd|gMQ(Ez0slu|rRlrT9h;rR}zoU;wByqX=z&Q$yQ7K;T2g8{W#O)JHx
z5c&@Qz~XTf2h9vj0H!V~D6VY+;4ebW0%i*Z$sQ)m5hS?TZ;vHS#r8uGu)f6+&Lwe$
zTYTNm`)Gb0)|ZnHF+b+Odnk$m_pQ6rKTPci@eFhth7_f*t)v+D76=RQxZQ}w;|M7V
zV)3{rjkthxHrq+AIxtcJUpY|C@g0cV0!oQ?f?so>_dHNnK1dC4-(c)v!oIUv<W@As
a|HdoZyQceyyn-zN0000<MNUMnLSTYg9O-%h

literal 1365
zcmeAS@N?(olHy`uVBq!ia0vp^4M4nrgAGU?nUwMuNO2Z;L>4nJ@ErkR#;MwT(hLl&
z?4B-;Ar*7p&fS}LIY6SV_sFfK_6n&BSdTDFW#GKAXv2mnOw2ktdwKO5t6v;B#^lW^
z%pGd(z_er=GgDNX*M<4gD*{e<S{^HWbENR``yG4EZ?-7BY<K+a?8hpfDyyxSGC3M7
zSR7=S6!;hg+8H{W8IBlo9{BU;>bCuR_x<}BlEU+^X8%nd1MBjm{0dx*|8n+6GHly!
z*0e<af5QI@3_o5Tt}p&o7Z}5IdWn4f)_->x?!?yIDO;JjRqXG&br!YtGroLX{d{Rq
z|NUe0B^jn~y1mx=;<cThFW$LxbbodKk(a-l3;O?l$lGciP;TIQF#oxH71xbhzpOs&
zd;GLJ{o-MF@7micsmmSyT>bT%X+q8E01<uf{L>BhuiY1BP%rl^ynOWbRr86n+xnV+
zOU_dYR;a74zt3ZE+wy(MIqA8Yi@&qWwC}yU_fY@Q{MYX}8>%0C>wo|8FSq>l#lNRp
zH}5hNeSiDk7WuU~ZWp(|{`}F-{DFyi-quIAFB@O}m-hSl`nh+)m;QMBx7CiL=#tHz
zJDztKf2_Uzp8cVH>#f_dy{8H+F7}mO<7@hvE~d8lyZ?Tc&*7DSY#9q)e#n=$F`pmv
z>i4p#OYg<IMZMcTZ&7~Zr$5%&zdvrfILGMwZu`2T-}bUVw?1Gi{N|%9=Mwj+{iN{a
za~@BA-Zfru@lCy2)X&L^91qvO`q4g*>CVqI0r$(N-E1WGf4$syczNN4pX(>oZ?2cx
z@@4t_%4`3$`sx!H>g;z+|9|vI_tYgi-A3$v;P9^3J5^O`sg=qnw|}mEIh)4pTZN7H
zkDXUdd?dh7h!O9K4Cumj42AZ886MUBVm$Kq3v<Wsm+S)HFY_zBTQ2W#$KSqT$9!Z3
z>WkzV>P!FK`p%rvs~BSMps`=sl5J&OLt^rVH|!iQ&r3Il*)#mxh++thobrWv4#WS4
zF1vr<KfL-w{}uiR*H^Sh$j_H?mh#@OeB`6~tp90^3;r@Z{`ddu;$N3Fen_7^c}KFL
zj)C?6Gskz=U$P(Y2fFkV*xNBeYVeGK89?Ct0ug?JFKo~QFaAaIf|;!+E2d^it^WG4
zuCk<R?Y>a^2J13&w(q+=^v-X4qh65gp?}`|HM_^UVE&u@0=wobbWeVx5A+M$#O;1}
zvugLuXLR~1ta4o7(0p^Y$#o4sB&TomyPH${r|6qh<>tDEIfgU738(Zl)-n9~!u&x0
zJt)qI4sLf~Tz;DPlD#1(<rkyEY+#%^Y`wBgo*`#Nsy)Mvz~6NYE2iE0%G{v4^%Xlq
zb=Gx$hHY0?$uqps{Nfl;<Xg90Sz)8cm84pm5ch|54RX`Ebp^i{{9CWz`ipVWl4z%6
zd+p?MG_UYqIQ*>Q`f}%pth@XSSA$R2F>F}8?Jq+D^YoTZU@?Rm+UMj0^L`eYx;{Ms
QEGHQ}UHx3vIVCg!04W4|3jhEB

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/signaller.png b/Resources/Textures/Objects/Devices/communication.rsi/signaller.png
index d6b68cba775e1dabde93e46de284f49f0b30a35e..1b14a3a13605242c53b964bc4f02b43a768acc79 100644
GIT binary patch
delta 343
zcmV-d0jU1S1MvcoBYy!nNkl<Zc%1E(F-yZh7>1t&6U1T%w^Az9NvM+rp@NfxE)K5J
zC5w}P!AblFE{+BNKnI85;G_=XAR=xRTExvEjcG`{I|rvq1@8!oa_{&Z-+K@5-F*jE
zR#tyeK@g~-yxgLUepJ<Z<^LpL0UVR2ukOIp<FmG(c0;vZQGXkIs}tA4qf2cFBY>fo
zp=#c^(I96w_q740bO8WV&Es`HAFGuPJm|rR>#DYt--a*(a0dCuhM#KS^Pu!bgb_e{
zXKP};+X*>TO6v%Wo?#NFbUPt&ln_S=XXn=>aZ0qHKOl_~kW#X~y#~P5%{@u~g$wQ|
z_Z^0sUPcLwrcfhpk52(;H5<&#&(Uf&j1n*c@JA(<b~h19Ae3Nbc@d!m<(~drGdhAi
pdoyV(4j@aj!T^5#FR-$*dIzTiYGn(Z1gro6002ovPDHLkV1j{bn4kav

delta 431
zcmV;g0Z{(&0>}f9BYyx1a7bBm000ie000ie0hKEb8vp<SdPzh<RCt_YVHjXA>VQ!P
zkmUd`?}-1~wyt0tFb6z*aE*alU}#3cpmTs_jNN|_eSFCwlG6pr4p5CZ`Ok3X7u-@1
zaBxwFG5?e52$CECvedy*onhYgtqguH=5TReV_h(PV9!kkQhxziQIOQ-jl$o2_A&#x
zfFuXlc(XG2>geK>|HFO{m=0*@fFoOfGd#Su9jE-``@b1T1w=dGu$}Jz*mGYQWEHs?
zo;`G8Fi-G+%bi@XgF#AuAH#E?Jk1<%@;(y-122UA^3G+Tr3g6?UrL^VEI_maN*-Ti
zRM0X8XT6X#c7Gsw3nA&m&T#iGjU502l1AKM`tIE)IOR#LCWcN?tgWs0ADj63N3R(S
z<wR-kfH$w-Fz_)5fZ1jXo-v$CkOEu&Y5OyV^PUW3JA!BjynOYHQHenX918lfzZp(3
zKrE%ia*`Z?3}!nc@*E|Wlk5OO1r1FLA`p0R?JTgWH7Nd%U!H~zAlDMAI)K_>)B&Ro
Z001=ZcCSkjr3wH5002ovPDHLkV1lbQyT$+j

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png
index 50f3927824f1ac568ddb6af0bad43f9201e8623c..70e2b3a2a56ff9d446ed8f379c3fad5ab524ab40 100644
GIT binary patch
delta 274
zcmV+t0qy?W0-^$t8Gi-<0047(dh`GQ0O?6YK~#90?UXT&!axi~|E#!xPccm*QTiC0
zBWxPZFx854P;dnbE`daW6qFNew}mAd%D)973LWu86zn`{3Xk;duNm7wp-`BC7$d#f
zk2#GL1OLZBjFCBwH)fF|R#gIkna$zl`Jz06whzPM5xkq3N`IIt=(d4XO{`C!!`=6C
zhjSNDe{pg?_ZM93>Xqi9s_eFbs>;6aIgUN~++&zhLff`TDS1=)P*vLg@dfU&C!eba
zetvJG*EG!#d&$~_B9bHb8Q822sA@t)U}g{zR5h_#9kR_l#oUX?ZDKrrFD+gu6yA<M
Y&)0L*UrKh#01E&B07*qoM6N<$f{$)}bpQYW

delta 332
zcmZ3)bcbnzWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$h2fKQ04
zwzi(Qn3R`yL~VrmhIX5$l9Fe4#Ce#RI5;>oG&CqGDt30x(Kj#yDld#U_76z$l?3?(
z|3?N4t_SX%0LpL{ctjR6Fx2xM0jfH}I8~cZ8YsHZ)5S5w!hi3CgF=TCcwC%?S{MEK
z|9;oP>W07<2QQX4=G@l_$Q1wMG~vkEle-rbfBD`vql{NAZCR3x_2LA*ck3Q4Hst1P
zTGHzvcIfQ;BQseRPbfU<mnPKXo}$gJA-zy6pqy9qjnt2hsS{K<4;)gEV08^NYK>`h
z@<`CMad|8t@w)AYp7+C(Y!yCDne}FGSbEd-^ecb*{LwtL(U^1okFboltSjehm$L5+
RT@Q3EgQu&X%Q~loCII{0gVO*2

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png
index da72f40e03f66d37d06b52899e1eb9f189c64367..0bf04a782db0e0813899de8605f0cd665fea2f42 100644
GIT binary patch
delta 86
zcmV-c0IC1a0d$ZgP&-LPK~z|U?a(0#03Z~D;faDr_6*+jWx*ht1oNu@msYkg0RZs5
s<Q_0v-Z$62?49BkW4KKK0Dy<213rZX=qdlo{{R3007*qoM6N<$f^(oHi~s-t

delta 178
zcmXRp&p1J)p0PN{-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!Qe1}1p@p%4<
z6rf;=r;B4qgnP0C>*55Fo~A$pF1LdY%x)UKLMQD0zuMo;CO(Cou{y6Nc}A9o+onpN
zfLSUZwmlcP;grH7q|81+l<C{D!vCsQ|17ZKsHoG)7CwCNa`y?Ne3(%h5+@rP85x%O
W%PgKQXLl25A%mx@pUXO@geCxBKRw6*

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png
index e5ebc2a36cfa7d8d2ec68c985f8118cca2cd05fb..0799b3f9c8bb605924e5f0bd7fb4164075fa1f03 100644
GIT binary patch
delta 272
zcmV+r0q_3(1FHg%B!BWrL_t(|ob8k`4#F@DMSp<{_yEjV=<c0~u}7c_11HEqm>7DA
zt~~$}8>klmF~E?G1%w$;t9EOhiUIPZ3_p^cpTss02m}Ve7$e%)(U3-hf&VdJj1iy0
zYclZ(W@Z5Z=iCrpx*sZgh|8mT$sSUf=}Xi%;E+Xfnols_ynpJwVm-pNcp_d(?|iB+
zSX>{t+{Z0_?0**>%q)j25@wdNETyS6`P6M_twoxqu-0l*=wN1XdHV$_t;wgVf%EOt
zdP$PhT8q~tBqE=1oq_FYhgmEjA~@$jM3}{b?P}+3rV~RCBDINT`+fEBKp^mQyaC~7
Wcnq&YI#>Vz00{s|MNUMnLSTX_8hg+H

delta 483
zcmV<90UZ9T0{sJ!B!3BTNLh0L01m_e01m_fl`9S#00056Nkl<Zc${Nl7+^5!0IE1Z
zTU+n{o7Zm`UcP$9I3Ny?SI`2I*FX*+Sua%_@bJMk22co)14cuDEC+xR-PNm?;0cbd
zAy6A({(s%&?_e4xcJ?zuu6e~tl5zq`4ggtTtk22-asY^iJAdE^ga(P#GLYs7vZ4SI
z-+XXBA`S2{kP66hz|2A=6n<+AA6b@@<bbD=lK)QwgILy3iGa#`3=Au1-~bSqvHk~x
z>BXCP)ttWfmlPw3cYyTs=Zqe*(%_W;u6#3tiv|~p{GJ=%7=$`~8At_WrGd9ShZy#h
z*kOnXkzp2D4u5!lYZC)Q52l!^GMyYy7z9jc3=>cVb%5o;MH)Nc{DWr<kH3mA%-Z*u
zK}1vpMGjOBfW%0x6G(CZ$O2HgFRy?phY%yJP9WL=UfvP^K_wmxoIQOAMc&xdj)5FN
zv;*wzTo@KX9RRW%7ThozBu0)Sh<3oiLwn$Cbj!(!dt8zo@bu|DI2)Vg=!uf*4!C&X
z6eFl10%B9ka*`Z?3}7uFm}3xPbaDVC7E<H@P&*J9<p1%hA+>WtatM&q`=P1>s0{|(
Z0RZRCzZ#?z%#r{A002ovPDHLkV1gl*$^ZZW

diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png b/Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png
deleted file mode 100644
index 987e571b263f8b1a1c863755865ddbb5f496cfbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 537
zcmV+!0_OdRP)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk00009a7bBm000ie
z000ie0hKEb8vp<S%Sl8*RCt{2m@!MkKorMcVrjskt)%VHE>5+Iv#X1vlY<|@&)`S!
zGYHPzoE%+>n}Z;fT1C;N2el0}Q3@%fXY$I0APU|k*E4W`NZ;KBdcT*;y(IqvD3%7$
z09*j=_8uLNr{FkGh7tf7(g67axH=ue-OUh=FBAd%B(^h{cy~x@fKquqZYM#c034n*
z!`~*@_LQ=*muC{67pV_i0Lg5>E6RS~-bS#l^YCYo)Jw2y)}gm}$9BUqfcO-6lp26d
zE~-rHK!^0@-UBj}Ux4JEuhlAe0JNyoLUiOf81H8Rbi#?)wrhBwI8I;<y1=LWE`bt&
zOWVfi6=q=jE!u+s`=e3?qx5G%Qp=kzy|@58cZN|U(@X#cgWJsBhJ^rRNCRj94WI$E
zKcE5f1@LeE0dL~QeKL7e=MN-7qyR8~piy<HWtuoPejUZ<d9&vRVA&Q80}l(M33Ivt
z5*Da~>JEOWTu=I|@du*GPpnNi_usHzD~4BO&i5aw0HVyJ$)hMLVSqVZIw3v{;<1(c
z0}KK|7GhT+UzLz4$~^gX)U0nnsag(OTU2Tx`qdwBKX9B-6A17rpG%+&K>GvQACMsp
bpd8=}cvi=k6xZ2A00000NkvXXu0mjfjHTr1

diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/jammer.png b/Resources/Textures/Objects/Devices/jammer.rsi/jammer.png
index 99e0246bfb1acdddf9df6c748233bfd2b808c0bf..6de27ba924f109e4b6bcf08e517a0ec822575e90 100644
GIT binary patch
delta 449
zcmV;y0Y3i80`CKmIDY}5Nkl<Zc%1E)Pfo%>6vkf-K{idOL<L<zFqAf7>jAg~(YO|O
zcmb~<8!d*Vn=aY8GU*vum9SPC5@~{93W-+UglPr?GBs@oreD&`zjnUgn|U*7%rFet
zq++mPMF0^%1hBmT2i<e`>~0_G^}6tLtX8YJSS}k21OUx%o_|gup98q6R$Z;p@QkQA
zt*?Xd4S<tQ91&Cnz_#rLBi8&l9*39dbS(ro06Y0^B0<bwdp**gI1X6}?5E}^(=<Vr
z<zMIJ0zmV8E=THU{5FsLD3bw6l3+L*k#@h|_r7^<x48o20<bI#5P&XuYG#TMSkk_~
ziVHy3b)izJxPNM~xB!I@t8_XY4gd=wC6lC$<;Tt;e0>h#@!^&v8Jj2NQi*FDe4PR`
z-AkoN-5v~9zK7Y5iMTESeF0#WtBOMQ{G?ETR;x8z6-~Ify!N7Ik0L_QzCZv_G~v3P
zj@L(*e;GtzHzAGweLRM2Ham}AUpYCCu`d7=8$C_LAUebaAPC$6g#&P}Y2*lsqDb1!
rW-~A%U-tlnpzZx3i2x#ie*^Fhk4m<pJ#1L-00000NkvXXu0mjfO_js~

delta 282
zcmV+#0p<Sh1IYrAIDY{9Nkl<Zc${Nl7+^5!fKdmGI$+cRqYj|h0U8=+|6jlU0O!Ab
zdyA1~4!E;G`v1AZPr>ZEqh?^5kDm)JkL(bdIKZbv8c0e*E&70ADXG3E*#XGDMF-^g
zo@57L13FA%3|IcWB3nPj4xq$xsyF}{*b8g^2hj)LUMD&&P=D0{QtXTj&wl<VNzc$N
zh>%mgsHgxK?*fX^v>*z4`xZ=J{Pve&InW|loJ)QB0v3P9z|3%vfiy65qhLTBuufPQ
zOn+ke#vuGt?f(^qzhM4LJ^?UI^SS^TfD#=w07(w`^zj>*Cb!(D*a0_goFcilqpAaF
g0Y)7#;0^!)$P*M&!Hni>ga7~l07*qoM6N<$g7i9kt^fc4

diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/meta.json b/Resources/Textures/Objects/Devices/jammer.rsi/meta.json
index c5cc9f56d2..2923d9ac63 100644
--- a/Resources/Textures/Objects/Devices/jammer.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/jammer.rsi/meta.json
@@ -1,23 +1,15 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/93d9c70530c7299ef0af96fe2178096b2a62e036/icons/obj/device.dmi",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/c65da5a49477413310c81c460ea4b243a9f864dd",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "jammer"
-        },
-        {
-            "name": "jammer-on",
-            "delays": [
-              [
-                0.8,
-                0.2
-              ]
-            ]
+            "name": "jammer",
+            "directions": 1
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
index 0f259d9b45..cefaeebebf 100644
--- a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
@@ -2,7 +2,7 @@
     "version": 1,
 
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi, signaller2 created by TheShuEd",
+    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/354d9635460c296dc7dce23ab39481dc4de6dc00, signaller2 created by TheShuEd",
 
     "size": {
         "x": 32,
@@ -18,4 +18,4 @@
             "directions": 1
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png b/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png
index d6b68cba775e1dabde93e46de284f49f0b30a35e..37a47342a6a0fadd153c1abb049caefe51b50e43 100644
GIT binary patch
delta 264
zcmX@XJcDV1WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04
zd8nt5s(4_oPs_BbAQqAH!or5PT!E6d+7mN@6h}#rU+{kjV7S-3HxekuS>O>_%)r2R
z7=#&*=dVZs3YL1hIEGmGU!CAx&)1;9<Ffq6!++-6)^08kQOxtHP|R$zS-@I)pvB4g
zzlOx?*8i+5JnEAYH2U6cRNJQVX#!W_K9T5|%%YpvH}_fwFz#;dbGSD@fxqXZ?+3$+
zqA`YF@;l@tCLibBcTE21jE)1Al71l>28{u)8H0aHR=D5Vkpy%BgQu&X%Q~k7#wGyW
CcVF!Q

delta 441
zcmV;q0Y?6q0>}f98Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00DYQL_t(|
zoMT}aU@+={Q3sIa059)||J$~%U>q<9JbZACfm&c_M!}$SfMtx`e-M3q$sv-{1<4Lj
zjW_wvaOM}>QV?)(QHL@Alj;bP900P^!BL%I-uA5welF&4aerT9T`+xM&rJqW0a;Oy
z)a8xB-+cBm1G#`C2iSPCGWhD~;*|fxeh-)qXy||=TYob=ytW;u{Nww-8At_0JK(UL
z?*G_xUm0W-xfz~4bYd`1@PNymT(E;dN`4>1bD%uU9B}eJ69WS;g#Gf)WuT=9IS^k;
zo`Ebtv;#^WUw>p&&@u*Ry^u6^AbATR>BP=(_b!bc00NRm++h0d-6uHZNv$S^PEo9_
zt@j_B`1wb#84Tq_Y43nHuir56F$jR!W(%G%oJx=aTmEVLGluh?3}ickXa~G}^^8%8
zK?NKN`m(<nPBB0%rNnZQ9DodFJ0tQOC6<%y073-~O)?825O{FyEU>CI{*Path7KUt
j5~@0Y+F;ZHqYeN7H12k<OA)0C00000NkvXXu0mjf8!o-h

diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png b/Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png
index cd94b9738a05ffbf12b4527479336fabaf91a047..53fabd17147d2c566dd0d0980241aeb7f1d65d4e 100644
GIT binary patch
literal 373
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4vh_V(978f1
z-%eSWci2Fn?Z4k_lQf|O))t8tiJ!LH)FswhZ7`RZVG`H-zV^_z1rr!9vs~$VBIL~P
zvodUgPT1ShRqvcTOLx7mDd%($U~vSYBdQPnrpXG`i|%e%{(Nfx++xl9)4#u8=-c5n
z?|FJQ14B(+PV=AZ3z;;ZE?JN{D>P%@jeom;=LYOsz~-U3H|W)iH{a6!f4<6pSRmxU
z&cBZT8J^29ELfMFv6hjccK_kWzZh%xHy888URS-{B=XNy+F;$?2!>>yYqxIRm@(hk
z>;HOQ0jG+kB0Yu~x65p-yDBSdt!>0z8+A@UnDaU6_2k(TZtc%t?lIhOt*N+g)he~e
z7SAV7wrrj9&sA8+se(b{bWzv=32PtCV_*Isk`H+jaYDvW|KI&TFrR&7-DtCOrf8kX
RKVUdAc)I$ztaD0e0st59p{oD@

literal 447
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZnt_3_
z(9^{+q+-t78}{CZ69m{kXmivtI38RXG^gp2f}WH5NB+Ad#Vck%P<gSa+gUtT*5%bR
zb`LZ5h289axsF;hU1D4UE=R^l6>s(Ea{at7j^j|V_vPv8cl7foDVn=TiUVzBXyAHK
zl&BT6>h3cm<|)y+uZ#ab*DaXy(%_$c1@ErxefN#_@g8Hy4AGhP>zd8?IaS%mIFt{#
zB&zNDbZ-0Ct6O{bojLs1H_0XG!1Jl=1wOMr{oL9pnYQSu>&X(K_bpeA3yzvz(t5o;
z;rHF;H}{@=SNQlvUtjy&FN~YM&XacWw+)UIyY~3KeSPYTV1^T`)uQ)rj{a$=E_rel
z^O9MmVJ9OP=f%$}+RK(WX^z!_ZH-nAyFo67fDneauMeM{`19{(ABIbF?!CJDVtS51
zJ)6hnQ`cg?KDcr^jeUvV9rxG8hVlkXJ-vPWe>6JJv#TV3dYfP&ukqJPUchI{!5Rfw
mhG)z(_-~j5uxEfn;{bbL<^G@f$87F_Z1HsUb6Mw<&;$VXyS-!p

diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png b/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png
index 15c1e94221d6ad947744547dfc7b4a8634b81917..67f3f53eb5010a9b612cd02ec21f1d09fb71a651 100644
GIT binary patch
delta 286
zcmV+(0pb3V0<Hp(8Gi-<0047(dh`GQ00DDSM?wIu&K&6g008JoL_t(oh3%1{4#F@L
zMK1&rT+Ku?F;g*9)$hTQAov3W2|vJB%}&is)NX=iNik0rwFO8v+Jpr2j%u5mzSCQP
zVHk#Ce$45-3V#*I^E^pllR7|aJv*RjnpNt3Ndj8yV2pV?+kb5zuiG#TLz2KcB}_yB
zfV!?>tpxz|{T;`{9({iY5uxk4q!ywY7;7H|gb?uFFJ@!E<EwyDDi~wnoI~5T<Jnv0
za=lIKq9~AM8HgxYYrjfFHQ=0s_a0J8R8=*blTyw$Ge=ZSN~r(<Wmzr`5JF5X#k@XR
k;8SFY*uf0LFc-|o6Qej+P*_VL=Kufz07*qoM6N<$g0pXRc>n+a

delta 257
zcmZ3-G>K_~WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hWfKQ0)
zP8VHqF)3|rz0Ax?MP-A|&N*J*5pVYd0p(5Z<QD)b&XOR%;Qvs-5bR$e1QIOph%9Dc
z;5!1sj8nDwq=ACjo-U3d7FGUlFBtM2P~dO~WORIA|7ekc!&cL~zr|bk9E|w2P(DI?
zM{XEHU6njzR)bvxr$VNKr%Qmk!l75)feaoejQ9TVI_;2_zhFz)JjUkZ)eK4g3DZ7^
s3pUs~vV2PrIDI^lX?I<MtiyY8{w&#V$0J^-0_|n+boFyt=akR{09)@`DF6Tf

diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json b/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json
index 96aaf12a24..771ce4c261 100644
--- a/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for SS14, based on beacon design from /tg/ // Icon/Blink Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
+    "copyright": "Created by EmoGarbage404 (github) for SS14, based on beacon design from /tg/",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png
index 436a75975b342462fdf8cad0071754919d2338ac..a8c6cb3f8da55d48bca152d2e4851161987be7e3 100644
GIT binary patch
delta 158
zcmey&w2pCtL_G^L0|P^2NcwRg#UJ1k;(Fk~0X;pvg8clnw6xHWkXOy7Z-G*bB|(0{
z3=Yq3qyag;o-U3d8WWQf7I1KIE&3!mbqY%WON-AO(LfOm>n;h-1sVbgC1MVN2M)YY
zX;{?Y=pq=($gDhz$wWIq)|5kpW0AH%prdhPpg`zBaRo+(5;2aK5<I`OfhIF}y85}S
Ib4q9e08CFWUjP6A

delta 356
zcmV-q0h|7=0rLWo7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0003cNkl<Z
zc%1E)-3kFg7=}l=0b02LZ0!X|IU=Q;I&qzfl-f8_asg_ilyD+004?7z+x%he&PQqA
zlWE@Co@ch1olTP;ClN>l{#&5lX!-nn<PK6_699O@wn^5?(0}=1e<bVm%3pYMK>|g9
zhv#!v(AOGG7z7F90u1grCDQBmX~$%sdnAxBDj>seublQUwmTi#m8%uu8Dj$cYiDq_
z%A)P~um^N8BA{EjyxAbz-G;~_u?1eOoX^-D(*ANj2}d)Q01ux{rcdE~XY3e;g}+NA
z0aNfu0w&=f3tgCoe<Xkb4=sQN4<&#JR|Mqy8-fW}1Q?KgQnBG$fu-lsk=<IDa76%q
znc(KSi`+X*xFP^~z<g<r7VRm(hQ1Z}W)gv)3tRy}3+95w7EB!g0000<MNUMnLSTZ)
C372R9

diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
index 6cfbd90fac..d4cab89f8e 100644
--- a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/eea0599511b088fdab9d43e562210cdbd51c6a98, storage and red-storage by Flareguy // Icon Tkan from https://github.com/ParadiseSS13/Paradise",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/eea0599511b088fdab9d43e562210cdbd51c6a98, storage and red-storage by Flareguy",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
index 5b2364d32f8950cdf0fd4a0dc584ed3db36009bb..ac25643123eae1511c713087fb498e3faf6db763 100644
GIT binary patch
delta 184
zcmdnTe1dU;L_G^L0|P^2NcwRgB@y5g;`+bgzn-36L4JN(T3TpG$SzjanG6is3=C(d
z?kNMRVJr#q3ubV5b|VeQiSu-E4AGdFoUnj{gKN<z$*EIV0$5sn=7<K0XjpeiC~6Cu
z3MQ1e2_^7orzDg(2?_X$CkO<(gdRB1v5es;*94{%LkD(Nr)L>lQ)B~wG&!lQ;BpBG
j5H&F1TBIeR!oaZTJ&*r8>HKp*s~9|8{an^LB{Ts5G#oeh

delta 432
zcmV;h0Z;zO0lou}7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0004SNkl<Z
zc%1E)&r1S96vtoS$+~D-=iFS_TbBqr6++O}i~ove?_T>iBuElru`WV*><}y)L~30k
z4<#P@G3^_7WcEk7>KldF?`4<=%jYw@GxIh9D^4sB3;b_^<A1^_ljkk-a&2h>2-kES
z(wP*WzrGBh+kIfRb?1>#A|S)JvzbZ#sBnUVM}l0SlH6jC4%{&EaB*JeH6epFHxmg`
z0fg`6lCbW=ombB5I2KDKUfVxB@H|5%AmFLZGz`lX_#TbGW^a6zySl+}4}^t8K)`o&
z4Qh>BFdg`{3xAjM^xOx($if2h%Kw62nN7g&{`L9cIhqRz$naLD_bXi9^<>8|Dtubz
z5}<<5B|r(ES%4ZolYk0%WC2z1NCGP10Reyi#$aQ4cN)n?^^6=I5Wr|sClg())4t(%
zJ2gC1;NG(MD7qHHv76Zn-~j>rWx~!i78%z#+;@E{6Dh#BFy@;pOXw+34V@~m%)|mK
a7x)1^VdyatfcNqM0000<MNUMnLSTa1TEVXX

diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png
index d7e908fa9c611ea973be719440c86db90fe95254..6fb3b4ab8e659efb01b14ea9eeced1fc55ef8f2c 100644
GIT binary patch
delta 863
zcmV-l1EBoA1@;DzB!2;OQb$4nuFf3k0009pNkl<ZScUDD%WD%+6vls(MBDnH(#4=;
zg0GEqBcftMu~29f-%wkNFI@UBsOUl}=%3(oAyTA)Oe?rCwp|p8f{2JDL>InD(2OxQ
zts!k}GcG1G$z&$U#4L2-x4Gw@Iro0woO|vA{^LLXGK5Bg`+xiU)zdp3HB55+%5qg6
zj}ube_WS)D9r9X(@>4bE2oY1OiSU#Y0LZc|loR{?ek4gE9*+a?>-(L0nk_hTR3L=g
zR)hy&aB#5Pr|Q0NI7~DerK_upa5xM=!LR8Zy57g=#R*eeiP1|Fph8}7b2zYUE5ZXH
zNs{3R1Oj9-8Gj^6LQxa|W@cs#yYRD=Fx@Wqm7_3U@-O1zVAnFCVY3KNDwSe#a?&&~
zm&-9eHin`oh@!~1A~`@|4vSrwgOPJjtpdtoQ*)5Xx=FoRHpO@VlF6juh(scQw)W|C
z8i3y3USe<G*37`!&_0WR2gk!CXEpoBJiLh%I3F}Gfq&4`(__lt^z^g<p!*Yv1Oo#D
zOigK(K7R65u}Vs4S*f*O(k0)9j$&WX{{G!()j|#q&Vh0v05|u4w8U)RqP6$c8w7(v
z0MhBS5&J%cEjc(i2P!l2KBY}Mw_77S)Bb|!J1sWqiyGu!uh)pJM(#*JrI6`jzklhO
z3b1ucDSsxMP)uWL5$kX{6;KU(53R(v4Sd_Qz9@=xbaaqNB&e(}J2=ijC1hC^Lc?wq
z+-%xftis9KW9-mW21Z^Tqwm`GW~OL<34o?VG$lZmWx?n30dVSe0D#bi2%;zgII4p`
zu7OJ28+yXJ%@V9n61o7hAL4Xh-B@>=qX&srY=8FX-YBqcvxKX?g{8$$#;mT~dS*Yw
zdGuHtT5U_#6%ZPBs|Wga*?w~^CCTT$*iNce*bnb6HGUM|I^kA#?s3t+23EJisuozt
z*WKDC6jXui0%WrA^11ags#^nDMWuBCR<uICA!;2eiwlsQxBpsGz{uBb)@IilRo&Uy
z`B+C1g5%l+)z;QV=`eR703a5Np(qLymtULw`nGcl{er55<85d?Y!utLM&al^puYv0
pf!FIbZq$YZ=pvdGU`PH>;5WT~U1=C8HLw5x002ovPDHLkV1kCMo$vqv

delta 678
zcmV;X0$Kg`2EGN5B!3BTNLh0L01m_e01m_fl`9S#0007TNkl<Zc%1E4O=uHA6#inD
zw!~J7CB+|D7O|}qBsFL#1-)6kDR}VQo9CW#@Yq97IeYWmLkh)9SV2%x4@ylDq^%}w
z3mQpm$w65N=sGi-*-pmoW@k211V7lF-+kY=Z+_l0aLo8GKz~`l?6n1N<#t1x@YaJ$
zN?8CU<@LFI4pX_8TI45&PNBREPZVK@#w%~^E_Hm2kzTa0^T|O{<nG-?8HXYaPSAlT
zPUgfEm-E@6e`NBcwt(Fik6}M+2W_KuP!C8bwsxv;YFn@_Tw?XFjc=@<{yneH{CJCg
zfqCHhD?NjS^?wP_4Jno~dTm%Hz;X6igL;F5dm##zWs-LzD0NPUArd>)_bF+d?TN9|
zXCVqj7NK~!dG(LJ``Kvk8X=?s_?Sh6RES6}L^dv$QJ@>J_~gUkF+>cALVP1Xp$m~b
zwg6d3vFf)?)AZ8mG=@h_w*K^tfB$G>>CrS>F1oZ)9)DIAAj5TCRt}Hq+ejp!*=(jV
znT+?@c}I@m6|A7dyii>1cme*hMR_4{G^8SEdEV;2MdPAx;h4se0!XA(^uoWF4}_t-
zJj>i)SnoYYD<6n5NHLZ3kAbym68B%nufaTtn81zs4C{B;95*~4NJ=WAxVTO3fo)Q=
zS^Lhk|9?<W^0YYzye@Tp6H5Rk9zQpT@iRlA<0F#`v3@|#1!4(Ux;Ya{E|PAnmY@rz
zCFmEavVi?BZT4WJKcq?m)@lQI+M4Jj9m&80l#&1$N5y=)xoTtcJ;~)8F}47n4cV=B
z=y<ihkKNWDRMAraRcs0A`r5(35i?0b>edm3upfA!lo9<69D6YO4JR`bL|w@Yp#T5?
M07*qoM6N<$f`msr{Qv*}

diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png
index 0951ee8d9b7a5d07f776e4d62489a86da62cd2a9..c51ae6332b212cb66cd2b9d58ffe841152d0d747 100644
GIT binary patch
delta 864
zcmV-m1E2h}1@{J!B!2;OQb$4nuFf3k0009qNkl<ZScUDDOKTHR7>1uos%^ax>0(fl
z;B6z_h^Vzgu~6D7-l4V@Z@6^bT@_tO1^o$L7a~O(NUY$-Si2~c3L;`9A-eEJg7z3=
zZ5!IgHsfMC(`06nOw2+TzMFH-%zM7?nKS1G|Mg#gSyDOXj(?60_4JNMWhXg)d9h%g
zDkn+xx}qo??e<ztnc<=_g2dE95CsAB#EPQe^ZAI!;{g2ne!CR2MMsWG1aaF!7y!9n
z3eeTnMK~NL8jaG}*hn}W1|X|ww(e_f3|tt>E6p0XI0PzWBsYiK7i}S2dh(v09$H&l
z@pwEmG&JDz`F{{XAcSCabkwM4XH>E?8icttD?6=uv(qZ`lP(T6La@)BXRZQBCX<Yh
zj}wVR5JDi!GJ_8v8uf2NEC-#!QqN97|GB4DfE;gf3Vx>DB;PFNd8z<LMn)vSAR8MS
zLs1k`sT2S$EiJ^}zO{U9?g*R>?y~^gKOSacQmg-%hJQDaEawCHzo6jqXl`y+0TPJ>
zot>Qw4{I}h@Z_r;R87?@wem}9`PqiLrM9Gf{kzYqC3#T*I}m^y`#)Md+qY=tJ@q<)
zKmdSLDrI=zC$UWq4)%ei-(!HhPijG@c5BJbcwP{Fr+K6PsFB?3^%~wn$sGZhK}MF^
z9SdVBz<<^)%bsvT<n<|*SeMHwKq2itv=aX|@Nd)FvMf_qS4Sd|Fh;GI9FKrmp-@QD
z*0h^VTbE|xv-0CqGy?svj?s2?dnF+%{{=ur5ETK0LLtfT_XBY1RyzQ}-UzZR12~!o
ze>?}wy4(GPb(?*#eu7{xOn!*dbY)}7evU3A=6?euS4|rw)@}CT@>H`h|H+8znqAN2
zhd7TOYh4R1$&vuUKDT<HZI|sk*TMvu*)O(1Ra5=JorUtZ;+rSj>drkbJZoTe4Xmn$
zxlGBWou{lSk)DH}X?XeEdKi_Q18JdBGY2bbAX8RqT`Kc)ke;@GTNI%GYZGhJYmHf5
zUs+%OM+kvI?SQJStz~&LcK`qoi^UK^Fm&m4-gAA~IhB4undNvHS~nYE>nm4|?gRQ=
qpb~k#UgJb93qXgc6u>U|KcU}Fxn=bu4hl8^0000<MNUMnLSTYLXpYqY

delta 667
zcmV;M0%ZO72D1f_B!3BTNLh0L01m_e01m_fl`9S#0007INkl<Zc%1E4O-LI-6#i0+
zN~$7Cq(86>TD1rg8#IW}-YVV{Jb3ojv!@(9dhnEUZ=O9wkY1J*3Z;}D6dNfNwM|$B
z8%b1huq*`H?aZvZZno=YXEsF&ez2Lp&3xayH*ep&k6Xr_0DoZtV-wTn>TFq>aAr9l
z6BfWo?fzssg`w0(De`-5T~JqGx<v#Eu!%Y8Q-Z_qI-(-AFb@^iBI*RVPwFOS7)>Xg
z`HsN{(gKb?yoL6@=8PQyWMI@}g!_jD=*4}I{%5>@T0Z0J?DTej<mV2Wg-B75+3W+m
zknYxtMi<r*pnn&>#8efI3v4R{fe?lMmYr56I_fOIM0nP@pzfYW*1CRd%_iZCH+$oM
z&Am<ryDQKIwje@<<S$B&5bx&RHVEtjX1BhE3qwC4)+WCo3paUa0bU{5f;CnY#f-<}
zXzx_G|5=P*e$%kDHq6~srB?HCYaJp*fngZDZSR!dBY%>BN~ID@BogL{{+Wj0bF3oA
zt&m;3vH~o(1z90-He@1L`-H%R1e%tP^V?c11DYuXt?>WV1Ab6f#<=-2n~mR*st1BL
zWEe_WVL<j2YW^4a-I}Hu6L>k5;PX0v#}Kav!jQU=T|A)Qfdksp_;_yEdKegaT$uzu
z<?8+uN`C+&?tR>f-iK|z>m7sBp$_1!1wsi}dNtxp?k3$`&p{SKE@&31uz>R)HU40?
zIix}YHi|8HSM9qhI-<c&P(lK{xGCqe%T?^2YDn(=B8C=VS3_F0=DS`fo#Uu_3{f-`
zz!Vc)Cz_3mmK)xr1*uU&5d89iP(}1FaO=tF4-}MK1|H50q3r+w002ovPDHLkV1n-S
BG=l&D

diff --git a/Resources/Textures/Objects/Tools/drill.rsi/meta.json b/Resources/Textures/Objects/Tools/drill.rsi/meta.json
index 0a315f41fa..90af7840e1 100644
--- a/Resources/Textures/Objects/Tools/drill.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/drill.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "modified from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189 by KingFroozy (Github) // Icon taken from https://github.com/ParadiseSS13/Paradise",
+  "copyright": "modified from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189 by KingFroozy (Github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_base.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_base.png
index 61a4a9b787776d54cb6827a50dd434d78ac30d37..ccb97cbe60d76b8c95769599ef727275ef2a74ae 100644
GIT binary patch
delta 379
zcmV->0fhe31FHj&Ie%SAL_t(|oMT}aU@+={Q3s4VVCXu)+(`F7jD7OlWk$L>0A#tc
zf((PQqAbJR`;S3F|H*X($qv|9!}s4SR*AtT@*czi51ud_S+2yeZSlkZ{w<$Kb_7Wd
zfLQJbwj2a@?LQ8tLHr}j9T_$<>?hd~B!>Xl=fL2{CSK*mKz}kAdbwb6?G1+5X6)kE
z&vMe%0igH=rGrB=o-i=++rh>EeLTdlV-qI>%@ZLEfGlsCB@WJlpqx;b26D`Pa*QHB
z4Ztjilml$!8biJVV3vbu28NgPb-;opTN$oh_{Y$m!^}`Q<u8!W#307NMSBOp3ZjUt
z%?$Dqkn{$kcXS;4$FO1=oeCll0QnpQW~}+gkP*VfKnWn(0iY~*@Z5i}uR#D51s+yR
z4D!;4Xzu`UIl#d8UsQ;JA=Vq!=Q}q2rB68kD~zy-GmrtuN(1CtMl}ae6O1}w)BywT
Z004b{h2GGkm~#LC002ovPDHLkV1nMst+xOG

delta 420
zcmV;V0bBm71JeVLIe&#oL_t(|oMT}aU@+={Q3s4VfMf^gX&e8?C3orSSw@;V0A#tW
zj0`>{|4DTONe+1a>N!JK<X;9gBVGm`RX4c!m)pA-Zk_wg5IgY|1F3){2Q1DP16yt$
ze;3G`jv{w*p)ydOfx)BZ8SNYZ0wBxHj7+hJp9VXSR6tfPcz^ul2?MnN$qtYdlVrf1
z5dYHF0lN<V0wzK>hO*_DAplC8AbFZPVBI}thKgyy3>%CfsU8Mkxgul!D%v_gKuD6o
z%wrY9zR3b$OOXLc93;<h_cHAq@ZsHah$Rf)G0FjuI7psUKynCl_=5@?UIv$d4dBEG
z$`Kp7x#03N4SxYAfhWMA7Y4IomP2yHJFpndL%_|R4bFyH4k;735Ya=+5I_cyV1Ea;
z90X=0G6Qn~jY9yG&((|=P!b>vs4?tfV3_}bwhp-P@F&BR{<lEZavUm{Y3l%FhZxAS
zWAK%jzcD<Zr33cex(jS<DF269itZ?gJPjRya0K<h&>d@(jyho2IRF5fzm3J^`Cjn=
O0000<MNUMnLSTYp6trys

diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_ext.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_ext.png
index c4112f6525a9afaba6a8f5b5054c186b2fbcac7b..fc41e60ff8781a238d3b387ad9fc4e203f91c916 100644
GIT binary patch
delta 211
zcmZo+dcrtCvYw5BfuXvubRCdlOY(MiVfYV%3-&Ib3>4uk@Q5sCVBk9f!i-b3`J{n@
z>?NMQuI$e^S%i!%Lb7dM0EG%YT^vI)?!CS4%hjMD(DqQUN$-Iqlk)p|fyF0`cknB2
zsI}*A*XZ~jS!W>6yh~D$;lOd9w+=5;cIf(a8(sTmdg|z5*Jq}#t5~01n`bnA@}6xC
zr%!&aW(1ndus_kndGhwBGrlUW+!gZt=cYUxSq6p!$z`2|0#Z`ZHy?u3c)I$ztaD0e
F0szMUPVoQ$

delta 243
zcmaFD*upeHvYwfNfx#!Bbq<hXEDmyaVpw-h<|UBBlJ4m1$iT3%pZiZDE08Z5;1lAS
z#wK@$Rp5VcusfsB1|iKewzfc-TW3=q0V(#9Aiv=MV89^d&Flsg;w<opEM{QfI|9Ot
zQ?>b|fr6=?E{-7{-fw#y`4|*Aa+tdp{jdMj^@T}ox8Y6Y;*Gw?ntnQRo?FV$JhO!>
zbFJsE!{y8!9<z2tM;wbvP+K`~$^#Jmqg&EElV#y+3FpOvtShwQSl+Z&n3_gI6(pSb
a$?!QypXGh_`g=ed89ZJ6T-G@yGywp{@>vT2

diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png
index 7b160b48d7b2c8cc6397a18f7b7ac306120d6d78..15edc91e52938302e7edd8e02013a69dd0304f09 100644
GIT binary patch
delta 159
zcmcb`xPftkWIY=L14D6D)fXVemgMd3!tfsi7wla=87RV8;1OBOz`%C|gc+x5^GO2*
z*-JcqUD=;;vIyx)UX4)F01DZ9x;TbJ98OM<U|pOb($f@ZaEVdba@N1qhJTJ5yb!BQ
x+c;tIORL=+Vi(O9U$o?MJE#FuDB&Q+z+fWB@}wki0x!@c22WQ%mvv4FO#m+?G4cQa

delta 201
zcmdnMc#Cm@WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKQ04
zJEPDBA<Z+kwrOl~KrucGwF^LswIs+d_&*RZ{NBbF3>4rj@Q5r1N*@7X#;MwT(m+9H
zPZ!4!3;(xg9Jv@2I9vkV_x_*hJlCmL(6#!$TI>8r{K8YtJ20hZt#%0A`1j%LBMdiG
rH|$Bc<8}TsQ~Ile2U${^9_(Y#pTWP@hJh;<XdZ*7tDnm{r-UW|uNOj+

diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png
index 704d654a6f1c17229caf4503f640e5c9ab228cfd..6c83622e3499372750fe4422db2b3c96b105af87 100644
GIT binary patch
delta 156
zcmcb`xR!B(WIY=L14D6D)fXVemgMd3!tfsi7wla=87RV8;1OBOz`%C|gc+x5^GO2*
z*-JcqUD=;;vIr@g@UaA61`1hux;TbJ9DaMzke5M0fZ4&rpdprJfq=Zun|_9E@jInw
zZ}IkKd{AzBwM+2*C7;}_J}cLMPPsjkfx%N${DdOwxhAy}n}NnKc)I$ztaD0e0svRr
BGF1Qo

delta 201
zcmZ3>c#Cm@WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKQ04
zRHRA5{=|hZW=q$a0L2y_<+%r>SWANZg8u^n!|!c;!9W4d0*}aI1_r((Aj~*bn@<`j
z=<Mm@7-Hf7_KYJJg93+3p!?qcGo9x;^$NOH-&bp$|A=3B%6SK-^sLnmp&S1`oPC7h
thU$hr33t5Ce`ZR5b?_idYSV*#4Ei(p*V-^}#RAP^@O1TaS?83{1OQs`MWp}$

diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png
index e2694136cb808b4353f1b68c2e511bb7101e27e8..015059c73086a48fdeb54267325ebdd96b2e5d4b 100644
GIT binary patch
delta 159
zcmcb`xPftkWIY=L14D6D)fXVemgMd3!tfsi7wla=87RV8;1OBOz`%C|gc+x5^GO2*
z*-JcqUD=;;vIwc@?NPVM0}9!Cx;TbJ9DaLoBQJx3fK#AeA)|Z2|K6N4z7IIk^Vekj
zU9Zx}#>wzucY)XHkaDv_x3l~-)9aVawq}%IV9;TYP-H!5vESq{&?E*=S3j3^P6<r_
DPHr;s

delta 201
zcmdnMc#Cm@WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKQ0)
zp%8%&C&T`K?|Ig!1QaVfu;?F<Vl4^s3;quT48OPW1p@^*3p^r=85sDEfH31!Z9ZwB
zptGloV~B<S+cS<_3<?}Bf$n?%&vc&a)GO#(eP6A0{v&?jDd!!S(z8}Ogl_!%aP|>~
t8>$=jB;4^j|CuTM)xm=-sZ9^|G3d|WUu(m_6$><v!PC{xWt~$(69C!QNLK&=

diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png
index 1fd176e822e10e4c9169a090fd5a4fb025fb3484..c88de643eb4ea1034032af998a560bd16f27aad9 100644
GIT binary patch
delta 159
zcmcb`xPftkWIY=L14D6D)fXVemgMd3!tfsi7wla=87RV8;1OBOz`%C|gc+x5^GO2*
z*-JcqUD=;;vIwaPbp;o$01DZ9x;TbJ98OM<U|pOb($f@ZaEVdba@N26v>*M66Z9+7
zHcnXl@|bs`&Z2zx#l>I+Ty6(7fT|@LbQl<V{;?i!ii}DIn#ADg>gTe~DWM4fY=JY)

delta 201
zcmdnMc#Cm@WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKP~P
zmn6@#0?Yrid^bDE0>#WLC0c<LYe|q_@P8m+_`QuU7%0G5;1OBOz`%C|gc+x5^GO2*
zojqL~LoEE?o^j-2P~dP0bl>}brt@5<UP0ID`)aN8AMp!MIq$%fp0(N`bmQNLvyU*`
sP~EU6;f~k&&rIpB4jyDlZF;beL4OASS{nwgSfF_fp00i_>zopr0P09Y!~g&Q

diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/meta.json b/Resources/Textures/Objects/Tools/geiger.rsi/meta.json
index 11fbd43681..10968b4776 100644
--- a/Resources/Textures/Objects/Tools/geiger.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/geiger.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise https://github.com/ParadiseSS13/Paradise",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png b/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png
index 77fbcef30da736b4008b8a3c372a3bc43424dda2..9938103840821ec610fa3ff217b4c8a3965985b5 100644
GIT binary patch
delta 257
zcmV+c0sj8q1Caud7=Hu<0001iRA<Kk001OVOjJd{z`#{iRsaA0+1c5zudhEpKNTP=
zUXH9pb*435p8!d9B_$>0W=jG90004WQchC<K<3zH0001+Nkl<ZD3N1epeGO%K;<(k
zDWVDp85^M}VN`Z?Mp43OoR(~eBH&iu=9ZR#B$7U}Eo;>>1bUyXb7osrRTWf8T3TAh
z%$aRnU0rPu+4l1C&c#Y*vu4ej1`z<NSh-lqYSpTh)8J-g&04i`=FFKef!({efw(hg
zLapHr4GqnjIdj#jRS9qvyR%lUT9yVEfS8=XkcJ*6gBt(<2uCy#`*zn|00000NkvXX
Hu0mjfXDMl>

delta 465
zcmV;?0WSWL0^b9W7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0004zNkl<Z
zc%1E)KTE?<6vc1BjuNGUV5LHbHW=^^3a*_T1?TR52BCAoFVb0X5~m_K2#Q*WL<iAg
zJBUTaMG%ahXK(xBD@k4gitx^IUvFM>emU<3GDd$a17H9QfPVo<4NzIH`SS1PK|S+p
z05HGt8cI(GA~67)JI+#|@4AgZDp4?r0bo8cIi>W`!?p58o!+l6BNItI1Fn0n0I;&9
zc>xh71%Tt*sqE5rb8}E%I;UjiSHvEyd#@fnKRt>km36gO(|UlB34nZV?TE77VYT{w
z2<x8b4Pxd&EPvWn(bIuY0K}7i)w|;dadWQR=RFXcbL?0bsjA#BYz`EFGj~6;Oysu?
zKg6H8B68|{@4-4ZZi__9rQs1w_bd0J&VM8TLu|QNd4yUhy!mV_D~>@T0M^3ds*gcK
z#QB+7>U8hL;OUBwObY<!FomMb`3?D5<0v!%*|c?W5=t1NoMZd4Ip%@i6iezuI8to@
z*|6QdRj%`}G6ZqVQrzf=nTG<zQPj=j=>LBY7ytuc0MhCc1U29O3BXS800000NkvXX
Hu0mjfc3aR=

diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json b/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json
index 3c793a9732..216140cec3 100644
--- a/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/. Inhand sprites by Macoron.",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 44636483b7b2868b3e42c92205539f11f6d7968f. Inhand sprites by Macoron.",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png
index d0bac8b61eb217c36e109147a9aef63d1eee1b10..fccc17e9193e7371d0b0630e1eb19d25699ad886 100644
GIT binary patch
delta 93
zcmdnMSUo`{+{x3$F(jfjS%P(Of=EwOpaB<~ltEC+|NpE07nmhWN2VF_mT+tcSQPo;
rl(@xjThkb0F1LdkP}LLJB_t#mk}_B?1f4VtV*mnAS3j3^P6<r_0x2JX

delta 147
zcmb>4z&Jsrp0PN{-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!Qe1}1p@p%4<
z6riB1r;B4qgnP0C>*55Fo~A&9M~uo-)Fe;LH~OJp_1SXD@dF>CVkbRZc$0O~+2p26
r%xr9T7@;b;+zx6;url*VNHBa4V`uyJH<mX6Xd;8BtDnm{r-UW|xvwzp

diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/icon.png b/Resources/Textures/Objects/Tools/multitool.rsi/icon.png
index 1dcb102e80b0defe93c2588312af3fed16bb7231..6e16a3f7ebb6fe8983d760368b6e256a4fa94da1 100644
GIT binary patch
delta 333
zcmV-T0kZy_1m^;fBYy!dNkl<ZScPL41*2dTjCjCEY5*KKZ~)GJ_%QwduKf-SdYU&G
z%*`9%W;r-G5N#e4xiJ8;+}~di%uY}L!Eo|q!+&zjA<F?U%O^}Y!Jw)z6HJrq2o`c2
z00RXD7AXAh-w)tZP8|ope1G9W2gCe1bKv5MDJcvd9_b7_c7HhhCnar>9ReWB7cQ1V
z2*l1|m^ej{VaE>A%pp4wQVUR&1_ZBsq1YK@Ibh?)_Y4!K++kqIQGttr_#knbJ3wB3
zCL<^z-napE1QdYy_wV0iaBw)l$iP5{f{0pxYzJs)K(b<Xfj*c9@yP)cg~03u%NbG=
zBEdAdfFcLLEJg>><N~s@At=#taHKQjW`KAH7;fAk&zzxI5P`Dd&70{cH6J1ij)GAz
f3WgG3U|;|MXTonI4e0RB00000NkvXXu0mjf-}s5Y

delta 515
zcmV+e0{s2w0-OYpBYyx1a7bBm000ie000ie0hKEb8vp<S&PhZ;RCt_YVHjXA>VQ!P
zknI2k6Nmr)-u?^|8w(lp>-+z2+`5tB!I=Y$baMa*IM|poYy>(4OamQ24j|b9AfLn7
zGv+Knp+R!L?!04o_TduIAwiM@Ko<13w=o<zauP14p`nRF-+#Dqoq=H|!+&BOL6QSN
zz61I8=G|Ki)B+?qAj0$yLr(m41|C&6oNB(@-o-Gb{|`goZW=fM1VEN|WG!d7@bD*w
zoPj($L&da6AZt0%=8^0GkPktY-(AAXAbRsTT>Q1VBm+atXRtgeU}zRZprF2sL!2%S
zaI<G)V5t5DWPb@GiT;9!)58I3M!XD0;g~sr)c7aa0ieV;rT;C&r{~sURkQ2hFRVF)
zDh>dFoI+uEIRNu9ENg<~)QlJyQVO2Y#sQ#22C@ufvA`rThFdnDfl(0*wj2a(qCPSl
zS;kL_k>r&FAaLg7KA?^AU_K~Hl6wAuEx&c{GwmGEw|x5=u!7P04+?6Pr8;nNP@+7t
zi~($U*P_o1`)=K(O>GDQ>)wkoTwSP!QXzpVDFomq$vm>MVMa;<N|g))psM)t&J(nC
z0I1njSXuQS)z=6>N@Ij92f!S`KqW9VE2B{dj5>gt002SGvy^e9L(~8O002ovPDHLk
FV1oM6-}(Rm

diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json
index c5c4ed87cb..bf4315734b 100644
--- a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/multitool.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/94f27c7b25bbde39c1412e24fb32bf6470fcc394 // Icon Taken from https://github.com/ParadiseSS13/Paradise",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/94f27c7b25bbde39c1412e24fb32bf6470fcc394",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png
index 71a6ee8f67b5927c7f206be27be23abaa61c00b5..a141fec4bf9b5deaf39c994e771dbe07e8da5698 100644
GIT binary patch
delta 87
zcmV-d0I2`30d<fhQ9MaRK~z|U?a;9e03ZlN(XVj^_utIkCA4w@F`@9k>Kfnzk|bp-
tk^2+Y$^CLy&Hg}(43Bp`BuUb*fDJgg0_WdhT?zmI002ovPDHLkV1lX&C6oXF

delta 146
zcmXS2&p1J)p0PN{-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!Qd`Cc-ajG_-
zG*HmR)5S3)!aZ4nb#a17Pg9`5BSz&ZYLa^<ivO<v%07je<(3Q&j}m|U#2h){DRKq|
n5BT6Jx!ewFNF*FMz`&r#&&FmOZfL;+G?2m5)z4*}Q$iB})jcSv

diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png
index 911fad308880b654934332ff45ebbcf8b58f6059..f890dbd413ae102ef91ec7bd277c61418e501d93 100644
GIT binary patch
delta 91
zcmV-h0Hpt}0eO%lRX|BZK~z|U?a;9e03ZlN(Zjfr`;Xu@lqOiYfS6GDUv&*|K>z?$
xv&{X75ht6?t6i=713feBzTPzf004iIv;nEo2J8>CYB~S_002ovPDHLkV1gJ+CH4RS

delta 145
zcmb<i$2dWyp0PN{-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!Qd`Cc-ajG_-
zG*Hml)5S3)!u{<zLtX|20q2WO2N>BlG!?8#U|^qcponco-h=&1UtS7fXn4<hIz4^c
u=40E`p3V~Ss=wDgE$<FL&;X0cdXkLnZ03{CykX!5@;zPsT-G@yGywn;1u(e)

diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/icon.png b/Resources/Textures/Objects/Tools/rcd.rsi/icon.png
index 3913af251881e2963334cf77daeb8f931c9ab74e..cb62979010f4ddc12341edfdbc08a6cd69426857 100644
GIT binary patch
delta 614
zcmV-s0-62U2L1$)BYy%#Nkl<Zc%1E)F>ljQ6oo${78KPehM{Q?n4v8l3~IZQVyS|O
zOe`f+7Pk5iutfX@vmhjtF$*lsT5uay7lDV!K>`m{S-_DTMU`00@Ng2>aS~7<OO6y>
z=RPOz%elvnCCjpyr!LHO_XWTLU;zMJOj`&}^e{R;Q>p-5@_)<7TbA@+08T!^<6T(W
zfNt(S084E+IM%~iLZku!w7!YjJNp7a#)IOHfRLs{SlS#9n*cBjBLsM~J^qW=t_pW1
zsov1TaS$UN&@>JEhYIci0C`pPduoGLv+&!6fkTm2uZep6QPiC~@USo*B5@U%rYSj&
zgXej?wl!=QPJiDQ`s+Ql(Lc7``0Mi!(33p@;x+|D_roC66CE&3Ge&Dw^$-f=?~2X4
zxl<s|yRY}oee$UP%U{++ourWfQ4S(SdB}K$m;(T%(h;@|?RF6mP5|Vt2uExew!f!`
zF);$eFhWh!P*oL0QBV{mwx00{vG?_Qk#@U?=XvO5OMkjtjgO`Ev&7R^+MhY#I8MBA
zQ<Q$_-sS=DeIMWVfx*~r02Ny!o6RE2GP0byHvrPKPedXIN$u@I?GW^G++xEp!U2Sg
z<2Z?I!Gs&pu+DD~saDm)%04`Mu7_#ojMGg1jNE3jXPTze>2wH!fFKCaG%XSCnE>cz
zOR610WnVviOaMU;jO<T6f=P;87={?WoiDEdxBn4<UbduKRS!2;Vg35(bJjQD#hYY*
z>Z@QHjT^!83fy{-4Czb({zh|uBwGM10Ok(x3+A2KBmwPTod5s;07*qoM6N<$f>`(+
A5dZ)H

delta 835
zcmV-J1HAnH1lb0VBYyx1a7bBm000ie000ie0hKEb8vp<U3rR#lRCt{2mR(2`Q547j
zi+y3ONRgzOic1>^i_2mJfr(;6A1|>z^dX3m50yQvLg7P@y-9%zefhAF1R)VdzC?^5
zSRh!stPCt@D4R(_pc$J{!ZO`+W@mIAcXza~9`?X;@7%q2&VTRz&$;K$Cj4Vd1Ec}c
z00{w_j+UrW#TM>&j+SwIsdN~}ZUk)`0zl3^XHIj!p|YCW(wsuP2GqX^ku(I~KgirF
zW4pO^9FQ5RX<*S%CzYjwH37H}N~+fTl5i0@cY5sDv0q9FkV>&t6(}kyKyxopH89Q3
zli9<ue`;_FPk&j3z_T7WAt!WvuYDF*8+Y;CWDq8R=+7Ah12f!zF_!_i=MX1fM&(1?
z?|5WD$ODU_ABkH_s*sHbB4~ba&VWn?VFFMT#pZIkRQ=h#-7lP#K*D7-_%w*=SF;Fy
z{DuDB{J6EPB5VXfKXx7iBGZ5^C_t96Ef@21nhITSU4QTvM>V*2qXOb09N)%R;>qj+
z9Iy6cWJF}l*Ln`yatK`wxxE{eCqiiJvj9LzNI4LWJ?kKbLINVXph+JL3?UqrV)KSj
zSFT{PBMa~q8}plcbNC%?jj)yjG&#7!sct0;o!pX~9D=)f;v|&g?8z=fGc(cB1zTX>
zX4U&xQ-3UbXD*D*Oem|q(*$78G*8Of8{$0BjhvH_yp&|_!mUDHg?AYKGz+^c50M|*
zX2>}~h{LM}-^<pL&^$(=$>-2e4&;k4ycrx8@=kHgDdTaaTW#wL*}M=^iv>lFr9@6<
zmM<f6e&lc&uK8}_PRA`{To$#$=`q&>QqqbFmVW_WKKIi?wf4N1A*dyzaOg!xWC^Q4
z<D}$r6~f^uQ$nu^U?l{Fpm=@|Qmq}gpF}tx$mkYbS`m%4(+t{rfsUp-t{|=Xdq9UE
z=d^3O5Bwqo^}f%zUTcplJ}ZspQh{1->-r!eh$^Q;CFy}~9;1^$O1KkLJTj@G$8<Zc
z`#g)Ne|*B$KOR5UQip_@zbB8bW~4rbe_~XK*1G2Z{U%HUqyaX{eglQIOIO6?S@-||
N002ovPDHLkV1kHhd#?Zh

diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json
index 47fc7c177e..17ec25991a 100644
--- a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
+  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png
index 86ac05b87ed63916f9001d1d8653a3dd60ab51ee..2bede8bc3b0708beedbacbd88aa4a50e20c463aa 100644
GIT binary patch
delta 234
zcmV<G02TkX0)_&RB!A6GL_t(og<}{6qhJ(_f>AIEMm%7|7681arT;-RBP%yt?Emkt
zC~BCwL>WFDEMr7g|M_$`R`c)y7HpR1xIl!>jCA1Qr_P;)v*$exMR6#XW+cPU#|OxY
zObi$ESvCA;lQ4luvT(u0|Nr@h(-3AJDTcpao-zD-afZQ?_hUF*Tv%8bMV*+K7=xsw
zBtv<5Iow{15C8>rs`^nd+sw!qE{-h(zFl7qra>X_=lv~)PsbV<cM{`mBrxD<U=)mk
kQ7{Td!6+D5z`(!&0H^Fh^vkdMfdBvi07*qoM6N<$f>su2pa1{>

delta 283
zcmZo;+Qu|NrJl3EBeIx*f$s<iGfvg!lV)IGc;V^d7*a7OIZ-0P;8jB)dyiGZ6~@JU
z5~T+o6f^V}o~;+i)hZBk{`ivrSi-N<H^tmiwi?(S<ztXMp|yl7ZFW=w+qqWZE{#5x
zm4E-fGi&ae^{jq|RAeOU9<g`#cgr5#7_qp))n%?@%opSOu)>mm{q4U4bWFDzvA+^c
ztoZqhcg8WMf6CTOM;Ytw?b$9X#OGGFO0wR!-{TN?oF{~xsbAi{VRhx6PmIiV1<$XQ
z-ckJU_nMQN-`0wP0=s`bnHS>O40l)w@CJA1X=pMib0xIhKe+0TRoK=k4F{+5y2~Pb
d^o5N<WIbPi<7KmtX+U2yc)I$ztaD0e0s!Z(b5sBT

diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png
index f018f39ffdf86e95555561dc5ac713ac8238a8b5..565ebc24f66a0a622c01e1fca2073a35928b7c33 100644
GIT binary patch
delta 134
zcmaFJID>J5WIY=L14D6D)fXTY@9E+g649D0!MZp>q^Bv+fXnTm1G8JsxA3sAf9x02
z+>RA&41Rv@(9O4R-$s0$$h;y=fM>_<-T&J+wzjqgJ~?vah=hu&s^qEDryqXftKfi|
jpdrDkEMs6`z`(HczYt4S{^YMfs~9|8{an^LB{Ts5L&Y`}

delta 208
zcmbQi_>ggeWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKQ04
zqqApOZG(!MX78jaK(R#+|Ed5f){-E<;Qv6t@Ov9yFi?QAz$3Dlfr0M`2s2LA=92~r
zdU?7yhFJK&?eXMdP~c&H`{}=V_AD(=r4Dz&Il;61qW>HaKjH1f*u#C3D<S0S1!;+3
zg9A6jl7v{NY4$Y#xNy*7dk?qfo1aWO^>>6HtKd&A^y^Ls8q476>gTe~DWM4fk7GtS

diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png
index 9e1369973418dd4a0e681f2cb730f43b07e17418..9d0d820ddaa8a7610582061de5121e0fe779d51c 100644
GIT binary patch
delta 210
zcmV;@04@LD0pkIX8Gi-<0047(dh`GQ0IEquK~z|UV;BXaU=)mkQ7{TdJYd8Y06jfD
z|3Ne_FE3o|^XJbfY9u8k8KR@38IjeOl$2mKk0byy3?KOZ{ri6q2B`&M5PQ|CRRr~6
z0~juzIdkTJJ3Bitn}>%7F8<}q7o3JDC@3&Ic<_MX(4j*N=}YP9B!vPCx&SDsH8nNy
z8Upe$h@LuiDwv<0oy~Ch@@0}O2Z6zt21das7zLwX6pRA80tN;K0N&L{g44@Iu>b%7
M07*qoM6N<$f+sjqKL7v#

delta 206
zcmaFNc%N~CWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|bfKQ0)
z%$YNLdV0Qp{|*$W<mwIvsVfQc3;zHAKZAqT$}d1ZXMsm#F#`kN5fEmas?8@26!h_Q
zaSXBWf7|QGb-;jwrTpvv`gOY)7xI3QaA!Jql+#D#-(i+V^B7JQ>EwRm-86?~2mhKo
zJtkXy***r!t=_<$R9@M)^z82^?VLw`9{9`1SIWKo>C=$^K!X`PUHx3vIVCg!0Na^N
AF8}}l

diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/meta.json b/Resources/Textures/Objects/Tools/seclite.rsi/meta.json
index d466ad62d5..86f25b0b7a 100644
--- a/Resources/Textures/Objects/Tools/seclite.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/seclite.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/lighting.dmi",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/52cbeaf94322209d4c6596818dda9fb3654729d3 and modified by Swept",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png
index e02d6ee077424adc4cbf9fc449925864a056d150..317e638c18c679b0a0ee848973c731e7a901d786 100644
GIT binary patch
delta 271
zcmV+q0r38W0-pkq8Gi-<0047(dh`GQ0Om<VK~z|U?UbPogFp<1y9IF)NrJ#(F-u4g
zyvUw!FM>eLU~vc%BofpuCFuov+nQ`66ZA9f9mn<W&mEvBilQ8z6E`4^W4j*reebRL
zCBd`eS(d>#jx=re6cX@>w!K4|ULenNn5Jp{$nv$Hz#H)d5Pw)4U5KK{3F*4dxf6yV
zG)=P^zl->8S(Z>$m0gQCOHGgv+z7$EzSZs%VN8-ljIR&{NT5U5ofMIIp1s{f0mc|-
zBZ7HxEu166Ff6$g$xY7YK;SLlhmZ<W7vI7Up(g;?HKf9OUBkcsh!jOp4h{f307S*3
Vyp$%2rT_o{00>D%PDHLkV1mdxcBlXV

delta 243
zcmbQw)WS4DvYwfNfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=#@z$e62
zT3Xu5%F4^jD<~-F>(}Rzk&!<CfpQEVp3m3>q&P}~{DS{O0K>iJy^%mM&H|6fVg?4j
zBOuH;Rhv&5D46K!;uvD#|F+*Thwp#_2TS?ZY5)K4P*4qYezj4&eTQOV6W7fGmgnw_
zUFNpo44ZZ&CVuPb(_SZV;eZgUwbeD5)?*qUmU&JNI4CuhtM+~LP0`!#YC8ANY_Pre
h<<A3-b8Z5a3=ECpzXJaIOa<D;;OXk;vd$@?2>`ECTATm?

diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png
index 7ea22fa4c673b9069203b7c9aea6b79030624493..a5e9f773ed55bfbc12fbbdce978c3733689ff043 100644
GIT binary patch
delta 91
zcmbQvR5?K<)WOrmF(jh(?L|W_1_d6LgWdn@m(11os7=aN_HbyC^{CHbVPGhmd3amt
vF0Hp;+1IhT^lxIR7mE;#<7Z%4(6)rL*jZtbwErhd1|aZs^>bP0l+XkK{`Vjk

delta 250
zcmV<W00sYfmjaL^e*tq+M?wIu&K&6g000DMK}|sb0I`n?{9y$E000SaNLh0L01m_e
z01m_fl`9S#00022Nkl<ZSVv<R1*2dTjDk@x3g`to+H?Lxne+uYIr0DJ&u{tv?d$&k
z$d35+^B#R1w0Lm`*m4j6(LkI5l>!4MC`~i)=g%J~3jsh5bb&Id;{c!k3?v077q=rL
zhz5lU%|iemU<3lHIA9AS1K3BT09YcVc?htuus~U;fQ?-V>}Z-h;PmO63@cY1W%&N>
z0K=q7YeDfpgKk+684OrKGzvz+C>RBU9565d0A?&i+Z#0Exc~qF07*qoM6N<$f>26Z
A(f|Me

diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png
index 1064101c28a568b4dc9acf68e1ff423b8e473014..d8ace36de984710ee0aa9095539bc689fc209fa8 100644
GIT binary patch
delta 258
zcmV+d0sa2L0-gepB!A^eL_t(oh3%BF3WG2ZhOfoJQ78q$!AEd(^UXT-&3pqN!9fs8
z!BMA_zi=VFv^{7m9lUS3ON_byeiO+s48zzwJ83{s6fPVO!w{|cCCRhmRaMb6O+4+^
z6q3k^vMj0VI;!iM=6MbuIl1-|WFwIP2F2k*p66aj-}l~~EPKoDLc{U9h<BT&p|)*Z
zC}OWQ!9uVRKz_bn{3k+$Yg&ATDnJ7cp*t;tWm%%#Q~_z4dK&@q)8XhH8OQOSYmwcQ
zJRAtz0@ww`d<eNPckwOq5Jmz>TthCr);0Y5kH|0#W8)Cf4X&f3j7@3uSO5S307*qo
IM6N<$f@ZpRga7~l

delta 294
zcmV+>0oneZ0>J{1B!3BTNLh0L01m_e01m_fl`9S#0002<Nkl<Zc%1E(FAsw-5XHL$
zfkZYz;INo!K71X?3>JqVK_WqId6ylbqZBq4mXUkrwWQbkUH{NP{a6AZ00JNY0&s4C
zIF9ere$zCULjX8&k|flRqDYlxN#9=~0$1Q(O%sP<sEVRcReyC;X?mTF9RZL$&vRvr
zp$QP&b)DByRhDH|pJS1@ZCh&l<lF*GQrGpWLrBhTu9|_i$O0IKfgBTRtvC5zSpa?C
zk5%yU`JBhH1Bk1~7Q6-UJe_n1v6m26xa7XE47CPgt$^#EekkiU;h?&1zzpD9niN7H
syefzNh#Vk`Iv@92AOHd&0Dl4S00+38Zcp(ok^lez07*qoM6N<$f+G-oX#fBK

diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
index a7ed668444..056ba0a856 100644
--- a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
@@ -1,5 +1,5 @@
 {
-   "copyright" : "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/8e92e96d56f231f79dc16f95918d59b2803085aa/icons/obj/painting.dmi",
+   "copyright" : "Taken from https://github.com/tgstation/tgstation at commit a21274e56ae84b2c96e8b6beeca805df3d5402e8.",
    "license" : "CC-BY-SA-3.0",
    "size" : {
       "x" : 32,
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png
index 0c7ebdadccef551b183bb87c0e117d9c80d9e4e0..462e22932c2b9401cd950e8630eb80caf0ea1a80 100644
GIT binary patch
delta 493
zcmV<J0TTX%28INXBYy$SNkl<Zc%1E)ze^)Q6vsb%T1X^Jh!;ImY`Pq0AqOcA0$NyG
zS>In^;r%VKxW6EsV3o%90*43z$rVDlCJPdOAY==Jjf};z>twU@!=w@14}_h}yf^PV
z@4eXsa&mG$I^MjFzVA!jS`Y-z`#KqB1q+5taBu^sUuK?u?SI)>lu<ydi3Dh0!>#lY
zLL_Tp7;61gyDVE(%(5x?(f4TFzK))yQpuz@LA4u?#{kspbpQr~!IW)g2IAn}?`S<P
z!PDdGNxp7vYXzh;H5?ALCD3L-B?tm<eND)XH9@Ufp;rCO$=Nw8tHSP#xhb6l7&Zna
zi#rYEW+fVr?th`%vp2bufUMKsJ%k>R+>SW-=sx=Xa~}X{6Y(iMk*>dmL`1h2O*FP(
z??*K5T@|bwSTkTay($8L&YuE82+HL$#bOcYTLsKyU|x0_vvZAa6RV#!197cyA3`qv
z{ZF5Miv8UQ)yf1>98s-6yJL;-)`X^@i?Yx)RO$AhP-d9!f&Nt=u$N(mRud@?(f-;Q
zkg1OqV-wCH!jp&4YDQxhhs+ZE`ulpnRS~*(gKBepnfN=Q?Ez(zWOH3cjxRI)oOqLQ
j{Qn@$TZ880yenP+m)WPJs1y#N00000NkvXXu0mjfMi}PH

delta 749
zcmV<J0uud(1cU~VBYyx1a7bBm000ie000ie0hKEb8vp<Twn;=mRCt`#mO)5VK^Vus
zwbBj|TFYW4tzz~_0yQ<L4&fo{R0c~BMc0s^OD9i3(5+Jt-lJ0lbqb_N$WqYV+U>A5
zY33`l*SfKbr#7o;zIo2<+im8(=lWLZ55xDq@j2gbzWL^RyMGlnS^p2f;NUenJbWj#
zDF7IJDzymJkSBl$e(8Ka^mR4`o&{F`XYhj^hMWr$LJQywj+#!Bsz4|KL~xdJAcTNn
z7*&H%0u&dH(P~4u)<AsxVMqrNlss>N4r0RqR1iWz^akIZP(TPjZ_UEZTSG9m&fc)5
zZ-EVAtM^!pW`DkA*PR6|z?F9ca<>x+3y$_Qa$9@1na^Pc2x;OLVGs^29uo?|oWN@W
zz~C3dy~T;1IB=iY8WzAVM7u%ZGuB1k>f*smi!?@mUR~hOIv6FuliQzRqTiB!ZghqF
zXs;hSDf>XVFu3>|TEif4_*4#FFEwbtBT9g}=f9yg-G2%qov@9Km$tqCV3f7z()Td~
zs#?Hzr%(Ta8nRD&eU$+9jr-x>bQX6hf;xSbaE(9kNy7LB@T2m;Sd1VtwhH)k<OLK~
zwy=!O!|Ytre+}SbQ_SK5m<{JV`ocQJ1B`(D;ezk*xjFZZC;{w$Ou~`9E%a<S2T3!}
z=gmSMCVyEq-)L{AZJ`fv`PG|}U5TSZ;RbLGFL@q8$AO*l+01^I&*i~I4-iK)aPAB|
ze&pRHE2@FE$PR#+(z!hgA0e`of?aRNxF0=XK;&7%b1f|Zrhn){H>BS$b03dk^2@w-
zH(#4uA;U7zu$lpr^?^(-!a!%hO%-JT(|_-HH)btAhDucNH4GxSD?ow%km>g$adpKt
z?CT`HzLZ*k)S?xtOKhjn@NVde*7IRzTd1xM#MKpwkNX4nJOaFWI1mH}1Arjq3gFyr
f(1CpcY=r&-6d`W^T<GB!00000NkvXXu0mjfd;?y_

diff --git a/Resources/Textures/Objects/Tools/welder.rsi/icon.png b/Resources/Textures/Objects/Tools/welder.rsi/icon.png
index c6917c8ba514fb1471fd732080cdb413c7d5ac6d..a023a035ad47559b1b80b4d2ea46c2531d76eb54 100644
GIT binary patch
delta 274
zcmV+t0qy>{1fl|v8Gi!+002a!ipBr{06$PnR7C&)02vt>AS*y7CMGH=DJv=}F)=Yc
zJv~H1LPtkONHzdSNJvyvR8><`X=!O{Pyu&$cYIz1jQ{|db`H;<52tCijsO4v0d!JM
zQvg8b*k%9#0Fg;VK~y-)-IGZYLLm%9L7PYm%^$-3&*}lbhJS?%tIW1vCFu+){Zjx7
zy?4a=^bRw#Pk@`bk)n~j&FPm6?wyoG@{!&Bxm|lOqgYBQ`8bZZE{rNA^io@_r=0U*
zSP18ZI;s>D!PtjzE;8Ue1E30#4X`S-2{z#y03aK}lVJ-14z;iX_i>MbQL$Rpk3Q-J
YRQd(HNLK_J01E&B07*qoM6N<$g5soRH2?qr

delta 554
zcmV+_0@eMZ0=NW_8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00HVrL_t(|
zob8p%O9D|8#=oFIf}qkxp*=|37@~_7NiL-RfFPj=H}xM_%c4!vI>ANKCO0(%*`|F+
zCAnx}2||#NIHg1?B!s)$Tx+IreB@)ajK0;mkKy~BJLlfhiGLr~Kfpi0?*`}|G!Z_2
zON2UF3P8<I%^}RJP9PS3f!=8%#<AX_eOCd0LtrHVc=O>N;N*D=^RqTYxOvN=6{h}J
z!Cv#Ul}Nu|H28(s;Xy^fvL}!Y0=I4-mbTqsHhg%^+Vk_NR0c|ApRi9H^Xt~Bukmtd
zAP?vbCQE{p1%J4B0_JQsFg_m^*4EKw&p{<J;T4bF7k%sU3<z;K<B9;Z;C5*NCPIiY
z3}=1^)wu(BI7XaX9~#jWn6oTfVB%#_waT6Vg*dV}2$Fy*=>U7_%A0638Y0eGYF?`<
zUPEent<{prXjCwl?xAyyKz#cUQF96r&gHPljh%#GZ+~=LST9urvI6iBG*jN3uY7Sa
zHWh%19`hy#VdBh<20hOFfqeE9YNZtbRDAV|Wl$)vuU3<l$H%(rpsr?g6OIV+K{|~_
zR2P8w-|u8H&AW!JQ2PMTt|x6gEdvmn%W?N>1}G)^1~l3SY6g%y`>Fvx-g{laSdQ$g
s2KY21k|VJ!s;L*C32L8r;LifQ1C@uwSxGc<%>V!Z07*qoM6N<$f+Q9AIRF3v

diff --git a/Resources/Textures/Objects/Tools/welder.rsi/meta.json b/Resources/Textures/Objects/Tools/welder.rsi/meta.json
index 407f85d4cf..5f876da9ae 100644
--- a/Resources/Textures/Objects/Tools/welder.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder.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/199fffd989d6f7fd6ea9c5188c875137df4f34b8 // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png
index 6c8ef525ccd7a64c212523ae35c1a3adda12ddf2..20aa48abf68c85cebc135633200b994f8efd9c66 100644
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!N$PAcy*Sa5Rk)J;1OBOz`zY;a|<zEx?A@L
zD46c);uw-~@9p)2ybTIG3=VRA55@c*D&6%=J2Z2H&0nWQ^LH=#YpUunYl{ej*w%UL
zw3UB(?VZgsLnygto6O<o_x`V7XGk~|u_U@@#{CuHzrSC!zPER~K7ZkqSwH{16?`W&
gbM<`=28SvJx3ku#=M+uP16s-8>FVdQ&MBb@089@=M*si-

literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YsBY
z)5S5QV$RzedwH1*dD;@AlX$jqcsm>wIqCCJB;>fr%_iHPUY4VsR^d-dC(4^wiYz@@
zKB<`-s56_fs$5?=TuoK%md|p=RmUG1PES<otjKw^_m@e-%B-Jv9eBRqz9W4i%XjPB
zs%%>)pcW)hV4?82an}9MKV(<W^kc30+~{v+(Dmc%n_o3AztlLmot+!==))WT^X%XD
hZk1Dn>uae0%BFqJXu-b)bDx3)Jzf1=);T3K0RU-PTd)8C

diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png
index d33656a0be4000ed43d259b1404726e98595ca41..446d4b21bf7742ce04c265fb06bf89a17c91643c 100644
GIT binary patch
delta 550
zcmV+>0@?kG2ebr`8Gi!+005o0f$RVP08UU$R7JqRz$hpvXlQ6qP*5;1FhD>+I5;?F
z0A@1)W@Z4)nE=e0GtA60%v4lVASghY0A>I){{R60005a77#IKmW=Kd#W&i-0007JY
z03aYB+w%7O00001bW%=J06^y0W&i*HczRS=bVOxyV{&P5bbo1YZU6vyoKseCa&`Cg
zQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AX6!|qC7Px
zCACP2i!&v&s2C_@$i<mfl$e_eVw(U(Q*#n4LBcv<$fc~{>gNKs3ILmWA5}ybnxFsx
z0T4+<K~z}7?SGcpZiO%qLv04buyvzA`~N@M7xpSQ1*y_~h#zxC9xEWlK+;o)WcKUm
z3O6(6d#NajE4*|!lgX>PX{)+vJ9T=g>(?`H=YazU{q6mulxZ_iS9E<@mi~F<i@||!
z8*EF!j=j6%#McCS4w{*na+xn8cb6370L{c)8o20m<9`tjkYt{785nqx&+0eb;-F-N
zgA(s>Fw5w0VjRI69F*t|PSe-O8yu7o0LP%gW4;bd5rc4oVR)P%#?1x-3T=pSQ0}A{
z+7RQQ{F@{~pDD&ccXIx3?{FY={#Txql=MvfpqZcFP(PR-?<&|27K2bfSPX*wU`-I{
o2Wx`V4<AxLNc|x7gQS1b55lz~33PYNvH$=807*qoM6N<$g4S*8*8l(j

delta 895
zcmV-_1AzRr1d9id8Gi-<0063Kaozv`010qNS#tmY4#WTe4#WYKD-Ig~00TWqL_t(|
zob6goXcIvgeSxKxCP+geQoB~DJ&87ADX0}GQoRU81rPP4;6X%0#go*V2M_*$s3*aj
z76dE3T1pUGd(n_8o+MCB6)PcPf2dMf^G!1AcJsTN{Q>uT5Pz~WJ2P+g&Fp+L$x{$;
zumA`+SO5eZEP%XFRaK+!EnB-q`t?*IWVcb-Rwk3FyA8ki6<I+Nx3xvZ_ul>i4GrM)
z+{e1h`pK_I@?WV!MrW)S$@U4oBNDI1r_dGIjy<tK?28Ye=g2mkx;VTpeRcetp@w)M
zZK&z2p7S6*QhzccR`_2&OqFmN)1!ZGS>_irfXIIyy@{1?Nj&*Ji{Y<>NMb@1Fn7c%
zsACc{3x!dAyR?3K`^hf^*boOcKEHy)c_o2OVg&4vXS2DIyxT8E^lS5jOZdsJ(DWms
zY&@r{F3G7udY5+X?h|?Gr4QosIDHowgPteT5w&Su<A1aWWss@bX)F8(&csVNjcGgl
z3az%Z;F#4mlkXquuh@tzYh~4!@S9&TcEWgr8k8$@xvAwO{N&g70Ttq|MysinkY*Qt
z@mJjm7N?XRqY2cR8-1ggP9;QGF~)EzYiAnz$zO9TtS?f<_bm3KTaeEzOo$jxgeR7l
zwVsw1oPVC556L_@1h@HZodt-TLW<g|YL}u>LB6xO8IL+Tv}<r5PV!q8z#L0cYisC%
zcW|1&;nQGT@%KR4D1XDf_j(36&0kf3avK!mJzA99oB>|&*H!z=WN{<X`tS56W3wEA
zcdM(IU0DIbVK@yp`Rfwk@}cXvzmPvv%oWmd+kZ)&nOs~9<wrs6;_l>fAvGLs=p64g
ze@y{8-}hn~381}@Hpf`%#8Y{lCwFoW;01qG0mSySAL3mj_05et{jh%U*PH>3{5IzV
z+~((Bg%NPD00=l(00bN?00Isc009RJATQV-!2W<jMz#Ov?;U$q))yetpLV=4)NtM(
zaCoxoLPc)^r8gfm)?t4@UHt41u=4->`LW|=eE~8Z`R%ShfcPqT69|zx_6M*(z$(}u
zQ0*rB1Hk@(vS5FJ0qhT8e*pUf;1<{)-~m7T18Nmue*pUf*dOp;g9Sjq!2%%Q_zV29
V_Xtar;P3zd002ovPDHLkV1nJ;q!a)E

diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json
index 1e4258956e..75650c1928 100644
--- a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder_experimental.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/199fffd989d6f7fd6ea9c5188c875137df4f34b8 // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png
index c4cac4606ac872e32a0a3b4df7fdb4540bc5087e..1efc7aaa60d236c09804dc0a9323648015d16b1c 100644
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQYryHA+84w9GEfV$B6_Wn(<>s
z!Ve&skdW}>$B7?5egGvrBz~NjaoNPu7pR`GB*-tA!Qt7BG$5zCDkP%BCAB!YD6^m>
zGe3`kp<+&OSV2+g_b<T(AHP1)^48TlcjkQXhERix#t$CpocGZ@$xzhOyTigb$oR6c
zm%^M!la5RZQ3%%Dy2!><U3II6xxIg9x3TKx6%ra*Cyvexn=)fIR}!=7vL(+{!kSu2
zd3H__jrkjMz>JZhXNCOYs3r?@pfj{QT^vI!PA4ZwutqdY;M9sYVVrvYo)P!d`?lO?
mSuTp02=lr*mx}OMGBDhmz<lESx*xJYT@0SCelF{r5}E)tb8|ZY

literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YsBZ
z)5S5QV$RzeYXzAV1==3=&*V7en8!I$lhM;tUGt%eszUIwsSUdwj`*svHtZ;8-H<i^
zq5B4YT|S`RJNz4R-}02M+0=A(XTy!Ek9O=!?PhJ6zO&)Y-p%j%zC3z$`$N?^`=%*-
zyr+BYVFGGE0vndu3uIsWA^UsI-AVr%j(srOx_FNFFXmN+DVvIRsQzud|EF%c09^fn
a`Wl7>`?N3ItWQ<|33|HvxvX<aXaWGd(OI<s

diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png
index c697fae1fab665ad0d2b3f893cb1d4612c54b801..5c6c99c5d93c3a85c31d016752459a504da2b50d 100644
GIT binary patch
delta 330
zcmV-Q0k!_l1K9$Q7=Hu<0001iRA<Kk000<JOjJd{z`z_F9638cOiods8yn0cBXJQC
zdwY9Ng`N-q0004WQchC<K<3zH0001OdQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6
z@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoPXky#FA7XQz<hqr93q!
zCACP2i!&v&s2C__$i<mfl$e_eVJj=R`niCO1^~T58_9k*3)KJs0Cq`4K~yM_V_={c
z5L7_rGb$M=Ffs@*!G(off{m1vl$4EJ93TQBN~*>{V5ArtmH<<s1Okd_2~abPjRX}1
z1qB7*rYb2gDnp`K%qWN^poF9z1elDK&;-mC9nb|r(6lI~p$ZtGSxbh1vJ%MxLTE0>
c^elw{0LzCCj!+{7kpKVy07*qoM6N<$g4gVLr2qf`

delta 448
zcmV;x0YCoP0?q@F7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0004iNkl<Z
zc%1E)u};G<5QYzlA#2pJu3#t&D1d~7gu3)0*ijeu?hKW9fDUXdr~_kP0cDAp0l@+T
z2v=fh^9aW0=uAlB))7wVkbm)A73cqa$z8e$|Eva}0a#xE#($W=wX@ZQ`zYL~6#&iA
z7}aX|aMJ55n6oH^L%E(Z1{a*?;$g3^_LKq60g(Cm`>V=>FAqk0`zoGDgNa-_7|Uz2
zF~Xt{nD(OvvzZa7umZUGdV5FbSI>_Mf(%TW&ttWIe!M~8dHVOE@2d)q<2VOW2!Q6g
z0$x%9y1A`x7k>*K7a1D?IOlk=m>wOgd<x0Q@Kh*#JQSOR_ZVA(7FGanAdLj&^iol0
zq(J{HV;h>@<W;A429OoCA^~7ETvWjd0L_0oAej%YDp6__9|XH_7e>nbQV1B-4UiVL
z=S{mUmJJ!_01r<uI!^a_Z2;+Ev~0Lk22h0>fRz9=13AimjGO^ft@Q^;MsD|4?&?cu
q1wj7~GPyHZJp$LJr2(o`1Mm&4YnlqU^tWXI0000<MNUMnLSTX)%)hSy

diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json
index 1a92064078..ab4744aaa6 100644
--- a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder_industrial.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/782006a07ef7f16f70128489b3e78b210ee4bbbe // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png
index c4cac4606ac872e32a0a3b4df7fdb4540bc5087e..7814b7485199170ae34cacd3a4ecfe43995e1367 100644
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQYryHA+84w9GEfV$B6_Wn(<>s
z!Ve&skdW}>$B7?5egGvrBz~NjaoNPu7pR`GB*-tA!Qt7BG$5y@DkP%BCAB!YD6^m>
zGe3`kp<+&OSV2+g_b<T(AHP1)^48TlcjkQXhERix#t$CpocGZ@$xzhOyTigb$oR6c
zm%^M!la5RZQ3%#F)?aF4s;;`#!`$A#v)fp8^9l)#oD)Z9hE16<n=6UAblH+;Dq&46
zr93;Qh{pVlIS|Iku&F_T(PE2}J<uImo-U3d7N?UFBv>OFCU9!Sn=np2f6s_}>U~@8
nvn&@yOoVyeoJ&P`EEyQ?O<+FpeccaPpe_baS3j3^P6<r_R3>uG

literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YsBZ
z)5S5QV$RzeYXzAV1==3=&*V7en8!I$lhM;tUGt%eszUIwsSUdwj`*svHtZ;8-H<i^
zq5B4YT|S`RJNz4R-}02M+0=A(XTy!Ek9O=!?PhJ6zO&)Y-p%j%zC3z$`$N?^`=%*-
zyr+BYVFGGE0vndu3uIsWA^UsI-AVr%j(srOx_FNFFXmN+DVvIRsQzud|EF%c09^fn
a`Wl7>`?N3ItWQ<|33|HvxvX<aXaWGd(OI<s

diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png
index 425cf3c4b3f8fb37bcda7ada9e600899acf3caf8..c187486f2bc9e34736019ee3a74cd4ef72380787 100644
GIT binary patch
delta 381
zcmV-@0fPRd1dIca7=Hu<0001iRA<Kk001XYOjJd{z`z_F9638cOioc6MVlmC%n>kc
z%p)V88yj&E5kd_OCI<(5dwZxf7Hj|j00DGTPE!Ct=GbNc003`#R9JLGWpiV4X>fFD
zZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDSycTa*U0*I5Sc+(=$pS
zoZ^zil2jm5sk9(7FQq&+CndE=iHkEOv#1y-YRJWzR+N~V3SlcNxca$(4F>=PKOC-y
ziw-XU005XtL_t(2k)@Ea5yCJGMHNqA<w$D$9Tu=#iWIN_cj>8^fms-X36Yd=KD&eb
zbE9`(Uy_Ob5O(*+s_qbz??~SYdc+J<+Q4+po2H9_nQnmAX;>Z#P79c=XVjV^5D{3l
zW;pTYpe^6&;>e*4F%QD?_2#l0EWsDxB(&Pz<rHdgPKOo@a|6bEli_J6kT3fk)SJt3
bwPCkDcbymPsr%wL00000NkvXXu0mjfLE)X7

delta 535
zcmV+y0_gpW1Ed6y7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0005jNkl<Z
zc%1E)ze~eF6vtnoQwu@~QjnG|5mXRce+<Q?4({%{c64)ha&qkG<lw*H(#1s`6lraB
z5~MVWAf@0C+ER@7PVcx}FHKXtNTpv0_qbf{ee&MRyF}rSHGc)*0I5{UVRkxW(((H8
zA`%J!I%iH%hLNCSezV{-8&6;*n*eKM-FbR6+p<OmkIK$PeS?^ghAn^xVrKkpV|4=~
z=!_aYR}C~`yL5b?$-%<Mkt-TOgwJ5~*nX(ja#0Dy0dVn4xd?S)Uy<v0?-pjC50snx
zsnu!&rY=^<@qf8QcAwT*yHaw2aDa?`2J^%z6LXFmxus5*5~P00ZP_sg!2IJ|A+`L*
ztOl46W)Mg%T8LK3cU=^V1@ol}Ekdz*v{6}7WW$8(f_%O-1q?#I=>??{i(=5;!D~Q#
zP>hJ|u=Li1TBif|whh&OAFN&vjP*QJ?rvZlDO<4^5q~-7JKZiogs{fre9rz^6QltR
z1rQ;`CMCj*<17#Wle-Sg0TAr~sFmd<sMa32^UuXY5`toQ0J37q9L#N>I9}~lJAl~X
zLIGgmXYy*R+5mKF3g8JKA5dOrfHr`zG+6-j5BZnQ0AB$4A3=xnp#Tg5G;6YI;9mlK
Z0T=1hN)URuay9?}002ovPDHLkV1hy&?hpU~

diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json
index 87568bcddb..ab4744aaa6 100644
--- a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder_industrialadv.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/782006a07ef7f16f70128489b3e78b210ee4bbbe // Icon Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png
index 809abc51eeb836157923b69ffbb551e0bd64a5b3..d8ba3f28bdc7cc71fd50d8352f699f748e44cd3f 100644
GIT binary patch
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQYryHA+84w9GEfV$B6_Wn(<>s
z!Ve&skdW}>$B7?5egGvrBz~NjaoNPu7pR`GB*-tA!Qt7BG$5z0DkP%BCAB!YD6^m>
zGe3`kp<+&OSV2+g_b<T(AHP1)^48TlcjkQXhERix#t$CpocGZ@$xzhOyTigb$oR6c
zm%^M!la5RZQ3zhSMZs8qsg0?+>Q)bPd;iXEW7W+oBs3CF9Gw|9WyWl-B<8QnmON7l
zYicRw**Qft=5Ne_X^adU=M<hj{`krp=n_p&7sn8b)5!@EZ4M_`rs~gXIF+71v-Q;b
pd97(p8C<hE*?1Nwi1gSnFkFAjd?I>#*h`=$22WQ%mvv4FO#pr8dXWGC

literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YsBZ
z)5S5QV$RzeYXzAV1==3=&*V7en8!I$lhM;tUGt%eszUIwsSUdwj`*svHtZ;8-H<i^
zq5B4YT|NeeckDN|m9<%gMIL+=<B+qrVt#Xwyzi~kF%IAE-7IIXD*T#TVf$R((d*t)
zZ<RPkpj}8H;<9{)Y4)GK+H-lH^$y7uvu_2SQ~k?$)xs#!^3J4x2lDIodvhSvAE>Wk
XIQ~%k!X785D3GY9tDnm{r-UW|X0lPz

diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png
index 09cfe9a497ae2b589ee05b3495f7618f3e1e0ec4..f331df4390e4cd2193af7bf878126a071b8badc7 100644
GIT binary patch
delta 200
zcmV;(05|{d0oehN8Gi-<0047(dh`GQ0H8@kK~z|U?UOMM!ypVrosKNbNZi0P_df+U
z-~ueHRF2ZfaS|k&sp@|c!XVine}Di00Dxbo>yc9GcF&9x%d7!0#>+y2_kNh0b0(|#
zniVgl>;-fz;?B8|_`=LYH%>f)nOFNm2<t5Ck5dxs+IBs41woR$b<$N=dqHuawMMnp
zQ?9tRIe5^Wegn1x%ayn~#8;Xl9{&OW004gu5xoIIXHfmgbD`A$0000<MNUMnLSTYS
CrC1&S

delta 222
zcmcb~_?~fsWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKQ04
zikhaQvuA8<O7Em8K(WIn-myT6wIs+d_&*RZ{NBbF3>4rj@Q5sCVBk9f!i-b3`J{n@
z5uPrNAr}5``w#Lp7;rc*eEffZWYm>#m+h(Q!u-|d$FyJSh~+H&u{7aOYues83qL8w
z-u4F*SNbrWGoIrnyQXmM+2|GA2J_=~Sg&xo-)Jz)r_L~e`{;A0BaA;D@_pa9B$p9r
O34^DrpUXO@geCwJRZhYH

diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png
index 4ad153c1068e8f52696f5ef2a280a419dde4aba9..a68f4c12577f44b8d8cce23be32ec1556b0f85ca 100644
GIT binary patch
delta 305
zcmV-10nYxL1Iq%CBYy!BNkl<ZScUDBF>Zq}6o!9jvcSL;DQ<lOPYgaokI|vZIilPk
zd+*UpuvKEt5K9>{AyrhZ6db(>kO|<5cF2(TEzbu0-v54VgJBqkxqAZFfH%Mz0207&
zadox!ue3?lfPIbUSc*p+PZbsqp*Ozo_9UW%)*4xs`K0tjw|@_)`{#I$Llr=Tb})W?
z{a_>IX!ayYyguZ4-V@Q8kPANhskkvFkWyOu-W^l%D2h;)<yi4RDP@O5{2NNFwYEZt
zOQd-tjK*&M>-i)Hwo0{~xLq~t8wZM_==IdNWsK?6oxBG~gpZ-(j)-2<v-V{j(<gD+
z<!Qa!-6&5LUMjvny{Dl5$77720^H~xU>JsBZVP}jRTHAe>k$yi00000NkvXXu0mjf
DU3ih>

delta 385
zcmV-{0e=3=0-FPnBYyx1a7bBm000ie000ie0hKEb8vp<SO-V#SRCt_YVHjXA>VQ!P
zj5=V{0izBWd=5z9=l)NO#=F1&FdY8&laZ<p09h{1%tX9aE{6ZlWt6bW%E~HW72m&i
zJBp)G902l_I5Qi=%fJ8dTK&+(jzLCBngL{m0uD6>rUn>d7k^G)U~qKy{EzGi6bC?q
z6mJx;SUQ1y0Wt{0M`nWn$YCI`W#d+c$B!SN=)H66I#?~TBQVkc!Fb)fodISsObEnQ
zQPcdNnUjrSG00Mo9Eir|V4@NsC~63W0LbUlr%VOMy`{M|!;@!E!43gg4pIkm1hVBA
z4#1rVk(8Y|#Cia;5CmdlQ{V=IEQSG)ypO*(iYdS}@E_zboN0jAL?{n*1WY}yTmS+f
z%g_PdTmXuHrtfS(9}&)q|2Tg^(#x&uIMv+2BZt)iAaL;iXW|N%ZwyocgRdwab-<_t
fMjbHf0D1!eas!}p`@|`?00000NkvXXu0mjflbE8u

diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png
index 68c8a3ed715738ad6d3cff7bf54aece317ffea32..3f79cb157cacf02c6412154c488d2af8c68a7928 100644
GIT binary patch
delta 211
zcmV;^04)FK0ptOY8Gi-<0047(dh`GQ0INwvK~z|U?UcO@10f8BeNjp}W}v5Y#|+HC
z0Ia|cHwkMn12aHHPvl4^CDP?ja&(d6uX(P(etrOgAPB<Wv)mf6uIp^Afz}#cX^e4U
zH7}(!ODS`V@s?7v9QU5Lf~F#J&R~q$)!sWGBJ1RLhmi}<>`b@Tf^&}7`lI>Cfe->H
zrM|NQ3Kb$kt@XO|J*5nAr~kASG$rA^f2h<T_bd3Fe?SlfK{x~exB#OJo$OTI?l%Ac
N002ovPDHLkV1o4-ULgPg

delta 214
zcmaFD_?&TqWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|bfKQ0)
zk|j&(>+4URJP8yqdpyAaq^=~$FZloe{|pXVE588woCO|{#S9F5M?jcysy3fAP%y;P
z#WBRf|82h^AA<r1v*W-2>B)v%UIhk){-2IL>zexHfcTVfCSHk!OF2W>c3))C+bh4f
zy~o-^Y|$iUrgQ4zB`KQ{`*{9!PV!^n(7hOXTzpEj;}RyP``k`{6Lo@t7BG0a`njxg
HN@xNA?kPvt

diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json
index 826b1c44ca..cd29490826 100644
--- a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/icon.png b/Resources/Textures/Objects/Tools/wrench.rsi/icon.png
index 1b8a2697e25e78a3b62154d3f105b4882a5027f5..4d24ac7fae1286a77c92964bdfbec03ca4e806ae 100644
GIT binary patch
delta 214
zcmaFD{ETseL_G^L0|P^2NcwRgr4`^4;`+bgznYp_NJz-cnKR|&<m~P3moHzQmX;<d
zDXFKYSCF6Y<Kt6bUmp|{H1Wm9LZB|jk|4ie28U-i(tw;SPZ!4!jfu$#3j`BHT*L#!
z3LQi_i+mlQaT#^&YE|IwVBh9f=qe_#N@MO8p`&NM`5*8+J;C>>hUko)TsK3$9r$#!
zIADr_LBTnz)+9sb=F3thsyb23%TsjqX9=;2g)p+kPv>62q_dC5go)ury8OIUQ5Ghk
OwG5uFelF{r5}E+v*+~`v

delta 470
zcmV;{0V)3G0ptUa7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0004&Nkl<Z
zc%1E*!AiqG5QeAV3n;x71T~NcC<RYSK@bZCFFkqcN$TS$K0_};p&|%HPleJ42t);;
zr($U@^}Nl$bjmg+t!5{+&@O~zHzD)w%w*=z4*m1k0<1T{X@Buth1XtMPnneg^m?Ck
zeN&_U*T7s>k`N04-hD4~e|x7+if6O6{Bc1P;s*e`oecm21{q>F7>PnedZ1Lkm@^Os
zAvGcaJnxMT9A^e`=(sAE+o#voGcg46BNYI=cxqgqgSj@2Yq<WQUMDjr!~slqfB3#O
zwwK-2Ztu1`bbnc?Xo%@^@&F7G>{{`T;Q<WH0f9O0r<R2H5?~Cwh6fOP>>S2<m^mU2
zfR`fnxCQ`@uyNNt(xI`1h%H1$jOWTR=R~vdsOPpdVQDjpNH&FV@RtJ5*g*Wb8v-au
zObvk?0f-GmqIN6^kysB%L0AbA2?%RNWD6l8$!s9RG*4kt2vJcQhTw{NRjtNCh^t}~
z0y+X~-{Wzten>@@GX$4yvyZF<fFa1}BXRm6)gP1Jh?e#KGujA%35n=IM!v(6wg3PC
M07*qoM6N<$f^GrB<NyEw

diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json
index ecd76812cd..a2c8f06819 100644
--- a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, storage by EmoGarbage404 (github) // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, storage by EmoGarbage404 (github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png b/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png
index 1a84e526a4a780111960391cd8356bf513b5f17f..6518b7245c721677990edb252828d4ce34c776f5 100644
GIT binary patch
delta 290
zcmV+-0p0$x0kHy*7=H)`0001UdV2H#0004VQb$4nuFf3k0002%Nkl<ZScUDEF$#n*
z5Ji79onT=vcnZPZVos1ldIE1C<QmgkSPR)=VM#_;SV)A$d`J_<yvLA$qx!yg@M5i1
zNEpe}UDpK#*4mVONS<cqq(B+TE6TEjzl<^N%ePS?d4*C6{(oX-5K%G-$<tL;1qJgw
zD*!OYxM`ZAUr5Q*`@WwRrho&0<P|9(zvNj0!!R5!_iX}1<l449?CU$={)-yNG3dfA
z9k_Z?&$@(JAPZ!HERY4Vz<&wE98j*#Qt}U_X&P+X_L&c2g@{~T*I3sz*gtfDnWMvj
o_rP;DhaLo$WgAI0o}Zol0zPa_Oj}ekF#rGn07*qoM6N<$f?(@?ivR!s

delta 162
zcmdnUw25(oL_G^L0|P^2NcwRg#UJ1k;(Fk~0RsaAXJ=;%3kzRgUmiKR%Rni{k|4ie
z28U-i(tw;mPZ!4!jfu$uEsSg$0Zk04&NCQ7;yCmYco@67Rxr7>WiXw}U~)Ug!6>d!
z5acGraC2po-hwAKlUM@w^b0yjICj`hFkH;2xyWFVv`~1;;mOPl@A`Git&-N=1e(s^
M>FVdQ&MBb@0K5S)Jpcdz

diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png b/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png
index 0f60f5243cc68934e4abaaa02445eb6b1b36b864..b68b06f10df2173eed99cb28d5f2e1b887e0b5f8 100644
GIT binary patch
delta 154
zcmXS2%{W1#o`a2nfuXpn>I;x!EDmyaVpw-h<|UAm>gnPb64Cnh`bJ&`MFHl6yN^qn
zDg?6ro!;cao1(C<$M+3eS<rKd$E+4#@13m6SbLPoOH)U|IMQM5RMt7g0SDTz@fsXp
zVCDf69UPuXjMe#KALOcdoxjJ4U5H9%EcO%mz$~)OR`}<eZk{(l8yP%Z{an^LB{Ts5
DHflDO

delta 99
zcmZ3@SUN!>mWi2xfq_qCQaX_03GfMVH83!6c6PR~u<-Tu)m`y&Ay8b!)5S4FVrp_i
zLt}tO1GmANCZ?L6{{amb>^vk2+65nT-)UrEI59QLQE#eD4NyIUr>mdKI;Vst07cCm
A)&Kwi

diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png b/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png
index 9dd42badabf989bf60e5806b1583651ff77a9a75..0bb895b050f0d11e75d4ceed4e62cdac855c6d56 100644
GIT binary patch
literal 516
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTN?DaPU;cPEB*=VV?2+50?Q978JR
zyq#^h%E?f`wf6qYnC1ssck0!5a2+(gp&7O3o4U%(lQK--w=|_cXlT8YbN%(#YK?;Z
z_qSh4x4j~x+jH;X*S>ofA8$SVG)Q<`o&VHXi(4;R@40u;x@yn28awv$nd*l(uDafL
z{PB_CG9#JQRk^pF>YlAmu?YKm>t)HTic@}V$)W4_-hbb@{0&I(pYI-LlLZV0Tnvke
zB$CsnDb9QsaW#AW_3THQ){=dpd%yi{JE#6%6=bp9{PR$Y-`3cP+wZxXC-_|^t53}B
z{f8>|_b)!)di+tsX8By6<E!rFrZ~snI_duYV|Ct%68E55`G7@RCimZa{Qb^^mwhT<
zY8kd3Uw&84={|cvb<M4}iZ}(n<ZJXW9nfGPmhgG;n<1;;f46PRKK=#Yer&nzj3Mx~
x)}ix~pIue|{bJ{3){`!LXS^aezpVNPWBJ~-1%;u`6M@mn;OXk;vd$@?2>>uX>B0a2

delta 549
zcmV+=0^0qA1hWK?8Gi!+007eJf;<2K00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000kAOjJcMFfc<yLpV4%O-)Sz003}GjTZm_00neXPE-H?|Nj8{whmJO000SaNLh0L
z01m?d01m?e$8V@)0004;Nkl<ZSV!%a$#TRX3`D`?|GzmcXn#B`T3ksvm+&rAqi(Cc
z$cA+Dr9(B=4M)nA>#`a=(`^UCv)SO8ZadN?<dm%jk95aT1CZ`Eh;+{(0doJm29fSM
z5CGL}5b3@HQzRC<L8O=BJ5q@ngeTxTQZ7M*NJoO_H~}Z%1e^eH0)GFwjvM%TxZu3L
zWH#Mx5b3VtPk**8(4#Yq0-TMPzwzsaNO!i5m}7u@$im7q-F7e^u&_e)=iB!kDul%a
zihu<hUSVguQr1T%kGx1GaIS36iuIAnlQ2LgaJDhM*{6-d!0f>voT!dC=Kv&z0gDHJ
zP*SPRDM0R76tH?EKu>7SF+gllz~-p|S^}M^bmW;U0e@5*il+r&l4v2f^E0N#!a%j5
zczOU@j@-`SJ<yjnie&dNVCnyHo`4f@0!{$<PXTXzuDL+Gx8TSxk=ho}q?^st0&2S%
zI>!L1MFE?q1}Ocza|%E$3|Ku9p!TP84tQhZwSZI}Nmw75JmJ=nW7WZZ<B^2*k;x-Z
nzywYO9v(?pT%ZV8Fi7bejMP07*0+Lm00000NkvXXu0mjf&!Oyp

diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json b/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
index c1f0d5e09e..7e8135f216 100644
--- a/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
@@ -24,12 +24,12 @@
             "directions": 1,
             "delays": [
                 [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
                 ]
             ]
         },
@@ -47,12 +47,12 @@
             "directions": 1,
             "delays": [
                 [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
                 ]
             ]
         }
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/open.png b/Resources/Textures/Structures/Doors/secret_door.rsi/open.png
index 5f78166d8cf2fe85d2e0d67e1e230415c0af7893..81862e1eade5b452853842c8baaa21f5413914aa 100644
GIT binary patch
delta 203
zcmZ3*c$;y8L_G%^0|P^GRn-?D#aJBV?!>U}oXkrgXR4=*V@O2n+lz)=&58mofxVY2
z+vIIpzrSy>ZG9m5M&$A_&!Bf<)^nBi@b_%JCTypsWT??+J0)lxyV9bU?B5KI1+Z4W
zQCylLbwDmD<nO2T8{6k>&Sa>L$eziz;k(h*`ZLTn2bgVKfEbJz4oK}eU+j08;akDE
zpPxh0-z2`z1!|r5e5YPi_A16V3%{@9`gEh3S>&(Ynl|UXZ9o??c)I$ztaD0e0sx<!
BR;2&{

delta 154
zcmcc3xQcOtL_G^L0|P^2NcwRg#UJ1k;(Fk~0RsaAXJ=;%3kzRgUmiKR%Rni{k|4ie
z28U-i(tsRKPZ!4!jfu$uEKH1SDhrk@N$F8y2wBjhl#r97(xSGYM=c?x2ShCZQV&}6
z78q?}H8{kq%wfnZsVsFtnM+w~qpO)$5d%Y^aIwf*Y4I3yps5U=u6{1-oD!M<e{d|U

diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png b/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png
index 127a10b53db82bb11412258d04c105339669665d..9d14324686769b131f947fdce1c02423f2cd3823 100644
GIT binary patch
literal 530
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTN?DaPU;cPEB*=VV?2*=Iam978JR
zyq#^>b=ZN&^=a>}IR_^M|M)jI(J%3X<Rwd$w`pa}l9eX$P5-UJKObopahx?RwbIMU
zOY`#k_Y;e+<j*g>aQkgp6o;ec)3?=6WWL@`mnpgbeX^Bdhe7*MNB!yD&8I4q&LkFI
z$o%#FxsI&hvkew6zE+h6Ncy)}>hM*`v_s{86n;?PHDHinV>rx^Ai==H+>pp%z{AkS
zcmTKH;#FN`FPy;U?7uG?a!fdpue;f9zGk@de*rL4j-P$%N0%9gA1(N7W4+?X=5?=c
ze?MXQYWsPM7u#~xOOrsV4qw@H`Cq2~zGdIn{oDTj+qVt-Za=zMBL4wR=wXq(Kw@~j
zN_+e1T8Ea{+KDo9dfyoZ%f7l6RqVLK?sDU*_{oQGMeP51S&8=tSY;0}=DJ_5J+OT5
qk6HJ2|GK~L_U*&J^12c3(Vtkmw&2XHnTvsu%;4$j=d#Wzp$P!4QQz+X

delta 568
zcmV-80>}N51jYoA8Gi!+007eJf;<2K00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000kAOjJcMFfcecI7352O-)Sz005htS1JGi00neXPE-H?|Nj8{whmJO000SaNLh0L
z01m<c01m<d6(~x800056Nkl<ZSV!%a!FGc%3<M$J|G&8_dw<Ns*pex<IkcWrvLmr1
zrGe!h+YZ421T4$CzFgLI;nfkPYzwkN<qQ?PXzuV@c~PO1Z9!J3oS{gegOont8B5s~
zgit%f3Rb5<XVWQ2DcgcHb8<#1=r`E+*%suKZ9$wkJ0lnL8Z2rHNZA%SPBhM-Kv&Yc
z!mfuj&il-svVScwU1#hC8aVPU<Gj!8Dcb_mbw(*T9bfZ|^A<|Vwm^v18M9y(%z{}U
z5aO>F{QA$e1}c8~hLdECMYJCvWn1Jp(KsU)bdI0Gwt$pvL7X@{BNcRyZ}XjkoU$!Q
zGtOg+b9~MB3cmf|rO-uZ)IllRf~-(E;{y-Bw_sZk9DhInVS=az=hzFLkJf%Ri0#-@
z-}&o6Y%h5C`hwVwJq0?0puo3dp9}0e^a}zz_NhP<K|y54UO&fn4frFm9eZ7-&Yc2c
zJNEW}(7)F~Y{z~U%z{}k3&g)Dc=mHWEO>gu8Qu>}+l)8z_?Bq}HscpWcI-d&*rJ)J
z;L(FuK{01RR1@0^UjGLPeUC&nu^sz-0vVzj+|9@LZTkYbqCGG~gOK_F0000<MNUMn
GLSTYbN%zqJ

diff --git a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/meta.json b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/meta.json
index 8bbfa474bf..351d5688e4 100644
--- a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Sprited by erhardsteinhauer (discord) for Space Station 14 New Frontier server",
+    "copyright": "Sprited by SonicHDC (Github) for Space Station 14",
     "states": [
         {
             "name": "state0"
diff --git a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state0.png b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state0.png
index d437ad8b738db68616d680dd195f849583138cf5..10fb9cd49d667800c7d9bc347b4b72a6978307dc 100644
GIT binary patch
delta 642
zcmV-|0)73rE}8|9BYy&6Nkl<ZSP8|Jy-xx$7{=cNH3*RfVSt6Okmw+WMgIRm2L__i
zgfIyBF_3@>1|$&BdkPQM-t|B}jt=b|J^FjzueKrwY~^zK+c^{;@Is*=2N6JcyWI|7
zfDVsDBH;=!;n8R`JOO@i<X<Q`V1tJuzy?pAov8xcs|SMM<A2FS35ckE4;|qT_xFNq
zN5Y}Oa>DVx7Xdo_`szwPdOff_aQwFO5D<<{29^VUo=*G1cP_w$+uRN?+s-_&2^=DJ
zk^_Ll-D<&rgi{|F-PQsK&*$?}uh*^FZg7{cTM01XxolQ?-L5s^-rwGqU_NXtzz^PP
zwdCURQku;s*MDD*fR{=oF-2@7APD~S_~-!<UaQqSbN?0qIBqhGIowXm2?yw=Qc>0d
zj%UI-(i8tGL&CYqpw1C<xZQ-`-QLP+JT9ZrNWNz?B?7-83>1NJZ2^981Q>feV$OwO
zEkKT2j+snG<v^#?@fDHH<<=7r1n0p*SL<+HfGGlSw11TzSO>0Fayy8C+mp$pvVJfa
zsHsFEArL?jgkv%=2?<|yq$<jyL(FY07K?eNtO9iSsv{MvG6YCCS_{i{>%WG>Wpz-=
z{FcDC#Yi}^J?^^n*-f&bBNcEYVYOOSfY+B78M-hugn_PSg5ujoqamqON<0E|IBzm>
z*Anw4vwP60EN2DyiI`5OG8vCOWr))4x_5;?N$3X$$OgBGKz-9%e8Xo7<-T!reEch5
zQ+SXFW;;U!VLH56EY1aN3-=R2xISmXv4J@@IR3cG^;}#ZVXX<r{E6%C{^zIk`+b4s
c3hp@a0{{;8c<c3M+5i9m07*qoM6N<$g6SnG!~g&Q

literal 5943
zcmeHLdpwkB8y><)Dt6U68-pdx(Tq7{kn_Yi7opWVGw+Ns%#4|r8Ip<)QtPlCwxq+B
z(qT*Kgd$~0TT)AOAe5+-zG^pZk?)-$>D#{c>-YQizszsUJkN98*L^?NbKm#lwI(>w
zcdCxD4g!Ig%JlOJg+Ecsx3(7iTb7pgI|88*n-(4kg#vPvL@MS95<nD`DgjZTLcl{H
z6t@mVL~rW1(;ec^IHr-Wmv>(q-`8$-`FV*(Zb>txgXwm8^7+V3IvX`|XTKeG>ToN!
z(~yQpnPi(hht^0Y!7d}V@^#m}M{VAHR_&dQr~B1_9Lv<sP0*vx-db?clsdmVhW5kh
zR|hOw6t{3sb+_f-&@;+OGCojZxpx><qy^zFl|((iZF8J+DJhzH(~WP|SM~eWg26$8
zRhlRMq8AeR^1&Lxq(yIza_S~|JgxA!R+{7<#;dN=P)jwi9nspjxan82j>YA(Rx6vg
z%Qu%#=T-L9{)x)VdOAP5Q_-7|TD^70h5L804KKIK3@Cj^BT5LC#SddzW^4nwxvTPD
zq+xynhcxb;iSl-scJubREC1@C95;_gT_t+zTE%Vdjx1X}ExTaaulZiv6pb^kgzrBl
z@3M`WvYr@W9#a#ItXj9A^2mz&r?7H{0o7csa9>$qJ)PE{v3p5eT%iA-dg&Ex%@{6I
z+pxaqkE`mIz@6uQ^OuRA41;Hgh8t$|W@;V~-}YKB>D_c+AGgaWN4??_x+lrlJ-aI!
zq4lSER?u>r;x4C<X=+K1UB19RJ>U49sO+nVxjC07_ZSd66}GGQ_<JliUOY2fFR*A1
z3)GCzH!*o`dm+;_6j+1)!P>vTzK~jHJ!?-<!i(n1G~UHoeKFF;sPbRXHXCDd98SdT
z`SphBp1p;_{U;8b-+#XBZsN+!_}%pwXTkpa^P>`P6}U1|9`5h^E~a!La;o_aTOZ@p
z4I!(|yWQ>0p5<Ga{b}dRfY8^!ZK8sExA3<lKdOt8Y;8SztN-VfCc@*JiFN5mS4GIG
zw`iZ-mYt+kZ>NRd{=J$t$%tRQ!tkO|a{ZRl8@-X*c6AL#=L{!hJ=3;!ifJEiYBv*O
z>n)!7P<o3(22C#0b`MPIecSs)O;{Vab>Jpu)z7+^ecMAaf~h&7A+uY)+ca<x=d$S#
zEi_*L!mPn98SE=dnnoI{+FZktisYKmy;!q=rLmQ526?#}h8gF86^rnzs)U{|%@4eK
zCAryTXPL9@cejFpuQiS4W$s%tcW1oUBOfFwie>pQveMO**<M<+9NKZ-uglY<wuEQb
zrPZz%4;FJAXB0H{K<!JH6FE=(TM+TJCsBv0yk#~$LsP>C)C%1j+RTdS)`jYq=DAgt
zzjkQ9(wEl2yS6mC*L$hG@Q)Kf<1)5IS#Q|m(<cu;I-c*iacciF^$zTi#bXQpaOJ`p
zLyIHXrVqP*A-185t&D(sM#k$0Ow*CqJ4APPfdhdB>q@no4W$*$FXL}?EJ&`XjtaME
z$zMF*s}$SPp;cNu$S3z~pLuQVZ&lk~>0Uo(EDc)wKp6cbH-%E#6l5OfGka}PR+<N@
zEVsM55Vxb}+JV6M@1g_$B}OiM`<mC6;oh<hYKsc_vCn$0MxcH5vFCxWBd*xU4?i2!
zvy3-s@o2d?v>@YEt<)!c*YHZC>%+*!)^|@;wEI6nAk<a}JUxS%o}TYo4cuUgmJ~4j
zYTZriVx#NO`bej2DtBMt%pnicJvrV-f^X>@qHm6Qt;sU}!QdO;b0@mGF0ikkt6LC(
zjF_W0gh)zG3WW;38u`&6>KBEiJx@MpE`Pdg(eCr4gF@4*(CvUaPN?%K`#;WjxErFs
zMKxR|e)X_UH~m5zLp{A}?Q_Qw+0tBBvY3EE={FH-kFTL*^PLm3Ubr4@m|HeCJ<x^s
zo8}seio=Sb`ickAe0~n^TXK-&SN?U==F>NC4ESDANZl1rzmGg-ez52iRk+bu*s=a>
za6`X?;Bd34kEy>OYVu^Ac)Q)|CLvMDp^n9IZoT&`q{B?<tRDNU0*>0excr4~uPlZJ
zTI~Z^X-p5@2N_94dHOr~-^8_=^}V@~RA}q|z^MGU+i&A1Z63C+y3>mGbsuq-Bz3fI
zV01~5hUr9ZSjrx~#zj9N&g{5GxxZ|A^iFwW|Dh9k%}A8zLQE$Dxw<B<psa1l9kYSQ
zPdc3rz0E-6MoP=Nr<NW?Af^`y;MO0>3ZQeuiCBOuW`kHoq6EGg5C|7Hg#_RTK?ubL
z`2rCG{q*!%G)ll_pd-jEJWJvU#tHn=q+nQDU^pjD$f0r3Zmv2m3OY=X2toi#k(eNo
z(G?7|ikA+5S5D*5C=~<}GSHE%V3em=3Zh6@5*Cl~RtQpvXjdJSi<HZwhkE&pQNSYx
zIu3#)bR14Dmt*BlSh19kBhY9x9G-|H5-~6WBTE%QfC3|uSt%(-IlMp_M=Fp&0<j3C
z<OJB_WQc)A!|SLqa(I>Ft$-)T94N;sdKtvUG2sCT-VY4G5%G8`22aEgX}F2@@G6Tn
zZY`3HsR-+dQvebi0gJ~aCVpTcgS=DT`}?ScEF8XpaiO40oGj&l-YK96vYO~rl8`K$
z=rdUcDyLL&CvbT<I4G6pi8j7WR`9ruQbxWYQKGU?q9-D`oN=5aS(>22a5*?I0ZfDg
zk-^M_5AcwH_x^xB*pG7MFM+`B#`!-$ztc+<i%M6zmza~RbjtK%pq25`xnhohOILj*
z<Jn{<k~0BAB~!T=5|>EBu(<#M12|JiG#-scr8-e2P%%X^2oP~VB^6AL6~H`rHk(M{
z07MLlOy*%oL=K1nNE|$T#uO)zLgA8V&b$c}K~e!+2|&WcsFYM(n2P8`BNOplGKSzp
zV`E5cyb}iC0bC4+3gF2E9+3dzX(}q^Ind_>GZ|<i7XN-GI01loVre2=UIGzUESJ4s
z3Kt}TVGy8{jX=Q@@e~T4Mj$&;X?W-Np!uLw2B*1_m4L?*iK-PYhwcM&0&uzs5&=Gl
zlZg1L1?9oe;qAcE0?O)unN{=fZs?v;5P-zeaIrXnfmTL~Qc|jl3gt3ZF7yB~M`fr2
zgIs0Bjn$k7z{jbEF1SyD|H2d&Czgx;H=g&<ah5q!NG_HNgQP+1c#s2qn&)HSai&nX
z+sPnlD)VnP^&dEw(S-GbZN<{m3I4;tq|wo6OG*%^q(Y%oZGaANM&*|QDIiyM1h9^y
zOPn}B#0TMiJ63G(<^>-~WRORs(%`(ukexspoXAu*hROvf7!ICC<*?z5;gLrVc${4(
z=0S2m3eMrfIRKwCTwJPiM%j(!->eU#k;j3`<iZo3Fa#n7PYcHr=>!7ZiGUtGZIla6
z*<s)9)<xNaSS<QPJzSJMiq2FfVpy_7k{|%3AL{fjZ~hBzg8f*I{+;<m*r>IqSdt1?
zaU2vR7k$$GM}VUY0Rj#vl8HYR`b5a6EE6swIOfqg_=1D)OWgQ{IhG~LLiz`P#<K4p
z^Z-+Taq?OEev#{oT%V=DXMw+D*B7}yOM%Y<f61=@n_N2YAGtvh{CA%mexQ~+czD4N
z<63NgUoXUn^0l+7WIa4HS>m@qhCodDTKQH(6c!o6lSqik@<#UQYJW4u;)s{cS@=IL
zmQ1fX;gPj<ZL<$&;q_K_cTV=>oSvhwy*VP%vw>VztX=G2YgaMd+<E)VHL{`aO+4#U
zUCd+c`HFe-_7!z6>6BfXapxqa=7f6x`bpUh$(pU*S7?Y;z|Qi*g~F-J2wI$g*Rzkf
zR<s)H1BR>m2GPhjE=`Da_ckA{iG6Ho>US)2<c6o>hZzY#Y*0bg62>Xh$JaDpmib~N
zD;T$Qa?5=6skIrEH49#bIb@&9h(yhN^OHK^ro0s8{06(+;PKWe#q7@GnHwGh>j-XB
zih0w!S<UG)%QG26{$AxHDbLFs_4UsTMhbVYlrOwc<`^jqnOikbGkfvQyhbb<L1Mi~
zGpaf^yKj5I(VL#HNUXR+6|v{cvF&A!c6;#kT~#HAh1F`#X!>3GhH0^|eh8*_px0rK
HMVbEwwkFzU

diff --git a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png
index a0ce5d516e8da1f72bed5c044fcf8019a2aac9c8..814483e1a6e32d29bd6c9a5648a3496337be5677 100644
GIT binary patch
delta 615
zcmV-t0+{{9E&l|NBYy%$Nkl<ZSP8|JJ8!};6opM#D2Pmj0T#qq2B=ud{~zeUfT*a1
z7|Nq`K!Qq0P*fynj?0OR<2(ouJlIKY;_uv75+Uw5n$6}RbuT{P)oNATMF8QG$s~CJ
zD%`THWCiH(bUK}!023Vbmq-ox!4nbS2e<Qi*?>2VKoI<Qw||oYEIHp`BK)n_6R36+
z90oim9OpL?pu(T)b@9Dig5`nZ+SOA)I9@XF9Pr0N!3e*)03GfZc7Qpq7J)c$h`34(
z0FH3W4Fd{J-k?nv3n08wsffW~;9Kn)*FC*RfDSL0N@BTK_!ivPZ03S_5L<u=J|2(7
zQ>`XOqY?LaSAW18jfT)g#1aq$fA9A_Ai}%duE%z^0KoAl!<-}R^qg>jURo{bE#NpN
zoGT-7RvQw|mkjzGIY-!a_-nf@9<o`n-EPHUzn3C#4QZeVtdRwn;7Bmu?Z`PdhPMEv
zoOUc0i?Rmh^SMz(sa%dGAPCM63q!5KRROvPz%fE25Pt<OcXB3(K-g{Dmfo+|YiY{m
zasmP<f^ZlEi;(cJPpYIGC*<63WHK3#$yb015BsEISEc|3M{nV|>iy4V<8}v?{Qo8J
z?6?w+YR@_${cwsb=#vUKim=n^NWkZGDmD%b18HFBS)jOgI2?++lPXUHR5<@+qQKc&
zC_;c3iD1=gW$Xa7E`*;Hp$QHz^xr64QwJkJ5m@Oh?&C3AmG6y{HjE3W5R(X2yJ}P6
zcveQ>Qn*P3;i^rCO96gx7{fx(&D9m&>Tudkwm*9L?c6Kb8H@k`002ovPDHLkV1m-p
B8B+iN

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

diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/meta.json b/Resources/Textures/Structures/Walls/shuttle.rsi/meta.json
index 9aff20a66c..97ca2aa3b0 100644
--- a/Resources/Textures/Structures/Walls/shuttle.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/shuttle.rsi/meta.json
@@ -41,24 +41,6 @@
         {
             "name": "state7",
             "directions": 4
-        },
-        {
-            "name": "shuttle_construct-0"
-        },
-        {
-            "name": "shuttle_construct-1"
-        },
-        {
-            "name": "shuttle_construct-2"
-        },
-        {
-            "name": "shuttle_construct-3"
-        },
-        {
-            "name": "shuttle_construct-4"
-        },
-        {
-            "name": "shuttle_construct-5"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-0.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-0.png
deleted file mode 100644
index dde7f67085c33178ecb82b20793d7e242ce38b19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006%Nkl<ZSVv=&
zm)H2ufCR)OC6T#QXTN&>9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb
z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{<
zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E<ykrD3=%@zREd@s@4hljn=%t_wtr9n!-U=m
z3?NUVIN;8mdtje~EQbL~9Rac&24Id*QBlHlKzDCD*p<kZ!!(8jg){sI<`rdNNd0F7
zih?+dKn6<wK?D}aXCSa<{Ys1wgxOJAT!|V2Fb6c%6)_;YIwUZh!O7W)tf<(xcOQx)
zK%rUJ)Ccw?RtFqBbethPzy)j>$PtuS4s$Wg5wNISxnU23y`3dt2iVyAknMBy-~u_~
z$iXdO;i2Pz*hFA~p{M}&j3ls#77`U@c=!4>LHapbaeM#%1BS)(Aq5=KA%N}xPyqt6
zoDcvx61|Wj$^oE)2viQh5+Sw_09g*Q00clG0s}A~!yHH`1hAF^u#ymz4M6}`2*9EN
z*%I{V!50FcY>2ZY1Qo@&902n%C@S{s+{xhL?hX$D7$0Uaz7QbW0kAYc$N_}X0ND<p
zO9<dggs>2xG!1~VA<oJOxhSS(E+DEXrh7R6stu7t0KG1tq$C`gb-{pC$Dr2AfHp{Q
zHpzgkA`pNzrwLU^WHrfPmC=ATN(Zc24(k~WSjS{gbj?7CYCt=u$f=s%-E#nNwA`Pq
Sw(#Zv0000<MNUMnLSTY!uLubM

diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-1.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-1.png
deleted file mode 100644
index c68cfbac68a535de1b7e26ec5c203f4d78b00153..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800070Nkl<ZSVv=&
zm)H2ufCR)OC6T#QXTN&>9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb
z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{<
zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E<ykrD3=%@zREd@s@4hljn=%t_wtr9n!-U=m
z3?NUVIN;8mdtje~EQbL~9Rac&24Id*QBlHlKzDCD*p<kZ!!(8jg){sI<`rdNNd0F7
zih?+dKn6<wK?D}aXCSa<{Ys1wgxOJAT!|V2Fb6c%6)_;YIwUZh!O7W)tf<(xcOQx)
zK%rUJ)Ccw?RtFqBbethPzy)j>$PtuS4s$Wg5wNISxnU23y`3dt2iVyAknMBy-~u_~
z$iXdO;i2Pz*hFA~p{M}&%+iIk7@j<N%pfBp%Mcx(hLI-l$=|>KfMM}`NC8K52%tNl
zv$d9?yt<hIL<7qX3<sP(u^%oEQilwPasa3x0+j=>M2Ig0+Ipuj?Af^!ZikDzJ401*
z4$crlcL3IM09F!$vLOhdI{+jGN=%^Q`rYf-49}5jHA!F%DkLfjE@H7|S!4%*vLVir
z5L6Tsa)73mCIiSqbO(U=*RNe4bpT}{fG-hJD-D3MA<oJOxhSS(E+DEXrh7R6stu7t
z0KG1tq$C`gb-{pC$Dr2AfHp{QHpzgkA`pNzrwKKW$ZC?oDx(2wlnz+49M&@$u#U-~
m=$e5N)qr+RkyACjyXOFhw%?z(x&(s&0000<MNUMnLSTYmArnUc

diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-2.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-2.png
deleted file mode 100644
index d2f5bc0c3bc867d40b2ddeb3ab1a0f35e84adacf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 689
zcmV;i0#5yjP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007bNkl<ZSVv=&
zm)H2ufCR)OC6T#QXTN&>9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb
z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{<
zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E<ykrD3=%@zREd@s@4hljn=%t_wtr9n!-U=m
z3?NUVIN;8mdtje~EQbL~9Rac&24Id*QBlHlKzDCD*p<kZ!!(8jg){sI<`rdNNd0F7
zih?+dKn6<wK?D}aXCSa<{Ys1wgxOJAT!|V2Fb6c%6)_;YIwUZh!O7W)tf<(xcOQx)
zK%rUJ)Ccw?RtFqBbethPzy)j>$PtuS4s$Wg5wNISxnU23y`3dt2iVyAknMBy-~u_~
z$iXdO;i2Pz*hFA~p{M}&%+iIk7@j<N%pfBp%Mcx(hLI-l$=|>KfMM}`NC8K52%tNl
zv$d9?yt<hIL<7qX3<sP(u^%oEQilwPasa3x0+j=>M2IT{Kn5>bxe;Dcg7~1)EiT+2
zY$vu5LU#bxasXBmg0dk9pgRC021-nz;u>VxmD`UQ&Ye5QU}R*(pra}ab`+?H#g=7}
z9RSLPI7>oMQB24IAPZs>62O*rPME<^UXTHH%;E(Lzz(E~13*Fk99XY|EC)G464-_S
z72$Mq0L?-GUm~Pd8USTOoRtxBQB2ERKvYpo_i_MK8zP4QdR;(CNjNm?f&r<HL9LYm
zZIIw>k^x&qAOLGlW7I@w0%SGGV3pB;HA)ApSq|$N4OquyP;|{eX=p$@r^tzz-raKm
X_sHm<;lFx500000NkvXXu0mjf_TU|m

diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-3.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-3.png
deleted file mode 100644
index 7098ec309a42368ab631fc9bca706b12cd0010e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 690
zcmV;j0!{siP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007cNkl<ZSVv=&
zm)H2ufCR)OC6T#QXTN&>9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb
z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{<
zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E<ykrD3=%@zREd@s@4hljn=%t_wtr9n!-U=m
z3?NUVIN;8mdtje~EQbL~9Rac&24Id*QBlHlKzDCD*p<kZ!!(8jg){sI<`rdNNd0F7
zih?+dKn6<wK?D}aXCSa<{Ys1wgxOJAT!|V2Fb6c%6)_;YIwUZh!O7W)tf<(xcOQx)
zK%rUJ)Ccw?RtFqBbethPzy)j>$PtuS4s$Wg5wNISxnU23y`3dt2iVyA5cGLxYb`^0
zbu+=x0XgEx!7X5QRC55#a$+1omIGoFfdz)50^D~?7tUgM^5ij`kL+`hBVa&AMwTHu
zJ`E*Q?%#jFuy{VCfFn8t&>ev6V_?~V5$vZ=><32&wh$r80ic2iR1UxrAvOoVYz0{a
z3RYO|0I@+1K$b^#A-V&wmIJVo5R?r;0Gk6qK1a3`oegscdcs6@04N*cED1qHF*XOl
zf)!)|GC+0!OdKSJ9t{*Z0NF6)V8@pCkmZr}QRD!SMaUt5uT+FNfb0+;lnBvNKei}<
z<pz=yA*e1uE{bWH3y3O;>0S<?hX8tAKuJkRR#8l-GNO51KumQ^Y()fWm=IMRgIX&C
z+91K%Bm=gJKmgX9##RWSWIJ-2WU$I;z#63k)+~qhj0UV@GAO!cpae9aom1o#Oz-YF
Y0Nak`pS+rxdH?_b07*qoM6N<$g7*Cv-2eap

diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-4.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-4.png
deleted file mode 100644
index 120b1638c4ea17b9dac3452f216bc6886c897e76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007NNkl<ZSVv=&
zm)H2ufCR)OC6T#QXTN&>9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb
z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{<
zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E<ykrD3=%@zREd@s@4hljn=%t_wtr9n!-U=m
z3?NUVIN;8mdtje~EQbL~9Rac&24Id*QBlHlKzDCD*p<kZ!!(8jg){sI<`rdNNd0F7
zih?+dKn6<wK?D}aXCSa<{Ys1wgxOJAT!|V2Fb6c%6)_;YIwUZh!O7W)tf<(xcOQx)
zK%rUJ)Ccw?RtFqBbethPzy)j>$PtuS4s$Wg5wNISxnU23y`3dt2iVyA5cGLxYb`^0
zbu+=x0XgEx!7X5QRC55#a$+1omIGoFfdz)50^D~?7tUgM^5ij`kL+`hBVa&AMwTHu
zJ`E*Q?%#jFuy{VCfFn8t&>ev6Q;?6)0W6_n3lX9m04j(;<p3-Z;&TAVa*!inmLju>
zaRAnG09F!$vLOgya{#c^#A+$b0U-MHiTxM}6FCGx*$`(*2r7!PIRNG>^q@x$0a%oP
z#Lz>5A_t(yJ-$K-S5#2s0Fcj+Lx30ukR1Yq5+NuJAOmbsKqw7>vLVjO2)QVxWiBA9
zD5iTk0ICg<Ljb)lprj-ut0*Q^8PU8hAf`Gdwju&GOo*zEL9LYmZIIw>k^x&qAOLGl
z6KVjE)g*&eMg!I;9k6COtY<V}9g{)PH3KE80qvY3r)qk4&jB*b-=6~gJgWcz002ov
JPDHLkV1kZ`4&ML(

diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-5.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-5.png
deleted file mode 100644
index c29bdb3197c7b96c5c06af664eeb3b7bde5163e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 671
zcmV;Q0$}}#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007JNkl<ZSVv=&
zm)H2ufCR)OC6T#QXTN&>9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb
z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{<
zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E<ykrD3=%@zREd@s@4hljn=%t_wtr9n!-U=m
z3?NUVIN;8mdtje~EQbL~9Rac&24Id*QBlHlKzDCD*p<kZ!!(8jg){sI<`rdNNd0F7
zih?+dKn6<wK?D}aXCSa<{Ys1wgxOJAT!|V2Fb6c%6)_;YIwUZh!O7W)tf<(xcOQx)
zK%rUJ)Ccw?RtFqBbethPzy)j>$PtuS4s$Wg5wNISxnU23y`3dt2iVyA5cGLxYb`^0
zbu+=x0XgEx!7X5QRC55#a$+1omIGoFfdz)50^D~?7tUgM^5ij`kL+`hBVa&AMwTHu
zJ`E*Q?%#jFuy{VCfFn8t&>ev6Q;?6)0W6_n3lX9m04j(;<p3-Z;&TAVa*!inmLju>
zaRAnG09F!$vLOgya{#c^#A+$b0U-MHiTxM}6FCGx*$`(*2r7!PIRNG>Y(bALD$qlL
zA_t(yJ+@#+4gqXwfg%The25$Z#5jQL5FnHYL1};xAe06`*$`)Cgj^KUG8Yh46w|#N
z0M&-bA%I>NP*M_-RTLAdjA&jL5K|o!TM>a8CPY=opw`NOHb`(b$$+gQ5P&tO31vmH
znq;ubXuuk!1J*2u^^69rV=^eZW}rkhpq*3XR88;hIRKrH<)7+<Hwgd$002ovPDHLk
FV1gw452^qF

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/full.png b/Resources/Textures/Structures/Walls/solid.rsi/full.png
index b4e991e34578da75a213d963719a3d1b784772d4..02ae3ff3cc8a5b265dd5a6f9e60f1008175fca1e 100644
GIT binary patch
delta 534
zcmV+x0_pvz0iy(v7=H)`0001UdV2H#00HVrL_t(|ob8uOj;cTuhQ9(->hcJTn6dzS
z>i+l8E}#+@009((JnrC13AYvKj_K}!e^P;PUVl!(Uk9<<?K*xCR(})6@s|=PrM?ua
zl)4d!<Cw$YK%QlIzP~t$=XppeNz;@(&lkn?HR3o%DTOgKynk)C<XMJknv2#DOZ<m5
zdgv|ie4qFIo*)eIT$kc_T-*r&A;hHJbsPZR_xn+ot)Wv8h5($(64!B<dpoPDLP|+h
zRXEoIcgbCI_BEQOxlaJVF#hdI2h?>vNx(1+>blm~N3bkQ`?qa7&N0RMS(wW8kid80
zMc_r?_Ye?5=zj&wiqL1!b=|1OYPHffEkv&C-dGt1m&;{VUYDY}T#!<J5Fr53&jV7*
z+e0C+ZF^P;mtwtMb2^=LCjiQ;H0$FyO;c@rb_dSqGq!DyIuJz>N~zlxWLbt~Sr~?a
z5CSRX^E$9vQI;iL*U`2uP16tr0q|XC!9*v2&u91|@P8ukKb|VZ6SfaCVcWKtritJ-
z%RNF>Rjk)*eSL)fBfKZYqY7z~5QHIrq+B$XODQSKlFeqramL?u9P*+dO_I@AuD77b
zbKbUF(j*}-3c9YFT|><I_Qhv^Og!Ho&FxFEBxYD+MBuAGn0;&%MOxcG69<Fi_^0p}
Ye!>Hwv=0lZN&o-=07*qoM6N<$f)tJY#sB~S

delta 152
zcmZ3?vVw7fL_HHT0|Nt}$fR^2#S`EY;%Z=EU}0h5?Ck98>nnU|+kc>VxTlL_h{V+7
zga*cqp$P`9j!cKb69c$doB7y|u2ir()9h#{dZdHJNXfA$L_s;{KM*Wyl2{+MHi|c?
zrMYLPRRGTp;|F}r)}rq!W|TjWYpIr$<1k=gIJh}S&|aRg<t5M#22WQ%mvv4FO#t>?
BGI{_2

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/meta.json b/Resources/Textures/Structures/Walls/solid.rsi/meta.json
index 246ebe31b9..85b809570d 100644
--- a/Resources/Textures/Structures/Walls/solid.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/solid.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
index 1e2da3352b75d4ada2d78b93cfa36e15d6fefaf6..828730d9f3d82e3f4e25ee4b0e4f0dd50970d037 100644
GIT binary patch
delta 880
zcmV-$1CRXS0s97!7=H)`0001UdV2H#00TlvL_t(|oXuC=PunmM|0Sd}EQv`Lfk3Ke
zMRa+9zE=GIkGvNiI#A>h4XG$<n<lLb$k_wL%_m>mU_Z$^w`bp7&Ua^@G8_&wd?K`b
zLMeT5F=Gsr(iiD#z!=*YKq*BShFHWgEJ9j0QA#l$kKy}%D}N2c@L9#Vj@)3i$QTR;
zSi~_@Rc#y>=jU)7r<Gn^UbgO4Rkfrehdcs{5R676?AkVV2|>JAlq^>i1>b!ick49(
z;LFZVjoP-2D2k9}^{^tA1ppY0MkOz6#YMZe{pgJ(0kJGp#jKx{f1?yx16{AzFio?j
zTzQh2>kvXT8-D-*s`_{;8Gwg}hnleWK+`lSyQmz%CI+fd{)+0CWwjdcQTRU%I5;?{
z{io|XZf<T~MPDmZ8o(Gsuh+wBxrFPwNS`9Mh#&}XdU}c=2;}c7E%K{KlLW5oVzpeN
z*Xzkjs0@e0EU$2m<KWBA4h+*onk2X{WPz^h2!a5*u786xRLeMy!8wQLdElIvcpXiX
zGMB3rrqd~W-v?vtF%21G@O>W_=jQ-`Zns-=S^i~&5EzC5!!R~qm!<#!&N+f0z~SLx
z&A_Y6OIb&bPfnx<RA5u%_xATeDaBF0Un@eM=gGNY7)aApj-oNebvd#u!%@EvN-6gC
z_c0!i<$tBs>VdDW3q{#vaNF5d(d2=<`}?<hpwsEJdf+)Ut<!b=?|Pu>_B;mKJis}}
z&97gL9%#*iBuPql!JlM-wzUP*vKq5M)&bx5aXXn{yW2&YB(?gT=Q-yblgXquIOnZ(
zKv5K=NrLTe7q^p%R1Oqk;QIO+w&Ng*A{Y%<s(<HsI6FI&XWT@K{3;C7L=;7^9S30;
z${3JG5Qd?Axd4D=nx#VYC+KLJd=CgAAcT<BP~HViub7X(r{9LP7g33+J<I<01|$u)
z;(K5<1a+$cLI~^<B7^2F!rJ!4iv@^fVP1HS=P1R%d^VHwEXzs*09@Avu<2^5H0L+%
zZE4a`G9XzjFc=IlpUp6j<C+j51b&RiSguw8&`5tW1|dXkZ<b}4$1&!!S*<aV2IP&2
zMTpGR>Nq|*!E`!prAPgK>s}#5Nk<MP?~XsKIaNNpJ^u~-;(9QzVua@a0000<MNUMn
GLSTY*0-5Xp

delta 209
zcmV;?051Rg2H^pa7=Hu<0001iRA<Kk000kAOjJcMFfcecI7352CnqOOO-+Cm5o-Vd
z0F6mRK~yM_y^+BQ1tAPXHERKmSb+IhfF-Ede@&|{!jkOy&m0U7)Ffk!lnuX^*c+QB
zE!Xla$QvR6l$K|ak|E1L;N^Mx1p*M;GQb;v5v!}NA>aWak4ml12lVI9d_X*1v<=D|
zToX_p2aKM+K!H1;?kfuX>kZMm8t!9!wII1dwPYEC3`#|*!j`%L;+izORVftD00000
LNkvXXu0mjf(}+<q

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
index 501e4b2ab408b63fd4b79deca623d61be4af3198..93e381adf25c561f5c87ce920668fd04e974a44d 100644
GIT binary patch
delta 852
zcmV-a1FQUs0^bIZ7=H)`0001UdV2H#00SmTL_t(|oXwZfZ<<gP#(z*c+aahk7#^D4
zhdLgnNuNym|3CRkV)x+e1FP8xq^TmTwQVkYSV0lgb?erB2|1YKIp4?OaPGazU@%B|
zMQGWL5MuA2J<mf3vDf|zJkMJR5JE7WPFX||hG}jM5<)N@kAHC-XRDn~r#p!=j!dw+
z?&$aXETRZiRV%Mg7Z<czt*!QQGT9ods%n8FL;ea3(_}On(P%blm?qI;QBbZZ3LhMY
z`{fdVx5vjN+iW(uzP=_+%WY*E1^}bcs8D5X{ZEZ%^Jg{U7}GG=OtX9<e=h`Sg<UR}
z)a&&Ux$=}V<A0D+Rto@7)t_%A1s)$COUZr*nx^Hs*U5oZ4{Snt5$gT9whH)Hcy$4#
z9ssayo8+l!GPtfw7=~Du#o5_eDQ2JFwrzahuNII^u*=DW_d=A&0m3lk{QR8ZaER-=
zJN;Ei;+S^3%@@z(wA(FD!tr=atJUIuxkRtmOCl`GVt+Us((Co;bUG!1AP5)^hgg<X
zDIm*fHX8ZV^gItGTa1Jde7d**pjNA4+cpmypP}oz^!t5uT}RjT)zc*jNs=%cjVjB3
zsA>4VpU;txy<T+%tWJlw$H(aPI&sBo$e%{nNs?si?@gp>%4xSt632YMy)9HA?*Yeg
z3Ke+QZhxaFFEb79A0D`zOrBqXmzsn}M@KJPfh0*vJ+KRRcXxdI`t{E$kbUPt5YXv#
zN~A#$5QZVH>y{ev&Ees%SKx!=ki>Cmey@M$K@gOla@QPC6on*?c~h(5d0wFc%3v@^
zg%Dg_U2$-5fU2tbBz&l-!0$}LLrp`k*YSNHDSstWN={BrRu#xpX7GI<V`E*fB7Kg(
zY7E2LVpO$@`4{*<SHs+??R5Wr0lUWWbFkS@I|WE7X_#idiF{77Z86befoT}b*S6ys
z3Oz8N&GP#+O$!%5yWIv>r<zTh`Kw~9I0^#d#e#mn&wMsx9z~@jQc6CL$9%uN1*o)N
zJWUTNWhpjIQ|3{`d^Rf`OmYF)!Nf4ld{}H=AA3D+Zf>^P({6Wbtdz3Ak)g05*@wSz
eI8|Qzc>V*Yqj)Xq?1mr!0000<MNUMnLSTYu>X&{1

delta 250
zcmV<W00sZw28sfZ7=Hu<0001iRA<Kk000tDOjJcMFfcecI7352CnqOOO-)o(R9vI6
zc>n+avq?ljR49>ckxdGOFbsubboRdD0n(y-!3(H(fT1w=zsjW54yBowMZ*XAX&zCl
z&V@>Tq)wEseF{x@BxV3CDKrrw?mXap3Vp`}955Xz0G|OorgMGRhXW2baPyUQ`U1{-
z=3Ky3wm33aYtSp;`3fQJ9Kv<V17u^_;saI;3YMr~&m|cU3l)${me)JRx<?I6iD_!a
z=EXj$@axg6Za(+t`{qFH3C)pP8(O1`mB#E=U$dJw)fo2f6#xJL07*qoM6N<$f`;;E
A!2kdN

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
index 23367ae824af90f4e119191de1f31c1aa39b52d7..cf8936fdcee3e3571a19b1105186d7052b6edef5 100644
GIT binary patch
delta 946
zcmV;j15Nyh0=x&17=H)`0001UdV2H#00V<bL_t(|oXwZdZ`xQ8$3J$+5^8K<kr9We
z?*R3oLE?nuD|h}}?p(PdksiEocn#_ztcYKB2}xw{p|JzlPP$RI*{@`crSY5Z*W;Oa
zeoCj)33*54q8lN^s}D;l5kkCbe+E*@X8}S8X0sXF%?8~tGJh8dA#fZA%d#@<Y&Lt5
zIO2!|tA~zOtHpM+K~>e%>&x{ul}aVkPA8MhwW_KfaYTqefo>R#$74$6G9|-cv)vvk
zR}_U$mc{*k55R{)Az{nqGPk$4gkiF*3|$9cJRToqId}L_sa*b%4bQ{Sbxy<VpU6K7
zL6~Cq`#r^CF@Hg>JjIMSf*?p20HCTrzDfu@K0YRby#={kE{=Uj4m{VuDU@GA{d%lS
z0ly3HE+A0@0QGtu|EXvqj7B3|*TpnV+U<5?&1?R8z0Q0-PZtnPu<2yNM<EjA0Ius|
z+cv}DkkM%LqCXA3=TWUz`6?xiW-~bn9mk<ksc^sFqkk2P2@$4g#=#qn28E~o2iWa)
zxUS1^IK(u~Q~^;;qg0BgW;_X{lvtL9yI3HlWICB70<_z0Ow)|tQqweQwHlhHF&qxD
zZ96ml0Mp3?DJAY=5tGAH5k?s>Yc+%rG@8xC5Q<PJ6zKJO^!t4liv|6DpI)zbl#x?}
zVMwFdM1Kf@S*zhVPP}QwHDFm5U#_nK$mjF?S*@Zd=^d<T8r^P}!C*kQ+eOnfeBaL$
zaR2bYbTWx2>F2Af*E4W_ex4c7_x+fBFc`c@4sdaC@#`|M+wB+(2K0J8G);>?hi%)L
z0`Bha`1{+p)C?${PA5F<f)9lPTCs@dc}IIe)PLsywrwZ6AnK5`Ld>0=QPg#O&*S@U
z$8x!h3o(&_PnL!6d5QUb*yq#fH1$oh=76Fo_@2if`8-m}^bFkG+;DbwhN`OZBz#E8
zz*{Eac`k=mEHa<Z34(wi2)Mkwe9l0mGQxa5M?cxuv-<mI{b^$u4mP8-znI^F|L1NP
zJAZR8y8n9tUdpcc7M#}8ivofmpkx^FPvpM|mbGTH-D2oE>x19%2uC%rUajK$Fbt0_
zfNHf0JfCV#ZRAf|o5pb@z}s$VwOXuKE7qG$B1jMf{N*@&-|YZW?N=!Yf*`Rr3`5qN
z4eQk^aWIJmL<bYyFydixdVRjSV!2#q+ABu0nYlIyf+LOyN_0AYufwVG-pBKQ05a%x
U@uE-jkpKVy07*qoM6N<$f&dB0dH?_b

delta 248
zcmV<U00;lP2Z#cY7=Hu<0001iRA<Kk000tDOjJcMFfcecI7352CnqOOO-)o(R9vI6
zc>n+au}MThR49>ckxdGOFbsubboRc|1Ej^-3tm8_2N;C8|5YZfR-~Et77ZVy`6Fu8
zx%f~RsS~AhpRECp#0-EXTLTf|E&wiM>pN!P0Ka7ep#TK<b#YjS4Gt%8Q!3g+1^ZcZ
zs=(JSwgToS=oRpkV$40qn0C2<EG)}$ff<8>_n}}dDFqM<RdA-fK6i=%CdGVe%9h5y
ys(Am=v~Gs`Grn0+yF#<%_6+Tz%qh*WTm1l#0yeXRdlC@<0000<MNUMnLSTaaMr5D>

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
index 2b48ffb696b72a8846a07c9bbd5e2d124112e184..ee44f0d40055ab2a033294a3def8d84ed4a8fa1c 100644
GIT binary patch
delta 946
zcmV;j15Nyf0=x&17=H)`0001UdV2H#00V<bL_t(|oW+;FZ{kQ4$3J$wi}nJB2sxra
zHwB!F4N^pb#2<iC(epRbQ(CFhMUluB92CA#Sh1pjA&JOF_7#Z-|Abt!r~OLSgBj2J
zKEHYMof)Om=>+^nXyFeb#NL-}+eQen*S-g~ZEph*LNK4tS$}yRC0)-QB!plxnP8e`
zuAR^4JBdS%Fkm&>(Q36=c^;~&W<EczuQ@t8%C)oUG<U43sxgibatcbi&UiegT&Ymj
zb-dLo7P+D*{AHRvZ#Dq@@$Fm6Rw@<l?(PVJbXn=85&+}zIF@BC`ck=4dCkUpjb18|
zbhCLQ|5FHp41c@XY$z6sDRSk_XUO6Ees%x=s`@%B0r2wjl5+MDXqqN{N6CS04J4ub
z66*cFaszk|EX(@L@XrNcSr+|%|I<OFY5<^CtMTwwG$F38u5evf{vQkm(hi41*=`sH
zr>CcxJ{`wNwX5)|O7(i3r^iRC)oO|yz;#`^-L51#KYu@$k6{=9bi3VHkWoCW*Ho)j
zo*o~m*XvRVRoE(=UM};z*>IS#lmIR+E&!<4>i{$w4H}I`sy_>d#Ujs}4SKoEWHOPG
zEi+)6ChqMmwrw+;PBWbthC#dCmR}sj+1XiUdx+U|if!Atx3`$4nVkXS_!uDsjb<}8
z*s?4+=YRA0oXgA06hYWF7z{ECv(aoKgupmHj%7fLX5h#5H2{S|fm*F5$@~5O)=?zo
z$+p>S20*{xXEYko>-Az82$l5v$;ti<gfiUg^%#vt8A;7Yl6+SNl<+_zgh*xJXGDrE
z%Sz30^2_0MwIs>EXc~^=d@KV|xUP%qy0qKv+<(42<YgeW3ceN!JgnE5`W@;(Sa7r1
zEcW$be-<9rYrYl=sa2qKI-NiW!OhJL2L}hJsw$N*It6)32<%nDFPg?-v54b1_`Z+t
z`%;Xg6f4U1n;plYln|q&)8TNKS?zhql3|E!Mp>trT?kjld&qa;Q`_-p$suPql%3kn
z?tfo`oeb-YUGXDG*3-@aeBY<6>+%r!U!3KQS$ZC2U1u3Nj)#cVz;dyWzk?u%Jpk2e
z71-Wtk~Zv5j*YIcC`T-S^=d_{)nd6=u=Ko?6W{mwdotni=?Ngy{$tztzMmQ!1OZFW
zW4TzQE+#U7@M2QZbtx9f=ljVC_xJa?wky$W=8pA!KgJOvwi)fi|8Y50e)skKUr6y>
UQ2<)w+5i9m07*qoM6N<$f*;z|)c^nh

delta 246
zcmV<S015xR2ZjQW7=Hu<0001iRA<Kk000tDOjJcMFfcecI7352CnqOOO-)o(R9vI6
zc>n+auSrBfR49>ckzEdiAPj_S@c<6-0EM{kBwhfGCotLjUu6r5F?44hXuhQMkEqw+
z<4a+pL6jy}tN~BN41lFr0}<jO06rA!I~Cx8c`F7&1qhh)m~Y1o9vAS-QMHE#_N(U7
zz}&jnDoAhO6!3DySbC1}*yRSYvaII~5=I4|Q$emN6_88Rz?I_ClVX5LF`t^UwXv@%
wK7Vwro8kV9Zx+<A&@8z>Lw_i9N^|U9KWp(ek<A=?tN;K207*qoM6N<$g6B16p8x;=

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
index 515b40760d8e7146dccd850215a3937cfaa29631..bf9dad0013f7c80f7cd856b24f31a2ff7e92741b 100644
GIT binary patch
delta 953
zcmV;q14jIb0>cN87=H)`0001UdV2H#00W9iL_t(|oW+;VZsJG~#(%b$v1S7XgdA}|
z(+5}|2vWo$Z-8>*&NFi7Xyp}9B$5M*4@`Wp(n8^1cI0ei?_tsgW1D1>8O<kI1#VY;
z)zwwi-P*;)MZ_OOLH!Uyy!!EcK1T@gs(cIP^ZCvJAq1Z1v42^wDVb)jk`RLFbc$`;
zxzh8zqr{3sIjrvwbUGb2>ovNrXFj(#H&m<DT<Okcxw^WpCpZ-1B`BFDlgWf~r9#;>
zS#LH8&oxcsZ`<Z62mtu&%a@d_R4ObM3!*5UR%WRLz+^H>M7gm4QMpq25smE@vsB{H
zOz=YfRS2RC8Gi%;#bPl<uD#e)9AOw{I{={TKUO6Io}Zsn#@>TMp%B~NCkJ*pa0u;}
zP`_>~*MYadah#8+f6M{Lap?E^A9f;@0|51UoyV7?QMkUoMoJm~9}EVu91e%^d&{yo
zKR?g3>HB`R1FD0$vl(B7NRb0bDY?A7L`sS0d0bsxC4Wezlv=mjjmG0~=1d>ATWYl$
z-{y0gtybI#b=Y+{vs~sW2sp_oCFO)=Su`3A48x$=Y|?BtF${xlw;NfOm8l1CQY`Wm
z1eoPA)9EyB*>MDH+vfJ>1^~k_sMqT$BdX25%s4S-Sr&P-2XJSzxR12Y&axw5ot`3u
zpxJ6Alz$z^iPv08$?ffJia@;^3<jBr*=)5CLSUVq{#*o9wktFmjg)cq&UIY?`u#qm
z(THBJ_x=c|Hr(s=7>!0L(qlLzKNbN^9Y}-_sR;bH*NPp-!Llq2!${3s<wg($NGVg~
zp9%$h-+x~O_93OzEX$(ZZl}iD?RMt!ycPi+c7Hh_@9+6+7(8ybnf+Up+IT!B2m)N!
z#dY0y=EutLal7TSVIc4Cv28njBD%Y~qf)K1SS&I-;bEDnssI=chjCfvIdM`f;`=_8
zY8B7(;uBHaiZyLFXW#cJ9W<lE_BtF6GqXJpS#22hHlwUl%rU6ycnkS4d}urVC^_Wp
zhJW#3;pp%$!BK{7#;*7t9Olze2f{F<Y?|>Q@@I_Y>8#dk%BIO`?>MfI$br>z8UK!=
zDDeQ)YBgYYt2vZv{7`ql!uB~54s16YI-L%y<&xEUoiY-JA^%LL{QLboK&JdQpA&{*
zN;irkR_isZ<uY|Ki5*ZElagr?hGFK@J~BJw;o%`yHe0P+-7pLj914le=r#O~%c=IK
bujl^*jU-=L@hEqo00000NkvXXu0mjf#C**4

delta 249
zcmV<V00#fV2Z;iZ7=Hu<0001iRA<Kk000tDOjJcMFfcecI7352CnqOOO-)o(R9vI6
zc>n+avPnciR49>ckzEdiAPj_S@c<6-0Htx?NxXm>Phhh5zseSrje^q$nlI_lAEH{F
z*PFsXofwTSg(W-?GXRzpmWU8{0q`M(y+Z;X7}pd)$N&N3(sD2T3Xc=`Y0uh10o(cK
zRKQreSTl%s;0*AztEQe+_f0M!vy1a_fr#FK>Ch#YWI!%b0Zqxf$Gzk<{T%btgXQ6&
zUz7els@9v~UdC@0RIjjEa(#ySP|YcuW7qltZ6P+1f5Ab700000NkvXXu0mjf277AT

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
index bbff6b658403c39270cdfb3c43bbc20a2e67602e..be5832d69d35ac0c3660ec69bd4e9d2cf3f15dcf 100644
GIT binary patch
delta 1006
zcmV<K0}=d!0{91z7=H)`0001UdV2H#00X~CL_t(|oW)l`Z`w={eYV_MX|TaUjyRz1
z!F)bAND&AAK!kGQ&TsUcqs3o9kq8Gq=itT%D;5HbY2-ArdkDK=yoR*2>XWQ7tY_Zr
z?9A-0(Cv0J{6k3eg%EP`W6$$I2stS~0?+ey4iG}%`##oD1b;<UOO*&An9XJ|O|w+`
zzJHXMa!`lG{egD7jdc`36h-bceRzPTX{GYfbxU<cQOt2ruq9Ab6_d#X)mjZzRYkO3
z=R6k#0somMUXug>@a5v7AZxW6=JPqSte94+q5uFUlSwYh(*8%)TJ1d=aST;aaA+pk
zl7A%x8Am2bf`3Y-QXm($HYrD%rhEqgKos9sB?IvG_Es?VJCG!a+1@7yu*-o%2!Dk7
zw5?JHJ_5&a&QU+l0mpIB@AuDkqL2ds&}cNU*(MFe{rx?{Fl4_6g8`GaZL|M%UB}JM
z4cBH61bhc*2YYl~d?lnn4gg^o;_mJaVHm>qeT+t<9DivThC-*)$;RU`ccz;-M!jCg
zH_wC7YOziz0=o{UR;zeT5?pdhi8`U{I-1QUWLbt~S+Fb%vMi(1>14XDbM*k=vQoio
zl0dCiF`La;%VrTUO%v0H2LOO9%V;zj1tYZ0ZfBeu({&wXvj>1j*JXXgy1r%+5W3xN
zMkAnU8h^fAT;Q@&!6uIJW7`KD$H8DQz-TmrEX$=NNs{39_7=8nqu1-P|366*v-$ny
z1&hT3rfKf>0vdtv`5B();n8)OGR<}h!!TeN2KSwUR~?V83(xZqK0h;Z;2;O|t1A#f
zV6<AS4flFI42Q$gS@SR)4s#Iz0Hf6cAq4u>RevrA1bQGLgcNe%$6hOT90$6tpIm}4
z3=8C+Bnd$faC6{f1ojbzp`hzJEX#VI)!q_VmW5`sS?XL_1PVFuS(dShV{ZSZr8XXq
zkt7MG(<!FYDVzDRGTg*5KFe|;2iS?|>FEhIO~ZUX=XS!wGNYXk0BqZ4Wm)FLWu<~3
z2!Bx1H2A*HPDHE~3&L*BK@dPWXhw(a)wXT)`+aW0@xW`tz}{xWJH;FWt&We7AH!MO
z@wwzc$!^F7rK7`t1V<TS&aU`7ILxP`4y0*{s;aU><gXYj(}~t=sEUHs-f^5FmjkQi
zlD%hHmU{r8Uate#-D(ac9p~xtIC2ie>t{9E?KW1+C00>XFp{Pz{-4e8{pAG!xbmCl
zAx+bQZkA<OMG;oZW#MAN9H18yMOBfeDfh9iud!GxN~O_imFlKxn&Y6zZAPc?H!i2b
czrLRT1e36DL7;>uEdT%j07*qoM6N<$f~?Qn#sB~S

delta 242
zcmV<O01f~62Z92S7=Hu<0001iRA<Kk000tDOjJcMFfcecI7352CnqOOO-)o(R9vI6
zc>n+at4TybR49>ck?ReGAPj{oIDm&Z05lFj;sQXNz{LGmxdr9MP|x{6^Cc~P5RIA~
zzZ4dlywGT?B`^ya1Hkxd3A`sW1;B-Bd6x<tu;ywYG=P9L&1-4SaJYfnj;0biDEFUR
z2W#&lHxS>z3NYKjTzh6dihqFLZQRcXM9cz2C#ROu0NF?#sFd#-?-W(^vj$%x{?`~<
sSHpdbuNE|}P%U{p!+0olN_Ff}KWq;+kt06!Pyhe`07*qoM6N<$f+Ip+rvLx|

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
index f6b33bcb1896a6421fb770b714c9f611c4ea85ea..8141637bd69025bf356c13441bf9d5b704d9f3b7 100644
GIT binary patch
delta 1118
zcmV-k1fl!k1Lz2l8Gi-<0063Kaozv`1TRTMK~#90?OWSUB0&%>$RfDFFvKkJMTuFL
z#Kl+RPx!h1gyB{8!MHJq4+cU|F3X^aY)&slniddK&CmmTl1||;0##GfbvZRLS~Jeh
z&PI}7P^nZzI(%8T0T{(%@xya!wVFClmr^)k04VeD@Ic*8hkvr3xA451n;R;XN)uVB
zR7Bq$7yY+IK>5?tQzhf^_{{aITBUqGKP9Db#sIkT*VosS^L@&B9>rp@sRaZ4D3$2z
z?yfqYr4-KW0RWT-y1gEG+3eJN=}d<Dy`GZEWO5><aK-}|xYCSZIGijRZ-T&Z{5MO{
z_lZ9tB<v&-6n~4y-$^MVV}Mm5G6qPEH$78I;nXI`*x%n*uMp~p>?u17&ZNRfa(>_5
z(qXYkFT)|-*X!@jJvus~ySuxoW7TRk`l&Eyc(~$F9wF}J<V0<Bq<O&A)fJ^uDe|;z
zu_{c4oG<{w8`4_N>=54(;%4pgP(Gbbt7QXDdBC?qL4Rd<@BkWzJ~BK2fb#u*-^zDK
z&I4>iya`@hT#Rr<8jXfp=jZ2>_kzJd$(PqxC6UVh84Rf1ZYzbMxU`;^LhJ#iJF=Ua
zfID;Q`m<cNQp?+b*Z{cdK&R7Dav2ZcTHXaCSTg{P<MccaI6OF@on%rey-^;3D-NY~
z$uK?O@qh7={Cr+@e{8k1q*zH5FtfE(GO22O7xBLulzsraxhbOp@hyP+8zBx78y#fI
zLaQn)hz)?yhWHMNT^<|VXf(}rnEkztGC=$3N#*d6i_XdWK0S|f1(y)|CiuL-Q0su$
z04Q9VjmEzMCJ5$|8o2sUp2?4mF#rl1WOk6>kAIKp?d@&uV)A1V{S`LEdjRM3ESDiU
zN$c@P-T<tKDWig|&jiIDVDj}_cMF(&Ju1CL;28i{szLEBp!4<U>(2{=So#crD-e5t
z&e!|CPpww#T`EjkI=pdVQ0MDW4}jL{&#3*mAAlJE<OHt3N)+H`C(~IvuODa}emsOW
z_kU+0{zW=pPa2sK6>NPTAU43Nc>A!hlBOuy<79M&u}Pv?;u^%XRJmN9#JpMjJ%f3H
z`&vy^jhqBUo*F9@3QB?*g7P0RLtZYoS<Da&z}#RE1lz|ALV2Aa-8yd2MASUMi6JR{
zM(Cpn5!`b6ZFhNj8T}!t&rXQ&ZD#|Kn|~4FIfRX!5yD73HcK2cJ%IBJL>pUh#slj0
zx|$t8KLI5*Hp*EZV9p~*;moKk9*STfWzJ?Y)Y3|6POojlnQCxW7by%xrW{_?9D<Y6
z;tYMxK%YP0c?28H7pD!->2@ct(No;p+nbt4*vLm_6p5P2C^i}U0xukIHk;}=@>d0x
zQaELRb<7SpV}M?_t4I?VVcsOkQ@c%xL_*CYu$02N2PYxt%@^<-f-a?SCKX=x;c0Uo
kK?-N0z_Q9%okJj^zuW-DBb&$^4*&oF07*qoM6N<$g7GUA2mk;8

delta 466
zcmaFC@sN3fWIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G}f0G|+7
z0|NsK3kzpwXLWUTUteD%BO{>9flrG5K#IL2$S?Rm7%)hAGrIwWI14-?iy0XB4uLSE
zsD@Vq&=Mz47srqY_p8&p`I;4Y>Rl_({{R1E>lZJP<d$gRM<=JL-mMCA>1uh~c%iZ2
zail=9RZ~H-!-Nm_BjaYSP-qp=R_yFrq2S4z=JDwyXM%?7Jr46@ENL35EMW>y#hD)-
z+pyrm<%}lV`GP5?6)Z;ojmn<r3%(FI6m;;3zz6Ho6LVVfcZz2`tXz4(mSwxcyZHM1
z0wtW5S{hqh4VWZ%FZ%1xY7bPwwIuiIr>hQ}Ybs|o3VO_%x}METVRn0|p`iiO-F+qE
ztCx6$6sQO>{rTP(UGQ_?^GuG<P4AS1MCUA@C@?2~Nu^`Cws6zuBqf&TPi^!MuzccW
zWh(csUbu4Ieer#}&A)Xpn*kl#@Sym-hpo4MEc5-v>-4m@ANac?etk30vjG9OyC0tj
z{w&+BclvpM?TPEW?Uoh0`u9csVr-E<-^AB)aNA!-&f|WuI_X?_z))uJboFyt=akR{
E0L$CGF#rGn

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
index a7800d9dcc3075ae1afa8be8f379d8627587d222..6f2bcb665a352d0023c9ef17c2fc5fb6c7cb60d9 100644
GIT binary patch
delta 983
zcmV;|11S891L6me8Gi-<0063Kaozv`1F1<wK~#90?ORQ6+CUH;Pza<@J`P2wAw;Mt
z66K!!34Sg&egSZ%2QCOms)!1OQa+O?RBz=)8$*iGtnnInlJy`s_U`lS%<j%OKuj!`
zOV$N$Z*N%_XfztEKAds>SqHAKuN_~d)9HxwRp!ET0q*bb9e<yTPPbYuDijJUZZsOK
z`+F`xFc@@v?$2hEzNFLdm<!JZ_y~c(`=O2R-wOqLUM$4-PZt+j?&G-tiFn-6dC^#m
zCgZW-a5%hTE}Yw+OL%#Gb###B1c8NR1(G@NTmYvy4}~ZY46ZR3z7fDJ_(p(;<@D^#
zg^^JpnM?|XnST@M>+B{NCqOhB72dwv>#hBk&*!ODtBKE&xiC%u#Ce3cVzIbp0qArj
z5}~*fI-AVNkZ}Sa)FHkj#BK8O=sc_hhYlDg0OtF!0NUUKq}hvMGMQ+(pYJR{H`x0D
z<#Kt6C(`ft#c_9cxB6{9n+bk?c@YffCTDdL)oPX127mjSVOOv%z;2Eod1sh2p6b`j
zOYSYTf-L}^IxrfI1n+7AUPGGzWQ)^w<gTvhJRCke0r14pX_Y1H7BCzRxwq2}SE4|-
z+x50rJK(e$<X%9Uxt;w2_7K4MMu-E$(Sbu}#%?vPf!$JsHpF)@y!_+i<65$Wn>=w7
zYytj^Mt_t{r3CvCTAX0WTC^Oc0O<VheqZoxI@QyvJ%TO3)6*0ED3t_%ySbsax3`@R
zufg^K$j@O3D|we>rwL#SAd?k#J{kcMiNw}(FfaH!9*fU%cx1C#Bg8sQg$-zfr#K0~
zy#U7duZIW0y0)tK3AO-gz8*;pnbtZQ0Z7TyZ+}W>nGUu9YQCP7WX915;CHYEa4T=W
zFSxRGlgs4<tGmK*lGrRU4eZodsZ?5R_aHCOZnrm!V&w(8osL*F%4u-DUiWuuES*jZ
zMrH_|-<BDQClaeFPZQPxS_F`}!TEf?H8%)g|G<=0BY#tLGI^IE-DUyP+3c_^zz)Az
zfPWG13&<+)R4OHEfd5w^f+434yGo_v@An1B+D*cckk#MYDn#V4(*Yv{kQRUv_-z&-
z>ktmAMo6^)l*GeX;%{~fkn;>g8(lEQ0(!lk$S@5C1IlDF!clIr0DC<G7sg~U)fpY8
z%%5X18Y<N!a(b;B#;gXtN}&2?IqX&)!cb{Hz<@S5f}Bp<nG0W80G8CG%nx*IzxhT0
zl-OZEL9IwRs+Xq7n*E{B66Lm%xi~pN1KQvzj#~gC`Ui&C7pPadj$!}+002ovPDHLk
FV1lw`%>4iW

delta 379
zcmaFF-pxEgvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04
zk&%&sfq|2gle4q4y1KfBg@v!LFHrL2()T_<ilZdRFZe$MFx+e28wnKSEbxddW?<ku
z48n}Z^H-z*1z&i&IEF;Hznylmp6jpzk8AJ6FaQ5nOpDE%tF&v^!xvQw`r98TD9zZp
zwwakpVDh>H%&Z+J4{$blSa2D><Vq3=wd69C6mYq^MqsjFV`NyzNe}L{B9Wv^q7jTh
z;=wnLq$2Khng`x<JW|{KU>4IJX_mstQ4?(A)eM#Lg1F=4FMenJDLn60i$b(gN!7B}
znqJR>tKTR6Vqvhps+<=zpCMuOeEWlS%ol%7Z7N|FN@GcTDK(vIS@e&Ik{MsuuUT^W
zP|(2=?s}W%NlzNyawZuma8w(6vtHJ{V_Z-dWpMKlJB#>?#@pB5Y-hRsjp57wgsm2j
Su4n>%&EV<k=d#Wzp$P!Y$Cb7K

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
index f6b33bcb1896a6421fb770b714c9f611c4ea85ea..8141637bd69025bf356c13441bf9d5b704d9f3b7 100644
GIT binary patch
delta 1118
zcmV-k1fl!k1Lz2l8Gi-<0063Kaozv`1TRTMK~#90?OWSUB0&%>$RfDFFvKkJMTuFL
z#Kl+RPx!h1gyB{8!MHJq4+cU|F3X^aY)&slniddK&CmmTl1||;0##GfbvZRLS~Jeh
z&PI}7P^nZzI(%8T0T{(%@xya!wVFClmr^)k04VeD@Ic*8hkvr3xA451n;R;XN)uVB
zR7Bq$7yY+IK>5?tQzhf^_{{aITBUqGKP9Db#sIkT*VosS^L@&B9>rp@sRaZ4D3$2z
z?yfqYr4-KW0RWT-y1gEG+3eJN=}d<Dy`GZEWO5><aK-}|xYCSZIGijRZ-T&Z{5MO{
z_lZ9tB<v&-6n~4y-$^MVV}Mm5G6qPEH$78I;nXI`*x%n*uMp~p>?u17&ZNRfa(>_5
z(qXYkFT)|-*X!@jJvus~ySuxoW7TRk`l&Eyc(~$F9wF}J<V0<Bq<O&A)fJ^uDe|;z
zu_{c4oG<{w8`4_N>=54(;%4pgP(Gbbt7QXDdBC?qL4Rd<@BkWzJ~BK2fb#u*-^zDK
z&I4>iya`@hT#Rr<8jXfp=jZ2>_kzJd$(PqxC6UVh84Rf1ZYzbMxU`;^LhJ#iJF=Ua
zfID;Q`m<cNQp?+b*Z{cdK&R7Dav2ZcTHXaCSTg{P<MccaI6OF@on%rey-^;3D-NY~
z$uK?O@qh7={Cr+@e{8k1q*zH5FtfE(GO22O7xBLulzsraxhbOp@hyP+8zBx78y#fI
zLaQn)hz)?yhWHMNT^<|VXf(}rnEkztGC=$3N#*d6i_XdWK0S|f1(y)|CiuL-Q0su$
z04Q9VjmEzMCJ5$|8o2sUp2?4mF#rl1WOk6>kAIKp?d@&uV)A1V{S`LEdjRM3ESDiU
zN$c@P-T<tKDWig|&jiIDVDj}_cMF(&Ju1CL;28i{szLEBp!4<U>(2{=So#crD-e5t
z&e!|CPpww#T`EjkI=pdVQ0MDW4}jL{&#3*mAAlJE<OHt3N)+H`C(~IvuODa}emsOW
z_kU+0{zW=pPa2sK6>NPTAU43Nc>A!hlBOuy<79M&u}Pv?;u^%XRJmN9#JpMjJ%f3H
z`&vy^jhqBUo*F9@3QB?*g7P0RLtZYoS<Da&z}#RE1lz|ALV2Aa-8yd2MASUMi6JR{
zM(Cpn5!`b6ZFhNj8T}!t&rXQ&ZD#|Kn|~4FIfRX!5yD73HcK2cJ%IBJL>pUh#slj0
zx|$t8KLI5*Hp*EZV9p~*;moKk9*STfWzJ?Y)Y3|6POojlnQCxW7by%xrW{_?9D<Y6
z;tYMxK%YP0c?28H7pD!->2@ct(No;p+nbt4*vLm_6p5P2C^i}U0xukIHk;}=@>d0x
zQaELRb<7SpV}M?_t4I?VVcsOkQ@c%xL_*CYu$02N2PYxt%@^<-f-a?SCKX=x;c0Uo
kK?-N0z_Q9%okJj^zuW-DBb&$^4*&oF07*qoM6N<$g7GUA2mk;8

delta 466
zcmaFC@sN3fWIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G}f0G|+7
z0|NsK3kzpwXLWUTUteD%BO{>9flrG5K#IL2$S?Rm7%)hAGrIwWI14-?iy0XB4uLSE
zsD@Vq&=Mz47srqY_p8&p`I;4Y>Rl_({{R1E>lZJP<d$gRM<=JL-mMCA>1uh~c%iZ2
zail=9RZ~H-!-Nm_BjaYSP-qp=R_yFrq2S4z=JDwyXM%?7Jr46@ENL35EMW>y#hD)-
z+pyrm<%}lV`GP5?6)Z;ojmn<r3%(FI6m;;3zz6Ho6LVVfcZz2`tXz4(mSwxcyZHM1
z0wtW5S{hqh4VWZ%FZ%1xY7bPwwIuiIr>hQ}Ybs|o3VO_%x}METVRn0|p`iiO-F+qE
ztCx6$6sQO>{rTP(UGQ_?^GuG<P4AS1MCUA@C@?2~Nu^`Cws6zuBqf&TPi^!MuzccW
zWh(csUbu4Ieer#}&A)Xpn*kl#@Sym-hpo4MEc5-v>-4m@ANac?etk30vjG9OyC0tj
z{w&+BclvpM?TPEW?Uoh0`u9csVr-E<-^AB)aNA!-&f|WuI_X?_z))uJboFyt=akR{
E0L$CGF#rGn

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
index a7800d9dcc3075ae1afa8be8f379d8627587d222..6f2bcb665a352d0023c9ef17c2fc5fb6c7cb60d9 100644
GIT binary patch
delta 983
zcmV;|11S891L6me8Gi-<0063Kaozv`1F1<wK~#90?ORQ6+CUH;Pza<@J`P2wAw;Mt
z66K!!34Sg&egSZ%2QCOms)!1OQa+O?RBz=)8$*iGtnnInlJy`s_U`lS%<j%OKuj!`
zOV$N$Z*N%_XfztEKAds>SqHAKuN_~d)9HxwRp!ET0q*bb9e<yTPPbYuDijJUZZsOK
z`+F`xFc@@v?$2hEzNFLdm<!JZ_y~c(`=O2R-wOqLUM$4-PZt+j?&G-tiFn-6dC^#m
zCgZW-a5%hTE}Yw+OL%#Gb###B1c8NR1(G@NTmYvy4}~ZY46ZR3z7fDJ_(p(;<@D^#
zg^^JpnM?|XnST@M>+B{NCqOhB72dwv>#hBk&*!ODtBKE&xiC%u#Ce3cVzIbp0qArj
z5}~*fI-AVNkZ}Sa)FHkj#BK8O=sc_hhYlDg0OtF!0NUUKq}hvMGMQ+(pYJR{H`x0D
z<#Kt6C(`ft#c_9cxB6{9n+bk?c@YffCTDdL)oPX127mjSVOOv%z;2Eod1sh2p6b`j
zOYSYTf-L}^IxrfI1n+7AUPGGzWQ)^w<gTvhJRCke0r14pX_Y1H7BCzRxwq2}SE4|-
z+x50rJK(e$<X%9Uxt;w2_7K4MMu-E$(Sbu}#%?vPf!$JsHpF)@y!_+i<65$Wn>=w7
zYytj^Mt_t{r3CvCTAX0WTC^Oc0O<VheqZoxI@QyvJ%TO3)6*0ED3t_%ySbsax3`@R
zufg^K$j@O3D|we>rwL#SAd?k#J{kcMiNw}(FfaH!9*fU%cx1C#Bg8sQg$-zfr#K0~
zy#U7duZIW0y0)tK3AO-gz8*;pnbtZQ0Z7TyZ+}W>nGUu9YQCP7WX915;CHYEa4T=W
zFSxRGlgs4<tGmK*lGrRU4eZodsZ?5R_aHCOZnrm!V&w(8osL*F%4u-DUiWuuES*jZ
zMrH_|-<BDQClaeFPZQPxS_F`}!TEf?H8%)g|G<=0BY#tLGI^IE-DUyP+3c_^zz)Az
zfPWG13&<+)R4OHEfd5w^f+434yGo_v@An1B+D*cckk#MYDn#V4(*Yv{kQRUv_-z&-
z>ktmAMo6^)l*GeX;%{~fkn;>g8(lEQ0(!lk$S@5C1IlDF!clIr0DC<G7sg~U)fpY8
z%%5X18Y<N!a(b;B#;gXtN}&2?IqX&)!cb{Hz<@S5f}Bp<nG0W80G8CG%nx*IzxhT0
zl-OZEL9IwRs+Xq7n*E{B66Lm%xi~pN1KQvzj#~gC`Ui&C7pPadj$!}+002ovPDHLk
FV1lw`%>4iW

delta 379
zcmaFF-pxEgvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04
zk&%&sfq|2gle4q4y1KfBg@v!LFHrL2()T_<ilZdRFZe$MFx+e28wnKSEbxddW?<ku
z48n}Z^H-z*1z&i&IEF;Hznylmp6jpzk8AJ6FaQ5nOpDE%tF&v^!xvQw`r98TD9zZp
zwwakpVDh>H%&Z+J4{$blSa2D><Vq3=wd69C6mYq^MqsjFV`NyzNe}L{B9Wv^q7jTh
z;=wnLq$2Khng`x<JW|{KU>4IJX_mstQ4?(A)eM#Lg1F=4FMenJDLn60i$b(gN!7B}
znqJR>tKTR6Vqvhps+<=zpCMuOeEWlS%ol%7Z7N|FN@GcTDK(vIS@e&Ik{MsuuUT^W
zP|(2=?s}W%NlzNyawZuma8w(6vtHJ{V_Z-dWpMKlJB#>?#@pB5Y-hRsjp57wgsm2j
Su4n>%&EV<k=d#Wzp$P!Y$Cb7K

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
index 9e8e9dd40ad31ec3840a47e52400f19a1171c665..3fe7b22905750d1d114672b453d087f53cd4a22c 100644
GIT binary patch
delta 980
zcmV;_11tQA1K$Ub8Gi-<0063Kaozv`1ExttK~#90?ORPxB0&%>h{)#>2w7rQg?KSx
zxx+8u#?SSpe*o_6!MHJ^ZVbc#E(nN$&Fj#UVVsrOt;Xpd=OvSu;Cyt|yy>p4DkH?i
zYPDkBpjNA`%H=ZM-Q7_%8WjidC6l4W>+9C*FD@=vHbglW2Y&&f12h<euQ191>2#W6
zdwcZj{@!9PjB!9Nm!p^YoYI*L#p7{{xiCrrH#awe=kxgnb6|`E_G2-MM5Aw*i*ORu
zU<{s+NG8Q;PUd1yM`I5T4g^EyMCy!ngBGDM7~$~Gt1Bv%%VM_g-rl}B_vGY+uCK2*
ze(Q8PEE}{?0Dp|Xyu74*K5s2`l}hD}0$QyWB@zkBX0z6{olb}KY%Lss<?ZzJlzyy@
z!TOFR&TW>5@d$`;sDM@q_*yJdDwz}tAeT7+3ZQjFIGIe8Jli-0s0MoyY&M%Kypdk7
zCysi(ZvAaGoeF+gECf%+V|t!WX)qWFgJF2P-DZs;5`W>Dz*c}$j#8#hK+ZCB{a&qF
zVXfa_I{<GTczSvg>_q|i-lYNp;{aN((|=Py>G+uT<8fhhpcH^N4x{ZX;Z(rG!vp2=
zd6ECa%pV8^xS`waZv2Ym#qaTW7ms2i+zoPXAZ6}kQxGbEdjmPaIoT8_QGkruvDBFc
zwgV8{Ab-LGW1Sxkheo-8y$qs$_wDddu$Nk%ZU`qq4aVRrKD`6jbHHdc`mgH(vl)_`
z8atZ=wgcqeUNUxipUMG9Wh0k|geLO($y7?s$UX>c2c*^+TQEx4kB^V8#S(4-Wmn+m
z1a0+tM1v@6O*Gy6yFp1pL?$~?&O$}Uq==9m2Y=Y>^<>)^nSxIr2(cZotGfM1VJAt^
zQmG`^nHAP?tIRHqRjXBNeRHedOUSx_v#5D~er|SYtXM1xMr8=bZ>tRH1|<%VZ*?}C
zZLJL=d7=~84uJ9Y0_ipd=oTX=p9D=)fbUIGjYebR1}LMw*CB#W&i>h*ot>HABxMJ3
z3V+)=MC50u0@^tM36=L0Ao~yk)gxqwh!w_Tp#-M_WSoK3MisPk0NyO}3TUEmQ-HG{
zfeS5LW!*w%8D6VKxEs`944$y7J_O%C0j&F8fM^mMDlp~-$z1sEfYEwcbAx@ShaRIs
zp|DYn4*b8&Aj*`-a=D~_zb_ny6ue|E!c9p~gE4r<a4?`)EJpoa&tfiocL1dA^+0fh
zMr%8B;rk?bbadqTT-jD{XD)nqz`q(H&sS1jC!#+hqY+g!T?Q5a0000<MNUMnLSTYx
C!N&Cf

delta 377
zcmcc5-pM>cvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04
zk&%&;laqyog|Dx#v$M0hy1IdZ0Z@|nAH!cD#ZeOE7yKUr816OijRcBu7I;J!GcfQS
z24TkI`72U@g3ml%977`9-%h(&&vjUV$JI3J*Z=xGQ{r+~u>_uOIm=vm@|N=?$DneP
zf_oDMlpL%+^ExIe%@Zu>QPdIj*}kEQO=dakWZgXqH;iB8F`kcof8w^s>>Ev+KWqsx
zxO-?GBg?*DdzV~16m+nJ`*nK3ypWx1JZA6FPk6v^NiB_4P9Zlae1gz@!yv}fd}oRr
zTef)WDs*Z6Vm11^Aj#o?%sUA|5ulRu3m7sd>;CX{<g}4oVjTTJp6Sh0o=Y>AIp{5k
zDzs6m(7CDD829<F@dU9e3m?`s7XP}k^wsLMng@En{t$Q9+Hv5jzLrHFf7RKfy8=aW
RLO?$=c)I$ztaD0e0sySJmQ?@%

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
index 3c0b42ddbf73d53c54c8da7192a85975e452677a..0bd4de7c1700d34d9a29a9e3239e7982cd2f4ea8 100644
GIT binary patch
delta 868
zcmV-q1DpKd0`LZq8Gi-<0063Kaozv`12;)TK~#90?OVZaA~6gNBPdi<ET<k?3gXCe
zhcDp9=W>G|-~%`#DBS}m7J&+-g4K%%3L&(x&fui*q>(G2ld<F2PW&bzh}dj4q#M*~
zwN0s15~I;bL{YT+{8ug~R-d2W{(q;_A?XmE@S9ix<vEe$Hh%zS{;Cb2yFJVJtfQZa
zY&I)W$)x!6_O_E$uzLW4oegFH%;)oBKAVZ`!-Ght(>qB8y9Yo~+hxOGFp!@vm&-j#
zK`=|;E|n6AC_0c-1Qi3~KrjZ#+}~Rz73@LK1_V5@b$cP)DQkmw20*Gqv>(2{9(-3W
zmqoYRm47Qqg@1Pj_*gDwimOyA2Oa>WGntIYX{oc<>ygIu&HzYt$nQvTwkQwf;U&0S
zz&itAa|90%mKdPiUM`dQ+{t*sd4Ow>&jXsx<_0q|9*^Z!uh)0qE#BXy{8+7|L~t{!
zymq@ydWJ-TrUKamOm{pMo#D=y)u-oY>X1%BHUMTFn14>EQl9Gp+;C<9VdQBO#g`Xx
zmrnmY17OCXv@R7)5133Q)Zv^XmMkzF4tcdY1Gn8E^#;n#O&JO<RtVt?&qt7-N(DGm
zn#%v(rb*x6BnGIO9jPufkPU$11{EG8^1P3!?kkX&016wFx9Vg!G_XXb^?L1%nb<;e
zp-|u&dVdeBg^+4=aN<@8at_YT4FK3;05>l{fyDsaoB$o<C(--$u8yiN3Hq6!)~`o3
zh_;ql4Wd9g#slDn6JJz)dRse7H^QkrfJ=gG0KH!?w2e_HxYYsF8^qPOzZ7CggT-P|
z$`DS4$*r+!wYuZVqA$?z_pQHEeF3wn8GLK(@qh7AN_2*x{CAxp-{8amYE~DE#r5?D
zp}gK8y}I6@iO@WN{e6K(qp^1bxu^JoA%Z2RFS}N&MbaTihKO2rE)X0?NbwMUEJsMz
z3bUE?1k(dloq=rQ3f>t2Gm9<t?`qZR0VW@T3NJgBwvt(u*RFBf4SMhlCm}8#0{ap;
z#$6k@RK>_{fMdJ?^To+icnJT4pkjdHAGkbz3&sG*45~&@e1xldX-aHs1f7rIVq?V~
u19YwcN5_cW1HcpD<O;AGfR!U4g!l);inkoDWrckJ0000<MNUMnLSTZ>Ig-i%

delta 336
zcmeys_JC=EWIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G~10G|+7
z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$
zlb$Y)ArbCxr$_TO8}P8aRrzjT{5GXNb!&*4R(H#kG&}J!mkO51TP%T^ZlMhpGq^&!
zC9bnRs(r?_=Dcnq#}vVuFY7t){o2pHs(Dj0Q2GM50DJU?Wem?*JA$_*R65@G7Fa%q
zW0lzL^8(ACFugZ!x|q&#EuHnB|8J{074aYXTLt<HbsRgj7qFV^H16rF<@Dd@@nyBA
z4bPN@e{<MDX80ZytYA8FQ0!0pg7;b))*a0&8{{fu9Qb0t+<4BE^kIp6eBBQ_+5gei
Zj62Ot8Y?^u`hnhJ@O1TaS?83{1OVXge(eAN

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
index 9e8e9dd40ad31ec3840a47e52400f19a1171c665..3fe7b22905750d1d114672b453d087f53cd4a22c 100644
GIT binary patch
delta 980
zcmV;_11tQA1K$Ub8Gi-<0063Kaozv`1ExttK~#90?ORPxB0&%>h{)#>2w7rQg?KSx
zxx+8u#?SSpe*o_6!MHJ^ZVbc#E(nN$&Fj#UVVsrOt;Xpd=OvSu;Cyt|yy>p4DkH?i
zYPDkBpjNA`%H=ZM-Q7_%8WjidC6l4W>+9C*FD@=vHbglW2Y&&f12h<euQ191>2#W6
zdwcZj{@!9PjB!9Nm!p^YoYI*L#p7{{xiCrrH#awe=kxgnb6|`E_G2-MM5Aw*i*ORu
zU<{s+NG8Q;PUd1yM`I5T4g^EyMCy!ngBGDM7~$~Gt1Bv%%VM_g-rl}B_vGY+uCK2*
ze(Q8PEE}{?0Dp|Xyu74*K5s2`l}hD}0$QyWB@zkBX0z6{olb}KY%Lss<?ZzJlzyy@
z!TOFR&TW>5@d$`;sDM@q_*yJdDwz}tAeT7+3ZQjFIGIe8Jli-0s0MoyY&M%Kypdk7
zCysi(ZvAaGoeF+gECf%+V|t!WX)qWFgJF2P-DZs;5`W>Dz*c}$j#8#hK+ZCB{a&qF
zVXfa_I{<GTczSvg>_q|i-lYNp;{aN((|=Py>G+uT<8fhhpcH^N4x{ZX;Z(rG!vp2=
zd6ECa%pV8^xS`waZv2Ym#qaTW7ms2i+zoPXAZ6}kQxGbEdjmPaIoT8_QGkruvDBFc
zwgV8{Ab-LGW1Sxkheo-8y$qs$_wDddu$Nk%ZU`qq4aVRrKD`6jbHHdc`mgH(vl)_`
z8atZ=wgcqeUNUxipUMG9Wh0k|geLO($y7?s$UX>c2c*^+TQEx4kB^V8#S(4-Wmn+m
z1a0+tM1v@6O*Gy6yFp1pL?$~?&O$}Uq==9m2Y=Y>^<>)^nSxIr2(cZotGfM1VJAt^
zQmG`^nHAP?tIRHqRjXBNeRHedOUSx_v#5D~er|SYtXM1xMr8=bZ>tRH1|<%VZ*?}C
zZLJL=d7=~84uJ9Y0_ipd=oTX=p9D=)fbUIGjYebR1}LMw*CB#W&i>h*ot>HABxMJ3
z3V+)=MC50u0@^tM36=L0Ao~yk)gxqwh!w_Tp#-M_WSoK3MisPk0NyO}3TUEmQ-HG{
zfeS5LW!*w%8D6VKxEs`944$y7J_O%C0j&F8fM^mMDlp~-$z1sEfYEwcbAx@ShaRIs
zp|DYn4*b8&Aj*`-a=D~_zb_ny6ue|E!c9p~gE4r<a4?`)EJpoa&tfiocL1dA^+0fh
zMr%8B;rk?bbadqTT-jD{XD)nqz`q(H&sS1jC!#+hqY+g!T?Q5a0000<MNUMnLSTYx
C!N&Cf

delta 377
zcmcc5-pM>cvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04
zk&%&;laqyog|Dx#v$M0hy1IdZ0Z@|nAH!cD#ZeOE7yKUr816OijRcBu7I;J!GcfQS
z24TkI`72U@g3ml%977`9-%h(&&vjUV$JI3J*Z=xGQ{r+~u>_uOIm=vm@|N=?$DneP
zf_oDMlpL%+^ExIe%@Zu>QPdIj*}kEQO=dakWZgXqH;iB8F`kcof8w^s>>Ev+KWqsx
zxO-?GBg?*DdzV~16m+nJ`*nK3ypWx1JZA6FPk6v^NiB_4P9Zlae1gz@!yv}fd}oRr
zTef)WDs*Z6Vm11^Aj#o?%sUA|5ulRu3m7sd>;CX{<g}4oVjTTJp6Sh0o=Y>AIp{5k
zDzs6m(7CDD829<F@dU9e3m?`s7XP}k^wsLMng@En{t$Q9+Hv5jzLrHFf7RKfy8=aW
RLO?$=c)I$ztaD0e0sySJmQ?@%

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png
index b4bc95f4f0d177ba63d815287f9152514b148456..c8bc3191d34ad17980c5364496982943817931d9 100644
GIT binary patch
delta 750
zcmV<K0ulYp0s94z8Gi-<0063Kaozv`0>Vi|K~#90?OVZa;xG^$5HwU&h!cmc3gXD-
z1NZ`Nd@eWm0X~2;f~tGqgb=8tRATk4I&w|6OEpe2CVo;hNQA`m{NfpBh6*upKA%|^
z7>!1(3(RISmJe0Vk8c5i00Cnt6kZX~Y&NN0tI?mAm(+6M4SxaccAMUkgqjZz6h%>L
zx$sH>tJO-`BuPG54!j}Yu3o1~wR&N>2#cVAF<gbl{k=NPwp`RCI*SF5K4eei&e<%8
zBLJc9u;0`A`T63ze!oxi`CNV0mJ4wN=ukHp3@#J^ryGq1wOXz8{KaCyx}P`#5b6-$
z5#q8|c{mT1;D2xdaRl^wJ*5E3SOc`|)njrvIJuv93UCef`+)Iye8!AyHXC&ehr{%{
z<Lj%kZ>N*8SlmwU@1K4@olaR}s8o0^uoYm-@n5Sm<cwMU_4vrWrBkp8z^nti-A>u>
zDxhdMBY><pZKM12M0Zhidjw#{;k0QrYz1t$Tkh?gBY&4DuwJi=_39f4yFu;+w9IYm
z3xWc;7tjlwZGC|g1?Zd|q0Tq32|#j#3=bA@USg>G3hXe5#0Kdtth6NO8iYkqz!(Ze
zAV9zv3Pm75z!(ZeAb@)TvtIA&RrODTO@LXiM^QtUwMs((8TI<Ca+Y+k2{7yRWNeH|
zLxAsK6Mv9b-TtSL%S+L2x2voVZ-v>Vu{e&?R#(&omdj=4dAcrO7d5>vjdeO5Wl<S|
z^Z%<1NrMvt^sF9_$MV$%;k;QOEnRKUhHnZG_kRJkr}&~n1dp8g*i9xAmJeQbi0H@8
z1-$DK(tQXw+asiMh5cSB!B&9IGZ1ZDK^y^?S!Zmif5&mA0_=VSE=0D<W~IzJy>^YT
z8x$~xtB_Y8LQsH!F<gbb`VhQQfbKtV`TETp0uUK=j-dMyO7*8H`p6N?egqdAtFQ<P
g7(<~bHvvTS7bgT}bYU@*QUCw|07*qoM6N<$g8cqjD*ylh

delta 187
zcmey(dWLa=WIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G}E0G|+7
zXJ=<1b62E@JCI^33Gxg6&+v4+ffta+S>O>_%)r2R7=#&*=dVZs3OahaIEF;Hzdd8f
z#o)lhbnwal`F1QDIa*#H&eJryIzQ`)r3oX0M#Joe`jelf7#f%u0vH&$9;g{?o@}Ge
fz`$C-@S<+&dmcuqW!?5b(-=Hm{an^LB{Ts5HSak)

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
index 1e2da3352b75d4ada2d78b93cfa36e15d6fefaf6..665f36c54ef14702a9b79f040faa3732bb015eb6 100644
GIT binary patch
delta 853
zcmV-b1FHPt0pJFZ7=H)`0001UdV2H#00SpUL_t(|oW+;TZ{j)>#ebxQ&`Ai1sv;I`
zqiXuHXxSqE|7G`d7QBus4=f_8DiD%a0#Z7Q)&}wcnR(OBk*t&4*uGaM*VlHf-|xTj
z7jY~fT-QC=SqOpax(B%mgb<qmT-RkXnXm{$T9#Eh$aP&tqkj>e=auqgGTG}``j7!@
z+aG$p9*ZzU)3n0&?fxFeaZ367!$av<P1AOKNT^@XvMh$fA#K~HZCQki#ZKh4T8)1^
zk5!TY@a5zr$F^<r{QS)8Yd)>4RttdPaJZxL@ph-SZNI4zMQVVAVVcBIgkhTKx?ad}
z6w&Q=iK8el{eQcyZQG=2s_a^}qo!?4%Op_^Hi?tGzi0W!c$^z2$7bg)4WJB-dYzi4
z?Pb~TS5P^Ck3!`Dn(xV0m8;^o$k^?60dO4Ww<f*1x&mPN@&dqWy~Z$2eBaOYt;tgC
zx-Q=z9=LQ}R!O1~Dm(Gx<Kte(W#2C^E@<dFKZM}x^?$WW=vu$uf0Y%^aU8y!oM4zH
zut_MXz}?*)&1Ms;pjw7u$a1-4Fc>J?wgLcg6!G873qcUzc^*QDT?M|~-vglQI!TgH
zD_Az2P6xv<FbqT4;y5ObW2Vz-sXC2%T`kv}+uQtJFdB_G>vRq(0ALsfaU843x8JKM
zAomR+#D7}=LI^z1tE9jo$RIydfqnQC1>!i)<-n&Y5Wa7v+fD&x|5XKYt3YnKLWrCK
zf1(cjI~wgMpz6SQJm%==2u;&eB`i{4Fc=)<G6j6!Crwk*H0AvKe3Jw4cHofkeV>+T
z^1QW`%JNzTSrwYPuFeBlD2<CwF`t3T3th@tm4B<Ea5t1_>biPft=C*$T(DZNY1He5
zEWdA$`(FWUA50ff#OdiNaTJjxNg+3M9pCqJzcYKj+#5iernD`K`PR`H-g4yW=?Q?d
zPKS9Ia@Oe(%w~$q5X@#cww;?3GC45cGs&Mq)`topS}f@Gddz3D!bkyTK|sA;=V>}s
ztWN8?;$*ojy_C$ukojzuyO^i|<i(_AS*loM+s*AQK@gPk*X!%jv1yv__>kBs#fR__
fm($wczMlUCaU6w_?t%9p00000NkvXXu0mjf@qezW

delta 209
zcmV;?051RF2H^pa7=Hu<0001iRA<Kk000kAOjJcMFfcecI7352CnqOOO-+Cm5o-Vd
z0F6mRK~yM_y^+BQ1tAPXHERKmSb+IhfF-Ede@&|{!jkOy&m0U7)Ffk!lnuX^*c+QB
zE!Xla$QvR6l$K|ak|E1L;N^Mx1p*M;GQb;v5v!}NA>aWak4ml12lVI9d_X*1v<=D|
zToX_p2aKM+K!H1;?kfuX>kZMm8t!9!wII1dwPYEC3`#|*!j`%L;+izORVftD00000
LNkvXXu0mjfy?s#@

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png
index 3849504b6ff74b96092fbd1ca668480707dba2e7..fe570c054fac195b1de49c70d9a0856eb79ebc8f 100644
GIT binary patch
delta 769
zcmV+c1OEJn1C9oe8Gi-<0063Kaozv`0@X=GK~#90?VDe2qc9N0KN|vgfe4=R$^p{X
zoFK=}33%Ne04WCu0umy^pMA)ZW>?!luxoo8eiBk!*_q+%I36<tfnqkBO~*4oj$^_z
z-{hGrk|>HM&5Prh%dQpzL{WtOevdrM;4hb>=lQ<RZJTm`f`1_LEW_J+jXcX>7{;he
z1lkDTFPHfF{*E9F;d>qkA%m9)v{(W?K^Ou6PGt$tbuskqSXC9bO|1j~07|bx*#W5Q
zdem4hd)%M!MTiOTVYC%M7PA1V9Z=0IfNBR+GYg>Ffu6rJJgy_+6KInNd7gLsnNo_&
z<svNIeFV3K?SFPV_|LK|3#ZcwUH37xEK30V=XqYFEP?a+499U`+xG36dj1!UlqFy-
z7AVUSUDu&)TQp6BAP8ib9z;q6$XLr$(PkG=#Vmko2UIf)pxOb|ND)9*S~~^qJis(f
zR8<AbvOXQtZ-Q;x@|qJ4w*X~X!nSQ3kH?4OJl92D6n{t$ho_1kUyZOO&~@FztH1fa
z_@N8JQsJg)2FLWp51k@F$P!qsR!`^lNs{oI7J`rn(B)>P@bY<pkO-J^w$~+UxCLO0
zAx%@{c|K}<-vbaukrpBdTLNS1`S(2lx*%*D9D3;Cxh?>Fzip5)hN`OI{=UI~L2#}4
z1J@paF@HIOEVu=z>l&2OhqZjuyqckuYIh!x^Gr~Nk%_!~9xw}_+5y$f0;qOCHM0OR
zjPzCEzW%>hEM%A+g_PoGb-92srd<*QXpp1y?+Y--Zhs?$z;T?xPEi2Z?RNkF`vOrE
zAx+cU?=m|?v=9IQvMhsXnxK?|5CX>7s0iRi+j?DK?iH5AEP!eUR5J^p+5y#QE5OUO
z%J#Hv3&Su#@bN71GrrwRQ|aM=APn(?F%$#+2Ed=`^Hj810!5zVZM{Z%I3O>I!G44L
zzGEJ=iGcgw0hx6JEd)rCL|OB+76Jh3s>Qzm*(C^1fyPf~00000NkvXXu0mjfg`Q$I

delta 375
zcmeBUYiFJyS<lSCz%X}v;~OBwSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@20z$e7j
zz`(%5!ou0v+1J+>C^ma`xE7FNEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$
z51uZLArbCxr@!TEHsEmm{q^5@8;$b%9uvdV4Jos}{Mj=xd1_bGv9?VO5jVNBa>b5x
zIbSHqW8An&e9NU(j2j;bhGaXe*}-zHA>t!v50EbspuVdiqL904N3T-Fb$Q0dh@A@=
zj&D7e8nV~=u;87@3(q+^ISkCBA`X-an=N6<Il*~ig2)AHO@#x}J_}51bRDEwcX975
z5H&cl{>NU1Zt+Xg1$K76c%X8{?TXRO-YIuaU2NC<Yq7ZTV<XeSnWv64vuZy{xH{Rc
zFs#pk_2v26TaipjM>S_WPHh6Z$L{O@pKmvRWpw;?eY$mm!<sj&+#Lrc^lMs8W`+n#
Ra|3<P;OXk;vd$@?2>{H{nil{7

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png
index 9ac2271692b8f0116025dbc2b68c5e44b53d8e06..4374ed1e1011027c4388033aad7d9985000188ba 100644
GIT binary patch
delta 400
zcmbQlG@p5bWIY=L1H-D!!g~x1jA@=Ojv*Cu-p=ywYB3ODSiH<!x1!m>Z=!HT&UYt2
z#VWSt;<;yZ(yZ+(CUO19%Jm4;nl<6rffj*HDK$MCC-!WgbTItEUh&?3!>(hG8Moy+
zKR?b~65D>RpFKnBqP7kj|Ap_iR`zlaEci<PiOt>1WWu29u(+NvgHejtf%`%RLsWy?
zA7#6~#TmBtzQVgCcKj7yfFj9!fyv~Ntz-7bTvx%Q-?jJGe>fn(ej;*<$N@oi56#$z
zjf#8^<_P!Be;&C?!AT||avHaZ#SzA~#2=q$wQqg)_^Xj+dhxvFo|=-+V?;mZ{g(%u
zUJtTcgfrmt{-lWvZxm<TzZl*iw%{Ve7KUE71*{oeYzzEb>yE#j&+um&(4*h)t$Cfb
zX6v%t{qH>g*Ub8E?>Euwy!f4eoELx^e5W#c)#<L{2@rz%=YhIc?&47C1y{-!++tV?
fQUW&9j#2)VRp77ATrFVGb250k`njxgN@xNAiNU3F

delta 257
zcmbQwJc((7WIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G~10G|+7
z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$
zYEKu(kO=p;R}HxiC<wR&_TKw{rt?G9%%s$fUYpNpw||((;xn6FH(^@x0`@bX{&UW2
zh|J^YX^8A&+&9mlo7t4vM*WN?dluUc^A^jktUGqLScV!NkoTDpe4Dw(Hqq~IdDF%?
yhu3@-4-On{e38B8%7Wc@1Nba9SOh2-Jm)@HWXgEBVtpIX9SokXelF{r5}E+)DqZaW

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid.rsi/solid2.png
index 3849504b6ff74b96092fbd1ca668480707dba2e7..fe570c054fac195b1de49c70d9a0856eb79ebc8f 100644
GIT binary patch
delta 769
zcmV+c1OEJn1C9oe8Gi-<0063Kaozv`0@X=GK~#90?VDe2qc9N0KN|vgfe4=R$^p{X
zoFK=}33%Ne04WCu0umy^pMA)ZW>?!luxoo8eiBk!*_q+%I36<tfnqkBO~*4oj$^_z
z-{hGrk|>HM&5Prh%dQpzL{WtOevdrM;4hb>=lQ<RZJTm`f`1_LEW_J+jXcX>7{;he
z1lkDTFPHfF{*E9F;d>qkA%m9)v{(W?K^Ou6PGt$tbuskqSXC9bO|1j~07|bx*#W5Q
zdem4hd)%M!MTiOTVYC%M7PA1V9Z=0IfNBR+GYg>Ffu6rJJgy_+6KInNd7gLsnNo_&
z<svNIeFV3K?SFPV_|LK|3#ZcwUH37xEK30V=XqYFEP?a+499U`+xG36dj1!UlqFy-
z7AVUSUDu&)TQp6BAP8ib9z;q6$XLr$(PkG=#Vmko2UIf)pxOb|ND)9*S~~^qJis(f
zR8<AbvOXQtZ-Q;x@|qJ4w*X~X!nSQ3kH?4OJl92D6n{t$ho_1kUyZOO&~@FztH1fa
z_@N8JQsJg)2FLWp51k@F$P!qsR!`^lNs{oI7J`rn(B)>P@bY<pkO-J^w$~+UxCLO0
zAx%@{c|K}<-vbaukrpBdTLNS1`S(2lx*%*D9D3;Cxh?>Fzip5)hN`OI{=UI~L2#}4
z1J@paF@HIOEVu=z>l&2OhqZjuyqckuYIh!x^Gr~Nk%_!~9xw}_+5y$f0;qOCHM0OR
zjPzCEzW%>hEM%A+g_PoGb-92srd<*QXpp1y?+Y--Zhs?$z;T?xPEi2Z?RNkF`vOrE
zAx+cU?=m|?v=9IQvMhsXnxK?|5CX>7s0iRi+j?DK?iH5AEP!eUR5J^p+5y#QE5OUO
z%J#Hv3&Su#@bN71GrrwRQ|aM=APn(?F%$#+2Ed=`^Hj810!5zVZM{Z%I3O>I!G44L
zzGEJ=iGcgw0hx6JEd)rCL|OB+76Jh3s>Qzm*(C^1fyPf~00000NkvXXu0mjfg`Q$I

delta 375
zcmeBUYiFJyS<lSCz%X}v;~OBwSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@20z$e7j
zz`(%5!ou0v+1J+>C^ma`xE7FNEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$
z51uZLArbCxr@!TEHsEmm{q^5@8;$b%9uvdV4Jos}{Mj=xd1_bGv9?VO5jVNBa>b5x
zIbSHqW8An&e9NU(j2j;bhGaXe*}-zHA>t!v50EbspuVdiqL904N3T-Fb$Q0dh@A@=
zj&D7e8nV~=u;87@3(q+^ISkCBA`X-an=N6<Il*~ig2)AHO@#x}J_}51bRDEwcX975
z5H&cl{>NU1Zt+Xg1$K76c%X8{?TXRO-YIuaU2NC<Yq7ZTV<XeSnWv64vuZy{xH{Rc
zFs#pk_2v26TaipjM>S_WPHh6Z$L{O@pKmvRWpw;?eY$mm!<sj&+#Lrc^lMs8W`+n#
Ra|3<P;OXk;vd$@?2>{H{nil{7

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png
index 9ac2271692b8f0116025dbc2b68c5e44b53d8e06..4374ed1e1011027c4388033aad7d9985000188ba 100644
GIT binary patch
delta 400
zcmbQlG@p5bWIY=L1H-D!!g~x1jA@=Ojv*Cu-p=ywYB3ODSiH<!x1!m>Z=!HT&UYt2
z#VWSt;<;yZ(yZ+(CUO19%Jm4;nl<6rffj*HDK$MCC-!WgbTItEUh&?3!>(hG8Moy+
zKR?b~65D>RpFKnBqP7kj|Ap_iR`zlaEci<PiOt>1WWu29u(+NvgHejtf%`%RLsWy?
zA7#6~#TmBtzQVgCcKj7yfFj9!fyv~Ntz-7bTvx%Q-?jJGe>fn(ej;*<$N@oi56#$z
zjf#8^<_P!Be;&C?!AT||avHaZ#SzA~#2=q$wQqg)_^Xj+dhxvFo|=-+V?;mZ{g(%u
zUJtTcgfrmt{-lWvZxm<TzZl*iw%{Ve7KUE71*{oeYzzEb>yE#j&+um&(4*h)t$Cfb
zX6v%t{qH>g*Ub8E?>Euwy!f4eoELx^e5W#c)#<L{2@rz%=YhIc?&47C1y{-!++tV?
fQUW&9j#2)VRp77ATrFVGb250k`njxgN@xNAiNU3F

delta 257
zcmbQwJc((7WIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G~10G|+7
z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$
zYEKu(kO=p;R}HxiC<wR&_TKw{rt?G9%%s$fUYpNpw||((;xn6FH(^@x0`@bX{&UW2
zh|J^YX^8A&+&9mlo7t4vM*WN?dluUc^A^jktUGqLScV!NkoTDpe4Dw(Hqq~IdDF%?
yhu3@-4-On{e38B8%7Wc@1Nba9SOh2-Jm)@HWXgEBVtpIX9SokXelF{r5}E+)DqZaW

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid.rsi/solid4.png
index a5a6dd285664fb8a9cf14cf963f055b368a6b75c..95e408947910600e79ff7adc7072d615c27f7b37 100644
GIT binary patch
delta 408
zcmbQiw48Z@WIY=L1H-D!!g~x1jCr0ejv*Cu-p=;UI&2`qFkibov4*YD|Do`Y8~4~t
zxEk{k3N~*n2wxW9WmoIA*ew6sDQPt&vCc~zXDs@D8}LjD5_&$z;<<~<lGj!@x4nJ$
zt8$+7*+1rIAN_A&UBH^5!=U?NZteZ<bF1|nGFR~~sM==hxRtTqE0HmSQHtAvTV_h#
zAK4J$hDE0sRLh;GGI}kt%lEll^8Ia9e)P{Bajq^Z&vh)*Ki>2133TFEdd|lF(<kc#
zOjBgsY+vOiS~rL-*vPPjp_f&|aLK;&|MYX%FEE*iK}CI6*EXg`)@{{0wnDa+>lMRc
zgB91>1-5W$U16*b@=C8rSivk49`#S_6@zbc-O}Z5vJ2k-HnuUi!YH@%WT>%zJ>Lef
z(GX8KB!e9MN8$g8zfI9M{<BVrV2Els#)M>D?=Ne|tq!NP9xz@jb$$Mr@x|%M6%BKY
tt>pP1><wSLKSpoW*9wMT>7V?sTyq!PdPL6pGB6GpJYD@<);T3K0RWGKt~USx

delta 264
zcmZ3^JcDV1WIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G~10G|+7
z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao>Fr%o3R|8P6
z(bL5-B*OjeRY$G{10I))SHAsAzjmO$e1g{tr|`^sMHl>C1EjgHz1i`FEp4R(YYb}<
z+m3am``_-GZ5h(YwS(&k&y5yKk$De}$^81y^6!QJnT0)#c8Pp@nfBNw@`Wm-C%C!K
zSjtq*@?#yxW*z35n=O%L93R?+(<0d_st@VN`x_kNJXvJQ7%IJ^8R!}YPgg&ebxsM4
FO#r~nUo8Lt

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png
index 3c0b42ddbf73d53c54c8da7192a85975e452677a..d4f50d419fb8f69add5073a70b824eeec4e1212c 100644
GIT binary patch
literal 448
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KnvaSW-L^LDm(UbBIS>v}`k
zB_-V3B3QLgY>MQWtuUGCor0Ih)=V$g-+n6hB;B08zdG?O+1k+{_WIOqxu!hLNj<Ax
zM@{;2&7^AnGWqrIf7|7pT)!>mkNB3{?q}CCb}dPixKI=0&?9*EIBU!^n`!;ayt8Jp
z0XaU}@4o!!{3o)Ykg<eOO58yl!MOQFSJ(6S<Bd5x>t28V6IN!=6vGhPaE$c=YX+R*
zbB*QY)cfu;Or?)s)Or;@gOlUopHusFx<j96P1tC8-dM0&{Ega-pdhc#uKi7RtS@>4
zPiAnjcrKkYo%dPgH_d`ZJ86Z+>gMwXe^i|rmri-Tc!Hg9LHEz<1Dp4X&f2>0JY!9J
zXM^eTy&7fzO<yp*U^3Bb&~tbUV>G`z>;30v)7^ds6o-SoQq%eE=|QcHN28SV5^Uz~
z`y=Lb;q}9WN&VbEYT_2G%1Kw%d+;s4_{cKOI^i>x+RuBQ0!{V3#J^F=Exq`bBrh;#
O7(8A5T-G@yGywqjI>0*s

delta 336
zcmX@W{D5hKWIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G~10G|+7
z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$
zlb$Y)ArbCxr$_TO8}P8aRrzjT{5GXNb!&*4R(H#kG&}J!mkO51TP%T^ZlMhpGq^&!
zC9bnRs(r?_=Dcnq#}vVuFY7t){o2pHs(Dj0Q2GM50DJU?Wem?*JA$_*R65@G7Fa%q
zW0lzL^8(ACFugZ!x|q&#EuHnB|8J{074aYXTLt<HbsRgj7qFV^H16rF<@Dd@@nyBA
z4bPN@e{<MDX80ZytYA8FQ0!0pg7;b))*a0&8{{fu9Qb0t+<4BE^kIp6eBBQ_+5gei
Zj62Ot8Y?^u`hnhJ@O1TaS?83{1OT1_e!2hv

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid.rsi/solid6.png
index a5a6dd285664fb8a9cf14cf963f055b368a6b75c..95e408947910600e79ff7adc7072d615c27f7b37 100644
GIT binary patch
delta 408
zcmbQiw48Z@WIY=L1H-D!!g~x1jCr0ejv*Cu-p=;UI&2`qFkibov4*YD|Do`Y8~4~t
zxEk{k3N~*n2wxW9WmoIA*ew6sDQPt&vCc~zXDs@D8}LjD5_&$z;<<~<lGj!@x4nJ$
zt8$+7*+1rIAN_A&UBH^5!=U?NZteZ<bF1|nGFR~~sM==hxRtTqE0HmSQHtAvTV_h#
zAK4J$hDE0sRLh;GGI}kt%lEll^8Ia9e)P{Bajq^Z&vh)*Ki>2133TFEdd|lF(<kc#
zOjBgsY+vOiS~rL-*vPPjp_f&|aLK;&|MYX%FEE*iK}CI6*EXg`)@{{0wnDa+>lMRc
zgB91>1-5W$U16*b@=C8rSivk49`#S_6@zbc-O}Z5vJ2k-HnuUi!YH@%WT>%zJ>Lef
z(GX8KB!e9MN8$g8zfI9M{<BVrV2Els#)M>D?=Ne|tq!NP9xz@jb$$Mr@x|%M6%BKY
tt>pP1><wSLKSpoW*9wMT>7V?sTyq!PdPL6pGB6GpJYD@<);T3K0RWGKt~USx

delta 264
zcmZ3^JcDV1WIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G~10G|+7
z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao>Fr%o3R|8P6
z(bL5-B*OjeRY$G{10I))SHAsAzjmO$e1g{tr|`^sMHl>C1EjgHz1i`FEp4R(YYb}<
z+m3am``_-GZ5h(YwS(&k&y5yKk$De}$^81y^6!QJnT0)#c8Pp@nfBNw@`Wm-C%C!K
zSjtq*@?#yxW*z35n=O%L93R?+(<0d_st@VN`x_kNJXvJQ7%IJ^8R!}YPgg&ebxsM4
FO#r~nUo8Lt

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png
index b4bc95f4f0d177ba63d815287f9152514b148456..a880e87e0e001365eb01e4fbc7bcacb119635fcf 100644
GIT binary patch
literal 261
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=XFOdTLn`LHopq46*+AgHy3qF1
zCvvXy6?$yz`pa*4t(K|s?4;sz-vsZUee`-)*!vInbpEk(DHJ$pHXLAF%D}`vg^5EZ
z07c+D@9g#GJ{xcTr?&CoN8td5MrJQY7CsGD0gDA94i6fFNE5hIXrJ)AUVd-<haa38
hIPC;F!XoV%J8v#qYy9nmhd_TZc)I$ztaD0e0ssciRo4Ij

delta 187
zcmZo=I>R_YvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|nfKQ04
zv$Hdhxhqn{9Y`^i1o;L3XL!2ZzzfLZEbxddW?<ku48n}Z^H-z*1sy$I977`9-<~n#
zVsPMLI{4)Od^?tn94)U8=V=;UouBo@(u9#gqhWSK{mIW#3=K>S0SpXW57Z1cPqtBK
eU|=m^cu_a?JrASQvTl2zX$+pOelF{r5}E+rfH=Yc

diff --git a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png
index 5976a6c5c8cddc3e0ce7cd57b773685b44112b56..fe95c81ed3254839a2b29b07e5556fdc599f2ab1 100644
GIT binary patch
delta 300
zcmV+{0n`4x0=xo{8Gi-<0047(dh`GQ010qNS#tmY3ljhU3ljkVnw%H_008buL_t(o
zg~ivs4TCTchT#tr(vd1G-~~`5_8)@OGz?&*(8YyQL`Xmk@z0%o3p}ql#EHTfgIv>f
zoe?>4DJ8N5EciH%=>s;n5NQMUcv+U|0&F;dGyz9A09<n6w|~0k4>-f$S_5EQ!Gb^g
z{t#yiSmTej#iW!K2Y`b5Q@nrdlTx@hjTI*kaM}5O$W{=7lLdt0BmpsabU-W~6+nRp
z2T<Wb0hG9R05$Fvz=1mlaN$k?ocP}W*OST;;B!)A#(E8XPip8~tLis^d*^HXHP71>
yq{e~OJCFm{S|xu2a^X@+h_jyt%CX_YFyI5HZw?UUZ<m4q0000<MNUMnLSTZ--+N8~

delta 279
zcmdnPw1;VeWF|8M1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hEfKQ04
zv9WPzXsEflxuvD0jg5_$r>BdHi-m<nWMrh7nHf-($2TCsz`$J+<QM!O4j8=r89z-_
zl&J6Zba4!^@Nd2BDb}FC<8tspOVxj7=?>-=zuCEe#l;%t)I3q2aD>@YnD<J$m`J=w
zz+9GRg$euC1s43?#@e_fM~>x{W%%*Ncl9!C?|(X8u;i$cXMXPd;4XXf?u0LP4EI=1
z+-9f}PWaz+;QoW%@#f_h?yQ&QK2`VT+ml6~ufATaoEpdU>etsD@00qP9{nz4v|KJL
T)$qsD3*=-^S3j3^P6<r_DxYwu

diff --git a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png
index 81e51b9ac639c8d0b590e01e1590d6cce83f0fa7..1eb30cb070cb074dc825e788e6e6302612e2cc59 100644
GIT binary patch
delta 281
zcmV+!0p|Xs0;vL!8Gi-<0047(dh`GQ010qNS#tmY3ljhU3ljkVnw%H_007%bL_t(o
zg~iv+4TCTYhT)H-S9&T7WC2u({fD3%WPorlhxA0%M1khVcD%sz3QJfSy!Yre%d&XY
z6F0`7OTd9!Yvlt1Tq)Ur7}r|M1*C8QG682e0Ni@v_i^M8xPQXm`woC{1qc3G*HfG=
z;1_?+GdAavH~<XPzvB3_Z_eQ{O-Y<QAZO?CkgcEwCkv>>Ndj8%=73hbDS!g64xqxT
z0x0p~0BXD_fCJAC;KH*4IPt#$xhIt+pyZ^sO!69*o>bBR?w!XItUwwM0(#)zfL=HN
fsH;bV#C!lqTN3j#Z6XfW00000NkvXXu0mjf9&&e`

delta 255
zcmZ3<w1jDbWGpiS1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04
zv9WPzXsEflxuvD0jg5_$r>BdH3sBPRm&{)v#ZeOE7yKUr816Oijhv_`QQzq4;uvD#
z-+Iwe=zszTi=)q!KmU(AZd6jr`DPUxvw*$7jzN@XMT~&Qe!&-enGCELZWS-syOrn6
zxj774q18-FPFM9GEVpOe=AQ7H@y2h?82g6zax!-tH@{bSA>FZyHPKw*9k<F~=GXi4
zglGKUrFr7rX*PyhhAY+$u?+8gZW)Uo_``Jgt+?yORTB>Yoyg$n>gTe~DWM4fZKYy6

diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png
index 84f71e4833af719f7573047e0912d80edf61c378..60d1c0421b3fecf74c453715810e8e5ffcf32774 100644
GIT binary patch
literal 15748
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
Kr*Cods{aE2tbMlt

delta 687
zcmV;g0#N;gd)Wn$BYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI
z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW
zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx
z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o+gecsz&)j)@6nB7H73mW37Ag7Y6d$N}B65M-ayn5=cUX
zj2g<Qz(SN(jeisqDcX;D_=g>Tl3X&m%3$PJKou$^#}EDozq>UHQ<H8|AO>{5*!IUL
z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT<rWBOtg9TwJ#`c@MbU0m4tZWJr$WrzsQ)
z!220}Qw|uq1^U+9-dg)OeE>4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t
z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GV2?-&#4KDxy0M<!FK~z}7#nwFv
z0x=MV;Rz_%g=G}0wekSDjpwlS0JfgPJ6XAvXjsw-D`+P!?rMJKCl`2L20jRY;&aYD
zjV6wWU^H>>y?nqYewZA0Mici<D|dk*8~|hj#&E2wmC?kP>pAZQ{^9p)f5#UPgNG2#
zMiXaQK?+X3f>fL|AO|N4$i+zlO7P-<QoJaD0?!Vh!m|P>@#Fw%JSl(!j}G9%qXIZ_
ztgGJv+_<%N{6{2#&lc0+3rOLY)9pJz68BBp{}D;!y%lKS?-gj_+s9^aG;u_P7i^Cp
V9h$cs<NyEw07*qoM6N<$0fKCFH4y*+

diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png
index 3655b4b9d1598142be19b4db57ba0aaeb3fed4ff..1ae08dba8877a734110a8725e09d327a12edf277 100644
GIT binary patch
literal 15665
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
UTMj#+^-^<db6e=C<+pzSf1@u^g8%>k

delta 661
zcmV;G0&4xSdcXycBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI
z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW
zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx
z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o+gecsz&)j)@6nB7H73mW37Ag7Y6d$N}B65M-ayn5=cUX
zj2g<Qz(SN(jeisqDcX;D_=g>Tl3X&m%3$PJKou$^#}EDozq>UHQ<H8|AO>{5*!IUL
z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT<rWBOtg9TwJ#`c@MbU0m4tZWJr$WrzsQ)
z!220}Qw|uq1^U+9-dg)OeE>4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t
z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GV3IPN_*4_XB0KG{>K~z}7#na0P
z0znXj;c75}Wdu)pGJuKCB#gtf+@lOKw*?P+6UAM39^GA?!1q(o0P$jsPhsLA1PBvP
zDftI{;^)ofBuqSwcfSSZZ~#65OL*812Vvs7<JNY8HGH}~>;g*goby$fXSm51)Zpr0
zP>ZVuwBTw1t++}+58fTni+2TR;LQPAcvFBTULBx~R|Qz$#Q|1$QGg}B8eon84e-Dh
v1HACr08jiUz#IPxVBqfn77hTy!~x(14wUkwK{{2*00000NkvXXu0mjfpVcXg

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png
index 41d24e9d2c47761eb99532452d5d92a59c25810a..b20d5ebd5efacbed1185a649c410e9eee61d80c5 100644
GIT binary patch
delta 1581
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

delta 405
zcmV;G0c!re46Xx^BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0YgbdK~z{r?U%ud!Y~kqtGH0;p-9-HK0_bFH}JkEuU>tCy?XWJ
z-8b-gy2m9*4~4=Cnt!%aZNxUQE%A^ahS+v8^JOArGD?!<5`Q=p0fb>l4^b4+IJELS
zr?DuC8vv3^De1$|5<(C}1%MYwz8A+`mSyls$+LgW<2Vk!<YL7+YXIBHVFw35$e&ZM
z5Mnl^<cPgKFDrm?`JI)*0gjkZzU!>}<Vv-L=@r<hmFp8a>%OWgHY)J_YzqhgVhAYw
z{GicR#qS@DoPQj@bpU+}9)#ow^op5)Hv({SwF3M%tjz?XwE`?`jg6Vg7+@%Q01w~+
zJb(u<2EZ|DW2R~Z;L}X?1?UZ|jZf1iwN`*3Ua_|1(EGJy%D+mE3I8FwNn23b)ROg{
z96~I_L~Ny6w_U4%vx|xItC{o5DLpw+5L^KS;%bH*st!1P00000NkvXXu0mjf?ijG!

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
index 888b3527fb..4a03341090 100644
--- a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png
index a4adc74bb5e0771858117099462f9ab51715dd47..fe379e2fef50ab07c64a4f9ff75b663ada0ee10f 100644
GIT binary patch
delta 2050
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

delta 739
zcmV<90v!F15c&m>BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0*^^VK~#8N?VB-612GiGPf;jzC~}IEodnko4zAM04<NWZxjO0x
z(9zY&UGM|A6juj_u7XpYiXPITP*BkPj~7WbXRmp-_wJG({C|1jY?1fBT#}bu7ovh`
zwOXIlbfVksvT_h%K&@6w+x2=qjnmNSbgE$hl24L^uI8r_Js^(bH2JIe_Hr;7;Bqhh
zV-9v7w$7>P#3DrzAo)h4fo3y#ev9&mizovWJ#9j~vC^b#Gew#KxT|9(OcH&~8F2;x
z(*$UJb2U?3M1LA!Qd?V&MlbJ~;v(7roxJJ|=n+=YN1YMh12pEyZ;DH4444(c0E*rc
z44~*O>|*F<{r-fSW2jXc7BNjsW&NjDjM(Xvh3m&32WPqf;#PB9!XrS@TY>=;y(Jhx
z(HV^DHkAdo0hsEtq^mi}unj<xS(2VSU>kr%PL@=?{(rsEsUC~D?D0(t+W@TaCP}gh
zYy<LOnxGJ60^0y{<o`<w(*!ZF3lW#YO%y`I;V>GFMuitc?0?>Fx2HA$$%9H5Q1tOO
zm$?jrk_nFhMQ6Mp1n;&Vty^Llphk!elf9$LY>BBwPA)0Z<gpfz#9RhJwGc9sXP@W&
zC;zb$w11x4o6^avo**iDz&5~kX0L_BB_|Kq2IzBoo3JM!9kv1L?tY)u|5O=FU>jhL
z^rp%J+kmnY44~*O!2pWhQfMIp%$KDvmab3r41yIT7E_o?F{NhBEc^YP>bxvn1i=7`
z-VzL;=q;r&K+OtPaS?5Rt|l9ncMr7aqt1x$0bJUIEO8NOfa=<~yXj66WPA5Oi;Fk|
z%;eST@7KEqKSf`2Mw$U*$<wu&BFX@ryrO50^nZzqh+@e5pU!&!<7sL-!RrB0^aag+
V9*_keI>!J2002ovPDHLkV1mglQS$%*

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png
index b0289b7d65a15e6f4a8c5b4862772304fac0d388..d75684f5d060b5e3ccb613eb3af2ddd2aaffc192 100644
GIT binary patch
delta 1079
zcmV-71jzf}1<MGKBYy-ENkl<Zc%1E9-HzKt6#mYPouo-ffo`@Sgesw`MQY!m5;xrU
zq7Ts*=yUJ_RiB}i5Vu^egv2!x0#va`l_+6pck9j1+Gh?Ij#Jxfd$%2%F-|^dHDez~
zGxO~?=bZRV2#)dO#&^$hx5U6~E)*11*&iO>e_%7dXY=7YaDVgq?Ii%&tVtvSLB)L-
zX!0xVhj!yTC!lvtBm9Q}y}qFo02qi-0F?hxwcU1n=LGD1H9B6tj8+_&2mn@pMPYy6
z^8sM_XM}6_hNCLGEu0f@ba1+VHsj^yhJsnmB0wMz=%a(vL6zNheCGu4T$CQEApi&<
zX&V8=b3v8ec7J^51Q21h>0k701LIpek^ehdLIADezoPzS?C*~j5RhI(QU4;l9a=zu
zTR3-u0A{KF6u<(&m315Bp1sKa&S--Irm1#@cyUR48M_tQK)}qhwL%*RaEh%bz&g1)
z`1<)bHlM%u{TGjH=U{`aSHO+{*AsA!ItUo2`qP5z<bRoTJfG(5&QJ#d>4YVpz|7Wd
zkh_=koujTTkpGXCwfVkt)I@;vvu*x<($Cx7qlPa-`Nda}P;~7UTOS3i6<`Ft^mWmT
z%H(Bc9WOEKhBW~km?dc_QbfEokO&YqLZk=^&{v2^la$%&ScDC%2_Q|s0e~1l^%VM_
zX+N<g1%Hf_pH}lS8-B2zfgP*~kTY{jkF*B>(HrK)3l@op0Fn7&NC4np)w;~)8ukPL
zXVDvGF|k9HP?CiaARtW~9<wR4*^X}uYXW}#`{$v8qJU4-P>-eH5kKG)n&=PHwxsX;
zouu^y?%cfld+t^)(~IN22>LuX;pFb%k5@k~K7R+m&tL!IJSS)(4=8<C#|zo0Kv=8`
zn{}WG0?KoJ6PLFEDcUMd&{QT^r~(nQUO1(kp<6Vy1=cFa=KZAO^FHK>v_%E~*%lB$
z$OBe04q=E$tIiUzz-9|%3z&Kk59fWLH2|FO>rQTg00k-_fP{r6clyKdm>GbK^~AXf
znt$2?YXxL|z_x_JloQO=@ONSGTo`nYCUWsHN=n!1Feuy(5j3HIq<)XI57?$KSn31v
zVQ|iY^R3XZ56DIVF>jq8DVVXI7&t}~1f<GfSp^8kXTJHABPg(ealQ?lOYrfHZ=c@U
z`!XOOs<-FAJex(I>X910Jwciw@mzGVJ%3-&j=I45{Quw+4<K;%OmJo!rHib!pdADN
z0IAp?P+pZ81*9TOJ#bEdg4+BZB+e2mu|NkEKp^s9#Ov>SK1_a2nJv&g1r#A$LObUK
zJEwrnEc94iCN=M*0?7YZ)8M+-?@jd}YdTj>@0J1#jDRH!UqyU$Fh9-wJ_ta;u`u`!
xDqxofV3!8~yF6f*2PD|#0oCZF0-WUm{{oTD)vp-+rab@v002ovPDHLkV1l+I0S*8F

delta 712
zcmV;(0yq832;T*eBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0(414K~#8N?V3Sr6G0e;XOk2>RF|@r6k~f*>qSVj#T4|g#aw!A
z1O5g<K@T2Uya-wq1TX#xq3uyGMORSJ8rO)Y7Edjq#JH54s();{<HWqV2p)Dm;X`H~
z7~b#OLr9*??Cfsh2xffWkEE1Ew3&&bsDx4rb^$>Uv{alLblC~Rkn|bY1=Re7Z50!P
zE<2kaU$`i>U>C49^Jdu*&T+JvS^9Ko1*I130yaupH&l!cy6h~rE<Ql1MGnb^<A}Wa
z8uSMd_8AaXcYp4y&|b&E`*YV(YQZkx%Tni|3T*)w*2k}*)Pj8pB;DQ-W#DDBVV?o7
zX18yu&^`&yH>U5Q)WYrpNH)@5N*Ywy1#n{pAdSU%0pwj^t@v&kr4C8GJ@*(j3w8-0
zjl~K;8VgxKu8`9nPM-ZroW2XFo0&T(Gn1w=xe}d!gnyO=vVf?z{}g3r(lkAseObDV
zmId+>7;y`E?Qx<&exyZ(JOje&j`j?YsXUzjFwHsx$O1M_Z)u+cgp|o*tIB!~pl^dx
z9O(|(PiDw7V14H8D$2~LCGfNU`SM+~ERY4%{Dm&c>`3R^X7v0lIu^(Rf*_D6vm?cR
z_&U`7VSn^rKo(G`RQkW}YN4(NJB_GOM#}<Oz~7z+c#~tob=|3B<0GQ|^}C4o4t9sf
zZ}qOOdY&iZI2O%jll&ei*qb4wu~-2}W3d8|#$p8^jl~K;8jBTxG!`oWX)MMIV7(Xb
zQ!ba~@Y%qV!n2il@8I`wZ*pv^c;=+|(Md$N+d<tO9{-bid+z`Kml!uz0Mb~j0Hm>4
u0Z3!90+7aH1t5*Z3P2i*6@WApA$|csT^o2*)CZ#g0000<MNUMnLSTZ6!9-dB

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png
index a4adc74bb5e0771858117099462f9ab51715dd47..fe379e2fef50ab07c64a4f9ff75b663ada0ee10f 100644
GIT binary patch
delta 2050
zcmV+d2>ti^1&<JrBYy|hNkl<Zc%0pv&u$#Y5ypRCb<ZsStSH46<v$Q&fQ}vK6>`We
zmmu&Vd4(WvkoU+r$SWiVBZnM=+;a<($chChP+*y~WtpZ(&P;b#4l_%xNRfy<6YoYJ
zvEb}X@6^=SRoz`xJz~Z9?K^+?-Bs5Lr2rbf>cV9i#xEZJ^nYh#<i{~To(k{Ye*ZH`
z38=swRE13|r7M7P=?b0}t-S(O7BM98aGdP5ARug5k*O}pT~U=MymTIr9Ct}_VgVEs
zRD%RAE?dP*V=V|MO|h^Q9EflJ<VH@<N&-knB?IK6l9t;y`>AUVayNzSwIHDHQQ})4
z-pHSR^mPq{uz!hrr`{6iKdLMU5$00Zl+sZtV<oQz0q!n<q37$csYCF)svHZNfsmcI
zFO35b=k}u8y%g4hfVgF*#gi1r(Oy3E2f!X)8UUoqaTD@MWlwptZ-PR}-C;Qmo0`RK
zi{6{V1KjT-6`)atfp_X%Wm2r10Q!;KJ;CW`sgY^suz!d20QcQ+Bm4!xf;Rsb!dFhf
zaXE?<%)RsuEh+%q@2aA^QgLHr3i;zlk&)Q4c>$s)#e7tfMWM6#{R)$xNcsL&E5>m-
zGN4xU(CnwKbnXsU4|EeM-`{Q>V3=f@-H8=WxT4L*MdeH5^?1>10IPKUbG)F}OXGEE
zOEp^d*nb<0h9jUTx=tUbJD09sqkQ`$jb09~d=>z}{gT<cn90c(&zHvQ^emIU&K)q?
z0!A+^{`lTse_bdsd6xic&CW;_mg=4Ow!p*9Q0K#PvhjBO*XiT*h9|fCU;JbK%ZDHS
zeC#uf!6YtlmGZ;kQo!P+kK%lE5Hl4<6VQ6URDXYw^1<x*{2an`=Cd-LjFmkFCb58v
z%A3?JD-W=k+h@C>QqUx^{1g~Xz>9ibT2j!TcY(3;rp9E`;6izmI;8ge(-R<&OlfPc
z-o(AQ`zhD0_`W5KCZMXSxUBr5_Z2y{nZ8`Kb8xH80IUva3fWU&^g1AQ`4pCvms$XY
z#eX2@1%&W6cQgQDQ>nDmCN{n)MiWr)gtz)5`I)~DW^Ws|;mu-^qX&v!#kqyjxht#(
z0i(@O!=F_)lj&25AgBbDH~tX!_N;A?;<iOk1O-)wO`hR-S&X)Tc++rH3vV6U6Fj)k
z<Wc|6?^@6S^hr=npWXUK7)?Mv@y?=BI)8B#OXG!GVZ#iR0L2|EHdC9A^8xf}FRK(h
zu@+O}XaZ)t@e#oM`*qdqpGRj~d-Yi=E6(jK*l7>)md$8#Vl6P5fM!3v2OOS0PQ9-e
z&kD-TK{l)O1;#C_0QA+6&);DP!Vb&Rl~0AE2`F9pTv7(`Oj1zm4q+yF_7Z|UwSSr9
zotq*zJmIA+C2U!>W4BiB2BQhM|M|V!(C7BHY<?EM8|P*(33msc_xp7i2&YJh$S}=q
z2hOL}=QJCXzwZ3XFq(k(cRx6$uiWLKWIaG;8<L`sp_0HmZ}CEDaoqLEll$|r^2cH{
z0SYpA954{l(94T8P63+<Perz=;D4RDg5!BTR)XVQ!1T$Y+h@C>0%#6$H`@)>>`trz
z!rbCwDr_F7`siM>g-x@;VJyZIQ2gD+Ve?r6_2WRZpJ)y;s)R+%``sV;wI6OhIl9+w
zmy`9#4U8rrY}?l2*uh1=_V=Qh%o}hVRf<w6ef*zKN>HU27eKycj1Pwo%YVhxb?j@s
zEb96-UfOUo)a24GH$2Qw|NmV;ky9LbUMgS=o0}YjJCbUFN{2O%Q&T!OI?wa4v+{v(
zd^C6?++Y5FUbX2BBW~Mwht<I>pPWzpo-Y?eR)I;^;!7nf0NUp*9!kH%tKSQ_9+<2&
zmcGv0`NYX5eb1jOFEJ!P-G7UppIZ+O#s@<~ub0lde3C1G&btn%GU>V6okG7lQgrwH
zsu0kYYUuehW!?Rf@(!-pFOn#dg4SXkFnSDFHhbtze_44i=l&ixdU5ea2mr_VXyw!3
z1O)WTXV29|<!jBN;(5%wOoogy4?8Qjf=LF!?7jIflwU5FEyFWK0e|wdoG@~stb8C?
zxe5N}osWM1{_PKrRAKe)%G-k!!nSR7hZzexjyvJwq3LO9d}r7k0mJ5qAAkIVUyYH!
z@|+xS7C>#h8TS#nk16DyJOHN*%C}EayR7`e^2T62w#Wd;7FDH7R@pvDJEifqw54W3
z<zWphz_7Ct`f^%*QGZdoPWi>=jB)Z;4<SX0$Jw1&QHE!dYJiK%FHk6xSnv9{z!Ef6
zT7l}K^4W7$DABMhXPcM7dJr(!VVK+bZWE_*xMcPV<tG-sa;SPOXyc7It9QetjgbrG
zgKT42`Kqd32@7xqc{(ft=)TIwR@ofs5$=2OM)+PFwhucf0DnuN<SVgLR2KUeWzw^f
z>hA<gN2S62uAp@>TQs!(b(y~W?tXU);p;#EB~ilWqL3g1&EidKK##8Z*>%_cYpe$W
zZP6lV%Fle?6II*^Z<Z6^%h{1Z`Z6aUvdUJe(7VB_@!FhKLc#RKpO0UA{YP6*fDHV5
z@#5t1gZ8AF;CmIh7hx?3D4i3wz%%~&pPs$$$-$%{SgbuUWRh?u&ZVsb0bbvVxqX_l
z0wzf|GaTftQyOo*P=F$*0k5nMlr{spw4MHCv2p@xoALL5{%vRY`dlDX1{XJsA$PE8
gn98~9kG6*Y05f0FX&|JO+5i9m07*qoM6N<$g23$%<p2Nx

delta 739
zcmV<90v!F15c&m>BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0*^^VK~#8N?VB-612GiGPf;jzC~}IEodnko4zAM04<NWZxjO0x
z(9zY&UGM|A6juj_u7XpYiXPITP*BkPj~7WbXRmp-_wJG({C|1jY?1fBT#}bu7ovh`
zwOXIlbfVksvT_h%K&@6w+x2=qjnmNSbgE$hl24L^uI8r_Js^(bH2JIe_Hr;7;Bqhh
zV-9v7w$7>P#3DrzAo)h4fo3y#ev9&mizovWJ#9j~vC^b#Gew#KxT|9(OcH&~8F2;x
z(*$UJb2U?3M1LA!Qd?V&MlbJ~;v(7roxJJ|=n+=YN1YMh12pEyZ;DH4444(c0E*rc
z44~*O>|*F<{r-fSW2jXc7BNjsW&NjDjM(Xvh3m&32WPqf;#PB9!XrS@TY>=;y(Jhx
z(HV^DHkAdo0hsEtq^mi}unj<xS(2VSU>kr%PL@=?{(rsEsUC~D?D0(t+W@TaCP}gh
zYy<LOnxGJ60^0y{<o`<w(*!ZF3lW#YO%y`I;V>GFMuitc?0?>Fx2HA$$%9H5Q1tOO
zm$?jrk_nFhMQ6Mp1n;&Vty^Llphk!elf9$LY>BBwPA)0Z<gpfz#9RhJwGc9sXP@W&
zC;zb$w11x4o6^avo**iDz&5~kX0L_BB_|Kq2IzBoo3JM!9kv1L?tY)u|5O=FU>jhL
z^rp%J+kmnY44~*O!2pWhQfMIp%$KDvmab3r41yIT7E_o?F{NhBEc^YP>bxvn1i=7`
z-VzL;=q;r&K+OtPaS?5Rt|l9ncMr7aqt1x$0bJUIEO8NOfa=<~yXj66WPA5Oi;Fk|
z%;eST@7KEqKSf`2Mw$U*$<wu&BFX@ryrO50^nZzqh+@e5pU!&!<7sL-!RrB0^aag+
V9*_keI>!J2002ovPDHLkV1mglQS$%*

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png
index b0289b7d65a15e6f4a8c5b4862772304fac0d388..d75684f5d060b5e3ccb613eb3af2ddd2aaffc192 100644
GIT binary patch
delta 1079
zcmV-71jzf}1<MGKBYy-ENkl<Zc%1E9-HzKt6#mYPouo-ffo`@Sgesw`MQY!m5;xrU
zq7Ts*=yUJ_RiB}i5Vu^egv2!x0#va`l_+6pck9j1+Gh?Ij#Jxfd$%2%F-|^dHDez~
zGxO~?=bZRV2#)dO#&^$hx5U6~E)*11*&iO>e_%7dXY=7YaDVgq?Ii%&tVtvSLB)L-
zX!0xVhj!yTC!lvtBm9Q}y}qFo02qi-0F?hxwcU1n=LGD1H9B6tj8+_&2mn@pMPYy6
z^8sM_XM}6_hNCLGEu0f@ba1+VHsj^yhJsnmB0wMz=%a(vL6zNheCGu4T$CQEApi&<
zX&V8=b3v8ec7J^51Q21h>0k701LIpek^ehdLIADezoPzS?C*~j5RhI(QU4;l9a=zu
zTR3-u0A{KF6u<(&m315Bp1sKa&S--Irm1#@cyUR48M_tQK)}qhwL%*RaEh%bz&g1)
z`1<)bHlM%u{TGjH=U{`aSHO+{*AsA!ItUo2`qP5z<bRoTJfG(5&QJ#d>4YVpz|7Wd
zkh_=koujTTkpGXCwfVkt)I@;vvu*x<($Cx7qlPa-`Nda}P;~7UTOS3i6<`Ft^mWmT
z%H(Bc9WOEKhBW~km?dc_QbfEokO&YqLZk=^&{v2^la$%&ScDC%2_Q|s0e~1l^%VM_
zX+N<g1%Hf_pH}lS8-B2zfgP*~kTY{jkF*B>(HrK)3l@op0Fn7&NC4np)w;~)8ukPL
zXVDvGF|k9HP?CiaARtW~9<wR4*^X}uYXW}#`{$v8qJU4-P>-eH5kKG)n&=PHwxsX;
zouu^y?%cfld+t^)(~IN22>LuX;pFb%k5@k~K7R+m&tL!IJSS)(4=8<C#|zo0Kv=8`
zn{}WG0?KoJ6PLFEDcUMd&{QT^r~(nQUO1(kp<6Vy1=cFa=KZAO^FHK>v_%E~*%lB$
z$OBe04q=E$tIiUzz-9|%3z&Kk59fWLH2|FO>rQTg00k-_fP{r6clyKdm>GbK^~AXf
znt$2?YXxL|z_x_JloQO=@ONSGTo`nYCUWsHN=n!1Feuy(5j3HIq<)XI57?$KSn31v
zVQ|iY^R3XZ56DIVF>jq8DVVXI7&t}~1f<GfSp^8kXTJHABPg(ealQ?lOYrfHZ=c@U
z`!XOOs<-FAJex(I>X910Jwciw@mzGVJ%3-&j=I45{Quw+4<K;%OmJo!rHib!pdADN
z0IAp?P+pZ81*9TOJ#bEdg4+BZB+e2mu|NkEKp^s9#Ov>SK1_a2nJv&g1r#A$LObUK
zJEwrnEc94iCN=M*0?7YZ)8M+-?@jd}YdTj>@0J1#jDRH!UqyU$Fh9-wJ_ta;u`u`!
xDqxofV3!8~yF6f*2PD|#0oCZF0-WUm{{oTD)vp-+rab@v002ovPDHLkV1l+I0S*8F

delta 712
zcmV;(0yq832;T*eBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0(414K~#8N?V3Sr6G0e;XOk2>RF|@r6k~f*>qSVj#T4|g#aw!A
z1O5g<K@T2Uya-wq1TX#xq3uyGMORSJ8rO)Y7Edjq#JH54s();{<HWqV2p)Dm;X`H~
z7~b#OLr9*??Cfsh2xffWkEE1Ew3&&bsDx4rb^$>Uv{alLblC~Rkn|bY1=Re7Z50!P
zE<2kaU$`i>U>C49^Jdu*&T+JvS^9Ko1*I130yaupH&l!cy6h~rE<Ql1MGnb^<A}Wa
z8uSMd_8AaXcYp4y&|b&E`*YV(YQZkx%Tni|3T*)w*2k}*)Pj8pB;DQ-W#DDBVV?o7
zX18yu&^`&yH>U5Q)WYrpNH)@5N*Ywy1#n{pAdSU%0pwj^t@v&kr4C8GJ@*(j3w8-0
zjl~K;8VgxKu8`9nPM-ZroW2XFo0&T(Gn1w=xe}d!gnyO=vVf?z{}g3r(lkAseObDV
zmId+>7;y`E?Qx<&exyZ(JOje&j`j?YsXUzjFwHsx$O1M_Z)u+cgp|o*tIB!~pl^dx
z9O(|(PiDw7V14H8D$2~LCGfNU`SM+~ERY4%{Dm&c>`3R^X7v0lIu^(Rf*_D6vm?cR
z_&U`7VSn^rKo(G`RQkW}YN4(NJB_GOM#}<Oz~7z+c#~tob=|3B<0GQ|^}C4o4t9sf
zZ}qOOdY&iZI2O%jll&ei*qb4wu~-2}W3d8|#$p8^jl~K;8jBTxG!`oWX)MMIV7(Xb
zQ!ba~@Y%qV!n2il@8I`wZ*pv^c;=+|(Md$N+d<tO9{-bid+z`Kml!uz0Mb~j0Hm>4
u0Z3!90+7aH1t5*Z3P2i*6@WApA$|csT^o2*)CZ#g0000<MNUMnLSTZ6!9-dB

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png
index 06f42755835f65ce3e62fe4024c3599f4a5ad172..051ddb5681d8fd7b09d02ae046234981b17298eb 100644
GIT binary patch
delta 1141
zcmV-*1d99K1&IleBYy-?Nkl<Zc%1E<&5j#I5XXPjGh?s47LX{;vM5p{N8-!@i9?Ru
z;lMla0z3zAz$>6!xN<~_!~=u~VJS$!X05Q<$oOMEx;WUzGwZM2?V0r8_<wPCSI<=U
zzpJ`xrpJP3eE0B&?|UD7{72A|=INL3>7P$7qp%aa7U99Hhks0S-3M2%fBa+b8yEe?
z<>C^dn!@B|Iu#>Eq4%~F*Mk6yQMI$N2vJd}&0M8hw(5Ei0HLN5W<#5rP!N!%XvGCe
zC7~_^G$hnudY&dWQB}~Ts9*uGW*=}tJqR!u5hKm}VT2MCg#`=fQnCevW!~(zFp*q$
zAxd3+sDTAoY=34Gy_AsA@uSAEs*VNv%N{E(uy=caur&;>xWEADl%?D|0V6vMw}-(3
z7ExeWmVWO9v`xpdH4GM9pu@gJfsq{=wuZri3$)n7Jzz%|T)}=>0PG5b1s5oF1B5yd
zpa@_kRGFNmYdREM07~2dp$-H9sO~cR1xn8ZWp|hD_<!m1{<mwIbAz0juvHq_8#_Mw
zDExhLmY!&;=GRxhbiRJ^#aFIla6uIout-)|&EnKf2U!AYE6{r@ROJHmjcVz?0)mm`
zzq*leMY?Z<DhL=bi`NA#Vtcb2L=r5C@Qt_b0u|_ULRA(p-vo;;AV$)5uhBx)s_KM7
z#^(oBS%1I^6x1|~0Wggqtw{HcQN;_9MXK7(yMUl^mM{efT9VpWysth~w+bsRph!a#
zy*uj1<M<-GV`IHX33-Ss4tYRD_dVnRR~rv`z^q;y(_i3_2UKv+Lmn{y{a@q(&IJ7Y
z{OKbAWNFTA)3GBvG;PyK0X3M#3y)KtEUz^+Fn<DP0zNtU^bH~zU~Hlmiv?mJ#b5z3
zk-Wc2#tYXGxWSnKi7=o>Q&AI%QMIb67zs5MF;+s*6thX@8_q*$+>2fU9DO*u)$}|~
zn)kyf=$H`T=p=0Z^ILqrNybyx5xBvbfOwFe&VOeOLY7=)Vp9brQL9!&PB+P1^}E8E
z0Dp6AR<b^s`Mu7|eTBQ5WUl&M;ZA@MuWQde<~<OKeeyC_{jTsIhdiSM0%W>Od9Pc(
z+U5@>T0nj>yUPA2zQ8;00%fHlx%?l1F|$L=?iJa(vR9O80r{^t@{_;%bXc3oLpcQG
zC!Mb^&hiIq+G~TV_kdE*@~gl*zX^JOFMq$``+{p@U;Z!P4F>{z55PC-LO^%TZ}$fB
zTca)nKrwL|vzkQhlHUq7cq_MdrCThI*LKOBPy-9dAD^u&?~=Qr4i<n<5^7)pe&O8$
zR24-U0<t(lFP1glCU=E*0<tj!6Vc3KYt?E9^DoD(Mj%Ea`Foq(Rlj!v?tIqDfNl}M
zs2`63rh_aY5SrZ}YWEtgZE{!r-U%2!n`YTqLmOuyB256zGy<5Msj*YN*d}+?@120;
zGE<u<KrF)1tW^@V+5+7vcZGKXp8xgiVXnIF@%(s)+zI~zrmYe$g<tZ300000NkvXX
Hu0mjf{$v*=

delta 711
zcmeC=yvI60xt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSL74G)
z{)!X^2Bu<97srr_xVN*<XA3)u98bS2Vx!UR;<@$K<f!~*of3}x(Px&12Y;9!u%fA5
zOus3N<zV-N`wClLdFnHU2dpq%C+M#`?^S<L@`SHJs`WQz&7aL~esplA`kupk_<8QX
zzkT>n-OQUOXRFRjS{9=9(rMuWtGRu<=I-Bqq4NLN>t7EYyeoXvx%$fYvhbsYdkpvd
zQ{Nn|o_`=}VzX5@3qz?GC&McpA%-iFDhw+&doTo~Ph?ndPKnWBZflL)hLD(<?SFgM
z%n#r9-v7-F>s8zC)z$|_+V3~qQ@61^udsscLe|!Z^C~Hv4s%_Z8nByJXva{bAE!6n
z{*ct<;GJd0S<?bGIq)fPF!5&hh0T6=xxija>;&T#En~wqmbZT2>5!9kJIZ9)@O0(#
z?hVIYg#4dTTl`DQ3#jCdeEi?nGwUDhU$FJvHT%%~g(;2uxGS=blvUKGw%ITrdi6^-
zB6*YQ2HU?ypNv2n_N?9h9%!lB%WoUok9uoFD(E-n-SJ*?e0yBe?G29e82$U!$2OX(
z`Idh7Dfy!2C6*%I5H<N*(CdZ5zvU<X=YGky5E2l3xC0`!*2SDidA`8Nz5buRgA2s3
zsmjyOPh=DQ7ORlG?3vNVd#uZ5Prjb8Hi2JZRc_q*Bl027rbz!jcR1?cJ{GsXe>hSf
zm|fd&zG1^Izgdh2yOozn9*{fG%)GidGC1cipT+NoEH7mb>|@yy*13pB>CfH+S2kDr
zSMCmw3a+osV!X!njUj95%&k7h9N4B>_J;Sby)R#TgPEgg!T-{mznC*6+Lojz@Gl5j
n=@Ru?$t!u0hE)4jhn4e>om6P>`JQD8OqdLwu6{1-oD!M<h2cS5

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png
index b6847b92373bef3eb2d0d28afbc586af9e53b4b9..af6c01d90690ecd156d8d0cbc111f5e7c5f1a291 100644
GIT binary patch
delta 1044
zcmV+v1nc{#1*iy+BYy+$Nkl<Zc%1E<KW^JF6vjW&k`k**(c18k03G53WNDY6=+pz`
zFg-_so}z0`&?zX20-f63*|NA!id2zf$tF9<v?y6}8ko-{9RGkIR49ddA0PieF<9o)
ztIy{rFWy`OKzQuO$z>L`p0R+3JmL%~z$V)5!|L;Izw|$>Q-8j<&ch}+>Ae08NI(Dp
zrkgIGZ@R!Ltu`0j=Yj=5*bh7wNMGd%i2#s$+U-5l<y#lv@a*7z|HzBG@1jvMNWp#1
zR9-_9Fe-xeCUA9r8!^uKWH|M?#{fX8_Aev?&Lke{2iC#50IjIi(XYAB<~3jI0jl<m
ziC|rTqNa1Bfq%U1>(?4aYaei+4*;;J@x0S3u5(JAAYix;a6kYyQEtu|`&<26O%oUb
zh)k94fB=d*gG<H(#V8P)D%BwYnpm0#Y}Y7&!k}J#ni=o;bzJg*x=BuNMV=8{@Bp1*
z!|!U^7%q8$6`s5R?BQEh^Y#7U<2ui;yPjW{C+`6}0e@`2fNeG<K!jo(?^V)Pp%g$j
zGS<?=O1@R71W<<7)wC0aE2spR8?P^9<X+9%-a1rM;dw2yiEgyo<6E)gvvDXqKx^ma
z8duw2KrV(#+l0yk<~ugI2dEks5`jpBvCRw<PzbQJbgddMG9hKkGJ>)n4TS*O2vF2M
z0C1l%|9@p`6!rrogLDeO!!Lq2cm%{Az$W>@Mvj<Dg#BPVx`?|n1psD!CQ8)_mRNLl
z5?L}xea5(OWfD&D8bee@0o4SgkfL+i_SoF-e*XE<sr?TdgsKmiQ;Y&45wREp*WbpN
z-AT{DR)i6#JYW@5Knidv^4I{okoN)lWQPUP&wpb80Pb_qYI8wQ{-dB=3*-f8Q(o?K
zmJCvK-$kSSBQHKYJGdt*|Gyy~2DN!W$Rm-6IJ=p3Z@wphM0Rz4Yuy8gJ3*As`a>Q8
zc?^InP&9!ties(C;imEg^#fFo!R<gHK#ZEn(CQcfdu(Vq{7?*lJ;>Jr<*eGE2dhvH
zgMTE4nWmxK6jkVAG^MRUyeZmv=5O6_1?8f&>8#%w<AL4L*iHcJb5h&!1y9}sb^_Rb
z0o%ABKvUd6RCAAUTo3@L4~SH&%BBgG5nK^K(G*8OHhXkU04&E5EYc)lH4cQz<_78~
z$oXc8zL!wKs3%zW06k8iK5(KGW1t6H8GpgL2Q0-4l)e~S`e>?+ZS#QHolIwUG8LJS
zKrYCN5SlTz%>%+?KL#)j`+=7XQe-!?uF9+VZgBfNAi2z<<T8Cex`@NDAB@Gch$q;@
zm!sAN003}+F)orp>O&#}%4dodw#x%li~#e1&S~3|LJB}XH=zA)@E=!Yg2FInTMc3W
O0000<MNUMnLSTZ^Ip}Ht

delta 657
zcmV;C0&e}N2&e^+BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0zFAYK~#8N?VB-9!$1&44FZWSLI$NuDh`m6gCKDQT1q$ol(bv{
ziGy$mDySl`P&y=#z~9Uy&a$Q;n)xg3K4~;-yPD_qTFz{?Dt|Jw+3c&X>#Av*>SpKe
zR!(<}j}EH$myc?(SUfe)Z*q2>llk$r4FAQpWEv>G2MX;%j?JM9z@3-7e>rrQEujm*
zv=57~C;L+wnnM==V#VY6_aF%YN?1G=Kx>i^fWn80#~Yv<7(o|+g8Ko&;w=|Px&Ra#
z2Jk2z&;_8-SbyM}$7_);07VXk2T3e~Oo{->*-`{Z&X$dT54aycT*&ZWZ2CRFDdiE6
zoGnFw<ZLMdB%9KH>kkGSa{*f9Xf&F}qPs}MR6xIY<h{e)U%|#qK&*H$e|%jFHl{Nm
zRy=6G^<A4Ee__4`#ES0*iC``O#EMVh4FFsOfUx-U&wtaaHqPV}4L1Rb7LTTA&={rQ
zCZH``n;*+}KboR!+-E>)xUK=R4y@LKoE`zCmGH9{K=uW&aa{vsxRijs0dk6livVqU
zh7wZ1T!1z^V-ixpRDd=)V-ivkVJ1MQcuYb+*qF|Mn1nFcn6CkS39;xd5-}G5AYmxj
zxCls@B7Z<~wiE%9vxWYD0rvia@(4)ImLfoMwiE%9Y1EVWz5#>>bOE|gAPijdkU$rp
z`vm#{yd=;C=sp1r;3*-AMX*^lO$H@ck%RzcNP;Cv2<T7oP=Ymd0oWtZwaX(CJfI8E
reFC8bFX#e-25HwYLCCQ&RrL*UH*Sr*_JiF3015yANkvXXu0mjf^d=OK

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png
index 06f42755835f65ce3e62fe4024c3599f4a5ad172..051ddb5681d8fd7b09d02ae046234981b17298eb 100644
GIT binary patch
delta 1141
zcmV-*1d99K1&IleBYy-?Nkl<Zc%1E<&5j#I5XXPjGh?s47LX{;vM5p{N8-!@i9?Ru
z;lMla0z3zAz$>6!xN<~_!~=u~VJS$!X05Q<$oOMEx;WUzGwZM2?V0r8_<wPCSI<=U
zzpJ`xrpJP3eE0B&?|UD7{72A|=INL3>7P$7qp%aa7U99Hhks0S-3M2%fBa+b8yEe?
z<>C^dn!@B|Iu#>Eq4%~F*Mk6yQMI$N2vJd}&0M8hw(5Ei0HLN5W<#5rP!N!%XvGCe
zC7~_^G$hnudY&dWQB}~Ts9*uGW*=}tJqR!u5hKm}VT2MCg#`=fQnCevW!~(zFp*q$
zAxd3+sDTAoY=34Gy_AsA@uSAEs*VNv%N{E(uy=caur&;>xWEADl%?D|0V6vMw}-(3
z7ExeWmVWO9v`xpdH4GM9pu@gJfsq{=wuZri3$)n7Jzz%|T)}=>0PG5b1s5oF1B5yd
zpa@_kRGFNmYdREM07~2dp$-H9sO~cR1xn8ZWp|hD_<!m1{<mwIbAz0juvHq_8#_Mw
zDExhLmY!&;=GRxhbiRJ^#aFIla6uIout-)|&EnKf2U!AYE6{r@ROJHmjcVz?0)mm`
zzq*leMY?Z<DhL=bi`NA#Vtcb2L=r5C@Qt_b0u|_ULRA(p-vo;;AV$)5uhBx)s_KM7
z#^(oBS%1I^6x1|~0Wggqtw{HcQN;_9MXK7(yMUl^mM{efT9VpWysth~w+bsRph!a#
zy*uj1<M<-GV`IHX33-Ss4tYRD_dVnRR~rv`z^q;y(_i3_2UKv+Lmn{y{a@q(&IJ7Y
z{OKbAWNFTA)3GBvG;PyK0X3M#3y)KtEUz^+Fn<DP0zNtU^bH~zU~Hlmiv?mJ#b5z3
zk-Wc2#tYXGxWSnKi7=o>Q&AI%QMIb67zs5MF;+s*6thX@8_q*$+>2fU9DO*u)$}|~
zn)kyf=$H`T=p=0Z^ILqrNybyx5xBvbfOwFe&VOeOLY7=)Vp9brQL9!&PB+P1^}E8E
z0Dp6AR<b^s`Mu7|eTBQ5WUl&M;ZA@MuWQde<~<OKeeyC_{jTsIhdiSM0%W>Od9Pc(
z+U5@>T0nj>yUPA2zQ8;00%fHlx%?l1F|$L=?iJa(vR9O80r{^t@{_;%bXc3oLpcQG
zC!Mb^&hiIq+G~TV_kdE*@~gl*zX^JOFMq$``+{p@U;Z!P4F>{z55PC-LO^%TZ}$fB
zTca)nKrwL|vzkQhlHUq7cq_MdrCThI*LKOBPy-9dAD^u&?~=Qr4i<n<5^7)pe&O8$
zR24-U0<t(lFP1glCU=E*0<tj!6Vc3KYt?E9^DoD(Mj%Ea`Foq(Rlj!v?tIqDfNl}M
zs2`63rh_aY5SrZ}YWEtgZE{!r-U%2!n`YTqLmOuyB256zGy<5Msj*YN*d}+?@120;
zGE<u<KrF)1tW^@V+5+7vcZGKXp8xgiVXnIF@%(s)+zI~zrmYe$g<tZ300000NkvXX
Hu0mjf{$v*=

delta 711
zcmeC=yvI60xt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSL74G)
z{)!X^2Bu<97srr_xVN*<XA3)u98bS2Vx!UR;<@$K<f!~*of3}x(Px&12Y;9!u%fA5
zOus3N<zV-N`wClLdFnHU2dpq%C+M#`?^S<L@`SHJs`WQz&7aL~esplA`kupk_<8QX
zzkT>n-OQUOXRFRjS{9=9(rMuWtGRu<=I-Bqq4NLN>t7EYyeoXvx%$fYvhbsYdkpvd
zQ{Nn|o_`=}VzX5@3qz?GC&McpA%-iFDhw+&doTo~Ph?ndPKnWBZflL)hLD(<?SFgM
z%n#r9-v7-F>s8zC)z$|_+V3~qQ@61^udsscLe|!Z^C~Hv4s%_Z8nByJXva{bAE!6n
z{*ct<;GJd0S<?bGIq)fPF!5&hh0T6=xxija>;&T#En~wqmbZT2>5!9kJIZ9)@O0(#
z?hVIYg#4dTTl`DQ3#jCdeEi?nGwUDhU$FJvHT%%~g(;2uxGS=blvUKGw%ITrdi6^-
zB6*YQ2HU?ypNv2n_N?9h9%!lB%WoUok9uoFD(E-n-SJ*?e0yBe?G29e82$U!$2OX(
z`Idh7Dfy!2C6*%I5H<N*(CdZ5zvU<X=YGky5E2l3xC0`!*2SDidA`8Nz5buRgA2s3
zsmjyOPh=DQ7ORlG?3vNVd#uZ5Prjb8Hi2JZRc_q*Bl027rbz!jcR1?cJ{GsXe>hSf
zm|fd&zG1^Izgdh2yOozn9*{fG%)GidGC1cipT+NoEH7mb>|@yy*13pB>CfH+S2kDr
zSMCmw3a+osV!X!njUj95%&k7h9N4B>_J;Sby)R#TgPEgg!T-{mznC*6+Lojz@Gl5j
n=@Ru?$t!u0hE)4jhn4e>om6P>`JQD8OqdLwu6{1-oD!M<h2cS5

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png
index 897abc2b8e4e75fdd1647290fe3cf0706530b969..dba4e93a8aa3680156ff4af0e3309e4a6bf365a3 100644
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=`#fD7Ln`LHy|t0IIe>@Z;)KA6
z=1CK0C@U{b;Y~~A5chA|eJ_6b<k|X_KNHUV{pI^?`~NDRXZt5VR1aX#U7*<@c0t5}
zJA-Qhs|o7`rddoGjJ}Lp8q#LkE%^UAIBq{9lHf9iD2HI&deEhheP;~*QhV^V`2yVf
a&hkEc%2PMjRO%GaCk&phelF{r5}E+k@>Q(>

literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Nr~~jv*CsZ)Y3wHaG|zkn>4kRh;3-m?qF9
z8nYpUk%uRD`n@|(+IK%${?Yh((c7N&H{N|ss5#oRRfHj1li^wr!<wZG5#Ed&rZFYx
zvL1-CyU+aZ-t+yJgbze<HQ-Q#DIr$d@Q)j;A5(6Mq1@!9Jau!GA3X*-m%-E3&t;uc
GLK6VO1X_mx

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png
index 3e5ebf50361addbf92ffd0ae571791fd467800b6..8ad1f325b352c75d7f7b998f9cb704bbdf06410a 100644
GIT binary patch
literal 15911
zcmeI3Yj6|S6@V9#0(KH=T&Bh)xT;LjB(U0tp1UK77@O245g1!Brh_S~-Icv#Nh`E#
zTbP!RKu9U2G$BC8JQAL1fTV*lPAI`JlaOX`ikZMbdC$-~G^NH6nt%tp^sZ!E^0j=2
zNix$vyQ9}R=bm%!{m#8d`)5}a&-mFR=|4)xFzk_{!h#a;ZP4DMMu1PHzWzVpD=l0&
zN5Qa%exSXFVGSF{VHo?N<SkdrJ<qYc95iu)>=RAVU>J<XFz1wLnB%KO)!-8=rI5?m
zdGN5&APFwxY^#U#g!9EJsjxmGme$Yk^7Yj`BN(T+)16Tk1PF>MXNU#^A%%^)jIp>Z
z_^qi4qaij#t#%pnw1kFoPq86ij)(@U$%gZ!&2F$WCdz8JTkMk!G)Y+r(oC31oHnx-
zlC{u=-plAt2fv&V!OxZyJky&FNG@ZQs)kvDsH>|p)tOClq>`W*h9O9rplKY8z?Fp|
zm5bsbB{v?VFHV7|@DVAjN^;1c#pQf*jp{NQwM6|_@4ABF{zM_AmmQ!;M7c0QnMfj)
zlfd`;gli&!*wh4`5CdXR45<q6qf+{Xt7KJHs^lS3_M3-H3~J)>^yf}F-(WChYDJw^
z3lQ`oP3ft47luWmL{#LO2ro{n1xv|IwR%<ZCyFy5l4col?qXCL!cDWp-C|oIULhw~
zE1Mq?IaQ8$WjWxE@3P`Pgogb5*sd}>F<S}=a-H&|lYm_k^-e?+3piDD(<E)iNgGaE
zyp)Z#I9SRuiKJMPObQYo3B~Zpg5+PAh(Uo3O=~eI8tm!h7)c}H7~uQ}oXXu-l;p8V
zaRi?A%aI_bx}_jjDH7pOrISb~lScOMDmGsZ$Pq9t(QS4TsnjXG3S_=U+tzs@UQ|Fa
zl%yhoQpFDLRIYNMw$Bid-0`*{$h;)5iKGsT-(g`yKW--l2ToC<h%>y^hKp8*z%hOY
zW7BG(9bOP3F)uA{Ogk`R@^Vn~)wY4h!xn`Ul>^HuDsTgZNdhzDL?0;%JcIlElm+K3
z76;DQd_LUg^U)47=MZS#AKM!P-4iqG4c(U=gigJ18)K&^#=(Gvi^7l#kIyqH*q}r+
zBNAxmTp($TwiW@bg(9sMlJVJbJ0n<e-fHpVKE?tzs%Y`kX3;M24yJD{DZ&g&RVZn7
zUkH^!t4*o6V4yZp_gLc%a}h<<+KS8A*H`*GH5l4|Ib-dK<#?@SyLs)@i-MCFpiN8*
zc9RB|^ZpRT<0rWfoujTw457M4JXCDd&_NX0uhwx9F|QJwr~7GW@u&mc;P9zW31AdE
znE~lr6hh%@zg-#b?^J!GGNf+2|GzS5z~kBZDlSwh3T~or1NSNJuX6Ev4m??Xr*-g2
zbZY;(EI7qrM{%*!Lpg~-x<uyq_;T$u25MsC?KBB4g3>;FU6akQ>m0OevKe+wcs?JJ
zR5#t54N@n0X*UM(f2~q*4=cKDR;$_SBw#h{Q7lEpKzV@#{<RdXpO`_Wm=A17={RR7
z$0S3qW4u&Jcbl<h7}tV(S#TRo^xsDh>XZFl?7RGtSkZSG6^f-Nfq<Yz9T%DpWYuv&
zK+vL&3(W_z>bM{vXi>+7<^x%ETo4ensN+KOfvh?%2nbr#aiRG@Rvi}v1TE^g(0m}P
zjtc^U7Ij=`K9E(%1pz^eIxaLH$g1OlfS^Sk7n%=b)p0>U(4vkD%?GmTxF8^CQOAYm
z16g%k5D>Je<3jU+tU4|T2wK!}q4_{o9Tx-yE$X<?d?2fi3j%@`bzEpZkX6S80YQs8
zE;Jv=s^fxyphX=Qnh#{vaX~=PqK*sA2eRt8ARuT_$A#ttS#?|x5VVNIm7aJqRSbd0
zQR~2Sr)`_B-2~698u-Ez4~Er0hG9#VVp!Kb@cjjb)sPtWule9{*FRubmi*c;jy{87
z!!H#T<awj#K3bRe?D)KK%P&uOc)`jsYqlQWZd!J6WA5LUjyg1U`=}ge^xsD}ct3d0
zF1@g{yn9$rTK)CBjPIvkKXCBD%*Lf#_CDsDyKGa=g|ojqxr(wrzUcfW@p9Lt&aO*y
z@<+WmtKwSMstNS;n=?CGew)25Jl}PA@2#61S1HV}E#rlIU*?a-KEJ(k4xN5}$DJ;J
z?xR0{$b0^p$=-fzOW^7K6R^*pYT|{5|B>aHx?DW?RYOhL>MUcI^KjK`D?i+A%U<4b
zrR>ed*2b$FR%Kx6^1R;zZS&Pdr}yoD`kZ_AmQ7tfzS9>+Pu(Bs%E|sA7~7ru-^m%Z
z+YU8~ul)JW5&Mmdj;vQ^cf5HFFWYK8aJ_5uv=PC(b6?*1*=TG}L3Q5RtR3%{);0(y
znp-#TZra`1m>G<=R5Hz_<3}yq)v>l>UCnz-Pkb`2Vo{FwK>O>P{Kf63*Vs?2tZlnJ
zxnkqlrZnu+oqs)Y_2qlZZ|rS)_C_X__VF9e?;Wa|x%bc~)0<xX8vpXqrs^xNudT}e
zy1Qun32FV!r=&B}oR{~NuZaBW!8~&GOE+7N4|kn!vybN*IzGEDoNC%U(*1_d*3;f|
zW9O#ElfOJQVtdE_lSk&d=KVUS;nqaq3UkJeVI|$O@Z!~8%u&wf)~w%f@uT*Qi&`po
ztN^~X$7Yysbg6Am{?mT`t68O!)?T4UUb#Cw+uQuppKSBKQ?_g614p{cn4Z;t%<8Cb
z9{K#dQ&TqY`OAv8{?xYTIl(lO9rMN7j?DK*Hui*$|9yICz58h3T*;Zrvd8Inwp}Z{
z@SD3CA2$=%-fB2^>s=*h_O6r11ILD4__U>=XTqHi$bIyy3vPD@F1Gu@Yd9CUOE2kk
zHTHCFoV4Wa`P7Eyv6ze*(vME8XkF2|X2!&eE-?M&8CyF8otd<Kdi%Q4mev=a7`q00
z`b=bNjXL4&>!&M1nQ3!>e0FiCbLIlWnDto|t!Z^_ZM%xcXFqUx@#5gUZ0wFt;;I+!
Sxvf3QT{LY*!MjuEzw|%x_1DV)

delta 722
zcmV;@0xkWgeEbEFBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI
z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW
zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx
z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o+gecsz&)j)@6nB7H73mW37Ag7Y6d$N}B65M-ayn5=cUX
zj2g<Qz(SN(jeisqDcX;D_=g>Tl3X&m%3$PJKou$^#}EDozq>UHQ<H8|AO>{5*!IUL
z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT<rWBOtg9TwJ#`c@MbU0m4tZWJr$WrzsQ)
z!220}Qw|uq1^U+9-dg)OeE>4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t
z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GV6*!h3P)Gm(0QpHoK~z}7#n&+k
z!Y~+y;V%WDG?RpkdWKFtj;o8i(9xmj5nLQRPLJUlic`8c)IpSrEjCU5{22q`c?k(5
z0OQE>yc3+bQVN0-x7H%z!keanlrnBWA5YU10OAGo@$Is#-}4Cv-rW`ee-P&kjNt&F
zwWhrVWB65{3avHTwxtW0f*+boDL8SG9dN+`gbi@Tg9gmOg9XgRg9P~C-T}V2S3n4S
zc0ee6RzOJHIUqFd6hMJb4xqv(1yJID1E}%iYF7zPJj=4-9f*Y+V}1i-;v2KC1t<P>
z2wCv;;}tOUW9dJgsqpi?Bq~JzqbQ~PEV9;;<4P$!0TpTkfuT94W&i*H07*qoM6N<$
Eg5tSH8UO$Q

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png
index 7bd92db59f70ce83df278ad44857a3797ff47877..e724d3b9f78d115d79ca3ded3230db216cfe4056 100644
GIT binary patch
literal 15885
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

delta 695
zcmV;o0!aOheBlL<BYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI
z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW
zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx
z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o+gecsz&)j)@6nB7H73mW37Ag7Y6d$N}B65M-ayn5=cUX
zj2g<Qz(SN(jeisqDcX;D_=g>Tl3X&m%3$PJKou$^#}EDozq>UHQ<H8|AO>{5*!IUL
z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT<rWBOtg9TwJ#`c@MbU0m4tZWJr$WrzsQ)
z!220}Qw|uq1^U+9-dg)OeE>4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t
z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GV6gZCrVF>^L0NzPNK~z}7#n&+o
z!XOlY;h!cZO_)r>Jvw<M@6gfBOE`EOkKxWp*E-o?Y_*j4fDwl84}k=r;^_N+GBxq8
z>o7I(5CTmt+<T9;wroI*w`~hhE+EFw$KmmwZ))Jv^8irh46NY*&N<y%f3Sw%-Sy<0
zV;o1lfGzmN-v(0?SJ{CS9FPr2#YF@5;9>!Lagl%=JUbv4&kB&hcLzw}y8<Nf<N#?r
zDL@0?9H5173ed#=2593y14`hl0j2Q8fRgxEKxzCVpawn%Ed5yGr?VCgVB(LWwRT<z
dA*ka3FPRL`p~u8|wEzGB2>?k&PDHLkV1m#LJ~99R

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png
index a1c5c2115fc19c9b01bc5e8eb039ffff5e143553..4cfc4c45da5178cb9fb00132bd47b9570301ad6b 100644
GIT binary patch
delta 2486
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
AIsgCw

delta 418
zcmV;T0bTyT6T1VDBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0Z>UqK~z{r?U%o5!!QuWmC}N1PsMocGkD75B#@<hmOzFM83J9p
zcPTWFlgH?4OeQ;q3<=*=m!4BKmR%cl&<_rwKX>=(Joq$9(|`1+96|zuAfQPUMKlgg
zQ4};*RrM_Z$@4s?jiHI-m_(cfU;)W_V|qW|>a)G_v40)&MLB0p09OJcCfTA_5u4<N
zlJm_u=Z)ScaC02MK{)8;KO>W0R<~Axr-$YC_<2`z=mS~R(c?kA?bc&s1sELUO2CpN
z>16EB$#wV|Mt=d4Fbq{$mYoc~P2B3y2q$0V?@PVZif1)jBgVB)*;oPQ@^(#Ti?x8E
z@B+L5FTe}%0;~n#r_#o3F*YQCn-T<T^K+4~uj~h`8WITt$eXn>8{tL)vL%CMS=Pze
zAF+PxF@H29GI?K}@kV{c#5h$~no<{S`TuyBIDeWse;b_A%n3@J09E5*n6`{(^8f$<
M07*qoM6N<$g2jQit^fc4

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
index e716cdf4ed..f66453a57d 100644
--- a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png
index 89446260094332a599021485bc68cfd23e52cf75..faeb000b4af4ee778ba66b9e19d9156b78305548 100644
GIT binary patch
delta 2924
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
WI1)>oZmF#R0000<MNUMnLSTZLG=N|L

delta 753
zcmV<N0uKH17KjFrBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0-Z@jK~#8N?VGVm13?gmPeF)DB_XXAf?$^_2CO9b05+BiHln4C
zXklTY*jOqyf|fQufCMWcTBQ>N3vENNN(@*i|1m4$kxMQ&CV!dS?gzsxD-!14+1uUO
zyD@Lb<n#G&YQ~~kt%_n$AwVjX^4pnA#`nEYE|-%b0D`aA>(m>aL}WlVoArZ-Z!{X-
z`sB_N{kbb!_p1xkjKw&46(D$I!qw+#;ro5Ui(*n#34oC|B3$QA3e??KR84`+sr@I6
zDuRay5ThHFN`FNZgQ^TLtkrgZGXa*%<w8x0N&z_OblPh+o1rE}<rDyz1{h%kd04;P
z_dDCLSe-ehW-QcafFU^Y#-xml0R6%VK;BxM0OYMjybRvWJ?~NT4_LnsvKvS6wOY;J
z+@ODK`pdicI4YQ>PkNe@;-&z3YjFaQw-zS=`Pkqo-+#_V1@RJ8DwRUZ+7JQ<7M$%9
zy9@?Lp4)$%*7}WD0Bmx?3?o128egx7)9-Bd_K}*Q@ERWqpVsXJd5sSxZ|YWoSO7fK
zq8KlEYeJlUsOeENGDv@j(Q37ZJ_W=--f0;O1Hpqt2oNU&IPN$+WZV=W9~<i*g6B&&
zT{l7o?0*5U3}OS6n2iv>tM6ncc$5BG7|25~xD}>u6^PTXSS)sZ2AJTnCC08WQD=eR
zeLXh>&V#3aQH59lep4GX)C9C6PQQozTic5fV8z8qyOD>D3IkaMG~)yyZ!Jy$^42oc
zB?v@)O)hL@S$>(f<2AW{;RGOWElvRP)-o~z@M>FUZc<b)gQz7S$WDhV=~rXwGXTK{
zN1dA#l>+b@A}sjc0XHe?rU0)VM=7Iizpf<bv$<Y_{|{6NV1h^KoWEPp$)u>50@i;z
jYyHR5)Qp8J13d2sVbc(ZBc!^q00000NkvXXu0mjfGmS}d

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png
index b4ba2ac0075caab209b751b8869d58c40248069f..46547d6b996bc58da7c10e55cafb0fd78fcd9801 100644
GIT binary patch
delta 1681
zcmV;C25$N72A~a)BYy^GNkl<Zc%1E9&2Lmy96k5V`{=Y&JDq7uDJ@W%cA$npi$x$V
z)IeCc6L&5ot~6@mLX4n^s1Xuyq5c6zF(fQ>=|&paK@lwoNnxlIq@{%polfa=ruTi^
z>!R<K*N>S7?wj65dy>iYy)!evch9}|chCJOfn*%2KYpSwe}7r=-`i5Qo!vHX5&+m_
zBzQ6Y=kf0kiNq%&Uk(DNn$Mot+|_1thjZ`V^*@u^mW~7kfaH~aqY$qcMCm%S;bW2b
z%F-VxE!tm5I1hT$TBuARBt-D&T3&D8x!EEbQHVyC;)N?vdJD+@o&Rcj#K9kL-oX^h
z;-%ADdFFB+b$|OJU=Fwv;z}W2i>btjsUL{Mmo7lxCnH}z_+?UwBn-wG`2F68dR==g
z4*-#bp(qAX3h}l3D)pB4Y7UFUm)-?_{o$MvUawOp&n-qduX{F5doEwl8Rh)Z)oG^~
zpX$!qqVc7-faI|UN6j&3=7K?C7JpnRoI7RfG+u}|AAj0**O?7RMdGU>Uk(C;r!thN
zpxlN50K@cdV}r4NC}WMSjcV}`04T%<5ns9h01WOnWUp`l5Y^%%t_bNud=SB<=YWhg
zRtwB6oQJ3uPZ#5ZfOG+(T0E7p#u^)p^{J=fMIl{)j5Sv47P9tfcu`0fAgaYv-uwK-
z<`upWAAba-3*d*B_yE97fT?195Q40PQGog{+{Cx0P?mT3#`)qrEml+u0A`#0gF?0I
z&j~@~1z{)nQ_J~p{k7#YFa`kXH#Cd!dv7F;i#~%0gj>KO{np=fjUqgq|64K;NDlD1
zHm`8TlkhSTNDlA{SESz-<z+%x0DsLcR>-Az*?$Nm2h6|rva_49i}IrJMNyJr&>N--
zjnzx>%ZZW*;1+IZnBJA*@1F$10u0l;js9!5&kq4WgRy?781KEygzzx<;^#XitZ}E}
z@txQs02PX^C;+fws(M_}NFiRwTcS@O24Mlx=X0Uq?zG<Ua?CczY{$EQyLV7)?rbuh
z9Diry{gdT|c+vQx5Ej5p*}0l+&)`<~kXpZ~&IW*qJ6W}<bzRn)U;u!cZO=>=<7Gm4
zE--!HJdy1;t^A<HZyp=f0if+jof&C0c(_S50H7FOR<D03`V1lvZUI-{9i9S!$v&!9
z?<&vb2Q7Z>(?Js56tMwN&Jfb7l!Clye1B00j{?lX^o5H(M6XkGQv)Vt7B?%`RnVTk
z^QuF+!z^wV<AW%K2!y-9f$D=Nm)gQE#*1!mi$b^yyuIdd8UXf3U!9%d`HfCgix0KD
zUsIXtp5)d9Gk5&hSke2&&?AR(=j*?|h>6A*MG#JK!PIu1)inU%cJH806d*rnQ-1)s
zbnAlAthe#`-(7A5A;5w}HqYu(W-`{?*<@x0vTC-UlFUF>?P}RguTNi*z9bjOblClq
zVrB^}=2~1D)#7vZ@TxXO?3>3%^{R~#={4`6)JtNE?%{=-H0it29s+5Ci!6C9fF4&v
z_XkGRwj*`scuy`AMBE^-EK6blFn|18T5am6x5G^uscbjw-dmT9_Hc)EFI@5^v0-|*
zky#wot(7@zf+5nXYt{rqXG<3yph@XnA*dxW!+Uu<HvkN8OIxi7DWP&Q+w6$~=?>6C
zNqvBSKmWh(1Lk-EpATpRfK?yhV$}z@SoHy`KHz`m1GMUp(y%w?06?Tw*M9)u`OaPW
zmEZ%UKfr<NgC{@Q|CvcNLbiU>pbwqSSgG!;9SRfYpG)^*i*+mS{9wi!t9|X(o_9pz
zOCN>+fKkpE<=jf!Jau-`WYf&iYt&^qz9U_LX1$GHznnAxVDxMj0PuTXj{y`u4eD*M
z2C=s&U4ZM;SClO~64u0(oPQqe2xGJ_9p2Ts#|9Q|yLs?VkOi@~C|v*#RolzWbFW_`
z^_?{)04N$^MfMg);2JH_xGP2gMI)p_iGU~|030Y_z?=<M!#y6CMu10bR)hc~M99d+
zG3~kUHX@s(v(H4-nK_1gJia9738V|q9`0Z_F5Ohu?vC4KYeQJ`N`EEm={;}g@ethq
z5%6lhB<BgF3ot;FB(c4fGRke{5XLBHJKJ~B>3bFd0C#fbKQA1p2+{@cK~X{=*(9B@
z$ApCZ3D0}EGt3w;XD0geK}CN+6aqe=;CbRFfph@`d_cxqa1nuY0X(ewfK?x`>I0<s
bfPVqSIJvrXFH-OT015yANkvXXu0mjf3gR*N

delta 855
zcmV-d1E~C<4ebVyBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0|H4zK~#8N?V3MmQ$ZZZ@4e)im(be87?n8N+ASm{L#JRZh2WxK
zM+Fxr2PbI<L5E5~++7?T1O;`lR6#2d2Wx4bb<%beLZNB?*ngHL=}U9IGrvLyh29<Q
zFX8SJetdtI!13<;?%n0?o<WdFrBV*1^fVN?aUAC?q(Yz@kjZ2Uo&j;g5WAFIE+^Fn
z6BLb&jSW&QSBbG{x#m`YJD?h2(0f2Soi2o$$75r`tIM`&b2sSr=j%yGg+T8CrfCw(
zA0UBBj~iI)<$n&SMi_Jh7}WbTXx*v{1XLjm`XewrJY3jqw&H!hsA~$`k9S|*9D`H{
z^d1lnhe`D03F41X%Z%)D2UH^rdJniVGQLa+IRiy*UeCSggH#A~17?Qu6W$Qe3q@`&
z<x`W83W09Ghk>8BJn3nd__?@z{sE*yppOCGzd)&wrGF!)K}@s(pvt1W0n)R;`~Dvj
zkc!}rt_(he90mOdfGUeN0909|4PbkDqR|ORU&Tx+KLx1>4R0}X4{{Ww4Y)iq{u@$m
z3~H>s`uO}D6j6{iAe+sKuSh6aoqanShY||XV?e9ob9tj#G2GI6nN+J)s09z{9`LCD
znFHy8X@B@?)?Dw)fi0uFKL2&TyL*6b*e-7byzu4$r~wyg0~)6`E$)bHS#GmITCEn;
zf`{~NxG*%f1L=XGv_;B0YnIRNTXnuUsE>fO0hvrjXcl1GS>9u?n){UNZUd6ZWC2oc
zOkx%noy7zcQIIy^fBONUP>9@(-k4%qEEeJ0Hh=YcokXKiQd%#OrSD6qqv4S(hFF95
zV0o=pYZp+P-sVUQux*=ME8baPaWgWx5DW(47krMyfKEmm0IDq708nMo27oGyHULyv
zv;m;Xq74957W4&aB9Wkf_XbKO!d8m(SNq+^r?KgDEEXf%+uP)R>B%J1e=)i;*xhf5
zVNjzD096)k0I0HP13;BU8vv>-+5k{x(FTAjOUD?%4on|crqXN`$YTG2>S59`2CxHD
hc8I#i{`~MD<PSUCsjYnS?C}5q002ovPDHLkV1gB7eYyYu

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png
index 89446260094332a599021485bc68cfd23e52cf75..faeb000b4af4ee778ba66b9e19d9156b78305548 100644
GIT binary patch
delta 2924
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
WI1)>oZmF#R0000<MNUMnLSTZLG=N|L

delta 753
zcmV<N0uKH17KjFrBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0-Z@jK~#8N?VGVm13?gmPeF)DB_XXAf?$^_2CO9b05+BiHln4C
zXklTY*jOqyf|fQufCMWcTBQ>N3vENNN(@*i|1m4$kxMQ&CV!dS?gzsxD-!14+1uUO
zyD@Lb<n#G&YQ~~kt%_n$AwVjX^4pnA#`nEYE|-%b0D`aA>(m>aL}WlVoArZ-Z!{X-
z`sB_N{kbb!_p1xkjKw&46(D$I!qw+#;ro5Ui(*n#34oC|B3$QA3e??KR84`+sr@I6
zDuRay5ThHFN`FNZgQ^TLtkrgZGXa*%<w8x0N&z_OblPh+o1rE}<rDyz1{h%kd04;P
z_dDCLSe-ehW-QcafFU^Y#-xml0R6%VK;BxM0OYMjybRvWJ?~NT4_LnsvKvS6wOY;J
z+@ODK`pdicI4YQ>PkNe@;-&z3YjFaQw-zS=`Pkqo-+#_V1@RJ8DwRUZ+7JQ<7M$%9
zy9@?Lp4)$%*7}WD0Bmx?3?o128egx7)9-Bd_K}*Q@ERWqpVsXJd5sSxZ|YWoSO7fK
zq8KlEYeJlUsOeENGDv@j(Q37ZJ_W=--f0;O1Hpqt2oNU&IPN$+WZV=W9~<i*g6B&&
zT{l7o?0*5U3}OS6n2iv>tM6ncc$5BG7|25~xD}>u6^PTXSS)sZ2AJTnCC08WQD=eR
zeLXh>&V#3aQH59lep4GX)C9C6PQQozTic5fV8z8qyOD>D3IkaMG~)yyZ!Jy$^42oc
zB?v@)O)hL@S$>(f<2AW{;RGOWElvRP)-o~z@M>FUZc<b)gQz7S$WDhV=~rXwGXTK{
zN1dA#l>+b@A}sjc0XHe?rU0)VM=7Iizpf<bv$<Y_{|{6NV1h^KoWEPp$)u>50@i;z
jYyHR5)Qp8J13d2sVbc(ZBc!^q00000NkvXXu0mjfGmS}d

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png
index 7f987f7a8ef60a676a08ed91fc81eebb21aa23fd..46547d6b996bc58da7c10e55cafb0fd78fcd9801 100644
GIT binary patch
delta 1681
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
bfPVqSIJvrXFH-OT015yANkvXXu0mjf3gR*N

delta 855
zcmV-d1E~C<4ebVyBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!T<mc!T}X1N`L?W0|H4zK~#8N?V3MmQ$ZZZ@4e)im(be87?n8N+ASm{L#JRZh2WxK
zM+Fxr2PbI<L5E5~++7?T1O;`lR6#2d2Wx4bb<%beLZNB?*ngHL=}U9IGrvLyh29<Q
zFX8SJetdtI!13<;?%n0?o<WdFrBV*1^fVN?aUAC?q(Yz@kjZ2Uo&j;g5WAFIE+^Fn
z6BLb&jSW&QSBbG{x#m`YJD?h2(0f2Soi2o$$75r`tIM`&b2sSr=j%yGg+T8CrfCw(
zA0UBBj~iI)<$n&SMi_Jh7}WbTXx*v{1XLjm`XewrJY3jqw&H!hsA~$`k9S|*9D`H{
z^d1lnhe`D03F41X%Z%)D2UH^rdJniVGQLa+IRiy*UeCSggH#A~17?Qu6W$Qe3q@`&
z<x`W83W09Ghk>8BJn3nd__?@z{sE*yppOCGzd)&wrGF!)K}@s(pvt1W0n)R;`~Dvj
zkc!}rt_(he90mOdfGUeN0909|4PbkDqR|ORU&Tx+KLx1>4R0}X4{{Ww4Y)iq{u@$m
z3~H>s`uO}D6j6{iAe+sKuSh6aoqanShY||XV?e9ob9tj#G2GI6nN+J)s09z{9`LCD
znFHy8X@B@?)?Dw)fi0uFKL2&TyL*6b*e-7byzu4$r~wyg0~)6`E$)bHS#GmITCEn;
zf`{~NxG*%f1L=XGv_;B0YnIRNTXnuUsE>fO0hvrjXcl1GS>9u?n){UNZUd6ZWC2oc
zOkx%noy7zcQIIy^fBONUP>9@(-k4%qEEeJ0Hh=YcokXKiQd%#OrSD6qqv4S(hFF95
zV0o=pYZp+P-sVUQux*=ME8baPaWgWx5DW(47krMyfKEmm0IDq708nMo27oGyHULyv
zv;m;Xq74957W4&aB9Wkf_XbKO!d8m(SNq+^r?KgDEEXf%+uP)R>B%J1e=)i;*xhf5
zVNjzD096)k0I0HP13;BU8vv>-+5k{x(FTAjOUD?%4on|crqXN`$YTG2>S59`2CxHD
hc8I#i{`~MD<PSUCsjYnS?C}5q002ovPDHLkV1hC`e0=}_

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png
index c9bd9b86994bdd5fdc01b63b07248e514245f84b..66dddef140ffd3fc8b6ecaa428f7de87b7bfe741 100644
GIT binary patch
delta 1730
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
Yzrx(A<|rn?4FCWD07*qoM6N<$g7_;%tN;K2

delta 852
zcmV-a1FQVe4eADvBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!T<mc!T}X1N`L?W0{=-wK~#8N?VCSnQ$ZZZ?_T<vq@>t1rb-1jTe^irN*shhDM-;l
zg$@o5E>12k(hPzQ5kYWv5p+{Qmr^Lz5|;|K4c%(HmqODtX@63Z7hm(vcg;_*(xG=p
z{iWW0!jJFo-f+qLzWej;j!=S3B9UORSd5fPB@zmS;A)$AJWlHMI(b@po#lEI<Le{O
zAeF)bMW@kd5XW(#L=NRANyiuv4u{G8Xm;^#@zFv2-5O4cjxhiWV*seO7z04H#TWpp
zEye&)Z7~LbYJZC{090F)_XFmJR;M66L{Co-c^tc!<60~h318vy>-3^aUX^pBzxM!E
zR#s5=Bup0o)fQs_sJ0jbK()mf0IDs<08ni)27qddF#z;L;Rl^><IhKV@RcAx2<;U9
zi2;8ebn=`ZgdV`!f{F54Jef>xKq`zytm0B(DFH<klz$D#WHM6Ekum0fIo-^E%@4vQ
z6qLJwwHI_ngVt=fvQr_|Y87h1L%9XKy!xg9>9KJ<$DVC`7_JAZ+l${9Pj?FlZuPpt
zQI5EFSCCj1{w%Eg3moRyqS5q&b;1<jqud3qUAgfS(qrTKpWRl;4g{>tg>MU|d=QMb
zY|-e7GJiXEwx9I%^+7FoD7S!{W0Sj(3PTy)`Z)jY5)@HTHefonoP$(`=Jn;&6Ub3e
zHsJH{k0Vcpj)VU)<c_b8ynrGK%3}b3qmzwJ0DmGz#uxyqE!rEPJPW8YH?;b|mq@!L
z&VTcN0W6FGpxR;#07ZjRsuZfA&jQnzm!}9Ly?;;?#$QZjA(aB%fLmjeYyPU>JQRib
z^yU2-NTonGU}9o|pDRf33eC*SDBT147*MHHNNIbA?3bzQl>@>7)kuTh0@CU9M#Srn
zkJWCk1zTa^8+y2YCkd$(9Wf31<2eb^kQ<T+s6rZa13b?o?tYUrqkDF9pe7tpjWp<8
zfK4B+w%pcWfA@e(srd7lUz+WPR0?zhGMUT<V{B0Nr6!-xE8PRS0jX4~;2Urbioz5M
eg$s~MK*%qckg2hB<(>Qh0000<MNUMnLSTZh`GZXW

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png
index f16d149ec46e25f3824cdb7562a002cdee1321cc..8ebeed21a9fceba5d6cd550f7ab6d33888cecb9d 100644
GIT binary patch
delta 1680
zcmV;B25<S%1)mL&BYy^FNkl<Zc%0>1OK%%h6h8CvwViQ1$;1gs9j9%`!=<f=^5_FW
zt5S)=f`<eGp|04%7713Ue}EO0Sb>mAB?Jh;0(DU+K?I~URizL}lhQW0PTV}knK*Xr
z@g2`)(V28QanhDMnF;ulti(B<9N+Jrd+vAcoMFIcoZIu`=YR8fHiy_?^y&8wBjw{_
zXgoVs9_%@MD>HM4lLR^Ayhg=Jt0c%-6)Uk<ZybG_#y?MUu^Z@oV$V#&HJOVhL=~rS
zqu3qD_s<_9!FHi6&C09Qu8{;eqhcj43GyPXf0p(i&?1sVY|D`bqq1i3dtYwh1&PCD
zMK@R;$efmnSAV<4jDSTID=}LCz7r5TDYEtZgIw>K78p4_ePHS5Jl}Lelp_0r2is60
z?Igh*d<FnCNs!aD{(WBpx6UdhtQu_UlWbk$RCB&~8{^eKODh4H(*OW0653E=QN>Ek
z40{9snj8LokAO;nF!QtXT(mC)3=d@hz(SN;)AL4_;eTPB1l!<Uh3^p{_6FFl-h{zN
zxd3YBF#rI=FoX-UKy*L=fULo92MN9tu=qov0Cz)rR>g`T33AbHSFzG)4SG9B@O=rW
zSczLdoqN7L;aM+9kkcww8ZA4mf8Pn%YF4X>AnWfcR$4Z*KMH&&z`nknwg>0{)ruY(
z_)dUheShB<(q8BQ-wCk84DD8cd+Xaq0y6VN7VaiZSFoc90JukjB*+;rbihs^K(oEp
zLtMp5t4#;Q-O~O}>;wV;%#gON@AVy^nhtQ&F|`o7*gN&U`Rn?+bSSqCiON2sC$IHT
z)$_FQB?7if*8Ur~LBNKL>=+<&ysWTZS9E^D4SxbQl%)=Fqd9CF*14acCcq|MGyu@7
z*@b($z12!wCNaJb+74<0oZ`hfKuM4@J88{3;Yt#;i<fG4Yd4tFQm*ggv~Yz0yLhQ)
zw`RVYw)Y#Z<N$k8bCO^VShLGoiv&07d0J2lA#?D^_C9L~ojENPYeR{2{7nhrl?nm?
zPJiq|$72)XFc4A~W5gVMMEecs;Kq^IraGVvCDH%@c%=e`zskU{Ko}Ot+Dw^@jgRvE
z$w606c4^?24sh=EmJYDiJ6BAV5sMh!&<K;gmP3PmhsvDDGA{V10(As9&h4!CX#fCA
z2XuBd^)ZN<PJgK^V}j9B=en8Y%f)c)q<;wTHSIT`gDW|}z6(^-0lA4%E`4DMH4jL*
z=Yy7s(O3S4ND`Hm;XJK-YIvdpfDmXp5XA;2<oogONF<5y<kcymQX+1+r-Cc@1-6O+
z3nOE{^whJG_|iMiuYPgmf~@EZxAWt<Za4hXz!d_lt<XBJ+i)JhFmQO^(cd|dWq;6P
zLU?Fsuv{q-xH3NGhI=Y_Qw|dXS0*nbq5~{m%mb+aOifG+ioS5$1^-m=rW|G%7&thj
zD}Stn8U{nKI;jPceLcF&H@Casp9-Fo!}a@v$0A8|to?<iBO|A$j}3j(A>VpqwB_~B
zPU*D%Y2nE>n7^*AtlcaV7BRfQ2!Da8GxOy=c!+#EHtc(0<jpn+P$32w`6-Qwza}><
zjHv<`z~l_ocOl?OIV?musCzsBO(#UXE)nRCpK8*AZM^a9i^nJ3@J|CbrEt|qnA1{m
zI1lSb<5PI%swBu(Pr!e_7_yba2uv+t7D34D?MXX7Z|@19^-qg!)d9}IJAdsv;f&C$
zau_zT`+i2~i4Jgn-hQu-);}#gITqi_?l(Nq0S}=Qe1j)Cpo;yzo&Z1L$+7q*cGucm
zXyE&y<X4@)p53gMV6$c8=JNu+cZm3{34AA@O0R%jRc@73T_MeP0v_VF+6Mfu9+<Gh
znpuFmYO&@TB>^_(gqmxVoPX0&F*7H`YNb(f9rp5B66D32Xq2=PpMCJ=%v<*wcXp#B
zEt=b!NjMRxmqWd(m_$RB0=a`%DhphgC4Zj3*;u8xN<T<?KMH&&;OflS?mif}p{s_@
zaImnJ!UZnKLa0NijRz*4+||zqTX<+V5++MO6;{~*ivfTE1K65)V1J_dxk!oWG{PNk
zHOR$E@tIJZ9}0B{{o&n#12v%oE`2((R{D)BPrRGS4t%(Gc<EAMTwBnumzOJd0BS%7
zlt?kZnkg`17t(VRC4-N0`PtEhHJsIzn$Q8QLVI0fGExcd5|~I5k$}t@u?|@W0PsQw
a`~xcTWAD^5B)R|q00{s|MNUMnLSTYbbs-Y~

delta 698
zcmV;r0!96w4bcUVBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0%l1>K~#8N?VG<#LqQD3Uj?Cdlk!&G1h-D5;8^@O6kOb0#10M)
z6&H6GLH`ZuD3nfaf}5_7hg&T;RPs#9^}JV#ZIWy6J`i%fEq~wpkzSKl5@i~V#<*Uu
zCwZPH)oK-Ie@W9c84icZRes+A@8a-n{~Cw?VgtPz5Ik|bbv8K4&I`jScGLxcl?OZB
z?hM8sn>Z_nx&W~4?cg8Nn<fs~Q5OJk1rO(60xtw0?BL5TzGb4G1zN4v7>5OR@Q?w_
z&o(Qc1t4J4fPZ;|Uk2&|KybDJ62SxNN8q{feu2Y3%oF^|9|3daZIi&OETBOY0DZ7T
z0ni7_!fEhn@3l0I&BLN;Y*FG7Kp!ko0QA8U1whYAtyU{FZP?Qw1$kLN=@tWvUazP6
zB4ynHcJSuPlWD^y00n0T4`f+3W!kXr09WvUbn#;r?0=V_EBIpI2_jj*6?|pq8%Mf`
z2msi@-+gwQqtOUw^biw(px~h>Y8FPd5EB5ZK41@Dx0AXb6h*ZW-vPcMdIx|(4**Vu
zbp!~g1VcHT`U12Oy#sJK5y5VW(Lh81Dtg)?_yD^ARN``p-~(*W;aQI%lYYOyp3h-g
zdArPQ_J0D<uF!<_2)IPBO&gKI2yK5C2QRzpUl?(%Jef8k0{Bc60DZ7T0ni7F>bEdJ
zyT2eF0rbHV1wbDxQ2_L6z(c9bBv4O-?RI<W4->?^?eZ(12Fq67{w0YEbphZfGSdJ_
z5xlqrsb~V@G7-4&Dhrf}z=;<En7snF2;8U(05d%TP%d|gAc497)F)tzAceXBW`PuX
g2dIw#r<h5SA5IKcU&dDOvj6}907*qoM6N<$f(d3PGynhq

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png
index c9bd9b86994bdd5fdc01b63b07248e514245f84b..66dddef140ffd3fc8b6ecaa428f7de87b7bfe741 100644
GIT binary patch
delta 1730
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
Yzrx(A<|rn?4FCWD07*qoM6N<$g7_;%tN;K2

delta 852
zcmV-a1FQVe4eADvBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!T<mc!T}X1N`L?W0{=-wK~#8N?VCSnQ$ZZZ?_T<vq@>t1rb-1jTe^irN*shhDM-;l
zg$@o5E>12k(hPzQ5kYWv5p+{Qmr^Lz5|;|K4c%(HmqODtX@63Z7hm(vcg;_*(xG=p
z{iWW0!jJFo-f+qLzWej;j!=S3B9UORSd5fPB@zmS;A)$AJWlHMI(b@po#lEI<Le{O
zAeF)bMW@kd5XW(#L=NRANyiuv4u{G8Xm;^#@zFv2-5O4cjxhiWV*seO7z04H#TWpp
zEye&)Z7~LbYJZC{090F)_XFmJR;M66L{Co-c^tc!<60~h318vy>-3^aUX^pBzxM!E
zR#s5=Bup0o)fQs_sJ0jbK()mf0IDs<08ni)27qddF#z;L;Rl^><IhKV@RcAx2<;U9
zi2;8ebn=`ZgdV`!f{F54Jef>xKq`zytm0B(DFH<klz$D#WHM6Ekum0fIo-^E%@4vQ
z6qLJwwHI_ngVt=fvQr_|Y87h1L%9XKy!xg9>9KJ<$DVC`7_JAZ+l${9Pj?FlZuPpt
zQI5EFSCCj1{w%Eg3moRyqS5q&b;1<jqud3qUAgfS(qrTKpWRl;4g{>tg>MU|d=QMb
zY|-e7GJiXEwx9I%^+7FoD7S!{W0Sj(3PTy)`Z)jY5)@HTHefonoP$(`=Jn;&6Ub3e
zHsJH{k0Vcpj)VU)<c_b8ynrGK%3}b3qmzwJ0DmGz#uxyqE!rEPJPW8YH?;b|mq@!L
z&VTcN0W6FGpxR;#07ZjRsuZfA&jQnzm!}9Ly?;;?#$QZjA(aB%fLmjeYyPU>JQRib
z^yU2-NTonGU}9o|pDRf33eC*SDBT147*MHHNNIbA?3bzQl>@>7)kuTh0@CU9M#Srn
zkJWCk1zTa^8+y2YCkd$(9Wf31<2eb^kQ<T+s6rZa13b?o?tYUrqkDF9pe7tpjWp<8
zfK4B+w%pcWfA@e(srd7lUz+WPR0?zhGMUT<V{B0Nr6!-xE8PRS0jX4~;2Urbioz5M
eg$s~MK*%qckg2hB<(>Qh0000<MNUMnLSTZh`GZXW

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png
index 4ad14d62d1dfd47f73faee41599f42863653e457..4d0ff4bf7318bde3f96e034058039551ad57141a 100644
GIT binary patch
delta 888
zcmV-;1Bd*M0*(ieBYy)`Nkl<Zc%1E9L5|Zf6n(8G3W7~EQB`$R4GR`<2G$&bTW|sn
z!Yw!gYtAqrv8k#?sB+~cmJzV1f9KbA(xUINqohxYMvaqt{<Hu8@7MMOnepY#w~zd@
zwrXA#^-ln$w(7Pj>c)RZTeYZ)dZ(?Lz5ns{gQWkd<mK3KhJR^o)e?XS84mzeQ8(JE
zSyj|qX`j6zz!~3QZ}?hUwb+=|vg6sUwrVErw+{rA+Nxz$)H?tr-K>hbxhwD2J_$Zi
z($2FJaBeCy5`siYk)439sXV!X0rn)s@_8TG2>`+*XsZ@~f1||X$Vc&cAAKOe0Dud8
zw{(*-fJ=p2cYiNB3E2s7DGzRx8?WsU@aW=1X{#2}{<9N6qZ;z>Gdf`2*8V@pP5>Dn
zn%ZY{00|}$vJ>F>_tBIdg%03wQ+okC`uE^<fDa;}D(Yq|I>4~&FvZ8D0{}OrnSUqK
z0XNbwVD<dLFL`7S1u8zG?;c)@>Uk-$%z&=kpBga;IDd)Ao`I!z(X>92zPS*C0OQ~A
z#EtRVPW(J4!~`($VgMK#U9ewvC~!GqvK!4ICcqajzJXOyH+}MXA5nrJ7cZf9$_5*=
zik`=%h(Z7tFQIlC`H;5HjVLjI2Q{ArXRzV2mPm+E&r1;{27skGw_vdZP;Sg>c~{=A
z0l>*x0Dr*q=?m-L-AVhG;z@M?8PDM_enjYBgjhPj&-J7OI&1ksxWFYk03C}T(*C7L
zq67M>0f0n0;Hhf)7)YW6fcC|Y82w8SZ3e)lKsbMAe*yNJKK5~9?%o@A8f4}00YgoL
zM`$aDuW9g_2K$F=8jSHJ=hC40^Xuhc)8HlLaDO>{_8s2RHuh<A7%>1Bl*9aaz9&H1
zzZA*KVcy<{z?ifg4zy<vjHz_M(er$*Pujl}sdPYVdv2uC0iEqRkwgas+K=`G<U|r3
z(9#}ln~MaK-2cGmS6@H1?Imb)8$G1+0=YFob^-!>1-Pml{(*@Lmeo!`S|Wy!%1!_W
zjd3inSBs<DC<&a#gwbu3+?dtO#e~^dHcB4A%jc@7x1-o7Nr8_W??#?>jt=|41Z4p-
zURyP1BR~8D6CD1c$r&9mi~|#d(4xsG4ou*BaPoR^@_KNxZP6r!4)_Po4zi-ku!6Aw
O0000<MNUMnLSTY>%&aN^

literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Nr~~jv*CsZ)Y3wHaG|zkUKI#fhADGLBz=;
z;BXMDfx(v8s^ZD=?<UPZc7D$3t;YM3c3*G)C~AByh+)lAh6r!Q4bzwsbXgBXaW!le
zVaWbj!~dgt{(mojhHOm+9BQygd|~{h57v(<7j&$GVQVT+-NR#rtw858c)I$ztaD0e
F0syz(SkC|e

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png
index fa6f83797c15f9e0a8fa44c37e4c6406d1f6d8be..facbfda3ade6a6c2884f9a596e976a4b6da0a329 100644
GIT binary patch
literal 15734
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

delta 723
zcmV;^0xbRZdi@2EBYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<Ps4t5Z6
z$WV2$AS&Wms#pXIrLEAagUO|T(4-+rad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(
zq|hS9JC1vJ?|WbFz5|3tg{fxOB%o@Rk&4H}Y;IKyyh1=f&3|zS5;OHgdNBjf@pTU$
z-|r$k%e(H+(Wm512KYqcDANs#c!PL$)6zNb6NgwyQi#uqCk(nE@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o*@n^sz&)j)@6nB7H73mW37Ag7Y6g%N}B7mMi9pm5=cUX
zj2g<Qz(Ry}jeisqDLRjN_=g>Tl3X&m%3$PJKou$^#}EDozk6#Irl;JbU<~MfvF(ph
zAg~KG>$d%UY}?Hf!2b+fX>EVC0nB}pUT<sRBVb?~xVUa>@*Z%x0}MUsk|8;gpO#Q4
z0Pkn?O*vrj7U*4b`_?+g=>w3VUM=4M2Zz8|k+Ro4-Xz`A*|&ddTK)S0Md5Ol8b}Lg
z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j~J04mlGnc=mDt008+(L_t(o!^PJz
z3c@fH#_=zrP@73Yz{$x2bn1b;gwO*Nyo3kp8JwJiQk+r;1sz1GXr)cw%gY!Dzds>?
z1P~lqmfe*kZj6DF#GP}PNa0P>Kx-X0po=F-0s!#>y7;<SRImAo1b&(w0e>LQ8R)|S
zz*@_D3;OWe&gRxyv~9~5Fa)3Pn?gzAEITj;2S6Jz7AFnx!N~%Aagu-#JUAc}4+@~b
zy#uIluK-GXbO1FzDu4qY9KeMS3gE=kH2ojIjbApVRFZh_4#dLiy8aG`iBGq6r6lo>
zTOffiud8RkuOCbI>CA;6$|Q5Hx*tWY^?RXnjvY6~-~k(D`iq@-gqZ*U002ovPDHLk
FV1h0lLiPXv

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png
index c40b161092bf1688a7c328fd6fab6c2df6b94fdf..3799df51bf9225b991de796f1ca3d2d663373420 100644
GIT binary patch
literal 15695
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
A9{>OV

delta 697
zcmV;q0!IDMdgBF<BYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<Ps4t5Z6
z$WV2$AS&Wms#pXIrLEAagUO|T(4-+rad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(
zq|hS9JC1vJ?|WbFz5|3tg{fxOB%o@Rk&4H}Y;IKyyh1=f&3|zS5;OHgdNBjf@pTU$
z-|r$k%e(H+(Wm512KYqcDANs#c!PL$)6zNb6NgwyQi#uqCk(nE@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o*@n^sz&)j)@6nB7H73mW37Ag7Y6g%N}B7mMi9pm5=cUX
zj2g<Qz(Ry}jeisqDLRjN_=g>Tl3X&m%3$PJKou$^#}EDozk6#Irl;JbU<~MfvF(ph
zAg~KG>$d%UY}?Hf!2b+fX>EVC0nB}pUT<sRBVb?~xVUa>@*Z%x0}MUsk|8;gpO#Q4
z0Pkn?O*vrj7U*4b`_?+g=>w3VUM=4M2Zz8|k+Ro4-Xz`A*|&ddTK)S0Md5Ol8b}Lg
z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j~J04mljW$Lr$&007@fL_t(o!^PJz
z4#FT5fZ?AeCN)f^;RYU{lZWdKyo3kx7)~yXbTZM&24kx&ya$Xhe18Ze02N2y_fJz3
z@460C6AvNK)WW^@SZm7$#CY4b0ObN={5Tx0@A;+%e&5{y%AA2E9KboJdw&a-@W<Jm
zoO6uhs28vX-(UP-YT_z8umuNX1GeI#0V%jxKq@X0kb`Fj<l<QY5_oce6rL0yiEj>&
z#y16M;Hv|)@Kpht_}>6+{AWN3d@-ODJ{wRH{|YFLe+1OPr+~R1OZ;@!!U0VDQMA@h
f3n2t`9N-1PCdA8BN8=m-015yANkvXXu0mjfL83K%

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png
index a1c44f239f04f38430c1b7d52c090dca8a4f54e1..10342c5705897d15d15cec6e6e15d43900b21769 100644
GIT binary patch
delta 2053
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

delta 426
zcmV;b0agB!5X1wJB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*miSxH1eR9HvtmrIJmKoExGFhWdL5&|w{R&#)?JkT7$jgSKb+;{{J
z<QZIv3n7GAB?e|d`HL>?j#0bwAe;W6=%gQ2e^oEKdlW^{#eW$P65zTn{rJ95ZQta1
zPHkD1cL4~VWf=|hO%Mbm;wAtc2+jlZ<zy%3cFJ*cUT~ruQxU+GfQZjk+Np^Dbx6TE
zbB_5T#tCGO37CilqPsP6@M?9H3Vg@Y-D!MK7IcAJ)!E;dvrm2(wOhaf0E+;g=TU1)
zQ54j2aC}z<D1Tc}2ZF;<6Vnm?vI1cklB3Bsi>cF)^G}dKM4G0}E5KB<duO_63+M|g
zzzVPetN<%OTL2Cf6Vv7GeE`l(4i_0-+v+|52Xba6rX##ofP5u`;XH3*ydJ*bQ@B@n
z*aE&f%VleeoDeRhPq(0t-~hh35{MzX38eyPS)~~7lq07Plfj>6gFjB`Zx9^k3h<$b
U03mOCK>z>%07*qoM6N<$f~`xgk^lez

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
index 84639dad70..739d63b247 100644
--- a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
@@ -1,46 +1,46 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "full"
-    },
-    {
-      "name": "ruwindow0",
-      "directions": 4
-    },
-    {
-      "name": "ruwindow1",
-      "directions": 4
-    },
-    {
-      "name": "ruwindow2",
-      "directions": 4
-    },
-    {
-      "name": "ruwindow3",
-      "directions": 4
-    },
-    {
-      "name": "ruwindow4",
-      "directions": 4
-    },
-    {
-      "name": "ruwindow5",
-      "directions": 4
-    },
-    {
-      "name": "ruwindow6",
-      "directions": 4
-    },
-    {
-      "name": "ruwindow7",
-      "directions": 4
-    }
-  ]
-}
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept ",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "full"
+      },
+      {
+        "name": "ruwindow0",
+        "directions": 4
+      },
+      {
+        "name": "ruwindow1",
+        "directions": 4
+      },
+      {
+        "name": "ruwindow2",
+        "directions": 4
+      },
+      {
+        "name": "ruwindow3",
+        "directions": 4
+      },
+      {
+        "name": "ruwindow4",
+        "directions": 4
+      },
+      {
+        "name": "ruwindow5",
+        "directions": 4
+      },
+      {
+        "name": "ruwindow6",
+        "directions": 4
+      },
+      {
+        "name": "ruwindow7",
+        "directions": 4
+      }
+    ]
+  }
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png
index ee388930016be622eb0a63c291c95bc0fe0446a3..dfe885bf85353c9892107604d33eb36f0480e742 100644
GIT binary patch
delta 2355
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
Z{{fGAzYr9Fk?a5f002ovPDHLkV1il+P@ez*

delta 726
zcmV;{0xA8z67B_%B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mjgGod|RCr$Po3Tm*K@f&dQHV(;Az&d|D1u!oO<|*HZ3OWFd;}ZO
z2Z-4C2tI%aHn!2mB3h*rL<_}22*D~bprHK6tgJ^ax!f3?yMNgahFMM|%)hg@yR)|=
z-ak_;7C)&Oi+a7zia~?`nM}rS=W;pU4??wCO@{yozS(Tj)99ok1M>O2A3S`k)$*oy
zCT{4@eL3B_T&89$L<wLr0V0g;HX?~|wei3bV3fQF(DMi$B77Vcmgw<N5tRY+`;#{>
z<4=C@CKLKmtAEv4F^I|l1Jd7Q0<2Idgc=u-0@!4;S+Cu0hZ+}=LjYhHpobCU#Bp=q
zf7pfd+4=!BV<A2R48fi^#w9TV3=1a!d9^qJ$g71t4X)iT>{0Uvn7`k)^A-3;qw&4A
zpL(D1?klfLX6oba=D4^aKwd3Q0P<>a0+5dl-tyfnDSxo1pmMn!TGoaT*s$0ouGCF~
z!JfD6H+E~ohAjXVIbnvL|LYpxps>?#<!tVnnxWV=J`_IHtpx2F-}BL%s7zq1zj?CS
zHv<d^9wMOUrDOp6$5GRxW@HdNGNRMzBwv7D(_k0~9;8BmI2mB0;w2~<Hw4JXM*T}r
z{WKV5C4UI))gXFa)k-k96sE@_V5?s$mHNH|Oz>C|r*1nOJg>J6f!o2;zlee@fPGRM
zG}Hv7!%n~T$70um5uoB=q+8F!l7jlBuoHm1TATpn)$*@X5QzGjT-eNVv3RHBGr3{m
z1R$>#Cjfc1Bt`)H)Y&#JqNhRB5)fps%@z07m{0f&K=8p{w~dQP0qhzgEco4lZCu0+
z0aH4UT1HFNt+7Fa{|!WC06c<McX3kv)minIr>PkWUIuvH7m2j<b%RaP9{>OV07*qo
IM6N<$f>@(TkpKVy

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png
index cb46c4deda811693284d6b9b027bfb7742c2c4e9..e1ca7ea363976b27b350b4be8191b9df97a6c9b9 100644
GIT binary patch
delta 1148
zcmV-?1cUqN29XJnB!3BTNLh0L01FcU01FcV0GgZ_000C-Nkl<Zc%1E;PiP!f9LK+J
z-ptM}&9<9qf=RbM6h*R)QP$Wj4Wxovij?$XMM4kSOP8FKkm^CigNR^*;wi3&s(4sR
z<0Y{KjY>5TNpusmge|4ggN=!8IvaOeXXnqG=b=WE!>+=M^M4jHpX2`K@%znpe*4~+
z_a5P#LngaZd(WDW#(3h}-<6HOul4QpjfE-!fO_%U#T#ct@~a|)w*oVN$iWxCX_ete
z9OkpXzedaFrnY*fxe5T7GWEJ~0hE7#<o_k*Hz}#7?q@saDq1Uz5~@&iF3?En=~kCQ
zRVY-{i;L!$-hTl<9C%+VRV^&Fni!lIju^IuPX<2VmzOU`p4{IH#u%rRDz)OG5ZQCU
zOFzE*CICz?&ME8x-T#H&;jvjOveZp10LbdSN|eNuT5+EF>~)d+(mUWi`)gkvTT#7d
z+il=3z&OQYimi^VM7-n8cFw)T)bUcyxM+Uq9k4sK_kV4X@wbaNUKSZIy#xBsXTOn|
zU-~K_n@|AR1;{28Kz0GL2?dZ{fNZwC0K!J-g`eIyCNln`hhMuWT7wANz5_x5WEUWt
zPypEl$R-p(b^)^4_5uiRiOJs55=Gbvnjfd_e>OD%a83b09a~Y?H!aoil3p(^6JY^f
z)Spmr5`X^m;+(!|+xnUNEC3{{_bSnov6^x5R}e$^FYrgz9w}8VELBVlP7LF&Z6SZ}
z-~yWtHfqF^iG<MEo+!cs9GE}#767b#|EsEI4A<l??<gR0r5ny)kN6MrxLPajrN>?s
zdj&CsSAn8($1i^QGcEVT-CL~6na{A8W=`|uEq{%{^BFwUi*LnCh_Dr_fYjq{QG_SK
z{`1*O0DxC&KQr-M?s4<ejP*|Zl$zatOv@Apoi$S782BzCnqQRQjF4lqq4GJWRJC{!
zWe)C2Z+{>_0o3u54gg<Wp8){0OqO&r9hG}9i2w!gPPBQ+0*`gIccG(z$m&tUO-z@i
zTYvFD3$QXVXCQx?Y*-?t6Py5quzjqF?9gK{h$h_ut`len&}+6b+CKts*3_s%8$yKO
zCcz8KdS7RcpNt!5JGjSVQ#aMM!@H!f1i?*$$D8dcw|vH!f0a}`95HNT-jd!0f&K+@
z_KZ&{B|+z{N9Y5BN)-A4ggzkj0ih3QKz|?52scH~n)yS{Lp)AqQ=^gG^^5LM<wMVS
zenI~)mncQ=7f8P;3IO1)Uqo3cRV_YLKIg!70{be`mmxD9<t>w&J;J(Y2m<K>B&N&C
z>QTe(C?L|+-i2g=$Gj75UQqd^3$V_WZa4$^)5OZe0`&+DBY;6PvO|wyA8R5Ygmnd#
zw;=?e3MJmGsg3rJfL^l$tx387YlnCFZ0e@kc5siEj2r0d?D5qL%iCuXH0CXWBZhsI
zR6NF*U*(n`<f*ZA0XCpeN=eS13Dg}*7a;Tjp%1u6=mSC@5c&WqKHyKl6MbL#R4Cs7
O0000<MNUMnLSTYbi6)c)

delta 849
zcmV-X1Frm$3FropB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mj{YgYYRCr$Pn$c@gQ5?t5y?U2QD?)5xuQl77=rAV~k`D`M1VMY~
zCFs59m~Xup!TyGzm!P7DC|rA(XhAkN?-~T<=qV6uYEgvRu7BRsJ^CB$p}>32wxgW$
zfy4KAt}xF1c=dSBnSwYI4u^G&@dR{jqwD%<D5>BsARdobECGH+p&Lprmt(pI?gB!g
zP{rsPe$UA<Lsjh$r?9*}1|=2T1w<l|3Od&DO<Z@ERhMeO<$-yA^Gyg!D!2=XMxzy{
z*Ys&Oet$6CU4PpG^4H4ep`=2E<O@c~Y-0^mH24eDaDM_~u~?;RcKk=Y4uj_Hc>SU<
z+TQ`mWU^v~zu&V@CX->h2kru9=M!aX5T~GPn^#X(jzdWWcL8&y=>?4NICO3EGF(bQ
zNd<QSiBEysRvhj3?6Y#Nd=E-0xX%LCuRx~8%5Y4B9Dk7lAcaME0nD?&rH_*fP|{#z
zr?wWM=7RhPKnjZ#04XfY0?1w-Z5sxdM{%VTPD4q<A8Rpl7iumr3%ER=_z9(Lu!6Uj
zA7{@(mkZ1SlF20Xio{yZRF^VK)SDsu0keRMb2B?o4vuL(`;D%qs*Y;mZDGU(Jet&@
z92lkL(0{tm#skK8rM~)Zm8$^uS-_<jcAIK7cJ=!M^DwSHykPqYFx#f~?P)83e>v)F
z#kJA?2+Yh*+x`wPO^lk`JDStstZwKVqb(pFk5kP8z3nUoRr9(0XbT{Rn^4+EMKyh0
z4?>R%%mV(mAK>wLQ0taAO|n+2!PP$Pb{l!UUVl_?)Y0bqP3AGMa43r*a>Kijy47m+
zYHLN%OP(Bx0GG>!oOfzP($1t#6y0t&yuu&39EKDYDF9MfqyR`^kpduvMGAlv7AXKy
zScDhAeLWfs1~J(iXfzs#tQ5a$UwYR&_k9tc&xe}LCUQS$q)7gY?9|q1|CbnVqyR`^
zkxBv}g+&U06c#A}Qdpz_NMVrzAcbXU1ds#M&*>i#vI-<^?}6$;GBg6nfhjpe-DPim
ba3J&-iPJcFc2Y^e00000NkvXXu0mjfk!^nm

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png
index ee388930016be622eb0a63c291c95bc0fe0446a3..773a2b3fff343d7aa621a31db801276464f4a3ef 100644
GIT binary patch
delta 2331
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
BU^f5&

delta 726
zcmV;{0xA8b67B_%B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mjgGod|RCr$Po3Tm*K@f&dQHV(;Az&d|D1u!oO<|*HZ3OWFd;}ZO
z2Z-4C2tI%aHn!2mB3h*rL<_}22*D~bprHK6tgJ^ax!f3?yMNgahFMM|%)hg@yR)|=
z-ak_;7C)&Oi+a7zia~?`nM}rS=W;pU4??wCO@{yozS(Tj)99ok1M>O2A3S`k)$*oy
zCT{4@eL3B_T&89$L<wLr0V0g;HX?~|wei3bV3fQF(DMi$B77Vcmgw<N5tRY+`;#{>
z<4=C@CKLKmtAEv4F^I|l1Jd7Q0<2Idgc=u-0@!4;S+Cu0hZ+}=LjYhHpobCU#Bp=q
zf7pfd+4=!BV<A2R48fi^#w9TV3=1a!d9^qJ$g71t4X)iT>{0Uvn7`k)^A-3;qw&4A
zpL(D1?klfLX6oba=D4^aKwd3Q0P<>a0+5dl-tyfnDSxo1pmMn!TGoaT*s$0ouGCF~
z!JfD6H+E~ohAjXVIbnvL|LYpxps>?#<!tVnnxWV=J`_IHtpx2F-}BL%s7zq1zj?CS
zHv<d^9wMOUrDOp6$5GRxW@HdNGNRMzBwv7D(_k0~9;8BmI2mB0;w2~<Hw4JXM*T}r
z{WKV5C4UI))gXFa)k-k96sE@_V5?s$mHNH|Oz>C|r*1nOJg>J6f!o2;zlee@fPGRM
zG}Hv7!%n~T$70um5uoB=q+8F!l7jlBuoHm1TATpn)$*@X5QzGjT-eNVv3RHBGr3{m
z1R$>#Cjfc1Bt`)H)Y&#JqNhRB5)fps%@z07m{0f&K=8p{w~dQP0qhzgEco4lZCu0+
z0aH4UT1HFNt+7Fa{|!WC06c<McX3kv)minIr>PkWUIuvH7m2j<b%RaP9{>OV07*qo
IM6N<$f)tZUc>n+a

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png
index 7977b29f0cc6fdce99b0fa912ebe23b2a3fe692a..e10cff828eaca524427883090f88e0a16bbc1ae8 100644
GIT binary patch
delta 1117
zcmV-j1fu)s2J#4yB!3BTNLh0L01FcU01FcV0GgZ_000CeNkl<Zc%1E;Pe>eB9LK-&
zW_D+1*_9}^(cP>Sy6hp5l!yv}qEt%~NG~F7P7#WQ(1PtrdnloW&<0{}ftEn_Vh*7d
z@sgG#B%xVa0;v@&HV3<bt;UTpM%Q(_f9B77Jy?r5?6&aI`F{z{=QQkZ-u`~`o%iR<
zyr&2uK*|1ie5~B|lF)u$WIKO1I}Y&RZ>tIb)QUezr$=P+Ych>r1S{8~rZH*w@?ZE(
zaQ@HRXq^oCGUv5202osty;fWX_V2g+zeIV6HT0`a>z#TZ(|igTL;H`f_%m-8EkI>}
zirR5G6zU=Hr+-=cGFRR}w)7ao-&{bkQo;DpIq~b`IrPPP;BZH%Ol8&L(Yhw7AwVv`
zN56mkIRM<hx6IaFTj%rYrbygw^v`!^O8{^t*uiubVAbN{$WNcj<R=$Ene93kNrtuT
zdxZ)BKnN88BFV6pJ)NrnK;+6ky;@v!{_>ererf^s$A9A&WZFMTr$=Slldl5DuOGWh
znV)<WpvDt`x&UfC0jLY0#uI?L0BZKU0MbTiF#W+vnfBxHufCJ5L54lw13Uq!3!ugm
zfVu!`JOQW+pk~htAZ>(hoVeK|^#^H?8X;)`Rwf%NG9NW%^UESFz=y#%7>2>`-&@w7
z`)vJgwtoZ!lrzB&rVj_I#$Uuk$RPbyn0jMF7HI(vJUDqC0DO0R+QOT8i*rY`r(*t@
z?nU$OTX+;9ty)|hy!(mVBgi4W3M{b#Uz>8&Oz*nIZA*Z2%)I`G**X#Q0S*To)Q;04
z-2<q%w`Gx@1dm@o_QTfIk*fFHIB~OQ<@-o!tbcw`d%tPOcktmm=7N$J!MEU-%`c04
zM#yxWk!M%UTzNw*h`a!&@BV;`0z|It(*fZ2;?_=B>qJ;D9%`iBn1qW0WQR8GL@Ht&
zZf-++D(24&6fFPrBXTS5Y60_otL9+xtg>T?B*#4g6vat6VI`>RU`!=<fZMp*0~%)Q
z*?+}TqiDHR=L2KALIn3F!OJ1N>u3{?7|pPHE!&tfG`llKz7n`M37*bXD!j}c?(iiP
z>{5TB5}12R-V0nE0+))@T-_S~<g@=ao)2&<k>>;8`2f!ccs^hk`heYVQgm$PTGVV2
zb;^TRzx98;oU}&P$L*H~*7W~!h*I`^0e|^PQ2+pU_yY1QSKbgK&#s!V9oOCp`7%^I
z)F@gf!q0hxZO`Ba<O2AoAF<3p!D>&%{D+&{kVr+0?9is|R(^5;wwdW(GzXJsmHEC^
zS3Sb65r8pO3F<l$PFR7WIIiV&D^X1tQ(A7-`7WLsMZ;{pt2L1eV0Xs2F=c30uU2J8
zjAnElZQ_y3p}jK+2IihBrT#)?2?g8X4zKVscXQX6T!0-gm8r_5;<T&okX!)I2Y5bU
j3(p65KEU$<BtGCTEv9plIn63E00000NkvXXu0mjfPjw$B

delta 849
zcmV-X1Frn?2<QfoB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ib
z000ib0l1NC?EnA*{YgYYRCr$Pn$c@gQ5?t5y?U2QD?)5xuQl77=rAV~k`D`M1VMY~
zCFs59m~Xup!TyGzm!P7DC|rA(XhAkN?-~T<=qV6uYEgvRu7BRsJ^CB$p}>32wxgW$
zfy4KAt}xF1c=dSBnSwYI4u^G&@dR{jqwD%<D5>BsARdobECGH+p&Lprmt(pI?gB!g
zP{rsPe$UA<Lsjh$r?9*}1|=2T1w<l|3Od&DO<Z@ERhMeO<$-yA^Gyg!D!2=XMxzy{
z*Ys&Oet$6CU4PpG^4H4ep`=2E<O@c~Y-0^mH24eDaDM_~u~?;RcKk=Y4uj_Hc>SU<
z+TQ`mWU^v~zu&V@CX->h2kru9=M!aX5T~GPn^#X(jzdWWcL8&y=>?4NICO3EGF(bQ
zNd<QSiBEysRvhj3?6Y#Nd=E-0xX%LCuRx~8%5Y4B9Dk7lAcaME0nD?&rH_*fP|{#z
zr?wWM=7RhPKnjZ#04XfY0?1w-Z5sxdM{%VTPD4q<A8Rpl7iumr3%ER=_z9(Lu!6Uj
zA7{@(mkZ1SlF20Xio{yZRF^VK)SDsu0keRMb2B?o4vuL(`;D%qs*Y;mZDGU(Jet&@
z92lkL(0{tm#skK8rM~)Zm8$^uS-_<jcAIK7cJ=!M^DwSHykPqYFx#f~?P)83e>v)F
z#kJA?2+Yh*+x`wPO^lk`JDStstZwKVqb(pFk5kP8z3nUoRr9(0XbT{Rn^4+EMKyh0
z4?>R%%mV(mAK>wLQ0taAO|n+2!PP$Pb{l!UUVl_?)Y0bqP3AGMa43r*a>Kijy47m+
zYHLN%OP(Bx0GG>!oOfzP($1t#6y0t&yuu&39EKDYDF9MfqyR`^kpduvMGAlv7AXKy
zScDhAeLWfs1~J(iXfzs#tQ5a$UwYR&_k9tc&xe}LCUQS$q)7gY?9|q1|CbnVqyR`^
zkxBv}g+&U06c#A}Qdpz_NMVrzAcbXU1ds#M&*>i#vI-<^?}6$;GBg6nfhjpe-DPim
ba3J&-iPJcFc2Y^e00000NkvXXu0mjf$CiNq

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png
index a50fafe0ed2f6c7e70c0d0444aa84f70270f1ef0..2dff7e5127da870b33ddd1f786a203e300ab2265 100644
GIT binary patch
delta 1112
zcmV-e1gHDz2JHxtB!3BTNLh0L01FcU01FcV0GgZ_000CZNkl<Zc%1E<L1<h>7{~uJ
z@9n<6&2HHw(!O+;y}0yHnh>E40SPr#v`{apVlTx=dMHZOQ?y_~L91fC6_g$lsFZ?|
zm`ep)thFqKU<<~i^q}iy*)`kHB%5TD-S_s*jEAt&g1ae9nSY7o{jT4>{eSsqX1;G{
z<`E$Tbh1009+|(A@KRzYx%c#U;jfEhwc(|U{;pRRt(Sg$@#bdFf0O>|2N``+=HVv>
zXFP`$TB<IK;f2c{{F<`=3RNZ4h}He=A~hbh0N|(mF8~1NQmds(U%LVJ?E=jmTdQ?v
zlHo3=6X{HcU4I-Z`>OP{8&GGuFYgVGo+a7C3!X~dEn@(s28mb}_OciOAxxRBDxs!O
zN|M)Oq4USjAU+dUnv-?|yq+YtCvB7U`~Du=L2qvdcSc*b&mtI^eLyM$Ww(H`&p6{Q
zukzxFC0CWcb^{)Q8q^>c*6(noqAJDyi=Yn(`hX3BK7SzS1A;z4OCLaF_XA$fzIAl7
z&s;rn?a=&0n>*4vXujzTh4%gRnwKLhV%N)s@cnFdSSkTY)QteI#)cOzd!_2K$cYsJ
z&Xm^sMkq6&Ufb)nJ~bY-R`<8--Hw7n1BydsKb`5YyPQsRXOiLEv9+3gyP$myQkp>a
z@PaoudViKo_vMw=`evvzfDpEq#Yn`mK&e5L>28A35fGn=)APsAAbC9&0;OBR1a*tx
zXp7a`+rjtP4p_hM+mp8G^(3`d0(Fbvi6z(NRn9o$1(f~DK-rDVKF~f2lum&Q>vy=Z
zG5@u%{&j*rK$TF?2O#JJf<7SV1GZovAiW>3JAa)XS?_#Ggn!LHVrJ!Fg2(PI5CCWv
z*S#MgeLrCSO2V@z?9k#l%LC{Cx|#aEC6xO#R0RNgGHNx8>qL4ABzTmz4HztSBOan=
zh=5Xb-%5pZuU2Y+K>-8J<9d;v0&8C7%Tje2e^-il``gd4?z*^m@)I#roW%>t=fF4<
z27fhZqj+Mcqjd^M8}RO*@1FyJsi`?y>MHR+j8&2Txjmfio2vl8smK9p(H*o=Ts(8@
zL+QUl0%-%t?>!$oV^Onsa&6;4QwRe9oUy1`Kjd^SwOWnh;^1!|NhKi3lc)k;$UJ{P
zn|)6z0ZF8*z~fwH+sbHPg>@4cpgRHG1b+tTPCz$-0lE{=&9*l{x)YS;aqbs1L-u`v
zZ9f7619T^#o4^3w3Fsy;Kz9PV+4cr#e{b;Wk!y#fz95VL_luMB6K$@{rmC#Ib_3pt
z^i!M$pPHJp9@#d3W3B>3$f?KyYMtKEFfOaF{kMSbgB9%tB<~&l3;>K9rkQ_!wNb`7
z6Wy6)_@PS_Jb|d$C@%Kh{6I!udle|qGGClzMy|h9<9<zmb4)**^HSq>2w)swXdahC
e`v}l|y#5b0A$=t}Z2Hsy0000<MNUMnLSTZV2p&oR

delta 851
zcmV-Z1FZb*2<irqB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ib
z000ib0l1NC?EnA*|4BqaRCr$Pn?Y+6K^TT-H%U!GRW!tw2%fZ|;2|U>qyaTFhst8{
zAok!z@a|cfo0k^B-ynDqR1ic-?ZJ>%Fs5y`xzz-(A=osC3V+$Oo9wvLeu9-AvNOa<
zoO#OdezVY$eRi`mvqKfcnMfpp1Azc)Hk-)n^}^9Zg25nawOYvcq?sXk9J$Hr5|mV^
zklZm01GU?2=%FKZKN%PSKA#U=%$!+wKWH4Zzwd^AF)#vnAq7ARixdDUEK&fZut))r
z!XgDg3X2o~DSs@??*nGGCl;VQg5U2)#=XEI$ws4r$O?}fA2%<cFN@#ezuy6r%Vn<b
zB;;2BQdpz_NMVrzAcaK=fD{%f08&__07zkx0wDVe+34&%3dTtzD?zdmIw<@T0e^0E
zlA3IU60rTl8|JlmG#afz=^Pa`^i4eiJuWZ{NTpI#mwyps`_~jyU(K(E;1Cy>1x(LQ
z?L*l!mW5GkXW!#?x$9f{)^H2B`SgkoWzSe`%k%Z65yn4UyBq5p!!6+2t8fv@o>2{#
z$9y(=*=#Di#ZN`90+>eu+{PZK&9d773;+i(-vL+WrX4>6kcH4*v+Ge+SH1ADFx+1O
zP1C5arGGsSs4r)ihg-n)`Sf=v9fK9Tv+_K53A$Wh7I32!TZEE^y|=N_L#VmHEFk?k
zeC*CpFW8eIGdEd%3|%g;j{^3Lj<yW~aybksEK&fZurQATtjugr+_z)&u;-lr=KlqF
zAq7ARixdFK4MkCy8Y|pKfw|Juf;}-l30=q7i+`yMlvHpRFgu^F*dJmXx{i7G;{9nT
zso*X^(=@WLK>boAo6Rzv19t(*WU|(^I-wH*mr3(PT6<F%fszXD0uqTt&3)Dix^Dff
zU|-jS!#%Thry7NlioqBL?aQEg6;q*T@E54zeh0+k@fteS369<NRaCF)_=H~H{lIhw
za7-6KHdoEA8S<YSF;&(1$0@9A4)-%4l}gnx#v$5CO+KGzItT6oVzHQR3mAj0V{~0V
d4<!W%{Q^-%ID3BNkl6qL002ovPDHLkV1h@qdMy9|

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png
index 3fe3f626e793d16d9353b33ed1780ffe7b4c8400..0a54faafb0dc4d54b4a80429d75b7b7141d40e5f 100644
GIT binary patch
delta 1067
zcmV+`1l0S$1;7Z9B!3BTNLh0L01FcU01FcV0GgZ_000B>Nkl<Zc%1E<O=uKn7{{Oa
zp6#T&iEi2?V~}7CsWx#Vo2;ZP8_-nIT!cVHlt>B|dg!Gsv=<Nc&|>u>Qm|k!w1|hr
zR@fGd3QgCqm}T80_(3$TqHzPR?(CXr=6iZ5y-2ccS$&_w&VTPXF#P}gc;0zuc4sKp
zbpey^qaPk_-zJ;G>bNs(f6_L@e1B(1iqL0zPiy^S1F3&I|HrjQf2|~+t>ola!9?`2
zJ~{T33A75dr5O1w^^M|)a?M>Ki42K+nnXxBhNK7`iL7+Ob1iJw`#tPp9c@xMze6e?
zeFApX4A3{VDSzmUZiM}(4io?=c3*UZ|18WXB=XS(e31K61I4A+q|Zs+o8JmuUzi_%
z_$Xf_m5(l<tte9Zw9N#1b>J!1m=*G-(4ZTpsu5WR=mMU7d`~o0O)VS({XS%_)&js2
z0QfIEz^edVz}DaT$1wBJcL8iX0oVnw@dRKOz{V4RU4H<Zsuxi4jnLk^pYEvS{7Rqa
zE2Ziuz!QL702@yLb^&ZW0oVnwsd@p#ei2H<;^CK%agr#(UECWXA_5Yzc)0184*C}V
zf*RyQ-P1<)R^fMD6FL};M1DDl2;d}9lILYge>-m(oW&P20%Y4?*bty_|Ca-TOJH?#
zFrXwCN`Lo2NuSvHm3yO*=GO;1NX0J;F##uUPb!f<zjLhqVEyN#hn^enmF($-8LAI@
zNL5%8VglU8674J0FcULZtdyL!7RP~3hM(9cNEKKHBHN&;YU-f8$-LmpX{^i#i+<hN
z6AQUr$yEZ0{Bn5r0VF~=Nt8zBuF+eBCdzth<bMOT0{v4eLm5$BCy`$cV%GpF=XVx6
zX{W2ThYgQjVvR`2Tq`!CParV?``+D9J9+*=X+In&e7Ey6xKT(m>uaiL8+`aEUwj_X
ztnQkI$VV5y$;>wAH84*(Zqpy6Dl7@HU0|+Z?$22vZ}Jpt1VTErO!G`zQKU%ZmxIUz
z^nZ^Hq!O`sxE27;LiXxE$Nzp9BGF)Zh%Et9FFgET(67SScml8sVB-nEE`W_E0J{J-
zRWE?T{$2q4{er5W08apR0c<=0*afih1Yj4yrs@Tte=%}ydm?74n)>qbs`+GQ<?(kk
zeaaT<dIhnaZ&^2DWUj9>-gFbOc$kC)^nWFAC!o36cEc`a1Tb8SU!w;(d0u{llSGL`
zKKcZVHhwGK<ffprb))^o&qvZLK;%|OgZ>PFLLwi10!}Z)oilLJKA1cXKkWXxj_-4=
zleZ@oQu*i;FszO{d`e(^t<S89%U3L4y~DYUB^LmQd^m|d0bR*e!k$>jE&6qbl_dG#
l1z%1ZlsB16?F_GjzW_RDWP5lu9N7Q>002ovPDHLkV1m;x@CE<?

delta 680
zcmV;Z0$2UO2*3r9B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mjRY^oaRCr$Pnz2d)K@dPsQHbf}IIs|HM6kOmA7EO)!cVXf^8pbX
zKf$lCjUSN8P7oW#LO2e)B%lzPI1@JOZV1Mi*|_^)nB}^8w|{qg$;?`&Oj(xWJkPVb
zuCqp?fmgpNiXs~f2HDn4-GS`l?&$Fnm%m~ivl>u5v3s`F-#D)(ftT1(7XWu2;-ItL
zf7^V)t8%CdfNgIV|9MrkaLJCk0Kio|JpU2|A%L)p_r3W3k{|>?;lASG1eh$CP!|9N
zn*rFxbM6Fn0e?`O9e_mffcl5f$#Z#u%O5OK{K|g_nRng}34%HWG)Mw4M@tfbIa-!J
z29F;Oy~o%hEPISCOL_z_M@tfbIa-nc%&at<O>bz!ehgBP!_&MwSy=RXJ=I^NtUJIi
z-n{b^+OP?r;>_ZKs;Xu}8`d4*Djtw-e$0dYCFm-CvVRB!kyF4`{LaT7u5=L*0NBMp
zb>CZ~(Fm{TAtr#J;-M*OHb%7&6F|+6*X!Z5?*~m$ZNzs#Xo$W8AYcXnFU9o;5YP#R
zb~w!iXe0U#z~xkeJrbjVhyZGO+7d#5T>!PXToOWnRe;^$H6?^1f=vJw?UG=IHmp0q
zCBY7DM1LA1^Zxj_-M|0;jS<(Kr_e@3K*%Hkn4={Lz#J{=V{+Q_1?dsM94$!z=4eR*
zFslJSlzbt9`Z3sUx5v1gVbO8<l|Kf3ci!$SbD=JP<^(7JNeMx`1gU8PYo7!zf;t6!
z5;zG$fH^B*OW;Ob0L%zLyWAx~0(Aj2CtypELLps%*&v140okTWmVE(@sZ)s~)1xy0
O0000<MNUMnLSTYlx+YKn

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png
index a50fafe0ed2f6c7e70c0d0444aa84f70270f1ef0..1f9ba05446a1f82dbfcc86e72429419f5f7f490a 100644
GIT binary patch
delta 1108
zcmV-a1grb%2I&ZpB!3BTNLh0L01FcU01FcV0GgZ_000CVNkl<Zc%1E<PiRy}9LK*i
z`*xo%-Oak$m~LHnTLRgGkcI}5=1@|a2!i4vA^{Jwr3LFnFQEm~LkqSQYJ0J#3Ke4y
zf^3_EC<tnCX(1}4M8U%bLc8hOX#Q+=ll1NTH`9ZpD0DZ%$bU>A?{od_<NMq1o0;E_
znR$eB4wbZZw4a&3lCsl0N*=af4t@Xkm@`uO!QF9aLEn3A|Lu*Q|FPq{t0MZE$ipuU
z=CL9wbh%dLBjt-WTu0hlp|XVPQSRK%)48w?05|{o1ppAg6wzhrD>tC|&SP3UxaM@{
zQ=!g87c%*s#(!eA=E~AnZooQ|{j+xV{3t05F4!`4H;n<5YNScmk?|q~gm}_)WeGKe
zQj)$A37#E3iI%CD)SQ$Xu-cbk#<-z51D=~S66onmviJpk>nwuN`(<Jdty(2iU5~rW
zVkTQWykg1HS8l*F&;ZfMIrA=)Dk@X#|M2?&zYlnd-+u@AeSqHwDCq-;=zhSF>Eru1
z`pxxySKpn_wOZdsKh!>YEgRfDGi(=0h3_~p8+tN5^RZ9@g2)>Iw&RVIFWSqsDlhU1
z2lJ%X`+7(-V7<1l*ZOoWtd~2ttKE)*L<1JHH8+#rX>=yK(49|(iU-%6<~xs-uR&51
zC=4#x*?;q+WU_x&YOQaCJOc>vGG2r<={hLYh&0^|kU9cdregH$@JXa^M1r7nQ<xxc
z5xk)5J$*@*G!k$IJl7aEwAH?Z@=73Y5j?zNS<GY}cUcKl*Bn~4qW8<nM}gESaL&BT
z0z@OSbsORL0kVYrJ^+3n;P(N3AFv7g0O9?BwttTHGnF@EJUlV?oSD_PUuCfe%LD)#
z#Z~VI2;UEwzml?zpN!zrsjv;k{&O?^^DDvP7fm$)Fvi1rqqs_hr$CZ5)0Uy2_r|SQ
zkZK_UO40r6>!IQy(*Xh$2%vFXEy7b^&8mH~T&tpF&f&!6)A+}-F!sS${K4E526w#&
zkAJ&7Kr~t}o{Y9BodUuJoG6Tb2>|ydN_45K%nE@Op1Ii?D)c`x0pO_7OLc0{dU5{N
zZ=VVO3ju@;AXB}k;$z#i#rLhJ2b!D*03bfLO<O<Yj9-fA_2Rte_s@kA5aeZ4fv-iL
ze=<GuiBJN92v>m@xyrVgQN9YR#y3E90)MLU4N#qcYJ3A!C!m@wZ-8(oD9Vf6FKC45
z_X1mf1o#H1PCzxj0jd*Fjc<VJ1XQ!-4N%?)soqjk{^8_&uGJFRR29`%ZoqM455+OC
zdlM!7xoz_!k4&J695s5We$1#F7u8oj1ymobC^ul&!vm)QAb2aF75A(-jJdo!pG^uq
zbBTf_(X7>r^WC>U7138-1xmEamd2gH9|L8Fxi$x5n0)6?JDoFvfX4t2jpJe{9|5Y5
a*Z&1WAAozTG<R$O0000<MNUMnLSTZck{DP3

delta 851
zcmV-Z1FZb%2<irqB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ib
z000ib0l1NC?EnA*|4BqaRCr$Pn?Y+6K^TT-H%U!GRW!tw2%fZ|;2|U>qyaTFhst8{
zAok!z@a|cfo0k^B-ynDqR1ic-?ZJ>%Fs5y`xzz-(A=osC3V+$Oo9wvLeu9-AvNOa<
zoO#OdezVY$eRi`mvqKfcnMfpp1Azc)Hk-)n^}^9Zg25nawOYvcq?sXk9J$Hr5|mV^
zklZm01GU?2=%FKZKN%PSKA#U=%$!+wKWH4Zzwd^AF)#vnAq7ARixdDUEK&fZut))r
z!XgDg3X2o~DSs@??*nGGCl;VQg5U2)#=XEI$ws4r$O?}fA2%<cFN@#ezuy6r%Vn<b
zB;;2BQdpz_NMVrzAcaK=fD{%f08&__07zkx0wDVe+34&%3dTtzD?zdmIw<@T0e^0E
zlA3IU60rTl8|JlmG#afz=^Pa`^i4eiJuWZ{NTpI#mwyps`_~jyU(K(E;1Cy>1x(LQ
z?L*l!mW5GkXW!#?x$9f{)^H2B`SgkoWzSe`%k%Z65yn4UyBq5p!!6+2t8fv@o>2{#
z$9y(=*=#Di#ZN`90+>eu+{PZK&9d773;+i(-vL+WrX4>6kcH4*v+Ge+SH1ADFx+1O
zP1C5arGGsSs4r)ihg-n)`Sf=v9fK9Tv+_K53A$Wh7I32!TZEE^y|=N_L#VmHEFk?k
zeC*CpFW8eIGdEd%3|%g;j{^3Lj<yW~aybksEK&fZurQATtjugr+_z)&u;-lr=KlqF
zAq7ARixdFK4MkCy8Y|pKfw|Juf;}-l30=q7i+`yMlvHpRFgu^F*dJmXx{i7G;{9nT
zso*X^(=@WLK>boAo6Rzv19t(*WU|(^I-wH*mr3(PT6<F%fszXD0uqTt&3)Dix^Dff
zU|-jS!#%Thry7NlioqBL?aQEg6;q*T@E54zeh0+k@fteS369<NRaCF)_=H~H{lIhw
za7-6KHdoEA8S<YSF;&(1$0@9A4)-%4l}gnx#v$5CO+KGzItT6oVzHQR3mAj0V{~0V
d4<!W%{Q^-%ID3BNkl6qL002ovPDHLkV1hbmdMN+^

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png
index 6edfddd38d6da14267666ae4f5ecb90a7f0143c0..5fb5fb0c7f73e3833ebcf274b733b174ac12c36b 100644
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP;jrO
zi(^Q|oVT|(@*XmfU`=eg(NZ|0(N6hddRxz7owSbqKU9jY+rKU;dVJ`1)N8fM`tR3M
z>TT?wr_|5y`QONt!RX7lrC}LEltVCs?gGsQu?r#&+!<U8SWWt0GXAo)fBMOM0TxNt
r3rw@{=!Ht3y;k4YjczWI)@SS@213=VXO##6J;LDW>gTe~DWM4fngUnA

literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1enaIvS0V@O5Z+u4S^4Gsba<c>^8U=G(fAZq3j
za5#w7z+g*kRq<r`ca!EHJD+oXlkvVsG4Go{iW*-FVpy}3A;Oz+!!)J@UDg9pTn$@A
z7_xuX@c*cu|KH1>AzPCHhZ-yrUl@PsgY{#|1s$tkh+4{1mvGRt5$Ie7Pgg&ebxsLQ
E06wu-kpKVy

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png
index 73b05e9b2a0e57f6bbbf74c2203f6a234ab05f53..34c51d7c3d6a3b995f8df92ed1176e988a2ad8cb 100644
GIT binary patch
delta 2050
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

delta 412
zcmV;N0b~A;5VZr4BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0ZK_kK~z{r?U%1l#4r@c3pufDayLr?8Zkj;@h9<kB$__}jl|=T
z=dla&^j&gxOm3Nje4BougL3Q2mLmE|UYh=Rec!$<>FZIR=YQ|QBT_&VMY5A5iEQVl
zX&TvfUH2sb!Rxw~6LXWMsTA=k00RiliSyM>sn$-)X8l<3pp4lQz)V2IS+SZ_#I{_^
z;5<2F9;<l?PL2gw2nRL%XY}CTv)jwS#no-uzU_MsQ=n%xUY>~8=ZC_W0fL3h1T4!k
zC!;@utL=Lj1%K$oaV*-lbu#!4u~4lM20y*LzEeY^*u6a6V~<0haxen~|Hc@z#ah5z
z1OY)n5D)|e0oDR=kB>21j0Fi`QNkP11^Vjs0K^RzBs#p;UCc(fQGi~O!K$iqGWuh$
z-)hVs1&JPfs>+yqqCHrY`Y6l)$HT<?)6DzhRQ9|e#1#jHer95qmM69V0000<MNUMn
GLSTYGh`YrA

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
index 90c736a41c..456d8a2890 100644
--- a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png
index f339bedb11d37faf9be7bfdfcdb3aaf21d18e791..8beafa06dbb5d13694d1414440fbd8abc6a2d5dc 100644
GIT binary patch
delta 2218
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

delta 735
zcmV<50wDdh5%vX;BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0*gsRK~#8N?VBM?13?f)4^-32QcD6FQ9()_qOKB2LV`e`2o^*|
z1z3VYAV^4%NL&T3G>8f`B-m2frVjcqvt(&@x$8}@o!;(CCV#V8LYkSI-I<-eTL~6S
zxm^CHVIsQSF3ScH4#?$l;kZyJgnAlUtyVT10OR}pKF!7_6A@4>7DMBq2ZKSdRX^^~
zpCh?#9PZFC5v!y{0OJt}Z%;Rs;n!ynN4SV`0G_;Z!h7ebLer@tY6)!bop$h4VLY4w
zXGGC%w^=rbihlsbW~Kfc36N5$WECzV9iWrX=Y!#JXcaCZmjJ*rz!Qd%8@mVR;iQ3a
z7PzEgBE(04Lf`py;j%OiNDJ=(($3-?K-yW@X>k9fc}BxO<k!}NkLUXf<ndmw7Zx{a
z{`K*yqEa9CG{?m+0n*Om9YESyyaPxl2D`dRmIZbSs(;mL*0#1f%HnLF*)#|vZ8D4V
zdfKoZfFj2xc=Ge^@lDGtD!~^TTG4xaXnZ<X3F<vQw7h9r1gT|#Nzq&0l3<4)dU`aB
z4Z<JJ7>z~?UjpnO|1S;Nfbk#`4oDIKI{rAkVEhswofzjg!K3C~WFe$L4S+O=0w^<u
zkm<I@B!9|y75-9~%O*Hk3e&U**x^^LRwMTSWjsn^RE3#33rybE>jJ}d<LO^S!QTVu
zp57$r2}oxaS-^NP0-U%QG41$}WnnH^Kr-F|q@Be(fV8tLGzEdUugTdm%fofUjo0MT
z!aIPpvv>!Pc9x}afPTxQ3m4I85WR$`Yj*BeV_4!NK=l=D!bPM5^d2H)^1TCHxQJT<
zdiOX^8*N+(X6LiHX^o!+q8y-%N9)|Q<C}zwh$Z0sr?bv~JWazy@FE}xegMu&5QrON
R_dEaq002ovPDHLkV1lsMNOS-I

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png
index defff91bc0186ab4955ad1c16e520e2a4d9e1945..ba95fde9e59c54dacd0eda155231ef640db07f41 100644
GIT binary patch
delta 1128
zcmV-u1eg2l1pEk)BYy-#Nkl<Zc%1E<Ur1F+9LHzooO6#xRBG*-7Ntd6n`MzwNff3*
z1Y5ln1kuW}5k4#|v@UH#+d~^#5cCicL{<>gOMhtD2Tdy13hj@jttp$flx3}@yVSk+
zoO@;_ezz@r$eZx9nG>Gx%ei-cXU^|;e#|hR`<uCxASI<lJ%1o8CvR^`=1lp#^A;P}
zJ|SzK=znrQ9$zB+!;aP;G5)nD;M?l@-MxR*TH}j~Jt4&VhxJ{%Xr(MHb>Q>M>vi^E
z_UiAJ?ZEhFL%8RYDv1&{X-NqW-@Rd(rb!uNgm$!q(uzuB%pi;zge0<KW79qY!cli$
ze>h5d`d^U)2Y*iz$8pHd6`N&yS2tNaJDYIMrC}IsFnea&*w1?kR9?8b8?K#Ax0pF)
zx^M`Uk-JSHb7p=7+NY(DWwv3k!R*Jktk{Y1uYC%%Jna*;C#qR^a<=oI5V0utB>ifh
z^Q7*4$ce?|pO1QZB0JW<A69`XO#g=+treL5CZ_XnXn#}X(aV^}>{?rZibDGo(5)Z=
zK8Qi9f&};=2CWJb;DZ>nYQ!f1O@cemG_At)|7FdB-!T0t#l6Ca9|1uEd=P_H1qtv$
z3|bW=zy~pC)re038ic0Kn2joFb+xykN?KSDLYKsfw(fVH)t)ocOV`9VF{G3RT%j#(
z$;x=!i+}px?L>B+LQjFbi7BjP<2Pc|qfUDaV^)%3QhD#Tol*R?Yg-nbHF>;|$gVp9
z=m1_v9Mr}}M(P;c#s+c<pc7DDePs_^Up6<Iqw@=6uzx4--wDy&x$ghBh$P0$!R$xM
zmTpJAfbJhdQAxz(`dVYuoCPt@^P~`h$QgO=i+_e1OK>6tCnS*_>mRG(SOrkq+g<G~
zTBiVd71&gH^wP)fIrdZ8(q-EZMV9Aen(GUvSrw-n-H4E~Zclj#>mMs+AmlkNztr~F
z?GHy~gmWo8p?&y+lqCRI0IpYCJLBK`uGiS(GIG(In^-AJz?UVfJ+G}fIVUTVz$%ck
zXn%R^pRU{5QCw*N$#V+aU#kw&0ZXKIDN6vQl-op7+qMZ~OgjO-lhP63{rwmFzI+3D
z)!b<LB?-zB&{K2P&MufQ(#MS^sriLoZ$q8=MfQB{D}k~Ez%M_CbHO<mQ6aq4g~d)^
zcboQ6pmYj6==oO|hC%&QhzU4Am7{<I0)Gw&I3VBvKXQOC{x49x?Vy{?D6Lvo7&_JX
zAa=36+iTeOgFTc(l)Kgzpw1U)KPd`=+Cao03~B{XGw_Dt4De8;eHj84045*<7~vf=
zsF3yq01E&U02=@!04o49sPgX{Bn37AMgUe&>DNC@&RCogfE9oll=)TVD3Rdhfng1R
z5r7qx`c~=eLjo26CIB`7MgUd-W>Do{djg;)0JQ<A5kRc~Y6dEIjs0{$f<dhSY6eQ3
us&w`t1so7?z*_|z5O6@i0qQw`5b_2j+mFcCwQ({40000<MNUMnLSTYdQxV|+

delta 596
zcmeyv@rGrBay<iMage(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sBugD~Uq
z{1qt-3`~rkE{-7;ac^fEdN4Z*xQ6FW%1(}Q)RtE4IAW4C(a$4UlSAxU(rVW(ky~9`
zTNNU1vAk*G5cAx?aYOsYF_Fx7Ok#$M|0{5anK$3Gu1}NGslTb@ZMWTgw{dmxIpd{4
znLT>laqHE8@!#WJ5w=>1Icja#Hr@s53SCOm&p$Vu)N{t3ajI9Uja2WQWA6&ZojZ4|
zlFwOmT1k{`!n!Ht5o~wjuDP<EalSffmg<DlPYovZl<l7Tw%lQDn6PVO+UA+L%vahE
z9zOP!bC-@<-~*ZZSTXK^{59*==GV44AJ5gF+phjcg!^mY0iK3cM}gQ?hV6Tw)FK13
zo2R=E%@B!Z3fMY>F<@(iNW-R&wKFCvnH~6E7}ix$bf1$~^U=x2OVWZKnanU*s_JU<
zGe!M|qq*SvyT6TA<}>T?INfCF_Fm)Wt-#wMZ=Y9atk>@89UWAEWb$hM=6$Dc2OXLG
ze=7fi(tqD7ip5wOUw{8C@wf3>{lb8P=7R@zGa7d?UDmgGb@`V+x3OV^nN7&wrEaMO
z?_wMNANU4z56DgEc!l|a*O7A;w0O;tUNAZ7$H#xRevyxpHoiDyP;&bA@8utV<S+To
z?VH2ta5aeyE8gqOdinY8Zlk$OE6=`S^UUH|(Dd@l@yU1iH77s3BW~||asRJUtp~tV
O!r<xZ=d#Wzp$PyZnFSF5

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png
index f339bedb11d37faf9be7bfdfcdb3aaf21d18e791..8beafa06dbb5d13694d1414440fbd8abc6a2d5dc 100644
GIT binary patch
delta 2218
zcmV;b2vzs?1+@{7BYy~dNkl<Zc%0>%dr(x@9mjw7+{eBEm+}w|ut8K<1px&gfmk$<
zsI8MY)0io3rmvZH#xb2_nwV+xhw+cJO-v`9q~lE6X`3`HGr>+x#sp0uKovq1BN$Y`
z7XgVPLReQ|ckknz&TlIgr-*hAbMChJ&g|@R_b$JCfA>6o_kVsrM*>bU#<>20BuP+M
z{*9eid)serOY!By$i-8jXwK+A_s-8XNBT~9rv5JZ-a>lq%6W4B)F;nz#pn4k%t8W+
z);+p2!<PlVO^;b4p~zVDppO3|i4~NdWkhyK)QSw%R;MSg{dx$$vp|yZJ=pp|T<Y3Q
z^e@{sJkJxKaDN^BEC{cB{Q50=u&qH>Bp8QJni5ri$t6<{6U_*N92`xVSGF-C_jNfH
z%Tzs<p?OCJ;(TQffs0z)$FJC(004+*MAo6W9Mq2H?9GoqI+~ZBoRaBv$6@!t7q+tI
z)BZ?xO|3!*A?qG2H;ZyI)J(4%e!rbBcq}9UREd$r34ac`$1vFb(^u%eBWH<enj<b%
zCBUd`=@C$d`klnLSjYYM@2``aPWi*L5!?1IfYPsz$vt)N!*f6RL6~$M^MX50kv$$K
zaXLN3<#vys?Q}^#KVu*hd^s29v8yNBWP`}uW0>tN07v|xx*8~}`mUtwx_T{f9v!KF
zTUxWG$bVDwo0tB5fg1kypFf^%+kYwB6A&0Y#|j^RGCUB}!RvN9igL5e)1G*%=Cx-X
z-+A#*jd%L}t}P{8@nfP3+z^pvSvo&>jS3AaGT3zT&d+6|AJ;kXtB+1zi0(0R_<%!H
z{8*?1NaC6Y4Ay-@%gMS2%&rdC+=_=yQSoD@3x7zt1^Ull`kmxjR-%iH8#4(Ygh&pD
z10294Ns=sKaYY51NqF*O9Y@t4Z>s{c@0`$MvONK*3zpO2mImc3g)7Z8ZyYQrSxyJ*
z-v06of}@{zNy%ju27dOsozZO~2SM&qa_7Fbuia^%H=h08y3(g#3FXgABu`Z2JDz##
zh<_1gKpTFsP3!IHe1<1J-YoG*SPQsP|4y{(3{3p%9%i_?UQN8m&-XB479=bIX_b#e
zF0>sdgMl&lqT{HNT)N&Ix^Ud~E-3T>6yHMn>Yi$dD_m(%N^QUTC}9a;jL8v@SR@jG
zSUGu=&=wH-v`zcjjvq2Cdqu{bNkRuf#eZKI>goMFTK0~%eyFBo6$!obn@++KkaYjX
z2)^H!w;=j=;_Avs;8HjDG|VfZT_8Jc4zVl?`@ij1ep1{|gs{lD(>`0b@1U(8)vJ+$
zRj{Qn!%9!kT+P+5GjG~L+gkv40?MC!ITZNxW8z)5`j)F2-B!F7PmuOgYNS{ARDbQv
zaY@rOqqpU-l3KYHdVcvM-tgSw?gA>cSV~@r6+U-TlE9+)VtrkbXHkBLh9)LxI6Q8R
zkB4Dm%%uL}zze_ngEOb{A<*LEgx&JaB<>dQ%J&~|_6H`Qy(itM|Def9DWz3gH<@Ki
z?oF69HSpCRm>4@bFiZ}1tMp7zr+)^sz4b@Moq(tQ_+hlTXG0f(reuap0P~H%z9YYx
zu{em^i6<@?vaE<3h)X|xG)*ZkKQA3?nlI&-;gcWR>jCaA5F#?|YknUBN$F$bvZ|Z1
zVpu+Z_;T|Bhn0|cRac$p@=~L#Z9c3hA2k_x5=z!v*Bka}DOp9ca~2%pZhwc_OIN%w
zXKpqf{;cDcWG49v#sinSqb<zT!%|YlQn=dJdGq@lC%>z`aWCHq{IA>&Pp6J1erJbQ
z+%4eSdk#K7bf}gjta&i%?aRQTqx<locU`HQss<R59TK%d(utNuZ24D5@Vg|JBd)LZ
zE%{<!FSIxA-Nh5%_7;F1J%4)j=-H!pj~+gH`B6_lIGTbUKYIP>`J?xb3;?nK$OKHK
zLhRCPPlNFaPJ`ci7^lHGH>Saqo73P5-^9Vczng6qms4giM=Z<&vo;N0ztBZo3;khi
zQq?uJ@}E;PgR<rTkcbsB45}!KONmdQU>GDPL6gsX5sryMh`S4*M}LoAJ$m+&{ylp6
z=;@=kj~+jI{pk6l_m2z!vH-{g%+4wBiMs_f{rYKF^urAP{nqU}wAR*kBdK5&AOnz9
zdcTA>L&yf$E$#%|jfanSjH{k_(O8m^EPLHfbs(sRGB;Mih27hob|*k+9f00HG5|5<
zNs0<I>G@AG0LTO&8-E}w{_P|z0cdxj_m2z!J`_bJ0NDUh@oy)g2Y}u`G648cRAk(l
zBrE~w`J?xb3;^2UqT=33LR$cO|HuF!3lJ+w5S9S+{L%YI1^`(AWCD;45EcJ+5;_RN
z6b1m90AvG1#lM|w$K|tf@^`QQ=^ouF0onc7D)qJc&PeCwQGeR<@>8z61SQ|&iEsNf
zgp2^P0x*Rgm}Ch=$o2#vBY>;`G6TpCAVYvGfvET~QIeuvj?4hE1IQ4Fj2#o}1>i;!
zkR4D!V#pGRiW@UGC0HIKJAe#<$hfvA02u*f1+Y9ub^sZIFV!H3i~zC%FohkMWC=tl
zmevbUWCxHT5Puoe_CXLCf&K&4PFyk*m<Su~-MwVw#1Vo_!QHS20KioU*`5Hj%W}W@
zTj*^$%(VL!8*@f4%dUz?SifbAm+yEL3nUUac8E>OA1qr<U*EQYD}GFL0b~V`89;Ub
z83JSpkSRd602u>h4UjpQ<PVTVKqdj%1m4&&Q3n`IihnW#s;ZI=OXiZi^rbY@>rT3L
z;pAtya8kpClbbhJ;=)Pi|I5P3>k_qeIM%Eg`K6cky}392y(KFLCxG_5WZ6N-#}aTS
zdhv`Vr7yA+0Hv|9RcksmFe}DNEYtyjtN=0t$POSwfGhzr1;`d4V-RHxeEu-92go2G
si-1f5vLgw+@nd22IKJ7ld>#P)3Du3|1f3d0*Z=?k07*qoM6N<$f~3nUO8@`>

delta 735
zcmV<50wDdh5%vX;BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0*gsRK~#8N?VBM?13?f)4^-32QcD6FQ9()_qOKB2LV`e`2o^*|
z1z3VYAV^4%NL&T3G>8f`B-m2frVjcqvt(&@x$8}@o!;(CCV#V8LYkSI-I<-eTL~6S
zxm^CHVIsQSF3ScH4#?$l;kZyJgnAlUtyVT10OR}pKF!7_6A@4>7DMBq2ZKSdRX^^~
zpCh?#9PZFC5v!y{0OJt}Z%;Rs;n!ynN4SV`0G_;Z!h7ebLer@tY6)!bop$h4VLY4w
zXGGC%w^=rbihlsbW~Kfc36N5$WECzV9iWrX=Y!#JXcaCZmjJ*rz!Qd%8@mVR;iQ3a
z7PzEgBE(04Lf`py;j%OiNDJ=(($3-?K-yW@X>k9fc}BxO<k!}NkLUXf<ndmw7Zx{a
z{`K*yqEa9CG{?m+0n*Om9YESyyaPxl2D`dRmIZbSs(;mL*0#1f%HnLF*)#|vZ8D4V
zdfKoZfFj2xc=Ge^@lDGtD!~^TTG4xaXnZ<X3F<vQw7h9r1gT|#Nzq&0l3<4)dU`aB
z4Z<JJ7>z~?UjpnO|1S;Nfbk#`4oDIKI{rAkVEhswofzjg!K3C~WFe$L4S+O=0w^<u
zkm<I@B!9|y75-9~%O*Hk3e&U**x^^LRwMTSWjsn^RE3#33rybE>jJ}d<LO^S!QTVu
zp57$r2}oxaS-^NP0-U%QG41$}WnnH^Kr-F|q@Be(fV8tLGzEdUugTdm%fofUjo0MT
z!aIPpvv>!Pc9x}afPTxQ3m4I85WR$`Yj*BeV_4!NK=l=D!bPM5^d2H)^1TCHxQJT<
zdiOX^8*N+(X6LiHX^o!+q8y-%N9)|Q<C}zwh$Z0sr?bv~JWazy@FE}xegMu&5QrON
R_dEaq002ovPDHLkV1lsMNOS-I

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png
index defff91bc0186ab4955ad1c16e520e2a4d9e1945..ba95fde9e59c54dacd0eda155231ef640db07f41 100644
GIT binary patch
delta 1128
zcmV-u1eg2l1pEk)BYy-#Nkl<Zc%1E<Ur1F+9LHzooO6#xRBG*-7Ntd6n`MzwNff3*
z1Y5ln1kuW}5k4#|v@UH#+d~^#5cCicL{<>gOMhtD2Tdy13hj@jttp$flx3}@yVSk+
zoO@;_ezz@r$eZx9nG>Gx%ei-cXU^|;e#|hR`<uCxASI<lJ%1o8CvR^`=1lp#^A;P}
zJ|SzK=znrQ9$zB+!;aP;G5)nD;M?l@-MxR*TH}j~Jt4&VhxJ{%Xr(MHb>Q>M>vi^E
z_UiAJ?ZEhFL%8RYDv1&{X-NqW-@Rd(rb!uNgm$!q(uzuB%pi;zge0<KW79qY!cli$
ze>h5d`d^U)2Y*iz$8pHd6`N&yS2tNaJDYIMrC}IsFnea&*w1?kR9?8b8?K#Ax0pF)
zx^M`Uk-JSHb7p=7+NY(DWwv3k!R*Jktk{Y1uYC%%Jna*;C#qR^a<=oI5V0utB>ifh
z^Q7*4$ce?|pO1QZB0JW<A69`XO#g=+treL5CZ_XnXn#}X(aV^}>{?rZibDGo(5)Z=
zK8Qi9f&};=2CWJb;DZ>nYQ!f1O@cemG_At)|7FdB-!T0t#l6Ca9|1uEd=P_H1qtv$
z3|bW=zy~pC)re038ic0Kn2joFb+xykN?KSDLYKsfw(fVH)t)ocOV`9VF{G3RT%j#(
z$;x=!i+}px?L>B+LQjFbi7BjP<2Pc|qfUDaV^)%3QhD#Tol*R?Yg-nbHF>;|$gVp9
z=m1_v9Mr}}M(P;c#s+c<pc7DDePs_^Up6<Iqw@=6uzx4--wDy&x$ghBh$P0$!R$xM
zmTpJAfbJhdQAxz(`dVYuoCPt@^P~`h$QgO=i+_e1OK>6tCnS*_>mRG(SOrkq+g<G~
zTBiVd71&gH^wP)fIrdZ8(q-EZMV9Aen(GUvSrw-n-H4E~Zclj#>mMs+AmlkNztr~F
z?GHy~gmWo8p?&y+lqCRI0IpYCJLBK`uGiS(GIG(In^-AJz?UVfJ+G}fIVUTVz$%ck
zXn%R^pRU{5QCw*N$#V+aU#kw&0ZXKIDN6vQl-op7+qMZ~OgjO-lhP63{rwmFzI+3D
z)!b<LB?-zB&{K2P&MufQ(#MS^sriLoZ$q8=MfQB{D}k~Ez%M_CbHO<mQ6aq4g~d)^
zcboQ6pmYj6==oO|hC%&QhzU4Am7{<I0)Gw&I3VBvKXQOC{x49x?Vy{?D6Lvo7&_JX
zAa=36+iTeOgFTc(l)Kgzpw1U)KPd`=+Cao03~B{XGw_Dt4De8;eHj84045*<7~vf=
zsF3yq01E&U02=@!04o49sPgX{Bn37AMgUe&>DNC@&RCogfE9oll=)TVD3Rdhfng1R
z5r7qx`c~=eLjo26CIB`7MgUd-W>Do{djg;)0JQ<A5kRc~Y6dEIjs0{$f<dhSY6eQ3
us&w`t1so7?z*_|z5O6@i0qQw`5b_2j+mFcCwQ({40000<MNUMnLSTYdQxV|+

delta 596
zcmeyv@rGrBay<iMage(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sBugD~Uq
z{1qt-3`~rkE{-7;ac^fEdN4Z*xQ6FW%1(}Q)RtE4IAW4C(a$4UlSAxU(rVW(ky~9`
zTNNU1vAk*G5cAx?aYOsYF_Fx7Ok#$M|0{5anK$3Gu1}NGslTb@ZMWTgw{dmxIpd{4
znLT>laqHE8@!#WJ5w=>1Icja#Hr@s53SCOm&p$Vu)N{t3ajI9Uja2WQWA6&ZojZ4|
zlFwOmT1k{`!n!Ht5o~wjuDP<EalSffmg<DlPYovZl<l7Tw%lQDn6PVO+UA+L%vahE
z9zOP!bC-@<-~*ZZSTXK^{59*==GV44AJ5gF+phjcg!^mY0iK3cM}gQ?hV6Tw)FK13
zo2R=E%@B!Z3fMY>F<@(iNW-R&wKFCvnH~6E7}ix$bf1$~^U=x2OVWZKnanU*s_JU<
zGe!M|qq*SvyT6TA<}>T?INfCF_Fm)Wt-#wMZ=Y9atk>@89UWAEWb$hM=6$Dc2OXLG
ze=7fi(tqD7ip5wOUw{8C@wf3>{lb8P=7R@zGa7d?UDmgGb@`V+x3OV^nN7&wrEaMO
z?_wMNANU4z56DgEc!l|a*O7A;w0O;tUNAZ7$H#xRevyxpHoiDyP;&bA@8utV<S+To
z?VH2ta5aeyE8gqOdinY8Zlk$OE6=`S^UUH|(Dd@l@yU1iH77s3BW~||asRJUtp~tV
O!r<xZ=d#Wzp$PyZnFSF5

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png
index 0324c05f17dadf615a222aa7b7bb36d63b16224f..754af67ca375ecbe1cce1a93a6ae6de253280ae6 100644
GIT binary patch
delta 1110
zcmV-c1gZPy1nLNoBYy-jNkl<Zc%1E9TWk$M7@nEkJ==<?wl38YTB2^H6>VH1q?ZSg
zxV(@Mad{wdOC(hAfCsmdNIZD(fJP$W#Vz8Y)sQOEHk6_&w1iTWmT=D5%go4MsgO8Z
zOf$36{a*HD|FiqeerM-=|34Ru1i?8Mx<Pto*1`O3N9}lmaev98ywI8IXU^5e7Psoq
zCUg0L6W6=De)q!M%Od=`$i+Pc<}w!15a|d<`L%{uw(B@zs{RFt>WA;2I)=C3E;Hft
z%?C}L=RQ<kF=g>97vO#KU6MGhz~PVYg)-CAklRofKe%wdD~n&b0A0XiCfR#Sj^X%;
zxwcGR-v~em!GES{A`@|pF{aXZWf6G+9{x*RwXt#S66C&kDz#0@1sIeunYC3_=t<dm
zZc6{YC?j_=Yb`t9d;SF5TN-fE)O;(-m`f>T7NsnC<{V2Fzi<8npe>rF;b*O%m{d}k
zWWPg@2LyS*cLaGrkOu^LfRa2wcsyX|xth7%eW!Hm%70liHXpVMGSl?Mc_WSDv(<Kl
zabB@+ZK%1iev1e{#$t~k?G11(n?kJ*HGhOs4r2haxV<1vfG%(E@_O)o$N^;W$AUBg
zz}vy&!Rx{E!TTWxki{PhQX2ps4_*(RFO$~`(gXl+2agA@2iudy+a0970pRiA_2Bt_
z5kZ;&;D7Dl@!<8~`QZJK1IXf!1!)36jSsax)cjEU!x#XJ1<2x$1*u&CYJI5reN}_V
zA`0?=AP)%gfFKVD@&F&^0m8q+h|v=cCZ>($@0#xXBIdyK9M<vrap(QL;;P33gx3ea
z;)b>x<wnl3bv9${hpn~Wx@u%ET_1(dA8%KfUVm|w5bgqT7?Ghf3u*X%t)c5WCWIjT
zq&}29qsSo|B1A*TE3R4q;V$qsVjb!TM^S6X7j)$4X=GUz+FrbxH#WDR=@T*#rIc%$
zMq<TNllm#`0>T39zf`*ij!iXph(3H2vk>Ny`!ykbY<2|Bk4#A*rlyft@zOO#JB1!V
z^?#UP{hM}He(EF%56iGVGv-98%klUe>vhG&kmWf1(aSdK6&K|fMNhauiOBWMjrGMM
z*DH5{KUvD=XZUG)TnPdJe9#7^2n6s!8<Zjtzz1zmie4{(^8Et4&ewLkzQ7Bj`vrRa
z8xRQKgElBdAb=0rpcH`sK4^nd^m+l5?|&PFMU;ZK_`f$!!V1#2<rnmnq6MA1L^$Uf
z9N}Eo&JkE!5G($CgHR%=z6)dxNhF2KR<J%Vo6LTM7;&18`NO+rYW_UiGz>g$*Z|Ed
zF3PXG76?aep^25W<OH#a6`|JmfB@@CEBC?iV_mi0H#^UP`9oMi^3x&;7DtF4D^GrW
z)$AQ2{K~sPlq2@4vRvykaf;)*E@zA(K03?(P*r9yiWs8^dBsKfeX)IBWP1JilL!Ca
c1rS2t02xS*lY7{Hi~s-t07*qoM6N<$g3Qb!1^@s6

delta 591
zcmaFG@tkFXay<iMage(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sBugD~Uq
z{1qt-42*v~T^vIy;@-|S^l%CkY4hLuBKoZ9ij}GpIEp*jwjWp;$RRar=~g!O_Nc`>
z6*;7$Tg*BaI4*U}(9bY!pSJu$z`S4bDIzcS-l(iP$6i1E{|~m-`Q`6-exLK2hja4D
zlzYJ|MM|w?y;OuMez{uBU1q?OSy=qspr-QJWk)^#)5kgH&S>qr{I+c6_16!Dd5=6+
zF=JDi>=||YUcO%HcDv)}w<pFNImV!QhG9h%HoWIG<I$j}3=bI&{$aAc8&@yG>ge#c
zZ1#^9aohd-txmd`HiWHKjhehclOeQQ5-XO~zVo6cCoaA6gXaY4g@q5}d4Ak`@ni;&
zdGNQ+xxck7ejeAE_te|WKVK~wu==XnZHDXS4c8gxaS8utdlPz2n!~+G+&PZ_)z@Ds
z(gF24p>ud1^c>L2ZTMB&u>JSWm~)xD5B44m@o98g_+TpQs;jS3q!-xne%pLteec9X
zOYQenu_a$p`Cgs*bn4Zy=pSC|9xp5`ZeK5S(62dQ>kP(#tvCDxw2sAp=Wa{Q`lqkZ
z3iCsS*aSPDPHBbOIb!AxyA~+rF-*U*=+g`j?tQ9TBP0$;-BppD`p>UGcA@YzwuOs6
zh&-@9qIX#QqvnCNTUYo#Ys$~|y~FS|Gho|Zzb}j$k5BD?a^q7pFo7_5y85}Sb4q9e
E0C52bHvj+t

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png
index 6770b1a2357e8a4a28f4bb16a59fdcda5cff46a0..6f16899eded8c32a19b7a837eaf03ccfda43eec9 100644
GIT binary patch
delta 1004
zcmV<I0~7qh1%U{VBYy+PNkl<Zc%1E<OH30{6o&6iTNr39mf9czBmv5!(EyQ$5dn=W
zb)y?tqJ{-7G$uyfm{^wv7skX02|kD`bs>o%u1u&^3=eq(D9|DXksyy!sBIbSbjBPK
zH-@5S$hl)?zGai?f99Wib7$`T4?|=kNs_ETXt>gRC$HvMbbo3-AfCuI6~6uyn#fDH
zu&o#C`Nn(C`u}wOtuy7Fa`ag_7w-u6l8s^aJBIKfHsYUO-ldCj<I^(+LsGI4L!P<;
z@U%0EOGR@ips%Q^*6WQaQO55VvGny=Lh-20Ph+QMzmcM{<D~iSlK|A@D6cekzaXm^
z`qT}0<nr**P=Anhb@drD4^@=}{K1~3uXAfy`qZZY!-tslFFqY-FCaP{`y;H^M<ZrS
zB)T36W9U;K0bLKA+~&=8Jlr6JeE9YI->d*T0d)f!Za;R>)Th4;QbsdC0X0xXGe7|~
zP(?F90X0xX^#;h^54icV@06VDou|uWea|zDyjxKH2!GHFP(Te-(F{;P4OGz#P(Te-
zQN00ZJ3?)j>dSur4fg(>r$=PH2+0M-0J!;+H}10=te(kEHB~IEg*{7yJ$y<|0gs`-
z9Vk-(o^*0BkZcqLLo6mH@V-fsw9g)sIFr0{wH*L$3fM9;QoMaV!LW}EG&R;q<Fkti
zd0Bh0<bUIWW`JjOV%2u=u-I6gZ)<ITwZdlS#^%-+n3|$2tP-{aZ55ELR#phF8G7Hl
zg`mkI%nc8+a3YMQ9}g4*;NYVuCp-E*X5f>p>3axg5{s*kNW?dkh@rn7+Is+o2&@9*
z(=%+UDT#p$0O1*S*geJ=?Ijx+`rCmv0^rOa&VT+P0{~e7$OJ$(082j}Xsdu@f8lO#
zUw5$iV|Spbv5t(-F6#2K(y-*?f@T1m`5WyA1dG*N+48h=NJzEuZ>Lv8RV;(B3c#5^
zoc%)v0I~p(34m+>hW>V-?Fz^H82UUpa!roD++AU`DS#Dt_*Yc_9-tYZfEuWx8K8g~
zsDGjvpnw{vqIv_U_X{{X`eo${{{Maf%4h~Cpa!aF1}LBgs%Qo%pa!a_-T>+yBkkAE
z)o#@vq?(qQqZgd~+Vo_it+bL$OEEfTRzkgrq9DN@B8CanrvPLGAS(cw0mu$Oh5)hz
zSe>KPN5J`72e;WcnN<;MX?s2Zo5dOBm1Sl^RMI%<@-B$W!H6{2`-Z)G`K+bQ?OpPW
zj-lK<K-~by2!yA`bjHkV0kQ)^m@`OLD|}+2WC!RkgTA4}&8z@t5+OSP83M=>pmdHB
aLVg18pkNYXZ|aHw0000<MNUMnLSTZevC*6W

delta 683
zcmV;c0#yBh2*L%BBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0#`{yK~#8N?V2G>LopDBAE;$^%#wgcOpsZ`+$55O1c5*iEQpB-
zumpubkdPpea}(GFiG~C_W?$w;{>OEB>)K^uxx0?`OD@+ucYojddfToWnKF$=V^XWt
zve9UiRVo#F`b)iD&+<Iab`FlO^6xKtI?MB2=Z2PlVw18ODBiHwJ{#;d+eOeLcGLyn
zlSk|yUJQJnGAHT+u<h;QKL))fE!j~Q09?i6{g)sJ0S3Ex9Dv*eApnK@ibn@17EGuM
zK*8kzcJZ8tqkp;p6l({NC?2SP5jyQYUea=oWr|<>FG48N7ZL>31vE$kC`U^YKsj1g
zZi7eXU2hv(hE?0xs-#zda<n7?l%pjHpv+2jYug*zu(v@|<mc<tb+NGM_xq~9NLhD)
zU3|4#oeOQ)1h|R^!{Klyv|-%=uHu38@M96|hoGzYVt)|`B3-~$d<Y!?hzJ07@oz7;
z&GC3lPxKHIU@*mFC|VwjY9S`T3_sp`_tUu_hN9Yt?|{${Jp&N913-`BdIb#lzaQgp
zb1y&}(KCRSQwjE!7!5=On4zaFAq3b3m|>?&LI|)5m`->d5<(HdCctcQmxOX?!@2`p
z670}MWPdQS=!efk=j8tnMz9lnp^b=ukVyh4M@tewIa<`O$!Xs&NUs3pXh{MnM@tew
zSq=P9@`VKIZLrm9O=vm8ve)I;z73jt0_6bH$ujd!P#0kC377zq5`s7c&CmpEp9C&~
z>H<CqoCG1Dyv1z^+^7q{9RZBXT@oZv7hvuQ*d!99P!~`hkmBxu?9e33egG-XQi<a&
RG#dZ_002ovPDHLkV1nBWCGY?M

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png
index 0324c05f17dadf615a222aa7b7bb36d63b16224f..754af67ca375ecbe1cce1a93a6ae6de253280ae6 100644
GIT binary patch
delta 1110
zcmV-c1gZPy1nLNoBYy-jNkl<Zc%1E9TWk$M7@nEkJ==<?wl38YTB2^H6>VH1q?ZSg
zxV(@Mad{wdOC(hAfCsmdNIZD(fJP$W#Vz8Y)sQOEHk6_&w1iTWmT=D5%go4MsgO8Z
zOf$36{a*HD|FiqeerM-=|34Ru1i?8Mx<Pto*1`O3N9}lmaev98ywI8IXU^5e7Psoq
zCUg0L6W6=De)q!M%Od=`$i+Pc<}w!15a|d<`L%{uw(B@zs{RFt>WA;2I)=C3E;Hft
z%?C}L=RQ<kF=g>97vO#KU6MGhz~PVYg)-CAklRofKe%wdD~n&b0A0XiCfR#Sj^X%;
zxwcGR-v~em!GES{A`@|pF{aXZWf6G+9{x*RwXt#S66C&kDz#0@1sIeunYC3_=t<dm
zZc6{YC?j_=Yb`t9d;SF5TN-fE)O;(-m`f>T7NsnC<{V2Fzi<8npe>rF;b*O%m{d}k
zWWPg@2LyS*cLaGrkOu^LfRa2wcsyX|xth7%eW!Hm%70liHXpVMGSl?Mc_WSDv(<Kl
zabB@+ZK%1iev1e{#$t~k?G11(n?kJ*HGhOs4r2haxV<1vfG%(E@_O)o$N^;W$AUBg
zz}vy&!Rx{E!TTWxki{PhQX2ps4_*(RFO$~`(gXl+2agA@2iudy+a0970pRiA_2Bt_
z5kZ;&;D7Dl@!<8~`QZJK1IXf!1!)36jSsax)cjEU!x#XJ1<2x$1*u&CYJI5reN}_V
zA`0?=AP)%gfFKVD@&F&^0m8q+h|v=cCZ>($@0#xXBIdyK9M<vrap(QL;;P33gx3ea
z;)b>x<wnl3bv9${hpn~Wx@u%ET_1(dA8%KfUVm|w5bgqT7?Ghf3u*X%t)c5WCWIjT
zq&}29qsSo|B1A*TE3R4q;V$qsVjb!TM^S6X7j)$4X=GUz+FrbxH#WDR=@T*#rIc%$
zMq<TNllm#`0>T39zf`*ij!iXph(3H2vk>Ny`!ykbY<2|Bk4#A*rlyft@zOO#JB1!V
z^?#UP{hM}He(EF%56iGVGv-98%klUe>vhG&kmWf1(aSdK6&K|fMNhauiOBWMjrGMM
z*DH5{KUvD=XZUG)TnPdJe9#7^2n6s!8<Zjtzz1zmie4{(^8Et4&ewLkzQ7Bj`vrRa
z8xRQKgElBdAb=0rpcH`sK4^nd^m+l5?|&PFMU;ZK_`f$!!V1#2<rnmnq6MA1L^$Uf
z9N}Eo&JkE!5G($CgHR%=z6)dxNhF2KR<J%Vo6LTM7;&18`NO+rYW_UiGz>g$*Z|Ed
zF3PXG76?aep^25W<OH#a6`|JmfB@@CEBC?iV_mi0H#^UP`9oMi^3x&;7DtF4D^GrW
z)$AQ2{K~sPlq2@4vRvykaf;)*E@zA(K03?(P*r9yiWs8^dBsKfeX)IBWP1JilL!Ca
c1rS2t02xS*lY7{Hi~s-t07*qoM6N<$g3Qb!1^@s6

delta 591
zcmaFG@tkFXay<iMage(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sBugD~Uq
z{1qt-42*v~T^vIy;@-|S^l%CkY4hLuBKoZ9ij}GpIEp*jwjWp;$RRar=~g!O_Nc`>
z6*;7$Tg*BaI4*U}(9bY!pSJu$z`S4bDIzcS-l(iP$6i1E{|~m-`Q`6-exLK2hja4D
zlzYJ|MM|w?y;OuMez{uBU1q?OSy=qspr-QJWk)^#)5kgH&S>qr{I+c6_16!Dd5=6+
zF=JDi>=||YUcO%HcDv)}w<pFNImV!QhG9h%HoWIG<I$j}3=bI&{$aAc8&@yG>ge#c
zZ1#^9aohd-txmd`HiWHKjhehclOeQQ5-XO~zVo6cCoaA6gXaY4g@q5}d4Ak`@ni;&
zdGNQ+xxck7ejeAE_te|WKVK~wu==XnZHDXS4c8gxaS8utdlPz2n!~+G+&PZ_)z@Ds
z(gF24p>ud1^c>L2ZTMB&u>JSWm~)xD5B44m@o98g_+TpQs;jS3q!-xne%pLteec9X
zOYQenu_a$p`Cgs*bn4Zy=pSC|9xp5`ZeK5S(62dQ>kP(#tvCDxw2sAp=Wa{Q`lqkZ
z3iCsS*aSPDPHBbOIb!AxyA~+rF-*U*=+g`j?tQ9TBP0$;-BppD`p>UGcA@YzwuOs6
zh&-@9qIX#QqvnCNTUYo#Ys$~|y~FS|Gho|Zzb}j$k5BD?a^q7pFo7_5y85}Sb4q9e
E0C52bHvj+t

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png
index 0e02c2e8de00c8cbba348e75dd3a5b8dbce1d31b..f7fe3b636510031699b058d6ca713ee68030872c 100644
GIT binary patch
literal 272
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=*F9YvLn`LHoxPEl$xz_HznPrN
z7BqHNs5P}|CM-|y(9UVR8~-FCQ%Li*QOf=A7nyE<E}nPh{`%$DQ~nu9{$u4*C~(kh
zIKa4+fr)(z6NgLyionO}18+ad-F?3ObYaQ-`0F>t{{3SSad^-W#L&p>#mK^^!75;}
ofJA}6;xl;uGvU>Ee3MSRaj8(<bnD^}pcffDUHx3vIVCg!02H-bD*ylh

literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!G)eKjv*CsZ)Y#$ZEz4cAa^W<!-lQ#pfO8v
zk`*I|OZ4T-zHxU{?R)1(UQ14{Ia>Qx{jql1nxza8-i#ZjF(v4-9*E*<*eb%1t;ulh
z(@(h%-|hZSoyTx3hyjNhED|r6zr=&}W6CY<`N)v;l&3B*C{zLHSO!m5KbLh*2~7YR
Cu2;wa

diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png
index cd8aca5579705880e93303708f4e5c727687e3c4..eb9489ddb47bb11907f90822a5ba80accfef0552 100644
GIT binary patch
literal 16179
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

delta 726
zcmV;{0xA8oet-s$BYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<;R4t5Z6
z$WWbH5EbbtRV;#q(pG5I!Q|3EXws0RxHt-~1qXi?s}3&Cx;nTDg5VE`tBaGOi<J0X
zQfLw59mhSq_q{K7-vL6i%2cyw5>PeENGIZAF25=UUJ*n;&3_1D5;OH=W-$xT@pTU$
z-|wP4%e(H+F{l(w2KYqcIi?#H@dokirloV<Cl0Z)q!6DIM+~|k@gvt|m)|&-92R(H
z$jGMWi9^I<sf*<<W@SSqo*@n^sz&)j&Si!37H73uXYG6P7X}O3N`~vS#*n}gl1M>>
zj5;c)!a|gGjeisqX*!R4_(vUoid-_eDq!STKn*G+#}EDozk6#Ir>EScU>xXuvF(p>
zAg~Lx8n*p?Y}>69!2b+fX&ry93B*20Z*;Wq5iqn3TwHfFc@MbU0Y;v5$&eh$PfI8k
zf%h}|raUlw3k<BeeQTfN^a03Hua<9sgF|4VMA_>e?<DT)?%TgL?f(4$)=_fL?6-nd
z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j>h42`(Cj+33gs008_+L_t(o!^PJz
z4uUWg#__LAgg4gN!P$Yqa0o|F;pprEoV|m)qq{5d44SY4V_9{AU<5<yYad%l$nT$q
zm$ZQ3lcwogN#a^-C`sHHgGdUm>l#E9HlUBkaSQ<A0{Zx7cgWlKkp$jU1%Cj9`3J^u
z03ag2Q!s`<^IJwlFvj=`n1Zjj`=gS?o2ua70UI0uZ-6b%8ZZZE3z&<u1i0YN0j{`H
z00%xhfD4}$z=>N2aN|}1KJdu_zVJx_KJjF+{2$;Of88%9C5b0VGQ0z!@Ukp_1481f
zY?~`d{A&s%@NNo*ZY=$yvnMb7aXn|Me^Df&?!$KN6W3bf1FKOJy7*C8<^TWy07*qo
IM6N<$f+QD8Hvj+t

diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png
index 4130608cea1b0074f870bd6a0abf28dfa6bec2fb..65254207165b957f648e77219eb234caf994a8b2 100644
GIT binary patch
literal 16152
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

delta 699
zcmV;s0!00oe&q#_BYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<;R4t5Z6
z$WWbH5EbbtRV;#q(pG5I!Q|3EXws0RxHt-~1qXi?s}3&Cx;nTDg5VE`tBaGOi<J0X
zQfLw59mhSq_q{K7-vL6i%2cyw5>PeENGIZAF25=UUJ*n;&3_1D5;OH=W-$xT@pTU$
z-|wP4%e(H+F{l(w2KYqcIi?#H@dokirloV<Cl0Z)q!6DIM+~|k@gvt|m)|&-92R(H
z$jGMWi9^I<sf*<<W@SSqo*@n^sz&)j&Si!37H73uXYG6P7X}O3N`~vS#*n}gl1M>>
zj5;c)!a|gGjeisqX*!R4_(vUoid-_eDq!STKn*G+#}EDozk6#Ir>EScU>xXuvF(p>
zAg~Lx8n*p?Y}>69!2b+fX&ry93B*20Z*;Wq5iqn3TwHfFc@MbU0Y;v5$&eh$PfI8k
zf%h}|raUlw3k<BeeQTfN^a03Hua<9sgF|4VMA_>e?<DT)?%TgL?f(4$)=_fL?6-nd
z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j>h42`(`zWf6z~007}hL_t(o!^PJz
z4#FT5fZ?A`P2SjRICL-`!qHPWI(sk=(L*?NZb!Q6)COa#1s>3iGJJmsBmf1!wryXg
zB;GU)rX+5yr7DGw<A{jl4RG<gt^x7|xcKpM>*oJe349uQfINF(3kML9w11~y3x9Tx
zlZargO&72SKb)_3QxczsUVjCAa6mV}7gr4k!PNpnag~4=JUSp2j|$Mhg9Ehipa4zW
zJ3t%v3P^$P4oHRX3P_3n4M>gu49J0R2IRt519IYD0lD#yfD-r;u=Zkcug<A(0OLLs
hMP!+n$0>1uH-#$QX2umL1PlNG002ovPDHLkV1nsgG$jB4

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png
index 371b38edb204fd13fe1521208356135a1f129acf..6baa538dad92fff2a6c364b70fd4a5d045c04afc 100644
GIT binary patch
literal 9436
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

delta 361
zcmV-v0ha#UNrMBBBYy!(Nkl<ZScUDEL2iRE5JkTcs*tB-<BPE3a6Lc{$6Z)7WGpL-
z(1mMcLr5LR&<%fs5VrsG0Ge;nG|h;AR0#l8RRI8qXctpv1^^giEPylb`+gSyrPKsb
z`sVJzrKr0tj8FHW^}T`$0Jbzl1n|%rL0KWHky|2~cJ5U8H-DF+?i@rla=V53yt?Il
zuo2XO?F4Wh2xtDNstbSx1OO>zlCjnr09MUc0end*r-fcs%-p8{Zh>#{`ISVVuV*Rc
z;=_vu2-bSB3bC)P_<P8<IsguU1K<ES0HS+AYD<0#Kx=J{_4S;x_}lF`fJjhG2Ym=I
z50KCLd5m1Vi(-mozInD}>}AZG2t#S`7r5M>)f_fsy0m?|4?)lkDzFxvbLb}O4s17Q
zj0pjl8A_??X!Ze<?M&dyz@7&eM>8K{5BVQ;iC-%Jx~F~s2(i5p#iblP00000NkvXX
Hu0mjfh8dyu

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
index cdbfb466b4..30517fd0ac 100644
--- a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/           f141c349e063f7318d8c8a2417d840f0b2d06600, modified",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png
index 5539fa6154e17c821e8867ca5f77bccaacec935b..414ffd9f3ee92a394adcaab92ef34f74bbb1afd5 100644
GIT binary patch
literal 10814
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
ZYxlTu#$ZI33;lct)RncBDiy54{s+=SrBna_

delta 1468
zcmdlNa#v`AvN2;@rn7T^r?ay{Kv8~LW=<*tgU0!(6Ky>X2Z*%#2QLlMY7!GEJP|Ng
zr=zQ5vfDxqQLo9F@>=yP9<(0+ZSj8Y;o9$vPHT^ttWM^+P;%Snn2O=tNKxkX9~R0x
zo>>r{HqCIl$B~QM_Pu*)b~ScN`osFGYtwYuez-h}Oq*f$k?rG^Ww{0S)cH0ytr40p
z+&}Az!bj!nqW$+Rp2vz+q}}jQecpNaNYcL6sbXoY!OHVg`c};H`{{Hmd20P<vGlbe
ziM@6|xt$|xQ)j;3(k5_NY1)Ja4pvc-z@}b}w^o{BlS=fqe&pZvk7cJwk?6q_8yk#F
zPOOvv!(Vs)+9}_jYEMPZ7d3@*`V$p4a9>&7_qq0s#aH12|9N6w`quAc^QoT{mzy<F
zc|p4LjvaYfr{oHDGV|C-ZqnR6Y5uecey17Vr+@L4T<~6uV_ju&_MFFG7(Fhod1QXz
zprXN~<!`>4y?>WA_xAkqJ3k$NF*XSnt<^s=p_ze!fwRCPvY3H^TNs2H8D`CqU|?W*
zGg(N;pOJTRqL2$SFPFmPWkOCYKw4q)OCkBmJi>aD?S$<oHwx=a-YBd#`L?k3WG)fS
z$z~!RlN&`GCLaOP{Gwv23hti10alIyp0-LxdIm}mZa_|ANm_nUuC0<!W?pH9(&S)K
zB^`)VSZYymW_}(>wV{EYk%f{%NoHD_m48uYYF<fV30TTdY4R#j*%XjlK)|LVx4_re
z$|JM5B)_QA4kiqgC`w7Qa!O1`5`qfmWGWPwxR#YzB_>0REKV#-O;LghCTAq(rKhIY
zD(Ndt))RA>Tq341d6AfUy@EcHNjCcErrYRaa|lG8OKNd)QDy<iGO!sC(I6K$AP=a|
z3aB$TwImV5v#%&fOwLX%QAo`LI-y9(-Y#Bf`XdGgrutS-7srr_xVN+S<{dH+IL^%M
zbfKT|qmYlJmRF=^@%-hr4c{uQwy&A8h;L>E=aCEi0!a<8<max=c2Ri3A+xdm(o3Ci
z(Ovt`Z>;s>x;OD-ZN2N+5Ee&;F2`1er$v@I;j6D+c<;3S`ssECjyj{60r^Em6B)Ng
z>GH_cS<S7AKl-^|@o%N};(w=2O@jkf)-$p6`|OCQGxuJ-bo!AcD})%7^IbI7FY|qM
zP9!uqA#f$X;VKR}C5N6|9yaDco>fK%4D>_(8!?8hzn<*d<;7?*)$8c&vuPXET%U?C
z%wUs9Wce9sQO#j}{lmv!e_YOntT@l$T=JyX(^8Ug(;-fWdr@;3>YuE2-NR#c>uz<{
zKjzoppT2r7SZ5>GK3n>WK9}oy6KV6am(*>~dKLyZ?AdC;cp|!6xS=NN!<6{+<xLfw
zuS%>orsi@qGIO8%wlkJ(vGVy``Q=;J2y!?0`prpv!XNwiwrJt6pXPJRvyL6guF<H8
z+AjRW)Nab2mC>w8j2{BLllB1Z=lm)1p?v=xmtW33KWpl~Xe#{s=zBUrhC}X&Q-g`*
zfx_btl^-u-_<1Gbzd+8G-O=VwY;PDh@FX!$ncXX}fA#$owTj9AqAX508|)HYmM7YA
zdHvO_+*-C74>qbETW1iS-uR-{)|};B^YZ$@)(D2WU}@7UEL)WQ_OHIZd#ku|{eiCT
ziKWW?)}nlyxH67G0_Dltrz^Y#JbulJxpT_s)&3hFXT^j;J-=t`oF0Zh*JjQZxq4b5
zi<6`1@<Xp*S7-d<arkgC@VT1nQieTk9NqiM5BPTN(mb&GxaX;igVFl-^UuDO`ePTM
z+Q2EdwD@1%LAA+?lDH!Nzg#2#Ro*|?SacK5hduF2*9vs>vfkeUEISxHUHx3vIVCg!
E0BoaL-~a#s

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png
index a7a0cad53aff9f936f9dc456b55d44b57fc39e4f..90131a48bf96cc8117ce389ac97229626c1ca243 100644
GIT binary patch
literal 8214
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

delta 1282
zcmbQ{uuX7+vN2;@rn7T^r?ay{Kv8~LW=<*tgU0!(6Ky>X2Z*%#2QLlMY7!GEJP|Ng
zr=zQ5vfDxqQLo7wQd;#Z9<(0+ZSj8Y;o9$vPHT^ttWM^+P;%Snn2O=tNKxkX9~R0x
zo>>r{HqCIl$B~QM_Pu*)b~ScN`osFGYtwYuez-h}Oq*f$k?rG^Ww{0S)cH0ytr40p
z+&}Az!bj!nqW$+Rp2vz+q}}jQecpNaNYcL6sbXoY!OHVg`c};H`{{Hmd20P<vGlbe
ziM@6|xt$|xQ)j;3(k5_NY1)Ja4pvc-z@}b}w^o{BlS=fqe&pZvk7cJwk?6q_8yk#F
zPOOvv!(Vs)+9}_jYEMPZ7d3@*`V$p4a9>&7_qq0s#aH12|9N6w`quAc^QoT{mzy<F
zc|p4LjvaYfr{oHDGV|C-ZqnR6Y5uecey17Vr+@L4T<~6uV_ju&_MFFG7(Fhod1QXz
zprXN~<!`>4y?>WA_xAkqJ3k$NF*XSnt<^s=p_ze!fwRCPvY3H^TNs2H8D`CqU|?W*
zGx;KqKO^sC1zs0sUM_{nsk}}sKw4q)3SRlir+M`z|K+ux?7*ipxqwe?@+>~>$tU?V
zCx7MhnC!ssFu9rEWAZtEF;xY3Pu~D5#{f@TB_llpB?vblC$S_gzbMyM$tN?fv_fgJ
zkbsgnL@F$`s5mn}52V`AK+niRX>y=|=;TZR*%Xk~AYfCGTj1+!<&jxjl3!G52NMQL
z6s4qDIVGke2|)#OG8KwTT+2$V5|c~7h8HK6rKTuB1(P!p^U_mOY?bttCchPMm~1Sl
zF*#9Cy<R~d$s`+nbklA0u{i{y&Ly=txhS&$WEt2Dh-i?D8;}RoX9d)mn_7|x;@MXe
zBqnF4mMEm=0i95!WN&wgD{mhI17rO?PZ!6KinzD44gC%~2)JI?R64E@=(3MxDz^yF
z+J!w9{4xyZnuFT5Xt;>1+|e?Xi8Du=wXHE<)0gXgN6*@s>TCa<I(sT!uD?7@)*^9|
z%1XnpNqgfqzjM6PpmREcO-HP|PTIlWA#z%tiPS?c>#F}OOEROvL!WL7+;eDY*dE*Z
z^XGv&7(`WhoXywl-@`WDPeQ>n-Kk+7ll-*Psr&CUUVb@cDr?&2$o;$l^V!a?%gZzT
z`snM+kBq_kN8+1Y12?dVe~moA)3E9&5Vy`{^VeS=nfWH&_^?-Uj1J3!EJJ26zULBn
zMC#Ip%L~4gP2;XEeA&b%{_Ro7r9)flMSUfEqAxu<6lb&ZM4UmcYec=D$5P%6It*Xa
zq<QwRwK|ADXm3a_-kjN97#$sRqkFY~^QE`BdT)+?zsmeV`~8xCJJip9mI?pA;D>zw
z@x0A9JERLH=xq3XXtCwd`f!U5#xDnhS>3gzuCRT#<^CXlqnsf`Hw_7w!8osY1@3kW
zhXiD1F>eXZIrl&4szu-9`;!yiAN+WCpK#)x&#Yoh0b6G<V#S3k60LMTalU2BlzGMC
pna;DI?d7}kllR#NZ9BX(Kk4H8e9L>4w}Cm3!PC{xWt~$(69BuH0%QOH

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png
index 5539fa6154e17c821e8867ca5f77bccaacec935b..ae12f39860f52ffc274a700f9d45e285625ff1f8 100644
GIT binary patch
literal 10815
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

delta 1728
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
Tc{h$w|4%@dl%_qb-ca^C!}g)X

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png
index a7a0cad53aff9f936f9dc456b55d44b57fc39e4f..bbfee9bce7f894201330ba16b9a6f7b146bddf58 100644
GIT binary patch
literal 8477
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

delta 1523
zcmZvY2~ZPf6vq>e6omi^2~|+yq7{TCn-Dgel*kp7P>yg^OjUG~?52w(gpg6xVrVEx
z6#-en6A4qb9t3GY23m@8SSeOfglemz#_1@^AqA>dM;edLbR55#|NG|szW2U)?_U+s
zG^@<VKrJL9Bc+naNS0KWi4z$Zh2q;=u}c))DRnPMNIsIZ#K?5d>Xudo6m2gem(@5h
zV$7FM<p1)?v`G?KZn5|_GreBOYK6_nqlb5vI2c1&CGqjw1CuPdlA5SvcM8rwN5-l;
zbDvNn%w4>b3a88Z8?iqx<W$KRwx=G~cpJihHKpQ}oITN9SDM;Jhv0!VyH$4$17;kg
zJr!GI_+EINHr{_!tsPwK++eJoUF}x7zn?YkbB$4Y8@a!RnS)=CU3CBJ&MtXdK?M`H
zPxd*qu;keO_-7G+C@LnHDsu|DbLlh3NLenn?@?o+YbQ`ymgiv4a8ESu^c@iz{FvqX
zz|-R{KfJVSan~{0yT8lh^1AE1U$|`T{jDdic#CAgj0az29V|sz^^W}~OD1xMktw&c
z(@v|0;tVacSVMW5I(?UqN#)txtV!>guWhk)3Yqi0-;d?hm1P&GW2(uxIi@kDL*1tA
z^#|`wQlqcbTKH$%7eM9T4o|^jZlmc{H>x+@d=~x>)i_IMW_Ok4lc&5qZ0v@~59kS0
zI=O-_wx!Qxkq77zcGjCk4${3zs&gP2<Qz(Fa1J1kI)6l7cJ?Qyo&89E7axqH3{vuV
zC?ABmm;&S>L3|K}P&o+0a)E*aDdfr^9>B^`YvbaC5>2)q)hIBDSOi!}AVDaF5F(c&
zTo?i&fkF=Qa1;Vjn9B#{Tv!>5LtGe9@&K~M#U}>l1o0FY5)2|76a#qzISL{eR{$yn
zaxNbiKs-dD09Z<ea9O5Kjp{`Jp+;30TdPq4tmTq8sW4nB5dqvl2q4+6%(pCsP-Dq@
zRIL>O9GJ%y1i=s&f`Vaw5DbuNR}ThDPvE#PK}TR3J*p=%HP%9atahCzdS%b66Y^%c
zXd+vmsoS*lKWu%_DRE&0s`?*#3o{7vu`45qm93B3pcg7WM>Q%;DFWEQTSC0YD4b_?
zS{}>;IXG%HTA_qN0iVwW5m>3@3Q&O@h6Df^JKLAsJloR%@r4lN&*4}jz+(Szf)Mt*
zQ-!eKx4@e^F_x{+5!zRKzy9M5O%gA&X4XETwNs7h(N|e$juus{$Mh^rqZAnc9T2*-
zZ>FY=LZJ>y#NjD9X(I<X@tt9=QP=!{^Q=U1n_Y#YyOX)57;*8UT*^->Z1feoA8-Du
z!e&N>zkT7CnSOCI$BK&0`xcvD_FU{)JHK=zJ`X|57ar$K$$v^~7!ALf7jR)EEr7XW
zt7lk3n5<I6n|n9r<IU4{hY7=Hsh|GYl-SyFWJRl}x7XT1VJvcr<ky~QrR|CTkR?$?
z<Q=l{uDpPqxlO$~w7bF{Z;+j#ORH(Ubs7z4$}%-HPEBTatu;m^*3&$uWM`f7PMou<
zpo*5jJ|!cDRY9FGiq!#jrgV<&YYmDMyXN-QUo}l`sB|=J$r>`!JpQ(%^mQ~c;^q{u
z>a%pDg|u|1LF%ZLhWO|s^!fnG6z=KNN-GHSxU(%!mEAyW%UZQ+_4OSm6Y~2;)Pck2
zo($MN@E<$;vU%~v39r;?(^K!#^O}a=i#)Yu0rk&2z7d==q#{Ms$@XOX<^FT~X-`Cs
zkG-#Nq@;ib+#251L%Qp&9d0R7BHgwzIpflF(g0F&?>4z^tbP1en;Uv_!k%d(J-wIu
zUS%Cag#mxf7_lL|9@<G%PNu@4(O$AGG^wexB~yN7EK@MJ=?2AmBvJ9=I@^eK#(x3p
CoKP14

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png
index ea4706b1911f1825e785f39c9bfe83f1f3defead..b79db5f7893ce7908127d271a29bd3d13c6e8fb8 100644
GIT binary patch
literal 8217
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
Dt^%_Y

delta 1570
zcmZuxYfuwc7~PbIA_<QgQjreE1*{57HX&>t<xNm%2}D3UpjbAW-54H8NFqiB!=%Ph
zTLoF6l^VdAR+%b@3YAAi5n2#&5Q?uV711hKl!7=)eRU&D#~<FAbMO7WIrn~N&Ufb?
zi1@|5*e8g#Llqq@i;IqC%XAt-m5l?y(%#a2p|R~UrX?}?$E4+E7Bja?W)0Z6dndW#
z&|HttNdCg*rs^R}=L_MuwY}gOEvlx2e-xu%Hr$N=&6jIU^{_ks&!I(;Jyl;2W!!IL
zJNkZZeLRX>N#C!$W4cm9K#tEP!>Pn~$b{p>z~LP2pP#s#G9UY}a(+?y0DHpcnn%%X
z;e&LRk+>f3_h46hhrHEN$|4++eJXtSR+lGCNBx17nx3$fH7V$xuxaP$)B^m#-}O7(
z+QG8o!nqC}%vI(+OCO1su}Tbq4HK@-ukD+dI*+!l6NNl}SM8#guG@OAc1yq68n@VK
zBtQ3H5z4M}9yq%9Nx_)#>HKqV=<7zMrY6UDQ_1?A%zZvpO0UL7b!NA>w#kkj;(2me
zOG#x}al%E~xN=JBSvAg@Tf14Gb@1*KEw=C2u;5(VVz}hU*i&Tuai;ZV<)&NHk^j=n
z?z$RINAXtx061x5Q}qDgJl_TyP=0U$0N9U_gY-ligA8Cu>=^UdWG*Ahhgzu-qEirJ
z39iR<Dy>1KQL}9^D%Wf@gn}S>jS)yXxrCGPE&*h|%M$Xii~l^fF(+HC7aMc5<Ovs+
zlM&T&xPdSSBx$Zbeq2S6g3m_<5W>STh%XEhKq!pLAq0_&FfNSA6+wKEjCb|&gN1Ur
zkcYq!EW+dvpFm*<MR)>8&O;Qz1k6K(3W{0e>XU(RgZLOO42FbU6o>dCISL7Jo(NKi
z<U9c(g84!W1KA2pyh5YPK`Gs;98`&Ov}z^DUKuBqi6dokp&&01o(*N$sDYrUp<uj9
zz0nAg-fjy_Fb{@<5kU|#OIm~L^pqX8b6hx(Cj{9B6+ws-bt+tKKy6Nif?SaDLMx8e
z;iy5QOVMbuLqS_Xw(SfUHe)blF-4L}#jz?q#oGLTde-|WR7s_TwqDGPw;jn=vGs<S
zJcAg;W@_otJX`_JCb12uT8S${LCW=MH!nYePuVUH=0jWprCi4p2qY2+c#sfLD0m`N
zBu8KoNQS#FC3D=pOt3%<!~R?@HG^!<yLvdb=FbS4)xvq7_K>%{cOK2#J7%&;k`+`G
z!ZF$&NDgj5ZBe*Ui(*;0fsLybp(aoVhKKdfQ?~*D?OvQDGR3(5(f5}U&db~^n$+SX
z>AK=pdw-Ur(^^GbzIOpo;N70ovYH>*Jn6TPwIppJ>ngosi5xy}9bzh5@7<>l@<mPI
zXM&=KwvXnu;4OoBr*8CE(49vrJ95V+LpE{R?l_E!E5_BeZd>{acL!CPdec`ipZ~RH
zI6cYBF0H0)tz-go|2UxY*^N5?OstSe04dP>FqR*ogvBcxqnI&|tMkwJUOL&+$0(}c
zn0I8|Pd(mE`$4t5oUHQ$R)6jJUJNcv8KGZ1?QLQ-J0&fy4}7_c_NB9xnM`f##)ngG
zuN<)$!U|ta-qCjP*l{JVkaL?HFNZ~Zj*cs-!doI5J?cICx53tg7)FN1d}(qp>*eY>
zU7G4QE*Xhux1Aktm=kc8ky&SdowKN@^H_2Q@4(n;+QXu@yT6}mu<Vm=ZazZ<i*=~R
zWFBa{;Mrdt?$85Nr`aIs%@{uN+AN(Gy!oj3JiYLzUn#`g0v>{Q>4C$YRZ|<&ZULj)
zcQ?}ZCmrp_!nDbm4RB%oL*K!&sW4IGh{gJWY}E!Qnd^z(A+XiHx_(XRh5Vtis~rrP
giQZjy&H4gxSv#WnG=1xS+Xn^2#Uw~-qcY6@0o+YhW&i*H

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png
index b26c7be0b2da6c07fc5f962d1858683c3a6cd74f..83797163f225f940ae731ded308e1418c5611567 100644
GIT binary patch
literal 6896
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
AX8-^I

delta 1449
zcmZuxdsLEV82<=jaxt$^*~-t)dnMo{;~;pKutX_c&Xpx0AO%Q3MyrHTnpPV6m6h{?
z?vkgxO}nVwbn0emQ=6`xoRzjp3pL8NoVEtq+3D=;J?A~|d49L&dH#7{tkK)*oP80Q
zqOdSdWLOx;k*5koVm<(P^qk6Luv$6x88NZnY+9)$+VAe*6tB)Ynguh<EC}o22;xe0
z#lwsrXQ-3Ktq1=^gjTirUEtw+m4i_~xOf*Q5Rf%5${a(w_3?rN@6)WdzRNcz#{35o
zPYQ?C162Yq^qcUJ1i=}9Bih*itweU;eNnx((zev@L}5Q@biPYC@qqd?k*E^<8s+*l
zyR~h{jf_)7!NOSQ5|`YH!szMHd%RQXS43e|95*L$8W)yukbn01#Z2o~s6eN&SV*wn
zsLk;hr+E_dm845XtERtEjrMXvOUHK_AHR-j$62fNo?klI$M;7%VMY(^E;_*lYjOP-
za$g-ZP+!|Mzr$}GW2+m{QR@6{lAU?Zdf~E$2I<bu6|zPop1!os^J;!+fiAiWF)5s4
zFV#;HEvok^b`?FELa_QON7gpCI8pM?8D9HOPV6imEZzItbjV)_t&O~j+@?DO002hD
zN>Bg*&dz)hKw;4m06-bw35ytnCCtEtBQ3EYti^<)OfLwxV;td83<-9?2EmEg)o>2h
z4Zeb11wX-h!nQaToQMmC^*B}ln9QRwQ{@t_k^zY%Tp^z<lL{elT_l@B3*kgEARiLt
zeaR7Xl>(EL0Y!<VdsGli#zX3P<z~KIAxf2+)!r164;2EHB7uMwBNy?dO0IH_@`gZ_
zL`Dmf^SR1Yd0c9$m;ssFfMyRAXr9`9=q3@HO=F1^Ce^-wVG|)w7SKYu!Ve%2B+a2>
z5vWi`q$z1!-h3|wH;tbRy$5+IT&a+s%z(%cjI|7gIhG!9x~01sB!3V^C;vB|PX511
z=5^tG1y3%LnVZdJ%%hvanWoC*qnVr%zLIOMf>bgtZx>$)@};H`<WNu`-knqe01MQt
z$ncOj)wc1%fM{e0K69^U`M}GS<=0W4U{7lOIf@ljpy-IholW8WTcPzWyDqKIi`ZsJ
z@##LCm9+o+Zuf*0Y~;J38ke*ZPv0f@d+9ezZwu-xJ+MV@%g>*$tbT5A4Qj|Vj7%H<
zCLX!D!>Zl^EKv;w6!}f3FQ&HVHX&-&FRfqI6;9n-_)}+@6cF#<a-c6Azq`XkX*SS{
z)EF&AQ`<g6x^dIR0vX&8L%#+LX)t?`!L>^@UL^|mie<ov0dQ$UK65-A-9xUCy~$y>
zP0oJgq<B2811sW#4<!RnQX<hwxdm0FEpR<<()TiEFpxKxpF5AMa|@CI!RF4osZ4)E
z5137tK1gl)qFqJb{Fd3-gcKW}bjGH%3V>|icI3}vO4p0rAq2^&Q5t#64X5=R4y?66
z<;6F<rk5O>9dopqA&ZUIKc|Tc(ZVU~?Py!8h>i7>^BHFlakJFVu6aFA=hzRp9Y0i&
zHM$%?FaRpyuG$9F+u|R~p5c0#Q;V91@1U-_GLbgOic!&*)(Z@1PIebR)S}iQDPG04
z3-#9C25iTDTJVxj_iDOO0T*pNk5|qNKN=gJc(<6jbyZARP8Pxm#y5ZLbqnb3E5Gk{
zZfLvi{i<`Du6cMYpX|a>qt|`4@mMRtpDQ{2U|QIF<z*WGEN&07B1W@7=jW8QL3h-R
z^2gcc2u_Wr2NkWQG#d!D?1#)DVAMt<Z|p*0`YrW=h(VNRza<6tb#DN;#qU;KOn+r;
V_V1<Z?wCFbATlC4ygD>V`w#QDM|l7M

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png
index ea4706b1911f1825e785f39c9bfe83f1f3defead..2cae7c43a4c77e1c531fe25b58c365624492faf0 100644
GIT binary patch
literal 8464
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
K>J(`?NB$R18wZsD

delta 1608
zcmZuxYfuws6y21EB1r%Zv8bbQ0gJ*Wn-DgSLJ$Z_DuEc#4k*fIvm1ku#3U*z7$%CN
zw#p+yD<y(6ZDmvt6)KO4B2*A@5R0!W6{A&9l%hClMeRnJPJg&FXTQC7&fR<F+&f=k
z^shdJ{uas(ZA^?p78Ao#81;lU69<5xo|2-7xHbhNKQZYi<pL{{v942L581hUr)|-}
z$-ZAzUp~C;!jkuuvY29rBdCEnYdqzsxIy^%(ZGVq)=1XggoNE}r6X5%Ft%zSzvGQ?
z#NL+sk`i6r&Od@tFPm@0pAX>LQ+!>H{e5tbC91pfYoe6<U0i$bFD*}pkgI9?G<Pjm
zs|m>cmDG_!e2<K}kM{kXW%%<8`bq22sTI=-%KBKN{?~mA?g$^IF|&yq@qrI_wY95S
z@=KV6Tay2QfW1{^39qC7z)GGoHPy-J9?5IZn3P<6|KqwH-fduMVcujnU&d1Fo}edU
z%Y0_BnO#5X)%4D_kzw?0?L3~x<9F7~8TZ=SbFEAM?H1WwkHMUE<pn6K*0b-(-sic)
z!WYxdzNfAnl3N<x<1NLjvNDSND>XA48gv<5vki?d)NsEO^P7t+N((PiMl@q`zseEj
z<eE*UwdME5C~>_<9fGs1bK&Ac!!MALkf#~;TNN8`zmEEcV)ZdrbJ`2H0RZ4(h)Xd6
zfaf$PC_q{H=K$b3Y<o*hq|j{fG^q=13d>eRi}oi^@(DMp39%G6VMeXNtkvsS&KOnc
z*PA0i(DstXw#}zU+A`@OwsQJB+j)BM6jpXtrp_eJ&NA3~=}eDo)WG4gVGd}U>*XKF
zRfnqid{h7-JRF1g!cYN(!l(*D5S0ky!k9`O$_H(kUb6y(DwU9jzz{6LR1lv)VF*Qd
z0!YO})L{h7LxgIQc+AT`9pQ%ZF<cl13Arc^@kJ^W65>1&q!y`o0zw4yg%}31)R=gY
z-k61wvb9;L2Im-b8j!VECRd1~6tW1A$A%|DMJ8${NNNNauhp&325l1W=@ta$!EhKN
z2t_7X%W<QLw8L4*h1onI$TDjQLY!#S;yN?xbSeVmf}|G)af}g1&3a?9UY{8OIy<tQ
zHK639!KB3`NiG-1X-y<+(|_p+@1s$TgeLkh3+Fs0vYA?z$sD`EEJm@9y-er^Tn$bn
zu{EepgR3Jz()DqlnSlhKv|Sa(hqwevx{j$4NF)&OAR(ew^F*jfg}@@vw%RAiW|%tD
z0t>`29L(jCZ;-|LzaEZr_#XsK=n3b1N_+SR-v5^7!#_S|mC{9IMAkVMBnvmA&L}e5
zfMRQLGYi+LBP^g1jFeoNqH6&F%6*wMDmi=AlOHZ6oKtw`>r)Dq@|A@xuE9)qj}>ZJ
z&g@(ucXpeyc^RMG^ek`&b6)BU<~8bpc`EpveSo29x&MIL&lfdDo(_!}*gmwO8E@|2
zaPnq%KDzTzMf<wpXW<(;t#{pq#0N%nHQt+h^LB?;SbEZyGG6_)+>xf7>5^Jqx<WdN
z`OFIGczLrnI0MUL5I{2YDGcW<)WG7!4bhC)r&T$p11_ED?xhtR;8=I8eUNgji}Is(
zL7A;K5Lot&-zU*OKY5UP@ziV!t;s_<w~jr&i?Z6&&PXCZYeyW(cNP!kn<aT~pWQWd
z@>sIsx5(Lz?w2JCm!KmWvhn7H4Zd}LSGL0Tgjia--g@a-|Jw0olREWP@9F7@XSSXh
zsh<>bhL%z5dV@2kpyOy#I&c5*DaxaQ)_cF7tj{l!Z)!SCgo%x)-eT=*z2JAHD$=bR
zs7iH0+LP`$^v)`OEqFh@@EkSo@NXnyZv&6OdsMcgqjGG0>TO_X`|bwHKIM@sn8c8j
zQ4i<UJqqYA9g~Qn2J`KoDVDDBP<S2h830>ctLm1QT*w(Hz1B`sSg2j4*X?fr`iepQ
UmuXw}IWH(c7MmcgiB7lv3lLLlQUCw|

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png
index a422e8c1526371137e017ed0c42b0ec483f2f93f..17304ce1044032ee392be2dcc63be90d6580eef0 100644
GIT binary patch
literal 4882
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
F_6HOSG7bO$

delta 966
zcmbQF_M2~lvN2;@rn7T^r?ay{Kv8~LW=<*tgU0!(6Ky>X2Z*%#2QLlMY7!GEJP|Ng
zr=zQ5vfDxqQLo8&1+?l{JZL@s+v5G)!?oWToz@;PS)I&tq2#vDF%`qPk)q7&KP;4Y
zJhLD?ZJOb9k0Tei?R)pq>}u?k^oR9V*QV*R{cw2{nKr}hBiqL-%W@0usq<}aS|c=H
zxPR6ag^$YDMf>ktJdYKtNW0;q`n>b-k)(aCQ^nF)gO%s0^sSiX_tWWC^3?jzV(Du`
z5_|1_ayv)Xrp|o5rA^?l(zFQ;9IT=ufla*{Z>==NCY9)I{m8%TAInaWBGH2<HZ~ZU
zoLDFShrjOpwNt)5)t-u+FKP<s^d~B8;J&iD?{n=Ni?6~5{`17V^sV2?=2Jf@E;nnU
z@`7~f9Xs-}PRSMQWahDv+@!gC()?)?{7y5zPyga8x!}DR$GXbm>^YCWFnU~E^T_<b
zK}CZ}%inx8d;czL?(O;IcYZqlVr&vDTC0C#LNfyc180FpWHAE+w=f7ZGR&GI!N9=s
zW^x;|KO^tttIRIUyj%*CrC6L;fV9HoSQh!o4J>+-H?i1H{>q{=S(R07vOlZ#<T_T(
z$*WjBCVyphm~6r3p{kIQY~_|;l$%&$tCX3Wn4YR%ke9Bc;O^-gVC5L#X{%(UXP`8B
z9h=zX<7`Sg5b?0oqT<Z_Jdm8Bfu50tl0r#lTAG!AQD$mhNn#0D%1~*t9J{P7$SojX
zQ;}QX>ucqaSzMA|RA~nj21*pAq**y7rXvYK1#>bd=d+6nDHNBumX%l~XC&sOr>58{
z=_^fM#O^Tp1-r&%F%I>51$`u)Hu~tM+2~`l7^2Q4wK%ybvjF5?uo)21AQv|v52()y
zs53XUBoV~3uP8`N&Q2{+NX-K}p-9Qz?%iYEaA2g=FZOhC45^5FJKK=A!9n1F+!KXH
z*+2~k5o@6fhl5xR47S8p6;GCbH);N{^E$7$8Si_v?_BdoQR8bt3~QD$M0hi9n8uW#
z%X%P+t6{4ML-x-a{vXxz|9kl}WNR|uP=g|23DNz9@s~c>02E2ET+p!!hF4-dbuSO~
R*8v^O;OXk;vd$@?2>>aBXYBw0

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png
index 5695bc0c26c731ad7753c4817a372db5d7479cbb..f7b6e10f869a9ba3ee1d2f09f066f153b5e21e5e 100644
GIT binary patch
delta 1302
zcmV+x1?l>*1E~s-B!3BTNLh0L01FcU01FcV0GgZ_000ErNkl<ZScS!xU1%It6vuz}
z&dh#icav<|)LPSMtv0c(ErK6JTR&b3S}O<&dGx_YeUMrx_)t(m6!cLad=NyXpaCld
z(Nb+ngB4A!rnU`eYLh0}eC%eE-TBx%*N2&8v+05$S^9sOJAdcS%=yhd_uPA~0O;xO
z8{!sd<kP{2%%1+fp^+n@rCO}@Rt=CoXdi?GJG4tbxQa-FPsUfZD`3Qerq+-!gSILK
zSEGd<`i9IEV=M!-gXKdx0)`9HByNlF1#q+u8Yo(2J%A|$mR10G!T{0$#PCUK7^yfA
zSFn_Wv;)cmOn(9Z8N7()^LhGJlBpy)a{~y005mXK`jgY6=g>m1cWW=*sk>-1S_6Ke
zxx6sKg~{ImcyRMxB1E|()eV579Io5fm?)0(TKYI?-(rChkO~2?c*g1Cp6M;TnEL=6
z1-?KE3tt0DkTro!@bs5+7h!H~2wd8&B(vJ%ld1DSgn#&yzZ?t-+5=1Qp8EoC@f8?B
zUjX14V8Y|~KEb;)XCdW-4;!P2;188(5O2Na-lBwyB{g@efOJ%p0Vq@yL|n3qQFd?H
z$!y^Zm=~)6A~EnmDFsCjauHs>d>>~9h8sBkZxvVqAQ#?0cj$gT?7c$4bMRCZW_@T+
z13Cn7ZGXPDCV0h6av*yrC%Mj<fnj2AcE0hy2-fJ#(cxqCCcu=m#4?bGK`{@ck*gn+
zLUPibSP!2!%c_O3g<3lRhy?jMx^T5Q&O@16FmKNVH<`>T0NbIH7@Jyd0|PotqbUF>
zDad<yN^u8@#Z>^nBsSk(`mQOCmsQX{zy9?bRDWtIyaEsrL0mTaQC!g|?bcCocMX6L
zwCN~MZr?{$ug&lE(JmuFR!H`A@2ay005Wizwz52GbyD=I>kc4=z%VS*kqq5#%Nl@C
z2_snfnl%XlI-{F{hH2FUgc~PqR$EgXOCjqG;Xl?{ZS4S%ud1d%G*TVFtUb+Db)#t^
zP=Cr}#-3^nkdbk|`QsD-DG{d`>NZ;V{>l$53dM5uWG;6W{R*Oq`JZ<eDZ@=ZB!G}9
z0G{7{uxS9TG6}%WEjw-o&?4BsO(ZF8(hOY+YlPm+PExuy$AUSaG!w!hZL~CedA+nJ
z-ij$CrB!phE(=@~i(>s(!L?eX<|7zyLw}$h@bOnVp6=hziKC~Ft%t*BUwVp<=7!jo
z?4sb6u$QV3Sq<O|JflS3zQKqy&#dx!Cvggn)K|U{YGdc3NE#;X2(B5y!qrWpA;4#q
zv&=@T94`%XAiIw)BhHxef$H+PK(keJFnIMmv)L-xJ{!yg)1}&o<YbH)-v-|xXMb8$
zwPt^$lR<Ba92QGdnWVPOCc{rJQ6;J+lns(m!MQ6xK>~=|)D9-N{B0@T-*AG%GY9G0
z{s=iMsA&~2UcSbHTj1h9mjQTe+rt<bbjCMv7*J>?E93k)daka&Bi@NXlD8)@O_N{7
ze&OSeK`PP%e-X$cdiwi@MqXb6t$#U`cz}WV3t+~{xltUWRvVObk=v<lR9e=j>$pG7
z4r4P5+FP-ix=PuEj4v6*f#@_{bTP&l06lMK!x0FJkb&~g!5PsmGh^7S96rL!b>?aw
zYtdQJB{dF0fK0MkCm3TMv?i}5#Fjvrj2UB~b0B5_g8KMY9?$;;gjcr_8V_4L!T<mO
M07*qoM6N<$f@ZZ-LI3~&

delta 406
zcmV;H0crlJ3a|r^B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*miMM*?KR9HvtmtTs)Fc8M;qEP5V(Xvmny@AkUcmuEC89abz@Cx2w
z@8J!)?9<X+`cNn+Xui>@CSsfP57~!&FvPZ#nO`PCCZi-t&VQao5rFUe^biCAjYF#_
z3L49@yaOP4mSyx|Xhl&(5ETGkAo=1m+U0o;pOifNR~&|+cUWd?&M5)J`|%DAfcXCV
z>J?%>{h;KCovuz5z}xLRD}@6bG2!;EvmTQRNefdeun{X)Cv?_hRYh!6VEbwd2moRT
zXf}DL(Nw?3AAcG-Iex1E>J~f+$q}fH>44V)aB{H%{5OnE2coe8ENqR5=}H@5C^-NJ
z-~b$e1JDM*F=}GEss-TFO!Nil4UCOX(>gU)fFasgQ*!A4wPeD-N{$KF5Z$CKD6MPB
zdQT1^7Gff{kkoBU6|i<Ov3@nPemSKlEAqSxWbtZ-;tvbJ5dZ)H07*qoM6N<$g709e
Ac>n+a

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
index e4e4f5004e..099201b418 100644
--- a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
@@ -1,46 +1,46 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "full"
-    },
-    {
-      "name": "uwindow0",
-      "directions": 4
-    },
-    {
-      "name": "uwindow1",
-      "directions": 4
-    },
-    {
-      "name": "uwindow2",
-      "directions": 4
-    },
-    {
-      "name": "uwindow3",
-      "directions": 4
-    },
-    {
-      "name": "uwindow4",
-      "directions": 4
-    },
-    {
-      "name": "uwindow5",
-      "directions": 4
-    },
-    {
-      "name": "uwindow6",
-      "directions": 4
-    },
-    {
-      "name": "uwindow7",
-      "directions": 4
-    }
-  ]
-}
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "full"
+      },
+      {
+        "name": "uwindow0",
+        "directions": 4
+      },
+      {
+        "name": "uwindow1",
+        "directions": 4
+      },
+      {
+        "name": "uwindow2",
+        "directions": 4
+      },
+      {
+        "name": "uwindow3",
+        "directions": 4
+      },
+      {
+        "name": "uwindow4",
+        "directions": 4
+      },
+      {
+        "name": "uwindow5",
+        "directions": 4
+      },
+      {
+        "name": "uwindow6",
+        "directions": 4
+      },
+      {
+        "name": "uwindow7",
+        "directions": 4
+      }
+    ]
+  }
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png
index 31bfc29cf0acfbe6522db842e91025891a0ce052..7be507678d49517ac92392e78b96843349952311 100644
GIT binary patch
delta 1672
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
SNQM9a002ovPDHLkU;%<4c>$>a

delta 749
zcmV<J0uue04TT1fB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mjnn^@KRCr$Pn?Xw(K@`W=Vj+-2(6o3c1_Z&A5NHp*=h9QJeuerG
z^aJQe(68Xtlb75*C<HtSLSah}rA<o?fj|X)|KUxT$gU>y+<)xbo%zAz4P%15|Gt@d
zGqYJqN~YWGK5)~E!C)YYL4^Q~M#Hq5&8G2-(C_!_Apn9O4u{-3Kefn!cDrqY-@Ry`
zjz%MNr{<4yaK3YO%uO%euvY<sZ?#%zc7Fc*k<4RKR0%+&R)i00n;q^e6jei@bGCYj
zr;6Yq0uP60p?@K;&rL71Wq^T1m}UZO>)m#)Nl__)%lg~*$>0CKb4`kB0c`M;4akU0
z<BxiyJ_9W7%<r0%$_P*tQ2_SA5(Qu%EaFP=<K@NyH)o(~4n<4{OWF57cbKuwl7;?s
z@BYYEf70EYlsE*~2TK%yeXv9U*n5LnJ<F<sSO6?_d4FbibD9wgfFScsd+<Ok0E(PE
zqy75ypp%BhQqK4mrLaoS1;IlEh(V;mRe~skZ6*+^GNG_l;HeR=2x<_gpU>qc(tkW2
zCzHvf^dTVr=e=HUVF3_4sD%JN8Q>DP!zB}k0DEtOp9H_&etNMGaxewa&6nY~+7v?W
zEzNUAxPR548kRB%QXw=`3Y$(Pyv7hX;bty2c*=wnRbj360$F$V))2TGJby(MVgc+u
zeU{-&Ks#aq=;_Yf*Sl5)5ei!cs=`uM0nJ1K*au4#fPJu(T7`kEH$?%;XB1OdO0lHo
ztt{7{f7Rz@=`x4{un(3f0Q+F6i~#nA>8VLkEoOk-O|~-LJ+Q_f^+tULSP}9}ib??}
zwefV#NfIpU-2-b<)K!AiH4UDszZZ|u>Q)IZ6#Q$TN&p)?VNQ?dF)1pBK=41E4gSZ|
f-1I`00ZH-*6;1wq5j@1C00000NkvXXu0mjfL?cvp

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png
index e395832e8e39f6a7f69e6c36c189a1f45bfbbdef..9979f28e945787ba4ffab8d70010c70209c7f274 100644
GIT binary patch
delta 1205
zcmV;m1WNnk1<47JB!3BTNLh0L01FcU01FcV0GgZ_000DgNkl<Zc%1E<+iM(E9LGOr
zW;2<+Wlh^$h>&HWrgUS7B7#0x#fMTMv@iNrAN&)<7a>@oC4wOMN0_(xpirp@Emn{O
zf?%jkXdW6i*f#g1+1q4xX2*xwT)b_hXE|pi`+1o&yXWlpw}0Q6Gkf^`&Wa!i(8=)C
z3o|m~?@#{pn#}l^%-~iq|B(|m>H>~l47(HD#(S0>wk;2E!8gIofd5olU%LVQvEGCB
zme|7$0{XF82^{F?1Yj%}fDRylo7Pg;t^syNT3@>X-}FsT@hj}scDViEE&vzvZ}X(|
zgtO@vs0VebUVjC{G`X|zBj?ESR{jl=BGnRoq5BzdW$uF+fS=tJVnVQL?1gXm;o%)?
zfLl8cA=7a<DDFdb2Y}$Ed;jlez_h*0x>qL?H}Qa;#`ReD>Hys0cQ|7KE|d&N)uECA
z0R;Wh`q~ZXxlyABIJo5dum7#5dE~eUbce@DIeqO0*nbnf*L3O|I>n<v+W_4G=%#Ie
z?f`VtHb8d(x;gO%NH2t5DZG18X8bSNuYZt@L53552eb{)9e{4y2IvkzH*EuS2cVl1
zZ-Ded$QfU|F7*MEXk7?N8!-QI5Edv*6L6t80Np;Pi=FJAI_!6zINS9qJyudyvZb^p
zCunCFbANN(w3Zm`?4VqX@m_M2MQ0g+xym+=r~(k+v*Z^s%|@C#+mZ;L8EFIVocjEr
zeRlqP>{yJ~hh8Nfq<F5Q3ji;ubN}f*ep_Ck9t3=P?oH0veX`OmLAo#^ejRBPH%|kQ
zb;F8H!LMQ`W2A_Y_Ms#W)847TJZL|B`8%n?hJP%rnF2w7SiDTtDVUp3wZZamYAz12
z@t5xFjp+~tqz%Y_(I`+L2#XdbVUa^L8I?F}N)|R`kv1UlS>Lt#G1JHyU%PHk^io(W
z^KEv5_aA-2Qhk;Dmx-q1R3N<&I_}Fy9i=Nl-><RZtg4he7NrK{%yeT9fCt1?O8+a$
zihrZ)ZkY;T2ti3SdqAp1*&Wbrgjf8<!Skvl{}aj#SZMtA4`)XHv=Gvb(r3VEqMMj7
zC`RY|>&XX{@N~%jBgzcu+JYf5$WCn+r+fkp*i7#+Ri2|NN@UGA_}X{p04k@zwn@?y
zOfSxc=W$1wbTiZ$kbcZ^vWVk(6s!^$(SJxsDvZKn%*}B*e<?gIoiqb{KiuaFz-G7s
zIs&LOz|4djoc9qc%A}j2eXsEF)eAH8A6Cd2eSG!&4XzZ%$@V63#@CMBL}>`Y?BJAC
zT0I&Q@fm4FE+SF}Y&fg<e(m^<EhHia!~u`n5AKpP(@K@2u^a<RLSP8NG7bqBRDanJ
zkvkw{KUc7yJ5WJn3`hkg!<iA_Fn6GW$QV#GAtnq)6WvO6BV&NB96@9ZaLOJ#wOxk9
zAYEJPbfaN_A0unVsfrR)<vBLfd&;DvVL&4{FugcS(iE_*E@>DI0}O+LRl@N+mXk$D
zKUOELOsN@-+`#4hCC1zwU@4Q1hAsh?4Qv99{|5Vh^ZqR)8U`HA4b%v82a5Ou_vlqc
T5^UWA00000NkvXXu0mjf8ooA=

delta 715
zcmX@f`IvQrN<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3
zR|5kBQ-!CCV@O5Z+gS&*g&jqXsh_Oc9Gj&hdYz4BtK8)^GaBT+Jx~>2Sn=VByn<H6
z#|w{KFRXeH_@9Me&Lw0+#Y7R2OE=bhyrIOQx$ug_>8g6oNhQZu{wxx-Ib-us)7V~O
z-+SGZn>A-{CzhEj&)__4FfGV$;T5&M#|+mvzA-G)c%@-!v*ydnt659_ACPlcDz#42
z(geuYH?56OzQMd=-`u(3;f8HNvzHpnizW0X@GrQ-u}<@*{hBY4mUnk@XS;}<@=%+u
z$TR1N#5YNU?Q#3+7a!TtKYwn-POfa0YKHJ#;_oyK`5s(+a{2TIw+-75e0SXBEosqf
z_{R9bpIa+md-dcu>8FL|AC`I;#;76PT;d=V@~<&<g19)tm8doR4STp+zOJl{5dL-c
z)HUV`u^4WLwMSVQwu%)o#9cF%v;0*ykEc>JVD`+}8*X{b{1!j2=Y9R+lt!5YOV1Yb
zCvNq;T=Kl|!!tH7u@kxm?|xcdHhk8*`8z`;+nKe~&!#u{l+QcACw(sC69%nb<zwF)
zLQd5!zLU6@eL}PY*UoIKE9+18Z&@)R-QnxqH%e>FR<YLYvHSf|%uDQrZUC=vM6J;$
z@4ulnGNRm1fWbIv!>tu&H)7W5)=Te~_$xhuS!1eKb$<ET6J2?Gq{IU^I`BR4KhNCM
znfdT{-NOU>JU{+?t$y+5y^Q|8?fQITpMUOo@wIBv)vSr@8=G$PI6^!L3WFGifb2p>
zsIQ@cQmVhtePhIw#p%qg>i3+|s~=zgn2@xq;L8KUk8AI{h<Z-i;(ok-dF0Js_xFoF
j0|ysYlYmBh3qDd8an>%6PtjZlOq~p#u6{1-oD!M<QvE^o

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png
index 31bfc29cf0acfbe6522db842e91025891a0ce052..7be507678d49517ac92392e78b96843349952311 100644
GIT binary patch
delta 1672
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
SNQM9a002ovPDHLkU;%<4c>$>a

delta 749
zcmV<J0uue04TT1fB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mjnn^@KRCr$Pn?Xw(K@`W=Vj+-2(6o3c1_Z&A5NHp*=h9QJeuerG
z^aJQe(68Xtlb75*C<HtSLSah}rA<o?fj|X)|KUxT$gU>y+<)xbo%zAz4P%15|Gt@d
zGqYJqN~YWGK5)~E!C)YYL4^Q~M#Hq5&8G2-(C_!_Apn9O4u{-3Kefn!cDrqY-@Ry`
zjz%MNr{<4yaK3YO%uO%euvY<sZ?#%zc7Fc*k<4RKR0%+&R)i00n;q^e6jei@bGCYj
zr;6Yq0uP60p?@K;&rL71Wq^T1m}UZO>)m#)Nl__)%lg~*$>0CKb4`kB0c`M;4akU0
z<BxiyJ_9W7%<r0%$_P*tQ2_SA5(Qu%EaFP=<K@NyH)o(~4n<4{OWF57cbKuwl7;?s
z@BYYEf70EYlsE*~2TK%yeXv9U*n5LnJ<F<sSO6?_d4FbibD9wgfFScsd+<Ok0E(PE
zqy75ypp%BhQqK4mrLaoS1;IlEh(V;mRe~skZ6*+^GNG_l;HeR=2x<_gpU>qc(tkW2
zCzHvf^dTVr=e=HUVF3_4sD%JN8Q>DP!zB}k0DEtOp9H_&etNMGaxewa&6nY~+7v?W
zEzNUAxPR548kRB%QXw=`3Y$(Pyv7hX;bty2c*=wnRbj360$F$V))2TGJby(MVgc+u
zeU{-&Ks#aq=;_Yf*Sl5)5ei!cs=`uM0nJ1K*au4#fPJu(T7`kEH$?%;XB1OdO0lHo
ztt{7{f7Rz@=`x4{un(3f0Q+F6i~#nA>8VLkEoOk-O|~-LJ+Q_f^+tULSP}9}ib??}
zwefV#NfIpU-2-b<)K!AiH4UDszZZ|u>Q)IZ6#Q$TN&p)?VNQ?dF)1pBK=41E4gSZ|
f-1I`00ZH-*6;1wq5j@1C00000NkvXXu0mjfL?cvp

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png
index e395832e8e39f6a7f69e6c36c189a1f45bfbbdef..9979f28e945787ba4ffab8d70010c70209c7f274 100644
GIT binary patch
delta 1205
zcmV;m1WNnk1<47JB!3BTNLh0L01FcU01FcV0GgZ_000DgNkl<Zc%1E<+iM(E9LGOr
zW;2<+Wlh^$h>&HWrgUS7B7#0x#fMTMv@iNrAN&)<7a>@oC4wOMN0_(xpirp@Emn{O
zf?%jkXdW6i*f#g1+1q4xX2*xwT)b_hXE|pi`+1o&yXWlpw}0Q6Gkf^`&Wa!i(8=)C
z3o|m~?@#{pn#}l^%-~iq|B(|m>H>~l47(HD#(S0>wk;2E!8gIofd5olU%LVQvEGCB
zme|7$0{XF82^{F?1Yj%}fDRylo7Pg;t^syNT3@>X-}FsT@hj}scDViEE&vzvZ}X(|
zgtO@vs0VebUVjC{G`X|zBj?ESR{jl=BGnRoq5BzdW$uF+fS=tJVnVQL?1gXm;o%)?
zfLl8cA=7a<DDFdb2Y}$Ed;jlez_h*0x>qL?H}Qa;#`ReD>Hys0cQ|7KE|d&N)uECA
z0R;Wh`q~ZXxlyABIJo5dum7#5dE~eUbce@DIeqO0*nbnf*L3O|I>n<v+W_4G=%#Ie
z?f`VtHb8d(x;gO%NH2t5DZG18X8bSNuYZt@L53552eb{)9e{4y2IvkzH*EuS2cVl1
zZ-Ded$QfU|F7*MEXk7?N8!-QI5Edv*6L6t80Np;Pi=FJAI_!6zINS9qJyudyvZb^p
zCunCFbANN(w3Zm`?4VqX@m_M2MQ0g+xym+=r~(k+v*Z^s%|@C#+mZ;L8EFIVocjEr
zeRlqP>{yJ~hh8Nfq<F5Q3ji;ubN}f*ep_Ck9t3=P?oH0veX`OmLAo#^ejRBPH%|kQ
zb;F8H!LMQ`W2A_Y_Ms#W)847TJZL|B`8%n?hJP%rnF2w7SiDTtDVUp3wZZamYAz12
z@t5xFjp+~tqz%Y_(I`+L2#XdbVUa^L8I?F}N)|R`kv1UlS>Lt#G1JHyU%PHk^io(W
z^KEv5_aA-2Qhk;Dmx-q1R3N<&I_}Fy9i=Nl-><RZtg4he7NrK{%yeT9fCt1?O8+a$
zihrZ)ZkY;T2ti3SdqAp1*&Wbrgjf8<!Skvl{}aj#SZMtA4`)XHv=Gvb(r3VEqMMj7
zC`RY|>&XX{@N~%jBgzcu+JYf5$WCn+r+fkp*i7#+Ri2|NN@UGA_}X{p04k@zwn@?y
zOfSxc=W$1wbTiZ$kbcZ^vWVk(6s!^$(SJxsDvZKn%*}B*e<?gIoiqb{KiuaFz-G7s
zIs&LOz|4djoc9qc%A}j2eXsEF)eAH8A6Cd2eSG!&4XzZ%$@V63#@CMBL}>`Y?BJAC
zT0I&Q@fm4FE+SF}Y&fg<e(m^<EhHia!~u`n5AKpP(@K@2u^a<RLSP8NG7bqBRDanJ
zkvkw{KUc7yJ5WJn3`hkg!<iA_Fn6GW$QV#GAtnq)6WvO6BV&NB96@9ZaLOJ#wOxk9
zAYEJPbfaN_A0unVsfrR)<vBLfd&;DvVL&4{FugcS(iE_*E@>DI0}O+LRl@N+mXk$D
zKUOELOsN@-+`#4hCC1zwU@4Q1hAsh?4Qv99{|5Vh^ZqR)8U`HA4b%v82a5Ou_vlqc
T5^UWA00000NkvXXu0mjf8ooA=

delta 715
zcmX@f`IvQrN<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3
zR|5kBQ-!CCV@O5Z+gS&*g&jqXsh_Oc9Gj&hdYz4BtK8)^GaBT+Jx~>2Sn=VByn<H6
z#|w{KFRXeH_@9Me&Lw0+#Y7R2OE=bhyrIOQx$ug_>8g6oNhQZu{wxx-Ib-us)7V~O
z-+SGZn>A-{CzhEj&)__4FfGV$;T5&M#|+mvzA-G)c%@-!v*ydnt659_ACPlcDz#42
z(geuYH?56OzQMd=-`u(3;f8HNvzHpnizW0X@GrQ-u}<@*{hBY4mUnk@XS;}<@=%+u
z$TR1N#5YNU?Q#3+7a!TtKYwn-POfa0YKHJ#;_oyK`5s(+a{2TIw+-75e0SXBEosqf
z_{R9bpIa+md-dcu>8FL|AC`I;#;76PT;d=V@~<&<g19)tm8doR4STp+zOJl{5dL-c
z)HUV`u^4WLwMSVQwu%)o#9cF%v;0*ykEc>JVD`+}8*X{b{1!j2=Y9R+lt!5YOV1Yb
zCvNq;T=Kl|!!tH7u@kxm?|xcdHhk8*`8z`;+nKe~&!#u{l+QcACw(sC69%nb<zwF)
zLQd5!zLU6@eL}PY*UoIKE9+18Z&@)R-QnxqH%e>FR<YLYvHSf|%uDQrZUC=vM6J;$
z@4ulnGNRm1fWbIv!>tu&H)7W5)=Te~_$xhuS!1eKb$<ET6J2?Gq{IU^I`BR4KhNCM
znfdT{-NOU>JU{+?t$y+5y^Q|8?fQITpMUOo@wIBv)vSr@8=G$PI6^!L3WFGifb2p>
zsIQ@cQmVhtePhIw#p%qg>i3+|s~=zgn2@xq;L8KUk8AI{h<Z-i;(ok-dF0Js_xFoF
j0|ysYlYmBh3qDd8an>%6PtjZlOq~p#u6{1-oD!M<QvE^o

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png
index 4097d024fc29b07a3490bafc6219ed5d0ca86404..9fa452a61bf19f4082c9fbc34586322836957de0 100644
GIT binary patch
delta 1196
zcmV;d1XKIt1;7cAB!3BTNLh0L01FcU01FcV0GgZ_000DXNkl<Zc%1E<OKTff7>1vt
zk;bE2R44HT7c2y+L*yE_lt8;^TDmYPm}JxJ(nWtl>84=XLV_2CLVrZPa~Cb7q!bdG
zLb1UVYSP%mix`O}@!gJf8;@o*UCj7GFZSYybEa7DMn}>dy?>t`ow<D9Hxj<@qf^5-
zugordT&EE0<C~XnbG<Y{zBi3Mv4%C-`}uKmV?r=DIQ^51e@tewZnfI*<3$R<hP{gC
zHI;fs1V9pSx%c=11tY7}Ij+?07*&NJCIn?{QVyuX5RnxS=+(hX0CdNa$~+?jAmbYh
z=SBcnq@m0=GJgOn2E;{-(Nwom-^c){;%f1Y3;?_4veVpUNDOjjOPy~t0C;ioMv{i8
zGF_WzGrOnEIvN0yHUKkAbEFLc+lDghXaI=CD4A7k*QK1UK=zqBYh_NysTzcFt$3Aj
zrvRABtfK+Iw17<j?wHHqdCIJ#0YI!Aj+=myQ)ew(4}Z8^zA<)ET53<M-LfWoDXrD`
zK0nEaPd{V1wMy~p6pyBUc~dF?NlCAOcI4zbrF0kYye1p=s!Gcfr4&HH$a3%T1HdJy
z0qB>qdce9<qfSuAs|umY_CzUL0sA@re$F2iDFd*d;}7RX$oT3mbx)GgW58&to4ANk
ziO%=ebAKVEEBF65DFbk33x>oXJI!6}+9?FEncZW$HcvxT$s0-VqEV1mw+n0=qz%E$
z(p>O7tO4kjIsn;cl+zV#*QI1uAr_51Okorz<4%EV#jC;7>S+Vuc|ooZz-Cwj&@XiW
zj9ifG@9Ss{K%=DV0mC=1%*xEyT@R2x7cG1e9)HbS0*=D8y1)tFGp%53x_|?o5v&OB
zg{-}_qyhBDdk@B2Vh_jn>BnNlw;|C5z_>pE3BV6)ehGrz!BSWH`Y%ZX_^xk~x>skn
zxfAC4Fjjnz=hf$2$i70$Z_#k;#0-P`i$8ObJnt6YCM`13!M8)w$AIheAI$>%>Z}kK
zf`8Rm*wqOOyYHI=+}(Ksxy0e5qz8>10Q}b;{=bg_Ggg^(w?!^#-~v4%&vmy2z+L`?
z^CsW~=l)C!>M0O_-!E$~EolHfx100;2S54#>;Kr&IP$m$bO(=9vJuEh8o)`nvPE6d
zxE|H04glQ&=vD`S?f`VF13-5Gx^?OSNPp)7vU;QR!I;ea-}2v{-v0}<LmdFR1JJDw
z0NnxTRtJFY0Celr1JK^1wkOtZNqxW+QWrwn0W5s#2MrR#034_cK)1)aN*B9l54XES
zlI>Q59y8rmf9(JOuyTw$1@4&340a``RpQ)8kFsQ!0hq6E^EAB4%Ex2bt6&&mnSVVm
zXRRH;{j*;lj4v$wh!v0X*3e~=eukG4X8>^h7LQ&$<d5<qE#K#hi|=sW>T8R?_GC!>
zJ`y%p&jFBkf{sziYhb10WQddXpehc_?niI4d-D1ZQjHbuD*y-@B#sT47A0d78Wxx?
zcGJNIHvYExdK>>&s2xD@tFS?WASGy;7z9n0<8G%-9S$WMD}Mn_dR{s7?CW~~0000<
KMNUMnLSTZLmN?S@

delta 715
zcmX@W`IvQrN<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3
zR|5kBQ-!CCV@O5Z+u8fOg&jqXtM9zAvfHgwikIV6<g-mlOi?+Blie(I*8JfPv0&-8
z&S9|?)ZyQ<ebXoL3Jx*LfQZL;rA}M3C|1cyEq)UzQ$Ojh?DI3`tw|5hXwNhF+<5%^
zZ?R1(@o8l<A}0x-30WN)sUzmP|GxOt>eiW8^WWFU>c6)Lu-x%_!Vjw#ofdt&7r(CG
zbmd10^R*6}D^W2F0ojF&4r`CHGHewSXFwD9RM{XuZCPTy^V{dG&nu_SjV|jhkFUSS
zwRQgczIEm2)iy6SZtz=vxJvEeGIXsdX8mF~QT;J$?KZB}{&8Ox9bM7Y$6CbTDBuy1
zyJSK(_uAIlj7SCc3mLx**VtM9w5$=5bvw>v+3>8pGcqFAXy)IFs!wM_x9Ch@Ua|dj
zy=}elAMqtqn#=w^)&+`%H_kcHJ9FBvEn0CWloN`U+Oe<hoy8>0e>^_c?KIGk&wGux
zCvNrJT=LlO<v~@ThUEvUgqAP+Y8&ZaC~bB^`N5Y@8?`sw@|ejhC*Pa5DD~i4rhw#0
zI)>{)Hl1hKE?EQ$8=&)7Gl<&j#D;7tz45aC@jrcsBarZ#((AO(K}+k+>V{iBzM6({
zta82jam}VpwhhJE%hzdtY@2IW{@rdjLpIBAksEOzj%l>smN;z3q!#{aiD1G16W*6N
z68IO~yJx?2U&}{h1)G13UwD4-Pjj5<<@8YP*oOXwXP-MWzv^yVcs1?ck=K$D$~TxZ
zOkDn^s#XIHe)wn7$Ir>a-x!({Zq)3~`O~!JYSzR$=4yt0@7;q=2}R{D($G3ArEtW*
YeX?HTk(G*Wz|_g$>FVdQ&MBb@0K&LFeE<Le

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png
index 5245aa4de55bbd9220be129782e2d81efda2353d..bd46092739e6b3d5f5e7e3eb3806b5feaa456145 100644
GIT binary patch
delta 771
zcmV+e1N{7$1)BztB!3BTNLh0L01FcU01FcV0GgZ_0008bNkl<Zc%1E<J!n%=7>1vl
z`_r@qQ%WM8EOjXcIypJ1i!OC?=_0tblPE5QK!-rVMXGL{?ciW1Gr5R3=+a4O=~TK%
zF-4lvmh}EQoJd7;tB~@2ft+W$+;Dlny!kli<ev99S(c&6!hhRGUsk6#;K=3k)tB7(
z_85`_sxL|umn%#EdVXVa{e3U`UM~+{1gqD+nu|ile*7H>z)QvS3t~!n?1vEfFywMv
zIEIn7sJwayyqj9Waa}%aeq?TV1tQs!)D2i|y*3vUog01(jEU*18_;leA#6hsLli>d
zf?E>PS2v*g%zpuf|GNJ_Gr&clZh+Jm%|m|{P{tadU4S;$0PO;_=_>;~g>w4JfEc+y
zLBHrL12pJ)A#{EB{+(W)@AdzDuMB(#h#R0W(4B{PH5vomdGy!Mp@20&y8vyh0ony<
zBlbq9U2E36ez1n>LP*4bcCA_8T+AS8ftvsUgdPM%34i%>k$opvG;e!n!%6S~-Ca3A
z(t!8?D1#p}y*I_}>P@mF5tGkDwgdc_H<z9;S9!(r<|k-HWLNHrmhdOCv%pD_(R36}
z6YwJ_2cq)bkTW1I03l`XGNcZqFuye;CZET^uLI-^@KPW!8Gu3th2OFPipUOvBW;rb
z7;+(Up??*M%6CK7fXHL+aD}JMTV@&@AEar}8|&=-!}i1u+dp;ym_>IQl<k1FSqe9t
zqrqAV7ndtb)mpROHTkh7Q9(Xp9iW{9$iuD!v<uM28lYW(Hr4=XLAy0(x5oMlNBg{h
zcD`WXJD{%&upucMl9I<7pk07A)&T7Sv{64Xl6;pN7?>k7n~T}mp()M|O;u~nx`YYp
z2Fzw>S%F5dYpx?Xef2S5zVv{F@rO+BO_>{!*U1vdpxy!ZcIr^_p@PW{9Iiktr?1`t
zlmn9$I897;;6!$_MBRY-tr<vx)G^rs!cLYzhM!k!y{jKOTz>!n002ovPDHLkV1iYX
BW&i*H

delta 639
zcmV-_0)YLS2ABnqB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mjElET{RCr$Pnn6kfK@dep(RGMXTm%Dx2MD<FCSJiS=mGQ!UcsBV
z@dknr$wD+r)(V>6RK-c#<04Y^Te=?<)iblIH$B}6)f)|&@qc*yIT#F@*=*K~Znm!F
zcHnULsCj*VZszm(Wcv0fcUQSPdAgF}T5L+Df#O@B&=7KM4qX7=yuAI3uD5InT>z$i
zT>P+qFp{A;bO9h$JidPqvJjxe#bW`qCJO;5ysLQZ0AXMRT>uJh2Z)QeTpZ~FP;4B)
zqj*3UfI?G&XMY~sBK?=(@$LS(4A<h{{}N<V1xPNIDnN3v{CO8(ui}5Degcw<r3#Q-
zELDJHQx^aAJA;k604=iD>y1(o9uhGX&@LW%XM68QurU*mDjqz%+^+;1(;1K|9!#B^
zAHQL~2BeA)gG?|N08+*0umb=W0U$1Za{6((h%>oG!+%YHqQ#>r8Z|~KxCvMkuFa3-
z-jAjz8}}KI8?I}BtOLunpr}tkSx5+H0rXq|8`m{JhD!-J8z8r6xCqduXDlHH%mrw(
zGbJGhOa*9@GbJGx5oQ8(il-#BgN^A7NJ)r;jrkhTmXM0@kVx$eNiLQuKytBE0g{WQ
zo)VK>EO=Fb<YK7;Bo_-^z_6b_H-PYfE<n!-#DQlX66gZ-oIpE(mjt>1Jtv?6JSAkY
z2u{D7CY=(j$U=b9CBc#`1hl7kEWsMO0Gts(yF4Yq1G)e`ClE{Uf-WFxkcNf{LavQz
ZnlFM&P>D2+`?3H4002ovPDHLkV1ld#2S)$^

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png
index 4097d024fc29b07a3490bafc6219ed5d0ca86404..eabc47c84b865b76a0c4cadd8a6c043917b318bf 100644
GIT binary patch
delta 1209
zcmV;q1V;Pg1<eVNB!3BTNLh0L01FcU01FcV0GgZ_000DkNkl<Zc%1E<%}-oa7>A#8
zKZf~YhDbj~QfUZQ8ipFHn<knVHpCdxgmhVV{s+blo3^s4iHU!OEE{5Mx@cp%uqJG*
zjT8bVh$8AB3>k)*VYr_z?m(w%hnPdoxdwilIWxKU{@!`!%zwS_`<{D67>4N7$o0|L
z`HyxOFka@1b2quRa*IO2#+|HS-|o55X<tJaeD}(o`!fE9%+9(Mgn{%iVg+EcxlS{1
zlzPSlKniepu=t2UBdgTeQtH-0H6ai}@EZ>Ho<~lRZ%k%Dq}Tf|0+2IP$~<EOARF2Y
z_Y?v6G2B(=8-E)BJ7$O_42CnRCV!;Z0I1<=@r@0DW<6lrtun-Udduq0&G7)>Cm1x+
zG(?S=`W&TPLz#6v0HmTXJiGLmgcV|K*~+Zr0l+X=?%HP0^;peR@p5bGtd%)+QY{MO
z>c|-5&H#{5W*rXzi6l@4;BI0Cd|#P$JOGH&v#|@9d4F}*vi*R!e!Vt!SXt^$R;KLR
zJ(Nl=cLr|p!P+OR1b<Ncyql-f53fiCASvk?a1=GUPAUBhGy{jt=DJGDL!}hJppoUl
z;v>Kz>H+ANvYfNLw~LE~5Q3Tzs%#IHvKg>n<L}q}agj0r`!)V>Pmye>F4a9uO3wkq
znH-id*nctgw&L5RB@xn9`~RDi0q8AT3~`=qw@R}fpWHzifKsl(Onr`qs4-}y!B<!C
zbdoXv)|O4e3YlGc9DR^d*YxNlWdOX~8mpNqd#=ZF*ESgOsKXRSkzm{z;OfX&^tN`~
z0Qi1X>jO}3^#Jrs9RM@Wb63Ci9)Lzk_X9?*kAKd}?612YAYBa2e_W3Sfq-_H$u4l3
z(KwNe#t9E_z&E2A;cv^@OG_F+!8&^|-V#lmFr+|=Qn(9t7Xag7AJ{<H>iOA3e}|;H
z*4K+94dBbd6b-*Y)vdH@eR!|<F27gTxsZRAAoOW?bxhOb>xFL^;yk0px5<cZ>EMq-
z(tqcGi6<Y<0?az=SVFL7wi29HWA}Z#k9(CB=xJk}@?p0EK={Vo|N9*9ZR%$>ynuY#
z1mJXw=Y|*M`}bIb(>CBl*Zyn(jWh@#EXdkROB%qLsem)U!B4*b`9HR7&;32%RP;J6
z8-bjp0UUNKTig|od{m=O0O$@tw@v`)4u3$mP5|f*K(~%P0O?vlR+m>N#$@*YzJKQU
zJ}+<-Isu?N0NpwPpgREFIsu?N0NpzF0JJ|e<xW<nqz*8RR3fAu!2F~aEs&Td;9ynH
z;l1QisHQ3RdI#IRCQ?-WU3$BY_VzmM002nl8FvP_n^>VQY2j3DCNh^;YW@PiLVvwV
z85giH5iAEal18h^+An9V9l*ohPY=cyp5CX+wzx9%Ch0Is-i{ui^1^_H$~-@;E)s?z
zH!i-zspQ!g9r8a(dod)QTxu<@_5v`t7cG}92Mv-LgDf`PzMv+aEiJd-X7|(OucQ`M
zw9fz_S|D+nkPTQi|AgH%BpjM9G%|tBziqz3(LGnF9YFE3)&j|Mp#*det!-UVa$)5!
Xp#Wu4&1DdR00000NkvXXu0mjfVJ$+&

delta 715
zcmX@h`IvQrN<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3
zR|5kBQ-!CCV@O5Z+u8fOg&jqXtM9zAvfHgwikIV6<g-mlOi?+Blie(I*8JfPv0&-8
z&S9|?)ZyQ<ebXoL3Jx*LfQZL;rA}M3C|1cyEq)UzQ$Ojh?DI3`tw|5hXwNhF+<5%^
zZ?R1(@o8l<A}0x-30WN)sUzmP|GxOt>eiW8^WWFU>c6)Lu-x%_!Vjw#ofdt&7r(CG
zbmd10^R*6}D^W2F0ojF&4r`CHGHewSXFwD9RM{XuZCPTy^V{dG&nu_SjV|jhkFUSS
zwRQgczIEm2)iy6SZtz=vxJvEeGIXsdX8mF~QT;J$?KZB}{&8Ox9bM7Y$6CbTDBuy1
zyJSK(_uAIlj7SCc3mLx**VtM9w5$=5bvw>v+3>8pGcqFAXy)IFs!wM_x9Ch@Ua|dj
zy=}elAMqtqn#=w^)&+`%H_kcHJ9FBvEn0CWloN`U+Oe<hoy8>0e>^_c?KIGk&wGux
zCvNrJT=LlO<v~@ThUEvUgqAP+Y8&ZaC~bB^`N5Y@8?`sw@|ejhC*Pa5DD~i4rhw#0
zI)>{)Hl1hKE?EQ$8=&)7Gl<&j#D;7tz45aC@jrcsBarZ#((AO(K}+k+>V{iBzM6({
zta82jam}VpwhhJE%hzdtY@2IW{@rdjLpIBAksEOzj%l>smN;z3q!#{aiD1G16W*6N
z68IO~yJx?2U&}{h1)G13UwD4-Pjj5<<@8YP*oOXwXP-MWzv^yVcs1?ck=K$D$~TxZ
zOkDn^s#XIHe)wn7$Ir>a-x!({Zq)3~`O~!JYSzR$=4yt0@7;q=2}R{D($G3ArEtW*
YeX?HTk(G*Wz|_g$>FVdQ&MBb@0OtojiU0rr

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png
index f2aec98846cb982515e94d2f3e994d085109e69b..f75790a41878a5b5e9df599eb3004fc19dc29d2f 100644
GIT binary patch
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkQ1G^=
zi(^Q|oVT+#@-`cYuo@=um7Ng!;xlWW>L%vq2R#lSzZQk<c)h>YDkJCQ+V6G~_nfO;
zeWw1}_rRI+wGaPqV9a2YV!ps+!nT0*-Hhn4!XFIb`xm|DmsjXTlF69%is?(`zEh9?
zGeFg5@Ce*jsF}B3XuJ3P=c{}ER@Nb#l)>Y`eL<o@Y=I$zu0wLe54L;k74ilkJK!>z
y`@}0OkOX!d{?4>d{6rE%RKqcbEes&rXX%$%%2g+2GNk~$$>8bg=d#Wzp$PyK^Ji!P

literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1enaIvS0V@O5Z+u4S^4Gsba<a`ubShF<_NO3zA
z91LPLFxV1XRXkb#-K6=)&aZjC$#~zRTko1biW*-FVpy}3A;Oz+!!)J@UDg9pTn$@A
z7_xuX@c*cu|KH1>AzPCHhZ-yrUl@PsgY{#|1s$tkuz1Q-Cn$6W<R=DCS3j3^P6<r_
DF^N~b

diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png
index dc5081de2ed0b1a9aa0e4cb968f41085f3ab7ab3..45b3c99189ff93d8928aae08e938c39e47de6c8c 100644
GIT binary patch
literal 15629
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

delta 686
zcmV;f0#W^qdf5e#BYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<Ps4t5Z6
z$WV2$AS&Wms#pXIrLEAagUO|T(4-+rad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(
zq|hS9JC1vJ?|WbFz5|3tg{fxOB%o@Rk&4H}Y;IKyyh1=f&3|zS5;OHgdNBjf@pTU$
z-|r$k%e(H+(Wm512KYqcDANs#c!PL$)6zNb6NgwyQi#uqCk(nE@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o*@n^sz&)j)@6nB7H73mW37Ag7Y6g%N}B7mMi9pm5=cUX
zj2g<Qz(Ry}jeisqDLRjN_=g>Tl3X&m%3$PJKou$^#}EDozk6#Irl;JbU<~MfvF(ph
zAg~KG>$d%UY}?Hf!2b+fX>EVC0nB}pUT<sRBVb?~xVUa>@*Z%x0}MUsk|8;gpO#Q4
z0Pkn?O*vrj7U*4b`_?+g=>w3VUM=4M2Zz8|k+Ro4-Xz`A*|&ddTK)S0Md5Ol8b}Lg
z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j~J04+ag7Yl|8H007lVL_t(o!^PH3
z3c@fDhT#e5I@HlsX+iJ+y^VMA0N%wr2|`O(8cWs+x)Y_XZIb!P1)i6I4+5b0s;YV!
zO&k%yXyVQ}`G9Y{JS`4J6K}gl?gB$N0LTQ4;dxe+Mibwzcf1#v!takOUw^<H+<RXe
zO`K%~AvpO8LUGc77@RC17AFZv!IJ}0@uUC>JUW01j|!l~g9E7Xpa2ehb^sTiXT@{?
zCvL6%{~_VVSIf=#1tjpx?K~VHg|}VP|By)Hy%k8~KLHx}XNFpMy?-8!CXR^k2EB0_
UzWfgt^#A|>07*qoM6N<$f<`MZ(f|Me

diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png
index 772c39f64193e84526e379b91b594ec019c24264..5286b1e17e622aec224cf58ea6b78db7afea79bd 100644
GIT binary patch
literal 15604
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

delta 660
zcmV;F0&D&BdA|jaBYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<Ps4t5Z6
z$WV2$AS&Wms#pXIrLEAagUO|T(4-+rad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(
zq|hS9JC1vJ?|WbFz5|3tg{fxOB%o@Rk&4H}Y;IKyyh1=f&3|zS5;OHgdNBjf@pTU$
z-|r$k%e(H+(Wm512KYqcDANs#c!PL$)6zNb6NgwyQi#uqCk(nE@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o*@n^sz&)j)@6nB7H73mW37Ag7Y6g%N}B7mMi9pm5=cUX
zj2g<Qz(Ry}jeisqDLRjN_=g>Tl3X&m%3$PJKou$^#}EDozk6#Irl;JbU<~MfvF(ph
zAg~KG>$d%UY}?Hf!2b+fX>EVC0nB}pUT<sRBVb?~xVUa>@*Z%x0}MUsk|8;gpO#Q4
z0Pkn?O*vrj7U*4b`_?+g=>w3VUM=4M2Zz8|k+Ro4-Xz`A*|&ddTK)S0Md5Ol8b}Lg
z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j~J04-N;XXXp$7006s5L_t(o!^P9f
z2|_^(h2ayh0U3AV1;GNQK0C54#g&XQYZtl`#rv2?l9L9$p92Ai7h`-06AvLkn0QLb
zKj0f5POGCZ@$2K_x4;+<z$ah|->!FqF!BB7V7tH)et+KV0!r|l^I4d<$z>PR;Obvc
zi>n5-;A#P_xJp0|-W|}3cLiwR%>i0?Q-CI39iWX@1z6z40akcXfF-^dV2#fPc;J%(
uUifH$C;k`UjsFBN@J|2>2LNH>0PqH@&E+BUD&+_O0000<MNUMnLSTZJf+lJJ

diff --git a/Resources/Textures/Structures/Windows/window.rsi/full.png b/Resources/Textures/Structures/Windows/window.rsi/full.png
index 897534dd8f6ad77a7169b021cb316555639cc403..5ed08bac4204e8a98d150333a24925dca8310739 100644
GIT binary patch
delta 1205
zcmV;m1WNm>1IP)GBYy;sNkl<Zc$~$TyKfv-6vlt&-a9ipyWZH2W1b0$f{hXovO)xe
zCIv-=P!NisAwr@7iJqP!eg23v^dO2TB?Vp{0TPS6<ZM84<h&fO?e*?F@1>a8U9U|P
zB)rPk%+*}Y`Mx=?d#(VSICZAMQ@{`3e{<ZNICZ9R=)=ze=zpZ?VAtj#3Y-HGToMD|
z5CDu;I}Cav{dMXbp4R0z4lfJ==%zUUp{D^F2B4c|)T$wMB{*YHQADN%Eee+=fCJyd
zIfnu)^o{o*BIGy#Gy@@404!M?Ll96+B3!LTRthlys8Xphd@#44s)DInfFK|RfAiiW
zE-&0b5N2LE#D9y^6HJ6&LE?nw-4zyZF9C35_9Z;6IIwRVfH=)qZf){lWtI75P|nfw
zwE<89d$naETjRT*BJw1`SzEZ-Ib5EjJOcy(+_}1hc1uGZ$OQtW$Z|{bQWNdK^&H_K
zcMdUzclOt4EVXe~1_C5a0mIwJUgy@2i%3{SoF%AKN`LG5j(Bf}E_l#N5vn2-Nme|w
zD8gxjBwc1-KEV8g+vKaQfdJq43s>ejaeISsaxYWuJ2bw%@I>POg5xLOW37IWZaXE<
za+0+c^~nkD_XH$KLQ8x?-{bk|Nm>~+E?(f+XJ3828v+{V&z(K;(U&M=s8>URAY@~0
z9e|-)Qh!Q#)Q)z8a|gtj!Fo_6g@9fN{=WNYB;<W!9BZ3h0LI4m3<M-ej3>hM-f@)D
zD5D>5<^Kp!iq&?64FcNRLy$Vh{4ZBVLfnJ3j_cPKktpuJ>kAO+)uk&M&<Now!LR@k
z!2oZ)@fyy#k&p(yhf>1f!!twg3lEfkUk?K&>wgvUEZcPfB7#wxv1)~2OJf@<!_Y5}
zh7lzpz;wMh6^&=M2`Ixp7Wg9}7TK0pqP7VDlFR~NvnTid-NKN7m3D{KPBO9(WHx7I
zqx0_qe65*p{86lB=d`mM2tC8kzx`PZG-XKoOi7;ajMFY6ieu8;?ch)VLFw{$PrNxY
z0e^lu!p+Pa+$kU_b502;8BHTf@*=@!U)VR4cnZL|oXo*k#TyBE4`cNzN=v^4`vQ8%
zbBA@KJqMtes(UDALebbX8QM5``eQDhKX-OF2;cwYQ=02*JoD@X?M_14?SM7|0a#0n
z@L;1uyA$Cg<?1HPp8jIU&{p3#Kx+*OY=7y<;4xKnD~fP|NAq5bx!LFNjV3O0qHM^D
zy02Nde4X5R*eoXS4Ysq{H{vNpYAs?d#u%J)Oza71ZAAUcO1y=%7h4P99M*NwLBN$O
z*8s@<U?3n9aAH_ULgvO|j?TTxWUV~2ov_?mXQLC-T>J}wqjNJTf$8xYrG4(NZGZCn
z<!j~s5tP8bJv9`<!;MX}F<iUZ<Yv1Hp^(JcK!AwQN@5O8?O|d0Avfk1(KZ{()^290
zd4;H@Uz_M{-Euw2n5<OEtz-F8AvDJ!N+UQj>u6(`3ZNAaj(b!5K~ek7m369Ng{T`L
zN(RG;EuNd{)->I^F0dM<h!O&$@h*W*W+`rWj#T@I%UOwG%n0rB(jxG5ujl^&ij&Wm
TAhAVV00000NkvXXu0mjft!p^a

delta 402
zcmV;D0d4-s39AE;BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0YFJaK~z{r?Uy|gf-n$9qZK2KiZutYqOkT5oWj!D16W&f3Jzgy
z?E$DoZE)x`-%f%76~f<OkvFr%gt+^RnIVik&wH`~Apy&>sDESIHnn||Bnh=?n!W{4
zJdR_!(Kn9ckVGbc0Tf^P+u(7D*ks{GVs5AK+%C_}PT^rAYvu%&Yd^pQNN~EApyJ4V
zK8BgVSllG=%f$+yOP7wwilc@YBXR<QqD1SE#W^3VTHFIWF%i%g!E`pKwl4SEm0Gnp
za`HW}|N0kv1AoPls7dIEmkP+@9N5<m9f`^nkYE|>gf7|wePINQfDtePMnGEtkI_1z
zOR0eJG|L?@bVGTX{-kmRq(qabDh_^~h}2_LYm{6OK3AQHif6difm~u=&_yLDz$ca-
wAX|`0poSPD{^P}D@K>|JUrwnv2#mb|4AL%YCpANW01E&B07*qoM6N<$f?46LSpWb4

diff --git a/Resources/Textures/Structures/Windows/window.rsi/meta.json b/Resources/Textures/Structures/Windows/window.rsi/meta.json
index 9f6536937a..41b8be18b4 100644
--- a/Resources/Textures/Structures/Windows/window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window0.png b/Resources/Textures/Structures/Windows/window.rsi/window0.png
index 95094714d3b20738d39d4ac64f7507ff94577854..37bade4a4a71e531e2b23af81c6e620a18dc4185 100644
GIT binary patch
delta 1616
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
O0000<MNUMnLSTZw0rnCA

delta 691
zcmV;k0!;nj49W$NBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0$)i)K~#8N?VGPs!$1(m1FAy}P!ysLAHf^+4Ui}V0>xlKR8)Xv
zPzVGH**EALRK(*dP!up_>LB0EUgjDuG|i^XCU?J?uX~e<&VPQne|t%{f{F>l@Q0d(
zh@yy<g9rm!t(I!H+iewBVKf>w!vG{dolfa$ej3pOI-QP6{`lnT@%w!e>>P9_^z~An
z`e%34EW|cN5m54oU9|Ivizowd=aCdlh*2NwMw9_W+Jt3dA<+Pkm;fCfg_+_a)qsTE
zz5U?p^CMGSM1LEglaIk{mn9bBdw@pI`e|{gjREVz8$i)nya5!Qg<TAtUJkCQxq#lu
zVJUlijnGz8Hm;9{_qVzL;#PB9{1Bk%EZzW$&f*QASQuThrd1cp=mF;8#Da`!PAqH#
zkYtvmClA;LV3U(2U9!@UP#@ALV+fds6IMw!p$r4^kbjsEM^PrQ4bZcG4w*ec4D3Rr
z$iqz(LbKT{n9t{x7enkH@AY~s8-V0NBMhke@iv!DO@d<aLx5sooSy{G2hY|cF&o$e
zU>O__?=Kp2B!;y;r&RK2OJY-#V3IsGM08CAWf*|1-M=#KysX<F!#2S7%w7wLOHLlJ
z4bac&ZGXa<fON_j0=TnQ)xiX|0qEW~)rB&8K&|lxP;?e=07Yl1v=9NQm!)rv6{L&J
z6qeE$b)IPB<)Po4m!+$~8$i)nya5!Qr8WlW(mE|Jq75*r$v=lIhFFO20osHtagl03
za*PJq-aXLbBGG{K8R9ar5M@A|^u`ZRMH!%zk1XQ^?L6Wlq8M`iud~kod77Gq;PrqY
Z_yv}nwSkvp8gBpq002ovPDHLkV1jx!H?9Bx

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window1.png b/Resources/Textures/Structures/Windows/window.rsi/window1.png
index 98f6b07bcb179e8ee2886c05241e663ffcacf7f0..4495aca459d59e327e8c391234a03bfcec9cc4da 100644
GIT binary patch
delta 1164
zcmV;71atd_1fL0zBYy;DNkl<Zc%1E<O^6&t7>3`f?&+ECncZyG_=6%!Siv7$Au+)m
zGz3u;6))n!AS*H_ZxYWrc#p^AB7q?05RV2$JxFqhKd_1`MnXamQ4`&`$!2!CXS%zp
z<g4ykRu9Q)wbixkyqB(Fy5_5Xr@N}=`MzN=lv2v*1NOeK|9?x9{-;kKf6S!6Z_>F6
z-TmBL@hM9E&CDQZB2Ck>9q6`dG$82|DG>TTk~{}a9yc0A?FLK+!D>4%@2Cc2$drQL
zEZ&=Hc|aKI_LAWGDANq>C^U{=y8+#O_ajMj^pYXI{^kdO0eg1MVsU91_uMfJDHW15
z1NS_9HUB-P0DtV>@i3ym)BTSc#;@Ig6KBrp<JH~(jJ1%1;pa2wA*BG$Ucz*zg-eT9
z(d<kBD8BKF-~NJ?eq2fX+6`Ee9%L@ywL754o1>fua-k2`av<C~ja(|IBnAs3GzJ6x
z-lWHk<JWG$xf4hJbKlDq#IN0eopT2cn)E+yxC)rxLw_4wV*?x*L#-Mc;J_Ga)z|<B
z#!#y^y#dBN;LQ)_pEl|L&PzK!HR;co*(GfHJ78>p17oOFV*?x*L#-Mc;J_Ga)uuPV
zcq8=0^RE~sHcox`zENVsbR%Sp#J0cK)d>p1)|9kprwMp_5_}lLo7l2?Uf^-0LZH=b
znue@Ym47fnN>EIDQYS4MOhOG~Y`=X9f5b&*XQdY-DbGz~h9t}3bI*nAH#eaB_{?hi
z)ED2uZ~K^?eE<<>=tM<kM+$}Wzg@wF3qR@1&+c6h;g*TWG;}30o&#P!{E40e+9jh8
zWUh~CF3<?0VwP1Ba!sGLGw+e^lN);uK$)PR<bNe4En>#ur9(*1hbWVq|5Rp}QLa+P
z23-E=m|242jc5Lk>sq&r4S4jmw+`N{MqvKfp|^L=9YFueBDzn_;^^mRv7Bc3_2c)d
zzMg+A<BgDMfkfT1x)aQ$z@NQpvbt5tssUlc*EIkFMG=GxvSz?wI7B9tUbdL|>RXwt
z8GjIX#m;YL=3ZMN*ClHPq@vgg-FN3Ur+$K39ZP2-0{0le+_9jRk;rwNV@uWy5WQvG
z76n*|Q)G!dOQAIbWHZ9W->)H-3W4u|OE>NVdj|BcgLxhn7Jk&PMc@V)v1UL&2$3~g
z$kQAt_rbXv6QQ+Ha0X3{_U?H^zgCXS1Aq1&0U=iFeEUM`0%#Xx%>b(IrUK`Yt_wFN
zK_~t%aM!c1VoT7#>-!$WyPqwfz3o<F2sbUFq~8^$^#vO`F;WGKaLNE;1;h+&$_WFA
z4G<$BRzS?arfM&i9!XOI`lpCcki((1xK2F+BUUhC2R7u40lZ`dSi=r%#dSlBYkyYI
zv79n<#(=uEMa~#NjDT1HF#}=;w&a8X#0H2F5Gx>NK<vO;Y-^Ejpb;A&RzS>v*nurM
zu@4|NkSZT}IzZO!ps(zGFHYP6BQ`*+fS3Wdm^X340Ad6Ea_uK(K<vPloG@T58z5#t
e?7)fu`~@0ZclH7qB!B<_002ovP6b4+LSTaAQ7J$G

delta 493
zcmbQw*~T(Kxt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSL74G)
z{)!X^2FBT*E{-7;ac^ho`y6(VILd7y5+JgukHz_tfX*tpMi)f`4i2WnM~<*aurM|{
zE||bk(|mA(!YqYCVU1Jr#?1`7_6T~k-Kh25r~Cfzr25mlLvmi~m+#%ZUbcIV=jAWL
zcNMx88Qg8&-Jo;Yhv}1zd@kb`<%G?p8~gJFo}cY?E@__OuxsOn9a}zKtn7EXefaKK
z-8!v~LKWS^3JQj1!tc&E?7jTjxTM+QR@_}DbB^zVAHMxc$_i^s<l54Ewk3>FMOUa{
zi7V5DEi=rWUR&$dUrv1XX-THlnTU%b4wsY|J)*X7DKvl7%Zyx^%<@G$i04v_VL!wB
zrnae8W=?91_oWrX8B2W{>s-4WXK6>VPB_@}ODjR_!QZUYT|dw7jn9j^$l<{DIo>v*
zXxr}Np39b{FIs+l(W~<LKdyfLz4~#pMc?90I(J!L7_@-h;K7hKNsJR>uL^@_H;Y2%
zLh%PxV(V9MY3;pr;M1+V#h?EKYxq5TcKP1+hPUz8|0n$2=MW50IgtVG7Y_!oF;034
bUHcdgY5i|w&E6aUj6McWS3j3^P6<r_!Y|V_

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window2.png b/Resources/Textures/Structures/Windows/window.rsi/window2.png
index 95094714d3b20738d39d4ac64f7507ff94577854..37bade4a4a71e531e2b23af81c6e620a18dc4185 100644
GIT binary patch
delta 1616
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
O0000<MNUMnLSTZw0rnCA

delta 691
zcmV;k0!;nj49W$NBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0$)i)K~#8N?VGPs!$1(m1FAy}P!ysLAHf^+4Ui}V0>xlKR8)Xv
zPzVGH**EALRK(*dP!up_>LB0EUgjDuG|i^XCU?J?uX~e<&VPQne|t%{f{F>l@Q0d(
zh@yy<g9rm!t(I!H+iewBVKf>w!vG{dolfa$ej3pOI-QP6{`lnT@%w!e>>P9_^z~An
z`e%34EW|cN5m54oU9|Ivizowd=aCdlh*2NwMw9_W+Jt3dA<+Pkm;fCfg_+_a)qsTE
zz5U?p^CMGSM1LEglaIk{mn9bBdw@pI`e|{gjREVz8$i)nya5!Qg<TAtUJkCQxq#lu
zVJUlijnGz8Hm;9{_qVzL;#PB9{1Bk%EZzW$&f*QASQuThrd1cp=mF;8#Da`!PAqH#
zkYtvmClA;LV3U(2U9!@UP#@ALV+fds6IMw!p$r4^kbjsEM^PrQ4bZcG4w*ec4D3Rr
z$iqz(LbKT{n9t{x7enkH@AY~s8-V0NBMhke@iv!DO@d<aLx5sooSy{G2hY|cF&o$e
zU>O__?=Kp2B!;y;r&RK2OJY-#V3IsGM08CAWf*|1-M=#KysX<F!#2S7%w7wLOHLlJ
z4bac&ZGXa<fON_j0=TnQ)xiX|0qEW~)rB&8K&|lxP;?e=07Yl1v=9NQm!)rv6{L&J
z6qeE$b)IPB<)Po4m!+$~8$i)nya5!Qr8WlW(mE|Jq75*r$v=lIhFFO20osHtagl03
za*PJq-aXLbBGG{K8R9ar5M@A|^u`ZRMH!%zk1XQ^?L6Wlq8M`iud~kod77Gq;PrqY
Z_yv}nwSkvp8gBpq002ovPDHLkV1jx!H?9Bx

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window3.png b/Resources/Textures/Structures/Windows/window.rsi/window3.png
index 98f6b07bcb179e8ee2886c05241e663ffcacf7f0..4495aca459d59e327e8c391234a03bfcec9cc4da 100644
GIT binary patch
delta 1164
zcmV;71atd_1fL0zBYy;DNkl<Zc%1E<O^6&t7>3`f?&+ECncZyG_=6%!Siv7$Au+)m
zGz3u;6))n!AS*H_ZxYWrc#p^AB7q?05RV2$JxFqhKd_1`MnXamQ4`&`$!2!CXS%zp
z<g4ykRu9Q)wbixkyqB(Fy5_5Xr@N}=`MzN=lv2v*1NOeK|9?x9{-;kKf6S!6Z_>F6
z-TmBL@hM9E&CDQZB2Ck>9q6`dG$82|DG>TTk~{}a9yc0A?FLK+!D>4%@2Cc2$drQL
zEZ&=Hc|aKI_LAWGDANq>C^U{=y8+#O_ajMj^pYXI{^kdO0eg1MVsU91_uMfJDHW15
z1NS_9HUB-P0DtV>@i3ym)BTSc#;@Ig6KBrp<JH~(jJ1%1;pa2wA*BG$Ucz*zg-eT9
z(d<kBD8BKF-~NJ?eq2fX+6`Ee9%L@ywL754o1>fua-k2`av<C~ja(|IBnAs3GzJ6x
z-lWHk<JWG$xf4hJbKlDq#IN0eopT2cn)E+yxC)rxLw_4wV*?x*L#-Mc;J_Ga)z|<B
z#!#y^y#dBN;LQ)_pEl|L&PzK!HR;co*(GfHJ78>p17oOFV*?x*L#-Mc;J_Ga)uuPV
zcq8=0^RE~sHcox`zENVsbR%Sp#J0cK)d>p1)|9kprwMp_5_}lLo7l2?Uf^-0LZH=b
znue@Ym47fnN>EIDQYS4MOhOG~Y`=X9f5b&*XQdY-DbGz~h9t}3bI*nAH#eaB_{?hi
z)ED2uZ~K^?eE<<>=tM<kM+$}Wzg@wF3qR@1&+c6h;g*TWG;}30o&#P!{E40e+9jh8
zWUh~CF3<?0VwP1Ba!sGLGw+e^lN);uK$)PR<bNe4En>#ur9(*1hbWVq|5Rp}QLa+P
z23-E=m|242jc5Lk>sq&r4S4jmw+`N{MqvKfp|^L=9YFueBDzn_;^^mRv7Bc3_2c)d
zzMg+A<BgDMfkfT1x)aQ$z@NQpvbt5tssUlc*EIkFMG=GxvSz?wI7B9tUbdL|>RXwt
z8GjIX#m;YL=3ZMN*ClHPq@vgg-FN3Ur+$K39ZP2-0{0le+_9jRk;rwNV@uWy5WQvG
z76n*|Q)G!dOQAIbWHZ9W->)H-3W4u|OE>NVdj|BcgLxhn7Jk&PMc@V)v1UL&2$3~g
z$kQAt_rbXv6QQ+Ha0X3{_U?H^zgCXS1Aq1&0U=iFeEUM`0%#Xx%>b(IrUK`Yt_wFN
zK_~t%aM!c1VoT7#>-!$WyPqwfz3o<F2sbUFq~8^$^#vO`F;WGKaLNE;1;h+&$_WFA
z4G<$BRzS?arfM&i9!XOI`lpCcki((1xK2F+BUUhC2R7u40lZ`dSi=r%#dSlBYkyYI
zv79n<#(=uEMa~#NjDT1HF#}=;w&a8X#0H2F5Gx>NK<vO;Y-^Ejpb;A&RzS>v*nurM
zu@4|NkSZT}IzZO!ps(zGFHYP6BQ`*+fS3Wdm^X340Ad6Ea_uK(K<vPloG@T58z5#t
e?7)fu`~@0ZclH7qB!B<_002ovP6b4+LSTaAQ7J$G

delta 493
zcmbQw*~T(Kxt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSL74G)
z{)!X^2FBT*E{-7;ac^ho`y6(VILd7y5+JgukHz_tfX*tpMi)f`4i2WnM~<*aurM|{
zE||bk(|mA(!YqYCVU1Jr#?1`7_6T~k-Kh25r~Cfzr25mlLvmi~m+#%ZUbcIV=jAWL
zcNMx88Qg8&-Jo;Yhv}1zd@kb`<%G?p8~gJFo}cY?E@__OuxsOn9a}zKtn7EXefaKK
z-8!v~LKWS^3JQj1!tc&E?7jTjxTM+QR@_}DbB^zVAHMxc$_i^s<l54Ewk3>FMOUa{
zi7V5DEi=rWUR&$dUrv1XX-THlnTU%b4wsY|J)*X7DKvl7%Zyx^%<@G$i04v_VL!wB
zrnae8W=?91_oWrX8B2W{>s-4WXK6>VPB_@}ODjR_!QZUYT|dw7jn9j^$l<{DIo>v*
zXxr}Np39b{FIs+l(W~<LKdyfLz4~#pMc?90I(J!L7_@-h;K7hKNsJR>uL^@_H;Y2%
zLh%PxV(V9MY3;pr;M1+V#h?EKYxq5TcKP1+hPUz8|0n$2=MW50IgtVG7Y_!oF;034
bUHcdgY5i|w&E6aUj6McWS3j3^P6<r_!Y|V_

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window4.png b/Resources/Textures/Structures/Windows/window.rsi/window4.png
index 30629fcac2aec115a9940cbd378b6039b439491d..13aaa2107eb3d7196a96e5530e1996c6cbe0b650 100644
GIT binary patch
delta 1168
zcmV;B1aJF`1fvO%BYy;HNkl<Zc%1E9-)me&6#nM^+P%A*G>!EKN>NIr{=f(gEf&#I
zP(f6D(HDyZB=irk?>_im3%(RYgdqA*d=W)KL8(ZsVk$;#DJ`Lh+G=XrWV83~&b@a=
z&fMLyDUudvof+Bv0=WZwXV1Cc&Y79-oVg5|kWy-W!M^7XoPWIQ>6fu33h~PR2k`di
zi>PnA6$|r+F*AGUwaxl6#_+}qyFSyg@9A{54PEk`BjB%Qf?O0vZ8||f$QTMpe0S<+
z#9?66wpnYNfYBdg$O;M3=@_%?R0vE>-J`CN?;Eq}3<2cGy?1U?ZC(hYcHIE;;Q0)V
zv6@kLoFTy6Z-2fK&Jd8L3Dy&i+iDSt=BhEfP7vS;fhh2i2#KXXu0mAIg@F?U6j4Q8
z7Z=Zf`94Hz&6sT`_5q&ffy)3nZzHQT(30kU7bix5OcQn8xA$R8`U0M|M7w!7K|mBm
zXm!{AmBNE4%;^Cq2w3ae_z0dM4$MWS_F#MUgHuo4NPm_t%pZPzX7&(TmzOd3<TT#-
z@-$X?hTlGY7so$(?-3pQq#tykJpu-y$!)@D2$0q%%|EmRkk%*7Puf4!9J+&oF#_71
zj?(%RvrK>L85oQa(9`%m&F>0~5zy24r1@RS!Wi|1v_5Hm(*CZ%iYK<T|3ASP0i^Ls
z>yzfsQh#@rLSqDw#wV>$nxC{k<p5lOIRaX1O6!y6M_&%WHjEL_iehAyDsrBKdx6RU
z3>5*S@k#5G=0{%+z&6Z<Kv5{IPay42Ie?)efHXd7{T|i~7C$zF_NM&tXJ0z0)8BSJ
zKs)ua{h8UaA?1eLKonKLIq$Y3)s|rhAyqu65r2{9xvqI_XcI8r7t47!K|)eDlM+Ft
z{A{A?197a{y?KDbp<avaJar$m37Fe|A5xy9nRb-cr=Z%qdm76ttGN4)NeCg4@(iBu
z<J*OwFacoCu7^;I%vFFlgEj%jPMlTOE6p|-t0D)(FDK4H&`FQe7ctqW;^OiZR2pM6
z6@RLGmwxya>#cGbe01mb|LD<f4%!5)2p=LZ;MW_FYFX*d19_R+zM2E^)=A_-s<ofR
zHH7W9`fS{{zZudd;Ow!Z|GMub`giaNT^F>VO~8$gvbm1`^)b0YU_^ieK3K(w00(@q
ziV*=0_+S-7Pk{CJ1?YT%PX8k>&J6GS0)K<RhyVwCu!<1@4)|adBLW=o!77HH0PBaP
z=@6ynS7>d7tP`-~`8ib}p|m*_P3k;_S09JhN#KudxprUVd*DTZYGq?t{i~1P*Rt=#
zad|3`Q0174CLt4$odi2>pTM6<Sy@_dCP=&Y@`NGHas=LB>I&8gn0svMTKo7nKYt>q
z2bi9|A2pAmQ7bD;qL4WE`(>Oze?e)FJ-Z*oE!~%^-qN&hoq#vLC{K*kRgIvEsGVc!
z>oeeafiSL>v$Pc5gH`22fB5}{f!TK=1gJnl#ZxMpB+P@)I}m<=qFY?O9@zj7Xj>=X
i(kJs}fy4#?{0&-Fd}<yBC<y=n00{s|MNUMnLSTZp(>{Oz

delta 498
zcmZ3?+08ORxt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSK$uZf
z!>fUTfpLMSi(^Pd+}qi@9xQ<(t@CgByqdvtnWfvH<LZ{X2_}*{Y)2Cc54Z6~@hm!+
zWFX1=?O>8153}2Cw#kqEZzcuImpRxfTK1f){K*`Cx%&I5Vr36Lq}@MLyIJ|*Or6vB
zCaZ9!Mz$TD`Zn$R#%6yfE92R%)1NPoD6f-w|M1U>t^J#X78~etF)VXsJg`NBVTKqh
z!{tQ`2~i>pKHW?WnTFq)!?xertx+v8-*54y&XX%Y6vQ9-^}5kcZvS43JHOvCinu<!
zHTi-nOjA8rS0Dr2$P4TVbz=R$e`{zzyvuJef6v8?8B8ZW|EXtpuxGw@JH0kKsk!J@
zl=0q2NvS;R&fNKP=u-4|(-7Hm^YH6Gw8XdY91=_VecdR=@ITudnfQ4N)*Lzb>=T=p
z_!(n`eaF)!@BKNdDqwD-b69jO6WGdZkT-VNb-LD7?@tK$QqQOi_1cd0O!suRTAgXA
z^PQB~#`#_H!QFtBhkGYzHk_AM3}z_Z!Sc)0vrSTM3)g|XiuFwI7%TGE?qq+kcc+&f
cv(pcT<d*+!>pp*;28=@nPgg&ebxsLQ08%5>{r~^~

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window5.png b/Resources/Textures/Structures/Windows/window.rsi/window5.png
index df4ef650886770bca3ae09bcd7cc067227552802..df8dd36cf54e1eeb9e03f2c59d16196a74347996 100644
GIT binary patch
delta 778
zcmV+l1NHox1)v6yBYy(tNkl<Zc%1E<J4_T&6o&t~GrP+y5ESen6xymJZb5B~+W2U&
zrlB`#VP|2l7Fya69}PCf#%F7^SQC^|Er=$X2uhS0b{==kxscGzEb1lajG6hGO?EST
z&i!*=bI*SrSdwL#)gN5GdFRzve;hgpaQ;*Wx1KK{h!cEye18|6*-KY;dj7__&QqKC
z%I4wSU}b0$a1<P+u(IBR2M16tTYPZ=!tbk4X#%&|M4$mZFu)q$V~v)>?6Jd8u8Y^*
zcX+h;2~Lu*#updh+0y5&Oh$kd$UF~iZ8xv{4dMcP3sXc<gsjnkX}3<{dwgk$3-Iyb
z?cDGGWChp_#D4|gYG@JStAI4M042yllv;oi<RD6^1h9TH`v*!T0N?&^o5~LX>t1(Z
zp?kvS`Rg-BtlsAx$F2#L?*Z%rNKAD7U>87QqU%RJ1WJ&DD7643$U&6K3&3_F)SbU}
zHTQ>^dsZ7ETUZ33#_vBnhmelEl?&wnP8_4zY;uI}3xDgG;9%P~pQElW!*Qg6EsG$I
zF{~VO?!PBl!*u5mbeeL7FNAdxq{g3~n!tyikNYp*WB$ck&hWXg3ZOPN&{jYiMbNGX
zfA1(~`23vMBIy(fGK>wjkZBEM8e_kf*}@l5`F#MN0LnGBfARp37l1qg#v33E>smy$
zfARp37k>b0f^h9;wFIErKY0KSw8H8wgY8DcEQ7=kZv;;km$$tEg0S|0^&m8JL0Gk|
zFqOayUxwz6a->iQTMv--0Tfa114@vCD7643$U&4^0PcWwX^cDI4pe>!h~F2u_~4C|
zzu>>WFCa~Ak`jnnNNti5pcbG6IfzmVP=Xvp5q~ey79EvU=E@BD2J$XVkuV%0hzqdK
zcL9IXH?W#+jz}HFZ1KhCfa3?padK+Xcm}XlJRvUu7vepDJOZtuVE{hPOi!4~5qc3@
zeDNMY9s%+SkY|9r1LPs#L|g#l5y-Uh43Kw#JOnfmvH;*Wtb^T!`Dp6<00000NkvXX
It^-0~g57m!n*aa+

delta 642
zcmV-|0)73U2ATzsBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0xwBKK~#8N?VF)e12GVW4`db4D#SSq>I9mHsN@My3>E|e0hU4W
z1js%F8iB&#PM}&q)k62!y~(ACX=nG(O!Cd_?9I9VyCe)rx_?uFX`1GDJRVnz#iBYs
zoj&pFj>Ds-`uYB%$96eyyLUd%k2m-HxDmVDVNiHsG^r`2lnHPF^yR5erkB^TudE4N
z01f*<_?o*qZ~;UpJk5U#k`Ul92+s?kDyayd;IZ(k3j<sL1$K+@!)q>%Z~+w7FGf8)
zk-`+9grQOoPk+D#P{>$Wkjf$mqX^)hEkywLY}tB0;Oye|iXS&(+yCdcrAz_t*-`{>
z&z2&9yDFne9W6BK0-TVt>ERa?RRLc3YH$Bwt<b0m2!$s;Ki&p~MtcgZg=hLr4>am)
zKqP!Js0$!M;ZyhvK$r+%2H{_44|ne`vvYn0!%{$pgny?)QTJdJg{1%*^YwDx_G6z8
zMbVg#fYh*F1KQOT=+}bWra%Yn_tSB>+zUWsy#{oM1pi750uupp=(%DbAqCV0$YEzl
zLJDXL=st5qLJ}g>1UN%{O@do!R7XHaf?sIV*8opKsGz6|AV@;2(3l8FnIeFDwiE%}
zvjzTp0ekfQf-(iTXG;;lJzI(Z?l9<_AXXNnFal(A#4i&GZ~<~pz%9l^0$hOH6ObY-
zC8V+l_M0Oy30kBgK!{0DBMAZC5Fbd;1}=c^2+(nPNP-1$0dh|uAi)H<0QZ1&`G0pn
c%7Ci+18Fi5jjyEM0ssI207*qoM6N<$f@qr%%K!iX

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window6.png b/Resources/Textures/Structures/Windows/window.rsi/window6.png
index 30629fcac2aec115a9940cbd378b6039b439491d..13aaa2107eb3d7196a96e5530e1996c6cbe0b650 100644
GIT binary patch
delta 1168
zcmV;B1aJF`1fvO%BYy;HNkl<Zc%1E9-)me&6#nM^+P%A*G>!EKN>NIr{=f(gEf&#I
zP(f6D(HDyZB=irk?>_im3%(RYgdqA*d=W)KL8(ZsVk$;#DJ`Lh+G=XrWV83~&b@a=
z&fMLyDUudvof+Bv0=WZwXV1Cc&Y79-oVg5|kWy-W!M^7XoPWIQ>6fu33h~PR2k`di
zi>PnA6$|r+F*AGUwaxl6#_+}qyFSyg@9A{54PEk`BjB%Qf?O0vZ8||f$QTMpe0S<+
z#9?66wpnYNfYBdg$O;M3=@_%?R0vE>-J`CN?;Eq}3<2cGy?1U?ZC(hYcHIE;;Q0)V
zv6@kLoFTy6Z-2fK&Jd8L3Dy&i+iDSt=BhEfP7vS;fhh2i2#KXXu0mAIg@F?U6j4Q8
z7Z=Zf`94Hz&6sT`_5q&ffy)3nZzHQT(30kU7bix5OcQn8xA$R8`U0M|M7w!7K|mBm
zXm!{AmBNE4%;^Cq2w3ae_z0dM4$MWS_F#MUgHuo4NPm_t%pZPzX7&(TmzOd3<TT#-
z@-$X?hTlGY7so$(?-3pQq#tykJpu-y$!)@D2$0q%%|EmRkk%*7Puf4!9J+&oF#_71
zj?(%RvrK>L85oQa(9`%m&F>0~5zy24r1@RS!Wi|1v_5Hm(*CZ%iYK<T|3ASP0i^Ls
z>yzfsQh#@rLSqDw#wV>$nxC{k<p5lOIRaX1O6!y6M_&%WHjEL_iehAyDsrBKdx6RU
z3>5*S@k#5G=0{%+z&6Z<Kv5{IPay42Ie?)efHXd7{T|i~7C$zF_NM&tXJ0z0)8BSJ
zKs)ua{h8UaA?1eLKonKLIq$Y3)s|rhAyqu65r2{9xvqI_XcI8r7t47!K|)eDlM+Ft
z{A{A?197a{y?KDbp<avaJar$m37Fe|A5xy9nRb-cr=Z%qdm76ttGN4)NeCg4@(iBu
z<J*OwFacoCu7^;I%vFFlgEj%jPMlTOE6p|-t0D)(FDK4H&`FQe7ctqW;^OiZR2pM6
z6@RLGmwxya>#cGbe01mb|LD<f4%!5)2p=LZ;MW_FYFX*d19_R+zM2E^)=A_-s<ofR
zHH7W9`fS{{zZudd;Ow!Z|GMub`giaNT^F>VO~8$gvbm1`^)b0YU_^ieK3K(w00(@q
ziV*=0_+S-7Pk{CJ1?YT%PX8k>&J6GS0)K<RhyVwCu!<1@4)|adBLW=o!77HH0PBaP
z=@6ynS7>d7tP`-~`8ib}p|m*_P3k;_S09JhN#KudxprUVd*DTZYGq?t{i~1P*Rt=#
zad|3`Q0174CLt4$odi2>pTM6<Sy@_dCP=&Y@`NGHas=LB>I&8gn0svMTKo7nKYt>q
z2bi9|A2pAmQ7bD;qL4WE`(>Oze?e)FJ-Z*oE!~%^-qN&hoq#vLC{K*kRgIvEsGVc!
z>oeeafiSL>v$Pc5gH`22fB5}{f!TK=1gJnl#ZxMpB+P@)I}m<=qFY?O9@zj7Xj>=X
i(kJs}fy4#?{0&-Fd}<yBC<y=n00{s|MNUMnLSTZp(>{Oz

delta 498
zcmZ3?+08ORxt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSK$uZf
z!>fUTfpLMSi(^Pd+}qi@9xQ<(t@CgByqdvtnWfvH<LZ{X2_}*{Y)2Cc54Z6~@hm!+
zWFX1=?O>8153}2Cw#kqEZzcuImpRxfTK1f){K*`Cx%&I5Vr36Lq}@MLyIJ|*Or6vB
zCaZ9!Mz$TD`Zn$R#%6yfE92R%)1NPoD6f-w|M1U>t^J#X78~etF)VXsJg`NBVTKqh
z!{tQ`2~i>pKHW?WnTFq)!?xertx+v8-*54y&XX%Y6vQ9-^}5kcZvS43JHOvCinu<!
zHTi-nOjA8rS0Dr2$P4TVbz=R$e`{zzyvuJef6v8?8B8ZW|EXtpuxGw@JH0kKsk!J@
zl=0q2NvS;R&fNKP=u-4|(-7Hm^YH6Gw8XdY91=_VecdR=@ITudnfQ4N)*Lzb>=T=p
z_!(n`eaF)!@BKNdDqwD-b69jO6WGdZkT-VNb-LD7?@tK$QqQOi_1cd0O!suRTAgXA
z^PQB~#`#_H!QFtBhkGYzHk_AM3}z_Z!Sc)0vrSTM3)g|XiuFwI7%TGE?qq+kcc+&f
cv(pcT<d*+!>pp*;28=@nPgg&ebxsLQ08%5>{r~^~

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window7.png b/Resources/Textures/Structures/Windows/window.rsi/window7.png
index 0e02c2e8de00c8cbba348e75dd3a5b8dbce1d31b..1a2e65fad78efe662cf60742e0d6afd2088f1e6b 100644
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Up!qLLn`LHogK(~$bf;>T&0m+
zq(MM{$;p9H?!cu21G~6c<%#A0WA&$-W=}7f=QJ&~Q?8)4uJ7cJ-#<Ti9eY3N;Qt0j
z2EI@phJqDI3=N01KFidv3_r;3@m+F%0VjjZDhY-M0Y@1a+O=l$3%obd>n|^vw}0-p
zi<NeFHFE#)8ZaDK*ag;aP}Owt`Ohg28QtbT4~}61YG7lq2r-1qL(F#;Wd@r0!#?2)
z%Rl~xWQGQa0N9e>OeY`I9{^be)tM;zp1UGGK?m6&+hv)*nAU!itCLw)Z4C53gQu&X
J%Q~loCIB+RX~6&h

literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!G)eKjv*CsZ)Y#$ZEz4cAa^W<!-lQ#pfO8v
zk`*I|OZ4T-zHxU{?R)1(UQ14{Ia>Qx{jql1nxza8-i#ZjF(v4-9*E*<*eb%1t;ulh
z(@(h%-|hZSoyTx3hyjNhED|r6zr=&}W6CY<`N)v;l&3B*C{zLHSO!m5KbLh*2~7YR
Cu2;wa

diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png
index 39ffd5be1fd6a117d57e55f02f9ac0cc33eb5ef5..df5805957d6b0d0b891e10d01cb5a46e4c36e95a 100644
GIT binary patch
literal 15988
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
DaE5Ko

delta 693
zcmV;m0!sb#eBT9-BYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI
z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW
zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx
z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o+gecsz&)j)@6nB7H73mW37Ag7Y6d$N}B65M-ayn5=cUX
zj2g<Qz(SN(jeisqDcX;D_=g>Tl3X&m%3$PJKou$^#}EDozq>UHQ<H8|AO>{5*!IUL
z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT<rWBOtg9TwJ#`c@MbU0m4tZWJr$WrzsQ)
z!220}Qw|uq1^U+9-dg)OeE>4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t
z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GUBsDKFL2v*70NhDLK~z}7#nvqn
z!Y~v@(J#m<AXSJsd;}|D6_scf)kSm#s2W@aiUJA?stgRFB+dJYjW{<ilbHaD%X|MY
znz*$VMicM*UOwO*-)wh#qlw?oo!kUMH~^V|UpN3~H1XBi^G@I&e!E`ye*$7~0G-jq
zSzbX3PW}o~angV(I9b3{oFpIz&khLSZrF>#vjTEYo)tiaPYR&KlLM&nqyP>)I)Dq0
z3gE<x(v1gj<D)+!34Fd-h9@9}pN@y`07)DGW{P<C5uky;0yOZVbZDEpGSYWGthT8u
bYb~BdHo^L^ZdgJ90000<2SrXqu0mjf3}rH`

diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png
index bb5136c8b008ae84e286e5a38026adea5bc4b14e..83737b8cefe39b1948b33192f9c553f14e70be24 100644
GIT binary patch
literal 15966
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
T+&>K<H>!JMPxP$~!+ZV$;QnZ1

delta 659
zcmV;E0&M->e7*&cBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI
z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW
zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx
z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o+gecsz&)j)@6nB7H73mW37Ag7Y6d$N}B65M-ayn5=cUX
zj2g<Qz(SN(jeisqDcX;D_=g>Tl3X&m%3$PJKou$^#}EDozq>UHQ<H8|AO>{5*!IUL
z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT<rWBOtg9TwJ#`c@MbU0m4tZWJr$WrzsQ)
z!220}Qw|uq1^U+9-dg)OeE>4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t
z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GUB{Sbi)dT<l0J}*<K~z}7#nUSi
z0x=Lp(bsE;LyW^muo6~+X1SvYgTjJ>f+E8t>CcOeIJdj10piO!KZJ>=lpsvJloB8C
zi64%qvoP`dWsciG4F?btu!aMego*F=*>?k5_-(oR1+?G*W?|wkSI~o-WnV!rZW=Ix
zn+1&GCIK2;9Z<oi*Ix^+3eZlj3b4Y50xa?F0BgJ}zyog%@WPt{Jn_u{Z~SjS1il&&
tg;xV2@t=Tb{40QgzXMn}00<KYfG2B~rKzhDTfP7Q002ovPDHLkV1ij2CqV!J

diff --git a/Resources/engineCommandPerms.yml b/Resources/engineCommandPerms.yml
index 51743c6e82..15200531e3 100644
--- a/Resources/engineCommandPerms.yml
+++ b/Resources/engineCommandPerms.yml
@@ -67,7 +67,6 @@
   - scene
   - replay_recording_stats
   - print_pvs_ack
-  - pvs_override_info
   - merge_grids
 
 

From f59b62e426485c3ffc291aaa3a659283fecd5863 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 13 Jun 2024 18:24:36 -0400
Subject: [PATCH 48/84] Revert "what"

This reverts commit beb81ff621b39111e3fd4e788eb701f29149a236, reversing
changes made to 510dedf8f75aa7abdb32812e39d46da434f5cc0d.
---
 Content.Client/Input/ContentContexts.cs       |   1 -
 .../Language/LanguageMenuWindow.xaml          |  18 -
 .../Language/LanguageMenuWindow.xaml.cs       | 134 -----
 .../Language/Systems/LanguageSystem.cs        |  76 ---
 .../Systems/TranslatorImplanterSystem.cs      |   8 -
 .../Options/UI/Tabs/KeyRebindTab.xaml.cs      |   1 -
 .../Systems/Chat/Controls/ChatInputBox.cs     |   1 -
 .../Language/LanguageMenuUIController.cs      |  89 ----
 .../MenuBar/GameTopMenuBarUIController.cs     |   4 -
 .../MenuBar/Widgets/GameTopMenuBar.xaml       |  10 -
 .../Administration/Managers/AdminManager.cs   |   2 +-
 .../Atmos/Components/AirtightComponent.cs     |  32 +-
 .../Atmos/EntitySystems/AirtightSystem.cs     |   2 +
 .../AtmosphereSystem.GridAtmosphere.cs        |   8 +-
 .../AtmosphereSystem.Processing.cs            |   2 +-
 .../EntitySystems/AtmosphereSystem.Utils.cs   |   3 +-
 Content.Server/Atmos/GasMixture.cs            |   7 +-
 Content.Server/Atmos/TileAtmosphere.cs        |   3 -
 Content.Server/Chat/Systems/ChatSystem.cs     | 153 ++----
 .../Chemistry/ReagentEffects/MakeSentient.cs  |  20 +-
 .../Language/Commands/ListLanguagesCommand.cs |  39 --
 .../Language/Commands/SayLanguageCommand.cs   |  53 --
 .../Commands/SelectLanguageCommand.cs         |  48 --
 .../Language/DetermineEntityLanguagesEvent.cs |  29 --
 .../Language/LanguageSystem.Networking.cs     |  59 ---
 Content.Server/Language/LanguageSystem.cs     | 289 ----------
 .../Language/TranslatorImplanterSystem.cs     |  72 ---
 Content.Server/Language/TranslatorSystem.cs   | 225 --------
 .../Mind/Commands/MakeSentientCommand.cs      |  10 -
 .../Radio/EntitySystems/HeadsetSystem.cs      |  16 +-
 .../Radio/EntitySystems/RadioDeviceSystem.cs  |   5 +-
 .../Radio/EntitySystems/RadioSystem.cs        |  66 +--
 Content.Server/Radio/RadioEvent.cs            |  14 +-
 .../Speech/EntitySystems/ListeningSystem.cs   |   7 +-
 Content.Shared/Input/ContentKeyFunctions.cs   |   1 -
 .../Components/LanguageSpeakerComponent.cs    |  29 --
 .../TranslatorImplanterComponent.cs           |  35 --
 .../Translators/BaseTranslatorComponent.cs    |  47 --
 .../HandheldTranslatorComponent.cs            |  15 -
 .../Translators/HoldsTranslatorComponent.cs   |  11 -
 .../ImplantedTranslatorComponent.cs           |   9 -
 .../IntrinsicTranslatorComponent.cs           |  10 -
 .../UniversalLanguageSpeakerComponent.cs      |  11 -
 .../Language/Events/LanguagesSetMessage.cs    |  13 -
 .../Language/Events/LanguagesUpdateEvent.cs   |   8 -
 .../Events/LanguagesUpdatedMessage.cs         |  15 -
 .../Events/RequestLanguagesMessage.cs         |  10 -
 Content.Shared/Language/LanguagePrototype.cs  |  37 --
 .../Language/Systems/SharedLanguageSystem.cs  |  39 --
 .../SharedTranslatorImplanterSystem.cs        |  36 --
 .../Systems/SharedTranslatorSystem.cs         |  34 --
 Resources/Changelog/Changelog.yml             |  24 -
 Resources/Locale/en-US/language/commands.ftl  |   8 -
 .../Locale/en-US/language/language-menu.ftl   |   4 -
 Resources/Locale/en-US/language/languages.ftl |  71 ---
 .../Locale/en-US/language/technologies.ftl    |   2 -
 .../Locale/en-US/language/translator.ftl      |   8 -
 .../DeltaV/Entities/Mobs/NPCs/animals.yml     |  13 +-
 .../DeltaV/Entities/Mobs/NPCs/familiars.yml   |   5 -
 .../DeltaV/Entities/Mobs/NPCs/nukiemouse.yml  |  10 +-
 .../DeltaV/Entities/Mobs/Species/harpy.yml    |  13 +-
 .../Entities/Mobs/Species/vulpkanin.yml       |   7 -
 .../Mobs/Cyborgs/base_borg_chassis.yml        |   7 -
 .../Prototypes/Entities/Mobs/NPCs/animals.yml | 129 +----
 .../Entities/Mobs/NPCs/argocyte.yml           |   7 +-
 .../Prototypes/Entities/Mobs/NPCs/pets.yml    |  65 +--
 .../Entities/Mobs/NPCs/regalrat.yml           |  13 -
 .../Entities/Mobs/NPCs/revenant.yml           |   1 -
 .../Prototypes/Entities/Mobs/NPCs/shadows.yml |  11 +-
 .../Prototypes/Entities/Mobs/NPCs/silicon.yml |   7 -
 .../Prototypes/Entities/Mobs/NPCs/slimes.yml  |   7 +-
 .../Prototypes/Entities/Mobs/NPCs/space.yml   |  23 +-
 .../Prototypes/Entities/Mobs/NPCs/xeno.yml    |  12 -
 .../Entities/Mobs/Player/observer.yml         |   1 -
 .../Entities/Mobs/Player/replay_observer.yml  |   1 -
 .../Prototypes/Entities/Mobs/Species/base.yml |   9 +-
 .../Entities/Mobs/Species/diona.yml           |   7 -
 .../Entities/Mobs/Species/dwarf.yml           |   7 -
 .../Entities/Mobs/Species/human.yml           |   8 -
 .../Prototypes/Entities/Mobs/Species/moth.yml |   7 -
 .../Entities/Mobs/Species/reptilian.yml       |   7 -
 .../Entities/Mobs/Species/slime.yml           |   7 -
 .../Objects/Devices/translator_implants.yml   | 132 -----
 .../Entities/Objects/Devices/translators.yml  | 205 --------
 .../Doors/Airlocks/base_structureairlocks.yml |   1 +
 .../Structures/Doors/Airlocks/shuttle.yml     |   1 +
 .../Structures/Doors/Firelocks/firelock.yml   |   2 +
 .../Doors/MaterialDoors/material_doors.yml    |   1 +
 .../Doors/SecretDoor/secret_door.yml          |   1 +
 .../Structures/Doors/Shutter/shutters.yml     |   1 +
 .../Doors/Windoors/base_structurewindoors.yml |   1 +
 .../Entities/Structures/Machines/lathe.yml    |  18 -
 .../Structures/Machines/vending_machines.yml  |   7 -
 .../Entities/Structures/plastic_flaps.yml     |   2 +
 Resources/Prototypes/Language/languages.yml   | 493 ------------------
 .../Nyanotrasen/Entities/Mobs/Species/Oni.yml |   7 -
 .../Entities/Mobs/Species/felinid.yml         |   9 -
 .../Prototypes/Recipes/Lathes/language.yml    | 190 -------
 .../Prototypes/Research/civilianservices.yml  |  40 --
 .../equipped-OUTERCLOTHING.png                | Bin 622 -> 411 bytes
 .../Armor/bulletproof.rsi/icon.png            | Bin 236 -> 244 bytes
 .../Armor/bulletproof.rsi/meta.json           |   2 +-
 .../Armor/riot.rsi/equipped-OUTERCLOTHING.png | Bin 648 -> 1562 bytes
 .../OuterClothing/Armor/riot.rsi/icon.png     | Bin 231 -> 293 bytes
 .../OuterClothing/Armor/riot.rsi/meta.json    |   4 +-
 .../security.rsi/equipped-OUTERCLOTHING.png   | Bin 413 -> 343 bytes
 .../OuterClothing/Armor/security.rsi/icon.png | Bin 193 -> 252 bytes
 .../Armor/security.rsi/meta.json              |   2 +-
 .../equipped-OUTERCLOTHING.png                | Bin 484 -> 428 bytes
 .../Armor/security_slim.rsi/icon.png          | Bin 195 -> 277 bytes
 .../Armor/security_slim.rsi/meta.json         |   2 +-
 Resources/Textures/Interface/language.png     | Bin 739 -> 0 bytes
 .../Objects/Devices/translator.rsi/icon.png   | Bin 278 -> 0 bytes
 .../Objects/Devices/translator.rsi/meta.json  |  17 -
 .../Devices/translator.rsi/translator.png     | Bin 202 -> 0 bytes
 .../fire_extinguisher_closed.png              | Bin 303 -> 429 bytes
 .../fire_extinguisher_open.png                | Bin 315 -> 420 bytes
 .../Misc/fire_extinguisher.rsi/meta.json      |   2 +-
 .../Misc/stock_parts.rsi/adv_capacitor.png    | Bin 345 -> 420 bytes
 .../Misc/stock_parts.rsi/adv_scan_module.png  | Bin 725 -> 927 bytes
 .../stock_parts.rsi/advanced_matter_bin.png   | Bin 430 -> 426 bytes
 .../stock_parts.rsi/bluespace_matter_bin.png  | Bin 1283 -> 627 bytes
 .../Misc/stock_parts.rsi/capacitor.png        | Bin 391 -> 254 bytes
 .../Misc/stock_parts.rsi/femto_mani.png       | Bin 416 -> 589 bytes
 .../Misc/stock_parts.rsi/high_micro_laser.png | Bin 333 -> 278 bytes
 .../Misc/stock_parts.rsi/matter_bin.png       | Bin 457 -> 462 bytes
 .../Objects/Misc/stock_parts.rsi/meta.json    |  50 +-
 .../Misc/stock_parts.rsi/micro_laser.png      | Bin 357 -> 263 bytes
 .../Misc/stock_parts.rsi/micro_mani.png       | Bin 390 -> 366 bytes
 .../Misc/stock_parts.rsi/nano_mani.png        | Bin 428 -> 394 bytes
 .../Misc/stock_parts.rsi/pico_mani.png        | Bin 404 -> 373 bytes
 .../stock_parts.rsi/quadratic_capacitor.png   | Bin 367 -> 729 bytes
 .../stock_parts.rsi/quadultra_micro_laser.png | Bin 421 -> 371 bytes
 .../Misc/stock_parts.rsi/scan_module.png      | Bin 478 -> 491 bytes
 .../Misc/stock_parts.rsi/super_capacitor.png  | Bin 291 -> 419 bytes
 .../Misc/stock_parts.rsi/super_matter_bin.png | Bin 523 -> 397 bytes
 .../stock_parts.rsi/super_scan_module.png     | Bin 564 -> 1182 bytes
 .../stock_parts.rsi/triphasic_scan_module.png | Bin 770 -> 631 bytes
 .../ultra_high_micro_laser.png                | Bin 389 -> 304 bytes
 .../Weapons/Melee/stunbaton.rsi/meta.json     |   2 +-
 .../Melee/stunbaton.rsi/stunbaton_nocell.png  | Bin 253 -> 431 bytes
 .../Melee/stunbaton.rsi/stunbaton_off.png     | Bin 224 -> 362 bytes
 .../Melee/stunbaton.rsi/stunbaton_on.png      | Bin 1753 -> 1091 bytes
 .../Decoration/banner.rsi/banner.png          | Bin 397 -> 1577 bytes
 .../Decoration/banner.rsi/banner_cargo.png    | Bin 415 -> 519 bytes
 .../banner.rsi/banner_engineering.png         | Bin 381 -> 724 bytes
 .../Decoration/banner.rsi/banner_medical.png  | Bin 420 -> 428 bytes
 .../Decoration/banner.rsi/banner_science.png  | Bin 417 -> 537 bytes
 .../Decoration/banner.rsi/banner_security.png | Bin 402 -> 742 bytes
 .../banner.rsi/banner_syndicate.png           | Bin 394 -> 569 bytes
 .../Decoration/banner.rsi/meta.json           |   2 +-
 .../Furniture/furniture.rsi/meta.json         |   4 +-
 .../Furniture/furniture.rsi/rack.png          | Bin 315 -> 250 bytes
 .../Singularity/collector.rsi/ca-o0.png       | Bin 152 -> 1477 bytes
 .../Singularity/collector.rsi/ca-o1.png       | Bin 149 -> 1415 bytes
 .../Singularity/collector.rsi/ca-o2.png       | Bin 151 -> 1383 bytes
 .../Singularity/collector.rsi/ca-o3.png       | Bin 148 -> 1421 bytes
 .../Singularity/collector.rsi/ca-tank.png     | Bin 198 -> 2071 bytes
 .../Singularity/collector.rsi/ca_active.png   | Bin 3159 -> 10749 bytes
 .../Singularity/collector.rsi/ca_deactive.png | Bin 3131 -> 10791 bytes
 .../Singularity/collector.rsi/ca_off.png      | Bin 990 -> 2755 bytes
 .../Singularity/collector.rsi/ca_on.png       | Bin 1521 -> 3212 bytes
 .../Singularity/collector.rsi/cu.png          | Bin 990 -> 558 bytes
 .../Singularity/collector.rsi/meta.json       |   2 +-
 .../Singularity/collector.rsi/static.png      | Bin 1608 -> 664 bytes
 .../Wallmounts/screen.rsi/meta.json           |   2 +-
 .../Wallmounts/screen.rsi/screen.png          | Bin 398 -> 266 bytes
 .../Structures/Walls/solid_rust.rsi/full.png  | Bin 2228 -> 2155 bytes
 .../Structures/Walls/solid_rust.rsi/meta.json |   2 +-
 .../solid_rust.rsi/reinf_construct-0.png      | Bin 2248 -> 2293 bytes
 .../solid_rust.rsi/reinf_construct-1.png      | Bin 2272 -> 2303 bytes
 .../solid_rust.rsi/reinf_construct-2.png      | Bin 2269 -> 2340 bytes
 .../solid_rust.rsi/reinf_construct-3.png      | Bin 2272 -> 2339 bytes
 .../solid_rust.rsi/reinf_construct-4.png      | Bin 2268 -> 2372 bytes
 .../solid_rust.rsi/reinf_construct-5.png      | Bin 2265 -> 2381 bytes
 .../Walls/solid_rust.rsi/reinf_over0.png      | Bin 3233 -> 3230 bytes
 .../Walls/solid_rust.rsi/reinf_over1.png      | Bin 3206 -> 2990 bytes
 .../Walls/solid_rust.rsi/reinf_over2.png      | Bin 3233 -> 3230 bytes
 .../Walls/solid_rust.rsi/reinf_over3.png      | Bin 3206 -> 2990 bytes
 .../Walls/solid_rust.rsi/reinf_over4.png      | Bin 3191 -> 2903 bytes
 .../Walls/solid_rust.rsi/reinf_over5.png      | Bin 3128 -> 2908 bytes
 .../Walls/solid_rust.rsi/reinf_over6.png      | Bin 3191 -> 2903 bytes
 .../Walls/solid_rust.rsi/reinf_over7.png      | Bin 3083 -> 2840 bytes
 .../Walls/solid_rust.rsi/rgeneric.png         | Bin 2248 -> 2332 bytes
 .../Walls/solid_rust.rsi/solid0.png           | Bin 3281 -> 2943 bytes
 .../Walls/solid_rust.rsi/solid1.png           | Bin 3147 -> 2638 bytes
 .../Walls/solid_rust.rsi/solid2.png           | Bin 3281 -> 2943 bytes
 .../Walls/solid_rust.rsi/solid3.png           | Bin 3147 -> 2638 bytes
 .../Walls/solid_rust.rsi/solid4.png           | Bin 3156 -> 2554 bytes
 .../Walls/solid_rust.rsi/solid5.png           | Bin 3128 -> 2565 bytes
 .../Walls/solid_rust.rsi/solid6.png           | Bin 3156 -> 2531 bytes
 .../Walls/solid_rust.rsi/solid7.png           | Bin 3083 -> 2495 bytes
 Resources/keybinds.yml                        |   3 -
 shell.nix                                     |   2 +-
 194 files changed, 202 insertions(+), 3374 deletions(-)
 delete mode 100644 Content.Client/Language/LanguageMenuWindow.xaml
 delete mode 100644 Content.Client/Language/LanguageMenuWindow.xaml.cs
 delete mode 100644 Content.Client/Language/Systems/LanguageSystem.cs
 delete mode 100644 Content.Client/Language/Systems/TranslatorImplanterSystem.cs
 delete mode 100644 Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs
 delete mode 100644 Content.Server/Language/Commands/ListLanguagesCommand.cs
 delete mode 100644 Content.Server/Language/Commands/SayLanguageCommand.cs
 delete mode 100644 Content.Server/Language/Commands/SelectLanguageCommand.cs
 delete mode 100644 Content.Server/Language/DetermineEntityLanguagesEvent.cs
 delete mode 100644 Content.Server/Language/LanguageSystem.Networking.cs
 delete mode 100644 Content.Server/Language/LanguageSystem.cs
 delete mode 100644 Content.Server/Language/TranslatorImplanterSystem.cs
 delete mode 100644 Content.Server/Language/TranslatorSystem.cs
 delete mode 100644 Content.Shared/Language/Components/LanguageSpeakerComponent.cs
 delete mode 100644 Content.Shared/Language/Components/TranslatorImplanterComponent.cs
 delete mode 100644 Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs
 delete mode 100644 Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs
 delete mode 100644 Content.Shared/Language/Components/Translators/HoldsTranslatorComponent.cs
 delete mode 100644 Content.Shared/Language/Components/Translators/ImplantedTranslatorComponent.cs
 delete mode 100644 Content.Shared/Language/Components/Translators/IntrinsicTranslatorComponent.cs
 delete mode 100644 Content.Shared/Language/Components/UniversalLanguageSpeakerComponent.cs
 delete mode 100644 Content.Shared/Language/Events/LanguagesSetMessage.cs
 delete mode 100644 Content.Shared/Language/Events/LanguagesUpdateEvent.cs
 delete mode 100644 Content.Shared/Language/Events/LanguagesUpdatedMessage.cs
 delete mode 100644 Content.Shared/Language/Events/RequestLanguagesMessage.cs
 delete mode 100644 Content.Shared/Language/LanguagePrototype.cs
 delete mode 100644 Content.Shared/Language/Systems/SharedLanguageSystem.cs
 delete mode 100644 Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs
 delete mode 100644 Content.Shared/Language/Systems/SharedTranslatorSystem.cs
 delete mode 100644 Resources/Locale/en-US/language/commands.ftl
 delete mode 100644 Resources/Locale/en-US/language/language-menu.ftl
 delete mode 100644 Resources/Locale/en-US/language/languages.ftl
 delete mode 100644 Resources/Locale/en-US/language/technologies.ftl
 delete mode 100644 Resources/Locale/en-US/language/translator.ftl
 delete mode 100644 Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml
 delete mode 100644 Resources/Prototypes/Entities/Objects/Devices/translators.yml
 delete mode 100644 Resources/Prototypes/Language/languages.yml
 delete mode 100644 Resources/Prototypes/Recipes/Lathes/language.yml
 delete mode 100644 Resources/Textures/Interface/language.png
 delete mode 100644 Resources/Textures/Objects/Devices/translator.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Devices/translator.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Devices/translator.rsi/translator.png

diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index fa63193810..03f4f3f38b 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -55,7 +55,6 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.UseItemInHand);
             human.AddFunction(ContentKeyFunctions.AltUseItemInHand);
             human.AddFunction(ContentKeyFunctions.OpenCharacterMenu);
-            human.AddFunction(ContentKeyFunctions.OpenLanguageMenu);
             human.AddFunction(ContentKeyFunctions.ActivateItemInWorld);
             human.AddFunction(ContentKeyFunctions.ThrowItemInHand);
             human.AddFunction(ContentKeyFunctions.AltActivateItemInWorld);
diff --git a/Content.Client/Language/LanguageMenuWindow.xaml b/Content.Client/Language/LanguageMenuWindow.xaml
deleted file mode 100644
index ff33a6ddf5..0000000000
--- a/Content.Client/Language/LanguageMenuWindow.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<DefaultWindow xmlns="https://spacestation14.io"
-               xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
-               Title="{Loc language-menu-window-title}"
-               SetSize="300 300">
-    <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
-        <PanelContainer Name="CurrentLanguageContainer" Access="Public" StyleClasses="PdaBorderRect">
-            <Label Name="CurrentLanguageLabel" Access="Public" Text="Current Language:" HorizontalExpand="True"></Label>
-        </PanelContainer>
-
-        <ui:HLine></ui:HLine>
-
-        <ScrollContainer HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="False" VScrollEnabled="True" MinHeight="50">
-            <BoxContainer Name="OptionsList" Access="Public" HorizontalExpand="True" SeparationOverride="2" Orientation="Vertical">
-                <!-- The rest here is generated programmatically -->
-            </BoxContainer>
-        </ScrollContainer>
-    </BoxContainer>
-</DefaultWindow>
diff --git a/Content.Client/Language/LanguageMenuWindow.xaml.cs b/Content.Client/Language/LanguageMenuWindow.xaml.cs
deleted file mode 100644
index 312814aca3..0000000000
--- a/Content.Client/Language/LanguageMenuWindow.xaml.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using Content.Client.Language.Systems;
-using Content.Shared.Language;
-using Content.Shared.Language.Systems;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Console;
-using Robust.Shared.Utility;
-using Serilog;
-using static Content.Shared.Language.Systems.SharedLanguageSystem;
-
-namespace Content.Client.Language;
-
-[GenerateTypedNameReferences]
-public sealed partial class LanguageMenuWindow : DefaultWindow
-{
-    private readonly LanguageSystem _clientLanguageSystem;
-    private readonly List<EntryState> _entries = new();
-
-
-    public LanguageMenuWindow()
-    {
-        RobustXamlLoader.Load(this);
-        _clientLanguageSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
-    }
-
-    protected override void Opened()
-    {
-        // Refresh the window when it gets opened.
-        // This actually causes two refreshes: one immediately, and one after the server sends a state message.
-        UpdateState(_clientLanguageSystem.CurrentLanguage, _clientLanguageSystem.SpokenLanguages);
-        _clientLanguageSystem.RequestStateUpdate();
-    }
-
-
-    public void UpdateState(string currentLanguage, List<string> spokenLanguages)
-    {
-        var langName = Loc.GetString($"language-{currentLanguage}-name");
-        CurrentLanguageLabel.Text = Loc.GetString("language-menu-current-language", ("language", langName));
-
-        OptionsList.RemoveAllChildren();
-        _entries.Clear();
-
-        foreach (var language in spokenLanguages)
-        {
-            AddLanguageEntry(language);
-        }
-
-        // Disable the button for the currently chosen language
-        foreach (var entry in _entries)
-        {
-            if (entry.button != null)
-                entry.button.Disabled = entry.language == currentLanguage;
-        }
-    }
-
-    private void AddLanguageEntry(string language)
-    {
-        var proto = _clientLanguageSystem.GetLanguagePrototype(language);
-        var state = new EntryState { language = language };
-
-        var container = new BoxContainer { Orientation = BoxContainer.LayoutOrientation.Vertical };
-
-        #region Header
-        var header = new BoxContainer
-        {
-            Orientation = BoxContainer.LayoutOrientation.Horizontal,
-            HorizontalExpand = true,
-            SeparationOverride = 2
-        };
-
-        var name = new Label
-        {
-            Text = proto?.Name ?? Loc.GetString("generic-error"),
-            MinWidth = 50,
-            HorizontalExpand = true
-        };
-
-        var button = new Button { Text = "Choose" };
-        button.OnPressed += _ => OnLanguageChosen(language);
-        state.button = button;
-
-        header.AddChild(name);
-        header.AddChild(button);
-
-        container.AddChild(header);
-        #endregion
-
-        #region Collapsible description
-        var body = new CollapsibleBody
-        {
-            HorizontalExpand = true,
-            Margin = new Thickness(4f, 4f)
-        };
-
-        var description = new RichTextLabel { HorizontalExpand = true };
-        description.SetMessage(proto?.Description ?? Loc.GetString("generic-error"));
-        body.AddChild(description);
-
-        var collapser = new Collapsible(Loc.GetString("language-menu-description-header"), body)
-        {
-            Orientation = BoxContainer.LayoutOrientation.Vertical,
-            HorizontalExpand = true
-        };
-
-        container.AddChild(collapser);
-        #endregion
-
-        // Before adding, wrap the new container in a PanelContainer to give it a distinct look
-        var wrapper = new PanelContainer();
-        wrapper.StyleClasses.Add("PdaBorderRect");
-
-        wrapper.AddChild(container);
-        OptionsList.AddChild(wrapper);
-
-        _entries.Add(state);
-    }
-
-
-    private void OnLanguageChosen(string id)
-    {
-        var proto = _clientLanguageSystem.GetLanguagePrototype(id);
-        if (proto != null)
-            _clientLanguageSystem.RequestSetLanguage(proto);
-    }
-
-
-    private struct EntryState
-    {
-        public string language;
-        public Button? button;
-    }
-}
diff --git a/Content.Client/Language/Systems/LanguageSystem.cs b/Content.Client/Language/Systems/LanguageSystem.cs
deleted file mode 100644
index 9714078b2c..0000000000
--- a/Content.Client/Language/Systems/LanguageSystem.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using Content.Shared.Language;
-using Content.Shared.Language.Events;
-using Content.Shared.Language.Systems;
-using Robust.Client;
-using Robust.Shared.Console;
-
-namespace Content.Client.Language.Systems;
-
-/// <summary>
-///   Client-side language system.
-/// </summary>
-/// <remarks>
-///   Unlike the server, the client is not aware of other entities' languages; it's only notified about the entity that it posesses.
-///   Due to that, this system stores such information in a static manner.
-/// </remarks>
-public sealed class LanguageSystem : SharedLanguageSystem
-{
-    [Dependency] private readonly IBaseClient _client = default!;
-
-    /// <summary>
-    ///   The current language of the entity currently possessed by the player.
-    /// </summary>
-    public string CurrentLanguage { get; private set; } = default!;
-    /// <summary>
-    ///   The list of languages the currently possessed entity can speak.
-    /// </summary>
-    public List<string> SpokenLanguages { get; private set; } = new();
-    /// <summary>
-    ///   The list of languages the currently possessed entity can understand.
-    /// </summary>
-    public List<string> UnderstoodLanguages { get; private set; } = new();
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeNetworkEvent<LanguagesUpdatedMessage>(OnLanguagesUpdated);
-        _client.RunLevelChanged += OnRunLevelChanged;
-    }
-
-    private void OnLanguagesUpdated(LanguagesUpdatedMessage message)
-    {
-        CurrentLanguage = message.CurrentLanguage;
-        SpokenLanguages = message.Spoken;
-        UnderstoodLanguages = message.Understood;
-    }
-
-    private void OnRunLevelChanged(object? sender, RunLevelChangedEventArgs args)
-    {
-        // Request an update when entering a game
-        if (args.NewLevel == ClientRunLevel.InGame)
-            RequestStateUpdate();
-    }
-
-    /// <summary>
-    ///   Sends a network request to the server to update this system's state.
-    ///   The server may ignore the said request if the player is not possessing an entity.
-    /// </summary>
-    public void RequestStateUpdate()
-    {
-        RaiseNetworkEvent(new RequestLanguagesMessage());
-    }
-
-    public void RequestSetLanguage(LanguagePrototype language)
-    {
-        if (language.ID == CurrentLanguage)
-            return;
-
-        RaiseNetworkEvent(new LanguagesSetMessage(language.ID));
-
-        // May cause some minor desync...
-        // So to reduce the probability of desync, we replicate the change locally too
-        if (SpokenLanguages.Contains(language.ID))
-            CurrentLanguage = language.ID;
-    }
-}
diff --git a/Content.Client/Language/Systems/TranslatorImplanterSystem.cs b/Content.Client/Language/Systems/TranslatorImplanterSystem.cs
deleted file mode 100644
index da19b3decf..0000000000
--- a/Content.Client/Language/Systems/TranslatorImplanterSystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.Language.Systems;
-
-namespace Content.Client.Language.Systems;
-
-public sealed class TranslatorImplanterSystem : SharedTranslatorImplanterSystem
-{
-
-}
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index 49e8099e0f..f0537079b9 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -212,7 +212,6 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.OpenCraftingMenu);
             AddButton(ContentKeyFunctions.OpenGuidebook);
             AddButton(ContentKeyFunctions.OpenInventoryMenu);
-            AddButton(ContentKeyFunctions.OpenLanguageMenu);
             AddButton(ContentKeyFunctions.OpenAHelp);
             AddButton(ContentKeyFunctions.OpenActionsMenu);
             AddButton(ContentKeyFunctions.OpenEntitySpawnWindow);
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs
index 31a3f11b19..843fd46c1a 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Chat;
 using Content.Shared.Input;
-using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.UserInterface.Systems.Chat.Controls;
diff --git a/Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs b/Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs
deleted file mode 100644
index f36521ce81..0000000000
--- a/Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using Content.Client.Language;
-using Content.Client.Gameplay;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Input;
-using Content.Shared.Language.Events;
-using Robust.Client.UserInterface.Controllers;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Input.Binding;
-using Robust.Shared.Utility;
-using static Robust.Client.UserInterface.Controls.BaseButton;
-using JetBrains.Annotations;
-
-namespace Content.Client.UserInterface.Systems.Language;
-
-[UsedImplicitly]
-public sealed class LanguageMenuUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>
-{
-    public LanguageMenuWindow? LanguageWindow;
-    private MenuButton? LanguageButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.LanguageButton;
-
-    public override void Initialize()
-    {
-        SubscribeNetworkEvent((LanguagesUpdatedMessage message, EntitySessionEventArgs _) =>
-            LanguageWindow?.UpdateState(message.CurrentLanguage, message.Spoken));
-    }
-
-    public void OnStateEntered(GameplayState state)
-    {
-        DebugTools.Assert(LanguageWindow == null);
-
-        LanguageWindow = UIManager.CreateWindow<LanguageMenuWindow>();
-        LayoutContainer.SetAnchorPreset(LanguageWindow, LayoutContainer.LayoutPreset.CenterTop);
-
-        CommandBinds.Builder.Bind(ContentKeyFunctions.OpenLanguageMenu,
-            InputCmdHandler.FromDelegate(_ => ToggleWindow())).Register<LanguageMenuUIController>();
-    }
-
-    public void OnStateExited(GameplayState state)
-    {
-        if (LanguageWindow != null)
-        {
-            LanguageWindow.Dispose();
-            LanguageWindow = null;
-        }
-
-        CommandBinds.Unregister<LanguageMenuUIController>();
-    }
-
-    public void UnloadButton()
-    {
-        if (LanguageButton == null)
-            return;
-
-        LanguageButton.OnPressed -= LanguageButtonPressed;
-    }
-
-    public void LoadButton()
-    {
-        if (LanguageButton == null)
-            return;
-
-        LanguageButton.OnPressed += LanguageButtonPressed;
-
-        if (LanguageWindow == null)
-            return;
-
-        LanguageWindow.OnClose += () => LanguageButton.Pressed = false;
-        LanguageWindow.OnOpen += () => LanguageButton.Pressed = true;
-    }
-
-    private void LanguageButtonPressed(ButtonEventArgs args)
-    {
-        ToggleWindow();
-    }
-
-    private void ToggleWindow()
-    {
-        if (LanguageWindow == null)
-            return;
-
-        if (LanguageButton != null)
-            LanguageButton.SetClickPressed(!LanguageWindow.IsOpen);
-
-        if (LanguageWindow.IsOpen)
-            LanguageWindow.Close();
-        else
-            LanguageWindow.Open();
-    }
-}
diff --git a/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs b/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs
index 156fa63884..1505db48a7 100644
--- a/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs
+++ b/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs
@@ -9,7 +9,6 @@
 using Content.Client.UserInterface.Systems.MenuBar.Widgets;
 using Content.Client.UserInterface.Systems.Sandbox;
 using Robust.Client.UserInterface.Controllers;
-using Content.Client.UserInterface.Systems.Language;
 
 namespace Content.Client.UserInterface.Systems.MenuBar;
 
@@ -23,7 +22,6 @@ public sealed class GameTopMenuBarUIController : UIController
     [Dependency] private readonly ActionUIController _action = default!;
     [Dependency] private readonly SandboxUIController _sandbox = default!;
     [Dependency] private readonly GuidebookUIController _guidebook = default!;
-    [Dependency] private readonly LanguageMenuUIController _language = default!;
 
     private GameTopMenuBar? GameTopMenuBar => UIManager.GetActiveUIWidgetOrNull<GameTopMenuBar>();
 
@@ -46,7 +44,6 @@ public void UnloadButtons()
         _ahelp.UnloadButton();
         _action.UnloadButton();
         _sandbox.UnloadButton();
-        _language.UnloadButton();
     }
 
     public void LoadButtons()
@@ -59,6 +56,5 @@ public void LoadButtons()
         _ahelp.LoadButton();
         _action.LoadButton();
         _sandbox.LoadButton();
-        _language.LoadButton();
     }
 }
diff --git a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
index a76943ace8..3c8cd1d164 100644
--- a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
+++ b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
@@ -63,16 +63,6 @@
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
         />
-    <ui:MenuButton
-        Name="LanguageButton"
-        Access="Internal"
-        Icon="{xe:Tex '/Textures/Interface/language.png'}"
-        BoundKey = "{x:Static is:ContentKeyFunctions.OpenLanguageMenu}"
-        ToolTip="Open the Language Menu"
-        MinSize="42 64"
-        HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
-        />
     <ui:MenuButton
         Name="AdminButton"
         Access="Internal"
diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs
index 57d6e089bd..b1cca46e63 100644
--- a/Content.Server/Administration/Managers/AdminManager.cs
+++ b/Content.Server/Administration/Managers/AdminManager.cs
@@ -315,7 +315,7 @@ private async void LoginAdminMaybe(ICommonSession session)
 
             _admins.Add(session, reg);
 
-            if (!session.ContentData()?.ExplicitlyDeadminned ?? false)
+            if (!session.ContentData()!.ExplicitlyDeadminned)
             {
                 reg.Data.Active = true;
 
diff --git a/Content.Server/Atmos/Components/AirtightComponent.cs b/Content.Server/Atmos/Components/AirtightComponent.cs
index 69488a7130..ca107eafbe 100644
--- a/Content.Server/Atmos/Components/AirtightComponent.cs
+++ b/Content.Server/Atmos/Components/AirtightComponent.cs
@@ -9,53 +9,27 @@ public sealed partial class AirtightComponent : Component
     {
         public (EntityUid Grid, Vector2i Tile) LastPosition { get; set; }
 
-        /// <summary>
-        /// The directions in which this entity should block airflow, relative to its own reference frame.
-        /// </summary>
         [DataField("airBlockedDirection", customTypeSerializer: typeof(FlagSerializer<AtmosDirectionFlags>))]
         public int InitialAirBlockedDirection { get; set; } = (int) AtmosDirection.All;
 
-        /// <summary>
-        /// The directions in which the entity is currently blocking airflow, relative to the grid that the entity is on.
-        /// I.e., this is a variant of <see cref="InitialAirBlockedDirection"/> that takes into account the entity's
-        /// current rotation.
-        /// </summary>
         [ViewVariables]
         public int CurrentAirBlockedDirection;
 
-        /// <summary>
-        /// Whether the airtight entity is currently blocking airflow.
-        /// </summary>
-        [DataField]
+        [DataField("airBlocked")]
         public bool AirBlocked { get; set; } = true;
 
-        /// <summary>
-        /// If true, entities on this tile will attempt to draw air from surrounding tiles when they become unblocked
-        /// and currently have no air. This is generally only required when <see cref="NoAirWhenFullyAirBlocked"/> is
-        /// true, or if the entity is likely to occupy the same tile as another no-air airtight entity.
-        /// </summary>
-        [DataField]
+        [DataField("fixVacuum")]
         public bool FixVacuum { get; set; } = true;
-        // I think fixvacuum exists to ensure that repeatedly closing/opening air-blocking doors doesn't end up
-        // depressurizing a room. However it can also effectively be used as a means of generating gasses for free
-        // TODO ATMOS Mass conservation. Make it actually push/pull air from adjacent tiles instead of destroying & creating,
 
-
-        // TODO ATMOS Do we need these two fields?
         [DataField("rotateAirBlocked")]
         public bool RotateAirBlocked { get; set; } = true;
 
-        // TODO ATMOS remove this? What is this even for??
         [DataField("fixAirBlockedDirectionInitialize")]
         public bool FixAirBlockedDirectionInitialize { get; set; } = true;
 
-        /// <summary>
-        /// If true, then the tile that this entity is on will have no air at all if all directions are blocked.
-        /// </summary>
-        [DataField]
+        [DataField("noAirWhenFullyAirBlocked")]
         public bool NoAirWhenFullyAirBlocked { get; set; } = true;
 
-        /// <inheritdoc cref="CurrentAirBlockedDirection"/>
         [Access(Other = AccessPermissions.ReadWriteExecute)]
         public AtmosDirection AirBlockedDirection => (AtmosDirection)CurrentAirBlockedDirection;
     }
diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
index 152fba8fc4..548d6a3692 100644
--- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
@@ -85,6 +85,8 @@ private void OnAirtightMoved(Entity<AirtightComponent> airtight, ref MoveEvent e
         private bool AirtightMove(Entity<AirtightComponent> ent, ref MoveEvent ev)
         {
             var (owner, airtight) = ent;
+            if (!airtight.RotateAirBlocked || airtight.InitialAirBlockedDirection == (int)AtmosDirection.Invalid)
+                return false;
 
             airtight.CurrentAirBlockedDirection = (int) Rotate((AtmosDirection)airtight.InitialAirBlockedDirection, ev.NewRotation);
             var pos = airtight.LastPosition;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
index beddef4be7..d43cc81b0f 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
@@ -399,7 +399,10 @@ private void GridIsHotspotActive(EntityUid uid, GridAtmosphereComponent componen
         args.Handled = true;
     }
 
-    private void GridFixTileVacuum(TileAtmosphere tile)
+    private void GridFixTileVacuum(
+        Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+        TileAtmosphere tile,
+        float volume)
     {
         DebugTools.AssertNotNull(tile.Air);
         DebugTools.Assert(tile.Air?.Immutable == false );
@@ -413,9 +416,6 @@ private void GridFixTileVacuum(TileAtmosphere tile)
                 count++;
         }
 
-        if (count == 0)
-            return;
-
         var ratio = 1f / count;
         var totalTemperature = 0f;
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
index eba398c182..1f3ca2145b 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
@@ -272,7 +272,7 @@ private void UpdateTileAir(
             tile.Air = new GasMixture(volume){Temperature = Atmospherics.T20C};
 
             if (data.FixVacuum)
-                GridFixTileVacuum(tile);
+                GridFixTileVacuum(ent, tile, volume);
         }
 
         private void QueueRunTiles(
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
index 67c6d5998d..9b0d0d9670 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
@@ -78,13 +78,12 @@ private AirtightData GetAirtightData(EntityUid uid, MapGridComponent grid, Vecto
             if (!_airtightQuery.TryGetComponent(ent, out var airtight))
                 continue;
 
-            fixVacuum |= airtight.FixVacuum;
-
             if(!airtight.AirBlocked)
                 continue;
 
             blockedDirs |= airtight.AirBlockedDirection;
             noAirWhenBlocked |= airtight.NoAirWhenFullyAirBlocked;
+            fixVacuum |= airtight.FixVacuum;
 
             if (blockedDirs == AtmosDirection.All && noAirWhenBlocked && fixVacuum)
                 break;
diff --git a/Content.Server/Atmos/GasMixture.cs b/Content.Server/Atmos/GasMixture.cs
index 3d73a4d0b1..77fd701833 100644
--- a/Content.Server/Atmos/GasMixture.cs
+++ b/Content.Server/Atmos/GasMixture.cs
@@ -62,9 +62,9 @@ public float Temperature
             get => _temperature;
             set
             {
-                DebugTools.Assert(!float.IsNaN(value));
-                if (!Immutable)
-                    _temperature = MathF.Min(MathF.Max(value, Atmospherics.TCMB), Atmospherics.Tmax);
+                DebugTools.Assert(!float.IsNaN(_temperature));
+                if (Immutable) return;
+                _temperature = MathF.Min(MathF.Max(value, Atmospherics.TCMB), Atmospherics.Tmax);
             }
         }
 
@@ -91,7 +91,6 @@ public GasMixture(float[] moles, float temp, float volume = Atmospherics.CellVol
             if (volume < 0)
                 volume = 0;
 
-            DebugTools.Assert(!float.IsNaN(temp));
             _temperature = temp;
             Moles = moles;
             Volume = volume;
diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs
index 0026dbbf4f..0dd35a29e7 100644
--- a/Content.Server/Atmos/TileAtmosphere.cs
+++ b/Content.Server/Atmos/TileAtmosphere.cs
@@ -28,9 +28,6 @@ public sealed class TileAtmosphere : IGasMixtureHolder
         [ViewVariables]
         public TileAtmosphere? PressureSpecificTarget { get; set; }
 
-        /// <summary>
-        /// This is either the pressure difference, or the quantity of moles transferred if monstermos is enabled.
-        /// </summary>
         [ViewVariables]
         public float PressureDifference { get; set; }
 
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 7190b94e14..6cdb088dbb 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -5,8 +5,6 @@
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
-using Content.Server.Language;
-using Content.Server.Speech;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.EntitySystems;
 using Content.Server.Psionics.Telepathy;
@@ -19,7 +17,6 @@
 using Content.Shared.Chat;
 using Content.Shared.Database;
 using Content.Shared.Ghost;
-using Content.Shared.Language;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
@@ -63,7 +60,6 @@ public sealed partial class ChatSystem : SharedChatSystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly ReplacementAccentSystem _wordreplacement = default!;
-    [Dependency] private readonly LanguageSystem _language = default!;
 
     //Nyano - Summary: pulls in the nyano chat system for psionics.
     [Dependency] private readonly NyanoChatSystem _nyanoChatSystem = default!;
@@ -72,7 +68,6 @@ public sealed partial class ChatSystem : SharedChatSystem
     public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
     public const int WhisperMuffledRange = 5; // how far whisper goes at all, in world units
     public const string DefaultAnnouncementSound = "/Audio/Announcements/announce.ogg";
-    public const float DefaultObfuscationFactor = 0.2f; // Percentage of symbols in a whispered message that can be seen even by "far" listeners
 
     private bool _loocEnabled = true;
     private bool _deadLoocEnabled;
@@ -178,8 +173,7 @@ public void TrySendInGameICMessage(
         ICommonSession? player = null,
         string? nameOverride = null,
         bool checkRadioPrefix = true,
-        bool ignoreActionBlocker = false,
-        LanguagePrototype? languageOverride = null
+        bool ignoreActionBlocker = false
         )
     {
         if (HasComp<GhostComponent>(source))
@@ -255,10 +249,10 @@ public void TrySendInGameICMessage(
         switch (desiredType)
         {
             case InGameICChatType.Speak:
-                SendEntitySpeak(source, message, range, nameOverride, hideLog, ignoreActionBlocker, languageOverride: languageOverride);
+                SendEntitySpeak(source, message, range, nameOverride, hideLog, ignoreActionBlocker);
                 break;
             case InGameICChatType.Whisper:
-                SendEntityWhisper(source, message, range, null, nameOverride, hideLog, ignoreActionBlocker, languageOverride: languageOverride);
+                SendEntityWhisper(source, message, range, null, nameOverride, hideLog, ignoreActionBlocker);
                 break;
             case InGameICChatType.Emote:
                 SendEntityEmote(source, message, range, nameOverride, hideLog: hideLog, ignoreActionBlocker: ignoreActionBlocker);
@@ -388,14 +382,12 @@ private void SendEntitySpeak(
         ChatTransmitRange range,
         string? nameOverride,
         bool hideLog = false,
-        bool ignoreActionBlocker = false,
-        LanguagePrototype? languageOverride = null
+        bool ignoreActionBlocker = false
         )
     {
         if (!_actionBlocker.CanSpeak(source) && !ignoreActionBlocker)
             return;
 
-        // The original message
         var message = TransformSpeech(source, FormattedMessage.RemoveMarkup(originalMessage));
 
         if (message.Length == 0)
@@ -419,19 +411,18 @@ private void SendEntitySpeak(
                 speech = proto;
         }
 
-        var language = languageOverride ?? _language.GetLanguage(source);
-
         name = FormattedMessage.EscapeText(name);
-        // The chat message wrapped in a "x says y" string
-        var wrappedMessage = WrapPublicMessage(source, name, message);
-        // The chat message obfuscated via language obfuscation
-        var obfuscated = SanitizeInGameICMessage(source, _language.ObfuscateSpeech(message, language), out var emoteStr, true, _configurationManager.GetCVar(CCVars.ChatPunctuation), (!CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Parent.Name == "en") || (CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Name == "en"));
-        // The language-obfuscated message wrapped in a "x says y" string
-        var wrappedObfuscated = WrapPublicMessage(source, name, obfuscated);
 
-        SendInVoiceRange(ChatChannel.Local, name, message, wrappedMessage, obfuscated, wrappedObfuscated, source, range, languageOverride: language);
+        var wrappedMessage = Loc.GetString(speech.Bold ? "chat-manager-entity-say-bold-wrap-message" : "chat-manager-entity-say-wrap-message",
+            ("entityName", name),
+            ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
+            ("fontType", speech.FontId),
+            ("fontSize", speech.FontSize),
+            ("message", FormattedMessage.EscapeText(message)));
+
+        SendInVoiceRange(ChatChannel.Local, message, wrappedMessage, source, range);
 
-        var ev = new EntitySpokeEvent(source, message, null, false, language);
+        var ev = new EntitySpokeEvent(source, message, null, null);
         RaiseLocalEvent(source, ev, true);
 
         // To avoid logging any messages sent by entities that are not players, like vendors, cloning, etc.
@@ -464,8 +455,7 @@ private void SendEntityWhisper(
         RadioChannelPrototype? channel,
         string? nameOverride,
         bool hideLog = false,
-        bool ignoreActionBlocker = false,
-        LanguagePrototype? languageOverride = null
+        bool ignoreActionBlocker = false
         )
     {
         if (!_actionBlocker.CanSpeak(source) && !ignoreActionBlocker)
@@ -475,6 +465,8 @@ private void SendEntityWhisper(
         if (message.Length == 0)
             return;
 
+        var obfuscatedMessage = ObfuscateMessageReadability(message, 0.2f);
+
         // get the entity's name by visual identity (if no override provided).
         string nameIdentity = FormattedMessage.EscapeText(nameOverride ?? Identity.Name(source, EntityManager));
         // get the entity's name by voice (if no override provided).
@@ -491,57 +483,41 @@ private void SendEntityWhisper(
         }
         name = FormattedMessage.EscapeText(name);
 
-        var language = languageOverride ?? _language.GetLanguage(source);
-        var languageObfuscatedMessage = SanitizeInGameICMessage(source, _language.ObfuscateSpeech(message, language), out var emoteStr, true, _configurationManager.GetCVar(CCVars.ChatPunctuation), (!CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Parent.Name == "en") || (CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Name == "en"));
+        var wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
+            ("entityName", name), ("message", FormattedMessage.EscapeText(message)));
+
+        var wrappedobfuscatedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
+            ("entityName", nameIdentity), ("message", FormattedMessage.EscapeText(obfuscatedMessage)));
+
+        var wrappedUnknownMessage = Loc.GetString("chat-manager-entity-whisper-unknown-wrap-message",
+            ("message", FormattedMessage.EscapeText(obfuscatedMessage)));
+
 
         foreach (var (session, data) in GetRecipients(source, WhisperMuffledRange))
         {
-            if (session.AttachedEntity is not { Valid: true } listener)
+            EntityUid listener;
+
+            if (session.AttachedEntity is not { Valid: true } playerEntity)
                 continue;
+            listener = session.AttachedEntity.Value;
 
             if (MessageRangeCheck(session, data, range) != MessageRangeCheckResult.Full)
                 continue; // Won't get logged to chat, and ghosts are too far away to see the pop-up, so we just won't send it to them.
 
-            var canUnderstandLanguage = _language.CanUnderstand(listener, language);
-            // How the entity perceives the message depends on whether it can understand its language
-            var perceivedMessage = canUnderstandLanguage ? message : languageObfuscatedMessage;
-
-            // Result is the intermediate message derived from the perceived one via obfuscation
-            // Wrapped message is the result wrapped in an "x says y" string
-            string result, wrappedMessage;
             if (data.Range <= WhisperClearRange)
-            {
-                // Scenario 1: the listener can clearly understand the message
-                result = perceivedMessage;
-                wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
-                    ("entityName", name),
-                    ("message", FormattedMessage.EscapeText(result)));
-            }
-            else if (_interactionSystem.InRangeUnobstructed(source, listener, WhisperMuffledRange, Shared.Physics.CollisionGroup.Opaque))
-            {
-                // Scenerio 2: if the listener is too far, they only hear fragments of the message
-                // Collisiongroup.Opaque is not ideal for this use. Preferably, there should be a check specifically with "Can Ent1 see Ent2" in mind
-                result = ObfuscateMessageReadability(perceivedMessage);
-                wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
-                    ("entityName", nameIdentity), ("message", FormattedMessage.EscapeText(result)));
-            }
+                _chatManager.ChatMessageToOne(ChatChannel.Whisper, message, wrappedMessage, source, false, session.Channel);
+            //If listener is too far, they only hear fragments of the message
+            //Collisiongroup.Opaque is not ideal for this use. Preferably, there should be a check specifically with "Can Ent1 see Ent2" in mind
+            else if (_interactionSystem.InRangeUnobstructed(source, listener, WhisperMuffledRange, Shared.Physics.CollisionGroup.Opaque)) //Shared.Physics.CollisionGroup.Opaque
+                _chatManager.ChatMessageToOne(ChatChannel.Whisper, obfuscatedMessage, wrappedobfuscatedMessage, source, false, session.Channel);
+            //If listener is too far and has no line of sight, they can't identify the whisperer's identity
             else
-            {
-                // Scenario 3: If listener is too far and has no line of sight, they can't identify the whisperer's identity
-                result = ObfuscateMessageReadability(perceivedMessage);
-                wrappedMessage = Loc.GetString("chat-manager-entity-whisper-unknown-wrap-message",
-                    ("message", FormattedMessage.EscapeText(result)));
-            }
-
-            _chatManager.ChatMessageToOne(ChatChannel.Whisper, result, wrappedMessage, source, false, session.Channel);
+                _chatManager.ChatMessageToOne(ChatChannel.Whisper, obfuscatedMessage, wrappedUnknownMessage, source, false, session.Channel);
         }
 
-        var replayWrap = Loc.GetString("chat-manager-entity-whisper-wrap-message",
-            ("entityName", name),
-            ("message", FormattedMessage.EscapeText(message)));
-        _replay.RecordServerMessage(new ChatMessage(ChatChannel.Whisper, message, replayWrap, GetNetEntity(source), null, MessageRangeHideChatForReplay(range)));
+        _replay.RecordServerMessage(new ChatMessage(ChatChannel.Whisper, message, wrappedMessage, GetNetEntity(source), null, MessageRangeHideChatForReplay(range)));
 
-        var ev = new EntitySpokeEvent(source, message, channel, true, language);
+        var ev = new EntitySpokeEvent(source, message, channel, obfuscatedMessage);
         RaiseLocalEvent(source, ev, true);
         if (!hideLog)
             if (originalMessage == message)
@@ -588,7 +564,7 @@ private void SendEntityEmote(
 
         if (checkEmote)
             TryEmoteChatInput(source, action);
-        SendInVoiceRange(ChatChannel.Emotes, name, action, wrappedMessage, obfuscated: "", obfuscatedWrappedMessage: "", source, range, author);
+        SendInVoiceRange(ChatChannel.Emotes, action, wrappedMessage, source, range, author);
         if (!hideLog)
             if (name != Name(source))
                 _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Emote from {ToPrettyString(source):user} as {name}: {action}");
@@ -615,13 +591,7 @@ private void SendLOOC(EntityUid source, ICommonSession player, string message, b
             ("entityName", name),
             ("message", FormattedMessage.EscapeText(message)));
 
-        SendInVoiceRange(ChatChannel.LOOC, name, message, wrappedMessage,
-            obfuscated: string.Empty,
-            obfuscatedWrappedMessage: string.Empty, // will be skipped anyway
-            source,
-            hideChat ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal,
-            player.UserId,
-            languageOverride: LanguageSystem.Universal);
+        SendInVoiceRange(ChatChannel.LOOC, message, wrappedMessage, source, hideChat ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal, player.UserId);
         _adminLogger.Add(LogType.Chat, LogImpact.Low, $"LOOC from {player:Player}: {message}");
     }
 
@@ -702,29 +672,15 @@ private MessageRangeCheckResult MessageRangeCheck(ICommonSession session, ICChat
     /// <summary>
     ///     Sends a chat message to the given players in range of the source entity.
     /// </summary>
-    private void SendInVoiceRange(ChatChannel channel, string name, string message, string wrappedMessage, string obfuscated, string obfuscatedWrappedMessage, EntityUid source, ChatTransmitRange range, NetUserId? author = null, LanguagePrototype? languageOverride = null)
+    private void SendInVoiceRange(ChatChannel channel, string message, string wrappedMessage, EntityUid source, ChatTransmitRange range, NetUserId? author = null)
     {
-        var language = languageOverride ?? _language.GetLanguage(source);
         foreach (var (session, data) in GetRecipients(source, VoiceRange))
         {
             var entRange = MessageRangeCheck(session, data, range);
             if (entRange == MessageRangeCheckResult.Disallowed)
                 continue;
             var entHideChat = entRange == MessageRangeCheckResult.HideChat;
-            if (session.AttachedEntity is not { Valid: true } playerEntity)
-                continue;
-            EntityUid listener = session.AttachedEntity.Value;
-
-
-            // If the channel does not support languages, or the entity can understand the message, send the original message, otherwise send the obfuscated version
-            if (channel == ChatChannel.LOOC || channel == ChatChannel.Emotes || _language.CanUnderstand(listener, language))
-            {
-                _chatManager.ChatMessageToOne(channel, message, wrappedMessage, source, entHideChat, session.Channel, author: author);
-            }
-            else
-            {
-                _chatManager.ChatMessageToOne(channel, obfuscated, obfuscatedWrappedMessage, source, entHideChat, session.Channel, author: author);
-            }
+            _chatManager.ChatMessageToOne(channel, message, wrappedMessage, source, entHideChat, session.Channel, author: author);
         }
 
         _replay.RecordServerMessage(new ChatMessage(channel, message, wrappedMessage, GetNetEntity(source), null, MessageRangeHideChatForReplay(range)));
@@ -834,21 +790,6 @@ public string SanitizeMessageReplaceWords(string message)
         return msg;
     }
 
-    /// <summary>
-    ///     Wraps a message sent by the specified entity into an "x says y" string.
-    /// </summary>
-    public string WrapPublicMessage(EntityUid source, string name, string message)
-    {
-        var speech = GetSpeechVerb(source, message);
-        var verbName = Loc.GetString(_random.Pick(speech.SpeechVerbStrings));
-        return Loc.GetString(speech.Bold ? "chat-manager-entity-say-bold-wrap-message" : "chat-manager-entity-say-wrap-message",
-            ("entityName", name),
-            ("verb", verbName),
-            ("fontType", speech.FontId),
-            ("fontSize", speech.FontSize),
-            ("message", FormattedMessage.EscapeText(message)));
-    }
-
     /// <summary>
     ///     Returns list of players and ranges for all players withing some range. Also returns observers with a range of -1.
     /// </summary>
@@ -895,7 +836,7 @@ public readonly record struct ICChatRecipientData(float Range, bool Observer, bo
     {
     }
 
-    public string ObfuscateMessageReadability(string message, float chance = DefaultObfuscationFactor)
+    private string ObfuscateMessageReadability(string message, float chance)
     {
         var modifiedMessage = new StringBuilder(message);
 
@@ -984,8 +925,7 @@ public sealed class EntitySpokeEvent : EntityEventArgs
 {
     public readonly EntityUid Source;
     public readonly string Message;
-    public readonly bool IsWhisper;
-    public readonly LanguagePrototype Language;
+    public readonly string? ObfuscatedMessage; // not null if this was a whisper
 
     /// <summary>
     ///     If the entity was trying to speak into a radio, this was the channel they were trying to access. If a radio
@@ -993,13 +933,12 @@ public sealed class EntitySpokeEvent : EntityEventArgs
     /// </summary>
     public RadioChannelPrototype? Channel;
 
-    public EntitySpokeEvent(EntityUid source, string message, RadioChannelPrototype? channel, bool isWhisper, LanguagePrototype language)
+    public EntitySpokeEvent(EntityUid source, string message, RadioChannelPrototype? channel, string? obfuscatedMessage)
     {
         Source = source;
         Message = message;
         Channel = channel;
-        IsWhisper = isWhisper;
-        Language = language;
+        ObfuscatedMessage = obfuscatedMessage;
     }
 }
 
diff --git a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs b/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
index da16529d51..bf7691fe37 100644
--- a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
+++ b/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
@@ -1,14 +1,10 @@
-using System.Linq;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Speech.Components;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Language;
-using Content.Shared.Language.Systems;
 using Content.Shared.Mind.Components;
 using Robust.Shared.Prototypes;
 using Content.Server.Psionics; //Nyano - Summary: pulls in the ability for the sentient creature to become psionic.
 using Content.Shared.Humanoid; //Delta-V - Banning humanoids from becoming ghost roles.
-using Content.Shared.Language.Events;
 
 namespace Content.Server.Chemistry.ReagentEffects;
 
@@ -28,20 +24,6 @@ public override void Effect(ReagentEffectArgs args)
         entityManager.RemoveComponent<ReplacementAccentComponent>(uid);
         entityManager.RemoveComponent<MonkeyAccentComponent>(uid);
 
-        var speaker = entityManager.EnsureComponent<LanguageSpeakerComponent>(uid);
-        var fallback = SharedLanguageSystem.FallbackLanguagePrototype;
-
-        if (!speaker.UnderstoodLanguages.Contains(fallback))
-            speaker.UnderstoodLanguages.Add(fallback);
-
-        if (!speaker.SpokenLanguages.Contains(fallback))
-        {
-            speaker.CurrentLanguage = fallback;
-            speaker.SpokenLanguages.Add(fallback);
-        }
-
-        args.EntityManager.EventBus.RaiseLocalEvent(uid, new LanguagesUpdateEvent(), true);
-
         // Stops from adding a ghost role to things like people who already have a mind
         if (entityManager.TryGetComponent<MindContainerComponent>(uid, out var mindContainer) && mindContainer.HasMind)
         {
@@ -65,7 +47,7 @@ public override void Effect(ReagentEffectArgs args)
 
         ghostRole = entityManager.AddComponent<GhostRoleComponent>(uid);
         entityManager.EnsureComponent<GhostTakeoverAvailableComponent>(uid);
-        entityManager.EnsureComponent<PotentialPsionicComponent>(uid); //Nyano - Summary:. Makes the animated body able to get psionics.
+        entityManager.EnsureComponent<PotentialPsionicComponent>(uid); //Nyano - Summary:. Makes the animated body able to get psionics. 
 
         var entityData = entityManager.GetComponent<MetaDataComponent>(uid);
         ghostRole.RoleName = entityData.EntityName;
diff --git a/Content.Server/Language/Commands/ListLanguagesCommand.cs b/Content.Server/Language/Commands/ListLanguagesCommand.cs
deleted file mode 100644
index 6698e1b645..0000000000
--- a/Content.Server/Language/Commands/ListLanguagesCommand.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Linq;
-using Content.Shared.Administration;
-using Robust.Shared.Console;
-using Robust.Shared.Enums;
-
-namespace Content.Server.Language.Commands;
-
-[AnyCommand]
-public sealed class ListLanguagesCommand : IConsoleCommand
-{
-    public string Command => "languagelist";
-    public string Description => Loc.GetString("command-list-langs-desc");
-    public string Help => Loc.GetString("command-list-langs-help", ("command", Command));
-
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        if (shell.Player is not { } player)
-        {
-            shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
-            return;
-        }
-
-        if (player.Status != SessionStatus.InGame)
-            return;
-
-        if (player.AttachedEntity is not {} playerEntity)
-        {
-            shell.WriteError(Loc.GetString("shell-must-be-attached-to-entity"));
-            return;
-        }
-
-        var languages = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
-
-        var (spokenLangs, knownLangs) = languages.GetAllLanguages(playerEntity);
-
-        shell.WriteLine("Spoken:\n" + string.Join("\n", spokenLangs));
-        shell.WriteLine("Understood:\n" + string.Join("\n", knownLangs));
-    }
-}
diff --git a/Content.Server/Language/Commands/SayLanguageCommand.cs b/Content.Server/Language/Commands/SayLanguageCommand.cs
deleted file mode 100644
index 2e4a27b1dc..0000000000
--- a/Content.Server/Language/Commands/SayLanguageCommand.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Content.Server.Chat.Systems;
-using Content.Shared.Administration;
-using Robust.Shared.Console;
-using Robust.Shared.Enums;
-
-namespace Content.Server.Language.Commands;
-
-[AnyCommand]
-public sealed class SayLanguageCommand : IConsoleCommand
-{
-    public string Command => "saylang";
-    public string Description => Loc.GetString("command-saylang-desc");
-    public string Help => Loc.GetString("command-saylang-help", ("command", Command));
-
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        if (shell.Player is not { } player)
-        {
-            shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
-            return;
-        }
-
-        if (player.Status != SessionStatus.InGame)
-            return;
-
-        if (player.AttachedEntity is not {} playerEntity)
-        {
-            shell.WriteError(Loc.GetString("shell-must-be-attached-to-entity"));
-            return;
-        }
-
-        if (args.Length < 2)
-            return;
-
-        var languageId = args[0];
-        var message = string.Join(" ", args, startIndex: 1, count: args.Length - 1).Trim();
-
-        if (string.IsNullOrEmpty(message))
-            return;
-
-        var languages = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
-        var chats = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
-
-        var language = languages.GetLanguagePrototype(languageId);
-        if (language == null || !languages.CanSpeak(playerEntity, language.ID))
-        {
-            shell.WriteError($"Language {languageId} is invalid or you cannot speak it!");
-            return;
-        }
-
-        chats.TrySendInGameICMessage(playerEntity, message, InGameICChatType.Speak, ChatTransmitRange.Normal, false, shell, player, languageOverride: language);
-    }
-}
diff --git a/Content.Server/Language/Commands/SelectLanguageCommand.cs b/Content.Server/Language/Commands/SelectLanguageCommand.cs
deleted file mode 100644
index e336384653..0000000000
--- a/Content.Server/Language/Commands/SelectLanguageCommand.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Linq;
-using Content.Shared.Administration;
-using Robust.Shared.Console;
-using Robust.Shared.Enums;
-
-namespace Content.Server.Language.Commands;
-
-[AnyCommand]
-public sealed class SelectLanguageCommand : IConsoleCommand
-{
-    public string Command => "languageselect";
-    public string Description => Loc.GetString("command-language-select-desc");
-    public string Help => Loc.GetString("command-language-select-help", ("command", Command));
-
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        if (shell.Player is not { } player)
-        {
-            shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
-            return;
-        }
-
-        if (player.Status != SessionStatus.InGame)
-            return;
-
-        if (player.AttachedEntity is not { } playerEntity)
-        {
-            shell.WriteError(Loc.GetString("shell-must-be-attached-to-entity"));
-            return;
-        }
-
-        if (args.Length < 1)
-            return;
-
-        var languageId = args[0];
-
-        var languages = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
-
-        var language = languages.GetLanguagePrototype(languageId);
-        if (language == null || !languages.CanSpeak(playerEntity, language.ID))
-        {
-            shell.WriteError($"Language {languageId} is invalid or you cannot speak it!");
-            return;
-        }
-
-        languages.SetLanguage(playerEntity, language.ID);
-    }
-}
diff --git a/Content.Server/Language/DetermineEntityLanguagesEvent.cs b/Content.Server/Language/DetermineEntityLanguagesEvent.cs
deleted file mode 100644
index 13ab2cac27..0000000000
--- a/Content.Server/Language/DetermineEntityLanguagesEvent.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace Content.Server.Language;
-
-/// <summary>
-///   Raised in order to determine the language an entity speaks at the current moment,
-///   as well as the list of all languages the entity may speak and understand.
-/// </summary>
-public sealed class DetermineEntityLanguagesEvent : EntityEventArgs
-{
-    /// <summary>
-    ///   The default language of this entity. If empty, remain unchanged.
-    ///   This field has no effect if the entity decides to speak in a concrete language.
-    /// </summary>
-    public string CurrentLanguage;
-    /// <summary>
-    ///   The list of all languages the entity may speak. Must NOT be held as a reference!
-    /// </summary>
-    public List<string> SpokenLanguages;
-    /// <summary>
-    ///   The list of all languages the entity may understand. Must NOT be held as a reference!
-    /// </summary>
-    public List<string> UnderstoodLanguages;
-
-    public DetermineEntityLanguagesEvent(string currentLanguage, List<string> spokenLanguages, List<string> understoodLanguages)
-    {
-        CurrentLanguage = currentLanguage;
-        SpokenLanguages = spokenLanguages;
-        UnderstoodLanguages = understoodLanguages;
-    }
-}
diff --git a/Content.Server/Language/LanguageSystem.Networking.cs b/Content.Server/Language/LanguageSystem.Networking.cs
deleted file mode 100644
index 7517b4185e..0000000000
--- a/Content.Server/Language/LanguageSystem.Networking.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Content.Server.Mind;
-using Content.Shared.Language;
-using Content.Shared.Language.Events;
-using Content.Shared.Mind;
-using Content.Shared.Mind.Components;
-using Robust.Shared.Player;
-
-namespace Content.Server.Language;
-
-/// <summary>
-///   LanguageSystem Networking
-///   This is used to update client state when mind change entity.
-/// </summary>
-
-public sealed partial class LanguageSystem
-{
-    [Dependency] private readonly MindSystem _mind = default!;
-
-
-    public void InitializeNet()
-    {
-        // Refresh the client's state when its mind hops to a different entity
-        SubscribeLocalEvent<MindContainerComponent, MindAddedMessage>((uid, _, _) => SendLanguageStateToClient(uid));
-        SubscribeLocalEvent<MindComponent, MindGotRemovedEvent>((_, _, args) =>
-        {
-            if (args.Mind.Comp.Session != null)
-                SendLanguageStateToClient(args.Mind.Comp.Session);
-        });
-
-        SubscribeLocalEvent<LanguageSpeakerComponent, LanguagesUpdateEvent>((uid, comp, _) => SendLanguageStateToClient(uid, comp));
-        SubscribeNetworkEvent<RequestLanguagesMessage>((_, session) => SendLanguageStateToClient(session.SenderSession));
-    }
-
-
-    private void SendLanguageStateToClient(EntityUid uid, LanguageSpeakerComponent? comp = null)
-    {
-        // Try to find a mind inside the entity and notify its session
-        if (!_mind.TryGetMind(uid, out _, out var mindComp) || mindComp.Session == null)
-            return;
-
-        SendLanguageStateToClient(uid, mindComp.Session, comp);
-    }
-
-    private void SendLanguageStateToClient(ICommonSession session, LanguageSpeakerComponent? comp = null)
-    {
-        // Try to find an entity associated with the session and resolve the languages from it
-        if (session.AttachedEntity is not { Valid: true } entity)
-            return;
-
-        SendLanguageStateToClient(entity, session, comp);
-    }
-
-    private void SendLanguageStateToClient(EntityUid uid, ICommonSession session, LanguageSpeakerComponent? component = null)
-    {
-        var langs = GetLanguages(uid, component);
-        var message = new LanguagesUpdatedMessage(langs.CurrentLanguage, langs.SpokenLanguages, langs.UnderstoodLanguages);
-        RaiseNetworkEvent(message, session);
-    }
-}
diff --git a/Content.Server/Language/LanguageSystem.cs b/Content.Server/Language/LanguageSystem.cs
deleted file mode 100644
index f1bf44c1f4..0000000000
--- a/Content.Server/Language/LanguageSystem.cs
+++ /dev/null
@@ -1,289 +0,0 @@
-using System.Linq;
-using System.Text;
-using Content.Server.GameTicking.Events;
-using Content.Shared.Language;
-using Content.Shared.Language.Events;
-using Content.Shared.Language.Systems;
-using Robust.Shared.Random;
-using UniversalLanguageSpeakerComponent = Content.Shared.Language.Components.UniversalLanguageSpeakerComponent;
-
-namespace Content.Server.Language;
-
-public sealed partial class LanguageSystem : SharedLanguageSystem
-{
-    // Static and re-used event instances used to minimize memory allocations during language processing, which can happen many times per tick.
-    // These are used in the method GetLanguages and returned from it. They should never be mutated outside of that method or returned outside this system.
-    private readonly DetermineEntityLanguagesEvent
-        _determineLanguagesEvent = new(string.Empty, new(), new()),
-        _universalLanguagesEvent = new(UniversalPrototype, [UniversalPrototype], [UniversalPrototype]); // Returned for universal speakers only
-
-    /// <summary>
-    ///   A random number added to each pseudo-random number's seed. Changes every round.
-    /// </summary>
-    public int RandomRoundSeed { get; private set; }
-
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeNetworkEvent<LanguagesSetMessage>(OnClientSetLanguage);
-        SubscribeLocalEvent<LanguageSpeakerComponent, ComponentInit>(OnInitLanguageSpeaker);
-        SubscribeLocalEvent<RoundStartingEvent>(_ => RandomRoundSeed = _random.Next());
-
-        InitializeNet();
-    }
-
-
-    #region public api
-    /// <summary>
-    ///   Obfuscate a message using an entity's default language.
-    /// </summary>
-    public string ObfuscateSpeech(EntityUid source, string message)
-    {
-        var language = GetLanguage(source) ?? Universal;
-        return ObfuscateSpeech(message, language);
-    }
-
-    /// <summary>
-    ///     Obfuscate a message using the given language.
-    /// </summary>
-    public string ObfuscateSpeech(string message, LanguagePrototype language)
-    {
-        var builder = new StringBuilder();
-        if (language.ObfuscateSyllables)
-            ObfuscateSyllables(builder, message, language);
-        else
-            ObfuscatePhrases(builder, message, language);
-
-        return builder.ToString();
-    }
-
-    public bool CanUnderstand(EntityUid listener, LanguagePrototype language, LanguageSpeakerComponent? listenerLanguageComp = null)
-    {
-        if (language.ID == UniversalPrototype || HasComp<UniversalLanguageSpeakerComponent>(listener))
-            return true;
-
-        var listenerLanguages = GetLanguages(listener, listenerLanguageComp)?.UnderstoodLanguages;
-
-        return listenerLanguages?.Contains(language.ID, StringComparer.Ordinal) ?? false;
-    }
-
-    public bool CanSpeak(EntityUid speaker, string language, LanguageSpeakerComponent? speakerComp = null)
-    {
-        if (HasComp<UniversalLanguageSpeakerComponent>(speaker))
-            return true;
-
-        var langs = GetLanguages(speaker, speakerComp)?.UnderstoodLanguages;
-        return langs?.Contains(language, StringComparer.Ordinal) ?? false;
-    }
-
-    /// <summary>
-    ///     Returns the current language of the given entity.
-    ///     Assumes Universal if not specified.
-    /// </summary>
-    public LanguagePrototype GetLanguage(EntityUid speaker, LanguageSpeakerComponent? languageComp = null)
-    {
-        var id = GetLanguages(speaker, languageComp)?.CurrentLanguage;
-        if (id == null)
-            return Universal; // Fallback
-
-        _prototype.TryIndex(id, out LanguagePrototype? proto);
-
-        return proto ?? Universal;
-    }
-
-    public void SetLanguage(EntityUid speaker, string language, LanguageSpeakerComponent? languageComp = null)
-    {
-        if (!CanSpeak(speaker, language) || HasComp<UniversalLanguageSpeakerComponent>(speaker))
-            return;
-
-        if (languageComp == null && !TryComp(speaker, out languageComp))
-            return;
-
-        if (languageComp.CurrentLanguage == language)
-            return;
-
-        languageComp.CurrentLanguage = language;
-
-        RaiseLocalEvent(speaker, new LanguagesUpdateEvent(), true);
-    }
-
-    /// <summary>
-    ///   Adds a new language to the lists of understood and/or spoken languages of the given component.
-    /// </summary>
-    public void AddLanguage(LanguageSpeakerComponent comp, string language, bool addSpoken = true, bool addUnderstood = true)
-    {
-        if (addSpoken && !comp.SpokenLanguages.Contains(language))
-            comp.SpokenLanguages.Add(language);
-
-        if (addUnderstood && !comp.UnderstoodLanguages.Contains(language))
-            comp.UnderstoodLanguages.Add(language);
-
-        RaiseLocalEvent(comp.Owner, new LanguagesUpdateEvent(), true);
-    }
-
-    public (List<string> spoken, List<string> understood) GetAllLanguages(EntityUid speaker)
-    {
-        var languages = GetLanguages(speaker);
-        // The lists need to be copied because the internal ones are re-used for performance reasons.
-        return (new List<string>(languages.SpokenLanguages), new List<string>(languages.UnderstoodLanguages));
-    }
-
-    /// <summary>
-    ///   Ensures the given entity has a valid language as its current language.
-    ///   If not, sets it to the first entry of its SpokenLanguages list, or universal if it's empty.
-    /// </summary>
-    public void EnsureValidLanguage(EntityUid entity, LanguageSpeakerComponent? comp = null)
-    {
-        if (comp == null && !TryComp(entity, out comp))
-            return;
-
-        var langs = GetLanguages(entity, comp);
-        if (!langs.SpokenLanguages.Contains(comp!.CurrentLanguage, StringComparer.Ordinal))
-        {
-            comp.CurrentLanguage = langs.SpokenLanguages.FirstOrDefault(UniversalPrototype);
-            RaiseLocalEvent(comp.Owner, new LanguagesUpdateEvent(), true);
-        }
-    }
-    #endregion
-
-    #region event handling
-    private void OnInitLanguageSpeaker(EntityUid uid, LanguageSpeakerComponent component, ComponentInit args)
-    {
-        if (string.IsNullOrEmpty(component.CurrentLanguage))
-            component.CurrentLanguage = component.SpokenLanguages.FirstOrDefault(UniversalPrototype);
-    }
-    #endregion
-
-    #region internal api - obfuscation
-    private void ObfuscateSyllables(StringBuilder builder, string message, LanguagePrototype language)
-    {
-        // Go through each word. Calculate its hash sum and count the number of letters.
-        // Replicate it with pseudo-random syllables of pseudo-random (but similar) length. Use the hash code as the seed.
-        // This means that identical words will be obfuscated identically. Simple words like "hello" or "yes" in different langs can be memorized.
-        var wordBeginIndex = 0;
-        var hashCode = 0;
-        for (var i = 0; i < message.Length; i++)
-        {
-            var ch = char.ToLower(message[i]);
-            // A word ends when one of the following is found: a space, a sentence end, or EOM
-            if (char.IsWhiteSpace(ch) || IsSentenceEnd(ch) || i == message.Length - 1)
-            {
-                var wordLength = i - wordBeginIndex;
-                if (wordLength > 0)
-                {
-                    var newWordLength = PseudoRandomNumber(hashCode, 1, 4);
-
-                    for (var j = 0; j < newWordLength; j++)
-                    {
-                        var index = PseudoRandomNumber(hashCode + j, 0, language.Replacement.Count);
-                        builder.Append(language.Replacement[index]);
-                    }
-                }
-
-                builder.Append(ch);
-                hashCode = 0;
-                wordBeginIndex = i + 1;
-            }
-            else
-                hashCode = hashCode * 31 + ch;
-        }
-    }
-
-    private void ObfuscatePhrases(StringBuilder builder, string message, LanguagePrototype language)
-    {
-        // In a similar manner, each phrase is obfuscated with a random number of conjoined obfuscation phrases.
-        // However, the number of phrases depends on the number of characters in the original phrase.
-        var sentenceBeginIndex = 0;
-        for (var i = 0; i < message.Length; i++)
-        {
-            var ch = char.ToLower(message[i]);
-            if (IsSentenceEnd(ch) || i == message.Length - 1)
-            {
-                var length = i - sentenceBeginIndex;
-                if (length > 0)
-                {
-                    var newLength = (int) Math.Clamp(Math.Cbrt(length) - 1, 1, 4); // 27+ chars for 2 phrases, 64+ for 3, 125+ for 4.
-
-                    for (var j = 0; j < newLength; j++)
-                    {
-                        var phrase = _random.Pick(language.Replacement);
-                        builder.Append(phrase);
-                    }
-                }
-                sentenceBeginIndex = i + 1;
-
-                if (IsSentenceEnd(ch))
-                    builder.Append(ch).Append(" ");
-            }
-        }
-    }
-
-    private static bool IsSentenceEnd(char ch)
-    {
-        return ch is '.' or '!' or '?';
-    }
-    #endregion
-
-    #region internal api - misc
-    /// <summary>
-    ///   Dynamically resolves the current language of the entity and the list of all languages it speaks.
-    ///
-    ///   If the entity is not a language speaker, or is a universal language speaker, then it's assumed to speak Universal,
-    ///   aka all languages at once and none at the same time.
-    /// </summary>
-    /// <remarks>
-    ///   The returned event is reused and thus must not be held as a reference anywhere but inside the caller function.
-    /// </remarks>
-    private DetermineEntityLanguagesEvent GetLanguages(EntityUid speaker, LanguageSpeakerComponent? comp = null)
-    {
-        // This is a shortcut for ghosts and entities that should not speak normally (admemes)
-        if (HasComp<UniversalLanguageSpeakerComponent>(speaker) || !TryComp(speaker, out comp))
-            return _universalLanguagesEvent;
-
-        var ev = _determineLanguagesEvent;
-        ev.SpokenLanguages.Clear();
-        ev.UnderstoodLanguages.Clear();
-
-        ev.CurrentLanguage = comp.CurrentLanguage;
-        ev.SpokenLanguages.AddRange(comp.SpokenLanguages);
-        ev.UnderstoodLanguages.AddRange(comp.UnderstoodLanguages);
-
-        RaiseLocalEvent(speaker, ev, true);
-
-        if (ev.CurrentLanguage.Length == 0)
-            ev.CurrentLanguage = !string.IsNullOrEmpty(comp.CurrentLanguage) ? comp.CurrentLanguage : UniversalPrototype; // Fall back to account for admemes like admins possessing a bread
-        return ev;
-    }
-
-    /// <summary>
-    ///   Generates a stable pseudo-random number in the range (min, max) for the given seed.
-    ///   Each input seed corresponds to exactly one random number.
-    /// </summary>
-    private int PseudoRandomNumber(int seed, int min, int max)
-    {
-        // This is not a uniform distribution, but it shouldn't matter given there's 2^31 possible random numbers,
-        //   the bias of this function should be so tiny it will never be noticed.
-        seed += RandomRoundSeed;
-        var random = ((seed * 1103515245) + 12345) & 0x7fffffff; // Source: http://cs.uccs.edu/~cs591/bufferOverflow/glibc-2.2.4/stdlib/random_r.c
-        return random % (max - min) + min;
-    }
-
-    /// <summary>
-    ///   Set CurrentLanguage of the client, the client must be able to Understand the language requested.
-    /// </summary>
-    private void OnClientSetLanguage(LanguagesSetMessage message, EntitySessionEventArgs args)
-    {
-        if (args.SenderSession.AttachedEntity is not {Valid: true} speaker)
-            return;
-
-        var language = GetLanguagePrototype(message.CurrentLanguage);
-
-        if (language == null || !CanSpeak(speaker, language.ID))
-            return;
-
-        SetLanguage(speaker, language.ID);
-    }
-    #endregion
-}
diff --git a/Content.Server/Language/TranslatorImplanterSystem.cs b/Content.Server/Language/TranslatorImplanterSystem.cs
deleted file mode 100644
index 1e0c13375e..0000000000
--- a/Content.Server/Language/TranslatorImplanterSystem.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System.Linq;
-using Content.Server.Administration.Logs;
-using Content.Server.Popups;
-using Content.Shared.Database;
-using Content.Shared.Interaction;
-using Content.Shared.Language;
-using Content.Shared.Language.Components;
-using Content.Shared.Language.Events;
-using Content.Shared.Language.Systems;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Language.Components.Translators;
-
-namespace Content.Server.Language;
-
-public sealed class TranslatorImplanterSystem : SharedTranslatorImplanterSystem
-{
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly LanguageSystem _language = default!;
-
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<TranslatorImplanterComponent, AfterInteractEvent>(OnImplant);
-    }
-
-
-    private void OnImplant(EntityUid implanter, TranslatorImplanterComponent component, AfterInteractEvent args)
-    {
-        if (component.Used || !args.CanReach || args.Target is not { Valid: true } target)
-            return;
-
-        if (!TryComp<LanguageSpeakerComponent>(target, out var speaker))
-            return;
-
-        if (component.MobsOnly && !HasComp<MobStateComponent>(target))
-        {
-            _popup.PopupEntity("translator-implanter-refuse", component.Owner);
-            return;
-        }
-
-        var understood = _language.GetAllLanguages(target).understood;
-        if (component.RequiredLanguages.Count > 0 && !component.RequiredLanguages.Any(lang => understood.Contains(lang)))
-        {
-            _popup.PopupEntity(Loc.GetString("translator-implanter-refuse",
-                ("implanter", implanter), ("target", target)), implanter);
-            return;
-        }
-
-        var intrinsic = EnsureComp<ImplantedTranslatorComponent>(target);
-        intrinsic.Enabled = true;
-
-        foreach (var lang in component.SpokenLanguages.Where(lang => !intrinsic.SpokenLanguages.Contains(lang)))
-            intrinsic.SpokenLanguages.Add(lang);
-
-        foreach (var lang in component.UnderstoodLanguages.Where(lang => !intrinsic.UnderstoodLanguages.Contains(lang)))
-            intrinsic.UnderstoodLanguages.Add(lang);
-
-        component.Used = true;
-        _popup.PopupEntity(Loc.GetString("translator-implanter-success",
-            ("implanter", implanter), ("target", target)), implanter);
-
-        _adminLogger.Add(LogType.Action, LogImpact.Medium,
-            $"{ToPrettyString(args.User):player} used {ToPrettyString(implanter):implanter} to give {ToPrettyString(target):target} the following languages:"
-            + $"\nSpoken: {string.Join(", ", component.SpokenLanguages)}; Understood: {string.Join(", ", component.UnderstoodLanguages)}");
-
-        OnAppearanceChange(implanter, component);
-        RaiseLocalEvent(target, new LanguagesUpdateEvent(), true);
-    }
-}
diff --git a/Content.Server/Language/TranslatorSystem.cs b/Content.Server/Language/TranslatorSystem.cs
deleted file mode 100644
index 3b7704b9a7..0000000000
--- a/Content.Server/Language/TranslatorSystem.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-using System.Linq;
-using Content.Server.Popups;
-using Content.Server.PowerCell;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Language;
-using Content.Shared.Language.Events;
-using Content.Shared.Language.Systems;
-using Content.Shared.PowerCell;
-using Content.Shared.Language.Components.Translators;
-
-namespace Content.Server.Language;
-
-// This does not support holding multiple translators at once.
-// That shouldn't be an issue for now, but it needs to be fixed later.
-public sealed class TranslatorSystem : SharedTranslatorSystem
-{
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly LanguageSystem _language = default!;
-    [Dependency] private readonly PowerCellSystem _powerCell = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        // I wanna die. But my death won't help us discover polymorphism.
-        SubscribeLocalEvent<IntrinsicTranslatorComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
-        SubscribeLocalEvent<HoldsTranslatorComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
-        SubscribeLocalEvent<ImplantedTranslatorComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
-
-        SubscribeLocalEvent<HandheldTranslatorComponent, ActivateInWorldEvent>(OnTranslatorToggle);
-        SubscribeLocalEvent<HandheldTranslatorComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
-
-        // TODO: why does this use InteractHandEvent??
-        SubscribeLocalEvent<HandheldTranslatorComponent, InteractHandEvent>(OnTranslatorInteract);
-        SubscribeLocalEvent<HandheldTranslatorComponent, DroppedEvent>(OnTranslatorDropped);
-    }
-
-    private void OnDetermineLanguages(EntityUid uid, IntrinsicTranslatorComponent component,
-        DetermineEntityLanguagesEvent ev)
-    {
-        if (!component.Enabled)
-            return;
-
-        if (!_powerCell.HasActivatableCharge(uid))
-            return;
-
-        var addUnderstood = true;
-        var addSpoken = true;
-        if (component.RequiredLanguages.Count > 0)
-        {
-            if (component.RequiresAllLanguages)
-            {
-                // Add langs when the wielder has all of the required languages
-                foreach (var language in component.RequiredLanguages)
-                {
-                    if (!ev.SpokenLanguages.Contains(language, StringComparer.Ordinal))
-                        addSpoken = false;
-
-                    if (!ev.UnderstoodLanguages.Contains(language, StringComparer.Ordinal))
-                        addUnderstood = false;
-                }
-            }
-            else
-            {
-                // Add langs when the wielder has at least one of the required languages
-                addUnderstood = false;
-                addSpoken = false;
-                foreach (var language in component.RequiredLanguages)
-                {
-                    if (ev.SpokenLanguages.Contains(language, StringComparer.Ordinal))
-                        addSpoken = true;
-
-                    if (ev.UnderstoodLanguages.Contains(language, StringComparer.Ordinal))
-                        addUnderstood = true;
-                }
-            }
-        }
-
-        if (addSpoken)
-        {
-            foreach (var language in component.SpokenLanguages)
-                AddIfNotExists(ev.SpokenLanguages, language);
-
-            if (component.DefaultLanguageOverride != null && ev.CurrentLanguage.Length == 0)
-                ev.CurrentLanguage = component.DefaultLanguageOverride;
-        }
-
-        if (addUnderstood)
-            foreach (var language in component.UnderstoodLanguages)
-                AddIfNotExists(ev.UnderstoodLanguages, language);
-    }
-
-    private void OnTranslatorInteract( EntityUid translator, HandheldTranslatorComponent component, InteractHandEvent args)
-    {
-        var holder = args.User;
-        if (!EntityManager.HasComponent<LanguageSpeakerComponent>(holder))
-            return;
-
-        var intrinsic = EnsureComp<HoldsTranslatorComponent>(holder);
-        UpdateBoundIntrinsicComp(component, intrinsic, component.Enabled);
-
-        RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
-    }
-
-    private void OnTranslatorDropped(EntityUid translator, HandheldTranslatorComponent component, DroppedEvent args)
-    {
-        var holder = args.User;
-        if (!EntityManager.TryGetComponent<HoldsTranslatorComponent>(holder, out var intrinsic))
-            return;
-
-        if (intrinsic.Issuer == component)
-        {
-            intrinsic.Enabled = false;
-            RemCompDeferred(holder, intrinsic);
-        }
-
-        _language.EnsureValidLanguage(holder);
-
-        RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
-    }
-
-    private void OnTranslatorToggle(EntityUid translator, HandheldTranslatorComponent component, ActivateInWorldEvent args)
-    {
-        if (!component.ToggleOnInteract)
-            return;
-
-        var hasPower = _powerCell.HasDrawCharge(translator);
-
-        if (Transform(args.Target).ParentUid is { Valid: true } holder
-            && EntityManager.HasComponent<LanguageSpeakerComponent>(holder))
-        {
-            // This translator is held by a language speaker and thus has an intrinsic counterpart bound to it.
-            // Make sure it's up-to-date.
-            var intrinsic = EnsureComp<HoldsTranslatorComponent>(holder);
-            var isEnabled = !component.Enabled;
-            if (intrinsic.Issuer != component)
-            {
-                // The intrinsic comp wasn't owned by this handheld component, so this comp wasn't the active translator.
-                // Thus it needs to be turned on regardless of its previous state.
-                intrinsic.Issuer = component;
-                isEnabled = true;
-            }
-
-            isEnabled &= hasPower;
-            UpdateBoundIntrinsicComp(component, intrinsic, isEnabled);
-            component.Enabled = isEnabled;
-            _powerCell.SetPowerCellDrawEnabled(translator, isEnabled);
-
-            _language.EnsureValidLanguage(holder);
-            RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
-        }
-        else
-        {
-            // This is a standalone translator (e.g. lying on the ground), toggle its state.
-            component.Enabled = !component.Enabled && hasPower;
-            _powerCell.SetPowerCellDrawEnabled(translator, !component.Enabled && hasPower);
-        }
-
-        OnAppearanceChange(translator, component);
-
-        // HasPower shows a popup when there's no power, so we do not proceed in that case
-        if (hasPower)
-        {
-            var message = Loc.GetString(
-                component.Enabled
-                    ? "translator-component-turnon"
-                    : "translator-component-shutoff",
-                ("translator", component.Owner));
-            _popup.PopupEntity(message, component.Owner, args.User);
-        }
-    }
-
-    private void OnPowerCellSlotEmpty(EntityUid translator, HandheldTranslatorComponent component, PowerCellSlotEmptyEvent args)
-    {
-        component.Enabled = false;
-        _powerCell.SetPowerCellDrawEnabled(translator, false);
-        OnAppearanceChange(translator, component);
-
-        if (Transform(translator).ParentUid is { Valid: true } holder
-            && EntityManager.HasComponent<LanguageSpeakerComponent>(holder))
-        {
-            if (!EntityManager.TryGetComponent<HoldsTranslatorComponent>(holder, out var intrinsic))
-                return;
-
-            if (intrinsic.Issuer == component)
-            {
-                intrinsic.Enabled = false;
-                EntityManager.RemoveComponent(holder, intrinsic);
-            }
-
-            _language.EnsureValidLanguage(holder);
-            RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
-        }
-    }
-
-    /// <summary>
-    ///   Copies the state from the handheld to the intrinsic component
-    /// </summary>
-    private void UpdateBoundIntrinsicComp(HandheldTranslatorComponent comp, HoldsTranslatorComponent intrinsic, bool isEnabled)
-    {
-        if (isEnabled)
-        {
-            intrinsic.SpokenLanguages = new List<string>(comp.SpokenLanguages);
-            intrinsic.UnderstoodLanguages = new List<string>(comp.UnderstoodLanguages);
-            intrinsic.DefaultLanguageOverride = comp.DefaultLanguageOverride;
-        }
-        else
-        {
-            intrinsic.SpokenLanguages.Clear();
-            intrinsic.UnderstoodLanguages.Clear();
-            intrinsic.DefaultLanguageOverride = null;
-        }
-
-        intrinsic.Enabled = isEnabled;
-        intrinsic.Issuer = comp;
-    }
-
-    private static void AddIfNotExists(List<string> list, string item)
-    {
-        if (list.Contains(item))
-            return;
-        list.Add(item);
-    }
-}
diff --git a/Content.Server/Mind/Commands/MakeSentientCommand.cs b/Content.Server/Mind/Commands/MakeSentientCommand.cs
index cacd499ab8..5e19d135b6 100644
--- a/Content.Server/Mind/Commands/MakeSentientCommand.cs
+++ b/Content.Server/Mind/Commands/MakeSentientCommand.cs
@@ -1,10 +1,7 @@
 using Content.Server.Administration;
-using Content.Server.Language;
 using Content.Shared.Administration;
 using Content.Shared.Emoting;
 using Content.Shared.Examine;
-using Content.Shared.Language;
-using Content.Shared.Language.Systems;
 using Content.Shared.Mind.Components;
 using Content.Shared.Movement.Components;
 using Content.Shared.Speech;
@@ -58,13 +55,6 @@ public static void MakeSentient(EntityUid uid, IEntityManager entityManager, boo
             {
                 entityManager.EnsureComponent<SpeechComponent>(uid);
                 entityManager.EnsureComponent<EmotingComponent>(uid);
-
-                var language = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
-                var speaker = entityManager.EnsureComponent<LanguageSpeakerComponent>(uid);
-                // If the speaker knows any language (like monkey or robot), they keep those
-                // Otherwise, we give them the fallback
-                if (speaker.SpokenLanguages.Count == 0)
-                    language.AddLanguage(speaker, SharedLanguageSystem.FallbackLanguagePrototype);
             }
 
             entityManager.EnsureComponent<ExaminerComponent>(uid);
diff --git a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
index 53517da6cb..d18b044205 100644
--- a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
+++ b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
@@ -1,9 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Emp;
-using Content.Server.Language;
 using Content.Server.Radio.Components;
-using Content.Server.Speech;
-using Content.Shared.Chat;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
@@ -17,7 +14,6 @@ public sealed class HeadsetSystem : SharedHeadsetSystem
 {
     [Dependency] private readonly INetManager _netMan = default!;
     [Dependency] private readonly RadioSystem _radio = default!;
-    [Dependency] private readonly LanguageSystem _language = default!;
 
     public override void Initialize()
     {
@@ -103,16 +99,8 @@ public void SetEnabled(EntityUid uid, bool value, HeadsetComponent? component =
 
     private void OnHeadsetReceive(EntityUid uid, HeadsetComponent component, ref RadioReceiveEvent args)
     {
-        var parent = Transform(uid).ParentUid;
-        if (TryComp(parent, out ActorComponent? actor))
-        {
-            var canUnderstand = _language.CanUnderstand(parent, args.Language);
-            var msg = new MsgChatMessage
-            {
-                Message = canUnderstand ? args.OriginalChatMsg : args.LanguageObfuscatedChatMsg
-            };
-            _netMan.ServerSendMessage(msg, actor.PlayerSession.Channel);
-        }
+        if (TryComp(Transform(uid).ParentUid, out ActorComponent? actor))
+            _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.Channel);
     }
 
     private void OnEmpPulse(EntityUid uid, HeadsetComponent component, ref EmpPulseEvent args)
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index fc3f69a3ba..ace7d8ae31 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Interaction;
-using Content.Server.Language;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -30,7 +29,6 @@ public sealed class RadioDeviceSystem : EntitySystem
     [Dependency] private readonly InteractionSystem _interaction = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
-    [Dependency] private readonly LanguageSystem _language = default!;
 
     // Used to prevent a shitter from using a bunch of radios to spam chat.
     private HashSet<(string, EntityUid)> _recentlySent = new();
@@ -210,8 +208,7 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref
             ("originalName", nameEv.Name));
 
         // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios
-        var message = args.OriginalChatMsg.Message; // The chat system will handle the rest and re-obfuscate if needed.
-        _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false, languageOverride: args.Language);
+        _chat.TrySendInGameICMessage(uid, args.Message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false);
     }
 
     private void OnBeforeIntercomUiOpen(EntityUid uid, IntercomComponent component, BeforeActivatableUIOpenEvent args)
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index 60aa7c2f4f..e2a61b5022 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -1,13 +1,10 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
-using Content.Server.Language;
 using Content.Server.Power.Components;
 using Content.Server.Radio.Components;
-using Content.Server.Speech;
 using Content.Server.VoiceMask;
 using Content.Shared.Chat;
 using Content.Shared.Database;
-using Content.Shared.Language;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
 using Content.Shared.Speech;
@@ -32,7 +29,6 @@ public sealed class RadioSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly LanguageSystem _language = default!;
 
     // set used to prevent radio feedback loops.
     private readonly HashSet<string> _messages = new();
@@ -48,7 +44,7 @@ private void OnIntrinsicSpeak(EntityUid uid, IntrinsicRadioTransmitterComponent
     {
         if (args.Channel != null && component.Channels.Contains(args.Channel.ID))
         {
-            SendRadioMessage(uid, args.Message, args.Channel, uid, args.Language);
+            SendRadioMessage(uid, args.Message, args.Channel, uid);
             args.Channel = null; // prevent duplicate messages from other listeners.
         }
     }
@@ -56,23 +52,15 @@ private void OnIntrinsicSpeak(EntityUid uid, IntrinsicRadioTransmitterComponent
     private void OnIntrinsicReceive(EntityUid uid, IntrinsicRadioReceiverComponent component, ref RadioReceiveEvent args)
     {
         if (TryComp(uid, out ActorComponent? actor))
-        {
-            // Einstein-Engines - languages mechanic
-            var listener = component.Owner;
-            var msg = args.OriginalChatMsg;
-            if (listener != null && !_language.CanUnderstand(listener, args.Language))
-                msg = args.LanguageObfuscatedChatMsg;
-
-            _netMan.ServerSendMessage(new MsgChatMessage { Message = msg}, actor.PlayerSession.Channel);
-        }
+            _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.Channel);
     }
 
     /// <summary>
     /// Send radio message to all active radio listeners
     /// </summary>
-    public void SendRadioMessage(EntityUid messageSource, string message, ProtoId<RadioChannelPrototype> channel, EntityUid radioSource, LanguagePrototype? language = null, bool escapeMarkup = true)
+    public void SendRadioMessage(EntityUid messageSource, string message, ProtoId<RadioChannelPrototype> channel, EntityUid radioSource, bool escapeMarkup = true)
     {
-        SendRadioMessage(messageSource, message, _prototype.Index(channel), radioSource, escapeMarkup: escapeMarkup, language: language);
+        SendRadioMessage(messageSource, message, _prototype.Index(channel), radioSource, escapeMarkup: escapeMarkup);
     }
 
     /// <summary>
@@ -80,11 +68,8 @@ public void SendRadioMessage(EntityUid messageSource, string message, ProtoId<Ra
     /// </summary>
     /// <param name="messageSource">Entity that spoke the message</param>
     /// <param name="radioSource">Entity that picked up the message and will send it, e.g. headset</param>
-    public void SendRadioMessage(EntityUid messageSource, string message, RadioChannelPrototype channel, EntityUid radioSource, LanguagePrototype? language = null, bool escapeMarkup = true)
+    public void SendRadioMessage(EntityUid messageSource, string message, RadioChannelPrototype channel, EntityUid radioSource, bool escapeMarkup = true)
     {
-        if (language == null)
-            language = _language.GetLanguage(messageSource);
-
         // TODO if radios ever garble / modify messages, feedback-prevention needs to be handled better than this.
         if (!_messages.Add(message))
             return;
@@ -99,7 +84,6 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
 
         name = FormattedMessage.EscapeText(name);
 
-        // most radios are relayed to chat, so lets parse the chat message beforehand
         SpeechVerbPrototype speech;
         if (mask != null
             && mask.Enabled
@@ -115,15 +99,24 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
             ? FormattedMessage.EscapeText(message)
             : message;
 
-        var wrappedMessage = WrapRadioMessage(messageSource, channel, name, content);
-        var msg = new ChatMessage(ChatChannel.Radio, content, wrappedMessage, NetEntity.Invalid, null);
-
-        // ... you guess it
-        var obfuscated = _language.ObfuscateSpeech(content, language);
-        var obfuscatedWrapped = WrapRadioMessage(messageSource, channel, name, obfuscated);
-        var notUdsMsg = new ChatMessage(ChatChannel.Radio, obfuscated, obfuscatedWrapped, NetEntity.Invalid, null);
+        var wrappedMessage = Loc.GetString(speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap",
+            ("color", channel.Color),
+            ("fontType", speech.FontId),
+            ("fontSize", speech.FontSize),
+            ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
+            ("channel", $"\\[{channel.LocalizedName}\\]"),
+            ("name", name),
+            ("message", content));
 
-        var ev = new RadioReceiveEvent(messageSource, channel, msg, notUdsMsg, language);
+        // most radios are relayed to chat, so lets parse the chat message beforehand
+        var chat = new ChatMessage(
+            ChatChannel.Radio,
+            message,
+            wrappedMessage,
+            NetEntity.Invalid,
+            null);
+        var chatMsg = new MsgChatMessage { Message = chat };
+        var ev = new RadioReceiveEvent(message, messageSource, channel, chatMsg);
 
         var sendAttemptEv = new RadioSendAttemptEvent(channel, radioSource);
         RaiseLocalEvent(ref sendAttemptEv);
@@ -169,23 +162,10 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
         else
             _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Radio message from {ToPrettyString(messageSource):user} on {channel.LocalizedName}: {message}");
 
-        _replay.RecordServerMessage(msg);
+        _replay.RecordServerMessage(chat);
         _messages.Remove(message);
     }
 
-    private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel, string name, string message)
-    {
-        var speech = _chat.GetSpeechVerb(source, message);
-        return Loc.GetString(speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap",
-            ("color", channel.Color),
-            ("fontType", speech.FontId),
-            ("fontSize", speech.FontSize),
-            ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
-            ("channel", $"\\[{channel.LocalizedName}\\]"),
-            ("name", name),
-            ("message", FormattedMessage.EscapeText(message)));
-    }
-
     /// <inheritdoc cref="TelecomServerComponent"/>
     private bool HasActiveServer(MapId mapId, string channelId)
     {
diff --git a/Content.Server/Radio/RadioEvent.cs b/Content.Server/Radio/RadioEvent.cs
index 35220d1d75..69d764ffe6 100644
--- a/Content.Server/Radio/RadioEvent.cs
+++ b/Content.Server/Radio/RadioEvent.cs
@@ -1,22 +1,10 @@
 using Content.Shared.Chat;
-using Content.Shared.Language;
 using Content.Shared.Radio;
 
 namespace Content.Server.Radio;
 
-/// <summary>
-/// <param name="OriginalChatMsg">The message to display when the speaker can understand "language"</param>
-/// <param name="LanguageObfuscatedChatMsg">The message to display when the speaker cannot understand "language"</param>
-/// </summary>
 [ByRefEvent]
-public readonly record struct RadioReceiveEvent(
-    // Einstein-Engines - languages mechanic
-    EntityUid MessageSource,
-    RadioChannelPrototype Channel,
-    ChatMessage OriginalChatMsg,
-    ChatMessage LanguageObfuscatedChatMsg,
-    LanguagePrototype Language
-);
+public readonly record struct RadioReceiveEvent(string Message, EntityUid MessageSource, RadioChannelPrototype Channel, MsgChatMessage ChatMsg);
 
 /// <summary>
 /// Use this event to cancel sending message per receiver
diff --git a/Content.Server/Speech/EntitySystems/ListeningSystem.cs b/Content.Server/Speech/EntitySystems/ListeningSystem.cs
index f2a625600c..ea3569e055 100644
--- a/Content.Server/Speech/EntitySystems/ListeningSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ListeningSystem.cs
@@ -8,7 +8,6 @@ namespace Content.Server.Speech.EntitySystems;
 /// </summary>
 public sealed class ListeningSystem : EntitySystem
 {
-    [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly SharedTransformSystem _xforms = default!;
 
     public override void Initialize()
@@ -19,10 +18,10 @@ public override void Initialize()
 
     private void OnSpeak(EntitySpokeEvent ev)
     {
-        PingListeners(ev.Source, ev.Message, ev.IsWhisper);
+        PingListeners(ev.Source, ev.Message, ev.ObfuscatedMessage);
     }
 
-    public void PingListeners(EntityUid source, string message, bool isWhisper)
+    public void PingListeners(EntityUid source, string message, string? obfuscatedMessage)
     {
         // TODO whispering / audio volume? Microphone sensitivity?
         // for now, whispering just arbitrarily reduces the listener's max range.
@@ -33,7 +32,7 @@ public void PingListeners(EntityUid source, string message, bool isWhisper)
 
         var attemptEv = new ListenAttemptEvent(source);
         var ev = new ListenEvent(message, source);
-        var obfuscatedEv = !isWhisper ? null : new ListenEvent(_chat.ObfuscateMessageReadability(message), source);
+        var obfuscatedEv = obfuscatedMessage == null ? null : new ListenEvent(obfuscatedMessage, source);
         var query = EntityQueryEnumerator<ActiveListenerComponent, TransformComponent>();
 
         while(query.MoveNext(out var listenerUid, out var listener, out var xform))
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index 0b72ac5ee7..ee4a4e9023 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -25,7 +25,6 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction CycleChatChannelBackward = "CycleChatChannelBackward";
         public static readonly BoundKeyFunction EscapeContext = "EscapeContext";
         public static readonly BoundKeyFunction OpenCharacterMenu = "OpenCharacterMenu";
-        public static readonly BoundKeyFunction OpenLanguageMenu = "OpenLanguageMenu";
         public static readonly BoundKeyFunction OpenCraftingMenu = "OpenCraftingMenu";
         public static readonly BoundKeyFunction OpenGuidebook = "OpenGuidebook";
         public static readonly BoundKeyFunction OpenInventoryMenu = "OpenInventoryMenu";
diff --git a/Content.Shared/Language/Components/LanguageSpeakerComponent.cs b/Content.Shared/Language/Components/LanguageSpeakerComponent.cs
deleted file mode 100644
index 95232ffe6f..0000000000
--- a/Content.Shared/Language/Components/LanguageSpeakerComponent.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Shared.Language;
-
-[RegisterComponent, AutoGenerateComponentState]
-public sealed partial class LanguageSpeakerComponent : Component
-{
-    /// <summary>
-    ///     The current language the entity may use to speak.
-    ///     Other listeners will hear the entity speak in this language.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
-    public string CurrentLanguage = default!;
-
-    /// <summary>
-    ///     List of languages this entity can speak.
-    /// </summary>
-    [ViewVariables]
-    [DataField("speaks", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>), required: true)]
-    public List<string> SpokenLanguages = new();
-
-    /// <summary>
-    ///     List of languages this entity can understand.
-    /// </summary>
-    [ViewVariables]
-    [DataField("understands", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>), required: true)]
-    public List<string> UnderstoodLanguages = new();
-}
diff --git a/Content.Shared/Language/Components/TranslatorImplanterComponent.cs b/Content.Shared/Language/Components/TranslatorImplanterComponent.cs
deleted file mode 100644
index 401e8a8b8a..0000000000
--- a/Content.Shared/Language/Components/TranslatorImplanterComponent.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Shared.Language.Components;
-
-/// <summary>
-///   An item that, when used on a mob, adds an intrinsic translator to it.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TranslatorImplanterComponent : Component
-{
-    [DataField("spoken", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
-    public List<string> SpokenLanguages = new();
-
-    [DataField("understood", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
-    public List<string> UnderstoodLanguages = new();
-
-    /// <summary>
-    ///   The list of languages the mob must understand in order for this translator to have effect.
-    ///   Knowing one language is enough.
-    /// </summary>
-    [DataField("requires", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
-    public List<string> RequiredLanguages = new();
-
-    /// <summary>
-    ///   If true, only allows to use this implanter on mobs.
-    /// </summary>
-    [DataField]
-    public bool MobsOnly = true;
-
-    /// <summary>
-    ///   Whether this implant has been used already.
-    /// </summary>
-    [DataField]
-    public bool Used = false;
-}
diff --git a/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs
deleted file mode 100644
index a66c9be082..0000000000
--- a/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Shared.Language.Components.Translators;
-
-public abstract partial class BaseTranslatorComponent : Component
-{
-    // TODO may need to be removed completely, it's a part of legacy code that never ended up being used.
-    /// <summary>
-    ///   The language this translator changes the speaker's language to when they don't specify one.
-    ///   If null, does not modify the default language.
-    /// </summary>
-    [DataField("defaultLanguage")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string? DefaultLanguageOverride = null;
-
-    /// <summary>
-    ///   The list of additional languages this translator allows the wielder to speak.
-    /// </summary>
-    [DataField("spoken", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
-    public List<string> SpokenLanguages = new();
-
-    /// <summary>
-    ///   The list of additional languages this translator allows the wielder to understand.
-    /// </summary>
-    [DataField("understood", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
-    public List<string> UnderstoodLanguages = new();
-
-    /// <summary>
-    ///   The languages the wielding MUST know in order for this translator to have effect.
-    ///   The field [RequiresAllLanguages] indicates whether all of them are required, or just one.
-    /// </summary>
-    [DataField("requires", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
-    public List<string> RequiredLanguages = new();
-
-    /// <summary>
-    ///   If true, the wielder must understand all languages in [RequiredLanguages] to speak [SpokenLanguages],
-    ///   and understand all languages in [RequiredLanguages] to understand [UnderstoodLanguages].
-    ///
-    ///   Otherwise, at least one language must be known (or the list must be empty).
-    /// </summary>
-    [DataField("requiresAll")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public bool RequiresAllLanguages = false;
-
-    [DataField("enabled"), ViewVariables(VVAccess.ReadWrite)]
-    public bool Enabled = true;
-}
diff --git a/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs
deleted file mode 100644
index f900603f01..0000000000
--- a/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Content.Shared.Language.Components.Translators;
-
-/// <summary>
-///   A translator that must be held in a hand or a pocket of an entity in order ot have effect.
-/// </summary>
-[RegisterComponent]
-public sealed partial class HandheldTranslatorComponent : Translators.BaseTranslatorComponent
-{
-    /// <summary>
-    ///   Whether or not interacting with this translator
-    ///   toggles it on or off.
-    /// </summary>
-    [DataField("toggleOnInteract")]
-    public bool ToggleOnInteract = true;
-}
diff --git a/Content.Shared/Language/Components/Translators/HoldsTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/HoldsTranslatorComponent.cs
deleted file mode 100644
index caea9b9a94..0000000000
--- a/Content.Shared/Language/Components/Translators/HoldsTranslatorComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Shared.Language.Components.Translators;
-
-/// <summary>
-///   Applied internally to the holder of [HandheldTranslatorComponent].
-///   Do not use directly. Use [HandheldTranslatorComponent] instead.
-/// </summary>
-[RegisterComponent]
-public sealed partial class HoldsTranslatorComponent : IntrinsicTranslatorComponent
-{
-    public Component? Issuer = null;
-}
diff --git a/Content.Shared/Language/Components/Translators/ImplantedTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/ImplantedTranslatorComponent.cs
deleted file mode 100644
index d1d72e83ed..0000000000
--- a/Content.Shared/Language/Components/Translators/ImplantedTranslatorComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Content.Shared.Language.Components.Translators;
-
-/// <summary>
-///   Applied to entities who were injected with a translator implant.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ImplantedTranslatorComponent : IntrinsicTranslatorComponent
-{
-}
diff --git a/Content.Shared/Language/Components/Translators/IntrinsicTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/IntrinsicTranslatorComponent.cs
deleted file mode 100644
index d8def4ac1d..0000000000
--- a/Content.Shared/Language/Components/Translators/IntrinsicTranslatorComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Shared.Language.Components.Translators;
-
-/// <summary>
-///   A translator attached to an entity that translates its speech.
-///   An example is a translator implant that allows the speaker to speak another language.
-/// </summary>
-[RegisterComponent, Virtual]
-public partial class IntrinsicTranslatorComponent : Translators.BaseTranslatorComponent
-{
-}
diff --git a/Content.Shared/Language/Components/UniversalLanguageSpeakerComponent.cs b/Content.Shared/Language/Components/UniversalLanguageSpeakerComponent.cs
deleted file mode 100644
index 6f5ad1178b..0000000000
--- a/Content.Shared/Language/Components/UniversalLanguageSpeakerComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Shared.Language.Components;
-
-// <summary>
-//     Signifies that this entity can speak and understand any language.
-//     Applies to such entities as ghosts.
-// </summary>
-[RegisterComponent]
-public sealed partial class UniversalLanguageSpeakerComponent : Component
-{
-
-}
diff --git a/Content.Shared/Language/Events/LanguagesSetMessage.cs b/Content.Shared/Language/Events/LanguagesSetMessage.cs
deleted file mode 100644
index f7a78210aa..0000000000
--- a/Content.Shared/Language/Events/LanguagesSetMessage.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Language.Events;
-
-/// <summary>
-///     Sent from the client to the server when it needs to want to set his currentLangauge.
-///     Yeah im using this instead of ExecuteCommand... Better right?
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class LanguagesSetMessage(string currentLanguage) : EntityEventArgs
-{
-    public string CurrentLanguage = currentLanguage;
-}
diff --git a/Content.Shared/Language/Events/LanguagesUpdateEvent.cs b/Content.Shared/Language/Events/LanguagesUpdateEvent.cs
deleted file mode 100644
index 90ce2f4446..0000000000
--- a/Content.Shared/Language/Events/LanguagesUpdateEvent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Content.Shared.Language.Events;
-
-/// <summary>
-///     Raised on an entity when its list of languages changes.
-/// </summary>
-public sealed class LanguagesUpdateEvent : EntityEventArgs
-{
-}
diff --git a/Content.Shared/Language/Events/LanguagesUpdatedMessage.cs b/Content.Shared/Language/Events/LanguagesUpdatedMessage.cs
deleted file mode 100644
index 563f036df6..0000000000
--- a/Content.Shared/Language/Events/LanguagesUpdatedMessage.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Language.Events;
-
-/// <summary>
-///     Sent to the client when its list of languages changes.
-///     The client should in turn update its HUD and relevant systems.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class LanguagesUpdatedMessage(string currentLanguage, List<string> spoken, List<string> understood) : EntityEventArgs
-{
-    public string CurrentLanguage = currentLanguage;
-    public List<string> Spoken = spoken;
-    public List<string> Understood = understood;
-}
diff --git a/Content.Shared/Language/Events/RequestLanguagesMessage.cs b/Content.Shared/Language/Events/RequestLanguagesMessage.cs
deleted file mode 100644
index aead1f4cd1..0000000000
--- a/Content.Shared/Language/Events/RequestLanguagesMessage.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Language.Events;
-
-/// <summary>
-///     Sent from the client to the server when it needs to learn the list of languages its entity knows.
-///     This event should always be followed by a <see cref="LanguagesUpdatedMessage"/>, unless the client doesn't have an entity.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class RequestLanguagesMessage : EntityEventArgs;
diff --git a/Content.Shared/Language/LanguagePrototype.cs b/Content.Shared/Language/LanguagePrototype.cs
deleted file mode 100644
index 801ab8a393..0000000000
--- a/Content.Shared/Language/LanguagePrototype.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Runtime.CompilerServices;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Language;
-
-[Prototype("language")]
-public sealed class LanguagePrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; private set;  } = default!;
-
-    /// <summary>
-    ///     If true, obfuscated phrases of creatures speaking this language will have their syllables replaced with "replacement" syllables.
-    ///     Otherwise entire sentences will be replaced.
-    /// </summary>
-    [DataField(required: true)]
-    public bool ObfuscateSyllables;
-
-    /// <summary>
-    ///     Lists all syllables that are used to obfuscate a message a listener cannot understand if obfuscateSyllables is true.
-    ///     Otherwise uses all possible phrases the creature can make when trying to say anything.
-    /// </summary>
-    [DataField(required: true)]
-    public List<string> Replacement = [];
-
-    #region utility
-    /// <summary>
-    ///     The in-world name of this language, localized.
-    /// </summary>
-    public string Name => Loc.GetString($"language-{ID}-name");
-
-    /// <summary>
-    ///     The in-world description of this language, localized.
-    /// </summary>
-    public string Description => Loc.GetString($"language-{ID}-description");
-    #endregion utility
-}
diff --git a/Content.Shared/Language/Systems/SharedLanguageSystem.cs b/Content.Shared/Language/Systems/SharedLanguageSystem.cs
deleted file mode 100644
index e2eeb8bb49..0000000000
--- a/Content.Shared/Language/Systems/SharedLanguageSystem.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared.Actions;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Language.Systems;
-
-public abstract class SharedLanguageSystem : EntitySystem
-{
-    /// <summary>
-    ///     The language used as a fallback in cases where an entity suddenly becomes a language speaker (e.g. the usage of make-sentient)
-    /// </summary>
-    [ValidatePrototypeId<LanguagePrototype>]
-    public static readonly string FallbackLanguagePrototype = "GalacticCommon";
-
-    /// <summary>
-    ///     The language whose speakers are assumed to understand and speak every language. Should never be added directly.
-    /// </summary>
-    [ValidatePrototypeId<LanguagePrototype>]
-    public static readonly string UniversalPrototype = "Universal";
-
-    /// <summary>
-    ///     A cached instance of <see cref="UniversalPrototype"/>
-    /// </summary>
-    public static LanguagePrototype Universal { get; private set; } = default!;
-
-    [Dependency] protected readonly IPrototypeManager _prototype = default!;
-    [Dependency] protected readonly IRobustRandom _random = default!;
-
-    public override void Initialize()
-    {
-        Universal = _prototype.Index<LanguagePrototype>("Universal");
-    }
-
-    public LanguagePrototype? GetLanguagePrototype(string id)
-    {
-        _prototype.TryIndex<LanguagePrototype>(id, out var proto);
-        return proto;
-    }
-}
diff --git a/Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs b/Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs
deleted file mode 100644
index a13225378c..0000000000
--- a/Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Examine;
-using Content.Shared.Implants.Components;
-using Content.Shared.Language.Components;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Language.Systems;
-
-public abstract class SharedTranslatorImplanterSystem : EntitySystem
-{
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<TranslatorImplanterComponent, ExaminedEvent>(OnExamined);
-    }
-
-    private void OnExamined(EntityUid uid, TranslatorImplanterComponent component, ExaminedEvent args)
-    {
-        if (!args.IsInDetailsRange)
-            return;
-
-        var text = !component.Used
-            ? Loc.GetString("translator-implanter-ready")
-            : Loc.GetString("translator-implanter-used");
-
-        args.PushText(text);
-    }
-
-    protected void OnAppearanceChange(EntityUid implanter, TranslatorImplanterComponent component)
-    {
-        var used = component.Used;
-        _appearance.SetData(implanter, ImplanterVisuals.Full, !used);
-    }
-}
diff --git a/Content.Shared/Language/Systems/SharedTranslatorSystem.cs b/Content.Shared/Language/Systems/SharedTranslatorSystem.cs
deleted file mode 100644
index 08a016efa9..0000000000
--- a/Content.Shared/Language/Systems/SharedTranslatorSystem.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.Examine;
-using Content.Shared.Toggleable;
-using Content.Shared.Language.Components.Translators;
-
-namespace Content.Shared.Language.Systems;
-
-public abstract class SharedTranslatorSystem : EntitySystem
-{
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<HandheldTranslatorComponent, ExaminedEvent>(OnExamined);
-    }
-
-    private void OnExamined(EntityUid uid, HandheldTranslatorComponent component, ExaminedEvent args)
-    {
-        var state = Loc.GetString(component.Enabled
-            ? "translator-enabled"
-            : "translator-disabled");
-
-        args.PushMarkup(state);
-    }
-
-    protected void OnAppearanceChange(EntityUid translator, HandheldTranslatorComponent? comp = null)
-    {
-        if (comp == null && !TryComp(translator, out comp))
-            return;
-
-        _appearance.SetData(translator, ToggleVisuals.Toggled, comp.Enabled);
-    }
-}
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 89dcd2f582..6679b141cd 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4142,27 +4142,3 @@ Entries:
       message: Floors Looks Updated/Resprited.
   id: 6118
   time: '2024-06-03T19:23:51.0000000+00:00'
-- author: FoxxoTrystan
-  changes:
-    - type: Add
-      message: All species can now bring their own cultures and languages
-  id: 6119
-  time: '2024-06-10T20:48:48.0000000+00:00'
-- author: FoxxoTrystan
-  changes:
-    - type: Tweak
-      message: Rust Walls Sprites.
-    - type: Tweak
-      message: Armor, Bulletproof, Riot Suit Resprites.
-    - type: Tweak
-      message: New Banners Sprites.
-    - type: Tweak
-      message: Stunbaton, Fire Extinguisher New Sprites.
-    - type: Tweak
-      message: Rack/WallScreen resprites.
-    - type: Tweak
-      message: Stock Parts new sprites!
-    - type: Tweak
-      message: Radiation Collector has now a new sprite!
-  id: 6120
-  time: '2024-06-11T00:34:02.0000000+00:00'
diff --git a/Resources/Locale/en-US/language/commands.ftl b/Resources/Locale/en-US/language/commands.ftl
deleted file mode 100644
index 32fa5415b8..0000000000
--- a/Resources/Locale/en-US/language/commands.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-command-list-langs-desc = List languages your current entity can speak at the current moment.
-command-list-langs-help = Usage: {$command}
-
-command-saylang-desc = Send a message in a specific language.
-command-saylang-help = Usage: {$command} <language id> <message>. Example: {$command} GalacticCommon "Hello World!"
-
-command-language-select-desc = Select the currently spoken language of your entity.
-command-language-select-help = Usage: {$command} <language id>. Example: {$command} GalacticCommon
diff --git a/Resources/Locale/en-US/language/language-menu.ftl b/Resources/Locale/en-US/language/language-menu.ftl
deleted file mode 100644
index 83687d0f1a..0000000000
--- a/Resources/Locale/en-US/language/language-menu.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-language-menu-window-title = Language Menu
-language-menu-current-language = Current Language: {$language}
-language-menu-description-header = Description
-ui-options-function-open-language-menu = Open language Menu
diff --git a/Resources/Locale/en-US/language/languages.ftl b/Resources/Locale/en-US/language/languages.ftl
deleted file mode 100644
index 69c5d0a4a7..0000000000
--- a/Resources/Locale/en-US/language/languages.ftl
+++ /dev/null
@@ -1,71 +0,0 @@
-language-Universal-name = Universal
-language-Universal-description = What are you?
-
-language-GalacticCommon-name = Galactic common
-language-GalacticCommon-description = The standard Galatic language, most commonly used for inter-species communications and legal work.
-
-language-Bubblish-name = Bubblish
-language-Bubblish-description = The language of Slimes. Being a mixture of bubbling noises and pops it's very difficult to speak for humans without the use of mechanical aids.
-
-language-RootSpeak-name = Rootspeak
-language-RootSpeak-description = The strange whistling-style language spoken by the Diona.
-
-language-Nekomimetic-name = Nekomimetic
-language-Nekomimetic-description = To the casual observer, this language is an incomprehensible mess of broken Japanese. To the felinids, it's somehow comprehensible.
-
-language-Draconic-name = Draconic
-language-Draconic-description = The common language of lizard-people, composed of sibilant hisses and rattles.
-
-language-SolCommon-name = Sol common
-language-SolCommon-description = The language common to species from the Sol System.
-
-language-Canilunzt-name = Canilunzt
-language-Canilunzt-description = The guttural language spoken and utilized by the inhabitants of the Vazzend system, composed of growls, barks, yaps, and heavy utilization of ears and tail movements. Vulpkanin speak this language with ease.
-
-language-Moffic-name = Moffic
-language-Moffic-description = The language of the mothpeople borders on complete unintelligibility.
-
-language-RobotTalk-name = RobotTalk
-language-RobotTalk-description = A language consisting of harsh binary chirps, whistles, hisses, and whines. Organic tongues cannot speak it without aid from special translators.
-
-language-Cat-name = Cat
-language-Cat-description = Meow
-
-language-Dog-name = Dog
-language-Dog-description = Bark!
-
-language-Fox-name = Fox
-language-Fox-description = Yeeps!
-
-language-Xeno-name = Xeno
-language-Xeno-description = Sssss!
-
-language-Monkey-name = Monkey
-language-Monkey-description = oooook!
-
-language-Mouse-name = Mouse
-language-Mouse-description = Squeeek!
-
-language-Chicken-name = Chicken
-language-Chicken-description = Coot!
-
-language-Duck-name = Duck
-language-Duck-description = Quack!
-
-language-Cow-name = Cow
-language-Cow-description = Moooo!
-
-language-Sheep-name = Sheep
-language-Sheep-description = Baaah!
-
-language-Kangaroo-name = Kangaroo
-language-Kangaroo-description = Chuu!
-
-language-Pig-name = Pig
-language-Pig-description = Oink!
-
-language-Crab-name = Crab
-language-Crab-description = Click!
-
-language-Kobold-name = Kobold
-language-Kobold-description = Hiss!
diff --git a/Resources/Locale/en-US/language/technologies.ftl b/Resources/Locale/en-US/language/technologies.ftl
deleted file mode 100644
index 901a48061c..0000000000
--- a/Resources/Locale/en-US/language/technologies.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-research-technology-basic-translation = Basic Translation
-research-technology-advanced-translation = Advanced Translation
diff --git a/Resources/Locale/en-US/language/translator.ftl b/Resources/Locale/en-US/language/translator.ftl
deleted file mode 100644
index b2a1e9b2b8..0000000000
--- a/Resources/Locale/en-US/language/translator.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-translator-component-shutoff = The {$translator} shuts off.
-translator-component-turnon = The {$translator} turns on.
-translator-enabled = It appears to be active.
-translator-disabled = It appears to be disabled.
-translator-implanter-refuse = The {$implanter} has no effect on {$target}.
-translator-implanter-success = The {$implanter} successfully injected {$target}.
-translator-implanter-ready = This implanter appears to be ready to use.
-translator-implanter-used = This implanter seems empty.
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
index e932974a0f..92615131f0 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
@@ -66,11 +66,6 @@
   - type: Tag
     tags:
     - VimPilot
-  - type: LanguageSpeaker
-    speaks:
-    - Fox
-    understands:
-    - Fox
 
 - type: entity
   name: security dog
@@ -159,6 +154,8 @@
     spawned:
     - id: FoodMeat
       amount: 2
+  - type: ReplacementAccent
+    accent: dog
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-dog
@@ -179,9 +176,3 @@
     tags:
     - DoorBumpOpener
     - VimPilot
-  - type: LanguageSpeaker
-    speaks:
-    - Dog
-    understands:
-    - Dog
-    - GalacticCommon
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
index 003c899fc5..4f255cad21 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -98,11 +98,6 @@
     factions:
     - PsionicInterloper
     - NanoTrasen
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    understands:
-    - GalacticCommon
   - type: GhostTakeoverAvailable
   - type: GhostRole
     makeSentient: true
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
index c2ae33ec0b..96950317c1 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
@@ -96,12 +96,8 @@
     spawned:
     - id: FoodMeat
       amount: 1
-  - type: LanguageSpeaker
-    speaks:
-    - Mouse
-    understands:
-    - Mouse
-    - GalacticCommon
+  - type: ReplacementAccent
+    accent: mouse
   - type: Tag
     tags:
     - VimPilot
@@ -167,4 +163,4 @@
     interactFailureString: petting-failure-nukie-mouse
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
-      path: /Audio/Animals/mouse_squeak.ogg
+      path: /Audio/Animals/mouse_squeak.ogg
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index 18437e074d..a4498299c9 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -122,19 +122,12 @@
   - type: MovementSpeedModifier
     baseWalkSpeed: 2.5
     baseSprintSpeed: 5.0
-  - type: Inventory
+  - type: Inventory 
     speciesId: harpy
     templateId: digitigrade
   - type: HarpyVisuals
   - type: UltraVision
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - SolCommon
-    understands:
-    - GalacticCommon
-    - SolCommon
-
+    
 - type: entity
   save: false
   name: Urist McHands
@@ -145,7 +138,7 @@
   components:
   - type: HumanoidAppearance
     species: Harpy
-  - type: Inventory
+  - type: Inventory 
     speciesId: harpy
   - type: Sprite
     scale: 0.9, 0.9
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
index 52853d696a..4a187d51b3 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
@@ -97,13 +97,6 @@
       Female: FemaleVulpkanin
       Unsexed: MaleVulpkanin
   - type: DogVision
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - Canilunzt
-    understands:
-    - GalacticCommon
-    - Canilunzt
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 0645e451af..dec46df0b5 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -213,13 +213,6 @@
     visMask:
       - PsionicInvisibility
       - Normal
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - RobotTalk
-    understands:
-    - GalacticCommon
-    - RobotTalk
 
 - type: entity
   id: BaseBorgChassisNT
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 369544fdc1..378b3f8a9d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -48,11 +48,8 @@
     flavorKind: station-event-random-sentience-flavor-organic
   - type: Bloodstream
     bloodMaxVolume: 50
-  - type: LanguageSpeaker
-    speaks:
-    - Mouse
-    understands:
-    - Mouse
+  - type: ReplacementAccent
+    accent: mouse
   - type: MeleeWeapon
     soundHit:
         path: /Audio/Effects/bite.ogg
@@ -232,11 +229,8 @@
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
-  - type: LanguageSpeaker
-    speaks:
-    - Chicken
-    understands:
-    - Chicken
+  - type: ReplacementAccent
+    accent: chicken
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
   - type: NpcFactionMember
@@ -510,11 +504,8 @@
       prob: 0.5
   - type: Extractable
     grindableSolutionName: food
-  - type: LanguageSpeaker
-    speaks:
-    - Moffic
-    understands:
-    - Moffic
+  - type: ReplacementAccent
+    accent: mothroach
   - type: ZombieAccentOverride
     accent: zombieMoth
   - type: Vocal
@@ -610,11 +601,8 @@
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
-  - type: LanguageSpeaker
-    speaks:
-    - Duck
-    understands:
-    - Duck
+  - type: ReplacementAccent
+    accent: duck
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
   - type: NpcFactionMember
@@ -851,11 +839,8 @@
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Voice/Arachnid/arachnid_chitter.ogg
-  - type: LanguageSpeaker
-    speaks:
-    - Crab
-    understands:
-    - Crab
+  - type: ReplacementAccent
+    accent: crab
   - type: Bloodstream
     bloodMaxVolume: 50
     bloodReagent: CopperBlood
@@ -1091,11 +1076,8 @@
   - type: Inventory
     speciesId: kangaroo
     templateId: kangaroo
-  - type: LanguageSpeaker
-    speaks:
-    - Kangaroo
-    understands:
-    - Kangaroo
+  - type: ReplacementAccent
+    accent: kangaroo
   - type: InventorySlots
   - type: Strippable
   - type: Butcherable
@@ -1284,12 +1266,7 @@
   - type: Speech
     speechSounds: Monkey
     speechVerb: Monkey
-  - type: LanguageSpeaker
-    speaks:
-    - Monkey
-    understands:
-    - Monkey
-    - Kobold
+  - type: MonkeyAccent
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-primate
   - type: AlwaysRevolutionaryConvertible
@@ -1323,13 +1300,7 @@
   - type: Speech
     speechSounds: Monkey
     speechVerb: Monkey
-  - type: LanguageSpeaker
-    speaks:
-    - Monkey
-    understands:
-    - Monkey
-    - Kobold
-    - GalacticCommon
+  - type: MonkeyAccent
   - type: NpcFactionMember
     factions:
     - Syndicate
@@ -1368,12 +1339,8 @@
   - type: NameIdentifier
     group: Kobold
   - type: LizardAccent
-  - type: LanguageSpeaker
-    speaks:
-    - Kobold
-    understands:
-    - Kobold
-    - Monkey
+  - type: ReplacementAccent
+    accent: kobold
   - type: Speech
     speechSounds: Lizard
     speechVerb: Reptilian
@@ -1601,11 +1568,8 @@
     spawned:
     - id: FoodMeatRat
       amount: 1
-  - type: LanguageSpeaker
-    speaks:
-    - Mouse
-    understands:
-    - Mouse
+  - type: ReplacementAccent
+    accent: mouse
   - type: Tag
     tags:
     - Trash
@@ -1930,11 +1894,6 @@
       path: /Audio/Animals/parrot_raught.ogg
   - type: Bloodstream
     bloodMaxVolume: 50
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    understands:
-    - GalacticCommon
 
 - type: entity
   name: penguin
@@ -2181,11 +2140,8 @@
   - type: MeleeChemicalInjector
     transferAmount: 0.75
     solution: melee
-  - type: LanguageSpeaker
-    speaks:
-    - Xeno
-    understands:
-    - Xeno
+  - type: ReplacementAccent
+    accent: xeno
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-tarantula
@@ -2516,11 +2472,6 @@
   - type: Tag
     tags:
     - VimPilot
-  - type: LanguageSpeaker
-    speaks:
-    - Fox
-    understands:
-    - Fox
 
 - type: entity
   name: corgi
@@ -2567,11 +2518,8 @@
     spawned:
     - id: FoodMeat
       amount: 2
-  - type: LanguageSpeaker
-    speaks:
-    - Dog
-    understands:
-    - Dog
+  - type: ReplacementAccent
+    accent: dog
   - type: InteractionPopup
     interactSuccessString: petting-success-dog
     interactFailureString: petting-failure-generic
@@ -2723,11 +2671,8 @@
     spawned:
     - id: FoodMeat
       amount: 3
-  - type: LanguageSpeaker
-    speaks:
-    - Cat
-    understands:
-    - Cat
+  - type: ReplacementAccent
+    accent: cat
   - type: InteractionPopup
     successChance: 0.7
     interactSuccessString: petting-success-cat
@@ -2794,12 +2739,6 @@
   - type: NpcFactionMember
     factions:
     - Syndicate
-  - type: LanguageSpeaker
-    speaks:
-    - Xeno
-    understands:
-    - Xeno
-    - GalacticCommon
 
 - type: entity
   name: space cat
@@ -3095,11 +3034,8 @@
     spawned:
     - id: FoodMeat
       amount: 1
-  - type: LanguageSpeaker
-    speaks:
-    - Mouse
-    understands:
-    - Mouse
+  - type: ReplacementAccent
+    accent: mouse
   - type: Tag
     tags:
     - VimPilot
@@ -3205,11 +3141,8 @@
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Animals/pig_oink.ogg
-  - type: LanguageSpeaker
-    speaks:
-    - Pig
-    understands:
-    - Pig
+  - type: ReplacementAccent
+    accent: pig
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
   - type: NpcFactionMember
@@ -3295,12 +3228,6 @@
     reformTime: 10
     popupText: diona-reform-attempt
     reformPrototype: MobDionaReformed
-  - type: LanguageSpeaker
-    speaks:
-    - RootSpeak
-    understands:
-    - GalacticCommon
-    - RootSpeak
 
 - type: entity
   parent: MobDionaNymph
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
index 3bcf8e7a16..39e68b63a7 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
@@ -15,11 +15,8 @@
   - type: Sprite
     sprite: Mobs/Aliens/Argocyte/argocyte_common.rsi
   - type: SolutionContainerManager
-  - type: LanguageSpeaker
-    speaks:
-    - Xeno
-    understands:
-    - Xeno
+  - type: ReplacementAccent
+    accent: xeno
   - type: Bloodstream
     bloodReagent: FerrochromicAcid
     bloodMaxVolume: 75 #we don't want the map to become pools of blood
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 8ca1b2d2f0..9981bb8bd9 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -36,12 +36,6 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalIan
-  - type: LanguageSpeaker
-    speaks:
-    - Dog
-    understands:
-    - GalacticCommon
-    - Dog
 
 - type: entity
   name: Old Ian
@@ -127,12 +121,6 @@
     tags:
     - CannotSuicide
     - VimPilot
-  - type: LanguageSpeaker
-    speaks:
-    - Cat
-    understands:
-    - GalacticCommon
-    - Cat
 
 - type: entity
   name: Exception
@@ -151,12 +139,6 @@
     tags:
     - CannotSuicide
     - VimPilot
-  - type: LanguageSpeaker
-    speaks:
-    - Cat
-    understands:
-    - GalacticCommon
-    - Cat
 
 - type: entity
   name: Floppa
@@ -306,12 +288,8 @@
     spawned:
     - id: FoodMeat
       amount: 2
-  - type: LanguageSpeaker
-    speaks:
-    - Dog
-    understands:
-    - GalacticCommon
-    - Dog
+  - type: ReplacementAccent
+    accent: dog
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-dog
@@ -409,12 +387,8 @@
     spawned:
     - id: FoodMeat
       amount: 3
-  - type: LanguageSpeaker
-    speaks:
-    - Dog
-    understands:
-    - GalacticCommon
-    - Dog
+  - type: ReplacementAccent
+    accent: dog
   - type: InteractionPopup
     successChance: 0.7
     interactSuccessString: petting-success-dog
@@ -572,12 +546,6 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalRenault
-  - type: LanguageSpeaker
-    speaks:
-    - Fox
-    understands:
-    - GalacticCommon
-    - Fox
 
 - type: entity
   name: Hamlet
@@ -625,12 +593,6 @@
     - CannotSuicide
     - Hamster
     - VimPilot
-  - type: LanguageSpeaker
-    speaks:
-    - Mouse
-    understands:
-    - GalacticCommon
-    - Mouse
 
 - type: entity
   name: Shiva
@@ -803,12 +765,6 @@
     attributes:
       proper: true
       gender: female
-  - type: LanguageSpeaker
-    speaks:
-    - Bubblish
-    understands:
-    - GalacticCommon
-    - Bubblish
 
 - type: entity
   name: Pun Pun
@@ -843,13 +799,6 @@
     attributes:
       proper: true
       gender: male
-  - type: LanguageSpeaker
-    speaks:
-    - Monkey
-    understands:
-    - GalacticCommon
-    - Monkey
-    - Kobold
 
 - type: entity
   name: Tropico
@@ -877,9 +826,3 @@
 #  - type: AlwaysRevolutionaryConvertible
   - type: StealTarget
     stealGroup: AnimalTropico
-  - type: LanguageSpeaker
-    speaks:
-    - Crab
-    understands:
-    - GalacticCommon
-    - Crab
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 50fe3b6765..89a6f16e52 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -119,13 +119,6 @@
     attributes:
       gender: male
   - type: PotentialPsionic # Nyano
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - Mouse
-    understands:
-    - GalacticCommon
-    - Mouse
 
 - type: entity
   id: MobRatKingBuff
@@ -296,12 +289,6 @@
   - type: Food
   - type: Item
     size: Tiny # Delta V - Make them eatable and pickable.
-  - type: LanguageSpeaker
-    speaks:
-    - Mouse
-    understands:
-    - GalacticCommon
-    - Mouse
 
 - type: weightedRandomEntity
   id: RatKingLoot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 1316aefc50..ec1ed3a58f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -97,7 +97,6 @@
     - RevenantTheme
   - type: Speech
     speechVerb: Ghost
-  - type: UniversalLanguageSpeaker
   - type: Tag
     tags:
       - NoPaint
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
index 9559ae3a0c..f08fe36544 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
@@ -36,7 +36,7 @@
     speedModifierThresholds:
       60: 0.7
       80: 0.5
-
+      
 - type: entity
   name: shadow cat
   parent: BaseShadowMob
@@ -50,11 +50,8 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: cat
   - type: Physics
-  - type: LanguageSpeaker
-    speaks:
-    - Cat
-    understands:
-    - Cat
+  - type: ReplacementAccent
+    accent: cat
   - type: InteractionPopup
     successChance: 0.01 # you cant pet shadow cat... almost
     interactSuccessString: petting-success-cat
@@ -67,4 +64,4 @@
       gender: epicene
   - type: Tag
     tags:
-    - VimPilot
+    - VimPilot
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index e3166c15f6..42b7ff9e21 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -107,13 +107,6 @@
   - type: TypingIndicator
     proto: robot
   - type: ZombieImmune
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - RobotTalk
-    understands:
-    - GalacticCommon
-    - RobotTalk
 
 - type: entity
   parent: MobSiliconBase
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index 901bf149cb..c64479369a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -111,11 +111,8 @@
     successChance: 0.5
     interactSuccessString: petting-success-slimes
     interactFailureString: petting-failure-generic
-  - type: LanguageSpeaker
-    speaks:
-    - Bubblish
-    understands:
-    - Bubblish
+  - type: ReplacementAccent
+    accent: slimes
   - type: GhostTakeoverAvailable
   - type: GhostRole
     makeSentient: true
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 9ea2d784db..0a294805cf 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -165,11 +165,8 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepBounce
-  - type: LanguageSpeaker
-    speaks:
-    - Kangaroo
-    understands:
-    - Kangaroo
+  - type: ReplacementAccent
+    accent: kangaroo
   - type: InventorySlots
   - type: Strippable
   - type: UserInterface
@@ -251,11 +248,8 @@
   - type: MeleeChemicalInjector
     solution: melee
     transferAmount: 4
-  - type: LanguageSpeaker
-    speaks:
-    - Xeno
-    understands:
-    - Xeno
+  - type: ReplacementAccent
+    accent: xeno
   - type: InteractionPopup
     successChance: 0.20
     interactSuccessString: petting-success-tarantula
@@ -357,11 +351,8 @@
     - type: MeleeChemicalInjector
       solution: melee
       transferAmount: 6
-    - type: LanguageSpeaker
-      speaks:
-      - Xeno
-      understands:
-      - Xeno
+    - type: ReplacementAccent
+      accent: xeno
     - type: InteractionPopup
       successChance: 0.2
       interactSuccessString: petting-success-snake
@@ -382,4 +373,4 @@
   parent: MobCobraSpace
   suffix: "Salvage Ruleset"
   components:
-    - type: SalvageMobRestrictions
+    - type: SalvageMobRestrictions
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 26553a2f1f..d0ac6fc026 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -125,11 +125,6 @@
     chance: -2
   - type: Psionic #Nyano - Summary: makes psionic by default.
     removable: false
-  - type: LanguageSpeaker
-    speaks:
-    - Xeno
-    understands:
-    - Xeno
 
 - type: entity
   name: Praetorian
@@ -239,13 +234,6 @@
   - type: Tag
     tags:
     - CannotSuicide
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - Xeno
-    understands:
-    - GalacticCommon
-    - Xeno
 
 - type: entity
   name: Ravager
diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
index 0086be81d9..8f3e6c1346 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -53,7 +53,6 @@
   - type: Tag
     tags:
     - BypassInteractionRangeChecks
-  - type: UniversalLanguageSpeaker # Ghosts should understand any language.
 
 - type: entity
   id: ActionGhostBoo
diff --git a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
index 07deef857c..ad9b37f63e 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
@@ -7,4 +7,3 @@
   - type: MovementSpeedModifier
     baseSprintSpeed: 24
     baseWalkSpeed: 16
-  - type: UniversalLanguageSpeaker
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 67212d416f..a610e04d6d 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -141,7 +141,7 @@
     - Pacified
     - StaminaModifier
     - PsionicsDisabled #Nyano - Summary: PCs can have psionics disabled.
-    - PsionicallyInsulated #Nyano - Summary: PCs can be made insulated from psionic powers.
+    - PsionicallyInsulated #Nyano - Summary: PCs can be made insulated from psionic powers. 
   - type: Reflect
     enabled: false
     reflectProb: 0
@@ -218,12 +218,7 @@
   - type: MobPrice
     price: 1500 # Kidnapping a living person and selling them for cred is a good move.
     deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less.
-  - type: CanEscapeInventory # Carrying system from nyanotrasen.
-  - type: LanguageSpeaker # This is here so all with no LanguageSpeaker at least spawn with the default languages.
-    speaks:
-    - GalacticCommon
-    understands:
-    - GalacticCommon
+  - type: CanEscapeInventory # Carrying system from nyanotrasen.  
   - type: Tag
     tags:
     - CanPilot
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index 5cb3de6f16..3d405c4dd9 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -102,13 +102,6 @@
     actionPrototype: DionaGibAction
     allowedStates:
     - Dead
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - RootSpeak
-    understands:
-    - GalacticCommon
-    - RootSpeak
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
index 7afc5cddd7..fe36754b9b 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -52,13 +52,6 @@
     accent: dwarf
   - type: Speech
     speechSounds: Bass
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - SolCommon
-    understands:
-    - GalacticCommon
-    - SolCommon
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index 7c3f857c00..900de77712 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -16,14 +16,6 @@
     spawned:
     - id: FoodMeatHuman
       amount: 5
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - SolCommon
-    understands:
-    - GalacticCommon
-    - SolCommon
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index 39aa0ab8de..1680dd6cda 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -23,13 +23,6 @@
     accent: zombieMoth
   - type: Speech
     speechVerb: Moth
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - Moffic
-    understands:
-    - GalacticCommon
-    - Moffic
   - type: TypingIndicator
     proto: moth
   - type: Butcherable
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index bdea4499ed..09e86b1996 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -59,13 +59,6 @@
       types:
         Heat : 1.5 #per second, scales with temperature & other constants
   - type: Wagging
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - Draconic
-    understands:
-    - GalacticCommon
-    - Draconic
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index a601010ef9..481afd06a3 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -74,13 +74,6 @@
       types:
         Asphyxiation: -1.0
     maxSaturation: 15
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - Bubblish
-    understands:
-    - GalacticCommon
-    - Bubblish
 
 - type: entity
   parent: MobHumanDummy
diff --git a/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml b/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml
deleted file mode 100644
index fc947efe9a..0000000000
--- a/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-- type: entity
-  abstract: true
-  id: BaseTranslatorImplanter
-  parent: [ BaseItem ]
-  name: basic translator implant
-  description: Translates speech.
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Medical/implanter.rsi
-    state: implanter0
-    layers:
-    - state: implanter1
-      map: [ "implantFull" ]
-      visible: true
-    - state: implanter0
-      map: [ "implantBroken" ]
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.ImplanterVisuals.Full:
-        implantFull:
-          True: {visible: true}
-          False: {visible: false}
-        implantBroken:
-          True: {visible: false}
-          False: {visible: true}
-
-- type: entity
-  id: BasicGalaticCommonTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: basic Galactic Common translator implant
-  description: An implant giving the ability to understand Galactic Common.
-  components:
-  - type: TranslatorImplanter
-    understood:
-    - GalacticCommon
-
-- type: entity
-  id: AdvancedGalaticCommonTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: advanced Galactic Common translator implant
-  description: An implant giving the ability to understand and speak Galactic Common.
-  components:
-  - type: TranslatorImplanter
-    spoken:
-    - GalacticCommon
-    understood:
-    - GalacticCommon
-
-- type: entity
-  id: BubblishTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Bubblish translator implant
-  description: An implant giving the ability to understand and speak Bubblish.
-  components:
-  - type: TranslatorImplanter
-    spoken:
-    - Bubblish
-    understood:
-    - Bubblish
-
-- type: entity
-  id: NekomimeticTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Nekomimetic translator implant
-  description: An implant giving the ability to understand and speak Nekomimetic. Nya~!
-  components:
-  - type: TranslatorImplanter
-    spoken:
-    - Nekomimetic
-    understood:
-    - Nekomimetic
-
-- type: entity
-  id: DraconicTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Draconic translator implant
-  description: An implant giving the ability to understand and speak Draconic.
-  components:
-  - type: TranslatorImplanter
-    spoken:
-    - Draconic
-    understood:
-    - Draconic
-
-- type: entity
-  id: CanilunztTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Canilunzt translator implant
-  description: An implant giving the ability to understand and speak Canilunzt. Yeeps!
-  components:
-  - type: TranslatorImplanter
-    spoken:
-    - Canilunzt
-    understood:
-    - Canilunzt
-
-- type: entity
-  id: SolCommonTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: SolCommon translator implant
-  description: An implant giving the ability to understand and speak SolCommon. Raaagh!
-  components:
-  - type: TranslatorImplanter
-    spoken:
-    - SolCommon
-    understood:
-    - SolCommon
-
-- type: entity
-  id: RootSpeakTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: RootSpeak translator implant
-  description: An implant giving the ability to understand and speak RootSpeak.
-  components:
-  - type: TranslatorImplanter
-    spoken:
-    - RootSpeak
-    understood:
-    - RootSpeak
-
-- type: entity
-  id: MofficTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Moffic translator implant
-  description: An implant giving the ability to understand and speak Moffic.
-  components:
-  - type: TranslatorImplanter
-    spoken:
-    - Moffic
-    understood:
-    - Moffic
diff --git a/Resources/Prototypes/Entities/Objects/Devices/translators.yml b/Resources/Prototypes/Entities/Objects/Devices/translators.yml
deleted file mode 100644
index e5ad824c5d..0000000000
--- a/Resources/Prototypes/Entities/Objects/Devices/translators.yml
+++ /dev/null
@@ -1,205 +0,0 @@
-- type: entity
-  abstract: true
-  id: TranslatorUnpowered
-  parent: [ BaseItem ]
-  name: translator
-  description: Translates speech.
-  components:
-  - type: Sprite
-    sprite: Objects/Devices/translator.rsi
-    state: icon
-    layers:
-      - state: icon
-      - state: translator
-        shader: unshaded
-        visible: false
-        map: [ "enum.ToggleVisuals.Layer", "enum.PowerDeviceVisualLayers.Powered" ]
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
-          True: { visible: true }
-          False: { visible: false }
-  - type: HandheldTranslator
-    enabled: false
-
-- type: entity
-  abstract: true
-  id: Translator
-  parent: [ TranslatorUnpowered, PowerCellSlotMediumItem ]
-  suffix: Powered
-  components:
-  - type: PowerCellDraw
-    drawRate: 1
-
-- type: entity
-  abstract: true
-  id: TranslatorEmpty
-  parent: [ Translator ]
-  suffix: Empty
-  components:
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
-
-
-- type: entity
-  id: CanilunztTranslator
-  parent: [ TranslatorEmpty ]
-  name: Canilunzt translator
-  description: Translates speech between Canilunzt and Galactic Common.
-  components:
-  - type: HandheldTranslator
-    spoken:
-    - GalacticCommon
-    - Canilunzt
-    understood:
-    - GalacticCommon
-    - Canilunzt
-    requires:
-    - GalacticCommon
-    - Canilunzt
-
-- type: entity
-  id: BubblishTranslator
-  parent: [ TranslatorEmpty ]
-  name: Bubblish translator
-  description: Translates speech between Bubblish and Galactic Common.
-  components:
-  - type: HandheldTranslator
-    spoken:
-    - GalacticCommon
-    - Bubblish
-    understood:
-    - GalacticCommon
-    - Bubblish
-    requires:
-    - GalacticCommon
-    - Bubblish
-
-- type: entity
-  id: NekomimeticTranslator
-  parent: [ TranslatorEmpty ]
-  name: Nekomimetic translator
-  description: Translates speech between Nekomimetic and Galactic Common. Why would you want that?
-  components:
-  - type: HandheldTranslator
-    spoken:
-    - GalacticCommon
-    - Nekomimetic
-    understood:
-    - GalacticCommon
-    - Nekomimetic
-    requires:
-    - GalacticCommon
-    - Nekomimetic
-
-- type: entity
-  id: DraconicTranslator
-  parent: [ TranslatorEmpty ]
-  name: Draconic translator
-  description: Translates speech between Draconic and Galactic Common.
-  components:
-  - type: HandheldTranslator
-    spoken:
-    - GalacticCommon
-    - Draconic
-    understood:
-    - GalacticCommon
-    - Draconic
-    requires:
-    - GalacticCommon
-    - Draconic
-
-- type: entity
-  id: SolCommonTranslator
-  parent: [ TranslatorEmpty ]
-  name: Sol Common translator
-  description: Translates speech between Sol Common and Galactic Common. Like a true Earthman!
-  components:
-  - type: HandheldTranslator
-    spoken:
-    - GalacticCommon
-    - SolCommon
-    understood:
-    - GalacticCommon
-    - SolCommon
-    requires:
-    - GalacticCommon
-    - SolCommon
-
-- type: entity
-  id: RootSpeakTranslator
-  parent: [ TranslatorEmpty ]
-  name: RootSpeak translator
-  description: Translates speech between RootSpeak and Galactic Common. Like a true plant?
-  components:
-  - type: HandheldTranslator
-    spoken:
-    - GalacticCommon
-    - RootSpeak
-    understood:
-    - GalacticCommon
-    - RootSpeak
-    requires:
-    - GalacticCommon
-    - RootSpeak
-
-- type: entity
-  id: MofficTranslator
-  parent: [ TranslatorEmpty ]
-  name: Moffic translator
-  description: Translates speech between Moffic and Galactic Common. Like a true moth... or bug?
-  components:
-  - type: HandheldTranslator
-    spoken:
-    - GalacticCommon
-    - Moffic
-    understood:
-    - GalacticCommon
-    - Moffic
-    requires:
-    - GalacticCommon
-    - Moffic
-
-- type: entity
-  id: XenoTranslator
-  parent: [ TranslatorEmpty ]
-  name: Xeno translator
-  description: Translates speech between Xeno and Galactic Common. Not sure if that will help.
-  components:
-  - type: HandheldTranslator
-    spoken:
-    - GalacticCommon
-    - Xeno
-    understood:
-    - GalacticCommon
-    - Xeno
-    requires:
-    - GalacticCommon
-
-- type: entity
-  id: AnimalTranslator
-  parent: [ TranslatorEmpty ]
-  name: Animal translator
-  description: Translates all the cutes noises that animals make into a more understandable form!
-  components:
-  - type: HandheldTranslator
-    understood:
-    - Cat
-    - Dog
-    - Fox
-    - Monkey
-    - Mouse
-    - Chicken
-    - Duck
-    - Cow
-    - Sheep
-    - Kangaroo
-    - Pig
-    - Crab
-    - Kobold
-    requires:
-    - GalacticCommon
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index 53a32e0f6f..5fca081998 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -104,6 +104,7 @@
     - key: enum.WiresUiKey.Key
       type: WiresBoundUserInterface
   - type: Airtight
+    fixVacuum: true
     noAirWhenFullyAirBlocked: false
   - type: RadiationBlocker
     resistance: 3
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 9771f63388..21d485be0c 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -57,6 +57,7 @@
     denySound:
       path: /Audio/Machines/airlock_deny.ogg
   - type: Airtight
+    fixVacuum: true
     noAirWhenFullyAirBlocked: false
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index e677ef185b..dccc76e96c 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -93,6 +93,7 @@
     - type: Physics
       canCollide: false
     - type: Airtight
+      fixVacuum: true
       airBlocked: false
       noAirWhenFullyAirBlocked: true
     - type: RadiationBlocker
@@ -157,6 +158,7 @@
       sprite: Structures/Doors/edge_door_hazard.rsi
       snapCardinals: false
     - type: Airtight
+      fixVacuum: true
       airBlocked: false
       noAirWhenFullyAirBlocked: false
       airBlockedDirection:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index 8dfe2f62a5..4b6f72de93 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -40,6 +40,7 @@
       path: /Audio/Effects/stonedoor_openclose.ogg
   - type: Appearance
   - type: Airtight
+    fixVacuum: true
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
diff --git a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
index d6c087af0a..2c54d3cd41 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
@@ -38,6 +38,7 @@
   - type: Weldable
     time: 2
   - type: Airtight
+    fixVacuum: true
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
index 1819c9d0ef..e38ba1fd66 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -59,6 +59,7 @@
     - key: enum.WiresUiKey.Key
       type: WiresBoundUserInterface
   - type: Airtight
+    fixVacuum: true
   - type: RadiationBlocker
     resistance: 2
   - type: Damageable
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index d03765d4fc..56167c178e 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -130,6 +130,7 @@
   - type: Appearance
   - type: WiresVisuals
   - type: Airtight
+    fixVacuum: true
     noAirWhenFullyAirBlocked: false
     airBlockedDirection:
       - South
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 7300c0b9ec..011f2a3b64 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -341,24 +341,6 @@
       - FauxTileAstroSnow
       - OreBagOfHolding
       - DeviceQuantumSpinInverter
-      - CanilunztTranslator
-      - BubblishTranslator
-      - NekomimeticTranslator
-      - DraconicTranslator
-      - SolCommonTranslator
-      - RootSpeakTranslator
-      - XenoTranslator
-      - BasicGalaticCommonTranslatorImplanter
-      - AdvancedGalaticCommonTranslatorImplanter
-      - BubblishTranslatorImplanter
-      - NekomimeticTranslatorImplanter
-      - DraconicTranslatorImplanter
-      - CanilunztTranslatorImplanter
-      - SolCommonTranslatorImplanter
-      - RootSpeakTranslatorImplanter
-      - AnimalTranslator
-      - MofficTranslatorImplanter
-      - MofficTranslator
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - ExplosivePayload
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 6efa5a6371..64b6b068c7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -101,13 +101,6 @@
     price: 100
   - type: Appearance
   - type: WiresVisuals
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - RobotTalk
-    understands:
-    - GalacticCommon
-    - RobotTalk
 
 - type: entity
   parent: VendingMachine
diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
index bf49eb1be3..8c53daf3b6 100644
--- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -83,6 +83,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Airtight
+    fixVacuum: true
 
 - type: entity
   id: PlasticFlapsAirtightOpaque
@@ -100,3 +101,4 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Airtight
+    fixVacuum: true
diff --git a/Resources/Prototypes/Language/languages.yml b/Resources/Prototypes/Language/languages.yml
deleted file mode 100644
index 90bce1baed..0000000000
--- a/Resources/Prototypes/Language/languages.yml
+++ /dev/null
@@ -1,493 +0,0 @@
-# The universal language, assumed if the entity has a UniversalLanguageSpeakerComponent.
-# Do not use otherwise. Try to use the respective component instead of this language.
-- type: language
-  id: Universal
-  obfuscateSyllables: false
-  replacement:
-  - "*incomprehensible*"
-
-# The common galactic tongue.
-- type: language
-  id: GalacticCommon
-  obfuscateSyllables: true
-  replacement:
-  - Blah
-  - Blah
-  - Blah
-  - dingle-doingle
-  - dingle
-  - dangle
-  - jibber-jabber
-  - jubber
-  - bleh
-  - zippity
-  - zoop
-  - wibble
-  - wobble
-  - wiggle
-  - yada
-  - meh
-  - neh
-  - nah
-  - wah
-
-# Spoken by slimes.
-- type: language
-  id: Bubblish
-  obfuscateSyllables: true
-  replacement:
-  - blob
-  - plop
-  - pop
-  - bop
-  - boop
-
-# Spoken by moths.
-- type: language
-  id: Moffic
-  obfuscateSyllables: true
-  replacement:
-  - år
-  - i
-  - går
-  - sek
-  - mo
-  - ff
-  - ok
-  - gj
-  - ø
-  - gå
-  - la
-  - le
-  - lit
-  - ygg
-  - van
-  - dår
-  - næ
-  - møt
-  - idd
-  - hvo
-  - ja
-  - på
-  - han
-  - så
-  - ån
-  - det
-  - att
-  - nå
-  - gö
-  - bra
-  - int
-  - tyc
-  - om
-  - när
-  - två
-  - må
-  - dag
-  - sjä
-  - vii
-  - vuo
-  - eil
-  - tun
-  - käyt
-  - teh
-  - vä
-  - hei
-  - huo
-  - suo
-  - ää
-  - ten
-  - ja
-  - heu
-  - stu
-  - uhr
-  - kön
-  - we
-  - hön
-
-  # Spoken by dionas.
-- type: language
-  id: RootSpeak
-  obfuscateSyllables: true
-  replacement:
-  - hs
-  - zt
-  - kr
-  - st
-  - sh
-
-# A mess of broken Japanese, spoken by Felinds and Oni
-- type: language
-  id: Nekomimetic
-  obfuscateSyllables: true
-  replacement:
-  - neko
-  - nyan
-  - mimi
-  - moe
-  - mofu
-  - fuwa
-  - kyaa
-  - kawaii
-  - poka
-  - munya
-  - puni
-  - munyu
-  - ufufu
-  - icha
-  - doki
-  - kyun
-  - kusu
-  - nya
-  - nyaa
-  - desu
-  - kis
-  - ama
-  - chuu
-  - baka
-  - hewo
-  - boop
-  - gato
-  - kit
-  - sune
-  - yori
-  - sou
-  - baka
-  - chan
-  - san
-  - kun
-  - mahou
-  - yatta
-  - suki
-  - usagi
-  - domo
-  - ori
-  - uwa
-  - zaazaa
-  - shiku
-  - puru
-  - ira
-  - heto
-  - etto
-
-# Spoken by the Lizard race.
-- type: language
-  id: Draconic
-  obfuscateSyllables: true
-  replacement:
-  - za
-  - az
-  - ze
-  - ez
-  - zi
-  - iz
-  - zo
-  - oz
-  - zu
-  - uz
-  - zs
-  - sz
-  - ha
-  - ah
-  - he
-  - eh
-  - hi
-  - ih
-  - ho
-  - oh
-  - hu
-  - uh
-  - hs
-  - sh
-  - la
-  - al
-  - le
-  - el
-  - li
-  - il
-  - lo
-  - ol
-  - lu
-  - ul
-  - ls
-  - sl
-  - ka
-  - ak
-  - ke
-  - ek
-  - ki
-  - ik
-  - ko
-  - ok
-  - ku
-  - uk
-  - ks
-  - sk
-  - sa
-  - as
-  - se
-  - es
-  - si
-  - is
-  - so
-  - os
-  - su
-  - us
-  - ss
-  - ss
-  - ra
-  - ar
-  - re
-  - er
-  - ri
-  - ir
-  - ro
-  - or
-  - ru
-  - ur
-  - rs
-  - sr
-  - a
-  - a
-  - e
-  - e
-  - i
-  - i
-  - o
-  - o
-  - u
-  - u
-  - s
-  - s
-
-# Spoken by the Vulpkanin race.
-- type: language
-  id: Canilunzt
-  obfuscateSyllables: true
-  replacement:
-  - rur
-  - ya
-  - cen
-  - rawr
-  - bar
-  - kuk
-  - tek
-  - qat
-  - uk
-  - wu
-  - vuh
-  - tah
-  - tch
-  - schz
-  - auch
-  - ist
-  - ein
-  - entch
-  - zwichs
-  - tut
-  - mir
-  - wo
-  - bis
-  - es
-  - vor
-  - nic
-  - gro
-  - lll
-  - enem
-  - zandt
-  - tzch
-  - noch
-  - hel
-  - ischt
-  - far
-  - wa
-  - baram
-  - iereng
-  - tech
-  - lach
-  - sam
-  - mak
-  - lich
-  - gen
-  - or
-  - ag
-  - eck
-  - gec
-  - stag
-  - onn
-  - bin
-  - ket
-  - jarl
-  - vulf
-  - einech
-  - cresthz
-  - azunein
-  - ghzth
-
-# The common language of the Sol system.
-- type: language
-  id: SolCommon
-  obfuscateSyllables: true
-  replacement:
-  - tao
-  - shi
-  - tzu
-  - yi
-  - com
-  - be
-  - is
-  - i
-  - op
-  - vi
-  - ed
-  - lec
-  - mo
-  - cle
-  - te
-  - dis
-  - e
-
-- type: language
-  id: RobotTalk
-  obfuscateSyllables: true
-  replacement:
-  - 0
-  - 1
-  - 01
-  - 10
-  - 001
-  - 100
-  - 011
-  - 110
-  - 101
-  - 010
-
-# Languages spoken by various critters.
-- type: language
-  id: Cat
-  obfuscateSyllables: true
-  replacement:
-  - murr
-  - meow
-  - purr
-  - mrow
-
-- type: language
-  id: Dog
-  obfuscateSyllables: true
-  replacement:
-  - woof
-  - bark
-  - ruff
-  - bork
-  - raff
-  - garr
-
-- type: language
-  id: Fox
-  obfuscateSyllables: true
-  replacement:
-  - bark
-  - gecker
-  - ruff
-  - raff
-  - garr
-
-- type: language
-  id: Xeno
-  obfuscateSyllables: true
-  replacement:
-  - sss
-  - sSs
-  - SSS
-
-- type: language
-  id: Monkey
-  obfuscateSyllables: true
-  replacement:
-  - ok
-  - ook
-  - oook
-  - ooook
-  - oooook
-
-- type: language
-  id: Mouse
-  obfuscateSyllables: true
-  replacement:
-  - Squeak
-  - Piep
-  - Chuu
-  - Eeee
-  - Pip
-  - Fwiep
-  - Heep
-
-- type: language
-  id: Chicken
-  obfuscateSyllables: true
-  replacement:
-  - Coo
-  - Coot
-  - Cooot
-
-- type: language
-  id: Duck
-  obfuscateSyllables: true
-  replacement:
-  - Quack
-  - Quack quack
-
-- type: language
-  id: Cow
-  obfuscateSyllables: true
-  replacement:
-  - Moo
-  - Mooo
-
-- type: language
-  id: Sheep
-  obfuscateSyllables: true
-  replacement:
-  - Ba
-  - Baa
-  - Baaa
-
-- type: language
-  id: Kangaroo
-  obfuscateSyllables: true
-  replacement:
-  - Shreak
-  - Chuu
-
-- type: language
-  id: Pig
-  obfuscateSyllables: true
-  replacement:
-  - Oink
-  - Oink oink
-
-- type: language
-  id: Crab
-  obfuscateSyllables: true
-  replacement:
-  - Click
-  - Click-clack
-  - Clack
-  - Tipi-tap
-  - Clik-tap
-  - Cliliick
-
-- type: language
-  id: Kobold
-  obfuscateSyllables: true
-  replacement:
-  - Yip
-  - Grrar.
-  - Yap
-  - Bip
-  - Screet
-  - Gronk
-  - Hiss
-  - Eeee
-  - Yip
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
index 8a0e750abd..e11f1c4165 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
@@ -35,13 +35,6 @@
         - MobLayer
   - type: Stamina
     critThreshold: 115
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - Nekomimetic
-    understands:
-    - GalacticCommon
-    - Nekomimetic
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
index 2184926b95..d9b25c5dd1 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -64,15 +64,6 @@
       Unsexed: MaleFelinid
   - type: Felinid
   - type: NoShoesSilentFootsteps
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - SolCommon
-    - Nekomimetic
-    understands:
-    - GalacticCommon
-    - SolCommon
-    - Nekomimetic
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Recipes/Lathes/language.yml b/Resources/Prototypes/Recipes/Lathes/language.yml
deleted file mode 100644
index 6871ed5228..0000000000
--- a/Resources/Prototypes/Recipes/Lathes/language.yml
+++ /dev/null
@@ -1,190 +0,0 @@
-- type: latheRecipe
-  id: CanilunztTranslator
-  result: CanilunztTranslator
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 100
-    Plastic: 50
-    Gold: 50
-
-- type: latheRecipe
-  id: BubblishTranslator
-  result: BubblishTranslator
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 100
-    Plastic: 50
-    Gold: 50
-
-- type: latheRecipe
-  id: NekomimeticTranslator
-  result: NekomimeticTranslator
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 100
-    Plastic: 50
-    Gold: 50
-
-- type: latheRecipe
-  id: DraconicTranslator
-  result: DraconicTranslator
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 100
-    Plastic: 50
-    Gold: 50
-
-- type: latheRecipe
-  id: SolCommonTranslator
-  result: SolCommonTranslator
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 100
-    Plastic: 50
-    Gold: 50
-
-- type: latheRecipe
-  id: RootSpeakTranslator
-  result: RootSpeakTranslator
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 100
-    Plastic: 50
-    Gold: 50
-
-- type: latheRecipe
-  id: MofficTranslator
-  result: MofficTranslator
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 100
-    Plastic: 50
-    Gold: 50
-
-- type: latheRecipe
-  id: BasicGalaticCommonTranslatorImplanter
-  result: BasicGalaticCommonTranslatorImplanter
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 100
-    Gold: 50
-    Silver: 50
-
-- type: latheRecipe
-  id: XenoTranslator
-  result: XenoTranslator
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 50
-    Gold: 50
-    Plasma: 50
-    Silver: 50
-
-- type: latheRecipe
-  id: AdvancedGalaticCommonTranslatorImplanter
-  result: AdvancedGalaticCommonTranslatorImplanter
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 100
-    Gold: 50
-    Silver: 50
-
-- type: latheRecipe
-  id: BubblishTranslatorImplanter
-  result: BubblishTranslatorImplanter
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 100
-    Gold: 50
-    Silver: 50
-
-- type: latheRecipe
-  id: NekomimeticTranslatorImplanter
-  result: NekomimeticTranslatorImplanter
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 100
-    Gold: 50
-    Silver: 50
-
-- type: latheRecipe
-  id: DraconicTranslatorImplanter
-  result: DraconicTranslatorImplanter
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 100
-    Gold: 50
-    Silver: 50
-
-- type: latheRecipe
-  id: CanilunztTranslatorImplanter
-  result: CanilunztTranslatorImplanter
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 100
-    Gold: 50
-    Silver: 50
-
-- type: latheRecipe
-  id: SolCommonTranslatorImplanter
-  result: SolCommonTranslatorImplanter
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 100
-    Gold: 50
-    Silver: 50
-
-- type: latheRecipe
-  id: RootSpeakTranslatorImplanter
-  result: RootSpeakTranslatorImplanter
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 100
-    Gold: 50
-    Silver: 50
-
-- type: latheRecipe
-  id: MofficTranslatorImplanter
-  result: MofficTranslatorImplanter
-  completetime: 2
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 100
-    Gold: 50
-    Silver: 50
-
-- type: latheRecipe
-  id: AnimalTranslator
-  result: AnimalTranslator
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 50
-    Gold: 50
-    Plasma: 50
-    Silver: 5
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index acb6a2498d..61f95894ee 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -227,43 +227,3 @@
   recipeUnlocks:
   - BluespaceBeaker
   - SyringeBluespace
-
-- type: technology
-  id: BasicTranslation
-  name: research-technology-basic-translation
-  icon:
-    sprite: Objects/Devices/translator.rsi
-    state: icon
-  discipline: CivilianServices
-  tier: 2
-  cost: 10000
-  recipeUnlocks:
-  - CanilunztTranslator
-  - BubblishTranslator
-  - NekomimeticTranslator
-  - DraconicTranslator
-  - SolCommonTranslator
-  - RootSpeakTranslator
-  - BasicGalaticCommonTranslatorImplanter
-  - MofficTranslator
-
-- type: technology
-  id: AdvancedTranslation
-  name: research-technology-advanced-translation
-  icon:
-    sprite: Objects/Devices/translator.rsi
-    state: icon
-  discipline: CivilianServices
-  tier: 3
-  cost: 15000
-  recipeUnlocks:
-  - XenoTranslator
-  - AdvancedGalaticCommonTranslatorImplanter
-  - BubblishTranslatorImplanter
-  - NekomimeticTranslatorImplanter
-  - DraconicTranslatorImplanter
-  - CanilunztTranslatorImplanter
-  - SolCommonTranslatorImplanter
-  - RootSpeakTranslatorImplanter
-  - AnimalTranslator
-  - MofficTranslatorImplanter
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png
index 78f7cd2453efbbe1b9cd75a835227c0d872a0a16..81512185135281cfe088087f850d732431838ab5 100644
GIT binary patch
delta 397
zcmV;80doHC1e*hp7=Hu<00013M{Ml?0004VQb$4o*~u(_00009a7bBm000XU000XU
z0RWnu7ytkO6;Mo6MF0Q*C?_jTOiwm7IAda7E-f(|8XS3l=hFZH00(qZPE!E?|NsC0
z|D}JX`v3p|3`s;mRCt{2l)-L<AP|O!m~a*_dzU49E{@rIS%1<8Xwti`hWCGjvbXs)
zv1xj&|82%^KE!}TXZ{lFeJg9_s4=p(Imw#3o?{Rr-McYaDy;qbw4z}L?*|E}F@$)u
zgqn?+WgW`e0}w)x4ds}@psS(C+UIlwpc-UDn=)Sx4fQ1v=yH|~{q$ZA)Q#r^pLXUr
z0pR=<09{Z(ihm;=r%XQpXU_a4?rqy?@C+K$;&Wy2@{T!zqgnDpj$DWzFi}P(dEKXa
z?yUrRZb>5$f&^090n8HMo#DAP+%`a2&~PsR)T_U43<SHVutP(9X#rT11i}Xbs-*>i
r`>O}hgRHI-ZKL3qQraEx&+`q(U?z<<az8`>0000<MFvhpu0mjf{Y9ny

delta 589
zcmV-T0<!&^1MUQn7*YrW0001;w}I>c0004VQb$4nuFf3k00004XF*Lt006O%3;baP
z0000FP)t-sAs`|d7#c4wF+xE^00014tKnM!000GaQchF<|Ns90`?d~KkuDd10oO@H
zK~z{r?N-~C#2^S$+yDROO^}%af}OLoPkWk&Rt$~tQnj65;t_ZR2rJNLpsy8u$ZK?Y
zDNJ%}gAty&LhE3F(Jg<K+rdwnfRff(w4=9!Xx;MfVmqJ=mI)(KAm62d?)Xb!41788
z>MUyQg-O7`Ow(E;0Ch-<0E=3Gdx4cN0n1-fy)%gxSzJMW5T18l)qzGUL_f@tjpz+<
zvt+?Opb5`=fr(lm;cWm)TB!Qar-C10uf{%<2H1i?qY0la0$NVM`HKmmxu_qo8VF-R
zverm>E5HGS%`yMl6>!f*<QIYsuuAd7dY$0{>cc^E4TLVRg<Tg`-U`fr0S*=oQa(6%
zKQp9!)!N5+1Req6zX|Mj#0mV2{u_N0ICYO334D&z(WV#yZ1}hw@Q$Dr3qX-~CxaE>
zb|{yKLP02=pLR!Z4vv9a2oEQ%2@t9ysd9krRBji00VI_I*sVCo)gTBZIfZ~cc!}6J
znBCtA$N?+y0=7RJF9f7;EFL9ZAnsWxy7215)<HDj1Oym^+Cg%GS_L+XIpbD=s(m6M
zi|&4oKX<^Tti=Re%36HE3xLKir$GY#sNojpBUrraLgW_*m?{kta2jtM+z;Z`!7uQo
bz<K@vf$uoKMFslg00000NkvXXu0mjft55n<

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png
index b1405b8b062bf244f9cd2dfa3154eb5b6e0616e4..2c2e17abe253a74a2214ce5188b2396369cb889a 100644
GIT binary patch
delta 216
zcmaFE_=RzTN<Cw7kh>G(&67Iy3=9mM1s;*b3=G`DAk4@xYmNj^P&&XT#1%*@E2){8
zT7(1#I61ob`uOYV8tUsAN{CB7y?XB)NN-7yUogXeC@^Q5eFZ2O>*?YcQZXkvK_aRl
zu%ppaAkyJRpy$O%22TeU6Wvgj$iRk;H*W3}INIapc+gFRF+DxqJ%y2PK^LD0;{q=J
zKUyuly{Z9ow32d^8k7{?J?hgs5YhKYPvJ#If<z1h1Itccu0@mc4g+ms@O1TaS?83{
F1OSw4NBaN(

delta 208
zcmV;>05AXa0qg;gB!3T3OjJd{z`!9OA}=m685kNuK}1D=0x<vp00DGTPE!Ct=GbNc
z004_gL_t(2k<F0N5yLPDLvft}D(nGDx_~JipuT4RnQH&U&<Vny-U%Io=-QKjdjM=E
zUW1DYmfl2;gZXoUDgrR~mGG^-_V-Fryo8@9C&)TMY2*mtHA&HQghQvppPFop2U+($
zW)wg}IRh+!41|qg`7;b@-g1+c`QgAein@2qm6pRw8qGCax<Y?Z$qwP+W>BL50000<
KMNUMnLSTZ)D_7_M

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
index 9ae7fc3f93..3f816376c7 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
+    "copyright": "Taken/modified by Taral from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
index 45ba5b9a32f108cb8abc0924565b771e5374220b..fdbed82bd34d13c306f3465bcdd2e638a190db1b 100644
GIT binary patch
delta 1556
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
GLSTYy#r;J9

delta 634
zcmV-=0)_pW42T7g8Gi!+005o0f$RVP00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000kAOjJc7AR-wU8ZRy}LP10T003F5;adOz00neXPE-H?|Nj8{whmJO000SaNLh0L
z01m?d01m?e$8V@)0005;Nkl<ZSV!%a;c|o^41@uF|7Y%QvVRIeqMiEZrgLAl2W(gZ
z9C~Gc$=BfD85FPR<4Uci@T#gCLvX2$wbJU^ft_1xG*Jub<+4>=wQdEM+D0I@wryK$
zK|hPNp?5(5Qrud|(x6V60i!+`AVDNhE2gkCK<bzQ<`DF5z`1Dz6xG`C1vG+w7@!q1
z&<H3GvououD1RVz+XnnWWG&*l5*YQv0KN!t5Kx-h4^llE*goGFEc8AF-kzcr)qWt|
zmtfS-#UP$zXbP<KP{Vfs-?Mq}j-@#1QwF}s8Qe<TsyR~z*AYe_^HR+j4Jsp`-^~H2
zEJg$Ng`UoVeR&0oU|?s&p9(8*%$Q|7Y0-c=;J@lK-hcIt0T+1QhG1Y47SgL1d;zCr
z%z}T-*WhbFKFa`4lk^;%%t5n3dK3i$QiEbIcYD36Wx_SyV=sLI{W`z^;k<TC@*uT<
z(aYakHjJ7AuK3$YP2g%U1$0cfGvFheZ-xg0LrowU*c=hJ-b`04C^JBS53pQCNwB#y
zz^@cOn{$^~U*?e+aCq)j(w`B~n8ez^--*<%w!lUJ;|Ny+WN5Vohn5*o;40?^(9j|1
z(E$3RL0Eywz;^1vK+A9v4Zs`_ScuUeAG~w-E6t~%@{*@1AcH4^PtV{FyfoPN9}aXj
U)vm(W;Q#;t07*qoM6N<$f~3+EW&i*H

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
index fde6c90e2ca57d106b00eb220ca18de671a779c3..bb2e517bde2189b79082556ac73bb37be78733d3 100644
GIT binary patch
delta 278
zcmV+x0qOqd0i^<v7=H)@0000)q>9D>001^nOjJbx001^NHcCoL78VvNDk?xgKsY!!
zA|fJ1MMW|)G9e)$8X6iVCMFjb7cDI<LqkJ5J3CHJPDK|;VgLXD0d!JMQvg8b*k%9#
z0G&xhK~y-6-H_1^!ypJn6%cHhw)_8|-8E@nD$SDZt(eF~PJgaSN)L;iuj0}tVnG%r
ziiliF7Bx1NA!mSdW;3m7He>)SE4#n2oYy4)5;v}@i)w`mU&-PE2kdblz~OKU_~GCY
zU_@qzgN<SW3g&eFf~W*Q!H@)V5acog$;Of63w{=1xO;D@^=-c+_V*W{qn|+ZpB?_c
c;-T>YXqX08ZVw|N-T(jq07*qoM6N<$f`<rYSpWb4

delta 215
zcmV;|04V>Z0_Opc7=Hu<0001iRA<Kk000kAOjJd{z`!pqF(Du#85kNuK}5OVk1+rM
z00DGTPE!Ct=GbNc004$bL_t(2k<HH04Z<)C1kgYhAT9$WJ_bm9od9+JnFvT2S3>;s
zhy2}>?OaO#^-8(y@(FA)p9eWCz-`QlwR+B1+qV0<d_brQ3s9i18*l)gD}*1RSt(-d
zZxDsZqUznGgJd-aR<wc&Uzs$&4RLlSWAiT)vs11ST2EsS$n7_1Pqu?Y?*URH5xMal
R%-sM0002ovPDHLkV1g#FR5btq

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
index afdd4120b5..30607d47ea 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
+  "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb",
   "size": {
     "x": 32,
     "y": 32
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
index 0063e8cda0675fb529c930e37cd2a780fc8cd565..427c203b198f8124ab283106ea28c080a1f0a726 100644
GIT binary patch
delta 328
zcmV-O0k{601J?qO7=Hu<00013M{Ml?001gbOjJbx000;l86zSlDJdyBIX*l(KS4l1
zLqbMHMMYCmR#jD1S5{hCSy^swZg}atJpcdz0d!JMQvg8b*k%9#0NY7KK~zY`?bAI9
z!axuO;D;lm_XK)_g;9$I!B$%l4-iO^Dv&}XWsb7l66+MXL4Q~)TfK{=Gw}xmv5>s(
z4If(!J3yarW@v!vn~rr1N|*P(%9#(MgB-}oUNlWEU!Wr|6xcVl2G#YVz^<t`8iep6
zDE1oo&?>OynFgu%u^ceSs7=k2L=K3{k`*B4{y+8kv*_CeV9)BC6UeGVA!i^5W1tIw
zK?j^ASUiBpo<StIxU2)n1_^>Q3Ycer6o_mkLF+OFCcxZF;A3E<_5e;KNEk5PWxgzZ
aev=zDtvcEW$;fR00000<MNUMnLSTX&ZGfu)

delta 399
zcmcc4G?#gTL_G&H0|Ud{?Tv4M6k~CayA#8@b22Z19F}xPUq=Rpjs4tz5?O(K{s5m4
zS5XlWMFk~&Jwqo)7ogZjyDzta6l+P4U+{k*VEDa_FBmAmS>O>_%)r2R7=#&*=dVZs
z8qVhF;usR){&w0~K4wLZ7RPUY=kMgHzrnldpGjs_#-Z{E)dv<|0+zh?_FBMlK*6Eo
zjd43?LI0e9v%N0j3(cnOQ50i4^s#G4{xrorIXi_+2exkK11d@<lUin#U1(E&Y3?w&
z`Jmt?F*BwdvFUtUEK6VX-aB&O(~1{`Zme&bdK)5RxW9-^W4bKO<jxKzGy;Fs9jjN_
zul>J6NP{teNtMA%f%Ap@|Ef)8TT*N;hbL@)zu-Wn#WCA+%U;gEsNPifSaso@?YlqL
zsmm|txqkKM_BW5twRY(={M^2!VUB7!lRCRQW3BQVnIGIQ-TC(Hy_}zrZF4pJ!SA!&
o59e0N{b~YQ^5Hwv^{-3|(`{D8KYFbO3@8Q;Pgg&ebxsLQ019rRi~s-t

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
index a92566d30878578d94b05820d81a8d90151f425d..e70741f1ff9e9d7153845eb7c8e05692c367083c 100644
GIT binary patch
delta 224
zcmX@e_=j<VO1(;ePlzi681VD+i;0QJ$;ml7IJmmH1_lO(hK5E)M&{+^)zsA7NR{~r
zRK{2m<QL4~@a#q!kkjVr;uxZFJ~=_cVM8@DGxPU6mif_JS{e`97BI&&EKTNQZVqo}
zc2d}K;;5^wh~j~Wi%XYmS>()+*x_<~Rj6z)&xuGThXyT!;%7W6jK_LrI$Y>7XqHrJ
zNYUNJpzWf-;K_X=Ktxv|dm^ioBa??;dO<gXmWN}Jgm+d(#th~nj-3n#9gYbwGfaAJ
V@N%)$o^2p+c)I$ztaD0e0supQN-qEa

delta 165
zcmV;W09yb20l@)~B!3T3OjJd{z`!pqF(Du#6%-UgK}72^)p!5^00DGTPE!Ct=GbNc
z003Y~L_t(2k=2jE5r7~N0}(0+HozSgfOj^4(tl0*Gk$z)o;#b&B!n+#$`+!5K;O!;
z_8Uah{g6x@shFh@h~{RzngGlUWQ@_dVwaH{8>%X=h6_*`Bpy@s#~XKV;b%Dk5f};t
TA?!hr00000NkvXXu0mjfnGHSE

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
index afdd4120b5..e482264df5 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png
index 59d6ea3b487304fc77f4cf2eafd6190208d4dec4..fb4087b662b9e233ad0108c8419361b5871021a9 100644
GIT binary patch
delta 372
zcmaFDyoPy#W4&~MPl&6&o}rVYi=u*3NN_+}YNCX=q_UElxtRq61A~^0$ORz9SrX(I
z{2vM!g8eImK!ODxk;M!Qe1}1p@p%4<6b1%HR!<klkO=p;)9&&eR^V{EShn{4|0BO0
zvJ)1)tjn8LaLH8YLr6Ju$UYSo#e_QT`V|N7%)IjZP>6cp39*bI#YIya5+2;=Su{mR
zL`pbyN$@FMDMz^*d&E-SJWEe=kPELkDSdF8^M-tG#?1mB)F;g6+BE0Dv-^7v{bE_6
zP#0y=q*AeEMG}jJN=7!ndOoYXK$C!hA_t>zQ#^NH^SNzviY^syS-OCAQ(Q@TKzn;)
zaBA-4?^$*)PDW|1cx6@jp+|w6{mZdi)2~ce)b%v$Qi5v9i@D){xtkl(SvX~XeR#mV
z<n^f@g@w-Yav{xfEZf&T;MO}_<FKPBYrkNKm~hkdS#sa?fYyEf-V`+N;=?Ki21Sp(
Qz;I&lboFyt=akR{05HLs6951J

delta 429
zcmV;e0aE^~1LOmcL4OrcOjJcLE-^wuK_en2LP11SQ&1Qe82|tP@FPV200007bW%=J
z|NsC0|Nj6QO9Ms#000SaNLh0L01m<c01m<d6(~x80003+Nkl<ZSV!%a+YZ7o2!<Jy
zz5gT2DG_>7<AsUow>Zm6f1oo`xWD8G908>YsI`;45b=s}P=DNk@J3oITnGT2Lh(kV
zMu=gJ080j30~CuT004(I!j?guuO&3epsh<lAR?$4W^d8}5`x0+na*bc(D-t#Qh+G2
zW*y&(l{ggngkulNd=}7mpx5d($WpdX*hWcbw#yl-VfPwUz6($R`5n~tRX|MW9=zmJ
z|A8ZL1e7Ci1b>u&6OhgqqYa%?7Ld*^-E)@|$a48>&kEUF$H3f{X;5R<=G-p|n%%8|
z+Gs#$yzRKFk$f#M+Zn;^0d1Uq{74Q-z_h(RnmzFBoXKGjkS*9{;Jtk=U{mj9U^k~1
zz*l?Vd75qH5?oxuq=y-uai4h!UYVW*&6=RcME%YsP9}n_j|j7wrSrQSfg_;&THwAP
Xj1pUE|AAcn00000NkvXXu0mjf14_G%

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png
index 23bb26f648e97e4678527d50e7f2b4320711dab2..f2b15dd82f3963c97d0c61ca6c2b1c257f997f75 100644
GIT binary patch
delta 261
zcmX@iIF)IFL_G&H0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rP=HT}
ztAx0uzMi3zqf1(9Vn}cRP}tyDaWIf#D+%%o{tp5SoA)o-4;0}n@Q5sCVBk9p!i>lB
zSEK+1t2|vCLoEE?P6*^Xs=&cg&RF-p{^@ou`AasJxJwop&gSblTJ=zPQagi<c9hx~
zo;6eMFv*%6nthQaG&nY`kx|KlYnFn*tVN$5a!DO{^Cm2G`2~hm*S-gGl$RFtd*0Cf
z!nSRGDfjQLz00(>9o(!fU*(~tYWo*xpm^e1`L*wa96$4YzXx;%gQu&X%Q~loCIF))
BUr7J}

delta 179
zcmbQrbeM61L_G^L0|P^2NcwRgB^2Nj;(Fk~0c9mMeLcgF-~cB_7YT96%$=R)Kv~9;
zAirP+hi5m^fSh<w7sn8diOC5PPaFaQ7+Tk_Sh8eA!;y3&!5|?+C$Rz^5uOq!F#%IU
zLs2K81RfC)5gr$z1W`jnLqSzfSA_^y1}6v6HBO8={ap$htS7KU_%cg4`A)PI=Mv#b
cknmw(D3s-W=;u@R3TPLDr>mdKI;Vst09n8=KmY&$

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
index afdd4120b5..e0d437b8ec 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Interface/language.png b/Resources/Textures/Interface/language.png
deleted file mode 100644
index 2b39424d12d3d75421a5f48ab87ec0c4f852129f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 739
zcmV<90v!E`P)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0004mX+uL$Nkc;*
zP;zf(X>4Tx04UFukv&MmP!xqvQ>9WWf_4yb$WWc^q9TqZ6^me@v=v%)FnQ@8G-*gu
zTpR`0f`dPcRR<SmT^(EnLGTB})x}BCMM}IcDYOU`d~kUm=e={d?><0iR+(n?#Q;sW
z&2&N%bNN*<@QM(ERKpNuW*N!MVirBu*FAiEzl-uL{BI4a1&aYbkvPT-(<a^^p4+qy
z&ilk+R+d%bbK)tJ8YF(?y5jL0=aS0;&kUQ{beuR$ES9=h>0(wkHR4&~h^pz7FXTK{
zId5^+s&&@xlfN)j&{r~Cry55BOGqLG5en+4pb8sN+I3Par0HDh;U9DTDRL>~s(_JW
z0X1llT|f9A{GP2<oSF8LLK4vb;y51@KwuYWH5}*r*l}7Xfd3h|(mVcI6PW)bz0uJk
zN5IfFaB<zyls({b2N-=aWK(t}Kb24{0`F(^O?hDC76`6+b8DaD^a04ytd?(pgF|4l
zMA_>--aXJgw?FT=^MmvQjVW@mx*a<o0000LP)t-s`T6<b;o(?VSWHYzK0ZFd!NC9k
z0MrA|Y5)KL2Xs<SQ~&?}|Ns908cPF400009a7bBm001r`001r`0jlENk^lez(Md!>
zR9HvtliLo2APhtW#Q*<fGYsXjE9oY-`@~5g6=qI+(Bpc^7Hk370uRBVP-6{S0Rlnc
zQ(`I5%fhIz6Z~EWU123)J;ridi31^|0?)CF!b%_)<6<1hbe^2~%%-KFzhp{`Vn>Z7
zxueKOz!l>drAkVi37b}eoEaHck8<KUc91ihRst$!5EklDL+X}-C&h|hw-rF4OOUDY
zf~^1`(5bBgPim}TFPQ0y?<(;Y@Hbo6|0P)0{RLXxU-0zl%y<iQwqOgu7Q7Z**A23)
VO4+l@GsFM@002ovPDHLkV1h80LdXCB

diff --git a/Resources/Textures/Objects/Devices/translator.rsi/icon.png b/Resources/Textures/Objects/Devices/translator.rsi/icon.png
deleted file mode 100644
index 6871c808ccdd49673996f8b8f4404ef118734c85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij?1AIbU_4M@Q<>hT`Y<zrt3=9lHLPCHt$zG>711a{BAiv=MV89^d&Flsg
z;w<opEM{QfI}E~%$MaXD00qlET^vI!{LfCh$k(92;i|9j@4vdbr}VTla#^Kub1L>6
zQhU|Z-a6Cv%8BbI{<kpSmkv~z#>bv4!1BA+Lo2}0W538WU#pihLZ&zz@(>PT+|s@$
z;f&CupQ;C=PPAHcUOTL%$X6+}V=}kyeUH}1?myQVa~Q{oXWeD^{6ysAU#rzwKqoMG
My85}Sb4q9e0CGNE+5i9m

diff --git a/Resources/Textures/Objects/Devices/translator.rsi/meta.json b/Resources/Textures/Objects/Devices/translator.rsi/meta.json
deleted file mode 100644
index 0202c0c39c..0000000000
--- a/Resources/Textures/Objects/Devices/translator.rsi/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "version": 2,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "baystation12",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "translator"
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Devices/translator.rsi/translator.png b/Resources/Textures/Objects/Devices/translator.rsi/translator.png
deleted file mode 100644
index 6c54a0b86366cef370ee7e2575979bc054a826dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V7#Y`V@QPi+bb724=C`kT-dCARMX0%{FPtn
zM7@b>Ggy`WPQ1h1>1a^Uq@bh}Rp#`xG0tlB_rgh+7A^Z3Ffrqd#I~w``;=d`)m1S?
uB}Iz&N5B8Xx#z0zhx6*&T(($0U_Q1^;pBD8!#jaiF?hQAxvX<aXaWE!Cr2&-

diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png
index b84389a06bd18e2ef60cf5e4bc94fde649b421bf..7c99615ffec1d6df58698e5dcf25e1fe7e9e4ad1 100644
GIT binary patch
delta 414
zcmV;P0b%~H0<8m(8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00Cb~L_t(|
zob8suYJ)Hs$G>QIDfH;*!6JzFb@Y%HpJOKr(s$T16b5^Vflsj)C?1O23kZU+GH)x4
z!Khij&_JOZG&U+_{voJ|`1_d{lOAIX+DxxidMD5c=n&X$2!9(48Nu_SD8!VqEQ>TI
zfN+%fGT$LhQ=pWd4A&wM$1xii0He`0hchMkSpvTAi|)?z9G1%nwxtJ<#iCB77b*!L
z9Kl(Z3D7+uEaAsT)<6#&!V!#hL(_yC!vJ}$BBCsSa16pEcwCmyrxeDk6+G?RPL)s+
zkmD}j9^o>d9Dm-Q%^>8*2Zd*zJqz&dWv(U@04|`C%l{MpF9A6NS`)BsTf0Q1A#far
z-ThMky<RsXpfi{C4b+j!0=H2Fuvq-vR<}Shp9|3Q{@U|Aa9vmIijwIRf*`0@0P_}x
zAQz+$US4>4Jy;vG3&;(K46cZq-R|hVTK5B0LA40zNEavY1L(hp8>j(KiU0rr07*qo
IM6N<$f@^xR4*&oF

delta 287
zcmV+)0pR|v1Fr&*8Gi!+002a!ipBr{06b7kR7L9a{d;?R<>lqJwzgSWSvEI1QB+ko
zH#Z?6CQktzj0Ga;bac7}1*HH0**G}nO-+f1hlPohyTQri=jy`bCkFrk00DGTPE!Ct
z=GbNc005y$L_t(IjkVIz4#OY_1yHCWV%4qs|NlDL?QLR{Hh<;yo?J*2;Gsc0iI*AB
zcyazDp5&95h`>9$ok9qV4iU$K0>#Ma{o;7IgF*ygX75mY2IK%DNsXxZzhnop=3Gjt
zqKZd1NM6@kYZ2p01ut#L*8#;T*eh-WdK!fH2>{rBU^78GKr?}~)_ZTwTp{@Y_6_s5
l_=^2M*tv?7(ikkiG9QYM3CE9d_ALMa002ovPDHLkV1i3Yeu@A9

diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png
index 0cf52827fca440fc3ec9a0d956ea5e53e86f2176..7909d14f269cea522d6e0b9033e83d81451f94ca 100644
GIT binary patch
delta 405
zcmV;G0c!rc0;B_w8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00CA>L_t(|
zob8rDYQjJihF{cf+y`8T>}zo`N{$jCc!!=LQ0OHJo+1~JEF^k?Kp<ctyDr>_PUj6i
z5!>24lZgoVVF;6feBV4~GSib%!adWwE4>wH1?m<kib8KG+kdvL#sv_brYQ&^O2car
zh~ro~jssB?f$#e)cqIYP^K`lMJclq0!F63NgYP(1xJdxv2+p!hgI+C5ChGYvWiu5Z
zID)Z1=yu_`(*f#pMA!mUdV~>pcsM{`2pBFF@Npa~D^Y0?BAl{S@cv{1fqK3%zQGo_
zEI-bk@-!L&D1QM?SOQf3I`cTcV%mC*3!MLOFtqoL3tWOt<s?uB_}}bz%jN9?Rlrqp
zbq$yV{}5;bc2$6zm-!rEHv4<bv_LYQYEX3S<9z@xCU`4K#$&vkm=(Zmg5Y!@eW|um
zZGCn&7!|<d77wJ){r=Z6;{sfe5rI0=3VZ{D`k3da?+z1*00000NkvXXu0mjfE@!D^

delta 299
zcmV+`0o4Aa1G@r{8Gi!+002a!ipBr{06b7kR7L9a{d;?R<>lqJwzgSWSvEI1H#av?
zR8=7%CQktzj0Ga;bac7}1*HH0**G}nO-+f1hlPohyTQri=jt*%SjGSV00DGTPE!Ct
z=GbNc006B?L_t(IjkVI<4#OY_1z@Ry#lNlg{oi$Hcd=xm$$y%0d%oZa(U?CCz#`se
zK;q51MLfypv2k{?9T5pE04M^z_XN&umWFSj$9*RvXF>K12>RU^<{*Yed^c%;V@f&a
z!lGyhQjDdP%;Sy?JY+)}g4S^XTE`opzn}mwC%$q8Jmth!t^m2PjM2fzEWz;xhYD&3
xRRvt@d7iaSIwW*(qoj!TAM{*A2w|50GA|%_3Obz{x$^)3002ovPDHLkV1j(`fVThu

diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json
index 2e60d4f404..990bbf9356 100644
--- a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise // Hand Sprites taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f",
+  "copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
index 2be12b48a6455bc64608c891277fed2825f3e603..039817e37b9cb3f6c43fa5d8481ab2d2a50025d2 100644
GIT binary patch
delta 372
zcmV-)0gL|G0;B_wIe%73L_t(|oMT}aU@+={Q3s4VVAKI*J7CK6)&D{CojZ3JR8&;J
zVmX<ijC64T$Z|siO*kLM28omE2$CIuZaFdliIeIGk{tjFa%2l(jyZqfI)*$=8~_5|
zp0*6np1*-x40DK-qzJ>r$uxGr_3Kv{wr)QRb_B!$3}A~v0DmM-Dj+)-z$^m=`PS{I
z4y36ADoU&wI(jxR`1%H5$Zg)d0W80B+fv#&00g#gZDa8Cu7dMnzV7diXL$LN#%bW#
zu`3Mrj^1F)?u4f?sH~g?r(yCmbwG8^G*BM@9~g)k1?$&ufXUO&0U+@Dy)4+W<JUej
zSR&CNaZ&+U4s8I(xuy<-$J7~MzQ<HYaBd(q2axRmU@8X&bM$|73nAikZ~zFzs;p*+
zne+>8;gUSI|2xSrhinJfcuO)cOnQiuPjd$-xIbjX$EUdis0BtHFzSE-cK`s<gpdWZ
SA;~%b0000<MNUMnLSTX`Q=&Hj

delta 297
zcmV+^0oMMc1K9$QIe!aDL_t(|oMT}aU@+={Q3s4VVAKJl4j6R+Q4a9*4ET>ve*5+f
zj5KqAp1#Tdz=%i&c{xdjgM0VkQubf{_Y($tPbr4yw|+86s<AWFFM7ss>EaoJ4#VpJ
zkmWwUK4A94N6#7Tot?0%Q&81pSifR9!@7wV7z6}G7#L14Fn@e_|Av7WKyn%YIRqC7
zQWF7(0th_6B@7G+z5j$lf+z<(xP2Y$OMLQApFLr?3iS29*9h?s+X;sP(IEh`1ewML
zU?G4=2Mh$$0bU0{HG|UuC<Jg>zGd?kaGbAu&wvPl6AY9mLS#n(ts$fa3?4mtz(5Kh
vDhi143Atcslp=(q4j6U7r~^hFKuZ7sUu$URzcXAb00000NkvXXu0mjf%t3Z?

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png
index 0ee37e653daa6931fa8331226de24fee077d6607..1871b477b638f959833e77345b5d89dbd339b170 100644
GIT binary patch
delta 918
zcmV;H18Mx#1)m3y7k@wq1^@s6<uq~*000AKNkl<Zc%1E=Pe@cz6vn@CUbUE9<tSdH
zMI^K_5JU)CiHuliOBZf*%3RbU0;8aTq(!9$5*W1bPYb~otz79sXj?%rL~X)c#FP_S
zIx~0FMsEw}*=)P#`OduY{6J>)-goag_de%+_nZL)K@bE%5Pt+AcqnBe++zqbRg{a1
z!9T;9grF|~>jb#L2T%{DB$UGfpkkE(rA#DUH<-nK@D~8or|Sl@eg>js3`xJW4`_`U
zrHnyq%-G%{WP70-fN<tGcB^+#yZYi}DizAv-p__mOP2|!f!$ibyq~w83yId4!P`Y1
zZKX`aX})eaAAbR%mM-hn=Lv+>4-j_1%*>1dfd0pm7`=7{`FtLUM8da~;Oh51nZVf9
z9yWdI{H+H3^y3c$0O|Z60KnJGHUMCCtAIC`&K-IXDoNjNu&psOcRP-r`TLl-a0^;%
z<Z?L-Kc57CemneCSk%{AAN+CXdoh3Ouc19lqrmJJ+<#blXnPAX{qZ=Pwpa7FPQa_S
zA)xmxCfX9D0Z^EpngRga*=YA&+pGE8B_Q()TI+-DH$FZDtu>I(kOuR=`dVw;+~|aw
zZpQHDMc?(km_Nyia2XhQ;KgmM7&-PDss0Zbau(UfK$*W|b=Bv0p_P?RqqWB7W&t}p
zzmd!3fPd_UKVJh&^tIOL)6cNNq|Y*c7o|+ZIo-wkA{K4reG!W`kn~ArT-xc*hPSGb
zcDh--m{7FQgtu$>li)WcD?g@`F-n=3-#bAm6LF&LMk!;8pZ@Q{Xv4l4N7w}<GY<dk
z=<fiQ{WjxD#^AelS)i1OC}o=DK!%Yc9{@oR1b;yg1VIo4K@bE%I4T6)3?v`Qmw^?1
z^vcs+I0H}){Rv(`ZqP_IbR^+(09@_0ntMqA3&qdCCczq|Or+SPz_J6BGEFDW-!<H)
zaui69Aom=W<2<&gxx5=*2LgO1OzschuFsD@n#IUKhwu7cA^ic&kop5Ep+27*(*J-;
zsDIDrhLnIxsL$ty)E`g@_4(Y8t%#u4=W|2u4;XtnhrY|7*y{7w*Q>C%m*%O@FAIqE
z@f1obqyzaD40vP4u{ffx9~2JN0s;1cy!f>gfXj?4^d?U^vsf$i2G)!tJu^A$^UI+>
sp)BA&kO{IAS`kR_1wjx5L9pU4$ev$+sSgitw*UYD07*qoM6N<$f)NM21poj5

literal 725
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F5M?jcysy3fA0|QgL
zr;B4q#hkZu?X!goW!m>QWjik93kwuy7iazGD-ygRx;rRlt_(|fp{@l-)9NW=R$Obp
zxN5Yfy?hYVl@?g=g1cj9(w4R_pLW~tZGSc|Jwqer*Ux*lmQ|K@^PePfbTK7}Ff3+}
zU_GG0;Kpdc)ey+g0}+~$!ua`f|F4y|-@U2XBVcO0_NOP)rVmG#KGks8f3Df!?9ZJ{
z@9tG!*l$*DyYKrxQBM1NcG6bWZ{F2v)+*eZFkkz@*HbZnX2kY2um4^6`PkJbj8@!p
zca;A2i}|@zuv>qTN$!dBq93x>n*T`ty>ahWS=STW-s`yRx&6vj^wtFXk32vAyuSbb
zb+&v`+OvNvZ_CTRJvMpj^8dE`UuhSZ)W3W>`^T3$=F{iD{eQUmcyhYNWT1UNZ@+tx
zZmt(QuXj<(;dSn&U`KrT@Zg91iG+sz(-USs6=^%a_Rx+$XRmIV{w4Bh`tSWat$s=@
zc_v<^T=waU(u`w&R2b{^mQK3g5wi13c68k*$$;;EqN!1z_lmP%4I(U|1{3<m{GjGH
zW5K?^3>Nq680O^LGn~`E%P+CrZQshTKb_suGpy=M*nTrUH`rfdpKwX)=jNFC_A2>p
zYM(x*ZICbU`}CImz)z4F?^zF`M-0pgq_{#6`pY2ko6+DKbHW?;12^~^RzCgB+?M^M
z^XpIb^b>ZGd(Zt*+aS*neEK_kPqgy=E5H6+PFtb8pA({Zqdddoy$UGCK~uy1wAg+R
U#Ul5ez;w#s>FVdQ&MBb@0PF}o;Q#;t

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
index 7533331b835f14da64cc2356e30d496d6f8282ab..819275417bab0d14b6904c6877cf9435fb74a812 100644
GIT binary patch
delta 378
zcmV-=0fqjq1F8d%Ie%P9L_t(|oMT}aU@+={Q3s4VVAKJ_!vRyKul|oqE+;dTk){p+
zS?=v=%P?{Bd<;1i6%~T|Npiscebc}`J?zr}<_q;sWiT|*1hcPSze0NlfPlET3WI?X
z7nuEsfpS350Y{Ht`G5Yxb%r~4?%-87V_GkU*w*cbDR%(Oa(_?|`+Hk6XlSW3{8dv1
z%Yi~bN>T)D5l9Vkkb|OzkfVum0CFm}v*HJ*fzP+@g86q8?*J`l09zCq;>)ml&1SG8
zK$e5p*wO{b4gi4%JLUf$+4`K}A;|K)F0dHyq%vR_e}t<6g%k)NTfTGKQoLD^Xa^{`
zKLi`(!?g0hu5%VI*mAH#+|$AGAYUVg0<o48?EqK^teC=pupAALV>!_dfQ3M7OZfj@
zms+rxWm7oA^<!7y@w|ES1~5&E<wQFG2C8eO!42P1GmU{7V0ctUqYfB#z^DU89Y6^H
Y0JU(EUB$UW0RR9107*qoM6N<$g82-o@&Et;

delta 382
zcmV-^0fGLi1Fi#*Ie%bDL_t(|oMT}aU@+={Q3s4VU}!qP(=*^dy4d#Z8yIQs0GP#r
z5s}!W|C8eoq8$LT9A@#9zHSC-DH#-bBuD)x#Sug~0AzVVSrJ2Od>n&-pa@nq>sKsi
zxO(*hLrrrhNsb^p5k7tP1SJ$ed~yKE4*2l?4LlT(Ed_~#z<<xrpGa~HQ4RnZcyRAN
zhS>`jf%%}QKnKvE2S)|WF;sH^3_N`F98AL;f-L^v_H~ByXD=|23MeXwU=9LVjt)Qx
zmzab|^^y>l6aE~V$FQ9U^)xApK_Rl`#9N}&(yT7Xun=a*x=3XQfKoUJfJ!}iIZ3Q)
zw6zTwmMmI8w0D^#hd`RkKZaRAhk!~(eBjZe2h=MGFI_yt2+Z66LB4x_>nBiz6Q^2G
zA|%#wq8$JNP(%M;y$T6tbN~x>QY<IQ0ceK*N3NJaB_F94ljQ((hX82?O2N=<l8riG
c)B)540AALdmMbzdCIA2c07*qoM6N<$g0jV%_5c6?

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
index 56d1aa2a36ae95eac498200e3a046a6f19d06197..ba244f3f29787b76c4d627848f663efbcc0c7d90 100644
GIT binary patch
delta 617
zcmZqX`plx(8Q|y6%O%Cdz`(%k>ERLtq#Zz*gAGWo$}GG$QBk~}N!8QEF{EP7+gaA$
zhXW+q;ul&}92V1e)#~cFwocNeu<&D(LeSl#t{?3!eks41U!WZtT_|XM<(1GXKP}OG
z=K~983lt}9ZOpp-<w?ZD-*PXWKAH2(cix;Ox<8o|__!GgBN#dkGdakJF+AG9U>~+=
zhlF|kYwxAsq8CWatf^!?S-)gus{RB&`S8+KCq)hQi3VFAWgq@IkLApo+?&h3Gjs0V
z`%lbWON?2EacR)Xg}f8a^}8^5J1qV=FWn)1gLv-6jpyCi>ih2hT*qW)w(acm=i(A=
zfyH-DohrJzspg;1rWNPPML&q@EsNNG^<96@g4&`#n~j4xg_7q4>&d(;zx$%9K49*9
ztpk;!y=AO#i#J>;Oy16$yx>okg4k?_g$1ekEga(S>#g+nF0$IcF8jdUhZ8Di)f{?f
zSzu6_q#u3aT-15<`^iTp3RxU3wS9g%e8H(dyI6S6-@mPWEA#A(2wC0saDi)c-4C9h
z8$S1aCR@z=z2U9(3$vbwKChm|c=4sBaR2uDsr=o=YXTfLMr@I1+FyRp^#4Ogt^1eX
zH@x1w_|;T>UB~11KP3MP^V6FDpQq76hv7&fBSx?aw6ivVq#piac=_e5Z}4mBoVePC
zlzla|4a+?5&Yylx|9fGrLvulG!)=Cj{6F4*Wo)*Mkyn^}{ww2Gd!9$X8lt{G|NQgW
vHTDRT?RF05O@YMoUksYaF(=Tzr-47Z!D(qS-{MSQ>S6G7^>bP0l+XkKQFIuz

literal 1283
zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!3HG1+{xJmq&N#aB8wRq_>O=u<5X=vX$A(C
zt)4E9Ar*7p&fT9a;wW>}T|`jO)RDV>LHcYDrL4@t8>)_;s<&cgCz*tm9kf6Ah--Di
z)I&}px~gv8+@h1NNrbo@oxC6;(c*J#zFzU`zqfAQtlYl&J#*sbn~(3k+4tt$y|>@b
zz6oUE;$?7VK5&7-z=VMZ#_Z&kklr8he#_glucz-0Io7i5{&vQwA8&p{Y>E5*Y3<$9
zueR}OuBwY?>)0VyxAD)G$FJSo&%2&}zjgiB-rmx5cEyyxF4GkR<>y6q)Wz%n7uMF@
zpOqKCR?kFwBJ0~P+RDopJuUjW(ERU?Z;x)dZHd`yHaEh)P+sBDuLbVBH~wAZwTK9f
z>%4W*g5#22{I5mYRY_Hq&$3Eno=Cj0uT89e9k%GZSIU8<pHjcNNUE8X#hH8D`TybL
z-cwu`<AbgL|NW)#qBQ=O)WxaH`oH6E#o3o7Xm70ZXI4{N_WIMZOD}n3Wy2<4wLY6W
zKRtZW(~b`N>I+JG*L}t3CdSmK<f{HMoLGAEop*fptQ)V&O&#t%dAHU+D{I}?_ix`Z
zJUVxO->2ZS*S%I+9aehr-G+JDGds`q>-=QwS57jhe?Ps*@x`xL-U-1gZnO8tE!iuo
z(^PlfSm9mGpQ!7dhn?M*Fly;8e69YD`QE=9Yqie5U%m8I(dq1Z`?@9H^7dt~OE2XW
z`&(<CcJ=GbB5&!M*W78+IbYZQVh|KPn3qz?EB1EjF`=dUCE3lJ?Hr~(EB)|irnA>c
z-5EN(i-L=b)9)S)XO#Wg8X>*s_3>K?tMk8>me_Akj1-y#j3$$R!i)G-etEAfJF!x0
z#~&q~lE3@TGdvEyTfaRu@@<9S7vcD(8k;W~lkDU@n-(%AWH3lbF|@HY;AGC=XLxNa
z&u}f>j$uvyRQ?I89#rJ+3E}v?=KOkz)Q`Jj<R<!i%<kXts--k@*Oa#DQoSD|=dWLB
zaw{QCY}2t)JEcN9hwH~@TfeiG7vN9JsClvboV&_7_8FxgpS`#H%-D2J&BrY6xwiZR
zEBS*p3=#8xGHd_}C)7S;KJY8-Cqt~f{tKx}m)d<d+m5cBE%0~C@BFLmGfY3u&3aOM
z<@xMfhnLIm*6*%q@LcRB7c@VA%R)8D*p|9ee?hK2k8GaZBo>UMkCY2wOarJ-L3-`K
z{$Z??-+w>seyE*NsJczY<L|!@rP>|Rk~i4!_<Qx0@~QnBPO-O`)a_qew}<x(`;!n9
z*RTA<sCVrA_N(sa<R29MYYF+uApZFI?N`dr`3o%Top#kUG=KcO_UpvY>=twE8<D+z
zhP~nIPY)q@4u!c5HQ$0oC-1It$atbAFQB#a1bd6ms-Mg?{rBaSR$3(<`SEvQ;#7Wz
zULg0{XZ9ab`|V5EtmFe&*zDv5teEHWYcMg-=jV`JUDI&-*N;WXSJ`*0>DRX^`^nJ$
z^`oo$^q&nAPPp1Bq!dl&=a_ouDYH{^zsf;W7t}L`MA$ABW!wNN)fhZo{an^LB{Ts5
D=1N37

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
index 242f217e4afd493c1d23275a445a3abcab026f92..305087c37b634d1fe0fa8962937605c45200cb89 100644
GIT binary patch
delta 226
zcmV<803H8_1O5S!B!2;OQb$4nuFf3k0002ENkl<ZScPL?7zLwX6pVsVFbW13Fp{g$
z(WCf30|NuY{vExHFg7l*e@8D)dsy&k)YH?$Yp|HO0)wMR@qaOK1)OSLy?lVr2>cGX
zbm<aKmn;3z|Nr(A9|HpeAH&;E?{J#&<-;qy4q(D7OC)G0(OV@+92sB@0YX8~z`(%p
z<qwqpaEF0`K^MishMvm=ErtQI6QPn;?0*IZ28Mgr7Bj-wxWK(@i^;ZU6pVsVFbYP&
cD4;n20LNu6<0Yi$kpKVy07*qoM6N<$g1>)ZeE<Le

delta 364
zcmV-y0h9jz0fz&SB!3BTNLh0L01m_e01m_fl`9S#0003wNkl<Zc${Nl7+^5!fKdmG
zI$+cRqYfB#0MQOePfq#|qMto~0p?%4a*aViPy{Z2>EaninmGVuxxStbgRqz+!@fPc
z!D3R95)9jS?_<!`HURTKynpk*!c!g0zIFF4gPO81L)Ofl1b-bx&;c;ZLE!DH=L}9R
zt_;^MT?F$JqazsBZ`;G5qpt^cNXPaI3_)rl3@2{AVjvb!Ee!~Y3Nh&GXfaIKwhip-
z6OSHI#{r-?mk<+U5SI``5r6Rt;!9xAGrWKO4$QuK^%?`IfS?0FiOmQY#31nU#VZuc
zv4Lsn?*CzIVr9|-K?gi~^nh{x(iQ(f@eK-vi<hpz<&YEM)vJ*B2U!XO#H0nH(g4g6
z*yKPK!_-W8^Z-MiP+A~55rQmWpaB><CE=(8MjbHffKdm~3IG6YBX^HGd{D#y0000<
KMNUMnLSTZ^Y?zDy

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
index 04057ffa8225c83b5542b7ef2ce9266d0a5a3d9b..f7e231248e590aef16b7911e08248ceaa8661fe1 100644
GIT binary patch
literal 589
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VoK
zPZ!6KiaBp*ZS-aelsUfNDcd<nBU6P}@mX2{3$N+S>=1!1+qbaw>i%WCD6(Zs*tXWK
zA<ZH}?aoTMVjhxhyk;(f;qOn*O=p`o=e<<je*P2hE8p*Uznj1Ra&x?V$6+Q188L=O
z8yE!ISsN^L7>*R`C`_GYUMGJ#rLXn_N9fPkw+#sf3BB4=(|z>UY}3`M-m==KtLx7?
zmW}}Hzs$}SJ#rEEpRY?_C?xtb_C3Q!j?G+R@25Rca$#NdX~vCpN!7DNZJk`}!kL^F
zCjJ!cU}ZU!T(sxgwvWbauhxf3>WO8n-#cl6(*2DMQES;^&u_0;fB#w3xynkNho4^`
zp0z!E`-)TVH6HxSxpHEjO``hu???TX>#g~iV$~G$?$Yv1<F>trSXX_v=IT(9f5K|Q
z+jjr`^lpRI4mK4>l%)6<OtML9+qJh+|C8+dhN(}i1iDStyIftiZ+jXr!~Ae{?^OGZ
zJS~UMb{0uq{JZ6K&2ejmx_vjl&5qW%qw!xk<>~S7Q=VAYaa0v<{y*{jdnN@wZid1L
z2Fw6UWQ0gHTo&GG&u~Znz+Xlval!2TU&fSQ%=eBrx-7C>__{+(s&U>I_Kuo^Cl-WO
yPkg_}USXbj!PNYjpSRg70F`R3JB?va4Rf!${Fei_UkC%!2ZN`ppUXO@geCx_?EK&W

delta 403
zcmV;E0c`%w1fT;UiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPLe^N<A
zK~#90V__IzFzSF&2aGyk)B!`o0ebo-|6%M)7tb)#%>l?3J00EyVc5F;r=}wah5%D!
z4#SVFn;8yF+r;3I<p<{LF--X{EhPh%fBNhR12UUb#}O3;9NxYVM*!I%S`lcWpr{aB
z9>xaIK*#(i#UXed05SyR+h2V0e_%c+1Q>w$W_S`#JxC5CDyj&Ez=!v57`UJgfB}#X
z(b+JI-@kqbrlHY7&=GhYASb8rUnr{q%!Z`{5Y2{W`PHiz7z6}GkS!(}5S0c%mV(j&
zC<+b$`R}Gd9EIjPc#eTN0u*`_IRNA<m}MSWv%xfo|LD;JMj*zjo~j`LY4ahdJXoh=
z1Qr8Xj;;<ARW=Sza6Tv<fT9JPT9O=q?htGM<TzwslVUm14j=}=Qa>q{Q^f(G&;cek
xcmgEFa;i9h980P007}5914bP%>VN@v004BWo|uaA($W9`002ovPDHLkV1hvxnTr4b

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png
index c23c941e150eda9e282659576a6b1707a9b721bc..2bd8d3837da037939796bf6e9c74730fdc936985 100644
GIT binary patch
delta 250
zcmV<W00sZe0+s@hB!AsWL_t(|ob8ptszFf{hClAm#K6#%fe~-O+yi(8W64bNDkd_K
z*~vinmJGNrpu3fvx?NHRqBw`yGCRd^(Gl&h_FxazxBu3vwZUSsSe{HoQ&g!mWV2ZZ
z_p|Te^m{6oitX+oQ{##QGBvKWJ6+MbqK^!w;prn#6&*bz|8svU0QUPO0Qo{$<x-Cz
zl}-W>kAG?v_XW7^K&SyeO0}yFj0@#(0{{$TSpXKfqWW<)N6&}@!TFiA!rud#-!A|X
zla^Kiyy_kR7<`Y!_fMGFoMycm-alZmSS)YH1sm*JseF8qNdN!<07*qoM6N<$g7!Le
A`v3p{

delta 306
zcmbQnbe3s?N<C+RM`SSr1K$x4W}K?cC(XdX@ZZzLF{ENna-u|n!K;Qq_8zN*D~yZz
zBzEy#xNQFOzJ&VGfc-BdnS1t?eB@E~m3i<|@`HTrn^#x49lRwa?Do_%FQ0fd_x`>{
zjpG6(3@0ue=<r~xwDfFi@1J-0D6^!}!#C{P*BfiB$Xb+L|JT1q`GXZh+Rr2FrY6+g
zpTZ>Ket_XbQHguQ7s1CId-y7Tz2ThmcCO@E2W|%gE(bg2#<iEH8(A<rGaPege||ph
zfPnKihDg4KWv~AKYqaC}cFvE7{rkJatMX1i)8(<-XD5+#<Ox@kB119D35OhpDZf}*
zTqQ0%?L0flCDqxf%~reWOG9IfL5cSvgfGqb7#K`lvP5bX*GK^agTd3)&t;ucLK6V*
CDSe6n

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
index 494582986fd3e448c7b114a3a92ee75d0d323d74..c4603632dff5c79f7610e6bf724f687f2b1303e1 100644
GIT binary patch
delta 436
zcmV;l0ZabL1I`1GB!2;OQb$4nuFf3k0004qNkl<ZScUDDO-lk%6owxqlBlqPpmrjD
z{egai3$aZE1w}*<ZgmlaxT?0bQwc&s!9avG3i=J!!cCb;gkJ?gRuo|ir-h9KjdDkn
zHuEg!yyu*k`(B0%8X6k^jINs|kJl$DeGl*Ls-CB+L0)`+TYpfjo2(YqMudeve?Yp*
zW&s#97!);M^?J*Qs0ksF$Lo{sZu02$dH_B@-W7F2!y^DR8V$^Ln~;eC5d$)>wPye(
zr=}I_Pmd1(j2g#;X9^jp7E74zwzk>J7{@1oW(3t@Nyva+NCh}uZcJ87>!K+k*PSl6
z=vZ|TtgU+hIDgm=cdVBymEIdTKRszJ@NR4>YTjOIEv+c3B8bPL#ADI68oA!L2o{%?
z0XRC0bky`Eg5NBxtOCs=KT92RnaKcPaX3`Z5{{q~sbqq{_D)y5Ju#q@V8&tVpMi8T
zp^JoqLfMup6(XS^>10CaH!pk#eg;awpW~KvaB-byD=p`zkjn`#hc4d(vvc!`?*TQ7
eH8eCdWWE94#e$z+?t)eT0000<MNUMnLSTZca=gm`

delta 431
zcmV;g0Z{(V1IYuBB!3BTNLh0L01m_e01m_fl`9S#0004dNkl<Zc${Nl7+^5!fKdmG
zI$&rzKu=BiKf2hZTXz|0?f{s@mbUiTr2muS5TYFbvK(gd@iUhgq@`p~<dGcppA<(B
z<p7xF+js9{5D*l>s^-zNcMMmrUSRNabt1_TLoX42c>e|*3V%<ZJwb^Eknd^gfM?HN
zFeFAtFnm0{hhg2VH*m+m05s^q>S*Es5P0$G6@$LAFoQmu7=w|%9+;2pKym;{4mf`J
zAcMZ63d6%YH^B~&5EDaj1TygT^7_Ad+cts;k?M&M<ha1#PzLdL=NUE=p`L69tY5nt
zg)gt74rhZxWq<wQJ4Bg7mIE5owc+gNw|;`@8T)UdI3fcWRav+0Qr7{X!f3|+gAA5`
z5JfR4@p;Prh4Vp<0Hu}VM4Cx*2!I>`N_-%ID*=K4RZBvsVgIEhB{1YbiH<>51%*%b
zx&YY`AT}tKg8(e=-@5yjEXzr90FomZ7}l;vX%Fms^eCP_?EwsjPyr0R+HlkXqYj`p
Z004NKpP(c3k*oj!002ovPDHLkV1h25y*B^=

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
index 50a7fd96d5..fac7308401 100644
--- a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0 // Taken from https://github.com/ParadiseSS13/Paradise/",
+  "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, micro_mani by EmoGarbage404 (github)",
   "states": [
     {
       "name": "adv_capacitor"
@@ -27,7 +27,6 @@
           0.1,
           0.1,
           0.1,
-          0.1,
           0.1
         ]
       ]
@@ -54,13 +53,7 @@
       "name": "bluespace_matter_bin",
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
+          0.3,
           0.1,
           0.1,
           0.1
@@ -153,7 +146,15 @@
       ]
     },
     {
-      "name": "femto_mani"
+      "name": "femto_mani",
+      "delays": [
+        [
+          0.3,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
       "name": "hdd1"
@@ -183,10 +184,24 @@
       "name": "pico_mani"
     },
     {
-      "name": "quadratic_capacitor"
+      "name": "quadratic_capacitor",
+      "delays": [
+        [
+          0.3,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
-      "name": "quadultra_micro_laser"
+      "name": "quadultra_micro_laser",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
       "name": "rom1"
@@ -207,6 +222,7 @@
           0.1,
           0.1,
           0.1,
+          0.1,
           0.1
         ]
       ]
@@ -244,15 +260,7 @@
       "name": "super_matter_bin"
     },
     {
-      "name": "super_scan_module",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+      "name": "super_scan_module"
     },
     {
       "name": "treatment_disk"
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png
index 0bf4296e9b398dcd7e5f3ccc352397b37c675e64..c23eea56f8556568887e45b1c071aa5493434681 100644
GIT binary patch
delta 235
zcmaFL)Xp?PrT(0!i(^Q|oa6)v*2M`TJxz>kJx?-Don8Cu|EH(M7XOcLU(Yjp+Zwgg
zI-3qmUw{2y{m-hm|F^E*{jc4~;E#P-$-DZZvq?(fj~BE1OMn1Z|2fs`9H(RymMa`S
z00asO3f2aE4Xp>-`TN<AF)CZL?3kXhu;swFZ7IL38X6l@8WZbhiZKJh;k%i6Dbar0
znD-rvao%`mbJw3W9%URF>2H$~fIy&c(Ha?v4~u5J`BZ)U9rOSFwZG35y#1xyHmj@V
h*Hvb)(*q6OFfg>{crW&Cn3l@`1fH&bF6*2UngFhSZ=L`E

delta 330
zcmV-Q0k!^z0_6gbB!3BTNLh0L01m_e01m_fl`9S#0003ONkl<Zc${Nl7+^5!fKdmG
zI$+cRqYfa;0ebo-|FMZ*x_E|><_?gPQ}~}@A<Qu2#9Ib*8YK7V(F2kkL6ie*%@96*
z_~H%NvJdY;Gy@7PFChZLV6}%&5f>T+9RRXiOIMFULQIU|#eb_;3|hLFYMwoR!C+~k
zhc5h|7)RiB0L=2^hYy1Jfx)3*N1y{KNeQqcKr{@1^bz9-ybk#I;XRz4%OJw=1j>e4
zhHfc2fM67WECGSZ3~v|$k@)EJhc}oZgX{sa9B}E@T~P4-mse3|Fw)m!ICt?9R&@{W
z+++Z$K^KGSCqv%>$c_LRhz)%B@s~k>gP8$co*2uCasV-gJz^jq49%i=)B&Ro7<Is?
c1BR6Y0B@RsK<T2Ey8r+H07*qoM6N<$f_0RMs{jB1

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
index c63b141f11d8ad63b1579c59afcc6447d82c91f9..8dca252f688e5ea18df98922c7dc02cf353ee676 100644
GIT binary patch
delta 339
zcmV-Z0j&Op1MUKlB!2;OQb$4nuFf3k0003fNkl<ZScUDAF>1pw6o$XF^^(Oy2za&+
zU<et!WO--E<O5{)4cbfO2wt4Uw+O}riZ??-#w_s_UWZ~s>VoAG5(@ezNl5Si^?nH~
z7K_F5WF~((6vwdwq-i>7$L)M<tvAz+BBB7E=doI?n9XJY+JBC(*DHXIHSuaH?s*<T
z5O6#mX_|)ld`?jmIF7?~I;E~_7K;V0>%Lc2^<ipYumd8ZVHlF<IRH@<ak*T`vW)Zj
ze6u&pGE-f1eBW2!_q&`$M3W@xt%-=1ps>;3E8PhZ(KwE84799aw27Co;$axF-|sn{
zPQAyr>weW?OiWpGe#X&fqiq+yJMmC93d>G(ZD?Xt1jCeFEIXJu+xu1@VA;E^mQRS`
lbNg`7K2Ny0#bWu#d;u5pZ+MgdwjBTf002ovPDHLkV1lQ?p4I>W

delta 363
zcmV-x0hIpk0)_*SB!3BTNLh0L01m_e01m_fl`9S#0003vNkl<Zc${Nl7+^5!fKdmG
zI$+cRqYfCH4)FEz`j1c3=55;;Y3cwFkdl-@;Xix+0xkw}AhjGpFbX8Z#IUkKju2z~
z#-ODw3FcqB`W!Adck2P79f#Ec5AWOrV{{N09E!pRS+1fX2Y=@yvHuh62&@jcbn7l7
zdOARN5SXuH#&GAxBMkk1!R8FtpZxfL?BWT6j=<^wJvHV3u=s`rJB<J0)hoEVwL9-K
zXv%Pa*+2^!f*BB@5bUl9qW*vR{+dBvMIC3tC71?a7J?EX3>-gv5FAPj40johT|`m-
zKNyJva-57_C}e|{o<3L(n<H>K0AvX|fJFnua!ddX^8ZlZgTc9rml*H?oN0i8OaOBP
z$oHUV`SSfS*x|U$q)AB#as*n`-~@xSC?0jdr~^hFFzNt$0ssbqdC#va9D4u&002ov
JPDHLkV1i%anSlTR

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
index 0c3defdefa4fdf1061e71e468e243ede1394a20c..93b2d06f098388d6a153ab87f3bfb3836c5db4e1 100644
GIT binary patch
delta 346
zcmV-g0j2(|1BwHXIe$D!L_t(|oMT}aU@+={Q3s4VVAKJl4j|eAQ>L%}k1m#z8OlgE
z2Y`T~fhL@N{=#*J{rjf<KkU;07qi{cz~JbVMUtaPasbFuWFRiC!Vq$L3B#T6GzOKG
zvlw2!yu&~$AUOm;j)2iH0J0nzfT9Z&JusST4v>-*0b*M)`+xie1_li+b%v|KNeBfw
z!C=cl4n(H$If7^h+_`gyVe58O{=xmP!Ipl`>tf)YRK{@Z*cFD??`7fg$TZmwc(7Cc
z|B<cF8P4D_3}iVBOz5p-EGTaOk4#hK00sAlU;_$@8UCxNsDK>-qd@@VdpL;jf;$44
zrpN)vApim(%Tr+h6yzXFkJqhauxtuvAO{c~0`6W{{$Ia-1x0Scwxw_%ZmF3@8wbF^
sP9)2y35HHxFzSF&2aGyk)B&^t0LO8NgsdPP_W%F@07*qoM6N<$f-iuXKL7v#

delta 380
zcmV-?0fYXE1FQp(Ie%VBL_t(|oMT}aU@+={Q3s4VVAKJl4jB9n@bnD$kIdh`eFGyt
z^;I<uVD;zEULZ<6P6vQ2e){YQLtsQCTx|V{<qUfICjT#8JcHFxkmdHyPGGizswPbM
zKR!obbpXing0dopgM0Te$jeEB#U4I-4yJv4eHf&rWd0|M-hTu0=e|~AFf=v*`xs<-
zX+aT49xMm)Ku%F9UPs^zfeBrGU;{t~BN+s?1mrtw{Z(N8yNh99N5X=fRDjh1APc)E
z^npVFDJa1J6cP_^UuSso=@pp&;N^7`IhcMJ0I4O}0U!Xf92Ts|4#Ndtav+DJI~Jcl
zg1G?X5M%&Kh;<+XnK{3L`CGnk0meCM@WVoakneFi0Gi6d*$I@ukO9bYko+Z7^<a8R
zU-y6H5CA)H^A-kNxdx{LkQ~7Pa|jl3ta^aCfN1r29YCxBl&T;6Me(QuMjbHffKdm~
a8UO%Ewy&4@&cM3>0000<MNUMnLSTZ|KBEBu

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
index 2da4e416464424d15410f82c64ecc33403fa2200..f3d1ff54dc93bff2eaf5ba08ed42bc1f64a49508 100644
GIT binary patch
delta 325
zcmV-L0lNN_1N8!sIe#ZfL_t(|oMT}aU@+={Q3s4VVAKJl4j|eAF}3Oc(Z!ZD&t#;V
z13*AgPZiF-f9W=gqmmu<!L*}O7D<jG$pIisu{j7NE-tRZ@bcvy22ugZApo)rM#C(B
z_TVv!I#9@fq6bD(&jAXGU<|Vu#^1MT7lVeDIyeMCmOA;lfq#_1X?%_#+5sS6f-J(u
z2eA+C-^y_8*cG@qGK~)qbijk1^8b%)ea<lNJp)$5Kw_Vsy@&JnE#AiH6zlaLnWo4A
z3hocV1~|ns{FhRY1zQNCmo&`;t8t3+LeT@Wl#t~_IRH5XU>3&IrGse`7fUexiQzps
z_{jl8hk%Lm`#%3L3vV!70@G*q9*6r7$fk`0kSw6M)T77&v;w0J7<Is?14bP%;0^!)
X?;V+{P93(D00000NkvXXu0mjf+;5R9

delta 356
zcmV-q0h|8y0+a)gIe$h;L_t(|ob8pn4go<FhL1$z4Ny?26|$m0DGCu$s6~YrP^y%k
zK<6Pu6iP%SqEKj7gTf`AVa=H}>uj)Q6PHNlPbQhm&ivn;IWy~pA4>r!00p1`6o3>!
zG?q3*eYqHUz6yZmsak^9lOaE}n_#>XLMj4iEW}|t?}K;=fPY4~YZ?W(LWsU`XLffq
zG;)u|r2sO8l5yDXtwnIb$?nJ@^l<PN8P;Fyo((NyHs?ctQzc;=U)D$NB7o-QYMj^6
z6albs7*+xdfC|mEY~<Qn!vN&;6aaUQ#wfkNdH4+-pC3(Q6h=VzvpG3%obL$0&y1Zj
z?Q691R=wTq0bTTOu;4R|=>}}$ZUHO^FcXTJi=ESjThrBD5;_@60f>cY@`-$Sbq!^&
zsq3d$#@vmh-T{#dWB9>SY(acT|M53e017|>d{P%az@Cv??+F3`0000<MNUMnLSTXd
C;hj7H

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
index 0cb5de4a3fdb66a708efdc83f63e3ef5dd9d0988..11633f753de16366181a89d31aa9bfb16306b2c0 100644
GIT binary patch
delta 720
zcmV;>0x$jV0@(#2iBL{Q4GJ0x0000DNk~Le0000$0000$2nGNE0IF$m-jN{}e*%k1
zL_t(|ob8%DNE|^JhTj9Ru~4q@k3a+of-AxJ6BH{&L_`PyC4x;PO^T!ou@Xs@V0RWa
zq6mUPAx#QF5v&eYQ4ua+5jZRqL&Bv9*9hS<-^eazmlJ20S;6_9M)w=!nR(CC)qN}A
zI2-^RhXa7)Z~$-|4gij$9l-GLfAbQ3EEEbzr_*w_x%nl9gfQjT3V`Hwb+zGj@Hx$s
z2*IRZIe@7AIyAQ(f@!~U0Q4<)T^MZU;^Iea-3F%pT5o}lj&_`#ormIJBaMv>*xufO
zZA|)=1Mp|w0UzctI5-e)fW!pJ<@(4jY~fE$084A-{j~1i-me^h_kI@sf7f;3#mjIO
zr0#!ShBrEn9PHuEFT(#cD_?||UxZKlQ}HVYP}A~69#V!7-JF=yI&%B4h4j;lKp{l^
zVy^1f`WetU_8Jg}jq;#p2!DS6gl(i>9M*(iIe=g1c{H~@l`>+ZWgTND<NvMO#I#>I
zfRpSN{f;d)wRXqW^56D?e|2k^_G`Tbs{dX}8S!!DJMx`-;XDaU`n3Wm7K^B^g1iSm
z7<h&zT-|`sJPAztwF1cH_EVnMRf-B}js!62*Zym8y8jrHnafbP`nIw(Y4Zlal3zQ3
zzL9z$b6WP=Hm3aA0X!T!P2F^D8&iJ%j}RP(1Ayaj0B{@*0FJ`}f534#05}c@0LS3~
zbia`M0o)IW!~FnoKfr;0z~e`Nkd%EsPwNWL=kMCD-Vewg!GH5gmJ|ZQ=krq&^7*~h
zegOG<+hqtbzc@Ut+wTWZNr6I$ZcfY-=?7#FuR@6W#o?3d2h1<T=85(LHq7|BAE3Gc
z?gxPT0o)JZegL>1Ccymw?g!ixH~=^f2LQ)$K7fD5mlkUvD3}lc0000<MNUMnLSTaa
C+D)1O

delta 355
zcmV-p0i6EX1@8hOiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPKe*qy$
zL_t(|oMT}aU@+={Q3s4VVAKIa(*bgF3jYNJMTk;+>EanisyaYV-{gOj?^ht}E0}-a
z1UJLFTW=VSF44hIdv@1dhP?L*{~tYifYT9VM?v1A?@-ovxR`a!6_U*%$^jr>BlGJv
zb2A7Ca-*p6&V9iEixxt`PLcyafAK9XB?IRRiVA`0_pjgK)ApZOM-UYPPoF(OVe9DY
zf!SBDUcgYRt!=<S3c%|CknfQV1o{5T#Y-q^gt8jIv_qC3!#W)!22ugV<p9WH5I8Vx
z6IuGHRuF+hU|Iup9RSV0@InVUEr0+hdTxd%q425d02n~d1t3R&asawxIgr7J_iw1@
z09YuHVgbIAk7NgsY9Og#Xx4_K4j6U7r~`(T0|1q5U;y?OeiHxy002ovPDHLkV1h+S
BkZAw_

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png
index b3bbe275e154c1c11cb03da9a882b4a3b11d9dc4..cc907fa5e260d73a4fd22eb9ccd6a658a81d4ec2 100644
GIT binary patch
literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0003xNkl<Zc%1Fl
zy-EW?6o%nfv9JpZf#?+oxq_%&Qc1+Z#vcTm+=P8f%WXvj(M}PZHl2~&K)NNBXqdo|
z&Tj1Du6AdKiHqlH4zsZH4YM<c1*Mcys&e|HNiSdHGsYKcME%jEhcUiTV_OHGud%fb
zj(omKt%$-~EpM$|jNh`1PvKn4&R>(flqAWoXIYj>rV<I6FZ*i7c$&@c@puf~ZnP5+
zGJiGHnyN~41@_Vu=iFj!ttH+C2%9h30OuS(n@~(4^F{aO_#*Z5*#`jg**gHk$E#>P
zAY{I%2i)vDQ>$+PP^)ipzkMf}Ml58$xCvfwT>|j1dn*nvBUHX<1I~y0h47Qt(^89A
zX1@3Y9KM_Z(0S^J!^;Sj|L=c=<%@2&J&guTr!W}A`wRRl`AR9Jlv1kVz5vGZr4}K?
R+4led002ovPDHLkV1n%7sx<%r

literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SS4l)cRCt_YVHjXA>VQ!Pj5=V{0izC}xdZg{P5y)EOBc^D(%k_d
z%ePLJV6cw4f>RAa2f%!Q4KPLKF#KCS1%nL(O}<~jmOpy*0ITl_Isjz(hxc#5Y;A1=
z20>9FhWD@EAru_kz;Jx#90tqA22?f_<Sn{@*K)iLfLSh-)xhv$>t=?lSI;uoI5>eF
zfeaF~<QQH-#gN%BM+*pwke3EvmOEtmF&qH$zfC&}7DovIAlP>85rZXE44DlAPoF&j
zM*|4ty;t~;Ei~{(!MkY<V9P-vKrYBz^c}A}P6vQoD<`M$ALIxS00t%4_aI*(1BC+@
z;9|&Z5CDZD*=YdT5irAG2@(dl<c)z*(}2N-fk|<k40W4L{^N>&f)0Q=0=MJ?>})8=
zTcq&+=n`dMR>U6vL^*&G0J79NhT%UxH8d}ZDM|zM0HY2Vb-<_tMjZeErzoaF>8JT<
P00000NkvXXu0mjfrRSkd

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png
index a05d626eea0e41ee7c45b01db0b5756d1ce45885..b95b803d8f7eb81581855ac7bfb9cd74b846b3f2 100644
GIT binary patch
literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*00059Nkl<Zc%1Fq
zF-t;G7{>9(urJYCU!XB+l9oP!gNp^V)X-v6LgH2q61b{MU_(PR8RXO&eSrq27HcT*
zINk<BA|mRX+kN%+|AC0YJ<oeQ9FD_#Bme*a008g<J5u!B=Ok;e$exCL72bmjMg>^s
zTW3#20kfW;@qMt}Zby=ISuAR`R?}!SQn_6A9`C>AdlejYyW>?K48~tPKaby^o|LIp
z|NKWtQ@&TRJ5rSEbd<k3RAXgd&N&T-L)}y=x((P>zs+~fO<orHam;_tw}^c2L^^xW
zZm;S)M6k`REwk*n=I^}#=ed$pSW+Wb4k{o-tJ#z!9lWe3o*mcxy%u07$vHRKe)W1u
z&N+>OO8I@hb546N8(L^BtMa;*czzu7_uc^?ZEqjNF^rev`3pU6-m8?oHmf0I{#l=g
z&ZNv@zaM=*1n&|!0KdvFx>NNH^OK%G00000000000000;f?038rl3E68q9ioxV2as
zv*3^W0mir=U@Yi<KpOh<tp%L{Y3R?l7PJ6q=+CznbUz>s{rT2{|Ax+bf4;R??g!AH
h4*&oF001x(-T?GNg|&x+);0hD002ovPDHLkV1l)(+F$?x

literal 478
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vm(
zPZ!6KiaBp*8G0XfU}&BH;(}pPho7s4g-GsnrKTV0bN+Di`N{s__WLI(=n@m<5+Jgr
zSwUlM@M{Ib=~11RTD<q9RK9O^s^0tBdtcmTo_x+H9t<ZYGE7irRB&f<=woS+;bgG9
z#`JBQ^}@GzHlJS2YO!ohjW(m&o}E{n_?)H-ojP+~Bw+pe=xG0FYY7`Mu|U_lRSjXg
zh2`F?dGO>B?>zYgU5+(}=P&;GUj9JIUioj;Kg*p%f6lZ%(9++w{y;^Cjm_QrNhUvg
zu04(qnK)lFAxprX{le~jKfl&hZ<g$zEBEf$`tSYc9~(Arf0O);S1dK|Utq3j-MzVc
zEKY8}#Tb`s_}SU#L;M-5aBGE``F?j&fwn(+f9!U~5%DQA@2Y%0#`Elvux-GURiD=W
zWBXms|14q6`V;p*&kao5_qBJz>&d6QBY*A^WwR7wC{kg-=5>g~3i$--b#)GYSNH?$
u9sV+WWd<=0@V;Vq_}g%40#azr(Z6Mz^JC}EQ;xt0WAJqKb6Mw<&;$TFE6KkA

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
index 054299f6d7ab343ed10b88b8a50f00e59be60e7f..d6d1f9d555a0a98a519049b70c227aaeb774217c 100644
GIT binary patch
delta 372
zcmV-)0gL{l0;2<vIDY|ENkl<Zc%1Fju}i~17zOYzApQ>uLNYiBPDLoVs6_|C*&)u|
z#Koy9s5rT05IVSM2DcVRF^(ySE}=ukAt^#v!O<n=1@8#a3g6+S%e^JN?;!8jgv%67
zI0j$<24Dcn0Qaz&;yOy+Xx5&~XZ~s1ssw;?XK`Mx#c#~H2!A%9TwV<3Tm&0{M_w!x
zm^ga<v9ASytZuDSoW!zNKpfj4-@DWc_!zy@!|h#;kbtZh!JHfAQy|Ll$cx1QRs!%(
z+T<QJ$F8*j&RaXQe|9a`_{ZWqFbJc3e<kSY1B79p9`A2xsj*E1iez!EQKu{Km^z&<
z>wauN>)--sJZ(i;IVk_$*9Sm?mn3WJ{yt|$34r$=WLNR-5u66@2~Y++1wE^_R!_@?
zm{$To_7<MW^*&{xzdN0}0slVAfaT2@B5yc$tsP)*46VP`+5!I+12BMz1HJ(2WQo4C
S0S77o0000<MNUMnLSTZW>Z)!4

delta 243
zcmZ3?yqIZ%MLok+PZ!6KiaE)N5(x&c8UopStP-v;F6NUcWr$<n@uT&R`!i#$PY*(N
zS3hEMTV=(Nva@Tt%$$5xWwvGgww0}+f4QA!|L0*j@bt60flQ}4%e%Px_CtN8R~xKZ
zWMx<%<qESJ96A4P*Xe{e%g#KQ`k!&N-K5J5+XNacMRuzm;^E1OwomwK8_DOuCn^wd
zP2|vOx#>q!EE%3v$4oo4s3Bm(<hKkG4*aYV4iOxjWl0Qv>~C&vX%n=Sma{EkU+&n_
rG%JPufXqRMWP=^vhv05sz|O!B{Mb$VZP9#A1|aZs^>bP0l+XkKONC)E

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
index b56c920f7be3acb4ab4fe2dea88296c6e2575934..54678e59150cbdd9b369d147265e3617e8a065e7 100644
GIT binary patch
delta 349
zcmV-j0iynk1dRibIe$M%L_t(|oMT}aU@+={Q3s4VVAKJ_!vQh1>Hl%bEoq*~NOcFm
zEPVFhF@uzXEQ6Du8^e-Gb1~F`<Ol(h9I$`iG_b{U_g`dC)KdkE!RSxV-qYRzARsQT
z0wgb@SWXEb=z!YQJ^$}tx(yC)bN~{EIU=j01Vet`rd^af0DopVEQmF<)WNi(f+EAw
zP5Z#{53&fB9$*0EFl>${*#XF@_?V+1Jn?}N-M&TJ7#QLpav-)-oEO*;Aj?6H!<H^c
zb^r)G*eU=2$kyi!521XJ!F*DJSk)q1erE4+yjhTF2Pn8d1RK=a!T=6|?&?^E($>Xr
zAA<mhZSChol2+wJI{-ZdV2)^>zXi@G$8w?_fE)tHj$MI^gDiu^^NnMdz%(hA6YT&P
vsIHktlHpW$04>0%14bP%>VQ!P47dXTHfNF$WMu~G00000NkvXXu0mjfx<Q*K

delta 476
zcmV<20VDp61B(QZIe)!LL_t(|oMT}aU@+={Q3s4VU}!nOH9z4$jQ#)q7p!XbY+A!e
z69<4SSJo7Q^Y7wN=i(RgpA<(B<p5;Mx3#Tf5D*l>s!rTNhk;R%ha^Xk6a~nZOH0Y1
z$US}bgyH7;0}Sec4x|`Kej)@}i0%k-0Lc#c@cs>$289I35r1@ZfR&6G14C61I2w>0
zf($^x4@xU{aO4n*8~_7eKt~V)FCV|4z5|Xuc?Agt0$}m(8w{iXf)3C%wE2(B2RQ^8
z+`aw|t3Ek7h5wHpJs_AB2|B<!-3-N&qccxosQLI7k{FS*pqhaR1JD74j3+M}2C%<H
z6_Da&SorKaIe$hGcEFu&kHDoH42a80FfhD&%V6w+P;+(<0|UP>YMDT6LL}$_kU<iP
zDh#9oShP^=09pfr4!C^&2q+~3a{?q3RJ`OEUNgusOhr!p<_ruHQ09w6cfh_UCI=AZ
z02lxn{QtfLoR2Gxi4A&^8~_RhSb316ca>qvC2fXg?^U-9wOfTTXb>RQ_e47Y=7^7P
z75*ES=rG(`bcO*$e_V8h!PpIzCdG1+8~_3!!)5IrfZ4ccQo-QQ1)~n2H2?rhjjn4?
SvY`n80000<MNUMnLSTX#2E(}k

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png
index 7fa4ceedfbd1277d9d2debbafbffbcb3a611159a..240ab514d764d165b0e09a42669a7f9b7b3eb28b 100644
GIT binary patch
literal 1182
zcmV;P1Y!G$P)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*000DKNkl<Zc%1E=
zPiP!f9LGN!6py<{BjU1M55XlXHk(5rHA!JTENCHm=*<XXp=B>7^$@U!7J}FW1hI&h
z)?<;15KL(!R3#G7L2z{;mrZD_Mogg_noMddeI90JXVYw)$;|A&4E=pz88$ofzQ6bT
zy?-<FdjUZZ1VIo4L5Lv+N!=#InXXV*Th4z@YY<}I0D=d=aXxgTD+mXn0cgP>IXH^K
z;1vw(Xn*gVBU~F)$F*%r1D1Yi0M%*jh6B>a^f{n7g31n|iX%E4V4=tP4sI*dHU#K&
zK7<cIBIt!<V`B>7qf=jVV)`hiX)-%I8@Rln`WH`K<@oe)Z1n>fY<xAU0M`Hh9e~?+
z9ssa@=K=42P;I*teCrz|DX^hU-v_==E{>q)Z&>G-22h3K8Q!>hmQVXnVwxt~+uQv1
z<7KKVZkatf)KWEgFWU=8-!#p}XP3UaN?VO22u;ECTYo<dz~3^|AUS`YeDiqw-nVDz
z{Rv+F?n28;dUB|x&&fwMKa>V`uQtw4Pw#1OcAR?p92KHirWzy%r>HlV<5hph1}|;z
z0Jtrwvi#7U^gbLu!>|4D{m{uBr>|T=_2f{utdgT~05JD4-27|jq<4B^0)R_*Uuc~7
z%a^F^IQ6vz+<YGhd!J(0e_;{^r>Og_e|DUDZ3euwy#ru%p;aJ%s0-$AkTCxN(=;31
z@A~zNRyVv4nb%1yRY^Si5P&=p4FRPxq@RYlMOWW6O)hM{#50ShxxAKS`#!ulN}@JH
zs#`(&8~|&fY_RJ;I0Xxnr2N*uHbW{q4qn<%_%)(9LdBT_9_7f9<Cx~ozb#cs^t>6}
z95A=ox}34DAGnlX=G7<Hs5aSKGe{BD98h3m!63C)Ij!p7u)#w+uyYE1eQL{|e4N&}
zxw+Y~WuPzpHm!o1^|umR+`E0R<MnTl%jmrk>d9%;H%MlO!rh35dK#L`pl+?}3xYG*
zYYBoqIscmibUYAjINh+09S?%r`c&9f7(^R`-t;j`-#+#Rv7z&0R+L12vlUFco3Jab
zSfl%8P{5WiM1?qC5ClOG1VIo4K@bE%cx;II!?1As13>@d;FzbU$9IFqLD-)V0iic&
zl*-X1U+q`B{}U>}HTxLbAOy!CX>U@{(*q28``-%wKK39GZU}PTf$De{YG<rHWhuw@
zeQfCc0lM?^b?r}x3jYQ-Wtqihe?ScIXY3>CAHMSQqoz&y`MTLpdit*A-k$mSQPal!
zeBJzi0Gga%Ds!z=rcx?XcYbb_pTBYimCLxF&=$5iKVLWA!$pe>u;F*87miN2`T5_x
z&7aSo;85)|mj7tO5M=j&g-I*jd-yQQ(RcFm`}$s^`tz)-Z}))OjCYE-PQ3RA6xhIE
z)&6EJ_YS*1x6IFvnl|R=>n6}D2x787;Bi3r{s7(jVTs~lT<jkS>m-W*mI9hq8o3Or
w`bE5ZLAWtfXMVn5Bg2m%2!bF8g0OG?17)@3(3V13H2?qr07*qoM6N<$g1$RElmGw#

literal 564
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnT
zPZ!6KiaBp**?T($N*t44xY1GI)Iye*>sTL#T@vAC^Q~)KHf_Ptt1JC4sApv4a!u)2
zmeJeRA*OobXxpKM3*SE5S@k$6>UrGxYTkR#&F>r*{Ay|U{ZHl9biPvy83Xuu8;UX*
zrZ_V%m~(?I=Y44H<+%7c>5KkO_)w@B^IClt<MOTkZx+95PioKZ*Lb^TLD3awsU27P
za}Q)Mzr8=L{q2JIRlG;!-{rf$-`7&NNV1^(>bv-2;op~bT-k1>u<P0@-Uk)mc}u7K
zJ^J)d|Gp!33QO}-8w9^=wZ7li&ZPJI?X!bF?37+#W}Wmaj4h?>^Non84RQs$fACHB
zcoi*qVQ=O`o^Lar?{*2Yzoz!WzFxsf)IHNQzG=5=YfIgm;01r5lvSONvcG7Uu`J@V
zinUGMnRRoV>rOjINz`tBJ^Rt|o<ym?NA9z-g@#w9|JQityx8!s#2Oxnu!w_}bM&i(
z@A9qM%r_^zWzw%}#s~Jid{uSxe|Gy+t@fo~l64zRvi@%Q`m-7wG%`{QPcJZNw6i%_
znlQja&Ebx?fjq-A<^wehpBc}v8_0i<29XNPpBaC+|76(wTIvv!ORSy3kNSHTJeL2G
wUVXmiz?WZV*pJAvq;Y&^WI~u2n14V#!DWL<YPaGvU@~CvboFyt=akR{05wPeGynhq

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png
index e2fd4e6fbff41f2e89a8c64668a35d7cabe4aaf9..d3e7d72b57de409a078622ed638518a3d732bf7c 100644
GIT binary patch
literal 631
zcmV--0*L*IP)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*0006$Nkl<Zc%1Fq
zu}Z^090u?&A|+$jZh?-L4lbo26dZ*L<_W~X#jOw0%~gDY2o@X*nTm^rQWv2R#D@ri
z)WyWaCh@Mh__yu%gACehzPsL~7vmj3L_|bHL_|aiY+zaR^Iz6MBHL8{Ug=r{fk@*4
zAOtKMScZTlRR_uT!v>boAz25hY!mrwjU3l?<Io4s!-?z0uX&zV`DomxeC^71yT`db
zUaNh;_x(ygfNjfHngfzwGt<c!jYb`pM{j5}>hUq1j5Eud7UlmulKE9qX}=Do4hR7&
zn(zRi-<;#@;2r(ue5GtODVm%ZvpVzU^hx_YW%85fD{6mM`6B9fL5bOZv}ob(xrWiA
zl`8V+`zvKlh&n&nsEhkU0KmN6Oyx)AOb&n$u)-jSJGH3&Hn0qX0IK=w9pE^r6Gq|Q
za2Wrt)9YoHEi3P;nzx&HIlqcKq0{TFT&<?^ZO2J{sCn%V0n2tA<tuPswF1ERNKC%w
z4hE^R$ug!!VcvOKvjuQ_jn-^|SH<_3%m-H6ubXZ3E@(0tSAGk)>-j1CLrgF~4*r^O
zrJu)$We0)G0OZ3s`FtWGA|fIpA|fIpA|j$4ApSpD;X0I6et&>8$@TgFf%NE;&M%Am
z1B7vZfH3VjVB6N`OIv#q{%w7}NmZ`Tm!`EtMrVD#$q%5)_4(4YcF5?g&o{k8rmFS%
z(v<cG<SAO8Z&H=(^QCcrz^0SF)TQ&w+UQ3S(S*C{olpuN#t{(_5fKsT`2<bXTUQkR
RG2H+F002ovPDHLkV1nFtGbsQ7

literal 770
zcmeAS@N?(olHy`uVBq!ia0vp^4nUm1!3HGP9xZtRq&N#aB8wRq_>O=u<5X=vX$A(S
zEuJopAr*7p&auxB4wN~*-%IeNLf96uqcd(!+vY63(5s+8vn$)Yy-Q*14$GhGXU}f-
zKIqAE_o!)!pt>U8&Ex>j#W$2zTsT;<zoI-&?|a6*r}w@ddjDH;*6GJzYvb+SU$U;)
ze@|kHGh+ZBtAnKo!_xo;2#4oVW?9}sVVU=Gmfg<wcHh2sZhN0o@4We@#e}OWvCrOX
zIvh%WmbUx&?fCtV?>1Lk{C|-czrW?1pO{e0b7|HoUQf?m?0nqOc3Ua=M7ES*<x^?a
zJ++3-yU(i~{w}QER~o;5zV^bm^6s76PiO9k*x7PiJ9o~`8yn`;#Qk(*^xhtAQJba1
zGfnizpQplQ)ALm7*@bUCEl-(a@?>hh$cDP7>Sp);*XuugtNY&Mj?tX1y5CPu-n%-n
za9wSKspn7j>ERncr`TSuS=_Mo`To80O?~{&x35lUuBm_hRqEO+57(f&r`JOF7;$>c
z%oh>(dHCW)PmZMUu!rYQFR%Uk`0e31uF0QPi|Zx7I``M-^Y=YGznWXFKm2IE{^MzB
z8^1latA8_G|H*up<15d#90@DQTgC@c?ebd}%5XIlX)v5x$e_{Av;Z3?vG#z%!!`U2
zubCs{5By@NuiqCslmGUq*``~X-oBdiika{Cd+CXlE}C~^HlEtPihn|Y<yEIW$(QT)
zcK>Qf;Bz`}qZFe1dF?CaBk$63<n1Cp+Pq>;`D66&X-M+lNT7iYB|rCww&8aI&~fQ1
zub5+ke*9v%F0#!|L7yvHeu8-GTK*H=3+Kx#{6DK}$`pKh_1(4ExBve9oA%;4dx`xX
zb;T938}81(pKnxI=dd9^zIV;P6){}g@$wI5O<ciWz=`hpIr|OTrf;v6bXy5b)C``k
KelF{r5}E*!B4JAa

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png
index 6aec80e9dd58bdec478db05bff5c93629a2f4bad..3e65d639a5e4b54ffae58b1dc80a0bca025b18b1 100644
GIT binary patch
delta 277
zcmV+w0qXvR1F!;+B!BlwL_t(|ob8l9OG0rJh9AYD;o_u4g7^oV#3}p+4M7q#DAd%f
zI0n|IXt9rwgPUB}Mh7qS1%gt73m3P#_tJLV#2R119L}@+IKz40mvat3Fbu=^XHrVj
zMXQ~J;pe6fqc7&(Ow!6IO{GeWAn-S}6K53}o$3oor*o5RzkjM$`Y(eiNPFw|@00Bn
ze8&+Jcf7kBSiZmV`v_H}0E4?T7K;D?-(LYR_hwQ6=>{G>mvZ?CfI=b9)5laYmjeLY
zK0g33d>hH;a)55L^~3zSc)r^J0KMuJ0G9`+vN`O*S1e6n;*L}G#tFH@V;m<dn;V8<
b7yxVAOi=C984f}600000NkvXXu0mjfMbLkt

delta 362
zcmV-w0hRu+0)+#RB!3BTNLh0L01m_e01m_fl`9S#0003uNkl<Zc${Nl7+^5!fKdmG
zI$+cRqYfC{4sh`c`A?3adp50Mq}Tx<%T>JOP{gcc#2Ah}c}0Y=A^(YW1i>gcI`b5m
z7MGP^uu2mHI|2q4@4kVdKGs!(fx!#n2$&c?#}JhUwoMdZIDfnAD#IrR6O0f5TZjZe
zj{1N93qy|HRR&`>WuU&h4ERC>rvqL-e!-x^0Eq&x{13no&}N9Uz*L7TN@}+XGcauZ
z0AvXRJ@A7e5r-r2hQQtH?-(TPR8TAfiM=><2h0aWOLg!YhQuBYhWRBwz%<C=AaMEo
z5wK;thBp5pp<|$p)ef8vfEs|33tk+8&>%;Ff*EAl*<Ejev@o1Twj4P$E}thc3a}Xj
z^ARirV1^^p=z6f3L9_#ibrdCFaF>Lm4j6U7r~^hFFd`fP0PP-v2@MvA8~^|S07*qo
IM6N<$f+@X@dH?_b

diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json
index d75e46fbf4..fc15bfadef 100644
--- a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ // Hands sprites taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
+  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_nocell.png b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_nocell.png
index bf08ef9cc769fe4ed6929318ae74f8414ff64212..8c4fbac7fdb19358dfe2c67931a69999e091f0e7 100644
GIT binary patch
delta 417
zcmV;S0bc(70j~p)7=H)`0001UdV2H#00DMML_t(|ob8t}PQx$&MPE?|RH;iCI^dyM
zkh++m7jUHxC?jWJ=L(#mf|-j{A`2@LUb=KBl9vp4V5r#4Kod2hEhTnRB=}oo$?y5w
zi52+IUx<{_B}w8ojU6=sf4+<`#;{4ER)HKoN+FkMOkf@UpnqVL!erQPMqm^CCVoTR
zKeZYWh@yyVE5C&UeC@<DQc5SKL~G5twM>TXt#E*?16AQlDYVvDYtdSNJAbe(r~-#T
z4XnenEMqpC?LDt|13qwX0be+HY{5EwKA&TZsWexm213E1LIZ=rz{PRQa=G+|!>WPR
zikwnv<CU4`@qg~Z0m0yffY!QYt)<`ZvrFRY_Juf(eVL_{Rv?6M<MEiqVnLdwrLoY}
z=P4aRV@zv0ozm%akWxDMti3KcY&nENh~h%&cDvLC-x(o<16-0MPATP9&j*PULb%@9
z>A?hw)FJVsFJbTaq&S?7CkKZXsQtenxIp&)T8GDe`5F~(Lg;(|Zg%0$JhrhL00000
LNkvXXu0mjfr*p&W

delta 237
zcmV<J022SN1N{Mz7=Hu<0001iRA<Kk001peOjJd{z`#aGSYKv#|A{m3wLujV8>>+;
zCnq=|BrB<C88SCL6crmpN>%QG0U;P02gG2M00001bW%=J06^y0W&i*Hen~_@R49>S
zV4w^zDxe7nE21edatuIKpduE4rXUqn2bux~MsZXH3__)73TD*N93fP|fK!10x`ILs
z69mvrV8^hcq7}`GS*y|9u%;W8&vjx0eg(JC6mXy`=mIL>dxs>z4OH*|2;qPasDJ^4
n;NTrY0ID8_cct$hFc1v@<!&7Li@sJ{00000NkvXXu0mjfC>&DR

diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png
index 8704ab6bcfc9d1cc1a0e0a9959d1eef636a6de3b..59940f44ca4373ace1a3068261c7b823721077c6 100644
GIT binary patch
delta 347
zcmV-h0i^!m0qO#f7=H)`0001UdV2H#00A*cL_t(|ob8uAPQx%5h96J|#2AJScwu4u
z7<z$p&B#T#0%zz2I0`)h5?&%9kM58G4;`XP3}&(viB$Qq9R_$;OW*VOwG$=qpT7_h
z@l{p%zO~CG;O~zG)>`@`vI+$Fb`L>fF@Y}pwS?^+cAM2Q0)Kt*=er~2%iF~w0!2~q
z<YW*I@UxT1h=>;vwAMU0$8NJa3kNv6Fc)5yC0c8ob7-vx=O;UYIdDkSKo{OL4Ru|Q
zo*Ugj3_MyO77h_d(1jagu-49+HLHPCaG246h<K$GZQDk}VPXSe=c(Y61OnU`6U&?~
z(1oYm{V0K)@Kiy8-0(pGAS)b3Jcdds5Ab#EX+93g1tw*Ef7|<I8<R=zf%Vl5B9dHU
tR024)K=%KF<O0p<Gl$2x<hX>to^PxI(^;hXInDq8002ovPDHLkV1m=$n416q

delta 208
zcmaFG^nh`KL_G^L0|P^2NcwRgr5@lD;(Fk~0XL6`__VVBoyH%wI*JNQuMRX&SGQ19
z(Ka%-6%mzo@d{Oxkp5D`d>5#Nu_VYZn8D%MjWi%9-P6S}L}Oxd!U7%xtp%JM+KV&|
zig+AC7buA}EK?8-WuL{w=2jTO%Hy;&gX_vg8O4wTo({>ZGHWxqtkM^1&bZsUEa5nl
zmc|3iW|af1Aq5N^4;$E5G%&V2c);V#uu87YcxgJHfdDUqo1Ij^3JEVwpq&h!u6{1-
HoD!M<T;@Qs

diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_on.png b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_on.png
index 2adbe76e9e16819f2e91a89abba140f95eebb6db..2132190ad45aa02a2165f4372bacbfd0be16514e 100644
GIT binary patch
delta 1071
zcmV+~1kn504Z{eKBYy-6Nkl<Zc%1E>F>BjE7=~Y$7)nOh5JQcjOY7+h@oK2DIN%J0
z{)5t?WB)?vPsrH+(IHuyKafB@nc}H&i36^O45pyrx=7|MTbAV9-KYC>F9eG~{M@VW
zPSU~mMt~QoYBnG;L?=3&*Xmf>V7kITFbF-24x6(XngGyh0e>>Ia}r9z?*kYo_}y9^
zSH|JdPv`y)$3h4>91i9E9gby)j&gEL^9L$lh8S4pXZn9;0v;VUXEQWU&&18o4-HJG
zQ+)b7yoqK*Q#Ut-KUeu@?}wKWzi)#Npqu4idjVp&dh$=Mfp`#>l*Jz#WcOqK+n%^g
z;dkQ$69w2X|9>L@POgEAp0Qib8XwBcBjAs7_+L!`?FC4KpTBy<o3FRMRts|gbKP8(
zug*LQei8p#3lKkUH5v_kS%_4)si%-#{CD4OPbvA4|7Mb}eIFo%kU<b&G#X*CSm2^}
zuu*xFkAbf7wO$mH@XPO`9sro0c{%t^0AoUas()=OAb$xTjYc&YqEoBmw=RaOd>LYp
zw)xUhfNgLc-&+O#lW)Q<n=b?ZNd<7-d>QzA4_JjyCKF7jQ!?`|^Y>Z-T+Ek&U-%D&
z5VGBFW4T<CndihWv;yMFQ<~?-&s~5RKAB9O%G^s_`MC<9!YO7SXMSb@IGZm6e`f)>
zn=b=DbAJU;nXd{z^9$SUwgiCiP~zd&AL}Qe>ijhwy?!Y@U#|-71CE}*fDnT0BvhIo
zgQ*6<m2avo#Ve-@7vSOFUlZf-{5;}#6Lg91<>ggKGQ=SI?AYi^&cly?XL%f{{*CSI
zQu_1P`eSyrYuMl$;tpzcT<zeK=K}^NS3>;#d4KxzO|6Ese1esHL=0BV%kw}c2Vsc4
z_2h5i8@mkU<gff|+lVDhZM10H$OkA(yA=6=JpQ#6V3+wV{qfyx-=Rs=`Gh?A0CWD;
zWfug&>ht>Jv9W8Qy80;i>KKahZRZ0v`r|G0S5HB@?*q}3PvLxo&j%3mwH6?wKi>HB
zZ+}*QK7hW-G3?{NQuzRr8^3-1`+R_9esU62A|GIK<5kpuas~Q)05RX^1Bm&R%LnMV
z92Mp7V)}dlG2iC{i1|JrK+N~~0Ajw+2N3gpK7g3-^8v(spARTGe@)b_c^vsZAK(g~
zYkxj9-{%8}<?{h9@j2cEUE+Ir@spK}1%LJb?=Q31zCWPSqJDpXOJeu_0N2Fz{Q=I1
z<NE`g61(>YxF%Nb4{%ZJ@&T^NW<J2r{4HXW4{%j1@&PW(`Fw!uaylQtLC)p_xX8(T
z04F(@58x)J@&O#>Og@0CoX7`oR_XHr+*Rs)KowN_d;oWqJ|Ezv$hYR{ms9zGN+^rE
pKcB07K7d%x<pU}$e-rj%r~hn$rX;_H%7p*`002ovPDHLkV1h;{82$hN

delta 1738
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

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner.png
index 8db1e80fdd1f32d08fe2e49909db021bc9aa7acd..8daa67ae23ed6f061805be4e6ade14c8dc289260 100644
GIT binary patch
delta 1571
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
Vkp%GIK=l9s002ovPDHLkV1f<v`M>}G

delta 381
zcmV-@0fPRi42=Vj8Gi!+002a!ipBr{06b7kR7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqKJC6&@Y;fJG#%QRLQQLvB{X3<P<k6EQswIH*W2L1do*V-D~kXC00DGTPE!Ct
z=GbNc0093<L_t(IjeS!A5`!QND@E4f5DNbPuWLaaPBfe)kbe+85C8yUU<V=|{5Nf^
zF_STf6Iy4bVjbI`!8!Y~Tj}UwAWJk6ZRMbr4ui0_lDB$yTBmpT`7`_3fBaEp3?0G(
zON_O|ord1vlS*-k%p4m{=Y$k1n6o%4(qBT;GZ%T9VU!@Uwz~xGFihZ_HGb<x38fT~
zq~q~7s6iaNVRo3n>Uc`f<@qt8y=R=jP2qBvaNdTSoy@g8oJGIYH>X){PBW$kRW^1?
z03R+5{;&eM73HVJ)sc)Y2x16`gc!sSt_BZ;-pbXp9tkcls0p%G5pb9QdQ(u*Uzn?f
bp5!6EN-!F3!qZui00000NkvXXu0mjf%S5GH

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_cargo.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_cargo.png
index 899c8d6e4cb0aa6d7e4b18368d411d3c34846a18..ff808bbc8bbca4efe6e3184df645be9251be9340 100644
GIT binary patch
delta 504
zcmV<U0SEq{1BV2V8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00Fs4L_t(|
zoYj{*PQ)+}hP_L8h$uorh=M2*#cF$wz!|8a<Oo}EfGs!%)SLlvg6&rnNUKm#AX!l)
zp2_Ywvf>y&W}GzqMVyB{|CjODk|Tytnx-`iP@d-_U!Ok!Hh;58{7N!^E>DcHbg0PG
z0S4-ZNBfLj%<kC3?Ui`Wjt@HDS8rUjZJ+LV05WC7I0evgG9A@tr(F{W3<mOELV&sc
zK2ydmUbuBSP&FV0fn^5NY`8Mx6A3^yuw{cPGJpya`qyZH^P6wcKF+tT5Sa0c>p%cK
zkPF7t7b7P?zJK}>ZJO-_8OZU$0H#1HOsFXuV0j;lc6wO`8OZUBaXP@$vfgYQTx>>d
zpe~Htv=MAVO)Me+)}XJ@07X%d0w+l_ECA>*9<$HiG27j$oNf8>gN_-z6AmR3z<XJ3
zt`%#_(B2LPpsob$oT~Dz055<pY#~x$$u$t~Mb08@rf~_c|5bz_SYqxX92lTaA^Hjs
z1)$4Uh*U@vfSv^#gfz!2KN5fm0wh7yzowXz08|LL*J}cd+dg=aYoImYwfQ|w!TSIh
u%CjHl5ZVjCcRIFx4>}!VO)*kq*kIQ2W&p3;QQD0F0000<MNUMnLSTY$|J9KI

delta 400
zcmV;B0dM|?1fK(t8Gi!+002a!ipBr{08vm(R7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqKD&xi<-vMyG#z3(DDlKnT1GI?re^WHNAj~h9uW{+VP&wly42j=IXpmrg^Ldq
zCreLLBq%f72x8#?0004WQchC<K<3zH0002|Nkl<ZIE|H);eU36APhz!$S56xpzW;h
z|Da1KAR=z3_eW0PyDFeE#u(=;0|2Gpr@7#K;2dB8Aq7^5W3dZTiZ78$)fPbsr3R%^
zDXmaN!0txPjojSE>5RUA-;r2yt67B^nbq1cr&G0TGzVcCeZWi;Sc4y@M)01DM8Hu;
zC<f)NfHQN=Nq?|@UTS7<kAe%05L_eZ<x#Wflkohhd3J=grYF#aFMRx~e~0iEwrzV0
z?INvT4{KQ4ZBBkY(mm>Q*72l2ei#3}O)~bJj3%djxJq!g&CxI}E6$m7zAINTe&#?5
u#-OeQkj5AZR|5ViK&Y!cD(bJe%P*r#9jPSko{s<k00{s|MNUMnLSTZ~ov~Q}

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_engineering.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_engineering.png
index e45b9e35303b848b27e9c8ce7294dde077c503bb..da76b044c1e1b33761127befeda670a74cd0ad44 100644
GIT binary patch
delta 711
zcmV;&0yzEs0@MYN8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00M?dL_t(|
zob8uQXcIvghM!H7)<_#g@w9kcFJ1&orKk`O>M=qEd(uPOc(bR1XbWvAA}YlSimeqd
zf-QQf2l3}%1VNPggV5809wY}Vilj<OlV+WXu8EsXGCL_f`G3x3*q!;_C-Z&TnF*sH
z(=;74luoCOdSfa8s+rB4Ne43TK4<#I@<N6E2FQtX!)caRO3(Kl3Izg~p#&UlhQzSx
zyCS|R_%qO{WxT<Ph{<7EL~A0#qW$Hc_wKysj|=57E2LBdUPUZ}Yn*2<dsr0hfoPkp
zS-#s#fn(JK@PGUDtyYvCj_{cby<DPAgt)~p7nr2Y+Q^cft%&hDRnP<QlR<&&+-8iM
zykRFHW_d4gE{m2WA2gg^3f}PylPx0mDOS19HqH{GLln*Q`T)%Fke__x4qa^G7!wS!
zgM?0~-~ckmQEOaSC&c1k<pUqtPbVWJ$=T}wAhm4gF@LPPA_YyN213lUpk=NNAm!Nd
zA0j^$t2Cmj0PTGk69)>;slyG$=gK4Ke@fLoL3;((O8)`s0;FC+yhAUzoZB#fE`*AC
zT>x3V^EYsI$4i^iizfwYsq^6PvGFd7n^1orHBUu>Yrr*FF<Qt(wif%b+*g{NEILvG
zkcSHI)_*+yc97W7)?z<%?+2%M4OPsMC!sX~@YAQ4X|{_!QR;Zls90~kINAXDOrGpQ
zuGk;xJ|T`H!M9>10QpIlh3J<CS7TFCFi?8uo&($K6rd7-iUyO(iWN}FzcPT|DohSc
zbMj*E-@Yri_*8zqGJqFCN`iQerGl6T0w{+lH$ZgdE_o31zyRe2E{OMeP-z#TG<5HN
tDwoiP0P5Y2tG(B{9jltEs60kBm|x!y->E7aPVE2y002ovPDHLkV1i6$NB#f+

delta 365
zcmV-z0h0dI1^oh$8Gi!+002a!ipBr{083CzR7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqKI_3w^WA%IG##O7D(}x_?Z{a%GBu&5sf`{m&{#vpG&F8;byZnhA54E@(%@FO
z)5kLBLjV8(0d!JMQvg8b*k%9#0N_bPK~y-6#gl;!f-nq3w||aVreXo-@c+NmwlF|p
zBqk<a*yXl+Nizb*7-Ox;0)RO$$JSX}Sqo5s^Nt;K?-sy&cXE@h;tZfetPm%gqr(~C
zR7<FZ%~6lD!ufJ$spS~VO4r6TA*h8MuW!Ijs-QM{bNc|a3Pkd#b^&Th*B0pdJB!*#
zcZw~^rtiK2#%2)|xol&k;)uuuui^+Lrha#X40*((YyK5T!&9Ze7>D#*AQSSYXs;JS
z5hCq}P0z%HjP<r(kW$T`IS9fvU<m-9Qu0s&_)h^5mU>0-sNU5JW`7<TVc=G>00000
LNkvXXu0mjfoiw9?

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_medical.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_medical.png
index c2dc11d21bf969063699ae9e24e9e1991b61e312..5bbd100773c4f80fca7401fc06b73090a0460cd8 100644
GIT binary patch
delta 413
zcmV;O0b>571FQp(8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00CY}L_t(|
zob8uAi^4z<hDWeSDZvFHW$>R^S=w4yUU7w3>JPZ<w6e6Yu(h=EpByOzLL^wGi;Q=>
z#LdUftcf7!+vIDq@3T8I3)=>QJkLwPLSY!TOffltGPB-j4u3)jl5rG8aN2(tj-^Aj
zivsXR$8n%DoGDY+b%8336(36lb2+RaNs_`9DNF$d`o5o{ImcLskh(y5I!HCpq}~A5
z0K3n@-Sc>Td@ev;dIMAf;3gvbS<kty?Dum5Fx?#07*+s55VZWmDviY#do$`fzt=d9
zZ@VCl#Rhnm8h-)66x0r&_xb<X2eO^Om8k=a0FQJ6r2~urRkF=_Z2)!YH2`c1ky3yp
z0GmRj79a_rX^{YKGubZE{=~crIQyUNf;4+FfDVDuLC_e*F=qi}A@E*;NTIQcVTfG=
z%HR(q_ns;1B1A)Z_M;p^9|AC)j?2DVosOxd6lKRKgBH00JsY%*t?cr600000NkvXX
Hu0mjf>e8|`

delta 405
zcmV;G0c!rN1Ed3x8Gi!+002a!ipBr{06$PnR7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqKCc!q+d)BZG#%*V+#MPk#Vk1C-P76C%0$INQAb2Ht51%|mEXuPV*mgE0d!JM
zQvg8b*k%9#0TW3?K~y-6g_D7{gCGco6>E;oDc5}eXC0umnSZwX*CF!%^q`b6##n21
z0l<-ehOM)9u@+zfw>plX@9qPvtGl@tzS0Bm&ilpt7LL^U1K{i~$z9kz)!|+Ecm|e+
z8lMj|UwTE8h?0aFlZme$h$x<}AQZ+kfXGDn69x7Wdmsyd6gE*1A7k!-BxBeB&C>~>
z6F>t%9Y6!1^?x%Ucil@5)cQ-=_$qZTCtxc&uY~s827pyPaix+8zzDBUYB~otEp!I_
zyNmrC1e%}2ev;wpBwH_vY;e+x)^DC(S~vS{D-r2vH^sqcBBw-JKPAeeFNFxg<)@ry
zHh<<I2;1PV09bR*D_jBmr+~;``HJ{o_Ec{N?;C1kTn?V&00000NkvXXu0mjf{q(fV

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_science.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_science.png
index 1da59b8a315e63fb905d1f87ac802147b584434e..8ae607cdcd4d5e1df01dccb78885b23735ae9246 100644
GIT binary patch
delta 523
zcmV+m0`&c%1DOPn8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00GNML_t(|
zoVAxRP6IIzMQ5elAX0?b6Ks<z^gs(e5(N!cKpX<N0u4w=>7j-6q@u|QLJ=uvSTrj}
z`tjQ9KfB3DQ5<{h|2#9c;*k(mmSrtHY`tC=IiD6lO6>gi+J7bfdHfb#D})-w9CTt#
z@c!qf`QC1~QdQN?*lM+s@p#;{AEqxYU<HarB$|T8v5@-e{Zvk7Gudo5&7%4-5bZ-#
zaT_<E$z&qm%caaO7s+&V)_{rQ?rn$I7ydTWxw^(&7D)}N2z4j8XqRy4n==X^Tu4O_
z1p63K8sP5esejcM%RfS59SjBtbIJ&K=TIrg2@Ej`z|K8}-f|wc?Kj>Fg8@Qu1T#T2
z^-ay80bc9JLZ(s=4Y}sOS<4H6mI{4%9pe~#99>1IA-8a=0JhPG$$c+?TwXo7cLU(=
z8DBOEGyuCZZxlKKhMt7n3CIHALWeR6;P&ex8rIk;uz!BN37^kC_5<KKR^B;u5$Z0n
zy75Hd1!UJVYgqs+#Bf&{W;MJK@sDY)04ab&8wHR$j;TDeyQcwS5Lo%x_K3Rx5JKBw
zH0-YMh`RxH1pYx<{Z8v$gequnKjslS2q5=5PL20^9kZg0;TkEJKi6U_F|33vvH$=8
N07*qoL<FuvV1i@(;-mlo

delta 402
zcmV;D0d4-71fc_v8Gi!+002a!ipBr{06$PnR7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqKI41Z_qyY6G#!B_kM*42qFK7|iQ?JS%I)mt?CRz0w@vuuoeA00ZvX%Q0d!JM
zQvg8b*k%9#0T4+<K~y-6g_D7HgCGn=A;@T2OaS-)-`XS-?SB-ucusuqE&&0ZbIyC$
z0{{+vcKhJ{;yu6uAqL4{?QjAyhOe-v4|xD7q_m{8r$dHx0HPi$9?EuU-97O6dP-R8
z65U7S)vbt<h^Wi_3*Z&iqf!egg)3hGq}CcymB$ob0cyl-hH~1v1BhH2wxVJJXnC1t
z2%r*GQWJm&Ykx4HG<}ybu<2;VDunpk4cNXn9b0RaIwY-81+8og7*){9I#&E*>lp(5
zD@K6&=ROQ~QUJ1@<O!fBVEfRR2f#n4X@uMYyAP%=z7jGunkT_GUx*#~vG4wg%xt;l
wporLzW&p&TbA%Zne+p=%nQut?%O1uXuf7@TnonB`01E&B07*qoM6N<$f)v8GNB{r;

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_security.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_security.png
index cfd18620e04750d95eddeb752af4a9f88894fb29..42114c515b2dc35dabb5fb643166d85680fb8525 100644
GIT binary patch
delta 729
zcmV;~0w(>E1Lg&g8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00NjvL_t(|
zob8v-YZE~f$6u0NgDVI{yT*<5;LSh6lh9I38$s%!hoUq#DU{lJ@ZYcv#l#{Af*!O*
zYXaiIlYfM_fYQ{s3cUr%uXW!pvz^`S&aa9mAA}5VcK7?)w|{Tuz0p9x^7*_23f6A7
zQ@m@&0C-}CZ9{c`64r13gsy1@zO6SVY%JJ;FX>rPC@t=SxErq?AAA2D_vZ{^e7#}F
z*P56ZgO7_y>?a@)<Y7@u>u1M&PAU@%Okk2ehfod>>-76jZ(M}R+&9SSdf><L!$li*
zKTW~Pjqn`Lgns}~7_HVcp;EA81<;4$Td%Ib#^Pb%I~4#Ct~V^uQW}&BCvUgZ?ZOMg
z@W!97J%;OFHoZ9%f7Z;wP}iV5bEpomTg|}l(PcPijNFhPh299oqeerN3LVe4ePBYm
zmvM7u1k*Pq0an(B-twY_lf>g7&>j^1`{|`A3?L&Mg?~V!L0XLKxk)H0%mQH<7XTAY
z6@n+u1n@Qv#%3gHtWAgs@UQGYfDnL6B8nuS5CCq+xSnMoh&b8Gl>sn&-@cr39^L&e
zRpE$ub>D*7`LE2bh#P^dkq*WpQ3!=TJ>or{4{(324^Lm4uzAN8j)LDeOv2LgUjRTe
zvS)%ZD}M^~+YcR#9KV+p0w@>V8vnt9((F-ULeh!%{G$c;X513asDi=(q(4OQdc*CA
z=Ij6>PJDaM^u)0QE4AfGhN385e|HHgw|)dZB8*mhe*sqKeLz+TmIj~;6N>K~<UsEY
zpuF(Qn}4!rLH4`@%hUdH<rN@lfGEUT(QmnG%~Cw127MRmq-B#4mja+6aEu_Ug?31|
z1t29Z4G=(}QKu&rVPyasgdE{i#f1TQ2iBzdQ!PW)BYDy@l3@M-<?2FU17J7?00000
LNkvXXu0mjfF~(4<

delta 386
zcmV-|0e$}F1(E}h8Gi!+002a!ipBr{06$PnR7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqJ})sfOixm8G#%SPK^htzJwQXnEI6+gFzLWy>#|C42O@CA>c&h>cmMzZ0d!JM
zQvg8b*k%9#0Rc%wK~y-6os)rbgCGz@;gAv%)}u-P|66-^1b>o>v@_iq&y{^5c<P*U
z-n%X$8vZrxgZG>FL>q+|q>^2S7Z79k2+#6n2arNaTT0I|Y)AtTcTsauwp$zS%GX;F
zS!wll&F)Ru9dl*JwOVC%JAMFp2V}ge<P7Zj005t8xe($p0rx>@exCp~!WL;cPk<75
zsG#`_*vgbZTYK*e)S{Ukr7i$Xb(S^oXixe741cX*?BX2YmK$-lP0fn|I@A23GQQ-#
zVq0MGc?PUi(h6(W5m17Aw*}y1ZbU~ko^l}?!Y!Wjj^t%5pE(%<P+9>L0Yq8>@~4n0
gt#U)sZ}F+V0m*+FJ_`6b!~g&Q07*qoM6N<$f*>!WQUCw|

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_syndicate.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_syndicate.png
index 6b39694e7a7070144b2e2d2c2ed902a1b6bf1ab0..c8424057d020c4eb817f2fce1561f02e4ec84538 100644
GIT binary patch
delta 555
zcmV+`0@VGA1Gxl{8Gi-<0047(dh`GQ00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z00GHKL_t(oN4=LzP69y?h6fA}AHfwnj5l%TF}#8Y@EBgfW4QAsMt1CoQ6ABeZ|EXT
z+mEUN{gTcU(3$_|uj(Om>bkB<OeT}^rU=vNwByPozYL_r=700Kt8|P;BUkMcnu;cX
ziP>z{)PupGx!!cT)pf7m)FocmtLmlxZtCT7*<8otaWs)+3pT>_?eKIbdez$+(ek$5
z3S;JZ@rjXWJCX)A5!QG8;hymO*V<KiE>3!`+8TLUEok9k1`vN-d^B~5`{CKnM9Dzc
zU9(ukfxX(aRDTKh2KaV4{C%WwlmxhuFU;%M5+2Sk_g?2v831nR_cn&?v0yp{kei2?
z!PYI{0m2#fDGg(6__&8WjAA4cfYMQn#qB3h`u3on0SJ36W_Vwg6_WvonFwRIU^W29
zG||cc9Lq%3K<XsOf}Dxc34rV=fYc*71%^mRa{}O?Q-2U5;ug#aAmGRBBcJ_A0usLn
z#FoEDOVNM~qThQ2VoPAJW&oks0-z19G*OBl)Gc5Rv{?445`fgtbBK2M1hoMW6A&6f
z7%bvoG5|6UVay1FMI6iqgm5se!h-2Z=!4+K1V&nmgDQc4{dX+16-^O0Q&m49Yl_}P
tbvIG~03-koWmrjOO-%qQ00008000000002eQ<DGy002ovPDHLkV1iGk_=x}j

delta 378
zcmV-=0fqj#1d0QY8Gi!+002a!ipBr{069=hR7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqK6Dcn#9%~kG#yO|9IH1s8U+!MB_?1F8Sdlbx~{Bc_Zt@g0004WQchC<K<3zH
z00030Nkl<ZIE{UiTNZ;L3`BWoX{<zG|BLMe0j<W)M;w_eLVq|IV~n+?%Q-jvF>JlH
zleNxG&d(mz)pvgY^Xy-~m6IJn@F7egv@)y@1Au#rc?;WZ9qyv#vp}_UOXj3Cnn)yt
zsoV7j*kVeFBSQ%}rMO)H$q{lZlvIE!RS_K+gaWh(f8TSu0_Tq*;u}zjoJ+|pxdMRT
zj7MR~HGm1>{&Rc)@O8;K?^d5dlpkln8p^*l$S&}UQsA^*P)ef{r1SwfiCRPNovh6{
zPD43O8q+7`u!P_r;*txo$uYHdY_}W)khTxR_k19aG46pA1hES`fSUpY@l#%r@Gn;N
Y1)&HU!*I$j%K!iX07*qoM6N<$f)*2>QUCw|

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/meta.json b/Resources/Textures/Structures/Decoration/banner.rsi/meta.json
index 2df45b016c..2de33ea029 100644
--- a/Resources/Textures/Structures/Decoration/banner.rsi/meta.json
+++ b/Resources/Textures/Structures/Decoration/banner.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise // banner_revolution, banner-red, banner-blue, banner-yellow, banner-green Taken from https://github.com/tgstation/tgstation/commit/fa9e44d937026d5a2ba72615afccf2f18a87c485",
+  "copyright": "https://github.com/tgstation/tgstation/commit/fa9e44d937026d5a2ba72615afccf2f18a87c485 | banner_syndicate sprited by mureixlol (Discord)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json b/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json
index 5afc1b2b0f..1f7049dfbe 100644
--- a/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/furniture.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/d5cb4288ec5f7cb9fb5b6f6e798f4c64cd82cd09, Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/9d7ff729b6b89eee0b3d750327f9fbaff4aeb045, Taken from https://github.com/ParadiseSS13/Paradise",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d5cb4288ec5f7cb9fb5b6f6e798f4c64cd82cd09, Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/9d7ff729b6b89eee0b3d750327f9fbaff4aeb045",
   "size": {
     "x": 32,
     "y": 32
@@ -29,4 +29,4 @@
       "name": "dresser"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png b/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png
index cb146b54125b44ae7c57278775f21a49b40f9045..b299cc49e140de7eae0de01b3e0b2c6d04584a05 100644
GIT binary patch
delta 233
zcmV<F02cqd0{Q`v8Gi!+002a!ipBr{05DKYR7I4Ol%}SpjEsz2TwJQEs>H;^h=_=p
znVD{GZb(Q-P*6}nKtMAyGgVbpi;IgbEiLbAP}=|i00DGTPE!Ct=GbNc004MNL_t(I
zjn$Gt4uBvG1i?bFfcXF4iX}=l0ym@6(`Gl!1*JZO9%kLmYGTUQ$p9vwgmdk!v1n1k
z8EWtLlW?Bl=!x=^B;kx@0me5J0V5B5QxW1w5r3wjn}Ti%hwh@_EESJb#dGgYMRR~}
j4VIMV7Hj#j9n=eK@vIN;nsJPK00000NkvXXu0mjf5`1IE

delta 299
zcmV+`0o4Bb0lNZ_8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~008YtL_t(|
zob8q|3&JoEg-`G|SgV7(U{Me^2cbXN)yYkiii?YjL#-(e{)5PYf}xl8VvH@Aw-gTg
z-Us(W(uSJl0X%>QXdb|PHkB>|*PCri3xMInQ3OHIaS|>>j(;Ed4xs>K=M)xk49Wfg
zy|7y_xMWvWknZ2fID*wORpw*|?zbFlM1kr&wI#HL;Hm(Cd%`ui(6a;O09Zhm9jF9A
z`40FF{C5XXt~$U5pvv+MQI{Nf3S5bG3Vtmk0GngT2H=L2$;6|1D>&{F2nT&-hA*X0
x#PLx8P9l4~)g+{5ZmLQjas?KF#y+)o-~s27g>AAvL-hav002ovPDHLkV1flUeD?qV

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o0.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o0.png
index 2cf968a8c32f2cfbd9b8e88a4e2e1ecb31796958..5eefb01db6a9d02c26a92a0504afb413f4dd4dc9 100644
GIT binary patch
delta 1460
zcmV;l1xxyv0mTcDBYy*bdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U-_<lHN85
z{a>f(5ex`{j-#J5y+MxOhwX3o+s!7~r0GnjQ)_HwgaE&XvD5nU=T3j%AXQFT%}Xui
zz>#aN+%WOuI_i0)BcIpv$oCTN-{=!R78ojll<U^oZQr2R*MAL<7}VeDliw@sx1)RE
z;ZP!SM4Qh^LeH0;?i5p9*Q8Xp=T!Th>Ucbhzn+B-yPaKoai5+Q*?`hi1QO;YB*%I6
z%SPf9X`w%_9CnZm_mm(+9?uFu-aOtz9>+64Z$N&`(tGs%8{l)hE#w`R<;Dn;4;M&3
z2LFWkDX_d`#D8xWW_vA__aN^*eeZQWUCRZCmb;>k^gt)}z_0^yIky!I!>O3tIVy%9
z?HHhZ9^>d3gDNr5--$9!YP4yca?n7EnHL)*^8hWOb1|+wf*;8-XtPO`DGufauLRDr
z@JlXq#;s?(L5|3iV9Eq%ApF}SeQ)t+M%sG>L=<59g?|<D;wVw15zNIER-l0P&6}P8
zKgLb}@l;qSRdA*!%#H_aN55QjrPtb$lV^dQLS7tGvUxiIM2M|Oh6D`Y1rnuri<pfF
zI64Sw$ebl}2LsWCCX(bVQaBkqM{MjdI&E3GaH!FnK!i#W12<I~$jVt!Kb9Re)KoO9
zYEe^9T7R__DY<AV#Y!}}W@6dYikZ1pYc8H$y|}r1^;WqGdZ5-)t$MAsHBJqI8hka_
zH)uL{>A7n!-MaVM+d%n@Jam*{!$%!$@|1}-G0U{+v(C0CEp&>Nm#(sG`KqgJ)Y_Jv
zx9+lS`>wmauy(Wh)%Xe4=w^*irozr%Sc5j1J%3zKv=a@^z!+x&;}#4=2Mf*)r<^&M
z3(k%jT}~NEYH*V#1!JHvFJj&F!rd!#pW-d4e~LH$5pyZ1`yI?BQ1>-&AFwv#J2y_o
zuD38SJp^wb)|a=$-r}Ry{;vEFI$E`(9q*0GW}vmt&R?5vGTWoq=yyBRMcdNd#$Is;
zet-J1&Al#&!l4@|zg?1>Y>>I<S~^c-nZ8OnW3DFX_w7vJ_`Xa(GWe|g-_gI#5sGdv
zB8uW@h8h{JXH``-G`A@zy~H~A&P!sUlI`6I6*%(lhCbnYpasmlO;C1g^c@yiqVmY<
zg#TU9HAL{AP59MT{ET?a;wSZ&Wct;O|9_+-V2JlM{RN*|*XW@>Srz~Q0fuQqLr_UW
zLm+T+Z)Rz1WdHzpoPCi!NW)MRg-=sODJ>3m5OK&*#lfPeh@(`o2o_3Pp;ZTym;OPM
zh9t$sQE)9d__J7baB<ev!Br3he?VMaoD^N8#QTy$ix@9F-p6_O9NxPR5E>Pxntxpr
zfT~$WDjpNFxmB^}6#<0c!#GAIX6lLbVg{b|bx)mCcTt|@-S=mOl)T9RpGZ8%bi*Rv
zAfDN@bk6(4VOEk9;&b9LgDyz?$aUG}H_k<e1)do;GO2muFtJ$dV7Y@?$xw->i6e@t
zQNECMS>e3JS*_Gq>z@3D!MwJT=6^b^A;htS1d<RTqlPjnun?tPBgI6D&SM__LC2pY
zmrSlQ7&#VDg$l{>ga5(r*_wr^NjE7N1G-;q`(qgB*#(+)+x|Yb?dA#Ke+I6!w!hi{
zW<N=<x3$O-(6<d-T(>oO54hX`2A*`ukQ~WRODGh8_cQvY9MFFY1lHWSwSUfW`T%5T
zR?9cQ!67hGr0jK%clUPA?cbi({C)tY_;S3yUE(hQ000JJOGiWi{{a60|De66lK=n!
z32;bRa{vGi!T<mc!T}X1N`L?W00(qQO+^Ri3Jn4QBw5oy7ytkOHAzH4RA}Dq*Rc%%
zAPfV+i2ZkV8U{e3g4{`-z%A8R0RX_U?EPT56952!t3*y7tYkS1Fj)h;$OZp2He><-
O0000<MNUMnLSTYq2)$7N

delta 124
zcmX@gJ%e$Aaw!92age(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sDEfH31!
zZ9ZwBpsuHjV@QVc+vAR03<^BV8y@}t|3;+jyN-8;CNEGL2==_4e0yJf)LsT=RaUKB
V=KpIx?sNl*d%F6$taD0e0szPtCOrTE

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o1.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o1.png
index 3d461d6029650ba8334fd73fb19b4c4059a7aaa5..1902bbd8b96f0cc2ef2b28c27b2314a8cb4c3697 100644
GIT binary patch
delta 1397
zcmV-*1&aEW0f!5aBYy)=dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U=KHlH@21
zMgLjFECERf!E$&;^bUIYbHQX*W>xj0y60;mP1wQ$B%y<`?Z)?S)BS^kJ+TXFDdreG
zj*vs<f=cq&k@uB+*w=mVX~O-J-rXBu)(fOuw^mO70=>QsxPSSe`mA^9v~W6xPQ%Th
zEYHhZe+&|OzVsB1p**fi%*h@@ttZrWI_^-;8Ohr*c8$fodsGBNmb$``Fb^T|`<kvk
zvQCk*^!v)IA7oiA4uZv>NRW`H>D{FFj|qB8@~!6HXa8P%mwYZqFYj_0PmWOew1M>V
z<nI(eIF@@v{D0g~^k(W~lIQGc&T-AIgoupBv!cAaWoL~+$BLB89u`pyr=o7VWR&EK
zZ$RFC^A)90CPwzBqd=VsO&VJ^Y6vm#V1s0Cz_N5nj59azAqlI{WRomi5@0nR4nTwO
zJr>%2^Y+&$!E+~cWr8sP|8a3YYy3)abGDTt^68!{#DB$Wi6V?eZe7s}KxiIrx)XdW
z2fu$<KUk_Ds5{LG6D+=7CaTig+LFy#&`%++M~IyDV*n|FZ$&U9Ab<x*l-5(kY(&Uo
z0-%D(SpruOAXV-Nl7mQOXPkKX#u%gBmz5(gHTEWeP>Et-lcfMw2#WP%Az=*_6%DEy
z)igQHT7RO%5H-eVacy$N#Db|sGfS4OBuOD@ipf$+IhD*=um@_6*>cJ`m%^^VQGu<3
z{so%KRcfeOW3`%UuBBo5w9vH0W-YbcO6M*e+eDAudg{5CL2h8D7-8s$!$ul;l!>)A
zWrnFUPMc}wS?<&h)eq$h)aX#-O=|VCJ2hyX*?-Lht?fh?GZ5oIAa0Am+QAkxpC|-g
z<Q6lZ*Dj}wAa${Eofa`541-uF-Pyg7`z>xx({FL(Uy*YQ-G4#O0o_M#pHS=TJ=Zp|
z>nU70^@67l?IRV(sjQb;`CIui^fL4^^fL4^^fL4&XK00MYjfaZYK%E#?hn6N@u{sM
zbARNyG$YjYC5x|-Xh8|Te<fOzw5sdR>C4jn*+3dO!+Fk~@M5(Y&Dpd%{R%R%^=7jS
zTX$j2g(LnLdbnnc$xi&!m3`;mOZTIOugd?CA!KlN{3*MC0l68sNgs__8~^|ThG|1X
zP)S2WAaHVTW@&6?004NLeUUv#!%!53Pk&QIDJ>3m5OK&*#lfPeh@(`o2o_3Pp;ZTy
zm;OPMh9t$sQE)9d__J7baB<ev!Br3he?VMaoD^N8#QTy$ix@9F-p6_O9NxPR5E>Px
znq3oss#!)V9uu><Rk7z40fgYgI7TIA>WTDX2A=hGPn}eEQJ&@9_h*HayvYEcNPj%X
zbi*RvAfDN@bk6(4VOEk9;&b9LgDyz?$aUG}H_k<e1)do;GO2muFtJ$dV7Y@?$xw->
zi6e@tQNECMS>e3JS*_Gq>z@3D!MwJT<~pq*#Ib|~k`N)IhB7L!5T#us#YBqEV;=rN
z$DbsZOs+B*ITlcb3d!+<|H1Fsntz3<NjE7N1G-;q`(qgB*#(+)+x|Yb?dA#Ke+I6!
zw!hi{W<N=<x3$O-(6<d-T(>oO54hX`2A*`ukQ~WRODGh8_cQvY9MFFY1lHWSwa#(+
z0Ay%Z%QwKmAuv*;>~)WK_jb<h-=5a|egLNUa=gA>;x7OI00v@9M??Vs0B-*P|De66
zlK=n!32;bRa{vGi!T<mc!T}X1N`L?W00(qQO+^Ri3Jn4R7P=`yTL1t6CrLy>R9M69
z&@mCfFaX3bU-@(XVCb4iyB8M#0KhF)TkUW6S;zAZ^Y#P(4RC_P00000NkvXXu0mjf
Dquig`

delta 121
zcmZqYp2|2uxrl+WILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DinK$vl=
zHlH+5P|MTBF(ktM?eT-03<^BV2Oj*hj&Ai^&|mk?gM$+&Z~yIN?tS&u;%zFd3Okwq
Ua|%yy1d1|vy85}Sb4q9e06&Z*mH+?%

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o2.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o2.png
index ef543a5e09e2dbc409b7e40bace45555c2417234..57a1eaa3abf69de8e86ed2770586422210073bd3 100644
GIT binary patch
delta 1365
zcmV-b1*-a&0p|*kBYy)edQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U=H2lH@21
zh4-9dj({YD#BunI=o`%O=V3duGOMa*s=I43i!@<_g)HRv0d|;w|5)KK92{c|NzHS~
z8SR)#DqPX<cpl}rQcTD7IQZ(q{gXZ1I~XQGE$6M(%fG^|Z+{Qm#-R3W4}SHqUxBWU
zTR_<(@6pC%lCbk>r*s7>^K9he_LyqBQtg-Hk;-*uigpD%pT&K6G$eycLotvrPa%oN
z)lVPUr%2uQ<H~$mtEhNDC6cd9Ajs3}-Rc-01$q+s)(Y>{zqj6r&-Jp)J1z625gMO%
zkbW-yA@Re&a(~Z=pF2vuh59J+TEo|x=iAkkp=iElR17zD_A_v7kX(+(GK%3;wCyMb
z#bb>f$Vcq4p>!(5P=5tVG^o;|dDNXcQcOJAP&0Ry!{%aKxPuW%+JzRI6dB?m*Lemo
zOTzbD=oq&g<8^Y3JP58#2nOIkFX7)hf2D-A`j&{I-+#42Uc9F$(%9to6<z>B>*A(|
zz_)VYj}P+)QxydDklFEqHMTQEQ+k_Qa&Q*-De7|xQLu3ZfJ7Kukqik4U;&BJUPa7C
z1RWiKDl%tD+(3X-c_2wnSQ;FRo%h&y#^~^6<;>fRy$K*xvKZJDseqM|V*Xfi%%Q5H
zNma9&dVkQOHA_xebIz9cCRa@?nOZh8w_?@BldESpcQ0NG7r`E=B^N7RN~x7Y#XuFY
zD*P)fjhnR8wB=^aTWPgp`t;Pb=WgA5>2>gsfo)>sVZ%ombyAqvDQ22F^R(%+%(^hw
zmaMdN<z>rPS@llsqWYoy0yVm*@j+_)*_|4!!GG))g7$Wzn;D34A`rJtVDDg?S#(N?
zH@VF$mc7d<BT3zC!k|qI2-76iMR#^@<i5l$sDFtY{};Ki(R~NG0CXR@eL`*Q?_58K
zovUzb8U?El{nKk;ulu7`|FnJudIfp~dIfp~`u_x44PS=3+}6^LU)$1c%{2B`p|sT~
zEPs*7ar<+d6W@v7%qsl$>)cXwJ`%-0WQ;0;Tz3oEwq1`#$TzRA=Ni68>Q|ue3bZim
zO85s+y0=6m^+8Jj00D++LqkwWLqi~Na&Km7Y-Iodc$|HaJxIe)6opSyMJX)~b`WvM
zP{qNbsEDIfu?QAQTcK44lb8NMlZGV4#eY$7EjakISaoo5*44pP5CnffTwR<LU8KbO
zl0u6ZFFfAIdG{RNyAKc=6{eb96M(8&Mk*c?v$<8V=M@2j;KMjZC1&c0^kN2{^>t63
zRCiIH<=yvZg_OL>0G~)a$8^IY-XNaYv~<q<#9>yF6ykH@F@r8h{K$3L<u}enhkpg0
z88$MhdEzj!SnOcAgIUQ?iKmGpimFk*kabz%yv13q)L84D{Dr~1wvy&Lts%s*ganch
zA)|&eDzFfxT_eRriq2ym{z1o|B$rICG8j1)P=yM~@q_=t@7bD#sYy2}7z4UrZ2Myv
z=-CCDb=&?vw(aH#;C}|Lw6?$60DopbNw2rH$Pv)D4P0EeHF*!X+yMrjbjgq$$xllt
z6oB_L`lcMve+vZG+_|;RaryvcXjaQNz`-FfQl#v4k9YTW&h6ix*8F||rucHazFp!k
z00006VoOIv0RI600RN!9r;`8x010qNS#tmY4#EHc4#EKyC`y0;000McNlr~g2j>b6
z0XiiRAR+Gn001dTL_t(o!|l+a5dbg@12JFspEuN<p|p|slTQEufL~10Y5Lk7>tMYL
XAKwM*NnS>*00000NkvXXu0mjfl>e4G

delta 123
zcmaFPHJx#SatQ-tage(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sDEfH31!
zZ9ZwBppK`DV@QPi+v6KK84P%s9Vh;M?)zHc1B>6pXMA!CfeQBAn7Zq$Y~<bp>L(eq
XSFpZjyZL?#P?*8f)z4*}Q$iB}`=uz<

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o3.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o3.png
index 4e1dc10c29ad7d0b38db1cb30eddbb1734ca537e..3522af81e5c10f2a19cf15e3bd4f3d47b42b13e1 100644
GIT binary patch
delta 1403
zcmV->1%&#P0gVfgBYy)^dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U-_tlH4c^
z{m&_K1SBCOj)VEA+8gBfd0=->_sr~WCdr>vwJ9SkK$71BK^Wivnc*8Aj+8@E^IUR{
zcv4A)D;gfpr|g<y+Vy_;>caPvKHNKCHVUMipH{E&6?%P}aDVeb$Fn~8)x&-nx;kzK
zWqDrS`eTsL^QotF87kv!<l^=i>T!kIu7Nw0>&+DHGIq|zcX(7J14>=tNSKF^#9jM2
zM%F7*mwwmGr?!fU1qeJ>Bmm^;_ii%AM}VF{zO}-8^zW^A;B&q7@(#;<VT8t~9i*Rw
zzaf5bEcb}`xqqY9o2ic=&)I#>asFLR8Hna<Ma6JKXU)OD1CYy}mQf6^qHVhr6puAF
zP~KyU2TG$t4D@H9M4c*48e2AM2r=<sgJf<jTjye2xPc>*v<gi&DbmHkT;mZySrWd-
zLfdcI{u((vcfwF67z5$|Uc!HMex-yt+k%Lq-?2hmynmJ`!dT3$8lyl6&5JkP0N=_*
ze|%U!SgK%9H_VP7tnoNa97=C%OE%AfaSC~EAqv(n1Aqv=6~T~z0c;>qTDyqZh=8Mm
zpo+*@5+7iIRJkKaP9m9uvGekcIYxUdD`#G6<R%cIlEuJHkqWX>Qmh|Kjx|(OG^uJ<
zQx96SW`D^kYtGs7N^;f2lBs1gb1PO|Jh^&ybNAx4a1rD{ExB0nQcA5HDjZeVsu*9P
zIrxwx9eU)$4nN9K8<tN?O<Qi(yp>ivcj-tIJ$LKgORs~%K&BXJ=*Yu{k231STAMP{
z)S0JEpJmoNYZt2@$`@Fpi#6U%t#Ni|4ccIKGk-xVo#^5WjBz3`Zi|7H!4_xHDJ5Ra
zEzV+DSxy;2>f$DJT8x3hG>CQ5ox3;Yeu}rC{!_g1|1lR9b$^1n0O~&S_6ci!opWt7
zcJ9K3X%y@}^bfCry{<#8{;qr(dKr2ddKr2dy2*(okGkOCQ@1%n>2t_jsTcQ52(7Cg
zrGMepnfhw?TBf8<Nl9mNq<Y+0@PU)@L5BB=UzML4qKUHz?pGYB5qQOM(xuHNxE&YV
z4p!8)F6CJ5R)WoW<hXvFk5S^popgWr7iI8YocJ>IcN@aKn7G#b0L{s}8Y_rtAOHXX
zhG|1XP)S2WAaHVTW@&6?004NLeUUv#!+%f|g-=sODJ>3m5OK&*#lfPeh@(`o2o_3P
zp;ZTym;OPMh9t$sQE)9d__J7baB<ev!Br3he?VMaoD^N8#QTy$ix@9F-p6_O9NxPR
z5E>Pxnq3oss#!)V9uu><Rk7z40fgYgI7TIA>WTDX2A=hGPn}eEQJ&@9_h*Hayno36
zpGZ8%bi*RvAfDN@bk6(4VOEk9;&b9LgDyz?$aUG}H_k<e1)do;GO2muFtJ$dV7Y@?
z$xw->i6e@tQNECMS>e3JS*_Gq>z@3D!MwJT<~pq*#Ib|~k`N)IhB7L!5T#us#YBqE
zV;=rN$DbsZOs+B*ITlcb3d!+<|9`>n*_wr^NjE7N1G-;q`(qgB*#(+)+x|Yb?dA#K
ze+I6!w!hi{W<N=<x3$O-(6<d-T(>oO54hX`2A*`ukQ~WRODGh8_cQvY9MFFY1lHWS
zwa#(+0Ay%Z%QwKmAuv*;>~)WK_jb<h-=5a|egLNUa=gA>;x7OI00v@9M|4C0{{a60
z|De66lK=n!32;bRa{vGi!T<mc!T}X1N`L?W00(qQO+^Ri3Jn1{BBg2Pj{pDwDM>^@
zR9M69(4i3kFbo4RUqSZY*qx!Yk@%BO007_{ou<>*>^KLkcL6<L1PkH9+miqQ002ov
JPDHLkV1j+5orM4Z

delta 120
zcmeC>p29dmxsZXeILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DinK$vl=
zHlH+5P}9@JF(ktM?a_^#3<f+b8`WLE-M`T`fj4Hy#0NWo@;z79UO(`YeVPhykUI-^
TT(fx<P>{jX)z4*}Q$iB}ND3u;

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-tank.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-tank.png
index a48466d3b462354bb8d7f28dae9603ddf3c18d08..4d5049f7b4ee366690c43580e5345c5caa549154 100644
GIT binary patch
delta 2059
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

delta 171
zcmbO(aEx(+ay<iQfk$L90|Va?5N4dJ%_q&kz)<1o;uumf=k2A9oDBv7tq;{X#5Q_A
z7x;GWiOMbO$$On|EcIURCcyO4rT6InS*IsH+Sj5z)e@)=4m=o&*Xv%%3ljWZxNdhi
z!?7zt$y<5!B-fnsT5ZkuZ{^QlANg9Yr!mh_x&Oyk$ie#8aj`dI4_-6eV7#6wFp2X6
Q<7SXap00i_>zopr0Do3PQ~&?~

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
index 184b880112456783ade0ac30e388a765b3be6d39..134c51bccb01fbcd4dcbb68fd1b7df8a6fafc0e5 100644
GIT binary patch
literal 10749
zcmV<ZDFW7sP)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*001OLdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3>vavV93tpDQ_a|G<maj=@r4c_tRb7U1oN~F5m
z?1|kZl~t9AjK#w}5Gk|&-~S%-Km2LYc@tBqx#ev66I*P)^GmhQpLV}H8}Ik~C%<0e
z?_Z9a_<q52DDX2pe=Ys>{?76A>jUp=xbgM4sjpXjeVxdCocR6;y0U&>pBKq-{~UL(
zm6*0)OK!D%Ug~(AXug+RfBhdnmi7G5-_4f;1uLz@g@X4xxM1)1`m7-6{}8&4-|t@U
z<7emZ+1wxRm0*xBxA*>O?PmjhG4lI2^SkwX|K9k%zupmkv*pW;hF`vY!KL4hhmY&~
z&le6KEAn4osLO{xZs+y?Ijf$tpS$ZZW6}JIsB3KZJ`Haim^|E%WxfjkCw?#YtMOHB
zw-c8yJMG|Wy5>CAKgLD3TzALq`*XU<5~JU~@YDN=TXd|3;+vm1#)YUacYFygtWfdX
z^xNRj82rat+`VqQ*PE_#<>h#*cbp7||NLeC_Tqo}GUrU0$jO-faWU)iiffi3&*?kw
z!XfUw{FbhP-(N5H+fRW-sN%tN&0M*`ZpU+qk=(D?3fIqp_a%NlDdbF9uM=P*uANwn
z3wXe07m~})7VnF5*s<cE&dPm=e&7L@l3y&+#}KkN#aFLu^O@rAdwufR>oC}aBT~qr
z;F}gY&WbS+KP6UTsHc!(N-3w3s!1*N9CFMl=UlQtu9r|^NhOz3YH6j{P-9Is*HUY3
zwKv}a7?@garPbD2@7{DS)Hzq@{hcGjk1*m$BabrbXroWUXU3Uko@LhAW?z1V1x&2G
z%BriazMa`1#g04eyvwe;?S6>06HYwo<Wo*P?eq_?y}bIz*MIPudwI=YPw9Q-!)qKh
zrMyq!1Sd&8!(%==JYM7hA((t-tBcXgbMl#OLb>EwWRh>pa`G51jNAEi+=uUedG25N
z&7}IT{O143b4ITF|KT}<>;ClHH(pzU;CVgvWT9+o1KG#xyLKa-IFSply!YCxueLq6
zRp+dc|0-A#?Vk2@E`Ipn^y92l4wv<FoP9<HHjU5Ka<ko!KJ>QATYA4AI5V|!*3su@
z<a)>QLQ01<)Zz7>vDfpdW?1n~zV>}Tyj?n5XAH;Xq$6dGqMra`Io~dZPq7;FX*uu3
zd|8TW?Olwu_fqMe{<WlMLA9|O^Rb+d#mIzrInQE#UdsM33uiDj#C2@h-SxiPacNJ0
zsP|cXF4nD9-L{RN@pQ;X!JVK+`NLl3v%z}!+q$fqJ-M_v_RRv#+gN}17)$Z(y_9dQ
zW!~ocw3zQa_GvlaN0K?ua(?#MYcYB4K@lxuEeBM4@*t;CO3cktxTDE)#vQ9Cw%sNN
zLmqh_lC{`1NaPsiqTuG9MhEA&&A7^YB4&)`#&#qi3D-?>Ypk<49Vnt4nsyiOCKN9h
zKUV0g<n~y`-P>W+{B3bZXRpFdZ|`C<MP{J3zfFgQWSxVpMtaiX*XQr2an7&Lm&c0J
zoBG7Ub@#cS7qGr#`EP6Zx&-sz*8p{?730)6I^G41_9U`F)ri+traDFN1AKP_F0?nS
zg)(y}r(vh%N3t!?UVu{Idgj>O^Y*<V<%`HJa2+_7t{dSyoV0XSy}4pKaqoUt%zKC!
zmI+Ls;L5y5PqQH4y|uLajTp|q%9zAyAlt5m8aDzmx`Wqz*|P?IB}m688SqSd)k&D;
zxm=n?21~r-B=^|ACT06QL>lOz4ke;uD$9eizF~}B$8#56S>a8)S$2==nBOX9nAF_`
zyEqB+c>QubrH=IdICKQwT*`)FyTLOq>#Bp8W?jdJ12qILzB^G`<9e}?3H_quDiiRh
zKni2#9Er?3HnB*UC8qBf=H9BxTO}Mg0c`eS#Icq4jnz5-a*Mdgcr6@QE`iWao`jn_
zBbG4EY^#j`p{VoVN|!?U!<K1=G<Nrd4l9~gMKl43fs%$V$6VR%T%&T{osdiClW7md
zAm{D2ryJ>&Q@b!(L*uByT9c}tpZJEG3qSra=y&$w(va$Y-xH=;<=hIzJ;#u#k71U)
zdxcGKS1Pp>#&#BPezOMa*miR>_qdl1aQ<zLTfO|7NCI^x=fr%F2A0(_IzoBSF-I%O
z5T!K%IsW(#SvhitKbsJL5Me)29&t+Y_qM`*Qs&4G;eFHQ^IZp${0t`)fG+852QY2m
zE}SHs4C&yydmk{gO@h|_vW59#jMSIKb8C@uBN7x9!!%)mV1^`aD-lhwZvdMLAmq2L
zFE^+0(C&UCVC*LXPkrhfipf8*dl$`{R%vNhEbZNvwYH*&pi~_*y_fk^j7n81A1`v<
zF)<`o11d82NBYR}z>6O>9#E{SCXY(FIMw6>@9Ws@EMMV?7ix1$6TaB%glu*qeC$pB
zWdf2I0Od+;*QtGC%&9Ooiv5joP9Sf|KVKn^7$#vS-;2_d;N1m&PgwM3^MDD|1?h`B
zKsC2OI}=CEO?!>q3n0uI1~@>$1yJ0qj!+4l=O+1xp%8*OtWFpS?BWCh#th3F;EwYX
zIYc4%m1-AnL>4&WpU6Ff(hdgmc_hxlV@S^0wF*!!Z}9{WW0~wO67SZ_ZtzyFGZjso
zW_cFj01Lt(4rJ9uB4SBPE)<Oh#ZRC&*_utXXHhPi=W5=jx+>hLH6eDhTF2m{+}A=r
zV@@rkkS1X`u9Zmzius<of!Q8-U)c|#$Owx9;R+Z~(k)=B-5?j2RdCKpBvJ97JfxIC
z6NpK7i5A>|`Vm>;oFaJveoWm0wR3jd<yy@T?s+P)d`Ro&+EismyMTRA{@6`k9vh7l
zNu#(uc@=@(T3-1F8&n#n8|%^Yxl)16Qc1ahArPvgRp^Xq8NAF6>eCdD&=OScaTuIi
zsjfrac|+p`=OH@5Qjpf>gn89N?tvSLXeee@=nH58d%4W5Noge56xs+EY*fos%sTfl
z%hUFFQmQPDtK`{I<2IamS#A;q5gq19FE+_FQ4|Nw_HdCd8rS1Pia)>fdf`n*hfst?
zZIl+_8;cb#)~B3X{Uls>K8*w&aJn_2ewd%+ByYGQ^YfB#Ol}pqOTcbTlT$v_!29KU
z#PIs_>U}M#D$F?p90bp8<RVg!{KEq?;`^2t3Ap=&IJqdA6y(#IP2&Wtw$*IwnnjF~
z8Y<J1$5ka28}J>J`6X_?dC6R@fu%802#B&q@|{Lv<#I?YjDf5!!0D8Jm=6jKxX8MU
zt)NEY9swzODceRuz9?9RZ4rY4!=Kh96$~Th+8$d#iU9zVyL2_YrbCM{wD@A{a|0A@
z3BMO5yd^8N+BW3?HWA)}y=!D5S?F2}wSiawOeZUb&1`TT@O0QXLp2~#tppoe@H1Ku
zu<QPHvVrOk<kpt3m=RVR<|qM<Bv1}b^|!txT2X+MEsA@d5~F<jJ}k^naq&4Ua_u9+
zYkkgw=pY&Gs&KBa9iJ1LmYy><H5nh4{qf@0*YbsrpB!Mmj|v5aRtP)xr(ZUZg1rV&
zskyAckB8`kO8~M7e|eG8{jU?(Jg>Y|B;+}aT2`XqA4qU|6v@5U=T66CLGCmmzrrL)
z!9Fs^5GXz#H^^`hwq!f`)a)R1sCXVEO+EZQeLZ}*nSO?E1Oz4BIV=SWxl3;dHLA`;
zvIOX)u+9hA_+=Omzj(0=mJGizZ-ODN_?cp;$q&f@g^-<OP}_4QFG9xYTJ&5&gr!lH
zIwhzY^y#VswoHmZbtk&#!m>-~C14B2yDJ5p%;Mfi&{QeIwgMfT7T8zlduu}7mf$8i
z+FxP_0fWxUtckF!t3xY*DmBx5AKs(8OarI8g+g4%|JA68@*lCh<)a0x2n*4+v%BeJ
zzRRcoo@ud}f6g?C*G^rl--Y-S!$j~s5kVaOeChSd*YN%b?pFwZyk!0i{qMs2Cnx+$
za`Rua{HG*0yz-cU3UolrhGk};%<MK02>>*<@=?1%844G1J;4d-3hk=vGKo1#f;pc_
z&ckr3sJ`n{VC_-IS?#GnwHg(MW@DWN7CB(NGc`|)t5TcU)J{kFZmDrZ99)1ut;6gH
zKIDh3FR3HN*rfr^!*2#Mfpzj3_=s^CYoWq@@R2G-85@#wUZl$9%i!TRu=|#YkMR(A
zqys5C+Qa(2YbzUceBQDguG@h;K2QKLH^tg4+F4u~$`0uxA#1IvQI;oFC}LXb7Gx-r
z_2vv&eG&I+er$E12KUnT4a~Z0M>CCbIpgh9xFw4LQk))+#qZtbybZSml0XamP@@Pu
z3lOs9-0{d)cM3WbCnb2{Xror@2j!d+7hHqs+au9HAvJ~Ka!^{3LZ|LB6f|YWy^Tjk
zK$@q77kAy@dmhSPQ4`Xt2Tke4r8+J)s5y1EVYF2oGNgjDD57v>zbjyq6XXePaXXKG
zJ?**;J=f+}Nt9D$$w>x&RiNA*30w0d+(GWfofM~iPeLXVyj<L=JJKJn3u%-$@84qX
zD-KjPRezyDo%)S6JPNk&r<KzKvC#L&8x&3VE&a(nID?1Qz^`UN90#=Nt^@&CXDI+{
zRk8df*SwubM#_zHB1$GV!G-OBaSWWAzaJwC(q0Ykc(1dz5DgaDxn{|~$CdjtK#pqv
z6HdRPiLwJ#$1I!NC>c5)Cu+Q@{<6@8*bHNSK08a`{3u9BBf*N!EG1T3o$pjAZ8{=%
zfJ2NQDT1g9FfQ?qvRCZVc15HVvJOuzqQ}ciRFa<gSuD{Aiy|h_v|C^$jXIiI{sGN}
zmo|rz8$Ah8OB9*TMmm@C?=-j=WD>Ys-D%GNWn|S^r9@f*XDAl`ltju=CA~IX6d(a%
z=YZN6qz%;@P!kUE>A5s;l31xz19zZ0k-CUZ(tU4EM&3%B653A*E9HUOrQeAO_^?1{
zKE0dKUlJb=5#a0dQIs~A9)h}Zs7RFXQb!AzayRowcTTP4MLxz2x0}Afb5S8`BqSM%
z7=_&`Ja&Dx$Z?j{zDQWmLp5&%U)?p53LV>PSokjX7|;ScKb!wpRoI|l_Tx8jF$;kD
z4ckCt2{f<ouY!#nS&&lFi`qv}c|_i6o$#E!qpJ`#MYsF)M9oS$Y${+xq?XC4i6t_l
zET_hJXugzdL2P9olpkiJ^R;b_P4Ukl$DCI)L~(@9-F;8uaZ*l70)Jw!>e9D-viirE
zEM&?^f!4GQ3rywDRgekLH9&upl`S>#vKT@IbMQ?I6%7R<wh}o<HnGCD;vkN4q@dJP
z!B3*p5!29gKe0|(RAo+^&_CoDw&y$-XO1%PnjCRlZcD>HNMzL;DN7n7?33cfo~!V?
z3f%LdKR?5XM%sF{*{g2Iw5h02FPrmpuOQVX3FtP@6QR?UTlT~{e-*wP*{XdKw8>TB
ze2f!_E8amV2f#{hsOcgwgnOc-GIxqF9~Cm@P=pJKhK=yNT7t=*h2gTOR=m(Qf_mMF
zBDF!tv_1OOy9t%8<>FAugOq-t$$TIm$Lmb+68s4ap$*rdvTV%ji#YuO0CPX2@W!E_
z6?m?|r1TtL4T!^PQsbSm+Z8hf1S$=bkZLhIN013F4>r>d5<m}C77hexp#~+!-pOT?
zr<7=*65ee;S7hGdJ~zpex&{u!9l2r_>vL%{7vM+@d1@pThU|CLV%`ViAwh}yx{DUv
zJvns1L(k17JnyOYGp0m6M0Lg-av%lm?Mluzj2zoOnmYZpH>xJVtzUQx;8hy{>Dn$M
zAPZD_Z+TSThflS+QAhUXch}9}qtq(Q4w8X<u+J{dvv0yjiW;4`FO`p%UoR4n&+9}J
zU}g!5+ylA@6%_V-nnviZ3p@cGcJ?HYREN6orL6W4<qq>72|@uhsGFD(1&XP<iH+DS
zBy&O&0s<=ZK&US5!6B<C+%fM<Ybb%Lqz2~>Xvcaw)$NwaeAh^JZ`c83Vh!TLX?q%j
z$EXr>d$K#hV$p`&-Y~ycOtnEM;e9vAsux{`#=&oAa#k%}HEqC_2_BI%eivS#sBmk?
z&NUQV2r)ie=cYV}iDjiH;k&4H%V+L%r#d^4r41h{UF=P>JQNb}-87g{@Dmi`e2xpY
zhU7g(9a-Nq>^;J|A&484E7m2={dA!Wc#W1kZE^>xnt=psS0Dlu<k(cF(5qN*$M0UF
zc(Iy6{@hLqE>*?BITWfoSO&Saw5R1%sEDwt0t*zur=VyxyV^Y10)rd7BnnR~SwI0v
zDUG@n%Z;>;0%=1+inNzR&VrA=#V9%kCOaV{xaWP$I&B2TTam%TB-&nzdTe6vLa)Bn
z5S5$X`&9N(+f&=bPO^rYF`$>?63BxJV1x`LlrW6d=44S1x}gk<&?x6@HO;{%Cdt69
z^`RLa3K7U<brQ&gQ$LluHr0Iq*y0^QC_jZh%6x_%XYw6pmj%I41qBzOs>A^#$kLI`
z7k;SA66ZdFxnyTr_#Hsvf+cm$pV>7bVYxbBQ}aebqH=kw!5a`fJP)5zuqI8jpp?B5
z5V{E1j&dS+Q5XC(buQsr(;N)NTTt2ySa%@o0o9^LDGW+DVl{D6b4g9Lk)qq~A;b%L
z5df&9DHW@N9zq6@k@vjKP=^VjnQQJhRlVIShfi=vZ0vll0c!~_qJFdodchF9Q#g6S
zNK&^Nk&T4NWv8^SmQgyk3?HwMbhPK#+O!r=bsF=LPCL>BT(j9%ffOSmZJ!kZ3GHrq
zQCCTS?dffGc~~-Z6a;}Pq&t*El!AB^4L&-}w;u-|pdaEV3F-nJ%nhtZc4?E3`iG0f
zU@jdC>f`TX_G_Q9U$#tL?TF_9AcOTJB*k*uI1oYFM?>wY0oFGGT>+&sDQenZt;0}2
zr?gyQ<w(X?+x}^vqA^5rFHiKZCPT)5?L0(O8}BSeomAO~=*;;xM>K?_@Ei(k7BY1)
zs62Fui*Ya1dc5+!*zlk3&Afo%b#K}qp(eL@@ds%io;{G(`fD!$E!ti?k%D$<;7c2f
zs+o^>hkw3kd3>V9-c`Ph`NfuBuBYxw8N#FY1>cu@U5x9$FE?I#?$`BRSNnA>^IYs-
z-P{1j#Uv1edMl_R#Y7r-%xlPm1pV1kr<9eW2`+21TE=(StE(q6`gB&4UgR#ccGX^-
znsXcOyTu?+RElT=OA`|f(p(O7q>WNp^`m`oD)f^2-S6CnihX-`+(3v%NkV6Ll2+J4
z*rg704mQFqAQsB?c1LA8_e4fvr-TlRFo)80+(G2qZK(Ab5Pl6JPwB9`wCtq{l6s6>
z-4T3IlL#z?x<1FN=LY;x!hjP>UAAJe(7gfA)&`a4Zi~|A!oO{Zj5|IwKlism5sF@?
zemmQQ|H6}bR}~4!t_GW?d?1O>EC{?~a{Xb))Z9`Om%R%b^7i|%CPUvZuu^N_603#h
zQfUOL1`v#v2+sK;+i1_aVkS&-_opUU9pM+hT8O=KX0t*3*JAEc%8%FVHB-4ev~-b^
zGM`5~XLYndZX+dw03+sv3RtOAx!|s->+TVMOC{{2%Dqod0b|)znXyrj$df&l1t3B+
zupLs|b>uV^Z^AIt$mp$Q9K^~3#T10MGeI^{wHYd3w8ek$Ip-t7Aypw5(Qx$ziB{lj
zQn?otxW|H)p+-}1kQH_k%2al338Um(fZAVts<A>TUh_xF|C(=XbqD%WgUBO*jBBgG
zSE;PTSF7OxIXJY2D681%b23SGqppkk_h)Eyn<^3K>?xu>x2*`6g=OK=(kf`qDaDv<
zZj0B--IEHKSDOd$gr#|%^Il~;FUtNbvOVYM{{$rFjat8egbJXB!j%Bc-SMPLkHm)7
z^<CJ{6x*O8w~gS0;u*ZKxZOa(+VHh|4pp2$pbmA#;kimF@<W|vcr3cdB|Z*sJ@$4r
zPb{oRGzGppfEj2wf#4;{A*-Gw4n8WhBtz9eDUVz@uNf?nvG){~xvB!b*ugAyDKHKU
z{^_tBjeo?p6eyqul%d6j#319MRO)CNLbx*ph~v1#-)dFkZD{LE%&R3%C+nyu4URZ%
zE#?{sSqisyvN=gxchFFCLZz7$yQVdy2A(NMK#~iRfCJ}djnWJ(I4xY^sO6~fudJay
zDNrZA4Jz(x!eysiSeruJ9hkq?Lq;_?A!!-3m3gLSJ^)CKL$HFPZGT8UHqxL(HZao(
zZ%HtCb@n708;)q|?L$Sm<`f)gmJm?L9^=>oBm#c(RnvOzBU1a}SlUZ+w;P)#L~{<c
zWQ!;YHx6`ivfIwjd9THq9LR{eK_BvJ5<%?-zCG2*Do~aPHMav^6Po(PTP;q=xs*r`
zUQ^o<T7w!1Bf^PAj}fVYwF&e0!ern@8YD`6PuS1Q9(ZcW3&nf6Lw-Ji_IYVGbWZKp
z55>7Afxvz}3jvA3SBW~BDIbBrCu0XeX`xm)m>6dnJG;M*s2O-m<Kou&HhLkcrT<j4
zE3wXP4@bIhZPR9tih%OKW~*ps3Yz9dLckkK0{lrDrKhAsc=l{GB17)>+m2i38K}}M
zL9r08%`LiBH2bwW)%ls=Fe-$aj*03)f&h*4t~Ue1DT%UI^<2|+w$F)Jdom6dhu()|
zG~zR;9Nj)$ioxHfK;(;$w`ShDK(remEcxgVDO5EMz(onJXDDo&g=fG!67milXKck?
z0rK!!3K%@MIIOPumIDQMSOo+n<MKliu{ZpDW^>DMK}2g#PF)jC?!tRe<j}|wG|MEx
zL-I{^9hA;Bd+0uu#R9x~57O0W{D1?fnSrq#6be`ka;^VyPqyH-0!NZ!bWvDnlX?I0
z{ZEqM{5~D}WjGWtqxfY%Fm^)g5Zg(*g4iZ+{k&5;&n9qtO#(iV4-|E6Zcy#qV$rY?
z4>pms+>Tgab!D_AM#q^f5r<{tCWT21k9yR$+zvo46y`F*rk-^`taOB2tWz5-jWmU$
z-|4&=o-WA|w}3^<H`=qDg6ms|k~UYYv^8pbVN6YO)n;BhuvmEK*N~z{sPdg7DLJCc
zxr?|zt)mQ$f)MKEma=}0X#6v6sf}7L?4Hrm(}#w1@T_89*l-55ocA<V{rQTBoY6gu
zS5kCAaV+;rEEX})3`fBI>8BeCA2xVdK-At`BY?oA9WJD?#{f`;@}7g_gDr1PpKQPn
zBoi0mPESL}X>WI-wYZ33H7SpWH-EkB_f03r*;3uj6iL2|I{E2=a#EyvRNPkfJFxet
zXAVt7xfTsV<<$lJ891FVf6=lMK(_BjVcwH4<{5=S`dUcnB&H}ggT*?{sUu*~@2OR2
z_*|O3OaktvPRCrz_A_D1`?O}n#PXf9?p>3fo?;jRMCAq-z=hdRUb#9=(rXHL*8nlU
zrd=PdZszf{^w0IRwlOC`4I%cq$Pkp81gFRpUJ~_y)2g=Gd@mHlh#v7V;eMOFhJ}bS
zlKXdi+iUU9LDqh|u!0PY3S%P_hz#E6G?5u8-QYcW1wQ+#8O<K0urMJcMK^oCi=tf2
z&#9!xBEtr?@777Y8(K3tC}eYqvQw)=UjXY{+QjTFKoLn;v#Y7prnW*wU6TDNwn0e@
zW$`jN3_~Sc4B9f{YPd!n1CarEM8IUrrY<B8T|lpI$8E9{Dlzc2FI#a6Xo|e{+)p=;
z@C6PL85lsD#j_QsrZYqn3d|z$3<!@jvAp1%_WJQE1*QpkMY*jM<nzn-Kf(1wn00Pr
zXjn9B>SaxBDek2qgL^$V>@i96#1V>^rz2Ijwj5p6|13D9tw!-r`zApfzUXW{r>934
zVtMv&ob3{u&zNAj#QduDL3xr)6eDo^LD1U|0n3jXXJBqO8h9Yqf$1ax2KwF;DGYB%
zsKLo0grYv->A`av4WQVQpB?4fZ6J=Q4pTIu!krb=<Ei|lQGOa5Mf|HTN@ekgKS+XW
zcWm3iGPnm!!fA~U(x6Q`_f8b*K@`@CEd$h}4m~=wOSs!96w<97$_Tnj9D;97;|S=U
zVWPUqyE$lfYh<f7#cavQo<Z%+9uYO};KkJb8-xhMK_V4VoKAXf!ovJC&;b_q$GRp|
zwO?qfoAO~3Ueh?~E_J>iu!=R4niU*_$q+~4R9>C*kX{-nDD@#iM~~(422BjWt~C)8
z)NMNwz=$;R3ID+;HR?&Ir1Y0v5cRYwY)5+~nvcMD4V^HurjB7bu|@U0y@{Ip*D&`v
zUxG*dv?qKpyWe`$5GW-(TM5vbsr@YeU+Q1z;Z_4f>j~4``GV((3@mP6YV}h@yyD?1
z#@}K{A!Me1TB*NB9`V5~YcMEPWi2IEgRpvtkR@%(K^WRu>Cg0CHGif8yl8C!jh<1~
zw7dE#P4g&I_=4Zm%sgpgM?|Itd`5>K;a-Tz)?A&QBYZtyg_x}>g{^CDe`p4ofS~ed
zPN)Pz!FqLBi;ddLvQ!a@1Ogpq&hoh$)!IX?{jGq+VNAr=Yu5e=F@z;{Pa%pkL`}AM
zZo%m7Fi|}m>a~-zf}YevXiuqg=ZA+)c9>>|BU9TnZe%^7ozxv6kY>=f0ok9Np4@Sg
zwQ50F#H&KNMh`Kaw-63A;^0$%Y->QfyZ&haFwnez`ODAOAoCA%QGIE9CYs=%y%y~$
zYZf6vuK&81Ojb}(rY7Z=n-VHT+bX6|6D}$&jR3W-Ms|=U@;Gig1nSA1IL@~tF}(%@
zp21JfItX_p(_B%Q?YFv3dv(7MT#ZaxyHU8(gCt6wxYfLiE@<L<zaB=}YM|p9(RMhb
z9_|=-14Tj+ybw->z;b{YR<8BlN6Fy6ur@u1x3sN)sC2firQzUC%{P>Dr=dY~7N>6T
zE)IKmp0-%w`c(92HK#EHOjvsn1O?K{Z$;|VD0vzIQA0qoZp}<$Zb%Bz1d&fIP87A*
zGdP%XO-EtY4!d>+i07)a0z>F@L@U{{%tBCG;&XF~MvO|>4&T(-0B#dncM*zB2BTU=
zM;Tj)Z<q-Z9x@UHgsx`eR=tB$pwpJBwL4`kuc5iPeYK83jamX!^FD)wmPtbc&>_}3
zoNM|=DS9`@LvLVm8mUhG_S@Wh!0NUCOx1=F=;<Euvm7;Lg#283R$7lpfO)<cL?T+n
z%2ee(3i^U<jSpSW&O7^3c}Y*-JV=F_x~TpP8Xs-#H{$5y9k16F%g=^I)aY3Ov7QMC
z#j4O8f;iV6V7_}gZWdu{fU~DJl{JZj1k;n))3vMtBRCK#9tHpPwg(rnjf`K~<A_^e
zrEMX?ufy2xs4(;o;i3hQGU0argpzmiL0Q<bKh)jgCR8j!VtC1xp^_$we)N!+_QODp
zk~H<BIkP)_`gGHP7kmcP5IRW%b{VjW-iJXYnfmu8+!RC>V;>A3_p$Y<z1mnb`%4Me
zbSCxS++ELSuq$1a?!CZ-SVc|}Xx#g(cZxMZVWtFOJ^l{MaNB%oNFqV}bBDwN{;j60
z4zk#Ro5F=<;iym|BEpO-5nxCiN{6rrq}+tTz}nOTq5$c^eUK`UN4_`h>rH}fwWTNC
zn`ROv2#n}9m<1IrYDQ4J!OynFn)n6VENtj~gmh?1Dqb?84H0xCvU~<KS5a%jQ2Lvm
zg3nye3PvQvCnxRN2&odY=|%-i7D1AoMl$Ym*5tgeH^U+o9}>Ym=;4UG5p(<!bIXAU
zYqeuTJpAZfqNkE>l&WuL$mYrBpQ^*ZDGrDL7#kTmc88Oo<a&%9ooTTbYykpOmO5z;
z$Zq6ODsJmxJhZRo30KfG)Y9f{+L~l}w$=%|fjGX8XrWAjaCCO7ZQArarJYeWnqPP(
z*tQFrtWxV~XdvVLEJRA0^>KRKRZr0oX;rg9E2$kc?v9Js(^~okq1m05A+A*dbr&Za
ziU?>{sUP_ck~xV{oUTV(HB(&G1U{M5B4nY$6nN)ySGSG3c6!2FLpt}_EFvo$chu0d
zt#{2$xq2I_ck4`zv05W=3YXLX%_LGLHT=K?S}9m#7I-#{#;Z+)uFh!FQl6m_A0Kg}
z8?{+|5sas&?mTG=)=@54Y$}C3cCAdRh}YB!_axehpP>1WvVmbhc-Wxuafb}|QY*qO
zaOU>gVCfBFrTOkWVl=hs^nAWe4NGcUZ-6}#SVcR{ckWpuDctGN6Y+O)3(V2u3G?n-
z3{9(=qY)YpDxfJTXIQ@IUzQ<j5t0+zw@9%{z@Pp_AVfC7q$$j&JvPgo#v!YW5?Rk5
zF9a`s$SD1&>G0T{{)riKGlIDjG>1})d{AsyASvV{wKVsJK(zo{S9?M`?^<;R4Y3`-
zm-W;ru>#X8P!)Ja*Bl3&yMuU|)1?TF9^49$O+0Mw?&w}{Z>pSb4QOqe=~kNaNBi<y
z{|=K!%xd<;=Wj);`BBYMkQSde{|A<5w9N?zHzEK40fuQqLr_UWLm+T+Z)Rz1WdHzp
zoPCi!NW)MRg-=sODJ>3m5OK&*#lfPeh@(`o2o_3Pp;ZTym;OPMh9t$sQE)9d__J7b
zaB<ev!Br3he?VMaoD^N8#QTy$ix@9F-p6_O9NxPR5E>Pxnq3oss#!)V9uu><Rk7z4
z0fgYgI7TIA>WTDX2A=hGPn}eEQJ&@9_h*HayvYEcNIb`M!y?`wp4qf?&ilk+R+1Fr
zbK)_BE=c^yb=l=N&P9g>o*6bWsd?fsu~_V2xr15BP>H9BBZ{g~zL0fU;k?CJt<+fS
zp8SQuytb0&I;|nZv4jMY5Fw+6GAghTrClS%M2gO19{xecpCp$|t}+-o7Epx>$?=2#
z!SC6cg{et5DHsE~Uu^qh80gsrnswX$KDO=V3E+PQuC%tl+5l!hNw2rH$Pv)D4P0Ee
zHF*!X+yMrjbjgq$$xllt6oB_L`lcMve+vZG+_|;RaryvcXjaQNz`-FfQl#v4k9YTW
z&h6ix*8F||rucHazFp!k00006VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkV
znw%H_000McNliru=L!u11_fIC#(@9;1ExttK~#9!?OQ=>6G0SyDG9|x+e;*1X&aJ*
z7!S6dWc6Ze5yVFP1A0jy7V)46&2JFBs8DDx-UTrcwP2HrhMa73u(>o#HZ?*Zm!!}%
zr+6`GlHHx1?PhkSzWE?z-|WnOyZg<Xo!Na4Kte)7LINv1@)iu@`Lm}TmdAhb@|DL>
z0M^7-Cn6GmJdt3+xv{>k<M;Mgh$j+oP^mJ#@R`}^ffE_#H`_NVkT|;gSf0Z$zgNUz
zz>OYg2DPj~W;zN}m#+278pS-(rm52?=3%j#((wr?0BbL>LaY7<pqQt&soNMpC&1Uw
zX|BE7?H*`^PO}az8#Zkl7za8J;5h`i-2)A$hLe6c=f7~$7Jz8e)M)_#w99k?@E!u(
z?1930fCxiC?}TmGv~@(|H}rs*uK=)LI4SS}*`}%E15hb1{>eo)O9Hhl9=}e2)z!yb
zhaYVG0|FdWsxUJ<&6JR|(8I{@b#n@81&sXO{)exkD6Wv^ayi5KKSqAtGoV(hK`b6~
zM)3UyC^xR_$~QMQArJ@<+hXH4oCWRu+JlLSsZ)_39ySb*(JiL|CjK#_!qbxXw;eu)
zonvC+H+>nmyZaMrwVEkWAP|80`Kvv9>D^5L0N8$*HB{a1MPcFhlE%VPspM!Zj9iXT
zP5&_S6JJNG>b~i|a5y|*KRD9YdHecJZ##PLzWtRW0)D371AbT8eqH+?_=y56FW;sn
zJOBRQ#-q_)00w?j0i2G1PJxA==mCnNz)EyQSDsF#b*src+gV*br!TfJ@Q;xe6Wyox
z@UI_RTVDqLyKRRT9(EQ&nD})b&^|tfY$ii>qN$G`4F8<~8^4$IlB%L<P|>uJ&N4`C
zF!Gy*CN3;ovHUEwvr}Le+K7c;xY$s)V>5X}M#hOIfCxQM#2e+R2VjcL6jA_8v6;M~
z%MW1P14F?%!=b33|5G~%o=JaiU#D3o+B9`K%{ts2FPriU;Q{eP0+MS<rajOqK0mpZ
zWEz|4Mh=4GAqZ1!rjP=-867Mlzw`j<0n!7|d%)39Xt$M3Rp+dDK<|dxuxaa9Arzd0
zNah=piw!L<oecqa#^<YL4Q?^IQEFKeUjXd+0bB*Zo*%$n0POhzTm`_MA0W&#0DFFb
z5VIic`2lW1<_Czn5W}7yz+C|B`2pMo0Fe0s+y!t7?D+wX1;Cykz*PY3`2j+B0QUR<
vZtDQ-`2k!#0DFD_R{^l+2k?N*58#Zy9CjQJws`$;00000NkvXXu0mjfV|sGq

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

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
index 420179558caf0cee76290b04e72a8cd0185b7e96..e40e276e04035dd21310865827ea52c80f704fde 100644
GIT binary patch
literal 10791
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

literal 3131
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
VU&TB4t!V%N002ovPDHLkV1h7j^?CpR

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
index 9da9ba51a1082d003b680705880d16d83503ef75..a3cac04acb3b5f649436c9c04811396ee7ab9eb9 100644
GIT binary patch
delta 2748
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
Co;o=I

delta 969
zcmV;)12+7_72XGsBYyx1a7bBm000ie000ie0hKEb8vp<UkV!;ARCt{2S6gcnK@|RG
zvq_q^Thn@NixqE(T0v2tq=*;r3X0&1BKV{zh=`B=48cpEMD2@$Pa^uD;uS@_VKtOm
z5EWaYme^dompPu<xZ5P%*otlR!7mBBv-8dQzL`C<XQN|^V1IRW3*i8y0RqH7K57Em
zzIH0+O}YW+Vz;1>(&KMPLMS;Q)PaZu?5?-a_b>NNR5V~-dLu-LBM~7rFeIe3;h2P3
zr#4ED^L$UIFdA!6+dM<Wj3^pg=a7Wo&9MbLfHtZ_BP3~JD-b!bqL@fQoYmJ3QH6fh
zHjC#|NoUG(V1J_cZ@@Re*{N}MN>mxXfxjW{8{pZC;=NgQ18T3^UEMYM{`P#;4Oo{G
zf;7i{T0Yu);bk>M*Ihlh$~T}%3F1d3KRd$eLi@70J>>%kR4X8|lOf*y?$eUuw(f)p
zS|R<kN`od#JP5jQ2uB~Bu~p;5;>~E-yksS&5KUGRhkp(qaTC7t{8^#%`nw(T+FJ4a
z(IB2&KZjgy1Y9&!5kqY(iiW0oG__2}VE-V@yoGcs2ita-BUPnCEE++b5rffWAfL%2
zpEr?Vj%C@9j#^$qlsO?T$9iiU+B#bB@#B}m3WN`|6FYJnTrc5B2R8qN`yog!q_*RL
z$8s=&Wq;bPxK!di56vy~0?tp4;@ZqnZN*VB)kGAnab_H;@>}4YaH7HamPaIQB20xV
zYG5d9agonrAo;;<M>x1<6#^>*Dt&cfLzoV}r@p!zoo8OpGncZ!AuiIeMlhTn0L_jB
z8&LSXOZkhBa~GrdGnB4@Z(zsvov0>`9X~m0;D24B2WQW9;&0&JDaUFRCIj*KH1uw`
zgIqcbJI6a=gs`S}H<HQkl?^<+e@84_yn>c4U4#esp23J4NF`J5(Sz4k$By-D1A}=Y
znc*~Kp0}{gd&?OuvdWx7BJm!5y>EnXz(Z}UW=zlppL$Va7<h`hF}zo6Zh$fZs}kEv
z41d^Z-lpn5ff6r!%P80QWe%v>zBc9r_BChHc*){2P40PrUA^Bo|MB`#^7P6Yfd<N#
zzxcX>VVbD3EZjaVFeE~_vf6U5dDyXiQ^~j|Phb3=fnu>=VMu5gh>V74X`YQQ{a<nO
z*4;5&@BWW#V9VByafOw&dduXQ7m_g(4niXpiTEb6x!@P8pd2ePP-$Qg`ZOI4S|P)S
r`5Y4%8x+69fZ86_hHt>zm(|7(gc6iExtP}~00000NkvXXu0mjfICsr-

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
index eb8cbc1f8183f22467a88c49d340e8f864961ac9..b9a49e1ec9892b4a4beb9175fc56754b5d90d413 100644
GIT binary patch
delta 3209
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

delta 1504
zcmV<61t0p18Sx8{BYyx1a7bBm000ie000ie0hKEb8vp<Wqe(<TRCt`lR$Gf4RS>Ro
z>Dyd(H#ZU!lHesuBmo8Af{GW6B!c=Nf*|-HivARTfQfk$F;6~-zGzS)F&Yg)MNC}6
z8pK34#=T^Brl<RK_vv%2Iz2Pl+3ksn$y&=y_c^Cd)mK$t)qkvn+a$&D^Nf`MmIE-b
z_`xS<z+c*DSL%%b`1*x+f4CLS8Dntnqwny|4tE9%^Z^Gxc;&%b03`eF-+8gl=8AWF
zlk=fRhoV~3n>)AGn)4T~+`IDPxDwC>PG;P7>vCwpShM0B^T{|`HEUoETv{s_=aQ^g
zV|5+)5dau{cYor^`(A|GD9C`*V*#A_{I_=a-l@<0h95RIHly~osVG^9Q`JfHbU95i
z3d;p&GL%7UQ!AR<y=9^^yV&h5#7b4?E*ls%^CB5GHZ-Hj9UGg;QmoSJsfy>iak6#i
z=CJ@sgeSP)3Vj(!!I)*HG`7@bWf%p|Mc58~Oh2<_X@7LC%f4fmUM4t4kX#0ybT+sv
z9+ZVfEi=9Z`uGL@;nA~*+>fG(FlcOS1?h5<>8#LYri%(38J0fk$mZsD6wh^%BFQy=
za$A`uj6ga;EAS#`BhB(&mgjM%9GAucAee}q1+6fYzVy%zH`;(LEyl_P?g-qMbdC{v
z469*^l7AsFIT1|=FcdvyFlYu?B+o~4!j`C&(?9^q4XXu!(K7^x3XBo*aI)cJ^r}b;
ztyNJVn_X%J0>kKJI1zc2okHO`WrxDY(CL1aAyjLJUe;APWhhVb%#whu&j6z%1{fg~
zkGru^=Gx$=L=G5gDT+*np2TU!$WB=pV+up{cYl^SG6wTNAn{AMP>DMP5;JK@4{Agf
z?@u$!OE)cr<gB@=9VCl!nkPkp8OVuV2#Rx0cpj39qF3ECCvKqe!eM6>^M&tpq~8i8
zMoss1Wn(}-wzdQu1GH{xS&u^D0!xw?B@z!Qj_k*)6rC4J=|&UHBW+AsP<!+vqx4rL
z5`S1KH@PTtXhYKzc~o^#T?R@IomR7qmzb*MtKD7}BWsf^Bjc{ED0*Z*bw+Qos|XxM
zpF8K|pL4+IeJ>EM_BkeK5WP!(MG+(jThsQEl@{JS{WgtBIKcLUH62hQ1J%l1XA3Ey
z-I7rF3JRq9vPeKlJa6P+LPrk}xF1Fgf`5QP1NBp(Ae9PKGY9Q!`VDY8_`?Wkn80hV
zzu`)9?42Ws$X1Ejy=w=ED*~3T_8?7j1mZFaQ6#`d92)Hjn4evQJS(8rRiL$YI+R#!
zOz^REvKhegLIRn}p%<s1i;_y=+CTIewK@13JlM5sJ6ygzTV=p|d7ni@ZsF)`Y=7T*
zMVUUEfm#@O4@F*}b2LoODYd-P!}0-9zbs31tes=hx3;oHUsGEqVY#jiopbyv7ZjAZ
zg@o&K7M&t$RWP`GY0jZB;Nhg>{pkC=Mt;()xppmfYi$I!Z3s+OAPEFQg8BIrxgzTU
zko^8^mnvGr)ne6}!6>KAs%M?fz<+MH9>C#4&%k=hk)y|M0Qh<O;&5ZVgnSMG{GT!e
zFhKNQWol{?W*$2UX`Fygv0E|=56wIWOH0eO`VPQXU!G)l@7Ztn?!5<2pE?KasWx<%
zy6!oU!J3{24nBZGNQ0hGm61*eTuJEsk+^lQ6N6DSvMv3bkANeYp8f?c&42vFMlwLs
zh{81p@47MrVY>}yp*h@(P%qoufnN`u0l3a#&o_@iFdsq(DgZjB|0AGsZbt2`_Hk1V
zP_#d`w~bdo=Voc`Pt2WX9v$7-G~PrlfYs?=xjzuE8^K$z2C(Q!`1tu~MDOsSCq~xa
zp8fvc0a)#9wFu?8CprHUQ(4M0&+To$V=K&Fy#}A2_+rhSLH++0z`>^<hJPaD@RP@%
z>c8LEClE=hYVXu>Yy`l#i?>SZ?2iDT_E>Kj0vPn=ddpw576@^5;qw~+0000<MNUMn
GLSTaHzQbVv

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png
index 9da9ba51a1082d003b680705880d16d83503ef75..896c844149da2caa6c341f8dd26f8c590481338a 100644
GIT binary patch
delta 534
zcmV+x0_pwU2d)H=BYy$)Nkl<Zc%02vziYxk6#gs)vlPb!gRcD(q#1;QATBMXn`2QB
z=~U_7u~6(%D}v(aB$Qex7CLpf|DjNWKPs4RA*I+s+Cg(o;w4cuu^)tcckkW3FYn&n
zy#OpYFP!~Y$JU9f;&s5--)0$Qb2$w9!?ik&L`769mAUaPr+-PBrmpPRZ4E~PJ3FD3
z3AnA{NWc$loB&NiR`zR}y7D$y*U<gwr@<6~Y%XV->_rY(eK3#Vpg%+;Dz5C@x+V)u
z0`13#wK{jgToTIN9)z%n)})EnqzNG`LI{gM`w3`2K?sY~hV>bB#yPsq3T6ZVK>PTd
z3Xy4}sM8BYn1AUNMREMIQN2#*pk9Y?a>BH;CEy00=b7W3PG?F`Rq-7E0stgl{)jI`
zfDnQ`>{A&45Q~}mZV^}%OahW5;ZiPO{0eZpFtrz{A_yU_5fIX8BpMAWFGXMxxJ7{H
zd0^()jx3XaEWZH&;y4CE07fvigb-@O0!ybyg{7m#fq&P9h!y%(Od}w7dypi_7w0sw
z!Po*tQIN@IJaJsB*5>lT_AT%Wa|FJ}W3=w?Hb)@Hah`60D*?dYE%-krnHMk?HA@vF
z>%#3#iOL6uNB$ECa-6G;Z4Q*nCHm=oFJK#ieE!t2zX+1a)ba#2dJ!2P39s-zG@piF
YF`2?d0uREQRsaA107*qoM6N<$g5fswmH+?%

delta 969
zcmV;)12+7w1l|XbBYyx1a7bBm000ie000ie0hKEb8vp<UkV!;ARCt{2S6gcnK@|RG
zvq_q^Thn@NixqE(T0v2tq=*;r3X0&1BKV{zh=`B=48cpEMD2@$Pa^uD;uS@_VKtOm
z5EWaYme^dompPu<xZ5P%*otlR!7mBBv-8dQzL`C<XQN|^V1IRW3*i8y0RqH7K57Em
zzIH0+O}YW+Vz;1>(&KMPLMS;Q)PaZu?5?-a_b>NNR5V~-dLu-LBM~7rFeIe3;h2P3
zr#4ED^L$UIFdA!6+dM<Wj3^pg=a7Wo&9MbLfHtZ_BP3~JD-b!bqL@fQoYmJ3QH6fh
zHjC#|NoUG(V1J_cZ@@Re*{N}MN>mxXfxjW{8{pZC;=NgQ18T3^UEMYM{`P#;4Oo{G
zf;7i{T0Yu);bk>M*Ihlh$~T}%3F1d3KRd$eLi@70J>>%kR4X8|lOf*y?$eUuw(f)p
zS|R<kN`od#JP5jQ2uB~Bu~p;5;>~E-yksS&5KUGRhkp(qaTC7t{8^#%`nw(T+FJ4a
z(IB2&KZjgy1Y9&!5kqY(iiW0oG__2}VE-V@yoGcs2ita-BUPnCEE++b5rffWAfL%2
zpEr?Vj%C@9j#^$qlsO?T$9iiU+B#bB@#B}m3WN`|6FYJnTrc5B2R8qN`yog!q_*RL
z$8s=&Wq;bPxK!di56vy~0?tp4;@ZqnZN*VB)kGAnab_H;@>}4YaH7HamPaIQB20xV
zYG5d9agonrAo;;<M>x1<6#^>*Dt&cfLzoV}r@p!zoo8OpGncZ!AuiIeMlhTn0L_jB
z8&LSXOZkhBa~GrdGnB4@Z(zsvov0>`9X~m0;D24B2WQW9;&0&JDaUFRCIj*KH1uw`
zgIqcbJI6a=gs`S}H<HQkl?^<+e@84_yn>c4U4#esp23J4NF`J5(Sz4k$By-D1A}=Y
znc*~Kp0}{gd&?OuvdWx7BJm!5y>EnXz(Z}UW=zlppL$Va7<h`hF}zo6Zh$fZs}kEv
z41d^Z-lpn5ff6r!%P80QWe%v>zBc9r_BChHc*){2P40PrUA^Bo|MB`#^7P6Yfd<N#
zzxcX>VVbD3EZjaVFeE~_vf6U5dDyXiQ^~j|Phb3=fnu>=VMu5gh>V74X`YQQ{a<nO
z*4;5&@BWW#V9VByafOw&dduXQ7m_g(4niXpiTEb6x!@P8pd2ePP-$Qg`ZOI4S|P)S
r`5Y4%8x+69fZ86_hHt>zm(|7(gc6iExtP}~00000NkvXXu0mjfsH4qJ

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
index 1c8714a8db..1da3a0a733 100644
--- a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/. Edited by FoxxoTrystan",
+  "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/commit/cbe076402ed43b1cd861295bbcb95608c453de7a. Edited by chromiumboy",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/static.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/static.png
index 7d8c7a8c49c0d50a333def578ddb231367e3d74e..6097982ee260134d4413f66b77a391f69a499f97 100644
GIT binary patch
delta 640
zcmV-`0)PF;444IwBYy&4Nkl<ZSi|jCL1@!Z82$p8(nHtFu;ADnV<6UotEUmg!yFVZ
z6-7J<-d3o?gE$J#i+UdOqO!tv+F*wr6enyJO2<S?Pi}*{QYfWq%~(ocwgtN}FdigX
zyX57)wM|d{m%RVw|MP$Ed*Az$a5!P%$)_r8wCS1GT)oem1%CxYAzO;iMIwedo;A=e
zGXTitMZ|jpa9tYF=gR4%rOy&mPA4%ct*|jrQ+9!LlG$g@v0^|IUoI~~tthC~1<`z#
z7`37RXOHV>V&qSXZ|d0;xb7Y}dd?rC2P}P-m>K{a<`E2q8Z>6Q1$HvPqyak_U;^-;
z0kxvwcSUKKqks8KF)R!W4qSjI9<!zE4UXPq>x5$_f$gwdUZew<n0Sm%S_6P$K|)`D
zudM}(1&Ivc^Xeyb+W7kY5d@(lMH7hxSp%{xV>~$CT7j?MAY8v@n4h1UhuiI@_ko=s
zJ8(K(O%<<J%cjrJ=9wCi)9J$U(jv9k{Ra<CbARpc8-Er+T97G#_p`4M8Ob1(<%q?-
zLn>az&f&(GpUTFm0SxuI0WaW1hP-_5MPS34A<tzG@%UK+u(H{%@V`L@08020ixOFQ
z_vWoW4&1)e9su%QNgwZ(N|v!dCF%5E#Q=~k%0S9o1NX3?Yap=g!;{Hydq2xHOJzCi
z{^=rTW_ge7`7Z!~yN_Pr`OGvmnYMbC7aLDHK4%;b2!ep&;j4!GTU+1tb{dVY!SBDN
zU$vuGt(Kc>M280lSdYh<=v(>t!Sven7Sz8a0H7d>D2QT9DyQWTTb<8$h5DPmxw*}?
aD#E`ZG)<d<8L#^Q0000<MNUMnLSTXjoHrr>

delta 1592
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

diff --git a/Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json
index 25f0d7f198..a4c3148aa8 100644
--- a/Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/",
+    "copyright": "From vgstation: https://github.com/vgstation-coders/vgstation13/commit/a7290010020e541ed6b57817a07023ca6bef26fe#diff-20395160138bed693d15eee6f16d671531b5fa533ec52c50e8df6d52370dbecd",
     "size": {
       "x": 32,
       "y": 32
diff --git a/Resources/Textures/Structures/Wallmounts/screen.rsi/screen.png b/Resources/Textures/Structures/Wallmounts/screen.rsi/screen.png
index 6b6329e83d0189509e614d991e696343ef5dcc20..a3e7a3fe55a7e1903126e5a270dbf1a58c74b4e3 100644
GIT binary patch
delta 218
zcmV<0044v91BwEWIDY`VNkl<Zc%1E)u?@r^3`L1VNy9b_!*~or$u>0f7kwm0CU?3j
zb}0O%6p2vYLy56{t<}95?_Q1x>?4qK{%C?rDaR!McuGl=Kbes59Nt<}frEz&?CTQ{
zJcJ+$A7e}wZF>0$2_9n<f%o1g0}_<4Dv*NHyCK1|PZ^qk2~(JW377x{XSHNA`YV7g
zg>Ln0;ZxzAa1lU%MxVYfkO-f?JjNoLiZsVEY<7-hxFHFrm}MyC545vi8Jd80P7N<k
U3N-;1UjP6A07*qoM6N<$g6(lwZvX%Q

delta 351
zcmV-l0igbh0*(WaIDY{^Nkl<Zc%1E)zpBD86o*e~X*+b$Ne~CYMNo>9yQ7P*;NS~5
zNGB(!%Y6yo;(~*_lN1FP!9fHkUAh!nswbM*^r|?Rv_rq4e@+6wkET711}T#ZFoA|`
zM>2!guB$Ks4Da^(P$`$Bgzpc>>v0;Pghs<319G@!P9yFeuz#C%az35T<XkKk*gam;
zIwe_)&wmBZaaS95PXy?rcZLIyfiwQ)1!l89ST5$I;QPMNaKkX*XEK6TyYmpB&~Qx?
z^K}M6Kr&E*lAS(~3$Vg<{o`x&ZSXyKD<GR(fD;JAP*@N6NB}WS6Leh{5~e5$c%JuO
zKsMPDP*pWu0aygr$g(UUVafIXCx9Ig|5nc?ev4$6Wditr#yx?^HXP4l0{7i%RIS<E
xfM|AGm+Xwm6QB|x5pG)^FUTfaeIOS|gA1DYXhs25w_yMP002ovPDHLkV1h^mnvDPe

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png
index 31911eddb8145e95dbbf0d0654a2dc77f4e10fd6..bac03f82f183c78dbe5fc02524fbfa07dea23914 100644
GIT binary patch
delta 2092
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
Wn)}~#Yr(bv0000<MNUMnLSTaM8zgH0

delta 2165
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json b/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json
index 3b1da2fdae..af5ebe04cf 100644
--- a/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan.",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/67a5373b4649937dd63dd94153e05e8506f40a5d and modified.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png
index 81f7b75d7bbb59bfd8b7b305b061c70754bb9787..3af1774039346e9d93c782bdef3367d85e240bdd 100644
GIT binary patch
delta 2231
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
FV1hJBRPz7;

delta 2186
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
MNkvXXt^-0~f*({x+5i9m

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png
index 69acb7711555a22675a17c3f695e5230598504d0..57f9a29657b67e7984c906d83ca9b5cc3d218c42 100644
GIT binary patch
delta 2241
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
P00000NkvXXu0mjft$R&e

delta 2210
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png
index 63c1502b8a7955f594121f1659eb34bc10b71367..122fb41398207e6033b43ef850e9133e71b91922 100644
GIT binary patch
delta 2278
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
A>Hq)$

delta 2207
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png
index ad5094443b9ad586d2b45c2f4f9bce0d5cc7d00e..2e7be27dd052dec7ba25dfe40051b9af101b3176 100644
GIT binary patch
delta 2277
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

delta 2210
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png
index 50b465c63be30104ea43b38b3ae3148d5c12b239..48a07386adb8a90c544e656f02f57d18b7d1542a 100644
GIT binary patch
delta 2310
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

delta 2206
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png
index c6d8dacab13d04c03d2d9f6b1a7c9507b9005150..0969ca3ecd71c546d306133c643d8452f1b607c3 100644
GIT binary patch
delta 2320
zcmV+r3GepV5zP{iR)6A2L_t(YOD$Ggj~qu8KGpZ@+;{fkyVuTcvLFX1#6hxy70a=L
z1Oy3C#1pSP^2P(N{16^MNJIz%QZ7Iqun~xuU=m|Hj@Nc}6Wg=1J=6E@>dO>g_qx=Y
z>8|dobIy0Z^POU^pW6~di!vsn0r9HL5;7{;sTn3Jlc*MYM1PFqiAX1=u>v=BnY%<2
zvYQ7YiwHLck!|6dgHbV2&Zx^Sp4*a%jxP_p7DYiwM$Ze=UcX1AR#<>{{^Nl3lE~Do
zVaK>}>-O5=qoSzEFh{G${OOl0*&}C}1i=XfpJh)H+0}^nlY6k!7&vum>(2Ie6a<b+
zB<ZGQ6XggiihoHZuO!>nu~5iNbi0GuJXl*@nop)d<0j^t!82hQSRo>gU!p7~nKn1p
z>Cs(@7lPN7x9>f-ek@C~il;dVgltpRC(j}3YlsA%P?u^7rns2|JZGxT)Go0Vi)=x*
zfoXDyt?6Yr_n&=s6UK<yz)))L0H0;uxqGkQ?~O*CE`Q?-giz2bP%}HW*#S;685ubt
z(@8Q{2i?Xbz9HHTkRH5OfDay#fRiis_Ptwc4#`-9g+~VNpzH3<BinWq1A8&I)6)zy
zuY@}qMa<^4M2ewl7WG`7HPO^%qV|TWP*t^-3^vfnayyD?nO4Wof;HM7Y8u!<y_GQV
zB!xH<Xn!LqAOfGyd6|I$!NjHf@igQ4Tr?4uv`8qN_qFy*QBgD{k>UkKDfTicB>z!4
z^8nb4oOzxgphd}}B$LPjVaOFVi3Qg7SPIORXmXhLP3HHSxEmCaJgi9sl>&@%a0Nw`
z@mhAqduf);Gk~*pWCXHv(sN^28C~K&X^w>C>wl)(RDqD1Op&mu(3v)29f6Ilk!`u6
zHG@drzjnR-1`o_pNK-9o5jPX6LW=NaLBlHHkWj)rU0FTU(HWAQ8-__j^ex?xnV~H5
zD2&K1D_YQKky4h%;Jl{VA6&cst;^@%zxsD3P<fOx>>M;^H4C?_ta%Br2?)1C4|r33
z?0@nL>#L`~=H0&&GU~}RVEKgEYm^4m;iP?d>&|30KUnd@?_L30Ok%(M!=Daj2E*Rv
zix=mUT`I6uVs=-;RB(<8QB5k3pW681{w;ZZZQu@9v-u-eQWk<`Jnm^WjB!#ks&9UJ
z|I#;K8oLOnc(}9saOcszon70ue)034dVhPn+Yg@{A9aVWl-6n?+lH$0lGiojkP&}(
zFiPfAsfm$T0D`w^Y(~ee$b?G`v!E274^NMu+%R<W%;xDc8>eMS`qf)+Z>$|_-?M4l
z(8)1fK!(a`l&MXN8tjNXk*IhIT8Oz;w(6>^@tO(NU`Y4B*qeL4?HrUOX1FTTvVU#9
z`>z}AIutVMJub2&&9bQvixDHGS!s<3g?0MqKvq;Q%uo@a8n;G8Q%vwde&^apZ@zKq
z!S3UvC_K*x$vi*wd{BF_>-lwEfA7^Zzx(U8^<yKK2~E{ZX#vt0id57K71GjmW<dnM
zG)tjg$LblD3=}|gloioCSO59_D}U!@i6o|Mp58oh;s_=;P8{AiaRS~wb8?+YvSEyW
zaOKrMU%e3%i-j@GNQXEWeZ%PMdLxh+Qj$j7UwSZ;m1SOvr~(j;q`&^ki*LPmt<||j
z97QIWs30kppc*R;3p<IJ#BbmG;LX=Akl6#iTF04XtjYjW8YIc>oqcEwJAeP&p=Y+v
zOp}uG1e-y(pwu<gP87i8y}x}p9u5p0CTkVqfQm58x+s8PQt*9me&v;O$UxNU3C7qG
z)5?T#MA`4S_wL-5ptZ5T9|V5D3tTW`JXKf?Z2{wFKl#yk)cxwl$xP5!P99!AG=#Bd
zHjXZ@E#Yk?sCc@0Gp4hUynlzXh(bS74YapLu0yS}oF_TrAK;T3?9UM{d<3$X`1RX=
zSsV8M^S{raCI7wq;Krv9(xTk={6oWWyC+JTWX3v-#w&-go*5%AEC`)7-3MtDv$xXZ
z6yYax?59)aT8<B^WH3SFVgLHaciMgE$8VsLp-SvGzke47i0+Pt{eQ*<M9}=j)5)}>
z=u|$=T2~JSd-<j3w>F;r<mM-U*rHssy9UakjC1Qqoq^Fv3a{JTymR%VZ@>19KfeEu
zOBY^#y1LyNwJI@Mrg)AGvU!NkCPY?cn=6CQC!Pdkc-WMOq@pY7QIb=Erm0Zk=?+c~
z%>Z#r(l1>&+wOj@oquV%)zeW&R7E7Il_<dzSvRCbZnKbdcnb3ks{~0>!{Cl<Sgvcp
zhti@%3wD<J7Wkm5OIp(r=sOo)u&HW0b~6raEJ*8;$jhV<2BaS|%(9sRwO6U;l4U4`
zC>vXhi5wD(M&+pKUXP&#@%^38dMX;04=6xKxH2O2mQY77M1PLPFRDVL*v1hl_V9}G
z2p^$K;x{WR{7J-P6pocon&nET`PCc60&*m|WCPIl$?BsPz~V+^no$_Ak<7->FhMC~
z-X5R}alOZzj$p%6!?ZwkdF$BHP~o#E%bBbSp4Si*xiFlP*)%*-q`B($N$o1E&I@>?
z0g!;Sks*RgS$`M<uDWCmc~Nqs$E(I=I961ZA}jsz+T0K1%_V)=w&EzA)oiKjE~zw0
ztD>Z&q7>>uRhd^jU!Vm-T|pXf+ErEW$!=Eb1&kKCE>Vncin0)FfSf9n&S#1y4_s>=
z#wav;QljP4tLM+}%|bto`Yi;_sB&t>$Q57MBIjj}N`J=%7CW|s(@M*B5v8$?gi&pZ
zGAb!}G&%R;SxVwIAC=r$Ssiu;BAwm7x7~Gco+%X^MUWdNXCze0<eHx}@>v)bmFRX*
zB?|~uRN}m4*HjKDv&kP&s;D*uZlM~-?Cj>lN2gpN%)Xy-_Vwqtx~e!kro1GsL)fvm
zoDlN`2!F@A8Yq+=qPdsS6eq7<|KE2XY^^TE0%7IDrLpJFj;<~TyPsx&9}>$<4<`i1
zx+Z<Ry+`O;FfdTFkb{Le4xc!rp~ry(jRMyh%DaUDSIMX{RQ=!?`4D90MQkZDx_4O8
qQqL)ppoK;1^!k$=9aj+1{{cYDMJxl=ea8R*00{s|MNUMnLSTZK>3skI

delta 2203
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png
index ce5adc65b5d1ef61d0c96091b9af8d7d0de684e4..89314482b3a3b392d3c07d3092e1ec06d182fe21 100644
GIT binary patch
delta 3188
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
aIq)CvKk&_<eNMjs0000<MNUMnLSTY=fgG^_

delta 3191
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png
index dd8b232de2603ce230615aed76d020399506ca91..79fb38bd6ac42893ee9a5f6b8f474289f81b2dbb 100644
GIT binary patch
delta 2946
zcmV-|3w`v48Lk(QNq@rt01m?e$8V@)000X^Nkl<ZcwXIGS#Km)75=Jg@6C2EUS^4x
zc!pV(O+-W@2?B*xVoBZ*<N=AF#S0JQg(%_$2@N160)l{uB$FA>7RQs>Jht0*Z&h7O
zck!KD-A>43%2L_+Jh!U5y4<e&-E+Qk&b@cEBuS7bzWI&k4u2jX3Vl?Oz<`HD)6}&P
zCB*U>n|#89{8O-#F5da?dV1rRMD7Iq`t_eDgW(9tpaUBkNeJMu+k?Od%pwr<pjjo}
znLejgKf$|zK`fML`0X2S9&ZA^^}_Q>5Dic)mDPLS@4>{7uh@CbLn!?uOxr@@lN4g|
z#FnMwum8H1iGP5?_?$aDuLqBv57j$Y9fbs&qi<VN>Os|K#RO9&X@~RZxf5VufD&E1
zI37o_15Ft@;Q%GuK#AuHx>%g6tIyl59_F<eJ9~TSeHoBD0Wm#a9zra=rmhI~Fy|(i
zldE(C3IV37)0hdjFkh*nqEQ+vrV`Ao$ejS&vY^=&xPNYimT#e0w9qV0BcT_Vu0bO(
zVDUb=XKgz|xmrWps$t7n;yp9zmt;Wh1Wc?w^>9W39ur>kJ2dq!(BlO!3ZNSXM}ElY
z(5JcdQPvMfymKc&x*;8=rb9DLgo%Z%0AT+W84P&p=<^=(f$0jPgNQ@erekDB{uZE2
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

delta 3164
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
CbL$iU

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png
index ce5adc65b5d1ef61d0c96091b9af8d7d0de684e4..89314482b3a3b392d3c07d3092e1ec06d182fe21 100644
GIT binary patch
delta 3188
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
aIq)CvKk&_<eNMjs0000<MNUMnLSTY=fgG^_

delta 3191
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png
index dd8b232de2603ce230615aed76d020399506ca91..79fb38bd6ac42893ee9a5f6b8f474289f81b2dbb 100644
GIT binary patch
delta 2946
zcmV-|3w`v48Lk(QNq@rt01m?e$8V@)000X^Nkl<ZcwXIGS#Km)75=Jg@6C2EUS^4x
zc!pV(O+-W@2?B*xVoBZ*<N=AF#S0JQg(%_$2@N160)l{uB$FA>7RQs>Jht0*Z&h7O
zck!KD-A>43%2L_+Jh!U5y4<e&-E+Qk&b@cEBuS7bzWI&k4u2jX3Vl?Oz<`HD)6}&P
zCB*U>n|#89{8O-#F5da?dV1rRMD7Iq`t_eDgW(9tpaUBkNeJMu+k?Od%pwr<pjjo}
znLejgKf$|zK`fML`0X2S9&ZA^^}_Q>5Dic)mDPLS@4>{7uh@CbLn!?uOxr@@lN4g|
z#FnMwum8H1iGP5?_?$aDuLqBv57j$Y9fbs&qi<VN>Os|K#RO9&X@~RZxf5VufD&E1
zI37o_15Ft@;Q%GuK#AuHx>%g6tIyl59_F<eJ9~TSeHoBD0Wm#a9zra=rmhI~Fy|(i
zldE(C3IV37)0hdjFkh*nqEQ+vrV`Ao$ejS&vY^=&xPNYimT#e0w9qV0BcT_Vu0bO(
zVDUb=XKgz|xmrWps$t7n;yp9zmt;Wh1Wc?w^>9W39ur>kJ2dq!(BlO!3ZNSXM}ElY
z(5JcdQPvMfymKc&x*;8=rb9DLgo%Z%0AT+W84P&p=<^=(f$0jPgNQ@erekDB{uZE2
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

delta 3164
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
CbL$iU

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png
index e6c25bf9542e09ddf61db4f4d36e5c284f327fba..3fd3d1f3a2608362673dbbf1a875b989502fcbdc 100644
GIT binary patch
delta 2859
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
JPDHLkV1k@(WV!$V

delta 3149
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png
index d0384e6f2b4af36283ac4b470bbd10fee64c74ee..a9d7e7173785fed126e8dd104c6b89171fb666d5 100644
GIT binary patch
delta 2864
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
O0000<MNUMnLSTY`nP_+b

delta 3086
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png
index e6c25bf9542e09ddf61db4f4d36e5c284f327fba..3fd3d1f3a2608362673dbbf1a875b989502fcbdc 100644
GIT binary patch
delta 2859
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
JPDHLkV1k@(WV!$V

delta 3149
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png
index 45a43655f63538bf0c87c3d80f63f39cc7b8f211..970ef1f1f5d37be02883f75dac02757445580d97 100644
GIT binary patch
delta 2795
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

delta 3040
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png
index 81f7b75d7bbb59bfd8b7b305b061c70754bb9787..02a1c5c63bb30d07f843d03913d8932c20cb4bbc 100644
GIT binary patch
delta 2270
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

delta 2186
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
MNkvXXt^-0~f-km3f&c&j

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png
index a82cf0533717421d96cddf6f73b23e8e8b90e690..b6720ad5a32d08322db2a247b5d749d2fd88d04b 100644
GIT binary patch
delta 2899
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

delta 3240
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
a2JjD$Cgg?o1&2of0000<MNUMnLSTaQjPLRQ

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png
index 88c852b396365e743a5427d4cecbb210bccfcd09..9d1da43e6f0a0c4aa7f797d23d7f3f72bcfba1ce 100644
GIT binary patch
delta 2592
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
Cy6jW{

delta 3105
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png
index a82cf0533717421d96cddf6f73b23e8e8b90e690..b6720ad5a32d08322db2a247b5d749d2fd88d04b 100644
GIT binary patch
delta 2899
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

delta 3240
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
a2JjD$Cgg?o1&2of0000<MNUMnLSTaQjPLRQ

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png
index 88c852b396365e743a5427d4cecbb210bccfcd09..9d1da43e6f0a0c4aa7f797d23d7f3f72bcfba1ce 100644
GIT binary patch
delta 2592
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
Cy6jW{

delta 3105
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png
index ba6ac0281f9fb64913d60d50c23036cabc209da0..f31f3a6bc985a32e1d956f1cb578bd55fb0843a2 100644
GIT binary patch
delta 2507
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
VZdMag0LuUX002ovPDHLkV1jagyWRi*

delta 3114
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
Ef_zHf+W-In

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png
index d0384e6f2b4af36283ac4b470bbd10fee64c74ee..7c18f9c11a717a893b219d4495d07f6801e43ee2 100644
GIT binary patch
delta 2518
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

delta 3086
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png
index ba6ac0281f9fb64913d60d50c23036cabc209da0..8737894cbf0f7b8e5edaff7ed5d4fe981dbaf434 100644
GIT binary patch
delta 2484
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

delta 3114
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
Ef@F2y!~g&Q

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png
index 45a43655f63538bf0c87c3d80f63f39cc7b8f211..15f74bcaeed2dbd44a6a4e062af82cdbbdcdda33 100644
GIT binary patch
delta 2448
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
O00{s|MNUMnLSTX|>ZyJJ

delta 3040
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

diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 24da641a07..346156159a 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -184,9 +184,6 @@ binds:
 - function: OpenCharacterMenu
   type: State
   key: C
-- function: OpenLanguageMenu
-  type: State
-  key: L
 - function: TextCursorSelect
   # TextCursorSelect HAS to be above ExamineEntity
   # So that LineEdit receives it correctly.
diff --git a/shell.nix b/shell.nix
index e93db685da..9a1b0ca429 100644
--- a/shell.nix
+++ b/shell.nix
@@ -7,7 +7,7 @@ in import (builtins.fetchTarball {
 
 let
   dependencies = with pkgs; [
-    dotnetCorePackages.sdk_8_0_1xx
+    dotnetCorePackages.sdk_8_0
     glfw
     SDL2
     libGL

From 409f5faabf445c1e8c458eafe3545c47887c89c5 Mon Sep 17 00:00:00 2001
From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com>
Date: Sun, 16 Jun 2024 08:39:17 -0700
Subject: [PATCH 49/84] Mirror: Trading Outpost now has half buy-only and half
 sell-only pallets (#191)

## Mirror of PR #25955: [Trading Outpost now has half buy-only and half
sell-only
pallets](https://github.com/space-wizards/space-station-14/pull/25955)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `c0bbbc33c19eafcc8defaa7f1ec2df42e485b435`

PR opened by <img
src="https://avatars.githubusercontent.com/u/1471082?v=4" width="16"/><a
href="https://github.com/wafehling"> wafehling</a> at 2024-03-10
02:47:02 UTC

---

PR changed 8 files with 226 additions and 123 deletions.

The PR had the following labels:
- Changes: Sprites
- Status: Needs Review


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> I added two new entity types, a buy and sell only cargo pallet, and
added them to the trading outpost in place of the old pallets.
>
> ## Why / Balance
> Since the day this was added, every single shift, at some point I'll
hear someone in cargo yelling about how **"You sold stuff I just
bought!"**
>
> This seemed like the easiest way to fix the problem.
>
> ## Technical details
> Added a variable to the cargo pallet component for labeling which type
it is, added two new varieties of the cargo pallet to the yml, and
adjusted all the calls for GetCargoPallets() to have boolean variables
for buyOnly and sellOnly to tell the function what kind of call you're
looking for.
>
> If you don't give it any specifics it'll still treat any pallet as a
two-way one, but this function is only called 2 or 3 times and I've
adjusted them all and commented the function itself for anyone looking
to change/add it in the future.
>
> The old pallet is still in the game and is set to "both" by default,
so it should work just fine for backwards compatibility.
>
> ## Media
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/38cdf849-3e05-4f98-957f-65a719c2280d)
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/56e471e9-b45e-4332-bd55-7220566542ab)
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/a5e8e651-d301-420a-b2d7-cc4cf07a50af)
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/fdf2cf4c-fba8-46c9-9a30-7313a2204b5e)
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/3811edd0-bb32-44cf-b884-e0a9f4bf16fa)
>
>
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
> ## Breaking changes
>
> Shouldn't break anything, I've left the old pallets fully in, and
updated them to work with the new GetCargoPallets() function just like
they used to. Not sure if/where you'd still need them, but better safe
than sorry.
>
> **Changelog**
> :cl:
> - tweak: The trading outpost now has dedicated buy-only and sell-only
pallets. No more accidentally selling orders you just bought. Cargonians
rejoice!
>


</details>

Co-authored-by: SimpleStation14 <Unknown>
---
 .../Cargo/Components/CargoPalletComponent.cs  |  21 +-
 .../Cargo/Systems/CargoSystem.Orders.cs       |   2 +-
 .../Cargo/Systems/CargoSystem.Shuttle.cs      |  15 +-
 Resources/Maps/Shuttles/trading_outpost.yml   | 263 ++++++++++--------
 .../Objects/Specific/Cargo/cargo_pallet.yml   |  31 +++
 .../cargo_pallets.rsi/cargo_pallet_buy.png    | Bin 0 -> 551 bytes
 .../cargo_pallets.rsi/cargo_pallet_sell.png   | Bin 0 -> 535 bytes
 .../Structures/cargo_pallets.rsi/meta.json    |  17 ++
 8 files changed, 226 insertions(+), 123 deletions(-)
 create mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png
 create mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png
 create mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/meta.json

diff --git a/Content.Server/Cargo/Components/CargoPalletComponent.cs b/Content.Server/Cargo/Components/CargoPalletComponent.cs
index ebf0be93e0..cdfd0a3874 100644
--- a/Content.Server/Cargo/Components/CargoPalletComponent.cs
+++ b/Content.Server/Cargo/Components/CargoPalletComponent.cs
@@ -1,7 +1,26 @@
 namespace Content.Server.Cargo.Components;
+using Content.Shared.Actions;
+using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
 /// <summary>
 /// Any entities intersecting when a shuttle is recalled will be sold.
 /// </summary>
+
+[Flags]
+public enum BuySellType : byte
+{
+    Buy = 1 << 0,
+    Sell = 1 << 1,
+    All = Buy | Sell
+}
+
+
 [RegisterComponent]
-public sealed partial class CargoPalletComponent : Component {}
+public sealed partial class CargoPalletComponent : Component
+{
+    /// <summary>
+    /// Whether the pad is a buy pad, a sell pad, or all.
+    /// </summary>
+    [DataField]
+    public BuySellType PalletType;
+}
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index ebe66ff029..d8b55a7237 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -205,7 +205,7 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
             // Try to fulfill from any station where possible, if the pad is not occupied.
             foreach (var trade in _listEnts)
             {
-                var tradePads = GetCargoPallets(trade);
+                var tradePads = GetCargoPallets(trade, BuySellType.Buy);
                 _random.Shuffle(tradePads);
 
                 var freePads = GetFreeCargoPallets(trade, tradePads);
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
index 3e39440da5..b8a491f4e8 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
@@ -198,13 +198,16 @@ private List<CargoOrderData> GetProjectedOrders(
     /// </summary>
     private int GetCargoSpace(EntityUid gridUid)
     {
-        var space = GetCargoPallets(gridUid).Count;
+        var space = GetCargoPallets(gridUid, BuySellType.Buy).Count;
         return space;
     }
 
-    private List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent PalletXform)> GetCargoPallets(EntityUid gridUid)
+    /// GetCargoPallets(gridUid, BuySellType.Sell) to return only Sell pads
+    /// GetCargoPallets(gridUid, BuySellType.Buy) to return only Buy pads
+    private List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent PalletXform)> GetCargoPallets(EntityUid gridUid, BuySellType requestType = BuySellType.All)
     {
         _pads.Clear();
+
         var query = AllEntityQuery<CargoPalletComponent, TransformComponent>();
 
         while (query.MoveNext(out var uid, out var comp, out var compXform))
@@ -215,7 +218,13 @@ private int GetCargoSpace(EntityUid gridUid)
                 continue;
             }
 
+            if ((requestType & comp.PalletType) == 0)
+            {
+                continue;
+            }
+
             _pads.Add((uid, comp, compXform));
+
         }
 
         return _pads;
@@ -275,7 +284,7 @@ private void GetPalletGoods(EntityUid gridUid, out HashSet<EntityUid> toSell, ou
         amount = 0;
         toSell = new HashSet<EntityUid>();
 
-        foreach (var (palletUid, _, _) in GetCargoPallets(gridUid))
+        foreach (var (palletUid, _, _) in GetCargoPallets(gridUid, BuySellType.Sell))
         {
             // Containers should already get the sell price of their children so can skip those.
             _setEnts.Clear();
diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml
index a10f070bd2..f040d58253 100644
--- a/Resources/Maps/Shuttles/trading_outpost.yml
+++ b/Resources/Maps/Shuttles/trading_outpost.yml
@@ -3,20 +3,20 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  29: FloorDark
-  34: FloorDarkMono
-  37: FloorDarkPavementVertical
-  49: FloorGrassJungle
-  64: FloorMetalDiamond
-  77: FloorReinforced
-  89: FloorSteel
-  100: FloorSteelMono
-  104: FloorTechMaint
-  105: FloorTechMaint2
-  118: FloorWood
-  119: FloorWoodTile
-  120: Lattice
-  121: Plating
+  31: FloorDark
+  36: FloorDarkMono
+  39: FloorDarkPavementVertical
+  51: FloorGrassJungle
+  66: FloorMetalDiamond
+  79: FloorReinforced
+  93: FloorSteel
+  104: FloorSteelMono
+  108: FloorTechMaint
+  109: FloorTechMaint2
+  122: FloorWood
+  124: FloorWoodTile
+  125: Lattice
+  126: Plating
 entities:
 - proto: ""
   entities:
@@ -31,27 +31,27 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: WQAAAAABWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAADWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAIgAAAAABJQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAABIgAAAAAAIgAAAAAAIgAAAAACIgAAAAABIgAAAAAAIgAAAAAAIgAAAAABIgAAAAACeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdwAAAAABdwAAAAADdwAAAAACMQAAAAAAMQAAAAAAMQAAAAAAdwAAAAADdwAAAAABdwAAAAABdgAAAAACeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAADdwAAAAABdwAAAAADdwAAAAADdgAAAAADdgAAAAACdgAAAAADdwAAAAAAdwAAAAABdwAAAAAAdgAAAAACIgAAAAADJQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdgAAAAABdgAAAAACdgAAAAABdgAAAAAAdgAAAAACdgAAAAAAdgAAAAAAdgAAAAABdgAAAAADdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAABXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAJAAAAAABJwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAAAJAAAAAABJAAAAAAAJAAAAAAAJAAAAAACJAAAAAABJAAAAAAAJAAAAAAAJAAAAAABJAAAAAACfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAfAAAAAABfAAAAAADfAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAfAAAAAADfAAAAAABfAAAAAABegAAAAACfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAegAAAAADfAAAAAABfAAAAAADfAAAAAADegAAAAADegAAAAACegAAAAADfAAAAAAAfAAAAAABfAAAAAAAegAAAAACJAAAAAADJwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAABegAAAAACegAAAAABegAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: eQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAIgAAAAABIgAAAAABHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAABIgAAAAACIgAAAAAAIgAAAAAAIgAAAAABIgAAAAABIgAAAAACIgAAAAAAIgAAAAACeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAAAWQAAAAACWQAAAAABWQAAAAABeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAADWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAACZAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAWQAAAAABaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAAAZAAAAAACeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAWQAAAAAAaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAABZAAAAAACeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAADTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAACTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAACWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADZAAAAAADeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAAAJAAAAAAAJAAAAAABJAAAAAABJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAADXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAACaAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAXQAAAAABbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAAAaAAAAAACfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAXQAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAABaAAAAAACfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAADTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAACXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADaAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJQAAAAACIgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJQAAAAADIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJwAAAAACJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJwAAAAADJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAA
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAIgAAAAABIgAAAAACHQAAAAACHQAAAAADHQAAAAABHQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAHQAAAAABHQAAAAACHQAAAAABIgAAAAADIgAAAAADHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAJAAAAAABJAAAAAACHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAABJAAAAAADJAAAAAADHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -1889,276 +1889,303 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-17.5
       parent: 2
-- proto: CargoPallet
+- proto: CargoPalletBuy
   entities:
-  - uid: 20
-    components:
-    - type: Transform
-      pos: 7.5,0.5
-      parent: 2
   - uid: 21
     components:
     - type: Transform
-      pos: 8.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-9.5
       parent: 2
   - uid: 24
     components:
     - type: Transform
-      pos: 8.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-9.5
       parent: 2
   - uid: 25
     components:
     - type: Transform
-      pos: 7.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-8.5
       parent: 2
   - uid: 26
     components:
     - type: Transform
-      pos: 7.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-8.5
       parent: 2
   - uid: 27
     components:
     - type: Transform
-      pos: 8.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-7.5
       parent: 2
   - uid: 30
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 6.5,0.5
-      parent: 2
-  - uid: 32
-    components:
-    - type: Transform
       pos: 2.5,-7.5
       parent: 2
-  - uid: 34
+  - uid: 32
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 7.5,-7.5
+      pos: 4.5,-9.5
       parent: 2
   - uid: 35
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-0.5
       parent: 2
   - uid: 36
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-0.5
       parent: 2
   - uid: 37
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 8.5,-9.5
+      pos: 4.5,-7.5
       parent: 2
   - uid: 39
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-2.5
       parent: 2
   - uid: 41
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-1.5
       parent: 2
   - uid: 42
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-1.5
       parent: 2
   - uid: 43
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-2.5
       parent: 2
   - uid: 44
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-1.5
       parent: 2
-  - uid: 45
+  - uid: 47
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,0.5
       parent: 2
-  - uid: 46
+  - uid: 49
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-0.5
       parent: 2
-  - uid: 47
+  - uid: 50
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-2.5
       parent: 2
-  - uid: 48
+  - uid: 56
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 6.5,-7.5
+      pos: 4.5,-6.5
       parent: 2
-  - uid: 49
+  - uid: 61
     components:
     - type: Transform
-      pos: 7.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-8.5
       parent: 2
-  - uid: 50
+  - uid: 67
     components:
     - type: Transform
-      pos: 3.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-6.5
       parent: 2
-  - uid: 51
+  - uid: 71
     components:
     - type: Transform
-      pos: 3.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-6.5
       parent: 2
-  - uid: 52
+  - uid: 183
     components:
     - type: Transform
-      pos: 3.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,0.5
       parent: 2
-  - uid: 54
+  - uid: 900
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,0.5
       parent: 2
-  - uid: 55
+- proto: CargoPalletSell
+  entities:
+  - uid: 34
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 6.5,-2.5
+      pos: 4.5,-0.5
       parent: 2
-  - uid: 56
+  - uid: 45
     components:
     - type: Transform
-      pos: 3.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-7.5
       parent: 2
-  - uid: 57
+  - uid: 46
     components:
     - type: Transform
-      pos: 2.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-2.5
       parent: 2
-  - uid: 58
+  - uid: 48
     components:
     - type: Transform
-      pos: 3.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
       parent: 2
-  - uid: 59
+  - uid: 51
     components:
     - type: Transform
-      pos: 3.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-1.5
       parent: 2
-  - uid: 60
+  - uid: 52
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 6.5,-0.5
+      pos: 2.5,-2.5
       parent: 2
-  - uid: 61
+  - uid: 54
     components:
     - type: Transform
-      pos: 2.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-9.5
       parent: 2
-  - uid: 66
+  - uid: 55
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 7.5,-2.5
+      pos: 2.5,-1.5
       parent: 2
-  - uid: 67
+  - uid: 57
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-9.5
+      parent: 2
+  - uid: 58
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-2.5
+      pos: 4.5,0.5
       parent: 2
-  - uid: 68
+  - uid: 59
     components:
     - type: Transform
-      pos: 2.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-6.5
       parent: 2
-  - uid: 69
+  - uid: 60
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-7.5
       parent: 2
-  - uid: 70
+  - uid: 66
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 8.5,-2.5
+      pos: 3.5,0.5
       parent: 2
-  - uid: 71
+  - uid: 68
     components:
     - type: Transform
-      pos: 2.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-8.5
       parent: 2
-  - uid: 72
+  - uid: 69
     components:
     - type: Transform
-      pos: 2.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-8.5
       parent: 2
-  - uid: 73
+  - uid: 70
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-9.5
       parent: 2
-  - uid: 183
+  - uid: 72
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 1.5707963267948966 rad
       pos: 7.5,-6.5
       parent: 2
-  - uid: 900
+  - uid: 73
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-6.5
       parent: 2
   - uid: 901
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-6.5
+      pos: 2.5,-0.5
       parent: 2
   - uid: 903
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,0.5
+      pos: 3.5,-0.5
       parent: 2
   - uid: 907
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-7.5
       parent: 2
   - uid: 908
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-2.5
+      pos: 4.5,-1.5
       parent: 2
   - uid: 909
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-8.5
+      parent: 2
+  - uid: 960
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-7.5
+      parent: 2
+  - uid: 961
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-1.5
+      pos: 2.5,0.5
       parent: 2
 - proto: CarpetBlack
   entities:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
index 925e036e09..c628d199a9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
@@ -21,6 +21,7 @@
         mask:
           - MachineMask
   - type: CargoPallet
+    palletType: All
   - type: StaticPrice
     price: 100
   - type: Sprite
@@ -53,3 +54,33 @@
   - type: GuideHelp
     guides:
     - Cargo
+
+- type: entity
+  id: CargoPalletSell
+  name: cargo selling pallet
+  description: Designates valid items to sell with a selling computer, or to CentCom when a shuttle is recalled.
+  parent: CargoPallet
+  components:
+  - type: CargoPallet
+    palletType: sell
+  - type: Sprite
+    drawdepth: FloorTiles
+    layers:
+    - sprite: Structures/cargo_pallets.rsi
+      state: cargo_pallet_sell
+
+
+- type: entity
+  id: CargoPalletBuy
+  name: cargo buying pallet
+  description: Designates where orders will appear when purchased.
+  parent: CargoPallet
+  components:
+  - type: CargoPallet
+    palletType: buy
+  - type: Sprite
+    drawdepth: FloorTiles
+    layers:
+    - sprite: Structures/cargo_pallets.rsi
+      state: cargo_pallet_buy
+
diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png b/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png
new file mode 100644
index 0000000000000000000000000000000000000000..024678fc209363462f2b44b707900f56c749dc56
GIT binary patch
literal 551
zcmV+?0@(eDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$;Ymb6R9J=WSHEk*Kp1_7xCN|8$yAPl!~GpuL`rsNagYuY2t}NVlS2_CgLIJM
z{~-P^5d;UPLnMkW0jV9##r(8Y(<;<AeRtoNyYKQIkGoW{SlrsSjY}Y%PD8Y98}$+c
z0F;{xU%|)goo}3Uo)ChRqA1&XiJ{is9Djr}VCW*6{R~9jnIuUVbaHM%r6nf1VXv`2
zpsLN?SO^wQrc1oM--9s*#+bku6SCRt*<)3kV=`Ta8Ven>JIv$xX^ff)P)a}fJf#!>
zKE1Wa<PBX!cbLapb>`bIr6|gFG#WvYB*?N1#uzB2yC!0EK`Di4nvuDvyrGNkT6~Z7
zdJRIzj)H(%1pxd50f69~&K(D8zs+}tdEeTh%`S<M1~_l$avqnrEbDLsQQY!h9LM`H
zd0CbL>}YTH9SQ;tbvEbU<bAka4MfC10-E@d29o4F2(E#0a{)p!@jl>*lh%X}*Q<e>
z5AYZ_AK1sh%?JLK4>)(YM0~(|$2_QkUSk7QGd*`W)4SNon&^VU(8s8?O$<6YsM-M^
z;I~%?iTOaSy@8>J-x{Hr$A=8wsxwqtGT{6|%d)t7Pab<8J+TdVUo1&O)uQL!27<rm
pFCMCdWRNNp3ft9cb)fg(#TS&@TbTH6xrYD%002ovPDHLkV1iA%_&Wdq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png b/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d11fb19d36db7047aecdb29bc67d9cbc309e4a8
GIT binary patch
literal 535
zcmV+y0_gpTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$(Md!>R9J=Wm$7c*KoEvMTUa{DM#2>?9JcivTyI4J9w4>5Ywj7Y;u+GUbDcIt
zULkK_+B*tw#Y$jBRw8_b*_>^1;2b82bo|w<|Iy4W|L7NMOsCT#&vQNkmSxe)^Bi?)
z03ffETEg&qP&;?c3n4JVFf7!iK^8CGeuX1oM?PQf9_i`H9LK?qe4P8IlQv#YtlDMG
zD(T!mv7T7Cu8Z-_KuT#!DNWaPky8Hid0UJ1#M-%FuQ}nxgTt?{Yx+PC1RMQ52m*jj
zHMcFVP}q^r#e>6=<^BQGm7>3mlO$=<)n=`E50C!n88uRHQ|8F)1R+EzL3LZxS!xb$
z2c)wUN{LKeP@gNkTJgGGI!kMk(@6dh>`0(>J4W+;{Bn6<2VT?lt(x!Shr=PTmHqCq
zl%U~IM{9n7ui^9Vz$-CyuoJCzpi9l0&^z!~AE0~9n|uwQcL&ZspkvNH@F#||5BwKC
z;QjD63WbNq;C9f752&lM9<V8Hiv0tmvlKh>>5raYG(2`EJUmuEdt~wAun*{euUmBH
z16jPlj{KeBj4%v~`F#HF50l!<NF$3EWG8J8#P#FL0L`E0Jszq;2#oP~T&z~B7NegA
ZzX9Q!OLX2m^49<W002ovPDHLkV1k5Q{I382

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/meta.json b/Resources/Textures/Structures/cargo_pallets.rsi/meta.json
new file mode 100644
index 0000000000..4751d95b9b
--- /dev/null
+++ b/Resources/Textures/Structures/cargo_pallets.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by TheShuEd (github) for Space Station 14)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "cargo_pallet_buy"
+        },
+        {
+            "name": "cargo_pallet_sell"
+        }
+    ]
+}

From 7240412649de9326f9f3ed4375fe01e695efa3f7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 16 Jun 2024 15:06:45 -0700
Subject: [PATCH 50/84] Update Credits (#437)

This is an automated Pull Request. This PR updates the GitHub
contributors in the credits section.

Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.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 8c54ecb084..03d5059e95 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem

From 32328cb1ffc7e045c7e8aa30422c6760f646d137 Mon Sep 17 00:00:00 2001
From: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com>
Date: Sun, 16 Jun 2024 18:14:33 -0400
Subject: [PATCH 51/84] Corpo Jacket Fixes (#462)

# Description

Adds hand-holes for corpo jackets pending the game being any good.
Renames corpo jacket sprites for clarity and organization.

---

<details><summary><h1>Media</h1></summary>
<p>

See the bot :)

</p>
</details>
---
 .../Clothing/OuterClothing/wintercoats.yml    |  40 +++++++++---------
 .../equipped-OUTERCLOTHING.png                | Bin 9460 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 10509 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9875 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 10492 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9782 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 10959 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9936 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 10546 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9675 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 10494 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 10740 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 8727 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9455 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 8689 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9750 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 8865 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 8433 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9422 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9418 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9578 -> 0 bytes
 41 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{bc_corpo_jacket.rsi => corpo_jacket_bishop_cybernetics.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{bc_corpo_jacket.rsi => corpo_jacket_bishop_cybernetics.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{cs_corpo_jacket.rsi => corpo_jacket_cybersun.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{cs_corpo_jacket.rsi => corpo_jacket_cybersun.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{dd_corpo_jacket.rsi => corpo_jacket_discount_dans.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{dd_corpo_jacket.rsi => corpo_jacket_discount_dans.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{ee_corpo_jacket.rsi => corpo_jacket_einstein_engines.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{ee_corpo_jacket.rsi => corpo_jacket_einstein_engines.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{fa_corpo_jacket.rsi => corpo_jacket_five_points_armory.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{fa_corpo_jacket.rsi => corpo_jacket_five_points_armory.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{ge_corpo_jacket.rsi => corpo_jacket_gilthari_exports.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{ge_corpo_jacket.rsi => corpo_jacket_gilthari_exports.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{hm_corpo_jacket.rsi => corpo_jacket_hawkmoon_aquisitions.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{hi_corpo_jacket.rsi => corpo_jacket_hawkmoon_aquisitions.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{hi_corpo_jacket.rsi => corpo_jacket_hephestus_industries.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{hm_corpo_jacket.rsi => corpo_jacket_hephestus_industries.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{id_corpo_jacket.rsi => corpo_jacket_interdyne.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{id_corpo_jacket.rsi => corpo_jacket_interdyne.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{zh_corpo_jacket.rsi => corpo_jacket_zeng_hu_pharma.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{zh_corpo_jacket.rsi => corpo_jacket_zeng_hu_pharma.rsi}/meta.json (100%)
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index f3610178b9..aa4a7b50e6 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -549,9 +549,9 @@
   description: A cozy jacket with the Cybersun logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -560,9 +560,9 @@
   description: A cozy jacket with the Einstein Engines logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -571,9 +571,9 @@
   description: A cozy jacket with the Hephaestus Industries logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -582,9 +582,9 @@
   description: A cozy jacket with the Hawkmoon Acquisitions logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -593,9 +593,9 @@
   description: A cozy jacket with the Interdyne logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -604,9 +604,9 @@
   description: A cozy jacket with the Bishop Cybernetics logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -615,9 +615,9 @@
   description: A cozy jacket with the Discount Dan's logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -626,9 +626,9 @@
   description: A cozy jacket with the Five Points Armory logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -637,9 +637,9 @@
   description: A cozy jacket with the Gilthari Exports logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -648,6 +648,6 @@
   description: A cozy jacket with the Zeng-Hu Pharmaceuticals logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 5eadcdc1c1ab3fbd2bf67c5055286b407e2e4a60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..35003686d555624fcac17b387f726605cd147bd7
GIT binary patch
literal 10509
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe470b0074272a504eac30798883e5e2c6c5e027
GIT binary patch
literal 9875
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..06932fff6fa7370f5410813dea7991e4cf15cae8
GIT binary patch
literal 10492
zcmeHNc~}$4wr>{M+)zOow;<}EU?2$zBoT<pBB+QWh_c?0gcz0t2>aIK%&6Cuab*U<
zxTCTSA|e7t+)xoSin5A`2*H66*05yhR{?Qw-hA)fdGFr)-9M(2N>^8%I(2^MoT_uW
zJNvh6UO!!Dz77OI)195{-N1Q`vS?|5-)pS!w-7WZjj_Wy(An7p(gJOOQbiq7QPO~-
zGO4brq6Vpfw!NUt26ZKkvdmYRGIl-$>I**APk{Q0Pc+IgSQS-hIyk3;f&+CuaJ~i#
zYv1@>cR>9YP_)KAvXv0z4X!56>z!S;7~;&Z7&8kZ7>~i>$rwvAmSBj(kO@{~3=Yh%
za`rcgz)(mVQb6Opl`>9XQVKeONm-x3v<}qOKFO=pjK-w8{v;eKs^dJJlw&{D-DWE%
zn2;T*L*7BU8yuY-!9+?0fghw1vV*iVG&D7)XlZI{YHMrhOw*e_ZR*r%U(KE~Q*Y6H
z)Z#_+7cMkhW@c<?v})<Xg)6L9uEJpPcs$COWJAPRn_1v-N+v4W+S=2mPBWN3-2k^_
z;S$`RK9IZ6EG?x>YAQyM>MRwtSt`f_2nFPvqB3@jLjl*SYU)!oG_|yKrUHUOU8Sbf
zRMpj{Oi@<{y-A=SQlB+t_7dz`jX7JXnnvMzxZOw3X)RrsU#{==qGy>!K*YD&I&<e4
zd^Lah*TySWn&1hRRzwon&fdXsy_55XZSEf1J$LN%qR|<F%w4P?Ze&z+Ol(~Ici->X
zyYKJ&4;(vw;^e8+AAd?af8pY#%b8cMUb|j!qwr?Yt>WAF?mu|=sN(UHr!T8ty{@UP
zt8Zv|-}<4gUD)yQ*WSMVfkDa8@W`kVmlEg1F^=qaxMl%ds_N=$>Y7SiDylI`;Iq`H
zEWv8bUb|J38a~Gew_8hZ-O+RT<=RUv+<No_B3|gsU50O2-m8Q*hU^~$_U-=(*=JzC
z;c9@Usi^?tsm+2Y(1_x|inFT!2_>_rNa`r&vEM{jt@TaWTWTuLl;jOGn^)E&(5ixT
zVROU2<@#0VeFnw09>vd^cgRyJ<?Zqj#X_0^0?ohbyUA^&cqBX}zU|t@>~)+g+fUqf
zJ(<!hq;$c9zq-s(cq7nVI43gA>>vVZ&*UkNO5mlO9!^t<ZR?_yRt6Pm-un70D^D3u
zb=X;QLuw}AMR!RaZojDFptt3Vvb`%LxxPKQKkykmgPV>(d)#v??)&L0s->QzoYb~1
z1Uj|zIae%le&WF0NWD^QyQ4b*4uGpG6eI+yy&#>VI78_bD9R$ey7$O;OW*+><$05A
zL3Hb4VNJfQnNyQ%UEuSg?kC6aXoi26>u4+jRZvC;eq)j4$0_Rc-6u0d4bDNJ$0+&9
zO+p=bj)~qi*B0wL2MS_X5?`LJs9tm+XU(@?7}oS$4}T8=wJekRk232Of&#@(fIsF|
zMbp(2Cp_x69z1@Xa3jN5YW`e~K&RV771M7$N)qI-hu3jTMLaWZ0blys?A+NAKmXCq
zT;99Ugc|0aTm)(re^3bFp{%{Qh)he_kr4;Si?bWIU926LDH0SQ(8ZC(o5dr{5>myj
zfjr!;BE^fw{*h$A1SZhOpl3ntyjBDn*#|ee%1_<6_c}(x3BbB<^LxRjcic9YEwhD3
z*VoGq^UL|sUD895c@AkDQ%+^N^i^SD)^MY(t860zl_3!N4zKIghKs?J<n6xX)cNc~
zp;O?yy;Z9fUdgDM;!tmAMP(lhw~w6Wf5*nAa65f1Q#2c8;?tG&MK{N+$PRitMe(W+
zeot$QOW?Qd?GmCyGdH}9BAJ$m5D0pzH`4QKrT?(;$rld#HQ{^owyv2nRy^%m;He07
z&soAB5ERIHOxgA3l4x;wO3AjBE3&R%m}g86W|3Vb{uxpPvU=7iTM&Lo%JXXK`TnhE
zqpgpS2@hTKwOiX)${$D<QpyL0vISFpfytYn$e$yS*mD}aZFA_zqP_!%otEFsO!5)P
zmNyRojU9!h^Q&JEq=@{DhZLTvCBs%s;?Uxg&pyuQOFT2ADaxr5z*H!&cJk)aPOlND
zFj4#_&d;y8wJBX#7w_@$a^Fo^v7jtG-tnkBOPGv6Px~YYq|qg`ZGCyW%+cSpa)g^c
zG`dAoI}@&Sy+2xu&SFvOlU>EKW{a4f&_~$rq~Oah-bvw%{<s87$#X8RC#TB$F2CW7
zt87zZo_UPy=ce>l`MHn2)mNYRHgkqGr>*R7d3}oC<7#^TfN6HC&WiKjj1^JhN*IB(
z#0>}(B}t($dqWzFV)6xE@3YoM*%Zs4!|(j%K?`ZiS<^RcjX5HWxf08->O-Jk!Ve)(
zrGKWBP!;Rg-^B}&zm+$xZZ&AyiN4xh(H)LJstDA%z3BT8MXf~eHl(rOCO6}?z$<-;
zOWz{Bpv_V9R@<m4X1k6?f@Q>$2ep@aUxjxir40G`RUy#BbRnmxFp}SM7=fyr6?TAC
zE#ZBWl@x3!W&KuSu<tBLl6Rh-D)W#>l6xuln7|XYjpbzcgR7#@?G-_6Rf#~3k1S-c
zYfuS**DSX|pbr#9ncFKo$`tfDKj+F&uJJ-k=G2y)ZBi?de{sKc74P98n(f=cH^8TY
z5oikn$$$WLwW;23l6WysN}^Z4&q1JIxO%1x=q$&t;KBy4CqZ#0g-%%xCv!!%l?B44
z5}SOFYY7KaZiJ3liUf(T^e+?+SO87`Fy^w+cl7uO^nHv7zAatPD;T~R+E`L2%nA26
zd;82Ag^<!?t|**=J$7U7r4=O=+>%$;{_P`h2k{ZymRBuLYcE|ICvm-*EKU|>^d4eo
zpL#V!8zLgmZg?=u`<^8nEM<x<L+cw!&wmx>Y}UOzGUEWjn0zoJgD<I&V}N5L(C8~T
zWJ3P!aLWP&%H+%TDK|&OEdFQ$Fa|7-?@zJMk>?}OCQ2^?DGIlj)YuBUZQvAu*~@>D
zO<toXFP^hs-5U;eS5!$oyAuT#%wC#-pr|Z{(vyZjuP6w#6qXR$YKBnErapGlk>M=3
zp?Tmw0-=CyJ+nJrp1SUJW<!pf$qPnsiR<;Qks-Dq#3Sg;`&Q9{WS0_dGhxauQPQ+~
z2Uh$R6@1~{{5BvUh*4dyAG=FF^S+W!YORd;C^+U*ai=zIIMqv0Cp90X9B<<&Z0eue
z?7PH;8{q*l0s%yW*Z7hYISwd?Kl&QK%kgwOyX$4Hk%xW`JwfAO4jdAPKphI#lSRWr
zOp;{r3Awjo2Z(0;OL6L6MJIW0m=qCUawT<pf4KAzP0m*oGFL70$(u*_36I$D(zD-U
z*ZBh<N$b9d1t93(Mj$m9_@NwZ()C$CTorZO3Q9gSl`QJrO5|3YYOCfgD^5u|UurB}
zulNaWZI%a7ZonT?6~K*aa^b6a?Xnqpxo}LcO+x{JGeQH)O>wf7*FYHnJQo9%Zk1mE
z_T%@86@{p6{#C=8wUm<K6F`<u;+JvhKO_P9y?*|k*Ew}{@`7jb_NpHh3xyys>RjE{
z_<6yn^=tSm9)M+%BI6=Z-g=3#+!}7>$>Yl;{$R`A@amV+)$&3~%0Qm+lSYs%0WTR^
zeBwi^{xgZ*(v^31bVqpBP-tMsjN>Q6`wSjY9$oW{%Gt&5Nr^*!MD6Myf;Fm2!n?UO
z#Zx;``6F;?GoNz*5DnGpmUgWD$o&&Os8vNKTOIVEKPnz23s5)Xc%}6PsQVy-wKyD3
zX|x8rZGB3MG9={k9bUjKOZpM$rLEutNGYU6%r~@4)34;RLS`L2-F8H1CEt%guBc%l
z0{NwUPIv}i1m9VtcqpZedS(dOAgKbuEP>}$DK(eEm)w2m#i#D2Gc+sF&w{@c*~4Vg
z#;3>o;TItDH!IE`fF_D5=Y9<@Na`vmV!y2ycs<A!+$D1)`y~6siDhT}dxWGWv1n(_
z@$VO2D9$msTIJ|H|MkHnjs!Lz+gCsO@?}fmfguF?0c>Q0k2-I{bSXt_)!o!+@W}MI
z_Se^z-DC!u%nB=MTAVuVEnA#wFqB8Gx#2&&zBFYZ<wl&8|6O3ytszpUZ+nLM>Gs51
zk5<cr2APfp7iEV{UU<*~6Neo1JTJ$s{e9jEt~I01ckp|D7(t+qC}y7}2-fn(f^O`~
zvbn6%9KIP>>{e5g*BUZH=`~jj$!?Cq1wON{&KESFOx>J$VIn7*x&Xcr$Fps^CE|HC
zWasDzMDQ-)cO@VntBRhyv%WZZJZgS|;k|n%^SleHtnFA5|AItm5nFU9GJ8XpEa@@=
zF~L_c^sKoZo`F4lM=|)w)AuV<`3CRwsPpHn47&8TI_#o@A84ZJ*AH)WQ{0s@yGs!W
z#Q9KVoFB}^-44|eNP|VF(!Ru;vLYsFG~Qis{A7QZ4{0RzYas)~)jT-}z<pK-MDr01
z3M3V&eQ~zi6S|*=4-DkE4%<^cN)c!YEb)kLE~hY?5NOWyMi4w!fgGT~b5*9})U?!x
z{qoIM)|F;l6ZOfpa|kKd#qvj@I)ycDAdAv-46e>p*emy}$$=U*DbCc+dJ|ivx7F{-
z`|-SQBL5pdFRq#t`<1ckb-~brXyI@_?`1X!<Unp$cx0w>?N0Wd*2VP|bs*5wMtH^<
z?X7p-&?x?19sCvo0$qU>jv%D4%&g}~4)c34jYX8c3W}8A1|qkeg2(Thhd>P9{EV-1
zgZT3V14O1yZ}g?2%0Zkp$YD5gki)D$${#LbHx<>zdw%6>S;CYbl)!J}-m<$J!w)4T
z1^<+LB_bl%<;c$de%mAv(ykd!ED+_{G_S`>2C{@kiaf1Y=giyIF6kYY#{6deIs2^R
z*uJE`jXz3uT<YicwJsjaoN)8miW&sEj2cED1oBD|aYm`*(JhPjYw!qPEweLa1fKII
z3*}o2=O+skhlO#C{1lLl(>nb&%0W`|Dby1RZR+IDDaxGhN{dm(hweSAeA2FOx9Cs?
zG1WiVlxK$gQrIlYy8&N_v)%kDz1{vW*6Y^<t`yv$-Q|zI5>JvQE!L?hwq$88v3Pl4
zZbC?PoOiO1@NL2J)Tb5TzM}Tnr0i<Fq-Y{%c}-D<u$f~RVk#(oEeI4!k$8QWyxr)(
z(27`pN=R_-ulx~c@%kSL`|oa>iPVSMuDJvrxqQd6v)kfqXJ;4|!3kuAFd!&4J?W^8
z)BQCIANp?#buiJ1)(wBWC8O)S(GjmbM($dL>#}BiotnJ%_}*m?A8rjp6NmG6M1_Ud
zye{|9Ri~^;UzD!rd+`CXe9v6$;)O%4O=T5LtJmyu|1mJCN;Qpr`Xhbav-a%|dra3E
zK)UOl0#9L$omUPY$xBclj-MyosSqj_CI!6>ShHr?8OC1L9FDFlr$IxQ^nQiu6O&$2
z?=9zf%aT9be&4%5c)n6qa47Ak0qgJ+J61*i{IWco9`s<_1FT2&O8>|4*%5EwXL|%?
zN4YBQIr;hTY$sRET9*I!<xaZi&hEvT{CqVJ7wNX@B8$?}ii(!cF4l`US^hZx8x#EF
zT$F5Pa!j!P*T$t6om4xL!_!l?8kSDQcOL0a>LOOnF&v)e^Dz`IRC$(o%#RbCzw|7;
z;MOg6@YBU%#cI=RzPi4$#O;U6TUJ0~=70<7Z#{E6eEZ{rMXduWkGFVUUGVOmu7RnW
z<hGzBft(;6+LXmdxsxN(D8ohfAV^oA<-Q|whs!21jT34{rE>xpX0f4RV-K0EDY0Qx
zS}-HhFo3~iv2BdRC43`87Tw0kli-4J3A1DDVmZY}Ft){ScBjP$(@1n9imi@yEEzBe
zWkga9V?#sOTym_9(HLJcs4JVzjSR;~B7<#=c7O+>cAN-?A>IschCw^TvZ8TDwmOE^
z5%fT^o4w;F7U0UpXjf!p7}?xBCML!##=?vf!8FH`NF;L%&K!qB0}3=ZjvYyjMYFj}
zl`O`2*fY4a2v%4mi^Dcl@}vfEq9SdKj6lEPgnXf4E-s(hv$>zN0Q6xVOARx}nqkaC
zL(M0T;6^$`116sY`oj@i_qZ^Ixf_GaiHe{x9HJTQ$fc86&}pB?hebt%jKQJP%o!n!
zP(aEBvtqxPQu*lk^9ZF1n5@vSu~9(TUr<J}0)JE17qTgP#^6jA1PuSo_Y3L?>|?}$
z%Eg6j&!I&r#dEf|F;dP?rgLa4I(fWG3kW1)=oV;fAPJAg<1GWxM9aWHG=YW>z*u5P
zmQ)&P5-VpmH<HSxF_f$Tb2Ap;gQMbzI07aBZH2eMpz%bj05r*hKtcyF2v&hsbW00j
z0A>;k*9aEyN@~btsg$hffE6LYA`lZuB%m>tN@=K6BAUpsqM=C)S|Falu*8!X<E-d3
zvLh!VlnTtr3Z*g`=3#8+*c?iQlh<x>wlTt)jgyYGYzd)827&=LMw?jdsMy~~-C3cG
zZIM)^HnCP%BA!IT<8VX^5)Oy`jc7X~f(txR$#d)_z*vvcEMx!%D3+@9Q@~)X9bh5b
zMKGw5oCtRgC&b3+^Xr4p-7a7`(W#MCduk*DF#Y^O!F}R|0vZEeF??1U*@Z)A1;+hv
z)XK$UXgzLnCl(jXA2-%CzM{4<!pE=1FGE;kOUcl1Y*CP@v~dVrYBYmBCMV!E-bLF*
zWiuII_xR+l6YZ=&a0Lqt(aMrYBcbV5z-oBB1szQ#;^}A-9rzN4h9QvXzvIs31V+YC
zBN%I$K#xFIz&*!awHU7OWU=X-81Bk1rHR?aP}%{g4Cn}LfpN!S$rf1fGRDaKUk?vM
zup|XoP_e)%18``3phX~>N+4OH=@<+hL&A|TmPFi_;{Jc&5zsiSI}S(2W0k(}Z-7Un
z(*yB1q9xi2ELk)j$H1bgR16V~v%*?hk+1<)7{)&r9!cr&7y!@e-vN(?C1L_Bu)rHF
zsK9!bz=Tw~WdNE%AOr*kGI02Sz<__$dSkoD|KOUIXe{CPtND`!t<9AIZDKiEoBy{3
zJ5Deu0s_Y#Zv&AP1Zwlok@}OzD`Von@c6V*{0nCQtpA$iPwDqBb^WETKc#^`Mf{g{
z{iUuyrGY<1{FitA)6}K&+r2)64N~+Na3>$^?T`(g184+nTyGB^rGd}cvdrV4MLW!C
zCl`XumMV)%>?KMxXw-~!c5%?`(9nfQs@l3q?cje%7S8r--D4X>X_Q@awl1vTuPmRd
zvwO#l8;f*mmWp=cx1C$8_vYaDKa`_q%*~u}iKr(un(=VS1&6M7-EW=B%hz_id#9&;
zV_lB!mKSv&HW-E-z01`S#}9RzmBkbvd?>TkJyuy((mXWOJ)~I1N3GFSU#qK*z4(AW
zU$99~kl(4Deu6^IJ-yK!d!gpR5Q<0Jx<6y1dH%tMTdYn8>nplhODOm5-MvC6IbX4U
zk&v7deKz69a40cr)%A6L1czJuO+R=%GdXxPQlrTKaaPBTh9mPR#=*^=>LIzCuGdzv
z^XB!L)C|q2TJi22=x?vC_xXvwT9dzSfzEcR&v%)2$0X}z20|WOyWlc(q2~JzYl^vF
zZC?NRBq+9k&$;vFxwKFmto16YsdtfBy*qKVoV$r}CjO>avp4z8$C9k9o2`EFYEf%g
zrj>Y??~eUSPG}(Zhj_pBwQGB5XHfX{i4!_5)ms{#O7y4rNgOIhdReWT8t#Za&X$y3
z+POnSZy9Q%-YHFNBn&V_74cQK6N_6qrE+i2I(r=JX58TN{Rvi4-W_Gxvi-esRsS>B
zDtH%-?J1I`y$7<B1X^0Ra}U&NmI=;wRV3_7U$p#Ez}jN!{%`Ddr3EfVErO?*v~7w0
zF1hQVdOqdbCB|Wz*74FRiLE<jZ?-f7`Z;-CTgthgKE}<ZcZ?YY*k$bdfaC_F;x3gl
zxP8=Fdlz3Fh4NnA+F_1aAuJoPpQ}>iC%(}Td+M|rlr3I#FDqi%24P%4^o7`fxh{``
zei-#m+`g0klf6Fp_V#WK(Q}3Bs@ssKak(3Bu32|YEn*v`N&x!4DF`$Sdh_e7TXVP4
zIu`xyQf}vwQt!N{hkw@XoCS>RKd9w){OpgKi9_XgS*_D*zs{YJIAw)6H;TJEtbJO{
zj14c=-~C0Tmd(Q6(RuUL>TiF{n^{17Iz3;KncEr5Syi_|NOy~TDTUZqs)N*MsjVx$
zghutZRj+0iW^62|cz9hjKYxa?^r9Y1-G?r4Sz4t+jlLV*T?#oT&QGN2Ek8d!OC#&1
x)84z!2CTVR)rCj+SNi)?*Q$-{2QK$dTskm!za3`2@&TN)!)E*3b$|QzzW|1*J<9+9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..553d9e2f64723d236c10d8feeb56c23836529b00
GIT binary patch
literal 9782
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
LZBvHT-ot+bfr+RI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..19b5dc75afffdae7d345415572ef0d33fb92b869
GIT binary patch
literal 10959
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
Ut|q6&?+>jkZ8l`B|7rjK0J;kVAOHXW

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfbe6e460dd870ae473d5042fa72e2cfeeed123c
GIT binary patch
literal 9936
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..03b6d3cf8602c5439dd03c8d5bad3a157deca91f
GIT binary patch
literal 10546
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
K>l=SM@IL^A4Qvnq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..c818593ba46bff87d23d00c5112b215da5e0e884
GIT binary patch
literal 9675
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
Bn@j)z

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ce9bf097d39502939b7184dc3dd07095fc242f7
GIT binary patch
literal 10494
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
G>%RazGBOqb

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..3503762d73365fe88c1a01d3aa4297e916fe3b23
GIT binary patch
literal 10740
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 631fcc2c946a0131aff878e41b8da273a212dd19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 6377db6f2e65dae97ff2fe448a29c96196e57c01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9455
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
a2hi|>*QIHm6bl{BIt>*a<)@0*ZvG!trPjOv

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 1055ce095cd7522fd695dc0ccd92a645ca009c12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8689
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
Bf;9jD

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index fa468b2390b544d69d79019d254584a10abd39fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 87fd745850387bc5509c30d040b8fe3bf1cc706c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8865
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
K|B>#Qi2ndTT)86v

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index e1f137dca37aea0a072e0ee239e01b3a91f13b5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8433
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
HOF{ny>l_pd

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 2d103cfa66729e5d5cc4a0383788456b758095c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9422
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
QD-58jsHIROXBqIn0Isk)A^-pY

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index ceb704581888a434c0169d51a01ee2fc823a4a09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9418
zcmeHtcTiL7w{}33Cej6IVgNxPq>x6HUPJ`xMbMA}p_7E(Y*YnAKv6mz>4Frci!>=p
z@gODAlp-QkKstJZo;u&1`R2^Mzx&t8Bs+Vr^1N$3?^^rKekW1J7j)TJ1Xut70Gqy^
zmI>`!?cl?7gmx?>dW{1B94P^2RumJAuc#-<gFtk}i&FeO@uGM?A^`yKd$;(I7%QO=
zd-MA|51C;|PFPn4f=Zt1b^P@fLaeBwj}0CG`6AtXc_%vzE)cU0n-BdKnDTv6QnetN
zgRGBu6p>-9=^X=}sX6;~@2L?wwAaYbZgS#sPs%21tZ8~q<M-E#-rq<3cU51gz@N7n
z9cnOi-yLF|@oq};IMi@@)h2%GRS=umL`hv>)AM^)Ln=O-wOK)XOCNf$WfKNFRog*8
zTrpg1%76A=)wd6&n@bm_zX}FT@o&!u4Fm@XIOcrd2(Awwo5y#1Y;3u&Y<grIb$@<o
zi{Qy;Kf8}odbByU>%X>rJ?5<7hShR^^rgUz;b7~F!h<Rqp{jyDz2&{>RBcvfncSh=
zaUat26Yi~Vn=;zDGG2R32dZXt<tZ<o@FS~E%>{)&9{dpHb|dW>)$M*-IJo85Apa=o
zK@PcPn_RNBP$=lvImxH$Q@2o*@%(*}m$E>8odHxmym(f=$2IIh-i(FgiPs{G-<#U^
z=3>qUZ-~I+@oR(ix7%t{kM_W(74~P4$_|^a^1twJEw1fHT)QeMcf0*{7~8YFiBkcU
zCx=(t-=yyX+XZ!yy@!q}Nb`S;m3<j-X+?ZK$8e*w2k!#KHL1ru;ub8Kq7%$Xk^S}X
zGWYW{7fjdmkQ<}(*>$rY#I$3LRHsrt3-+*_x}G7#!tdN_8VSu!#zrBYO`GaLB@#$n
zWltB#9nic~awno{(m<;0m%9dMo>qP?jM#KAL=2g@xWy<4ilIc@+u%Kvp<s5EjkjcQ
z!v^wdFOyg-d{rtZ7CE-g?VL>fXiZ3SqaIGQu=0A8)Gb|9@~r9IhSEZHe^1>)?MU5_
zz5V{o8mgXf*`C~PS_^IrjHys)q!*~>X9H$@fbz+T^j5#1caqFdX$yZpt+2gN5St$v
ztF5z5u<<|29*&Q>HL^PWbu41`+p~%D=NiAJ>?)<plg7?|sPS!lkaRg@x5>q{#!V=0
zOv>!2YWk<C9qI0*+#v7RkBhI)2JXd)<l{&0__7l**_9tVi07YFNw1*lz)DxkZ}Cp;
zG+^$Ijio<jU$7&m*KMXgJAd@To=xCaevlex&)WHrwTx?E@}d$r=&&5)td28VWs|Yp
zhibspjG{vbzIRNZMGJ?*tg0t2vVluU4OACg_i;<s{+)(wjm6G7!#g$UwHcZ7E%?l`
zjUx}PO05k?k5U&mMytAU^=H~%Y+$j53Cb16`v_mpJVxvbH0&nLPD7N$sRCJJv0u`w
za<)SziTtfD6WG8~x82r87G}36`yVP7kFTy6NLsrZo|t-2u>i4lo;c$+L>+C#-8%f~
zo$IqJZa$w4=Enjq54WI4+#a~9_Bh26l^~g~0t0S84U&M7Z1L@gGPBU(2kw`W#y)J6
zJSfbaqdHuFP`ikAPe5MA9BN!~Ja^9(YLbyoxfp!%5(ci2RU%)}(Bebtlr^6?v|h`q
zzPn0o6>{mac4M}zEgB%LOf}aO<?$n1;|Zc->Zh<h)YW3oxD$--HIhS$_CUIK91`N8
ziXV@LS4C{#H%6~{^4x4$`iKeh;C~*OyvxR6&l=<`<SN0Ax_|h+gt$elf{d35FVwLj
zH#hPIbi9>RUANpv7`Y?+Eb%1ah>psvbKY&blZHc7Beh|zrF;RhPfl<ryVkYIOo&d$
z)o^ol5B?M5ZE9`<XlAHW#SuLlSD~pxp|!^~=fyj!E5oU_sSk$BxHCc5r~Rf2TpvE@
zFv^ihHsLsLiA&|qGW9)kubVA~O&8ow6=7O$N*g{}DFkP|7q2Gv9?^!s9*x#2WDexs
zwC-2j4188=QPABfc<M8;`O2UQ3*h9vPVN^A`02i9K@qHw6nbVb25X9Mt`X=JcWAa7
ze$;uY?HOrpE%j96)|ezzoR7>HH<fAvIeH}~yj6M8dg0tQx;!GOeS!A_wW4LwZKEd0
zR(R^`Vo;~Y+hz^wc+694sK3tK5<NG_MR1Qv@X=Ai5YDtc4=eI;!TZS`8(_zHC6DPe
zyIj^gulok0_bWzAs++0aeBtH2kDm6;K%HXH68D}AQMFUQ!NT6W8;=CujNQcyho9*4
z0Wo?s-SkBq;Xq1Kkv9@E6UZGyl8DUeZlOk#6uHOT7scHUw^^)Sc@&$hcN__bA-xXo
zXFhWrMJN9DLLdF<`G7L{PAkpi0G56kav;0Ll_r0+&pJl>L2o6cY%|MW#>U)v@+ywL
z<Xsp;$eckLUEUEc9l0#>nDCWJJvx?OeZ>;y2+!hA48g9@iMgHfIy?WwDAAOw=k`ES
zD?f+H4KD>w0j&tmJc~E-gO`$`u=9k|K^7S0Sg$8Xip!s<7Ab{b!ip|-co`ZmiD#u;
zcoq|q{n*$L@&b0=lRi2aU5D+GSen#g8uqj+Duzz2XtYEuiiWd~EH-pYPR+1S87dUt
ztr@x<ea<*CC)2wgq09;_H#XI39~R3_W<lEww%s6*j-J742(H1t7D`&>-P5VQYhaY!
z!7~`k(8c4L8E$^pHn)Vwu4wqVZ{p0$>n5HxmXVt)h%L3FA|GQvv)0F6ytMmd)i3g;
zGK^`Ggo;i(Cdl0>TcYc5n$tmCv+P&kaz$05m|}gCay4%3?Uv9Le*HuaTeaZQyIG`P
zVjlY!Cs5w>F(qOH;&O%}^H;p4N}EY)voA;CD~asq%y4@#<%4q$)}Y}R9rM=&UUmSR
zU25JMa{{Vbw_UXl@!hxVJ4TVIih9H4IiJD*RVD*z@T^0-Kq}od=B(ymyX+CN=PC=Z
zc^_33{9Hy7#FJ~eC39G*ujc$j61@n=D!)bl%j>_Y_=*A<#DL>=OLU0qg1Zc$QlaV`
zSm@1)vX{bu!=bSSC{8)K3A^aBfHvaG-t0bqry2>B5ZBW)eLIk&{b><<`ss1g=~BAu
zpR|LvYATUY(qRG)NtevE0Vn*UoHbR~&Bgg|ub8XCJuLyJ?A~jNvbW2q`gj6(lebgU
zrHynUM^?5aE}dSAfW5R*vBJp~U}eUi;FT9{)PvF{Sp*W1>2$hvcC$^cXz48i_qmJB
z_XpT@J1$3EN%C0hE;YO&Cv;D1p=;w%C*Z`#k>&UBj5ksIOjhCiSG{WDAcZ06SQ|Z#
zqM)f0-HWV!QP0Ur(GBMVZt-bE9lk0+mpg*G*}@Y)EesWQ-%`<gosl(t@<!_(=ebnK
zDn!yYYPtN&EoZov%+s<<8a8|vEkyNHZe4P2#Z~W3rC+X?Abgz4nmU;?gEvn@N7nK&
z8LO7@4q72j6-0S@vz{XvOP*@TisXzel4H9W<JfSBiWOUE4rs5xnj)ibNt!Q~esHYw
zcoR2c6>F^RQO-6`xk98+uyl7XzbMBiM#+FepKZ#%7)-A{?o(t*u7G9z?ZA?=(mlrC
z)QU!y&7c;Q1$3BC7nu!2Rk&-=ou5p%);G}Ni?+8s$JwqkgGJq#PwO$2D~#VrT0^&-
ziiQL)wy)#V)|V}{Jwonm)pYNRfp5q->+!4GX!l%J-!`UKe&{sNni*iDEt1spvF2MF
zMKWl=Dk0S-U&TkDR$DXIsx!US+uZG;#a+1CQo=x{NqLt{^0a|=f7GMJ;^>AVqqo|x
z_jy8`o(6tPO~TGhcdm(Cyd|Td7=$>tBVqJhxO-V{Z*1y2`+BHDCe!898h1yN`>u(^
zXi16X2dNa~wQgY(`MXZAe4PY~g)WL;9Vzbf1Mixzi(NgVsC{~0Z#empln9o+n{FXR
zkV(Rs8g?ZX^;HEZg7?r{ycjR~?i$xQ=8DpL`V}l$#7sl3<#SpB(XUDK_!A>q&%1Ap
zjSHMLnvewLe<7PY)E2NNIhjR4A6N!^b8!^<dGpHYZ9Fc~oe<HNJzlwh4zSegetSHf
z!K<}!4aczNf?1#Xa&rCpxx6mIhSrzI)S4z(U5UeG9?u7%@A`q8p^HSshT0@G<{e^G
z=M9lN>e9*xyIuCw2;O*<T2cf#cU3CFe5955;FpeTEiTvTJX9^QEBWqkjoD6$MpDtM
z8j|sr=F(N%en<Apc(+C>T|4)YNkv1=%U{@`32DAhBsHZGMdVMGcO0t(BPn8~36IS1
z*94vYWCfdvW%(D3+oL~oGA!9nn7;VH;&WS_L*rsykJtJBMdKa?1zx)_uIyuJv94@e
zv&Slm#~JcC>lH;hXLE$p^14>I)Qui?RhEX2q^_cvqktC9(RS})I)HS!5-}xCK(kbD
zpvCmWLi?nTI|1}!R7#`zgrV|R4e*F{es#VWS3q%*7nk08;Zd&_oR;<^ZRar9O`dRm
z&|S&AjY>Ug$nG(WU)WsR7vSllclJ(PU01~-csGJU&T5(GGv7H(+Z1x7mfp4an%>Z<
zbo|L)1jt#x(bKkJuwWLPsK_~(y{h3hag1^g`t)Ww>pL?;`n~`~59V7_<H9#Cs%6}i
z<s36@$aW!|^(svi`pkBQB#q_BtmS89k@K&kc1iEw%VyBFh+zDxq>KM9oJq~WE{LCF
zY;-EIx^HKr<Z?0QIXcfBnZr{m!andu{W#yG+Rip)f1o!_TDiC1wcp{GONAZp%KViI
zPoHqlqmv@!R|eU!g-F>~(tc_?pPR~#`=cYO8Ln}Snat~s<u7tpnl9UFvy;3vMND&W
zU*a833nS^|@*6EXhL?C@z?cu0Pff9t!%=2M+63iG7tTeswA*K`#&G45#N;{B7n+y#
zX0GO1tWnA#8FC&z%OjFO$sR8<%a>l2uY`yez6--MlzsYUQ~KDnlo?{qgFmLrmi?HW
z{wyEwcEr#s=(H+6k1kI5V)1jiPC{YY@f-I&Q+3?vJN1M-Uq%q@K>?(wq$`yL(I$M?
zSZ<6yM{dt2^U@35?u3W?iIq%RM+Ok{UsN2A*rXGcNI1#Rn<H}HoKd^r{4&#p{e9<q
z@&4Uz>R6WDLCoz_chm>`OzDs54v2u`KPc5_4V{2Vb@n$beB-DL9Wee*sciRer0`|i
zm_B4TADL3kzVS||N=jQa-3Tyf+ma3t-|IjOIYuT{Xxgpim8+C(jJ{6Po~gpJhA`>f
z`s7|7cnGR_zOwYDMalguS7msc#xr8`v+O@vZeD6>OSrvJfaX<hI1^M+-e{BZxN#g2
zT)%EIQoor%RB}4><(K(loQ%XeHLU&GJDnT3tBEpzn6PhOn?Dyg*C)jKD1m{Ao&Bnh
zWtoAw%@1b`In-Y{zvsOhbvB;8=T*_NrS-;!PU`vF_%B<d+bXB{fCWwUACgqhh=<Nw
zC7FJFYnu14dAcy~TkXRgsa(Z{d=#^N^BH8$X1Ndksqd<Psh(Ymgt91AQ(*E~pm1MK
zLtcvnPu=Biw$~UT-aL|{kOW`k{=j#sXp3itGX=#rXO3YpIdZz43Ok{C?hXRCT|!dn
z+_OC;mu8J`H*C5GJ?^#eof;~9wfFQ`#3W1EW&43=uzTi_<=PEx*Y5NL9=}3JzhiIX
zHg~w=!N{C;;y6g(U-D^9Xun-oG_0V?F$I*FF3rWsz&U-PI8~>HC-kjt4)_t$H@k8V
zY)4ECEgn29bw~K<+_kN}5~|5km`@5begYXV@BT=wxZtZz66l5TuZ8{IzU-{#IjCOk
z24RUW(i<A_si@w;tl0A41}6kae77|J&g;hP)}1Q$U)&84-&vnTkBukv$G!mo=-i2#
zn#M#dmbNL8>K)%Lqji!0WvINSJim3O_>5e*tklKww^GO!2SQ>KVF}@@(|xHb(D7GX
zk*jQC*zlIk7W=TY?YT21chee5V<-*n`43ua(ssWE^!ShW_#fNC`schKWYcJpR{YYL
zk4$;kf8FS&Q)Zg`bz;lYJT7kiZ^Fx{Ewcs@<A!e&o3l<fud9!2X*7$4FY<)7-^9vj
z+kOf6Oo=xDvn;c2Dv{Jaus)jS4KYi7yi(*KdEz8v<L3gri&ZH`Y?kNd?oF|<pw2CY
zxLSQQwp;ucpRR>wi5~HbaLPH^_`Hs*W(Kg`5!BXV3c*@Ae9x^5J=t-W+oLgGV(wwQ
zb98z<*vNY3o08FxkVqkgT{r7n)0%yNX!YTYl=Mxn_x>3X9Muu>MV~L<OVydsnkaUT
zS8=kwk+4>n>(Mf&NExLPCHFyxaXW_G>2X;KhaX$^p)YrSc1+8$)hp@ZwrlQ@TkraI
zFAUsw$Z@?5nnnizu)~S84I(SU^NLsxH#rQ>!vQbn=jKV<Kmq`i&-!^{ur7Ftr~}@S
z=&k}>u4@E}5^*X(ON1fB&{GrdMAQo);Y|ZBm|+84unIWfSydKgKSdgV8=is@^>cG|
zCoB4?0Ds^r(#{XWV4&y^6N-xp(8|zQRMUfm7lq5g<scw!KcWu|sLCR$Ou`WqO|*1=
zgP>ih0G%ilPem};*Vk9hS6<G8<Oqf;C@6p-Ffa@TqFI2*{_YfvAIP07b^!4cLkmyF
zl8BxZqKCWa0Vc-5!<(W41k&`PzsKk1X=wNdygT_f7HE8c{V<+js2l|B<_7+&2brSn
zLj(COp#Ro`Y)0E>1DoK<9^ND@UfT!nP7(Vn1P=R$zo$3J^+!55EEw;KccYn-X`@2_
zHl(h;q46Ic2NXCG-8_GI(a8RrC51@%ldQkRcA)u@&R+wex&MLtH|yVX|6xqCGBi}w
z^1yl@gr~2i0z4RB5$Ay=;uL?JLLn#uS{?}p!LUdu2#!M%KxhRV284rS;V=XqhC*R5
ze}U3>CsQ!)So{GL4P1^$!-1g@3JMSh6o`O@96%88AO$oW27<$pNW23IjYmWO3SmSd
z(y9{U`q!uqpl~!OI0A)7z~pJZ4hpmb5(fvN(F6j>0pkG0AfQML0gL|;4GycQ<3V!6
z(592<hH=D$J>4CDC=Li$R5#XF0m9@Ue@cv9F%$yLfz|^=cbtbW`A?M@(G71(!5r`j
zML|&zc@z|ZKq#Q((a=AQEbt^UtribZp%6KF*bmLY#3<6zp;3!Ds8kxj4>>IxMNJYO
zL-8P)d3d<001tu^J@EWPZAfb<9EO6?!cg!uPzVgJ2tg>q6wF{S8VQOB1PDTt{Keh_
zM<n?F|Ev$%M^yRer0WsMwDJ9ah<^5zDc<Yn)z3>;;*Vw$75&i`iWuzA6v!AKJnl!F
zG_0R0tP{rF5l_2+{8q5P%ZdL@F*v}Wc$_>M0z$%2^0Z>Wp+OEX0t$peI5?o;2nBfs
zDE#l}WDf$x7em6UJJNWhaYZZ8A6$t_{Weu+{%-H<gg=-E8f7$&K=KeX7*r9ipa?+&
z!T<U6Pzq=?hE~uZJO+aT!3iiR2o1&3suTmk!XQ`#!2wP9d$|9T^bjBz^hZTN6(Pv~
zi}Vn96bubRJAf2uZ481#(6rf;cff)05GV$XhhPbKDC&PTy*~^7_w<y(2lxBmYgHNi
z|5Wo&gTE{gv|0Ztqb)qNbqxH+LiSrZ94s0C!PjqH^dB672L10K|A^mz>H3$hf5gB)
zGXA%^{-x_5G4PL!|E;e7HM&^-d=$pJ(|*7D(jIhc0M{mH56MRy40N>sSpYb|z{hEr
zjV59C)Uzf70CHjnA3DEBXMJcwMvA_nHshzmBJ?2Cz($oY06@Q?ucdBw@E?rETiohA
z?Tvi&M-mTlmUQS`-@bO{_+9DaB<%|~l~@J80|YrsR`xWDmx_TKoUCtn93IIUusr55
zks6m1vX`Yd5EZ|pc14y{QAIuJ<ycYCH4`i<zR=UN**$`iuk&XYWx7s#TbUxY1Z1cz
zuUy@lw|3gdc4Zch3EwyxCMHn06Sl<z)QNXn)MvLTW}2xQn4`CD=!c?FJF61CHB>)=
zf?l)X@NH7kTtGXrxfgA>EPA=*oY#?|<);smWAf7DN_>HH5#+16&?WCBhLEAfJ`Y6i
za%^tfJVS&kVBN+r@WmcBqB1i?`gS#Fba%$<I(cQUez(?~ae0s(7#&j0^hCDz)Dpwe
ze$LXF@%li);SdR}U2dnww{*D}sC-^_+C|75JCy%07|!T?EJi6Xc|F3(ktbP!Hy87m
z=P+;w0O2<b`>F}Pj;TUfk7Ua3ua}!|F5PGdTa=XDjS~S@JSA?DSJzUWnBM)Bouc+O
zcpy0VZOGkUjb1U$pmWttcFq(l#0$TemHcjBbpO<5^R)8mHN0M@g%wwS+)ws?9;-W;
z_Jes6kMMPOwrdM*Fbyy=NJx!-rPpV(hhxe~4Cn?`L8C8oExLdg8yjv6=CK_@%0{n|
zKE4at%mv8lSLR0yv3+oh;sNXDm+-XI`ky4<ef&gRT08owqG>rVO`D4;3#w5ZQmHVw
zaIN)(Bsi{Tmij>+F#eE^x-}r?X*-I1xpeig?5hM{vW0U;vt1lS(8#h-m&1mkJJtF7
zQfypVoc{&;ZAPUR*B)x_>M)numiF~X8IvV;FP(~KvZ|T|INID^rtf9Htkz&{<76pi
zpHR!49Nxx~XQu?LI~)6DdTuK0SA}?<v=uUd&jt~CQu2bW)*@G}?c!zzbwGy9DAnaX
zfz;OpL@YDic*C=~JeIu!ARc?4WD|l2j2RQ2JF-heFF${)i;=L!gm~BXY)dMg{eE^>
jje|j*gTd?6)*-#B4`m|{nS5zY0npdJpjD!A<@$dCWtzU~

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index b138d1416b77e292cf051eef49a9c7946a8b51e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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


From 3bae97d2c45e5210c47837c2dcba3b4b8ffa5435 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Date: Sun, 16 Jun 2024 15:38:10 -0700
Subject: [PATCH 52/84] Default to Separated UI Layout (#433)

# Description

<sub>~~Change from Nyano~~</sub>
Uses space a lot better. The old layout still exists if people want it
for whatever reason.
I also renamed "Default" to "Overlay", which should stay anyway if the
default change is denied.

---

<details><summary><h1>Media</h1></summary>
<p>

## Separated


![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/b97c4373-99ac-4ac5-80a5-149122238551)

## Overlay


![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/3891756f-91f0-4336-b075-6c461ee1b8e6)

</p>
</details>

---

# Changelog

:cl:
- tweak: UI layout now defaults to separated, the old one is still
available in settings
---
 Content.Client/Gameplay/GameplayState.cs         |  8 ++++----
 ...ameScreen.xaml => OverlayChatGameScreen.xaml} |  4 ++--
 ...een.xaml.cs => OverlayChatGameScreen.xaml.cs} |  4 ++--
 .../UserInterface/Screens/ScreenType.cs          |  8 ++++----
 .../Systems/Chat/ChatUIController.cs             | 16 ++++++++--------
 .../Systems/Vote/VoteUIController.cs             |  6 +++---
 Content.Shared/CCVar/CCVars.cs                   |  6 +++---
 7 files changed, 26 insertions(+), 26 deletions(-)
 rename Content.Client/UserInterface/Screens/{DefaultGameScreen.xaml => OverlayChatGameScreen.xaml} (96%)
 rename Content.Client/UserInterface/Screens/{DefaultGameScreen.xaml.cs => OverlayChatGameScreen.xaml.cs} (94%)

diff --git a/Content.Client/Gameplay/GameplayState.cs b/Content.Client/Gameplay/GameplayState.cs
index 1efee978f3..2ea16521e8 100644
--- a/Content.Client/Gameplay/GameplayState.cs
+++ b/Content.Client/Gameplay/GameplayState.cs
@@ -93,17 +93,17 @@ private void LoadMainScreen()
             var screenTypeString = _configurationManager.GetCVar(CCVars.UILayout);
             if (!Enum.TryParse(screenTypeString, out ScreenType screenType))
             {
-                screenType = default;
+                screenType = ScreenType.Separated;
             }
 
             switch (screenType)
             {
-                case ScreenType.Default:
-                    _uiManager.LoadScreen<DefaultGameScreen>();
-                    break;
                 case ScreenType.Separated:
                     _uiManager.LoadScreen<SeparatedChatGameScreen>();
                     break;
+                case ScreenType.Overlay:
+                    _uiManager.LoadScreen<OverlayChatGameScreen>();
+                    break;
             }
 
             _loadController.LoadScreen();
diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
similarity index 96%
rename from Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
rename to Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
index 54aeffe72c..4ba820b339 100644
--- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
+++ b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
@@ -1,4 +1,4 @@
-<screens:DefaultGameScreen
+<screens:OverlayChatGameScreen
     xmlns="https://spacestation14.io"
     xmlns:screens="clr-namespace:Content.Client.UserInterface.Screens"
     xmlns:menuBar="clr-namespace:Content.Client.UserInterface.Systems.MenuBar.Widgets"
@@ -30,4 +30,4 @@
     <hotbar:HotbarGui Name="Hotbar" Access="Protected" />
     <chat:ResizableChatBox Name="Chat" Access="Protected" />
     <alerts:AlertsUI Name="Alerts" Access="Protected" />
-</screens:DefaultGameScreen>
+</screens:OverlayChatGameScreen>
diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs
similarity index 94%
rename from Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
rename to Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs
index 0fb1b7d507..c45ec9d4a0 100644
--- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs
@@ -6,9 +6,9 @@
 namespace Content.Client.UserInterface.Screens;
 
 [GenerateTypedNameReferences]
-public sealed partial class DefaultGameScreen : InGameScreen
+public sealed partial class OverlayChatGameScreen : InGameScreen
 {
-    public DefaultGameScreen()
+    public OverlayChatGameScreen()
     {
         RobustXamlLoader.Load(this);
 
diff --git a/Content.Client/UserInterface/Screens/ScreenType.cs b/Content.Client/UserInterface/Screens/ScreenType.cs
index 595dc79556..039cd7b128 100644
--- a/Content.Client/UserInterface/Screens/ScreenType.cs
+++ b/Content.Client/UserInterface/Screens/ScreenType.cs
@@ -3,11 +3,11 @@ namespace Content.Client.UserInterface.Screens;
 public enum ScreenType
 {
     /// <summary>
-    ///     The modern SS14 user interface.
+    ///     The classic SS13 user interface.
     /// </summary>
-    Default,
+    Separated,
     /// <summary>
-    ///     The classic SS13 user interface.
+    ///     The temporary SS14 user interface.
     /// </summary>
-    Separated
+    Overlay,
 }
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 79c1909eba..ecc57561cd 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -263,16 +263,16 @@ public void SetMainChat(bool setting)
 
         switch (UIManager.ActiveScreen)
         {
-            case DefaultGameScreen defaultScreen:
-                chatBox = defaultScreen.ChatBox;
-                chatSizeRaw = _config.GetCVar(CCVars.DefaultScreenChatSize);
-                SetChatSizing(chatSizeRaw, defaultScreen, setting);
-                break;
             case SeparatedChatGameScreen separatedScreen:
                 chatBox = separatedScreen.ChatBox;
                 chatSizeRaw = _config.GetCVar(CCVars.SeparatedScreenChatSize);
                 SetChatSizing(chatSizeRaw, separatedScreen, setting);
                 break;
+            case OverlayChatGameScreen overlayScreen:
+                chatBox = overlayScreen.ChatBox;
+                chatSizeRaw = _config.GetCVar(CCVars.OverlayScreenChatSize);
+                SetChatSizing(chatSizeRaw, overlayScreen, setting);
+                break;
             default:
                 // this could be better?
                 var maybeChat = UIManager.ActiveScreen.GetWidget<ChatBox>();
@@ -321,12 +321,12 @@ private void StoreChatSize(Vector2 size)
             $"{size.X.ToString(CultureInfo.InvariantCulture)},{size.Y.ToString(CultureInfo.InvariantCulture)}";
         switch (UIManager.ActiveScreen)
         {
-            case DefaultGameScreen _:
-                _config.SetCVar(CCVars.DefaultScreenChatSize, stringSize);
-                break;
             case SeparatedChatGameScreen _:
                 _config.SetCVar(CCVars.SeparatedScreenChatSize, stringSize);
                 break;
+            case OverlayChatGameScreen _:
+                _config.SetCVar(CCVars.OverlayScreenChatSize, stringSize);
+                break;
             default:
                 // do nothing
                 return;
diff --git a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
index 52d0348b79..ac37cebfa9 100644
--- a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
+++ b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
@@ -23,12 +23,12 @@ private void OnScreenLoad()
     {
         switch (UIManager.ActiveScreen)
         {
-            case DefaultGameScreen game:
-                _votes.SetPopupContainer(game.VoteMenu);
-                break;
             case SeparatedChatGameScreen separated:
                 _votes.SetPopupContainer(separated.VoteMenu);
                 break;
+            case OverlayChatGameScreen overlay:
+                _votes.SetPopupContainer(overlay.VoteMenu);
+                break;
         }
     }
 
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index f8943a9bf9..891c790d52 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1596,10 +1596,10 @@ public static readonly CVarDef<int>
          */
 
         public static readonly CVarDef<string> UILayout =
-            CVarDef.Create("ui.layout", "Default", CVar.CLIENTONLY | CVar.ARCHIVE);
+            CVarDef.Create("ui.layout", "Separated", CVar.CLIENTONLY | CVar.ARCHIVE);
 
-        public static readonly CVarDef<string> DefaultScreenChatSize =
-            CVarDef.Create("ui.default_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE);
+        public static readonly CVarDef<string> OverlayScreenChatSize =
+            CVarDef.Create("ui.overlay_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE);
 
         public static readonly CVarDef<string> SeparatedScreenChatSize =
             CVarDef.Create("ui.separated_chat_size", "0.6,0", CVar.CLIENTONLY | CVar.ARCHIVE);

From 34e5669c41e58d3b18638d2ef070ced256b59a64 Mon Sep 17 00:00:00 2001
From: stellar-novas <stellar_novas@riseup.net>
Date: Sun, 16 Jun 2024 18:49:20 -0400
Subject: [PATCH 53/84] Build doc cleanup (#470)

# Description

This pr streamlines the build process by removing the python3 dependency
and pointing to the new build scripts.
---
 BuildChecker/BuildChecker.csproj |   4 +-
 BuildChecker/git_helper.py       | 110 -------------------------------
 BuildChecker/hooks/post-checkout |  13 ----
 BuildChecker/hooks/post-merge    |   5 --
 LEGAL.md                         |   4 +-
 README.md                        |  27 ++++----
 RUN_THIS.py                      |  13 ----
 Scripts/bat/buildAllDebug.bat    |   1 -
 Scripts/bat/buildAllRelease.bat  |   1 -
 Scripts/bat/buildAllTools.bat    |   1 -
 Scripts/sh/buildAllDebug.sh      |   1 -
 Scripts/sh/buildAllRelease.sh    |   1 -
 Scripts/sh/buildAllTools.sh      |   1 -
 shell.nix                        |   1 -
 14 files changed, 15 insertions(+), 168 deletions(-)
 delete mode 100644 BuildChecker/git_helper.py
 delete mode 100755 BuildChecker/hooks/post-checkout
 delete mode 100755 BuildChecker/hooks/post-merge
 delete mode 100755 RUN_THIS.py

diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj
index 63d16fa970..d4f9a41254 100644
--- a/BuildChecker/BuildChecker.csproj
+++ b/BuildChecker/BuildChecker.csproj
@@ -14,8 +14,6 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
 -->
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Python>python3</Python>
-    <Python Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">py -3</Python>
     <ProjectGuid>{C899FCA4-7037-4E49-ABC2-44DE72487110}</ProjectGuid>
     <TargetFrameworkMoniker>.NETFramework, Version=v4.7.2</TargetFrameworkMoniker>
     <RestorePackages>false</RestorePackages>
@@ -39,7 +37,7 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
     <OutputPath>bin\DebugOpt\</OutputPath>
   </PropertyGroup>
   <Target Name="Build">
-    <Exec Command="$(Python) git_helper.py" CustomErrorRegularExpression="^Error" />
+    <Exec Command="git submodule update --init --recursive"/>
   </Target>
   <Target Name="Rebuild" DependsOnTargets="Build" />
   <Target Name="Clean">
diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py
deleted file mode 100644
index becd4506e8..0000000000
--- a/BuildChecker/git_helper.py
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/env python3
-# Installs git hooks, updates them, updates submodules, that kind of thing.
-
-import subprocess
-import sys
-import os
-import shutil
-from pathlib import Path
-from typing import List
-
-SOLUTION_PATH = Path("..") / "SpaceStation14.sln"
-# If this doesn't match the saved version we overwrite them all.
-CURRENT_HOOKS_VERSION = "2"
-QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"
-
-
-def run_command(command: List[str], capture: bool = False) -> subprocess.CompletedProcess:
-    """
-    Runs a command with pretty output.
-    """
-    text = ' '.join(command)
-    if not QUIET:
-        print("$ {}".format(text))
-
-    sys.stdout.flush()
-
-    completed = None
-
-    if capture:
-        completed = subprocess.run(command, cwd="..", stdout=subprocess.PIPE)
-    else:
-        completed = subprocess.run(command, cwd="..")
-
-    if completed.returncode != 0:
-        print("Error: command exited with code {}!".format(completed.returncode))
-
-    return completed
-
-
-def update_submodules():
-    """
-    Updates all submodules.
-    """
-
-    if ('GITHUB_ACTIONS' in os.environ):
-        return
-
-    if os.path.isfile("DISABLE_SUBMODULE_AUTOUPDATE"):
-        return
-
-    if shutil.which("git") is None:
-        raise FileNotFoundError("git not found in PATH")
-
-    # If the status doesn't match, force VS to reload the solution.
-    # status = run_command(["git", "submodule", "status"], capture=True)
-    run_command(["git", "submodule", "update", "--init", "--recursive"])
-    # status2 = run_command(["git", "submodule", "status"], capture=True)
-
-    # Something changed.
-    # if status.stdout != status2.stdout:
-    #     print("Git submodules changed. Reloading solution.")
-    #     reset_solution()
-
-
-def install_hooks():
-    """
-    Installs the necessary git hooks into .git/hooks.
-    """
-
-    # Read version file.
-    if os.path.isfile("INSTALLED_HOOKS_VERSION"):
-        with open("INSTALLED_HOOKS_VERSION", "r") as f:
-            if f.read() == CURRENT_HOOKS_VERSION:
-                if not QUIET:
-                    print("No hooks change detected.")
-                return
-
-    with open("INSTALLED_HOOKS_VERSION", "w") as f:
-        f.write(CURRENT_HOOKS_VERSION)
-
-    print("Hooks need updating.")
-
-    hooks_target_dir = Path("..")/".git"/"hooks"
-    hooks_source_dir = Path("hooks")
-
-    # Clear entire tree since we need to kill deleted files too.
-    for filename in os.listdir(str(hooks_target_dir)):
-        os.remove(str(hooks_target_dir/filename))
-
-    for filename in os.listdir(str(hooks_source_dir)):
-        print("Copying hook {}".format(filename))
-        shutil.copy2(str(hooks_source_dir/filename),
-                        str(hooks_target_dir/filename))
-
-
-def reset_solution():
-    """
-    Force VS to think the solution has been changed to prompt the user to reload it, thus fixing any load errors.
-    """
-
-    with SOLUTION_PATH.open("r") as f:
-        content = f.read()
-
-    with SOLUTION_PATH.open("w") as f:
-        f.write(content)
-
-
-if __name__ == '__main__':
-    install_hooks()
-    update_submodules()
diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout
deleted file mode 100755
index c5662445c2..0000000000
--- a/BuildChecker/hooks/post-checkout
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-gitroot=`git rev-parse --show-toplevel`
-
-cd "$gitroot/BuildChecker"
-
-if [[ `uname` == MINGW* || `uname` == CYGWIN* ]]; then
-    # Windows
-    py -3 git_helper.py --quiet
-else
-    # Not Windows, so probably some other Unix thing.
-    python3 git_helper.py --quiet
-fi
diff --git a/BuildChecker/hooks/post-merge b/BuildChecker/hooks/post-merge
deleted file mode 100755
index 85fe61d966..0000000000
--- a/BuildChecker/hooks/post-merge
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Just call post-checkout since it does the same thing.
-gitroot=`git rev-parse --show-toplevel`
-bash "$gitroot/.git/hooks/post-checkout"
diff --git a/LEGAL.md b/LEGAL.md
index 2df3c39add..34cd4009d5 100644
--- a/LEGAL.md
+++ b/LEGAL.md
@@ -6,9 +6,9 @@ The Authors retain all copyright to their respective work submitted here.
 
 ## Code license
 
-Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated. See [LICENSE-AGPLv3](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-AGPLv3.txt).
+Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated. See [LICENSE-AGPLv3](./LICENSE-AGPLv3.txt).
 
-Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license unless otherwise stated. See [LICENSE-MIT](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-MIT.txt).
+Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license unless otherwise stated. See [LICENSE-MIT](./LICENSE-MIT.txt).
 
 [87c70a89a67d0521a56388e6b1c3f2cb947943e4](https://github.com/Simple-Station/Einstein-Engines/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4) was pushed on February 17th 2024 at 21:48 UTC
 
diff --git a/README.md b/README.md
index 3dbe1910e2..f102318611 100644
--- a/README.md
+++ b/README.md
@@ -41,27 +41,24 @@ We provide some scripts shown below to make the job easier.
 ### Build dependencies
 
 > - Git
-> - DOTNET SDK 7.0 or higher
-> - python 3.7 or higher
+> - .NET SDK 8.0.100
 
 
 ### Windows
 
 > 1. Clone this repository
-> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal
-> 3. Run the `Scripts/bat/run1buildDebug.bat`
-> 4. Run the `Scripts/bat/run2configDev.bat` if you need other configurations run other config scripts
-> 5. Run both the `Scripts/bat/run3server.bat` and `Scripts/bat/run4client.bat`
-> 6. Connect to localhost and play
+> 2. Run `git submodule update --init --recursive` in a terminal to download the engine
+> 3. Run `Scripts/bat/buildAllDebug.bat` after making any changes to the source
+> 4. Run `Scripts/bat/runQuickAll.bat` to launch the client and the server
+> 5. Connect to localhost in the client and play
 
 ### Linux
 
 > 1. Clone this repository
-> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal
-> 3. Run the `Scripts/sh/run1buildDebug.sh`
-> 4. Run the `Scripts/sh/run2configDev.sh` if you need other configurations run other config scripts
-> 5. Run both the `Scripts/sh/run3server.bat` and `scripts/sh/run4client.sh`
-> 6. Connect to localhost and play
+> 2. Run `git submodule update --init --recursive` in a terminal to download the engine
+> 3. Run `Scripts/bat/buildAllDebug.sh` after making any changes to the source
+> 4. Run `Scripts/bat/runQuickAll.sh` to launch the client and the server
+> 5. Connect to localhost in the client and play
 
 ### MacOS
 
@@ -70,12 +67,12 @@ We provide some scripts shown below to make the job easier.
 ## License
 
 Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 (`17 February 2024 23:00:00 UTC`) is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated.
-See [LICENSE-AGPLv3](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-AGPLv3.txt).
+See [LICENSE-AGPLv3](./LICENSE-AGPLv3.txt).
 
 Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 (`17 February 2024 23:00:00 UTC`) is licensed under the MIT license unless otherwise stated.
-See [LICENSE-MIT](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-MIT.txt).
+See [LICENSE-MIT](./LICENSE-MIT.txt).
 
 Most assets are licensed under [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) unless stated otherwise. Assets have their license and the copyright in the metadata file.
-[Example](https://github.com/Simple-Station/Einstein-Engines/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).
+[Example](./Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).
 
 Note that some assets are licensed under the non-commercial [CC-BY-NC-SA 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/) or similar non-commercial licenses and will need to be removed if you wish to use this project commercially.
diff --git a/RUN_THIS.py b/RUN_THIS.py
deleted file mode 100755
index 6ea9f8e707..0000000000
--- a/RUN_THIS.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python3
-
-# Import future so people on py2 still get the clear error that they need to upgrade.
-from __future__ import print_function
-import sys
-import subprocess
-
-version = sys.version_info
-if version.major < 3 or (version.major == 3 and version.minor < 5):
-    print("ERROR: You need at least Python 3.5 to build SS14.")
-    sys.exit(1)
-
-subprocess.run([sys.executable, "git_helper.py"], cwd="BuildChecker")
diff --git a/Scripts/bat/buildAllDebug.bat b/Scripts/bat/buildAllDebug.bat
index 5cf4952175..1e3cc5442e 100755
--- a/Scripts/bat/buildAllDebug.bat
+++ b/Scripts/bat/buildAllDebug.bat
@@ -1,7 +1,6 @@
 @echo off
 cd ../../
 
-call python RUN_THIS.py
 call git submodule update --init --recursive
 call dotnet build -c Debug
 
diff --git a/Scripts/bat/buildAllRelease.bat b/Scripts/bat/buildAllRelease.bat
index 6a8cbac664..730b39d26e 100755
--- a/Scripts/bat/buildAllRelease.bat
+++ b/Scripts/bat/buildAllRelease.bat
@@ -1,7 +1,6 @@
 @echo off
 cd ../../
 
-call python RUN_THIS.py
 call git submodule update --init --recursive
 call dotnet build -c Release
 
diff --git a/Scripts/bat/buildAllTools.bat b/Scripts/bat/buildAllTools.bat
index 7c878cbabb..37db01f459 100755
--- a/Scripts/bat/buildAllTools.bat
+++ b/Scripts/bat/buildAllTools.bat
@@ -1,7 +1,6 @@
 @echo off
 cd ../../
 
-call python RUN_THIS.py
 call git submodule update --init --recursive
 call dotnet build -c Tools
 
diff --git a/Scripts/sh/buildAllDebug.sh b/Scripts/sh/buildAllDebug.sh
index 1ee457ff2a..1e62ef7742 100755
--- a/Scripts/sh/buildAllDebug.sh
+++ b/Scripts/sh/buildAllDebug.sh
@@ -7,6 +7,5 @@ fi
 
 cd ../../
 
-python RUN_THIS.py
 git submodule update --init --recursive
 dotnet build -c Debug
diff --git a/Scripts/sh/buildAllRelease.sh b/Scripts/sh/buildAllRelease.sh
index b3749ac28d..3cfb84b76c 100755
--- a/Scripts/sh/buildAllRelease.sh
+++ b/Scripts/sh/buildAllRelease.sh
@@ -7,6 +7,5 @@ fi
 
 cd ../../
 
-python RUN_THIS.py
 git submodule update --init --recursive
 dotnet build -c Release
diff --git a/Scripts/sh/buildAllTools.sh b/Scripts/sh/buildAllTools.sh
index 14a68487af..551db74fcb 100755
--- a/Scripts/sh/buildAllTools.sh
+++ b/Scripts/sh/buildAllTools.sh
@@ -7,6 +7,5 @@ fi
 
 cd ../../
 
-python RUN_THIS.py
 git submodule update --init --recursive
 dotnet build -c Tools
diff --git a/shell.nix b/shell.nix
index 9a1b0ca429..85e97a4283 100644
--- a/shell.nix
+++ b/shell.nix
@@ -41,7 +41,6 @@ let
     dbus
     at-spi2-core
     cups
-    python3
   ];
 in pkgs.mkShell {
   name = "space-station-14-devshell";

From 5b69766dd7087d772e7fff899c426bf80c4f0775 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Date: Mon, 17 Jun 2024 00:56:25 -0700
Subject: [PATCH 54/84] Move Changelog Bot to Changelogs Directory (#469)

---
 .github/workflows/changelog.yml              | 4 ++--
 Tools/{changelog => changelogs}/changelog.js | 0
 Tools/{changelog => changelogs}/package.json | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Tools/{changelog => changelogs}/changelog.js (100%)
 rename Tools/{changelog => changelogs}/package.json (100%)

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index a44cac2cd1..877273d764 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -35,14 +35,14 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          cd "Tools/changelog"
+          cd "Tools/changelogs"
           npm install
         shell: bash
         continue-on-error: true
 
       - name: Generate Changelog
         run: |
-          cd "Tools/changelog"
+          cd "Tools/changelogs"
           node changelog.js
         shell: bash
         continue-on-error: true
diff --git a/Tools/changelog/changelog.js b/Tools/changelogs/changelog.js
similarity index 100%
rename from Tools/changelog/changelog.js
rename to Tools/changelogs/changelog.js
diff --git a/Tools/changelog/package.json b/Tools/changelogs/package.json
similarity index 100%
rename from Tools/changelog/package.json
rename to Tools/changelogs/package.json

From d34f64b4a7b59c3e9f0675c01da57dd29294d6b1 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Mon, 17 Jun 2024 03:58:34 -0400
Subject: [PATCH 55/84] Port Frictionless Space (#464)

# Description

This ports
https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/pull/46.
This PR is something I consider a key feature adjacent to Space Wind
Rework and its accompanying updates, and is an essential part of the
space station experience.
In practice, this weirdly enough makes being launched into space a bit
easier to survive, since instead of needing to throw potentially
hundreds of items, you can simply throw enough items to get started
flying in the direction of the station and will eventually float back to
the station.

---

<details><summary><h1>Media</h1></summary>
<p>


https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/assets/77995199/5570ef35-16e2-493a-ac35-738f27751346


https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/assets/77995199/51fba943-8dce-4265-a9cc-7181155eb8de


https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/assets/77995199/cd6c0511-2639-4e14-8160-426ba7f2ba73

---
</p>
</details>

# Changelog

:cl: DEATHB4DEFEAT
- tweak: Space has suddenly become less dense (objects don't slow down
in space)
- remove: Moths are unable to move in space
- tweak: Moths have way better control in zero gravity environments

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
---
 .../MovementSpeedModifierComponent.cs         |  2 +-
 .../Physics/FrictionRemoverSystem.cs          | 25 +++++++++++++++++++
 .../Prototypes/Entities/Mobs/Species/moth.yml |  4 +--
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 Content.Shared/Physics/FrictionRemoverSystem.cs

diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
index a0feab7052..813a18f974 100644
--- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
+++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class MovementSpeedModifierComponent : Component
         // Weightless
         public const float DefaultMinimumFrictionSpeed = 0.005f;
         public const float DefaultWeightlessFriction = 1f;
-        public const float DefaultWeightlessFrictionNoInput = 0.2f;
+        public const float DefaultWeightlessFrictionNoInput = 0f;
         public const float DefaultWeightlessModifier = 0.7f;
         public const float DefaultWeightlessAcceleration = 1f;
 
diff --git a/Content.Shared/Physics/FrictionRemoverSystem.cs b/Content.Shared/Physics/FrictionRemoverSystem.cs
new file mode 100644
index 0000000000..65bbe9e4d2
--- /dev/null
+++ b/Content.Shared/Physics/FrictionRemoverSystem.cs
@@ -0,0 +1,25 @@
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Systems;
+
+namespace Content.Shared.Physics;
+
+public sealed class FrictionRemoverSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PhysicsComponent, PhysicsSleepEvent>(RemoveDampening);
+    }
+
+
+    private void RemoveDampening(EntityUid uid, PhysicsComponent component, PhysicsSleepEvent args)
+    {
+        _physics.SetAngularDamping(uid, component, 0f, false);
+        _physics.SetLinearDamping(uid, component, 0f);
+    }
+}
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index 1680dd6cda..df7fad06dd 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -44,9 +44,7 @@
       Female: UnisexMoth
       Unsexed: UnisexMoth
   - type: MovementSpeedModifier
-    weightlessAcceleration: 1.5 # Move around more easily in space.
-    weightlessFriction: 1
-    weightlessModifier: 1
+    weightlessAcceleration: 2.5 # Move around more easily in space.
   - type: Flammable
     damage:
       types:

From cef74f3ddaec0dc362da85be0b294e1a0569ac98 Mon Sep 17 00:00:00 2001
From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com>
Date: Mon, 17 Jun 2024 03:12:29 -0700
Subject: [PATCH 56/84] Mirror: Landmine stepoff (#358)

## Mirror of PR #22962: [Landmine
stepoff](https://github.com/space-wizards/space-station-14/pull/22962)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `54dd273f660d6d8d523d0771bb8d8437373b082e`

PR opened by <img
src="https://avatars.githubusercontent.com/u/59531932?v=4"
width="16"/><a href="https://github.com/YuriyKiss"> YuriyKiss</a> at
2023-12-25 12:38:55 UTC

---

PR changed 13 files with 95 additions and 47 deletions.

The PR had the following labels:
- Status: Awaiting Changes


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> Landmine will explode when player steps off it. Landmine will make a
sound effect when player steps on it
> Close #21658 (Issue has some other suggestions, turn them into
separate issues if relevant)
>
> Requires https://github.com/space-wizards/RobustToolbox/pull/4883
>
> ## Why / Balance
> IRL some landmines will only trigger after you release the pressure
put on them.
>
> ## Technical details
> There are two landmine modes now, one will make landmine trigger
immediately after player steps on them another one will only trigger
after player steps off the landmine (this is the default now).
>
> ## Media
> Landmine stepoff in action:
>
>
https://github.com/space-wizards/space-station-14/assets/59531932/6e884619-7217-4301-bd78-6e843e0d78f1
>
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
> ## Breaking changes
>
>
> **Changelog**
> - tweak: landmines will trigger after you step off them
> - add: landmine trigger sound
>


</details>

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: SimpleStation14 <Unknown>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
---
 .../Ensnaring/EnsnareableSystem.Ensnaring.cs  |   4 +-
 .../Explosion/EntitySystems/TriggerSystem.cs  |   4 +-
 Content.Server/LandMines/LandMineComponent.cs |   9 +++-
 Content.Server/LandMines/LandMineSystem.cs    |  46 +++++++++---------
 Content.Server/Tiles/LavaSystem.cs            |   4 +-
 Content.Shared/Chasm/ChasmSystem.cs           |   4 +-
 Content.Shared/Slippery/SlipperySystem.cs     |   4 +-
 .../Components/StepTriggerComponent.cs        |   8 ++-
 .../StepTrigger/Systems/StepTriggerSystem.cs  |  41 ++++++++++++----
 Resources/Audio/Effects/attributions.yml      |   5 ++
 Resources/Audio/Effects/beep_landmine.ogg     | Bin 0 -> 6034 bytes
 .../Entities/Objects/Misc/land_mine.yml       |   8 +--
 .../Objects/Specific/Janitorial/janitor.yml   |   5 ++
 13 files changed, 95 insertions(+), 47 deletions(-)
 create mode 100644 Resources/Audio/Effects/beep_landmine.ogg

diff --git a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
index 169daca07a..202d03bcda 100644
--- a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
+++ b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
@@ -25,7 +25,7 @@ public void InitializeEnsnaring()
     {
         SubscribeLocalEvent<EnsnaringComponent, ComponentRemove>(OnComponentRemove);
         SubscribeLocalEvent<EnsnaringComponent, StepTriggerAttemptEvent>(AttemptStepTrigger);
-        SubscribeLocalEvent<EnsnaringComponent, StepTriggeredEvent>(OnStepTrigger);
+        SubscribeLocalEvent<EnsnaringComponent, StepTriggeredOffEvent>(OnStepTrigger);
         SubscribeLocalEvent<EnsnaringComponent, ThrowDoHitEvent>(OnThrowHit);
         SubscribeLocalEvent<EnsnaringComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
     }
@@ -49,7 +49,7 @@ private void AttemptStepTrigger(EntityUid uid, EnsnaringComponent component, ref
         args.Continue = true;
     }
 
-    private void OnStepTrigger(EntityUid uid, EnsnaringComponent component, ref StepTriggeredEvent args)
+    private void OnStepTrigger(EntityUid uid, EnsnaringComponent component, ref StepTriggeredOffEvent args)
     {
         TryEnsnare(args.Tripper, uid, component);
     }
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index 9b9a042641..e24de5a2f6 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -88,7 +88,7 @@ public override void Initialize()
             SubscribeLocalEvent<TriggerOnCollideComponent, StartCollideEvent>(OnTriggerCollide);
             SubscribeLocalEvent<TriggerOnActivateComponent, ActivateInWorldEvent>(OnActivate);
             SubscribeLocalEvent<TriggerImplantActionComponent, ActivateImplantEvent>(OnImplantTrigger);
-            SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredEvent>(OnStepTriggered);
+            SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredOffEvent>(OnStepTriggered);
             SubscribeLocalEvent<TriggerOnSlipComponent, SlipEvent>(OnSlipTriggered);
             SubscribeLocalEvent<TriggerWhenEmptyComponent, OnEmptyGunShotEvent>(OnEmptyTriggered);
 
@@ -228,7 +228,7 @@ private void OnImplantTrigger(EntityUid uid, TriggerImplantActionComponent compo
             args.Handled = Trigger(uid);
         }
 
-        private void OnStepTriggered(EntityUid uid, TriggerOnStepTriggerComponent component, ref StepTriggeredEvent args)
+        private void OnStepTriggered(EntityUid uid, TriggerOnStepTriggerComponent component, ref StepTriggeredOffEvent args)
         {
             Trigger(uid, args.Tripper);
         }
diff --git a/Content.Server/LandMines/LandMineComponent.cs b/Content.Server/LandMines/LandMineComponent.cs
index 63e1e4b99f..1c4ba06691 100644
--- a/Content.Server/LandMines/LandMineComponent.cs
+++ b/Content.Server/LandMines/LandMineComponent.cs
@@ -1,6 +1,13 @@
-namespace Content.Server.LandMines;
+using Robust.Shared.Audio;
+
+namespace Content.Server.LandMines;
 
 [RegisterComponent]
 public sealed partial class LandMineComponent : Component
 {
+    /// <summary>
+    /// Trigger sound effect when stepping onto landmine
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public SoundSpecifier? Sound;
 }
diff --git a/Content.Server/LandMines/LandMineSystem.cs b/Content.Server/LandMines/LandMineSystem.cs
index 78c48ef99e..22dedb9337 100644
--- a/Content.Server/LandMines/LandMineSystem.cs
+++ b/Content.Server/LandMines/LandMineSystem.cs
@@ -1,43 +1,43 @@
-using Content.Server.Explosion.EntitySystems;
+using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Popups;
-using Content.Shared.StepTrigger;
 using Content.Shared.StepTrigger.Systems;
-using Robust.Shared.Player;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.LandMines;
 
 public sealed class LandMineSystem : EntitySystem
 {
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly TriggerSystem _trigger = default!;
 
-
     public override void Initialize()
     {
-        SubscribeLocalEvent<LandMineComponent, StepTriggeredEvent>(HandleTriggered);
-        SubscribeLocalEvent<LandMineComponent, StepTriggerAttemptEvent>(HandleTriggerAttempt);
+        SubscribeLocalEvent<LandMineComponent, StepTriggeredOnEvent>(HandleStepOnTriggered);
+        SubscribeLocalEvent<LandMineComponent, StepTriggeredOffEvent>(HandleStepOffTriggered);
+
+        SubscribeLocalEvent<LandMineComponent, StepTriggerAttemptEvent>(HandleStepTriggerAttempt);
     }
 
-    private static void HandleTriggerAttempt(
-        EntityUid uid,
-        LandMineComponent component,
-        ref StepTriggerAttemptEvent args)
+    private void HandleStepOnTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOnEvent args)
     {
-        args.Continue = true;
+        _popupSystem.PopupCoordinates(
+            Loc.GetString("land-mine-triggered", ("mine", uid)),
+            Transform(uid).Coordinates,
+            args.Tripper,
+            PopupType.LargeCaution);
+
+        _audioSystem.PlayPvs(component.Sound, uid);
     }
 
-    private void HandleTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredEvent args)
+    private void HandleStepOffTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOffEvent args)
     {
-        // This doesn't use TriggerOnStepTrigger since we don't want to display the popup if nothing happens
-        // and I didn't feel like making an `AfterTrigger` event
-        if (_trigger.Trigger(uid, args.Tripper))
-        {
-            _popupSystem.PopupCoordinates(
-                Loc.GetString("land-mine-triggered", ("mine", uid)),
-                Transform(uid).Coordinates,
-                args.Tripper,
-                PopupType.LargeCaution);
-        }
+        _trigger.Trigger(uid, args.Tripper);
     }
-}
 
+    private static void HandleStepTriggerAttempt(EntityUid uid, LandMineComponent component, ref StepTriggerAttemptEvent args)
+    {
+        args.Continue = true;
+    }
+}
diff --git a/Content.Server/Tiles/LavaSystem.cs b/Content.Server/Tiles/LavaSystem.cs
index 7aee0b6501..51bd6f8475 100644
--- a/Content.Server/Tiles/LavaSystem.cs
+++ b/Content.Server/Tiles/LavaSystem.cs
@@ -11,7 +11,7 @@ public sealed class LavaSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<LavaComponent, StepTriggeredEvent>(OnLavaStepTriggered);
+        SubscribeLocalEvent<LavaComponent, StepTriggeredOffEvent>(OnLavaStepTriggered);
         SubscribeLocalEvent<LavaComponent, StepTriggerAttemptEvent>(OnLavaStepTriggerAttempt);
     }
 
@@ -23,7 +23,7 @@ private void OnLavaStepTriggerAttempt(EntityUid uid, LavaComponent component, re
         args.Continue = true;
     }
 
-    private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredEvent args)
+    private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredOffEvent args)
     {
         var otherUid = args.Tripper;
 
diff --git a/Content.Shared/Chasm/ChasmSystem.cs b/Content.Shared/Chasm/ChasmSystem.cs
index 51299557db..86b8d4fc4d 100644
--- a/Content.Shared/Chasm/ChasmSystem.cs
+++ b/Content.Shared/Chasm/ChasmSystem.cs
@@ -24,7 +24,7 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<ChasmComponent, StepTriggeredEvent>(OnStepTriggered);
+        SubscribeLocalEvent<ChasmComponent, StepTriggeredOffEvent>(OnStepTriggered);
         SubscribeLocalEvent<ChasmComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
         SubscribeLocalEvent<ChasmFallingComponent, UpdateCanMoveEvent>(OnUpdateCanMove);
     }
@@ -47,7 +47,7 @@ public override void Update(float frameTime)
         }
     }
 
-    private void OnStepTriggered(EntityUid uid, ChasmComponent component, ref StepTriggeredEvent args)
+    private void OnStepTriggered(EntityUid uid, ChasmComponent component, ref StepTriggeredOffEvent args)
     {
         // already doomed
         if (HasComp<ChasmFallingComponent>(args.Tripper))
diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs
index d20495cfa6..ff8b597a0d 100644
--- a/Content.Shared/Slippery/SlipperySystem.cs
+++ b/Content.Shared/Slippery/SlipperySystem.cs
@@ -31,14 +31,14 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<SlipperyComponent, StepTriggerAttemptEvent>(HandleAttemptCollide);
-        SubscribeLocalEvent<SlipperyComponent, StepTriggeredEvent>(HandleStepTrigger);
+        SubscribeLocalEvent<SlipperyComponent, StepTriggeredOffEvent>(HandleStepTrigger);
         SubscribeLocalEvent<NoSlipComponent, SlipAttemptEvent>(OnNoSlipAttempt);
         SubscribeLocalEvent<ThrownItemComponent, SlipCausingAttemptEvent>(OnThrownSlipAttempt);
         // as long as slip-resistant mice are never added, this should be fine (otherwise a mouse-hat will transfer it's power to the wearer).
         SubscribeLocalEvent<NoSlipComponent, InventoryRelayedEvent<SlipAttemptEvent>>((e, c, ev) => OnNoSlipAttempt(e, c, ev.Args));
     }
 
-    private void HandleStepTrigger(EntityUid uid, SlipperyComponent component, ref StepTriggeredEvent args)
+    private void HandleStepTrigger(EntityUid uid, SlipperyComponent component, ref StepTriggeredOffEvent args)
     {
         TrySlip(uid, component, args.Tripper);
     }
diff --git a/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs b/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
index f4731bf46a..b8483d021a 100644
--- a/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
+++ b/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
@@ -49,8 +49,14 @@ public sealed partial class StepTriggerComponent : Component
     ///     If this is true, steptrigger will still occur on entities that are in air / weightless. They do not
     ///     by default.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool IgnoreWeightless;
+
+    /// <summary>
+    /// Does this have separate "StepOn" and "StepOff" triggers.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool StepOn = false;
 }
 
 [RegisterComponent]
diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
index ede39b2aa9..b4ac2cde75 100644
--- a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
+++ b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
@@ -11,6 +11,7 @@ public sealed class StepTriggerSystem : EntitySystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly SharedGravitySystem _gravity = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
 
     public override void Initialize()
     {
@@ -40,7 +41,9 @@ public override void Update(float frameTime)
         while (enumerator.MoveNext(out var uid, out var active, out var trigger, out var transform))
         {
             if (!Update(uid, trigger, transform, query))
+            {
                 continue;
+            }
 
             RemCompDeferred(uid, active);
         }
@@ -56,7 +59,8 @@ private bool Update(EntityUid uid, StepTriggerComponent component, TransformComp
 
         if (component.Blacklist != null && TryComp<MapGridComponent>(transform.GridUid, out var grid))
         {
-            var anch = grid.GetAnchoredEntitiesEnumerator(grid.LocalToTile(transform.Coordinates));
+            var positon = _map.LocalToTile(uid, grid, transform.Coordinates);
+            var anch = _map.GetAnchoredEntitiesEnumerator(uid, grid, positon);
 
             while (anch.MoveNext(out var ent))
             {
@@ -109,8 +113,16 @@ private void UpdateColliding(EntityUid uid, StepTriggerComponent component, Tran
             return;
         }
 
-        var ev = new StepTriggeredEvent { Source = uid, Tripper = otherUid };
-        RaiseLocalEvent(uid, ref ev, true);
+        if (component.StepOn)
+        {
+            var evStep = new StepTriggeredOnEvent(uid, otherUid);
+            RaiseLocalEvent(uid, ref evStep);
+        }
+        else
+        {
+            var evStep = new StepTriggeredOffEvent(uid, otherUid);
+            RaiseLocalEvent(uid, ref evStep);
+        }
 
         component.CurrentlySteppedOn.Add(otherUid);
         Dirty(uid, component);
@@ -130,7 +142,7 @@ private bool CanTrigger(EntityUid uid, EntityUid otherUid, StepTriggerComponent
 
         var msg = new StepTriggerAttemptEvent { Source = uid, Tripper = otherUid };
 
-        RaiseLocalEvent(uid, ref msg, true);
+        RaiseLocalEvent(uid, ref msg);
 
         return msg.Continue && !msg.Cancelled;
     }
@@ -163,6 +175,12 @@ private void OnEndCollide(EntityUid uid, StepTriggerComponent component, ref End
         component.CurrentlySteppedOn.Remove(otherUid);
         Dirty(uid, component);
 
+        if (component.StepOn)
+        {
+            var evStepOff = new StepTriggeredOffEvent(uid, otherUid);
+            RaiseLocalEvent(uid, ref evStepOff);
+        }
+
         if (component.Colliding.Count == 0)
         {
             RemCompDeferred<StepTriggerActiveComponent>(uid);
@@ -230,9 +248,14 @@ public struct StepTriggerAttemptEvent
     public bool Cancelled;
 }
 
+/// <summary>
+/// Raised when an entity stands on a steptrigger initially (assuming it has both on and off states).
+/// </summary>
 [ByRefEvent]
-public struct StepTriggeredEvent
-{
-    public EntityUid Source;
-    public EntityUid Tripper;
-}
+public readonly record struct StepTriggeredOnEvent(EntityUid Source, EntityUid Tripper);
+
+/// <summary>
+/// Raised when an entity leaves a steptrigger if it has on and off states OR when an entity intersects a steptrigger.
+/// </summary>
+[ByRefEvent]
+public readonly record struct StepTriggeredOffEvent(EntityUid Source, EntityUid Tripper);
diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index 90445a31d1..6f18510d17 100644
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -226,3 +226,8 @@
   copyright: TGStation at 3df5d3b42bfb6b3b5adba1067ab41f83816255bb
   license: CC-BY-SA-3.0
   source: https://github.com/tgstation/tgstation/blob/3df5d3b42bfb6b3b5adba1067ab41f83816255bb/sound/misc/server-ready.ogg
+
+- files: [beep_landmine.ogg]
+  copyright: '"beep_landmine.ogg" by kaktuscsc of Discord for SS14'
+  license: "CC-BY-SA-3.0"
+  source: https://github.com/YuriyKiss/space-station-14/commit/971a135a9c83aed46e967aac9302ab5b35562b5f
diff --git a/Resources/Audio/Effects/beep_landmine.ogg b/Resources/Audio/Effects/beep_landmine.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..48bc5e21d962084a1db41c473f30892d914894ae
GIT binary patch
literal 6034
zcmahtdpy(Y|Iap;VQDc!($vN#9hQknF?Wk%Ojyf3B&C?tNhxzlI9fBMDau4q5u#3x
z%B^xuE`>wopmfpcoaUtRdp4cE-|t_)=k<I(pZDi|d*09cdB30M{rPMO5BCB{@Vz}9
zcwa09Ki1|}BlHmQd-erK#!3+ghjQryfFw(V>{*A{B9;8nq>@q!K4V{rs_p!LwWFv7
zHH#qCEhv76IqfHkDeR_F_7(67+a0neG;H4nNDPq@sZt_-S7h*l972BKxzf(w2LWsW
zAjE1JIf-L6c~~7g5ABz_cAZggwC&uM9MfIv#(qSM&CxF|v`c4`j&|p;fK(ujo`B<J
z(9!xl;s#%Svf%~@rPClTQi{Xc{d;qyML;SYy`1;b)Dn~Yhvlp;&ynVfg}5m^Z?Ron
zesVbtG84>QJdzb?Q@Xr+#-xm6O{R64JUMex=CN_pwkOFdcIo-auI95kyl{Gg=E4{R
zx=T*70=-R(=R}7VDA4L~yhrp>9i9;ly@H3QhH8Ku017XVGA@vmu{u@CpbY@5ttYN^
zukM4Bx(_OKRnUw4<l#C1G~{#1D0aynci|KK_(WNsIDXmqQI)K(m5I9m;NgjJ+>29`
z$%O)dF0{-L`(}tEGA7fr(Y(}hBuD~44h}=L_p){tICOcl25O^+{;RWvVcIfr=tJz|
z$Q@-0>82=c1=%`4Gm@5Mm^LN->*ORYhUx{S3fidXWuc#HKBJPhT;x)7fPXflo;E3p
z?R+pHqI5#&g2)e(5BVlVO@)5S3y@*uf$n@GDQ<7)t3c6`76=(s9LUMfs)3MvMPzpV
zrb-C8)E{7;-6X}uN>#~jubW@#iqxgArFZIuXS<srw58?M?;`9E78#$+$#A~5*wn0`
zVKVyhWCY%6NwCh^S9Hmgsgh2z$nJH|R7A1B3Qf%2%VZcXI2;LV(fTPkrpv##;B@^|
zt$h#4mkN(DjLJ$cWUhT=e4|}<vwBm0Lv=ld(uB2NUD3q!iZ<`}je19$%ulZN@sFyg
zVKT^K0aID#KRookoq~2~j;B;}a60*tXrHoC>4H1)(xm}l%b&VEOP2qqf6(n(LiALF
zeNFFL^Ik7U7B_4_$o0FK$R14LND@b2pXCPm3d8*Vr!Pz$COIAk`@%%XEn2bdv?+oB
z`|mX2f`S;Fvn<|Rs|cGO6FMFnZ}~{wqQ1cs=h#bS^=NQBEuuZwh4q?qyw-78KG9o+
z(d=68P+r)OByse=I!949MKu7d_^ZhLm1O=)%WQ(HZA6<9uvL&|WX20p_Df4X!Ie*p
z<cA*+mY&Ifb>^JWWf=>=N?D{Wqa-1tEFq&bA$uyFA8|%lT9&{1Vac0YSEv8Kt|AL?
z0swIY=Y0fcCc%*j0hxD`FjDX8-lq^8_ZdHWOkJ2`kNO7a(5-O`o5uGA008sgI_^=A
zuDcqskGY2BwWg2h*yqLi|C)O*)m<GrR!N$$-Ttxd6?xh8sq(xwQgPwHX4*vYKs)J}
zXc9{aIo-;n*kf9Rbe=#SI!z9E!n~riQJQr3b-KPLICj#EmWx|x&Se*$crq$W{MR$Y
zwcb%LMey|@N$kJr%5t%H)a6Pj1Qg+=Qq-NJfw08^a1_H-CZ`C3JIRwd%!jlI-QWz`
zB~eHxjZ`3bNHZ)rrA8LRSMsDt(CIoMI`!C<1mmL-0WUieHPjJc4Z&E9uKOvfJC5kC
z?zjcV8BllZ%cXWu%{{$Y?l|{8Z<e2?J4;A(H*<H#vAonBSsE-ap*yQ4tcx1`)SES;
z$?B^OV}DBAD&&rsxj&V@LMj)&a%!VT@_wjd4S2JL)<LSdXB@|q73K#u$8-D!SX=uO
zq2@j>_oo^xmXP(dFN`JR2E?&Od^k@BSbqJ9L;WcM{fYNVFW=hz@aokoRpoP4Kh52G
zJ1ubSb(0#@=ite5-&zyx#f@gGI}T{D`h<>NT&N{6fE)I7z@dlh$jS|q4w)Oq*&nv`
zCKQQg#V3x&aX5Kgj_(e(B&C<j<>ZEqZVmI3gmGH?xuX)d-dgv8K5j3IJKE3v<4p9>
zEEMCiged`#Zy@FQf!!lZ&v~-ABLYqU6kEDGz~WiMZtH8&AwwIhuC2m2H(WR746VD>
z;C`ArGPTV9xkW0qw>lc?8;Rot<Z(wLrf+$8vp8GBo=R9-KP5sVo_|Ul)nW}upvzPH
zgatv8MDaV7Tvlxgv|#ddG{^Vw%c(C7YvZ_VC|lXyaMk+u-ni6_Fy|F?0YJKuP${Y9
zXz)S~Xz@h$ZuE3qGTaKtyc}ke7O$N~){bS`k;_t;%oAG4IWz-e>}Ce3NbJGbRK)AI
zBUh#{{dZOL<@=v7=RNi(iEBI<C(6V+>?m`mOnRH>6rW}&7RU(gG^2uKxP`)v&fl2a
z>`OBwCTBAg^~HRK8&RxfZ&aBp2!@0~|6TRXr(;RtW<FyVQS8fhqt$A~W=jV*lnpMf
zVKSp~W0_D@m@2~vs$wuG&?=}()s6vGc`=|>!K=xAzKorfP}L?%zX$UKBy3_(psL-K
zfArHM))cFSkccgsAy+GEbnM9sgZF8MRNRpcPHf>bvZRA&)x+&@bLAiT{^j+}gHh4-
zf9J<`m(}=txz$Ups+aeReRn6h8_vAhgOOQL<Im2drF|bfqXw#qs{8~AP}L@ed97Ad
zw)v-g|0|FXwX<>}KlVLkV$dtf{H9hE9K#=~n&=OK#ScmqZVv{6qcHE0(!7_`XHXQ1
z=;@TnVk(+4ArfRzCh^5g%7iYDxpopS;4`HVQ(0WhXGRqXn9Q9OFz=DlykABoYAV9C
zC4wAf5E!HT=uc};D(h*y@q>>JJye)k%VijtebJ8=FkJ44jEBYLa3l_%<}iR^fNy|O
z5aahLvDaIMsZ9x>vbI8uFl^M9Bju^(vbB8rq?l;7MJjuMJ0eL5qFLSCJ$>u_+`SL$
zTLGAnQv`*`Wj@Z9WE~Y_nN_fGgKJB7(ND(0qg0G#GT`2*6$8r>(;^H`r%DZ^!&pV1
zghynSKzdF}A+bR1M{V|>D(!zDc`&=h63p5R7LqG1ZHx3*Ba)!fMlJE_eHbexvUw&=
zp-3Qro(jsOpvA>c{5R#sVi~SwHG{$BqGS&yqoP?S1jbaqe|cqp{(2a<no;GnL0v}V
znik*K&O4GEW)!90Klc5dy#C;F^U2|4?7eDS$kqB!V?Vzq*ZN0wY?#IKJSzMAV`rqr
z<OzyoIC%yZnA<XGlX|?FyNW>o>`z7khhtf0<%9x_Y=x!L*`k#I9vci7SOoJBP8)LT
z!o!(FWXf==c4%Vgzc{fVbAeAuEZ~3VgLTB($wDX#aZH9x7A=Kd{lJl>m930QCjNlL
zJS>AG<%7P(+QHj*FaL|<|G+Vs|Ki|MediM}U115TYY9VDi*BgR(hRz&v{Wxi7QeOt
z;F^5Aju+6|DdA=MXi90B9fO=ov44m!A$uw7r|8FK=p&1oeKs}2gB>de(9i{@wjQP^
zfKkP6RHPf)##F=V)-E*Fg=#F9rkD$sP&5F+fHaP@O=)&~)+`^VJ$CG;cUD+C>@jT9
z3!v=Mcvs27`a`PW@R(e|1*W3(dji1KUkpI2Ja$Qsu2X7@f^%A{q6@5sVQT}8il9*+
z>EJ+3J6TkDx99l>gc>YTzBf5JIT-}w5Xi~NzHa2sZC@Ztziy;>$%7+F1O#Hm#g+O5
z1A@sKV`F0zleV^|x`x^dc}3e?EeSXrLfU}xcHx)vH@=YMcL5A=#X?y;ypoXHr+h&m
zumbCZU$$f-DM>M-d0*4U3rALb3BIpqaxGxRgPXTk=qGR-adq-^;649K=zNdr9$L?e
zkt6fZ?|w}@%Y4|g%y4(B^})Xucj7hHpytcs-3;DkDH18;6BEDBz0O+I;SW=Ae(B(m
zJVaIcaKi`1OPPv;UKBK*g?tH2J$9zXn3uk{uDaph6RdsZ_rOM$-5s-o2SVjce^DH*
zJ$l>HBD3cBj+?s?zqX`YTx`12#6qW0ScyP`YGT^dHl=;Opv`@UrT(Gim*k!}<w;P>
zvL#&g<<vnv6)d>!*cHRJaYc-2%9odwY}XmKOZ$9O={^duLl-5%+2{04V63N;uU&L#
z`I1YI{5)MejKVoDZAYQEe$G#ozka6`Jp&p`Lv^a74ic8M9aoe4(*#lIp>`YKTC=PF
zynp!MD$T~uyaa#%OS$AVA=jd94-kd|!)%tltyLiqoFjw64h<|;i%=^#Z>Dw^1}fem
zwm18XQh3r&MYn9v-(56Pw6vG=^DlW@E29)~?g$d&D|ovt8R3okXanw}QeTA$_$Pj|
zsZig$=x?V(vF+87w|`a2piHenPy?JWo!_>diF4LAp7r@SJy&a;r9N;=&%kl`z%jn|
z<h^I4i&yV{_)W4F7*NB%sh;}$o4<u0&bY1hbA$QU!uU7!bCOSoFJ#8j+!}03vtPu&
zY8=NK=OG=!^?y3oAYtpb*P-$FGkeyX2@fshrOez}LjF2_Cb{=*L#OggkIAQd&zlvj
zLz-u8>*^F$(wSgZZ{Fn5?*re?#ot(WGxsL3e*RiV==k>Xk+*3SD_m`jHqdtSD>C69
z9KgA>mzT?_l)T$73BPw{|L8FCZcU}~BzV2ot6?`L&fI6|zJlz3jvx-6S>%eTFlbxO
z4oO%I8ZnF7>DsQJL``%wV^>2#kHUqgN`IAz1HQ>S{&MUe)gwWj=YP?idlKe&;gE0H
z$awNyj@-2l(R<+JSJ1b7BIZz)9@2MBPnp6?5!$Sq>SsScl$F!+xx>hKO4IPV&Ewfa
zmu~q#x&Ps8>yA!~dzw4G_`JMvKR^0@^U3;EXXOGu)lA<Nn$*5sRJHAvTGgwi>9@xv
zJlbR(+5YE*gy2jHjuaShE;v9@^yS+>rQ01hd`f(;D2cIluekxvy<XE?V_-I2x^g4^
z)>e>oK)g98;&}-&srx)KNp;%}23AnG6j<f0WxfvfN7nmo=WBQjZ}*IN2V(XFRa{Jb
z89%!7$+p93IcIQYt*d@Vjb#?{8cseNYKr3r6<2H-iF7vE{K?h9GNy5+g3mqTAyoQM
z@yCVClR>XG(DS{X^`zx|7)91Op9@vYyo@kjQ;qTtVXaOojCOj-bUM*$cJElD_oL1W
zdmO9ms%$i^5)|oaCg&9^<)3`i>C}0j_aaq~uztmhuPDU1g9VrJi&KNfVymtKVBFE3
zq&a7E1%cnS9sz7HbX1HP|2o#rw50=)^g0S_GpM#0MSS>%44O*E9oVSGnx&SOIyX4%
zWv5QP={oq!bO*7Izq$6!ud7ZUL7fh(vkIY9%PStadRg84bNFM`$E!?ZxHVUACl%-(
z{>rzP`x=t;PTA%D_UJnV1UX|b`yVrFy>q4cq_WWi`FB2cS2u68`AKz)+=cTaxi$e;
zHd5276tm{C5Vx<ZlJ<8Y$zSqMv`0VDr#842ToSlbeqXtfIyh-CDRG@j?Lv*&fSm~7
zYo-FeJllyt))_z4^p&$2x^w6S`Ofo0p}{*t-C4M~J;1?y5ia#}kh40lriUK=Cz$?E
zmiI+Jgkcrj>BltIPS8TK=7uMBSXkZ*<qrJu!3CIt;wZ~YP6|85G*#~0AO17qv*H%b
zzb@Jkj(%Qd4|m_d+V_s1SQXnapAD}Yq|Xz9;i^p4pBoy|woO$J26wvo&hz$#dk9}N
znrw8@n4~UhE-&zyoe3=1@wOvUIl2>SfOaR9E`|q8lJ-#)AmP`h1y1iui*)*V{+s<~
zbEO!>a2`M(-oTX?!yiwi{MN!kmR?kybJ2>sbskKrF`B%xT(Ht6;MH#>LOsL@vGnw5
z7;@A+bvhvVsy)f<+1-wV8b+(R?!xk2#s;fe3=~xxT*6h_E~;@w89k?_uPeOIR72F|
z6TbEO6l#uM+Pt}^Y0Vi8lPiPig>thTs}U?`rsXQovoxQ4jCt6kZ+Mvg=i=T)6URd%
zn_3lS)syT15CPvY4?|cZMQ0$ug!W}OeNxxruY3>B@o#6?w{JTICLC6sF(ZO^wg?|^
z8EbPfADIrnAiBlWMv&p-Y<K1CE=f2A)i`qVpeyu<3N^bRtTk^M84)OmejvyNmn>e7
zi)NOpHbg%}JESesK%xLj#EDO3cZi1H5fbWVRxbM(yV!=Zc@C>%blLiirt#bDr$*NP
ziqebtTf*+hQs;|!U&B{4g!=%%2E&L#_+ujH#SE;K$Movt-<@89`3a<po?8_ftXO0^
zj{$OJR5lkH0+O!Be-82cvRK{ltW|rAsRizdZBCw{udnRz&u0VMWk~$-QQ~;Ft#;Sb
zK|^-ROP|2MRtBn891p*DGrN0x$)4f_w{q&)hiCtKP<?jKldg3~OQ;7Y%dPr!X2Q$j
z?5`-Ca~8jUFCi7s2zPBFo7o}b=|>*Q?KlYjIs-`XZ<;%ZJ9a}~5gNL#TBNnat@_P|
zQxiJus<KOE=%hBc66A=qgs4#fzE)8_GLuDhYJscvefjfQ$Z>gqM>K|`0>5@2PE|n>
zONL%tvySl(4Da6Fp_UdYcyj}L8<$ujPQlGtYgKh;>xE<Y8m_uLW*vtE=Y$SjqqlhV
z)U?l}qHi}2x7<|a*X`CqO`Sy69nk<|a)aimkhK7GQdS|$JY2i_8s}--%I=$};w@}7
zrt&eT<O?m}5;snB{SBA(RSdXK-h4ETSov$VC07-3$8|r-SCm#Va6(!g;X8~>VkUNB
z<o#L5_n|#6Xm2I$*!H<|+pLbs5tKGPaG72tj6r6HdP_F%k6ou=s_Ay37vZv9xU0+L
zYrHy!viXSD&MsqzUwrIUz)`3#tkU*a$xKC!<e<VWi=n6U-aao`@gIuus!v}KZ#*$1
z#<V0Y8GH4c(|XW--=E4+@xuU*k}k)`;mfV?wg|OuK-exk#E~4ClegcyUgLy5zakI?
z)xw{j@bPA{!6wF$s*?T(WASBidCk3>{mX5I`X+yq^*k;2j-3oHp#uEHQ;>W1Ts#8S
zYkSzgQ4zY}t`f`CRHj7@T-u|7*WbOvW^)_H_wlNc{pJaw5&E|Guk3Je)iBmN)r164
zZnE~<6cQF2d^{F|kqKTs5@U(70%zxwKL8bFpeOtyDP3_3z##t74*y5)2ToPm{tuh|
Bu4e!M

literal 0
HcmV?d00001

diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
index 9088edc815..a3e3485bc6 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -35,9 +35,13 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: LandMine
-  - type: TriggerOnStepTrigger
+    sound:
+        path: /Audio/Effects/beep_landmine.ogg
+        params:
+            maxDistance: 10
   - type: StepTrigger
     requiredTriggeredSpeed: 0
+    stepOn: true
 
 - type: entity
   name: kick mine
@@ -57,7 +61,6 @@
   - type: Construction
     graph: ModularMineGraph
     node: emptyCase
-  - type: LandMine
 
 - type: entity
   name: explosive mine
@@ -71,4 +74,3 @@
     intensitySlope: 3
     totalIntensity: 120 # about a ~4 tile radius
     canCreateVacuum: false
-  - type: DeleteOnTrigger
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 8d3c83e3e1..2ddb21b9e6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -230,6 +230,7 @@
   - type: StepTrigger
     intersectRatio: 0.2
     requiredTriggeredSpeed: 0
+    stepOn: true
   - type: CollisionWake
     enabled: false
   - type: Physics
@@ -251,6 +252,10 @@
         mask:
         - ItemMask
   - type: LandMine
+    sound:
+      path: /Audio/Effects/beep_landmine.ogg
+      params:
+        maxDistance: 10
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: HardBomb  # normally Default and max 5 total 60

From c03835e47c54da8401a283acc23987b83615a56e Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Date: Mon, 17 Jun 2024 06:25:29 -0700
Subject: [PATCH 57/84] Workflow to Automatically Title Case PRs (#468)

# Description

Hooray, more JavaScript!
I tested this on a personal repo with a new PAT, but it *should* work
here first try.

---------

Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
---
 .github/workflows/prtitlecase.yml | 34 +++++++++++++++++++++++++++++++
 Tools/changelogs/package.json     |  2 ++
 Tools/prtitlecase/index.js        | 19 +++++++++++++++++
 Tools/prtitlecase/package.json    | 12 +++++++++++
 4 files changed, 67 insertions(+)
 create mode 100644 .github/workflows/prtitlecase.yml
 create mode 100644 Tools/prtitlecase/index.js
 create mode 100644 Tools/prtitlecase/package.json

diff --git a/.github/workflows/prtitlecase.yml b/.github/workflows/prtitlecase.yml
new file mode 100644
index 0000000000..0c5a38a4e8
--- /dev/null
+++ b/.github/workflows/prtitlecase.yml
@@ -0,0 +1,34 @@
+name: PR Title Case
+on:
+  pull_request_target:
+    types: [opened, edited, synchronize]
+
+env:
+  GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+  PR_NUMBER: ${{ github.event.pull_request.number }}
+
+jobs:
+  prtitlecase:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Master
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+
+      - name: Install Dependencies
+        run: |
+          cd "Tools/prtitlecase"
+          npm install
+        shell: bash
+
+      - name: Change Title
+        run: |
+          cd "Tools/prtitlecase"
+          node src/index.js
+        shell: bash
diff --git a/Tools/changelogs/package.json b/Tools/changelogs/package.json
index 512a3624c8..1f0899df96 100644
--- a/Tools/changelogs/package.json
+++ b/Tools/changelogs/package.json
@@ -1,5 +1,7 @@
 {
     "name": "changelogs",
+    "author": "DEATHB4DEFEAT",
+    "license": "MIT",
     "dependencies": {
         "axios": "^1.3.4",
         "js-yaml": "^4.1.0"
diff --git a/Tools/prtitlecase/index.js b/Tools/prtitlecase/index.js
new file mode 100644
index 0000000000..0d72b71131
--- /dev/null
+++ b/Tools/prtitlecase/index.js
@@ -0,0 +1,19 @@
+import axios from 'axios';
+import { titleCase } from 'title-case';
+
+if (process.env.GITHUB_TOKEN) axios.defaults.headers.common['Authorization'] = `token ${process.env.GITHUB_TOKEN}`;
+else throw new Error('BOT_TOKEN was not provided in repository secrets or GITHUB_TOKEN was not set correctly.');
+
+
+// Get PR title
+let prTitle = await axios.get(`https://api.github.com/repos/${process.env.GITHUB_REPOSITORY}/pulls/${process.env.PR_NUMBER}`)
+    .then(res => res.data.title);
+
+// Title case PR title
+console.log(`Old PR title: ${prTitle}`);
+prTitle = titleCase(prTitle);
+console.log(`New PR title: ${prTitle}`);
+
+// Update PR title
+await axios.patch(`https://api.github.com/repos/${process.env.GITHUB_REPOSITORY}/pulls/${process.env.PR_NUMBER}`,
+    { title: prTitle });
diff --git a/Tools/prtitlecase/package.json b/Tools/prtitlecase/package.json
new file mode 100644
index 0000000000..ecba01099f
--- /dev/null
+++ b/Tools/prtitlecase/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "prtitlecase",
+  "description": "Converts PR titles to Title Case using title-case package",
+  "type": "module",
+  "exports": "./index.js",
+  "author": "DEATHB4DEFEAT",
+  "license": "MIT",
+  "dependencies": {
+    "axios": "^1.7.2",
+    "title-case": "^4.3.1"
+  }
+}

From 17cf334c16290489c5a95e47e9eac5cfd2f227c7 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Mon, 17 Jun 2024 17:15:13 -0400
Subject: [PATCH 58/84] Revert "Merge branch 'master' of
 https://github.com/VMSolidus/Einstein-Engines"

This reverts commit 15a750005d6c2007017b5a6063d4749aeb3363f7, reversing
changes made to ffaa8b6648a5dc334b0eca0cba24342d8b7606ba.
---
 .github/workflows/changelog.yml               |   4 +-
 .github/workflows/prtitlecase.yml             |  34 ---
 BuildChecker/BuildChecker.csproj              |   4 +-
 BuildChecker/git_helper.py                    | 110 ++++++++
 BuildChecker/hooks/post-checkout              |  13 +
 BuildChecker/hooks/post-merge                 |   5 +
 Content.Client/Gameplay/GameplayState.cs      |   8 +-
 ...GameScreen.xaml => DefaultGameScreen.xaml} |   4 +-
 ...reen.xaml.cs => DefaultGameScreen.xaml.cs} |   4 +-
 .../UserInterface/Screens/ScreenType.cs       |   8 +-
 .../Systems/Chat/ChatUIController.cs          |  16 +-
 .../Systems/Vote/VoteUIController.cs          |   6 +-
 .../Cargo/Components/CargoPalletComponent.cs  |  21 +-
 .../Cargo/Systems/CargoSystem.Orders.cs       |   2 +-
 .../Cargo/Systems/CargoSystem.Shuttle.cs      |  15 +-
 .../Ensnaring/EnsnareableSystem.Ensnaring.cs  |   4 +-
 .../Explosion/EntitySystems/TriggerSystem.cs  |   4 +-
 Content.Server/LandMines/LandMineComponent.cs |   9 +-
 Content.Server/LandMines/LandMineSystem.cs    |  46 +--
 Content.Server/Tiles/LavaSystem.cs            |   4 +-
 Content.Shared/CCVar/CCVars.cs                |   6 +-
 Content.Shared/Chasm/ChasmSystem.cs           |   4 +-
 .../MovementSpeedModifierComponent.cs         |   2 +-
 .../Physics/FrictionRemoverSystem.cs          |  25 --
 Content.Shared/Slippery/SlipperySystem.cs     |   4 +-
 .../Components/StepTriggerComponent.cs        |   8 +-
 .../StepTrigger/Systems/StepTriggerSystem.cs  |  41 +--
 LEGAL.md                                      |   4 +-
 README.md                                     |  27 +-
 RUN_THIS.py                                   |  13 +
 Resources/Audio/Effects/attributions.yml      |   5 -
 Resources/Audio/Effects/beep_landmine.ogg     | Bin 6034 -> 0 bytes
 Resources/Changelog/Changelog.yml             |   2 +-
 Resources/Credits/GitHub.txt                  |   2 +-
 Resources/Maps/Shuttles/trading_outpost.yml   | 263 ++++++++----------
 .../Clothing/OuterClothing/wintercoats.yml    |  40 +--
 .../Prototypes/Entities/Mobs/Species/moth.yml |   4 +-
 .../Consumable/Drinks/drinks-cartons.yml      |  23 +-
 .../Consumable/Drinks/trash_drinks.yml        |  59 ++--
 .../Entities/Objects/Misc/land_mine.yml       |   8 +-
 .../Objects/Specific/Cargo/cargo_pallet.yml   |  31 ---
 .../Objects/Specific/Janitorial/janitor.yml   |   5 -
 .../Structures/Decoration/curtains.yml        |   4 +-
 .../Recipes/Construction/furniture.yml        |  40 ++-
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9460 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 10509 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9875 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 10492 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9782 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 10959 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9936 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 10546 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9675 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 10494 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 10740 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 8727 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9455 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 8689 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9750 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 8865 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 8433 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9422 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9418 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9578 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../cargo_pallets.rsi/cargo_pallet_buy.png    | Bin 551 -> 0 bytes
 .../cargo_pallets.rsi/cargo_pallet_sell.png   | Bin 535 -> 0 bytes
 .../Structures/cargo_pallets.rsi/meta.json    |  17 --
 Scripts/bat/buildAllDebug.bat                 |   1 +
 Scripts/bat/buildAllRelease.bat               |   1 +
 Scripts/bat/buildAllTools.bat                 |   1 +
 Scripts/sh/buildAllDebug.sh                   |   1 +
 Scripts/sh/buildAllRelease.sh                 |   1 +
 Scripts/sh/buildAllTools.sh                   |   1 +
 Tools/{changelogs => changelog}/changelog.js  |   0
 Tools/{changelogs => changelog}/package.json  |   2 -
 Tools/prtitlecase/index.js                    |  19 --
 Tools/prtitlecase/package.json                |  12 -
 shell.nix                                     |   1 +
 98 files changed, 456 insertions(+), 542 deletions(-)
 delete mode 100644 .github/workflows/prtitlecase.yml
 create mode 100644 BuildChecker/git_helper.py
 create mode 100755 BuildChecker/hooks/post-checkout
 create mode 100755 BuildChecker/hooks/post-merge
 rename Content.Client/UserInterface/Screens/{OverlayChatGameScreen.xaml => DefaultGameScreen.xaml} (96%)
 rename Content.Client/UserInterface/Screens/{OverlayChatGameScreen.xaml.cs => DefaultGameScreen.xaml.cs} (94%)
 delete mode 100644 Content.Shared/Physics/FrictionRemoverSystem.cs
 create mode 100755 RUN_THIS.py
 delete mode 100644 Resources/Audio/Effects/beep_landmine.ogg
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_bishop_cybernetics.rsi => bc_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_bishop_cybernetics.rsi => bc_corpo_jacket.rsi}/meta.json (100%)
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_cybersun.rsi => cs_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_cybersun.rsi => cs_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_discount_dans.rsi => dd_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_discount_dans.rsi => dd_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_einstein_engines.rsi => ee_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_einstein_engines.rsi => ee_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_five_points_armory.rsi => fa_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_five_points_armory.rsi => fa_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_gilthari_exports.rsi => ge_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_gilthari_exports.rsi => ge_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_hephestus_industries.rsi => hi_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_hawkmoon_aquisitions.rsi => hi_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_hawkmoon_aquisitions.rsi => hm_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_hephestus_industries.rsi => hm_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_interdyne.rsi => id_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_interdyne.rsi => id_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_zeng_hu_pharma.rsi => zh_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_zeng_hu_pharma.rsi => zh_corpo_jacket.rsi}/meta.json (100%)
 delete mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png
 delete mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png
 delete mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/meta.json
 rename Tools/{changelogs => changelog}/changelog.js (100%)
 rename Tools/{changelogs => changelog}/package.json (68%)
 delete mode 100644 Tools/prtitlecase/index.js
 delete mode 100644 Tools/prtitlecase/package.json

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 877273d764..a44cac2cd1 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -35,14 +35,14 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          cd "Tools/changelogs"
+          cd "Tools/changelog"
           npm install
         shell: bash
         continue-on-error: true
 
       - name: Generate Changelog
         run: |
-          cd "Tools/changelogs"
+          cd "Tools/changelog"
           node changelog.js
         shell: bash
         continue-on-error: true
diff --git a/.github/workflows/prtitlecase.yml b/.github/workflows/prtitlecase.yml
deleted file mode 100644
index 0c5a38a4e8..0000000000
--- a/.github/workflows/prtitlecase.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: PR Title Case
-on:
-  pull_request_target:
-    types: [opened, edited, synchronize]
-
-env:
-  GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
-  PR_NUMBER: ${{ github.event.pull_request.number }}
-
-jobs:
-  prtitlecase:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Master
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.BOT_TOKEN }}
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18.x
-
-      - name: Install Dependencies
-        run: |
-          cd "Tools/prtitlecase"
-          npm install
-        shell: bash
-
-      - name: Change Title
-        run: |
-          cd "Tools/prtitlecase"
-          node src/index.js
-        shell: bash
diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj
index d4f9a41254..63d16fa970 100644
--- a/BuildChecker/BuildChecker.csproj
+++ b/BuildChecker/BuildChecker.csproj
@@ -14,6 +14,8 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
 -->
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <Python>python3</Python>
+    <Python Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">py -3</Python>
     <ProjectGuid>{C899FCA4-7037-4E49-ABC2-44DE72487110}</ProjectGuid>
     <TargetFrameworkMoniker>.NETFramework, Version=v4.7.2</TargetFrameworkMoniker>
     <RestorePackages>false</RestorePackages>
@@ -37,7 +39,7 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
     <OutputPath>bin\DebugOpt\</OutputPath>
   </PropertyGroup>
   <Target Name="Build">
-    <Exec Command="git submodule update --init --recursive"/>
+    <Exec Command="$(Python) git_helper.py" CustomErrorRegularExpression="^Error" />
   </Target>
   <Target Name="Rebuild" DependsOnTargets="Build" />
   <Target Name="Clean">
diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py
new file mode 100644
index 0000000000..becd4506e8
--- /dev/null
+++ b/BuildChecker/git_helper.py
@@ -0,0 +1,110 @@
+#!/usr/bin/env python3
+# Installs git hooks, updates them, updates submodules, that kind of thing.
+
+import subprocess
+import sys
+import os
+import shutil
+from pathlib import Path
+from typing import List
+
+SOLUTION_PATH = Path("..") / "SpaceStation14.sln"
+# If this doesn't match the saved version we overwrite them all.
+CURRENT_HOOKS_VERSION = "2"
+QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"
+
+
+def run_command(command: List[str], capture: bool = False) -> subprocess.CompletedProcess:
+    """
+    Runs a command with pretty output.
+    """
+    text = ' '.join(command)
+    if not QUIET:
+        print("$ {}".format(text))
+
+    sys.stdout.flush()
+
+    completed = None
+
+    if capture:
+        completed = subprocess.run(command, cwd="..", stdout=subprocess.PIPE)
+    else:
+        completed = subprocess.run(command, cwd="..")
+
+    if completed.returncode != 0:
+        print("Error: command exited with code {}!".format(completed.returncode))
+
+    return completed
+
+
+def update_submodules():
+    """
+    Updates all submodules.
+    """
+
+    if ('GITHUB_ACTIONS' in os.environ):
+        return
+
+    if os.path.isfile("DISABLE_SUBMODULE_AUTOUPDATE"):
+        return
+
+    if shutil.which("git") is None:
+        raise FileNotFoundError("git not found in PATH")
+
+    # If the status doesn't match, force VS to reload the solution.
+    # status = run_command(["git", "submodule", "status"], capture=True)
+    run_command(["git", "submodule", "update", "--init", "--recursive"])
+    # status2 = run_command(["git", "submodule", "status"], capture=True)
+
+    # Something changed.
+    # if status.stdout != status2.stdout:
+    #     print("Git submodules changed. Reloading solution.")
+    #     reset_solution()
+
+
+def install_hooks():
+    """
+    Installs the necessary git hooks into .git/hooks.
+    """
+
+    # Read version file.
+    if os.path.isfile("INSTALLED_HOOKS_VERSION"):
+        with open("INSTALLED_HOOKS_VERSION", "r") as f:
+            if f.read() == CURRENT_HOOKS_VERSION:
+                if not QUIET:
+                    print("No hooks change detected.")
+                return
+
+    with open("INSTALLED_HOOKS_VERSION", "w") as f:
+        f.write(CURRENT_HOOKS_VERSION)
+
+    print("Hooks need updating.")
+
+    hooks_target_dir = Path("..")/".git"/"hooks"
+    hooks_source_dir = Path("hooks")
+
+    # Clear entire tree since we need to kill deleted files too.
+    for filename in os.listdir(str(hooks_target_dir)):
+        os.remove(str(hooks_target_dir/filename))
+
+    for filename in os.listdir(str(hooks_source_dir)):
+        print("Copying hook {}".format(filename))
+        shutil.copy2(str(hooks_source_dir/filename),
+                        str(hooks_target_dir/filename))
+
+
+def reset_solution():
+    """
+    Force VS to think the solution has been changed to prompt the user to reload it, thus fixing any load errors.
+    """
+
+    with SOLUTION_PATH.open("r") as f:
+        content = f.read()
+
+    with SOLUTION_PATH.open("w") as f:
+        f.write(content)
+
+
+if __name__ == '__main__':
+    install_hooks()
+    update_submodules()
diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout
new file mode 100755
index 0000000000..c5662445c2
--- /dev/null
+++ b/BuildChecker/hooks/post-checkout
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+gitroot=`git rev-parse --show-toplevel`
+
+cd "$gitroot/BuildChecker"
+
+if [[ `uname` == MINGW* || `uname` == CYGWIN* ]]; then
+    # Windows
+    py -3 git_helper.py --quiet
+else
+    # Not Windows, so probably some other Unix thing.
+    python3 git_helper.py --quiet
+fi
diff --git a/BuildChecker/hooks/post-merge b/BuildChecker/hooks/post-merge
new file mode 100755
index 0000000000..85fe61d966
--- /dev/null
+++ b/BuildChecker/hooks/post-merge
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Just call post-checkout since it does the same thing.
+gitroot=`git rev-parse --show-toplevel`
+bash "$gitroot/.git/hooks/post-checkout"
diff --git a/Content.Client/Gameplay/GameplayState.cs b/Content.Client/Gameplay/GameplayState.cs
index 2ea16521e8..1efee978f3 100644
--- a/Content.Client/Gameplay/GameplayState.cs
+++ b/Content.Client/Gameplay/GameplayState.cs
@@ -93,17 +93,17 @@ private void LoadMainScreen()
             var screenTypeString = _configurationManager.GetCVar(CCVars.UILayout);
             if (!Enum.TryParse(screenTypeString, out ScreenType screenType))
             {
-                screenType = ScreenType.Separated;
+                screenType = default;
             }
 
             switch (screenType)
             {
+                case ScreenType.Default:
+                    _uiManager.LoadScreen<DefaultGameScreen>();
+                    break;
                 case ScreenType.Separated:
                     _uiManager.LoadScreen<SeparatedChatGameScreen>();
                     break;
-                case ScreenType.Overlay:
-                    _uiManager.LoadScreen<OverlayChatGameScreen>();
-                    break;
             }
 
             _loadController.LoadScreen();
diff --git a/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
similarity index 96%
rename from Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
rename to Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
index 4ba820b339..54aeffe72c 100644
--- a/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
+++ b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
@@ -1,4 +1,4 @@
-<screens:OverlayChatGameScreen
+<screens:DefaultGameScreen
     xmlns="https://spacestation14.io"
     xmlns:screens="clr-namespace:Content.Client.UserInterface.Screens"
     xmlns:menuBar="clr-namespace:Content.Client.UserInterface.Systems.MenuBar.Widgets"
@@ -30,4 +30,4 @@
     <hotbar:HotbarGui Name="Hotbar" Access="Protected" />
     <chat:ResizableChatBox Name="Chat" Access="Protected" />
     <alerts:AlertsUI Name="Alerts" Access="Protected" />
-</screens:OverlayChatGameScreen>
+</screens:DefaultGameScreen>
diff --git a/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
similarity index 94%
rename from Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs
rename to Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
index c45ec9d4a0..0fb1b7d507 100644
--- a/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
@@ -6,9 +6,9 @@
 namespace Content.Client.UserInterface.Screens;
 
 [GenerateTypedNameReferences]
-public sealed partial class OverlayChatGameScreen : InGameScreen
+public sealed partial class DefaultGameScreen : InGameScreen
 {
-    public OverlayChatGameScreen()
+    public DefaultGameScreen()
     {
         RobustXamlLoader.Load(this);
 
diff --git a/Content.Client/UserInterface/Screens/ScreenType.cs b/Content.Client/UserInterface/Screens/ScreenType.cs
index 039cd7b128..595dc79556 100644
--- a/Content.Client/UserInterface/Screens/ScreenType.cs
+++ b/Content.Client/UserInterface/Screens/ScreenType.cs
@@ -3,11 +3,11 @@ namespace Content.Client.UserInterface.Screens;
 public enum ScreenType
 {
     /// <summary>
-    ///     The classic SS13 user interface.
+    ///     The modern SS14 user interface.
     /// </summary>
-    Separated,
+    Default,
     /// <summary>
-    ///     The temporary SS14 user interface.
+    ///     The classic SS13 user interface.
     /// </summary>
-    Overlay,
+    Separated
 }
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index ecc57561cd..79c1909eba 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -263,16 +263,16 @@ public void SetMainChat(bool setting)
 
         switch (UIManager.ActiveScreen)
         {
+            case DefaultGameScreen defaultScreen:
+                chatBox = defaultScreen.ChatBox;
+                chatSizeRaw = _config.GetCVar(CCVars.DefaultScreenChatSize);
+                SetChatSizing(chatSizeRaw, defaultScreen, setting);
+                break;
             case SeparatedChatGameScreen separatedScreen:
                 chatBox = separatedScreen.ChatBox;
                 chatSizeRaw = _config.GetCVar(CCVars.SeparatedScreenChatSize);
                 SetChatSizing(chatSizeRaw, separatedScreen, setting);
                 break;
-            case OverlayChatGameScreen overlayScreen:
-                chatBox = overlayScreen.ChatBox;
-                chatSizeRaw = _config.GetCVar(CCVars.OverlayScreenChatSize);
-                SetChatSizing(chatSizeRaw, overlayScreen, setting);
-                break;
             default:
                 // this could be better?
                 var maybeChat = UIManager.ActiveScreen.GetWidget<ChatBox>();
@@ -321,12 +321,12 @@ private void StoreChatSize(Vector2 size)
             $"{size.X.ToString(CultureInfo.InvariantCulture)},{size.Y.ToString(CultureInfo.InvariantCulture)}";
         switch (UIManager.ActiveScreen)
         {
+            case DefaultGameScreen _:
+                _config.SetCVar(CCVars.DefaultScreenChatSize, stringSize);
+                break;
             case SeparatedChatGameScreen _:
                 _config.SetCVar(CCVars.SeparatedScreenChatSize, stringSize);
                 break;
-            case OverlayChatGameScreen _:
-                _config.SetCVar(CCVars.OverlayScreenChatSize, stringSize);
-                break;
             default:
                 // do nothing
                 return;
diff --git a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
index ac37cebfa9..52d0348b79 100644
--- a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
+++ b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
@@ -23,12 +23,12 @@ private void OnScreenLoad()
     {
         switch (UIManager.ActiveScreen)
         {
+            case DefaultGameScreen game:
+                _votes.SetPopupContainer(game.VoteMenu);
+                break;
             case SeparatedChatGameScreen separated:
                 _votes.SetPopupContainer(separated.VoteMenu);
                 break;
-            case OverlayChatGameScreen overlay:
-                _votes.SetPopupContainer(overlay.VoteMenu);
-                break;
         }
     }
 
diff --git a/Content.Server/Cargo/Components/CargoPalletComponent.cs b/Content.Server/Cargo/Components/CargoPalletComponent.cs
index cdfd0a3874..ebf0be93e0 100644
--- a/Content.Server/Cargo/Components/CargoPalletComponent.cs
+++ b/Content.Server/Cargo/Components/CargoPalletComponent.cs
@@ -1,26 +1,7 @@
 namespace Content.Server.Cargo.Components;
-using Content.Shared.Actions;
-using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
 /// <summary>
 /// Any entities intersecting when a shuttle is recalled will be sold.
 /// </summary>
-
-[Flags]
-public enum BuySellType : byte
-{
-    Buy = 1 << 0,
-    Sell = 1 << 1,
-    All = Buy | Sell
-}
-
-
 [RegisterComponent]
-public sealed partial class CargoPalletComponent : Component
-{
-    /// <summary>
-    /// Whether the pad is a buy pad, a sell pad, or all.
-    /// </summary>
-    [DataField]
-    public BuySellType PalletType;
-}
+public sealed partial class CargoPalletComponent : Component {}
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index d8b55a7237..ebe66ff029 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -205,7 +205,7 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
             // Try to fulfill from any station where possible, if the pad is not occupied.
             foreach (var trade in _listEnts)
             {
-                var tradePads = GetCargoPallets(trade, BuySellType.Buy);
+                var tradePads = GetCargoPallets(trade);
                 _random.Shuffle(tradePads);
 
                 var freePads = GetFreeCargoPallets(trade, tradePads);
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
index b8a491f4e8..3e39440da5 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
@@ -198,16 +198,13 @@ private List<CargoOrderData> GetProjectedOrders(
     /// </summary>
     private int GetCargoSpace(EntityUid gridUid)
     {
-        var space = GetCargoPallets(gridUid, BuySellType.Buy).Count;
+        var space = GetCargoPallets(gridUid).Count;
         return space;
     }
 
-    /// GetCargoPallets(gridUid, BuySellType.Sell) to return only Sell pads
-    /// GetCargoPallets(gridUid, BuySellType.Buy) to return only Buy pads
-    private List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent PalletXform)> GetCargoPallets(EntityUid gridUid, BuySellType requestType = BuySellType.All)
+    private List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent PalletXform)> GetCargoPallets(EntityUid gridUid)
     {
         _pads.Clear();
-
         var query = AllEntityQuery<CargoPalletComponent, TransformComponent>();
 
         while (query.MoveNext(out var uid, out var comp, out var compXform))
@@ -218,13 +215,7 @@ private int GetCargoSpace(EntityUid gridUid)
                 continue;
             }
 
-            if ((requestType & comp.PalletType) == 0)
-            {
-                continue;
-            }
-
             _pads.Add((uid, comp, compXform));
-
         }
 
         return _pads;
@@ -284,7 +275,7 @@ private void GetPalletGoods(EntityUid gridUid, out HashSet<EntityUid> toSell, ou
         amount = 0;
         toSell = new HashSet<EntityUid>();
 
-        foreach (var (palletUid, _, _) in GetCargoPallets(gridUid, BuySellType.Sell))
+        foreach (var (palletUid, _, _) in GetCargoPallets(gridUid))
         {
             // Containers should already get the sell price of their children so can skip those.
             _setEnts.Clear();
diff --git a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
index 202d03bcda..169daca07a 100644
--- a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
+++ b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
@@ -25,7 +25,7 @@ public void InitializeEnsnaring()
     {
         SubscribeLocalEvent<EnsnaringComponent, ComponentRemove>(OnComponentRemove);
         SubscribeLocalEvent<EnsnaringComponent, StepTriggerAttemptEvent>(AttemptStepTrigger);
-        SubscribeLocalEvent<EnsnaringComponent, StepTriggeredOffEvent>(OnStepTrigger);
+        SubscribeLocalEvent<EnsnaringComponent, StepTriggeredEvent>(OnStepTrigger);
         SubscribeLocalEvent<EnsnaringComponent, ThrowDoHitEvent>(OnThrowHit);
         SubscribeLocalEvent<EnsnaringComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
     }
@@ -49,7 +49,7 @@ private void AttemptStepTrigger(EntityUid uid, EnsnaringComponent component, ref
         args.Continue = true;
     }
 
-    private void OnStepTrigger(EntityUid uid, EnsnaringComponent component, ref StepTriggeredOffEvent args)
+    private void OnStepTrigger(EntityUid uid, EnsnaringComponent component, ref StepTriggeredEvent args)
     {
         TryEnsnare(args.Tripper, uid, component);
     }
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index e24de5a2f6..9b9a042641 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -88,7 +88,7 @@ public override void Initialize()
             SubscribeLocalEvent<TriggerOnCollideComponent, StartCollideEvent>(OnTriggerCollide);
             SubscribeLocalEvent<TriggerOnActivateComponent, ActivateInWorldEvent>(OnActivate);
             SubscribeLocalEvent<TriggerImplantActionComponent, ActivateImplantEvent>(OnImplantTrigger);
-            SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredOffEvent>(OnStepTriggered);
+            SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredEvent>(OnStepTriggered);
             SubscribeLocalEvent<TriggerOnSlipComponent, SlipEvent>(OnSlipTriggered);
             SubscribeLocalEvent<TriggerWhenEmptyComponent, OnEmptyGunShotEvent>(OnEmptyTriggered);
 
@@ -228,7 +228,7 @@ private void OnImplantTrigger(EntityUid uid, TriggerImplantActionComponent compo
             args.Handled = Trigger(uid);
         }
 
-        private void OnStepTriggered(EntityUid uid, TriggerOnStepTriggerComponent component, ref StepTriggeredOffEvent args)
+        private void OnStepTriggered(EntityUid uid, TriggerOnStepTriggerComponent component, ref StepTriggeredEvent args)
         {
             Trigger(uid, args.Tripper);
         }
diff --git a/Content.Server/LandMines/LandMineComponent.cs b/Content.Server/LandMines/LandMineComponent.cs
index 1c4ba06691..63e1e4b99f 100644
--- a/Content.Server/LandMines/LandMineComponent.cs
+++ b/Content.Server/LandMines/LandMineComponent.cs
@@ -1,13 +1,6 @@
-using Robust.Shared.Audio;
-
-namespace Content.Server.LandMines;
+namespace Content.Server.LandMines;
 
 [RegisterComponent]
 public sealed partial class LandMineComponent : Component
 {
-    /// <summary>
-    /// Trigger sound effect when stepping onto landmine
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public SoundSpecifier? Sound;
 }
diff --git a/Content.Server/LandMines/LandMineSystem.cs b/Content.Server/LandMines/LandMineSystem.cs
index 22dedb9337..78c48ef99e 100644
--- a/Content.Server/LandMines/LandMineSystem.cs
+++ b/Content.Server/LandMines/LandMineSystem.cs
@@ -1,43 +1,43 @@
-using Content.Server.Explosion.EntitySystems;
+using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Popups;
+using Content.Shared.StepTrigger;
 using Content.Shared.StepTrigger.Systems;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Server.LandMines;
 
 public sealed class LandMineSystem : EntitySystem
 {
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly TriggerSystem _trigger = default!;
 
+
     public override void Initialize()
     {
-        SubscribeLocalEvent<LandMineComponent, StepTriggeredOnEvent>(HandleStepOnTriggered);
-        SubscribeLocalEvent<LandMineComponent, StepTriggeredOffEvent>(HandleStepOffTriggered);
-
-        SubscribeLocalEvent<LandMineComponent, StepTriggerAttemptEvent>(HandleStepTriggerAttempt);
+        SubscribeLocalEvent<LandMineComponent, StepTriggeredEvent>(HandleTriggered);
+        SubscribeLocalEvent<LandMineComponent, StepTriggerAttemptEvent>(HandleTriggerAttempt);
     }
 
-    private void HandleStepOnTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOnEvent args)
+    private static void HandleTriggerAttempt(
+        EntityUid uid,
+        LandMineComponent component,
+        ref StepTriggerAttemptEvent args)
     {
-        _popupSystem.PopupCoordinates(
-            Loc.GetString("land-mine-triggered", ("mine", uid)),
-            Transform(uid).Coordinates,
-            args.Tripper,
-            PopupType.LargeCaution);
-
-        _audioSystem.PlayPvs(component.Sound, uid);
-    }
-
-    private void HandleStepOffTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOffEvent args)
-    {
-        _trigger.Trigger(uid, args.Tripper);
+        args.Continue = true;
     }
 
-    private static void HandleStepTriggerAttempt(EntityUid uid, LandMineComponent component, ref StepTriggerAttemptEvent args)
+    private void HandleTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredEvent args)
     {
-        args.Continue = true;
+        // This doesn't use TriggerOnStepTrigger since we don't want to display the popup if nothing happens
+        // and I didn't feel like making an `AfterTrigger` event
+        if (_trigger.Trigger(uid, args.Tripper))
+        {
+            _popupSystem.PopupCoordinates(
+                Loc.GetString("land-mine-triggered", ("mine", uid)),
+                Transform(uid).Coordinates,
+                args.Tripper,
+                PopupType.LargeCaution);
+        }
     }
 }
+
diff --git a/Content.Server/Tiles/LavaSystem.cs b/Content.Server/Tiles/LavaSystem.cs
index 51bd6f8475..7aee0b6501 100644
--- a/Content.Server/Tiles/LavaSystem.cs
+++ b/Content.Server/Tiles/LavaSystem.cs
@@ -11,7 +11,7 @@ public sealed class LavaSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<LavaComponent, StepTriggeredOffEvent>(OnLavaStepTriggered);
+        SubscribeLocalEvent<LavaComponent, StepTriggeredEvent>(OnLavaStepTriggered);
         SubscribeLocalEvent<LavaComponent, StepTriggerAttemptEvent>(OnLavaStepTriggerAttempt);
     }
 
@@ -23,7 +23,7 @@ private void OnLavaStepTriggerAttempt(EntityUid uid, LavaComponent component, re
         args.Continue = true;
     }
 
-    private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredOffEvent args)
+    private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredEvent args)
     {
         var otherUid = args.Tripper;
 
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 891c790d52..f8943a9bf9 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1596,10 +1596,10 @@ public static readonly CVarDef<int>
          */
 
         public static readonly CVarDef<string> UILayout =
-            CVarDef.Create("ui.layout", "Separated", CVar.CLIENTONLY | CVar.ARCHIVE);
+            CVarDef.Create("ui.layout", "Default", CVar.CLIENTONLY | CVar.ARCHIVE);
 
-        public static readonly CVarDef<string> OverlayScreenChatSize =
-            CVarDef.Create("ui.overlay_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE);
+        public static readonly CVarDef<string> DefaultScreenChatSize =
+            CVarDef.Create("ui.default_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE);
 
         public static readonly CVarDef<string> SeparatedScreenChatSize =
             CVarDef.Create("ui.separated_chat_size", "0.6,0", CVar.CLIENTONLY | CVar.ARCHIVE);
diff --git a/Content.Shared/Chasm/ChasmSystem.cs b/Content.Shared/Chasm/ChasmSystem.cs
index 86b8d4fc4d..51299557db 100644
--- a/Content.Shared/Chasm/ChasmSystem.cs
+++ b/Content.Shared/Chasm/ChasmSystem.cs
@@ -24,7 +24,7 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<ChasmComponent, StepTriggeredOffEvent>(OnStepTriggered);
+        SubscribeLocalEvent<ChasmComponent, StepTriggeredEvent>(OnStepTriggered);
         SubscribeLocalEvent<ChasmComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
         SubscribeLocalEvent<ChasmFallingComponent, UpdateCanMoveEvent>(OnUpdateCanMove);
     }
@@ -47,7 +47,7 @@ public override void Update(float frameTime)
         }
     }
 
-    private void OnStepTriggered(EntityUid uid, ChasmComponent component, ref StepTriggeredOffEvent args)
+    private void OnStepTriggered(EntityUid uid, ChasmComponent component, ref StepTriggeredEvent args)
     {
         // already doomed
         if (HasComp<ChasmFallingComponent>(args.Tripper))
diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
index 813a18f974..a0feab7052 100644
--- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
+++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class MovementSpeedModifierComponent : Component
         // Weightless
         public const float DefaultMinimumFrictionSpeed = 0.005f;
         public const float DefaultWeightlessFriction = 1f;
-        public const float DefaultWeightlessFrictionNoInput = 0f;
+        public const float DefaultWeightlessFrictionNoInput = 0.2f;
         public const float DefaultWeightlessModifier = 0.7f;
         public const float DefaultWeightlessAcceleration = 1f;
 
diff --git a/Content.Shared/Physics/FrictionRemoverSystem.cs b/Content.Shared/Physics/FrictionRemoverSystem.cs
deleted file mode 100644
index 65bbe9e4d2..0000000000
--- a/Content.Shared/Physics/FrictionRemoverSystem.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
-
-namespace Content.Shared.Physics;
-
-public sealed class FrictionRemoverSystem : EntitySystem
-{
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PhysicsComponent, PhysicsSleepEvent>(RemoveDampening);
-    }
-
-
-    private void RemoveDampening(EntityUid uid, PhysicsComponent component, PhysicsSleepEvent args)
-    {
-        _physics.SetAngularDamping(uid, component, 0f, false);
-        _physics.SetLinearDamping(uid, component, 0f);
-    }
-}
diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs
index ff8b597a0d..d20495cfa6 100644
--- a/Content.Shared/Slippery/SlipperySystem.cs
+++ b/Content.Shared/Slippery/SlipperySystem.cs
@@ -31,14 +31,14 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<SlipperyComponent, StepTriggerAttemptEvent>(HandleAttemptCollide);
-        SubscribeLocalEvent<SlipperyComponent, StepTriggeredOffEvent>(HandleStepTrigger);
+        SubscribeLocalEvent<SlipperyComponent, StepTriggeredEvent>(HandleStepTrigger);
         SubscribeLocalEvent<NoSlipComponent, SlipAttemptEvent>(OnNoSlipAttempt);
         SubscribeLocalEvent<ThrownItemComponent, SlipCausingAttemptEvent>(OnThrownSlipAttempt);
         // as long as slip-resistant mice are never added, this should be fine (otherwise a mouse-hat will transfer it's power to the wearer).
         SubscribeLocalEvent<NoSlipComponent, InventoryRelayedEvent<SlipAttemptEvent>>((e, c, ev) => OnNoSlipAttempt(e, c, ev.Args));
     }
 
-    private void HandleStepTrigger(EntityUid uid, SlipperyComponent component, ref StepTriggeredOffEvent args)
+    private void HandleStepTrigger(EntityUid uid, SlipperyComponent component, ref StepTriggeredEvent args)
     {
         TrySlip(uid, component, args.Tripper);
     }
diff --git a/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs b/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
index b8483d021a..f4731bf46a 100644
--- a/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
+++ b/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
@@ -49,14 +49,8 @@ public sealed partial class StepTriggerComponent : Component
     ///     If this is true, steptrigger will still occur on entities that are in air / weightless. They do not
     ///     by default.
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [DataField]
     public bool IgnoreWeightless;
-
-    /// <summary>
-    /// Does this have separate "StepOn" and "StepOff" triggers.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool StepOn = false;
 }
 
 [RegisterComponent]
diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
index b4ac2cde75..ede39b2aa9 100644
--- a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
+++ b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
@@ -11,7 +11,6 @@ public sealed class StepTriggerSystem : EntitySystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly SharedGravitySystem _gravity = default!;
-    [Dependency] private readonly SharedMapSystem _map = default!;
 
     public override void Initialize()
     {
@@ -41,9 +40,7 @@ public override void Update(float frameTime)
         while (enumerator.MoveNext(out var uid, out var active, out var trigger, out var transform))
         {
             if (!Update(uid, trigger, transform, query))
-            {
                 continue;
-            }
 
             RemCompDeferred(uid, active);
         }
@@ -59,8 +56,7 @@ private bool Update(EntityUid uid, StepTriggerComponent component, TransformComp
 
         if (component.Blacklist != null && TryComp<MapGridComponent>(transform.GridUid, out var grid))
         {
-            var positon = _map.LocalToTile(uid, grid, transform.Coordinates);
-            var anch = _map.GetAnchoredEntitiesEnumerator(uid, grid, positon);
+            var anch = grid.GetAnchoredEntitiesEnumerator(grid.LocalToTile(transform.Coordinates));
 
             while (anch.MoveNext(out var ent))
             {
@@ -113,16 +109,8 @@ private void UpdateColliding(EntityUid uid, StepTriggerComponent component, Tran
             return;
         }
 
-        if (component.StepOn)
-        {
-            var evStep = new StepTriggeredOnEvent(uid, otherUid);
-            RaiseLocalEvent(uid, ref evStep);
-        }
-        else
-        {
-            var evStep = new StepTriggeredOffEvent(uid, otherUid);
-            RaiseLocalEvent(uid, ref evStep);
-        }
+        var ev = new StepTriggeredEvent { Source = uid, Tripper = otherUid };
+        RaiseLocalEvent(uid, ref ev, true);
 
         component.CurrentlySteppedOn.Add(otherUid);
         Dirty(uid, component);
@@ -142,7 +130,7 @@ private bool CanTrigger(EntityUid uid, EntityUid otherUid, StepTriggerComponent
 
         var msg = new StepTriggerAttemptEvent { Source = uid, Tripper = otherUid };
 
-        RaiseLocalEvent(uid, ref msg);
+        RaiseLocalEvent(uid, ref msg, true);
 
         return msg.Continue && !msg.Cancelled;
     }
@@ -175,12 +163,6 @@ private void OnEndCollide(EntityUid uid, StepTriggerComponent component, ref End
         component.CurrentlySteppedOn.Remove(otherUid);
         Dirty(uid, component);
 
-        if (component.StepOn)
-        {
-            var evStepOff = new StepTriggeredOffEvent(uid, otherUid);
-            RaiseLocalEvent(uid, ref evStepOff);
-        }
-
         if (component.Colliding.Count == 0)
         {
             RemCompDeferred<StepTriggerActiveComponent>(uid);
@@ -248,14 +230,9 @@ public struct StepTriggerAttemptEvent
     public bool Cancelled;
 }
 
-/// <summary>
-/// Raised when an entity stands on a steptrigger initially (assuming it has both on and off states).
-/// </summary>
-[ByRefEvent]
-public readonly record struct StepTriggeredOnEvent(EntityUid Source, EntityUid Tripper);
-
-/// <summary>
-/// Raised when an entity leaves a steptrigger if it has on and off states OR when an entity intersects a steptrigger.
-/// </summary>
 [ByRefEvent]
-public readonly record struct StepTriggeredOffEvent(EntityUid Source, EntityUid Tripper);
+public struct StepTriggeredEvent
+{
+    public EntityUid Source;
+    public EntityUid Tripper;
+}
diff --git a/LEGAL.md b/LEGAL.md
index 34cd4009d5..2df3c39add 100644
--- a/LEGAL.md
+++ b/LEGAL.md
@@ -6,9 +6,9 @@ The Authors retain all copyright to their respective work submitted here.
 
 ## Code license
 
-Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated. See [LICENSE-AGPLv3](./LICENSE-AGPLv3.txt).
+Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated. See [LICENSE-AGPLv3](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-AGPLv3.txt).
 
-Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license unless otherwise stated. See [LICENSE-MIT](./LICENSE-MIT.txt).
+Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license unless otherwise stated. See [LICENSE-MIT](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-MIT.txt).
 
 [87c70a89a67d0521a56388e6b1c3f2cb947943e4](https://github.com/Simple-Station/Einstein-Engines/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4) was pushed on February 17th 2024 at 21:48 UTC
 
diff --git a/README.md b/README.md
index f102318611..3dbe1910e2 100644
--- a/README.md
+++ b/README.md
@@ -41,24 +41,27 @@ We provide some scripts shown below to make the job easier.
 ### Build dependencies
 
 > - Git
-> - .NET SDK 8.0.100
+> - DOTNET SDK 7.0 or higher
+> - python 3.7 or higher
 
 
 ### Windows
 
 > 1. Clone this repository
-> 2. Run `git submodule update --init --recursive` in a terminal to download the engine
-> 3. Run `Scripts/bat/buildAllDebug.bat` after making any changes to the source
-> 4. Run `Scripts/bat/runQuickAll.bat` to launch the client and the server
-> 5. Connect to localhost in the client and play
+> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal
+> 3. Run the `Scripts/bat/run1buildDebug.bat`
+> 4. Run the `Scripts/bat/run2configDev.bat` if you need other configurations run other config scripts
+> 5. Run both the `Scripts/bat/run3server.bat` and `Scripts/bat/run4client.bat`
+> 6. Connect to localhost and play
 
 ### Linux
 
 > 1. Clone this repository
-> 2. Run `git submodule update --init --recursive` in a terminal to download the engine
-> 3. Run `Scripts/bat/buildAllDebug.sh` after making any changes to the source
-> 4. Run `Scripts/bat/runQuickAll.sh` to launch the client and the server
-> 5. Connect to localhost in the client and play
+> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal
+> 3. Run the `Scripts/sh/run1buildDebug.sh`
+> 4. Run the `Scripts/sh/run2configDev.sh` if you need other configurations run other config scripts
+> 5. Run both the `Scripts/sh/run3server.bat` and `scripts/sh/run4client.sh`
+> 6. Connect to localhost and play
 
 ### MacOS
 
@@ -67,12 +70,12 @@ We provide some scripts shown below to make the job easier.
 ## License
 
 Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 (`17 February 2024 23:00:00 UTC`) is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated.
-See [LICENSE-AGPLv3](./LICENSE-AGPLv3.txt).
+See [LICENSE-AGPLv3](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-AGPLv3.txt).
 
 Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 (`17 February 2024 23:00:00 UTC`) is licensed under the MIT license unless otherwise stated.
-See [LICENSE-MIT](./LICENSE-MIT.txt).
+See [LICENSE-MIT](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-MIT.txt).
 
 Most assets are licensed under [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) unless stated otherwise. Assets have their license and the copyright in the metadata file.
-[Example](./Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).
+[Example](https://github.com/Simple-Station/Einstein-Engines/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).
 
 Note that some assets are licensed under the non-commercial [CC-BY-NC-SA 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/) or similar non-commercial licenses and will need to be removed if you wish to use this project commercially.
diff --git a/RUN_THIS.py b/RUN_THIS.py
new file mode 100755
index 0000000000..6ea9f8e707
--- /dev/null
+++ b/RUN_THIS.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+
+# Import future so people on py2 still get the clear error that they need to upgrade.
+from __future__ import print_function
+import sys
+import subprocess
+
+version = sys.version_info
+if version.major < 3 or (version.major == 3 and version.minor < 5):
+    print("ERROR: You need at least Python 3.5 to build SS14.")
+    sys.exit(1)
+
+subprocess.run([sys.executable, "git_helper.py"], cwd="BuildChecker")
diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index 6f18510d17..90445a31d1 100644
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -226,8 +226,3 @@
   copyright: TGStation at 3df5d3b42bfb6b3b5adba1067ab41f83816255bb
   license: CC-BY-SA-3.0
   source: https://github.com/tgstation/tgstation/blob/3df5d3b42bfb6b3b5adba1067ab41f83816255bb/sound/misc/server-ready.ogg
-
-- files: [beep_landmine.ogg]
-  copyright: '"beep_landmine.ogg" by kaktuscsc of Discord for SS14'
-  license: "CC-BY-SA-3.0"
-  source: https://github.com/YuriyKiss/space-station-14/commit/971a135a9c83aed46e967aac9302ab5b35562b5f
diff --git a/Resources/Audio/Effects/beep_landmine.ogg b/Resources/Audio/Effects/beep_landmine.ogg
deleted file mode 100644
index 48bc5e21d962084a1db41c473f30892d914894ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6034
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
Bu4e!M

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6679b141cd..743c0add32 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4051,7 +4051,7 @@ Entries:
     - type: Add
       message: >-
         Glass/Crystal shards and floor tiles now deal damage and embed in
-        victims when colliding with them.
+        victims when colliding with them. 
   id: 6107
   time: '2024-05-11T01:23:00.0000000+00:00'
 - author: FoxxoTrystan
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 03d5059e95..8c54ecb084 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml
index f040d58253..a10f070bd2 100644
--- a/Resources/Maps/Shuttles/trading_outpost.yml
+++ b/Resources/Maps/Shuttles/trading_outpost.yml
@@ -3,20 +3,20 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  31: FloorDark
-  36: FloorDarkMono
-  39: FloorDarkPavementVertical
-  51: FloorGrassJungle
-  66: FloorMetalDiamond
-  79: FloorReinforced
-  93: FloorSteel
-  104: FloorSteelMono
-  108: FloorTechMaint
-  109: FloorTechMaint2
-  122: FloorWood
-  124: FloorWoodTile
-  125: Lattice
-  126: Plating
+  29: FloorDark
+  34: FloorDarkMono
+  37: FloorDarkPavementVertical
+  49: FloorGrassJungle
+  64: FloorMetalDiamond
+  77: FloorReinforced
+  89: FloorSteel
+  100: FloorSteelMono
+  104: FloorTechMaint
+  105: FloorTechMaint2
+  118: FloorWood
+  119: FloorWoodTile
+  120: Lattice
+  121: Plating
 entities:
 - proto: ""
   entities:
@@ -31,27 +31,27 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: XQAAAAABXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAJAAAAAABJwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAAAJAAAAAABJAAAAAAAJAAAAAAAJAAAAAACJAAAAAABJAAAAAAAJAAAAAAAJAAAAAABJAAAAAACfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAfAAAAAABfAAAAAADfAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAfAAAAAADfAAAAAABfAAAAAABegAAAAACfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAegAAAAADfAAAAAABfAAAAAADfAAAAAADegAAAAADegAAAAACegAAAAADfAAAAAAAfAAAAAABfAAAAAAAegAAAAACJAAAAAADJwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAABegAAAAACegAAAAABegAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: WQAAAAABWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAADWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAIgAAAAABJQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAABIgAAAAAAIgAAAAAAIgAAAAACIgAAAAABIgAAAAAAIgAAAAAAIgAAAAABIgAAAAACeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdwAAAAABdwAAAAADdwAAAAACMQAAAAAAMQAAAAAAMQAAAAAAdwAAAAADdwAAAAABdwAAAAABdgAAAAACeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAADdwAAAAABdwAAAAADdwAAAAADdgAAAAADdgAAAAACdgAAAAADdwAAAAAAdwAAAAABdwAAAAAAdgAAAAACIgAAAAADJQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdgAAAAABdgAAAAACdgAAAAABdgAAAAAAdgAAAAACdgAAAAAAdgAAAAAAdgAAAAABdgAAAAADdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: fgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAAAJAAAAAAAJAAAAAABJAAAAAABJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAADXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAACaAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAXQAAAAABbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAAAaAAAAAACfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAXQAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAABaAAAAAACfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAADTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAACXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADaAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
+          tiles: eQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAIgAAAAABIgAAAAABHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAABIgAAAAACIgAAAAAAIgAAAAAAIgAAAAABIgAAAAABIgAAAAACIgAAAAAAIgAAAAACeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAAAWQAAAAACWQAAAAABWQAAAAABeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAADWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAACZAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAWQAAAAABaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAAAZAAAAAACeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAWQAAAAAAaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAABZAAAAAACeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAADTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAACTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAACWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADZAAAAAADeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJwAAAAACJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJwAAAAADJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJQAAAAACIgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJQAAAAADIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAA
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAJAAAAAABJAAAAAACHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAABJAAAAAADJAAAAAADHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAIgAAAAABIgAAAAACHQAAAAACHQAAAAADHQAAAAABHQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAHQAAAAABHQAAAAACHQAAAAABIgAAAAADIgAAAAADHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -1889,303 +1889,276 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-17.5
       parent: 2
-- proto: CargoPalletBuy
+- proto: CargoPallet
   entities:
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 2
   - uid: 21
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-9.5
+      pos: 8.5,0.5
       parent: 2
   - uid: 24
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-9.5
+      pos: 8.5,-0.5
       parent: 2
   - uid: 25
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-8.5
+      pos: 7.5,-0.5
       parent: 2
   - uid: 26
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-8.5
+      pos: 7.5,-1.5
       parent: 2
   - uid: 27
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-7.5
+      pos: 8.5,-1.5
       parent: 2
   - uid: 30
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-7.5
+      pos: 6.5,0.5
       parent: 2
   - uid: 32
+    components:
+    - type: Transform
+      pos: 2.5,-7.5
+      parent: 2
+  - uid: 34
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-9.5
+      pos: 7.5,-7.5
       parent: 2
   - uid: 35
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-7.5
       parent: 2
   - uid: 36
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-1.5
       parent: 2
   - uid: 37
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-7.5
+      pos: 8.5,-9.5
       parent: 2
   - uid: 39
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-8.5
       parent: 2
   - uid: 41
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-8.5
       parent: 2
   - uid: 42
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-8.5
       parent: 2
   - uid: 43
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-9.5
       parent: 2
   - uid: 44
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-0.5
       parent: 2
-  - uid: 47
+  - uid: 45
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-8.5
       parent: 2
-  - uid: 49
+  - uid: 46
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-6.5
       parent: 2
-  - uid: 50
+  - uid: 47
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-9.5
       parent: 2
-  - uid: 56
+  - uid: 48
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-6.5
+      pos: 6.5,-7.5
       parent: 2
-  - uid: 61
+  - uid: 49
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-8.5
+      pos: 7.5,-9.5
       parent: 2
-  - uid: 67
+  - uid: 50
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-6.5
+      pos: 3.5,-7.5
       parent: 2
-  - uid: 71
+  - uid: 51
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-6.5
+      pos: 3.5,-9.5
       parent: 2
-  - uid: 183
+  - uid: 52
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,0.5
+      pos: 3.5,-8.5
       parent: 2
-  - uid: 900
+  - uid: 54
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-7.5
       parent: 2
-- proto: CargoPalletSell
-  entities:
-  - uid: 34
+  - uid: 55
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-0.5
+      pos: 6.5,-2.5
       parent: 2
-  - uid: 45
+  - uid: 56
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-7.5
+      pos: 3.5,-1.5
       parent: 2
-  - uid: 46
+  - uid: 57
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-2.5
+      pos: 2.5,-8.5
       parent: 2
-  - uid: 48
+  - uid: 58
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-2.5
+      pos: 3.5,-0.5
       parent: 2
-  - uid: 51
+  - uid: 59
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-1.5
+      pos: 3.5,0.5
       parent: 2
-  - uid: 52
+  - uid: 60
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-2.5
+      pos: 6.5,-0.5
       parent: 2
-  - uid: 54
+  - uid: 61
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-9.5
+      pos: 2.5,-9.5
       parent: 2
-  - uid: 55
+  - uid: 66
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-1.5
-      parent: 2
-  - uid: 57
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-9.5
+      pos: 7.5,-2.5
       parent: 2
-  - uid: 58
+  - uid: 67
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,0.5
+      pos: 2.5,-2.5
       parent: 2
-  - uid: 59
+  - uid: 68
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-6.5
+      pos: 2.5,-1.5
       parent: 2
-  - uid: 60
+  - uid: 69
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
       parent: 2
-  - uid: 66
+  - uid: 70
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 3.5,0.5
+      pos: 8.5,-2.5
       parent: 2
-  - uid: 68
+  - uid: 71
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-8.5
+      pos: 2.5,-0.5
       parent: 2
-  - uid: 69
+  - uid: 72
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-8.5
+      pos: 2.5,0.5
       parent: 2
-  - uid: 70
+  - uid: 73
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-6.5
       parent: 2
-  - uid: 72
+  - uid: 183
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: -1.5707963267948966 rad
       pos: 7.5,-6.5
       parent: 2
-  - uid: 73
+  - uid: 900
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-6.5
       parent: 2
   - uid: 901
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
+      pos: 2.5,-6.5
       parent: 2
   - uid: 903
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 3.5,-0.5
+      pos: 4.5,0.5
       parent: 2
   - uid: 907
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-6.5
       parent: 2
   - uid: 908
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-1.5
+      pos: 4.5,-2.5
       parent: 2
   - uid: 909
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-8.5
-      parent: 2
-  - uid: 960
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-7.5
-      parent: 2
-  - uid: 961
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,0.5
+      pos: 4.5,-1.5
       parent: 2
 - proto: CarpetBlack
   entities:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index aa4a7b50e6..f3610178b9 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -549,9 +549,9 @@
   description: A cozy jacket with the Cybersun logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -560,9 +560,9 @@
   description: A cozy jacket with the Einstein Engines logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -571,9 +571,9 @@
   description: A cozy jacket with the Hephaestus Industries logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -582,9 +582,9 @@
   description: A cozy jacket with the Hawkmoon Acquisitions logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -593,9 +593,9 @@
   description: A cozy jacket with the Interdyne logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -604,9 +604,9 @@
   description: A cozy jacket with the Bishop Cybernetics logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -615,9 +615,9 @@
   description: A cozy jacket with the Discount Dan's logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -626,9 +626,9 @@
   description: A cozy jacket with the Five Points Armory logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -637,9 +637,9 @@
   description: A cozy jacket with the Gilthari Exports logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -648,6 +648,6 @@
   description: A cozy jacket with the Zeng-Hu Pharmaceuticals logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index df7fad06dd..1680dd6cda 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -44,7 +44,9 @@
       Female: UnisexMoth
       Unsexed: UnisexMoth
   - type: MovementSpeedModifier
-    weightlessAcceleration: 2.5 # Move around more easily in space.
+    weightlessAcceleration: 1.5 # Move around more easily in space.
+    weightlessFriction: 1
+    weightlessModifier: 1
   - type: Flammable
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index 67d7954038..f232bf1d34 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -17,7 +17,7 @@
   - type: Sprite
     state: icon
   - type: Item
-    size: Small
+    size: Normal
   - type: MeleeWeapon
     soundNoDamage:
       path: "/Audio/Effects/Fluids/splat.ogg"
@@ -39,18 +39,6 @@
   - type: TrashOnSolutionEmpty
     solution: drink
 
-- type: entity
-  parent: DrinkCartonBaseFull
-  id: DrinkCartonBaseLargeFull
-  abstract: true
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 100
-  - type: Item
-    size: Normal
-
 - type: entity
   id: DrinkCartonVisualsOpenable
   abstract: true
@@ -128,7 +116,7 @@
     sprite: Objects/Consumable/Drinks/cream.rsi
 
 - type: entity
-  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull]
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
   id: DrinkMilkCarton
   name: milk
   description: An opaque white liquid produced by the mammary glands of mammals.
@@ -136,6 +124,7 @@
   - type: SolutionContainerManager
     solutions:
       drink:
+        maxVol: 100
         reagents:
         - ReagentId: Milk
           Quantity: 100
@@ -143,7 +132,7 @@
     sprite: Objects/Consumable/Drinks/milk.rsi
 
 - type: entity
-  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull]
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
   id: DrinkSoyMilkCarton
   name: soy milk
   description: White and nutritious soy goodness!
@@ -151,6 +140,7 @@
   - type: SolutionContainerManager
     solutions:
       drink:
+        maxVol: 100
         reagents:
         - ReagentId: MilkSoy
           Quantity: 100
@@ -158,7 +148,7 @@
     sprite: Objects/Consumable/Drinks/soymilk.rsi
 
 - type: entity
-  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull]
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
   id: DrinkOatMilkCarton
   name: oat milk
   description: It's oat milk. Tan and nutritious goodness!
@@ -166,6 +156,7 @@
   - type: SolutionContainerManager
     solutions:
       drink:
+        maxVol: 100
         reagents:
         - ReagentId: MilkOat
           Quantity: 100
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
index 86bc34f3c8..f6dd722261 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
@@ -8,8 +8,6 @@
   components:
   - type: Sprite
     state: icon
-  - type: Item
-    size: Normal
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -74,19 +72,6 @@
       Glass: 100
   - type: SpaceGarbage
 
-- type: entity
-  name: base empty bottle
-  id: DrinkBottleBaseSmallEmpty
-  parent: DrinkBottleBaseEmpty
-  abstract: true
-  components:
-  - type: Item
-    size: Small
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 50
-
 - type: entity
   name: base empty carton
   id: DrinkCartonBaseEmpty
@@ -137,19 +122,6 @@
       Cardboard: 20
   - type: SpaceGarbage
 
-- type: entity
-  name: base empty bottle
-  id: DrinkCartonBaseLargeEmpty
-  parent: DrinkCartonBaseEmpty
-  abstract: true
-  components:
-  - type: Item
-    size: Normal
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 100
-
 # Containers
 - type: entity
   name: Jailbreaker Verte bottle
@@ -171,20 +143,28 @@
 
 - type: entity
   name: ale bottle
-  parent: DrinkBottleBaseSmallEmpty
+  parent: DrinkBottleBaseEmpty
   id: DrinkBottleAle
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
 
 
 - type: entity
   name: beer bottle
-  parent: DrinkBottleBaseSmallEmpty
+  parent: DrinkBottleBaseEmpty
   id: DrinkBottleBeer
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
 
 
 - type: entity
@@ -342,24 +322,37 @@
 
 - type: entity
   name: milk carton
-  parent: DrinkCartonBaseLargeEmpty
+  parent: DrinkCartonBaseEmpty
   id: DrinkCartonMilk
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/milk.rsi
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
+
 
 - type: entity
   name: soy milk carton
-  parent: DrinkCartonBaseLargeEmpty
+  parent: DrinkCartonBaseEmpty
   id: DrinkCartonSoyMilk
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/soymilk.rsi
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
 
 - type: entity
   name: oat milk carton
-  parent: DrinkCartonBaseLargeEmpty
+  parent: DrinkCartonBaseEmpty
   id: DrinkCartonOatMilk
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/oatmilk.rsi
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
index a3e3485bc6..9088edc815 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -35,13 +35,9 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: LandMine
-    sound:
-        path: /Audio/Effects/beep_landmine.ogg
-        params:
-            maxDistance: 10
+  - type: TriggerOnStepTrigger
   - type: StepTrigger
     requiredTriggeredSpeed: 0
-    stepOn: true
 
 - type: entity
   name: kick mine
@@ -61,6 +57,7 @@
   - type: Construction
     graph: ModularMineGraph
     node: emptyCase
+  - type: LandMine
 
 - type: entity
   name: explosive mine
@@ -74,3 +71,4 @@
     intensitySlope: 3
     totalIntensity: 120 # about a ~4 tile radius
     canCreateVacuum: false
+  - type: DeleteOnTrigger
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
index c628d199a9..925e036e09 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
@@ -21,7 +21,6 @@
         mask:
           - MachineMask
   - type: CargoPallet
-    palletType: All
   - type: StaticPrice
     price: 100
   - type: Sprite
@@ -54,33 +53,3 @@
   - type: GuideHelp
     guides:
     - Cargo
-
-- type: entity
-  id: CargoPalletSell
-  name: cargo selling pallet
-  description: Designates valid items to sell with a selling computer, or to CentCom when a shuttle is recalled.
-  parent: CargoPallet
-  components:
-  - type: CargoPallet
-    palletType: sell
-  - type: Sprite
-    drawdepth: FloorTiles
-    layers:
-    - sprite: Structures/cargo_pallets.rsi
-      state: cargo_pallet_sell
-
-
-- type: entity
-  id: CargoPalletBuy
-  name: cargo buying pallet
-  description: Designates where orders will appear when purchased.
-  parent: CargoPallet
-  components:
-  - type: CargoPallet
-    palletType: buy
-  - type: Sprite
-    drawdepth: FloorTiles
-    layers:
-    - sprite: Structures/cargo_pallets.rsi
-      state: cargo_pallet_buy
-
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 2ddb21b9e6..8d3c83e3e1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -230,7 +230,6 @@
   - type: StepTrigger
     intersectRatio: 0.2
     requiredTriggeredSpeed: 0
-    stepOn: true
   - type: CollisionWake
     enabled: false
   - type: Physics
@@ -252,10 +251,6 @@
         mask:
         - ItemMask
   - type: LandMine
-    sound:
-      path: /Audio/Effects/beep_landmine.ogg
-      params:
-        maxDistance: 10
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: HardBomb  # normally Default and max 5 total 60
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
index 77b03d36f5..85c9bdae3d 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
@@ -50,8 +50,6 @@
           MaterialCloth1:
             min: 1
             max: 2
-  - type: WallMount
-    arc: 360
         
 - type: entity
   id: HospitalCurtains
@@ -352,4 +350,4 @@
     graph: Curtains
     node: CurtainsWhiteOpen
   - type: Physics
-    canCollide: false
+    canCollide: false
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index 2597877187..1a17b2f856 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -731,7 +731,9 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
     
 - type: construction
   id: CurtainsBlack
@@ -746,7 +748,9 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked  
 
 - type: construction
   id: CurtainsBlue
@@ -761,7 +765,9 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked  
     
 - type: construction
   id: CurtainsCyan
@@ -776,7 +782,9 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
     
 - type: construction
   id: CurtainsGreen
@@ -791,7 +799,9 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
     
 - type: construction
   id: CurtainsOrange
@@ -806,7 +816,9 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
     
 - type: construction
   id: CurtainsPink
@@ -821,7 +833,9 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
     
 - type: construction
   id: CurtainsPurple
@@ -836,7 +850,9 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
     
 - type: construction
   id: CurtainsRed
@@ -851,7 +867,9 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked    
 
 - type: construction
   id: CurtainsWhite
@@ -866,7 +884,9 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
 
 - type: construction
   id: Bookshelf
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eadcdc1c1ab3fbd2bf67c5055286b407e2e4a60
GIT binary patch
literal 9460
zcmeHtc{o(>`~OfOkwj66F@$2wm>J6qL-u{&*UWA#GcsdOq9~Q5P}VHTUb2(1Crfrx
z3L!0oY*EN>)O-E?zSs4;-q-j0`Tq5uYtET-p67mE&wan{*L}{M=Q>elCc505M>zoi
z0JpxLmId?o^v=e?#@y$V&yE2A2a<xU?C2I4f1tMyl}Pp^0O^6=1Rx=ROauS|M&^<n
z{lu%ewYIA{A)?=QR|~23Ebgy8cLrEGc*|kt)8cyb*T;hv@k@>3yr+TTLzL~Qg=bsQ
zkIp@vv`BDpI4N)@FZ(cxI^!EEzcKd+Uq2^}&RO4RKD*`z@|IdUx}cV=He7#WqmpI*
zPWO{dO8Ri~)_Opus-(siqIWqx7tUF0-*bA-SM`nLCj4o|!Z2^zzL}VN@Qb4f&q55g
z{T6t{MGd6kE?gL05y<&xg7fU!Tl$ZelfE6t4$LZzf79<axvyMIQtR8~kLh6v4PKLd
zJKr2-%EI#rDXjK1ua;4F+<(Dzebd(!9JD~>|Ni=7^W`J$D-%K6tE$DMA)E*C5c*K2
zU79w-2D>06aBzlyuA-^(%k4nO*U|Ndw)GNj4?SEiE__Pn0iHd#)af6(`L%PA_`O}o
z@}+tJHzv~UnR{Gs({3&vhjSZz;uTfcJw@az4+Q7)s_ut*enrob<0T<I*^ThK9}>pD
z`_%_e*p7cN;*KRPj-eZ|F6z6w5&X!lE&_0}hi}l6<$Or!4=k{skE1lAx}@QJbnunf
zt(Z4g+34?Tp3ge#xFnp2WQ`Z<={9QB1y)^+c_k34&oPM(D+CNCqRM&MIM!2|vA0B@
z+BH023qe#~S@!d4n^4^^5~g+I1n0}Lmn_oRMnClO-<kEu<)qNsZ+TFv@7P(iXIFu=
zqlygU#O<$Mu_E_-6z08m$RBiYoCB9}EKJ)Zm5n&erjq=0=HI+2m=!vLX^GVlCbZ>d
zMXT!HOC+WdItoj>>YA?ZbGIY3=NA;!ZArxYjRf8SQ-(+V)ZUFmNv59bh_y6T-r_E2
zAG%k!z1#hVI#|#mD77}D)jT#QU0)#Qq7)H$_!j$F7FJUY_NSloRkPFEP7-Y`g*(Ia
ziBE}v+FZK_zRJFvs$OoLXZHy`s%YC$SrwsnF~#!Z4^|&)RW+E0awff^tkPKX^FxiI
zMrn(Xl=1S*Bjsma6$CTB6+GG=+U3i_h7^l8zS7}h+2QnVtj6!yjaDEn)t3Wvhqm{^
z=elF}8OxvJ`Hz9;Q*=GdZK5uRsy|9lxZ!zo;+DOWO6iJ;kGh^_LCkAIr{J6R$eRsm
zuSLaf5%wg8bf`*JWKD(1tXL-RpAGLK?3y_xcDX=DLL|ce*74=I>JuY}?mOHmd+!i!
zkY8%}vfACx971@)m`ua9fISvV*u-C2htv0ULtHMK2^G@Q1Y@ccuoFE7&65)x{LYd|
zS)bp(j?xI4_j@2|t^I+1He+`ZX0LLp&7@nRb^un(<@LL*vJ+fNfupk~y@PpNJsY)q
z2j&gGK3CX=-{`J4F`+d@545`EK!EQ2uewik&7C|qHhu1^k&~1)doq^A#3wzf6omWi
z7UMMeJ$<tKCfa9BLNNFKZq|hlcP(@C{4=7Lll_sYNx8!#><#?=9n;$4U)ioPs;)-O
zed#<6sYe{yFJ;f6zJ|z~_k6^m7;d0C#9zWj<7A0;32z`VQVd?`TzjYe+(v}7Cvxe2
zYFEu6$#k8HdwuWQQ>zNo+MRfLuAY@SAbwEPv}*s1Tkyx|1AKyVTMAk0a$0XL1={ew
z<7-L1z3yS?RjsEKwW0S`o}?<43t$8Zg{`O!nme3-&a#wL>7hJBfhxp6rotCFmh~*U
zRVu!2#GPp9I1(=NjzyoB|FLvw)8m=volo*>4WeH3Y0l;hiZ%}PM>Uimp76~4W>RxB
zjo)CtnpxHYp{?P~!xAwgi-hNaO~8YB=Fe14QH@C!rX+iQ{L65z`x%2qG3i%pMM(2|
zg*Gy;C-X@=h>NZ9sw`zi9|J~Q2Glp=;O^7vx)eHxO*%Mrq83rYaBmeb)Zh;#bZ8vC
zp_w)KeZZ-kZPmmtzT!&LIh(;k&}Pe(rE77fA_7wiL3?968)W55yDR#Iu7~J|UdZWE
z_qn-!*74R26SR9B`&y!Pm`q;-+sorPlT731W9wm>j4Z~{QP2JLKy!yPjt>Jl{F?;@
zih<YLQz-F|H1(D79o^CEvA%J)ZUPQGlj3~iaGGycwYNg-MR}AY*@P$4Au_LF`G|_F
z?0ru2;W+y1FQ90}jYO>2Fnrc2HrXyuE1V%YP$<Lyz!TTtDs=_@y&RBa?iqo)W8mBb
zYJsG2sVNkF_srGJ9<eT;k6kw4Wl>D$xzykgR^v0<t7q41;~4(X&hf5nl-jvtiWddL
zszkVM?OH$ZB40FHtf;((crYTA<G@}k*7yfY7ZMKKbGmG{)W}&=^}R+f#cw3iiSx0R
zIejU<>U~X+{r%&gG{Mg@_T*~olt<rv`s{cI_icE}5_?KFPs-*+OVzwSp_4~#D*VNJ
z?C1Dl;8w=n2U*<%h%v@dtJjp4WAQE7BN?0ew+B&P*7ygH2H)!_$8wU5KAsZjz1Q1z
zPk)@}m2%k{TmN(H^hZO4QbsI)s)U!QWo>q3QKslo8aDj80EW&l&XAbDm1jCqr7KBs
z_d2<0Gdvj3AA5LrIQFi%<Ryz!`>sPGMILFqYW+fsi<ffg)@?hZ-=Z0Ym=Rh%e~1I*
zr)HY)V&(kYB{LaqQ`7WZ@@Lf))<fDedsy#l9XwJkN!mS^7{_fZKGj<I{q5Yse5-~%
zmZ5Kpa<u@j2ncg(E%s{rojesow37K0@32eXMXBE`)>yfZdQz$H)NCg#0uR7gKj!lG
zzNzenJ0=r(KKo!&v7z`$$&oON#a@s`K<7YJtf+MI`>^3&hj!uF`GjXQYHD1jYT$G(
zwC{n$BmI5$`iH+=2ld?_$SY~7Y-d$lW-K%f&MVD1TQIz~O3zY19RkaJMEk)b4qA(u
zX&+Bwn@WH4AuYk+4*#)gJDAi;n_oVeB~CKa!0>7AWUrN-25B#OEd1jeIZ!0}jO7ql
zrmT5Gz~K%6C9C2Tnta-izb>J|M^(LLaHXP4z4t6ZlEiNy?0PS%%7%2k^1EBE^u3aK
zql}5%+xJh4<SQKQZ96p^&Nn|dS|oit?PiO)zK@Jz_3eaQzfZT26Blkg36H8Z=xfZn
z)8Af3$*;MTZF9#i*Y7mvVan;lZZ7GS)-!IaKqP-iLKt)m>*hRh*j2{#RD;_@jhC2b
zn$a9A9D>l(alLM(ap900K|K0Q?)9diwzoRR9OC&LqlKR9JLgBny}whQex%9xtN~>%
zFChN<+Fs?tV7KP`sHZg{X4ZKD7e}o2J~0SAK3rqqU|acIX59y?XugzsZd6`qtm)IM
zOnbg>S0}wU52XPX_Mb4wPU4-oG=F#tqYAft{N37Q{N&vE)B*Z^Yx+r{W8%WRYHkS^
zCAhvwps9{(u~WU#?^;U?3@h(0Jy-5W>M3|>DIf8Dbn!zmOX<Vx{8rVTNz<9`sf4H#
z--h>-^%yn@XP$-Ijjz_Pu^zRKQgA-rorq}9JUv;$d*cn%5BzjVDU{%56m%=XfZ_&w
zSCGB<1V(>^a>@pMxCZ4Py<1_pA7rL1)oj^j%mvCwTsa{h<Sm&allHV}GA?<n=*3c$
zy|lYx^=I}YyS2?zjl??9Eraap?VAy1i`Nb=mT8866MSaUtZ<>Zb}wsPV#_5T_v+((
zTCTYCcQ=5n0CDA`7EunbAHjUcg6Ts(rZvI9(KY@pGmhQ{+QTQ#CYL&U=K8k=)o50X
zS69I{IW2={YpocnyQwS|?!wRZyXPutW_7n6MOC1r!~>~`RRV8$W;%vY`P)^m-nf69
zQZGs~9?H1TtwAzv51><yUun>;D;Ts;&lCh2uGURcS-TAycyL1--t~`Zek%UbW~e&Y
z3*lqQVJq(g-L$ta5w(n7RzBgHA1}GLxE=OGmu;rF1IADsTAB=S456)jn89z~8R~aZ
zTdbii`zu0R`*ag6WAZ8ijJMj?V_F0U?h|!1HH&&V!=Zy#Uy9#%N|^BWb*Z_tarPP~
z=)O09)i-_JHIf@L)Y+?VwHoO18agP@Atf~0HYqYqvsyi7>r8Z*2HxiFc<6fTgVu?-
zbDvz;D2!x|_M#W#<86-fcOF}RA3pxVnB6>@mz=t6E~p^g!l!ZD&&+A4>$E{|$Q#<}
z3EVobbw!T<LQck)sKsX=`GQA#G=#Uy?pZrLsAPHcDaDPm3v_VhFdstGQO|^KQ_G#t
z-c#(%wfZ9~y`N^CsK4PF@3!!uz$%e;qaOb8TDKlfi>l~fr2BSgK@;iPY)Ef5kA6D(
z%mQ5luBMAo8wM!k7)6b_;MTy#H`t1Xnk0PuwKbEE!D_HIJ%Z7J7;FC`UWa}2HhU60
z3hi>U9~9qqbFOqa=&pv_(^;IRFDp5e<!)Z=t7$K+`Orf^fUG!M&XQ><aY?XkeZADa
z^QJ%+O=$Z8mQB=`XcLD9#dg*f-065>JrO#0t^lWYfW^(0AK8?Ml|uG4$?grnms>ge
z3+#8_wQqd>+sdaA|Dis)*Xxo_U#epVY>Y0d+mL)cjv)E_mTO2VSh}9<t`9)<X6ka!
z{MNwN;*DZ8BZb4G%ggzPzPuH^#x>gZyx3T)zgJ_|K<QnKG3IzbYC-;@N0z0}-Q6#|
zQ_IjAJkhob+&M}ru);G>#(YSLo#mJkihNoKxS()aA~I51VDVKsdi~1Ff+OBmZGa3B
z$32D=;~%_)wFaXhH!rF4&WlfGMue%!gCE|kN8|;UWx%$IZ<ev1kHZ#Duh*o$M|;)X
zti_{8O!mmyoAyl!+@%GcKpPI;&q>=``i6+eXR+N?&!OORRP;I#_jP@%;F*K`tS_zR
z=1TGxHq(_VfwOy$$(J8reNaD78dj7gZ1u1PeHry|aZwa8UHnqQnaFeOkd}REklXZ4
zT+0FbX-{f7bUyQd<E6$cU!rEpbsPo89H#><8*56&y~4P~E_5B)NcXF;AigpwZJRk$
znUHLacDfK-SmU4dL`8Sasn|6#%a2>Meia9~uB%-Tv|i_>YjS9Hr4CCfnQ=A^wQT0u
z2b#O9DxWsh(jr%mIc~n{WUiUo?Gf`j#BXyP1>Ei$)0$Epm-Resm2qz`<9bY}*U^(6
zn~OPOYaUJy>%N+M3TS(!+fj4f85*xSU&@8jZSlQb-YbRk`^2S%09W1vHK9lcs#@+g
zwXyppX8E<mW#7xeW!F|pKro(@VXrwV`=d)03X4>hT9mVVuh~aX5XW*Px>fedvTkQo
z92*(-o=rmv`cJoK`7wIjxjRSVSDuzZ&kJ6-GQmzx7}8rXbB*B0^#Lat^v485&cE(A
zUIg*i3@0|2HCLDynZrGn-tFERJnavWTTzlG7&wR=bXwVk82u=IMVhy5l7kqhyxzPW
z4%%+Zs#-AWAjR}2R(X2agi%(*);~GO%rOR@UK|~pCT#@2R?F2p7G$k?^hxA`+Zlsk
zzZ@5let4I6k1?I%T4QV8i9O=ngIjgjCf;kAj*F})$rLeq{3WXKQfPk@^=p)SkWAN)
zjyXo~R`CZOu#A^;zVz9RnokAFh9|D0>c)iJXU9hRx7#zHI4bB%Hww4k_N34Y9&(>;
zcwf5bocn2CAipZ2uqBJL7M*$?zd{I5J6;<m_(8LwIVM2)<kZR5_3u{gUxTHGF3{Dz
zMn#gNLiAKbDJBmdicB?B*MJRm?b8*gnX;eCc^CIYY<CxI*ituRg!GOSSBJ8e?VY}R
z0;t{y0I*QVnwn;09FDmrk>VTMC9P#H*cuAggbUiIi%-i&%1D`)3`!|9V~KH%#Cdst
zoi3-!U{XK6z*8nJ;^n%-I?u~fjs_<!Zly9FMbjD2auZvsQ#XDDbq9`h2ku|T1!lc{
z!L8AF3bojttB{;D5N>+OEj^VIPHryGImoB~<M@K&x)np%jPYZ9?Sq@c^D4G=jV7_k
zIsS-emvGYBj*F4r$+3nI&V_wz%08zj_GQl=I&YOy^rZkRc|?T0ekPCLVfP3l_JRM>
z#wD?cbM5QMm>PX0T$lKLzmCsMC%VPW5p)BY*qpWtR)(;R*NW?N$wYgV$W5;frOCEi
zeAN2f6Q7b|-LIy_LQL(ae<+&{3km1bd2};=G%mXY0ju`hOHNxm`!?|2<pWih;RQ2i
z5>j-=wZ;qGW6^H*7jG};KcF^$Leby6B1>+8_u#)9^QFaPAomp6_9~repCP4YIqE&^
z;B#*3mR;%ikq`mt-9=h?DwoOv0PrBl%=IBVV<Qxf>LrW8Q?Ufu055Om`Vj!2q88wd
z!FdqqKrDeorl3I!PwGKHG9C@Gl{bbOdutNh$a+CO1j`^3D_oEV4v7b;sdB0WpqKz&
z1Ud#7;N?l7p#spLpSURI@lG=Y1pH}2_dtW}jLm?WR38EmA&ZcOg0%z4elU<KCs4%)
zPefU0>HG%4JVS%r=yY!s1mf@SFY6DNrTUN{a!4c+0);_fFfh{sObevYF#%u-O>76^
z7lsyrhVvnN)5%l{a0e5ErTWs*AP}=3_`82z-p0m%z*A_yvB2a55`giB$jL$>US5#D
zj-b)C{g@!XIrLwSpjk1O*&r4K8r9baN6_{oQ0QWRg}~$f81L=t<M}fjJPtzeBzQ4R
zY0O#W{x+qqzOmUKBX%etk-fZsj$)GiH%mI1_$OI^^KGZ+XE=X#ggN{V+`n1>9{W#Y
zrj@ZVN{fo~-EmJ}3k}+tABCsl$avJRLmZZ<1jWO_azrEoj6f(5!Ac55B3K@Wz(N(E
zNCgZI`4=dC3XP7T;0QZVOmJB;69<OGDZv$>2(S_kjs+ty2pm`m%fwN{!e9zWC8!cy
zN$xKYraok*Dlwja^=bzS&xDf4!ii9#k~|oyu;UE|qXbqWDB{3K0*;7~CnzA01n5sF
zJPxHp_3^?m(@FNikO&ZO3h8IZ4&f+uGkr7&Ci~0uXN#F9hE8M-VAcScf~We^{xr5C
zdl4+@m>oXl6y+452q+YRP(;eX5K4a<*${kaOfBx9%0Xq}u%A6Ui9s>LVN#3PQ7RMQ
zXFD?*l%@{>L#O&!QK_D2(2fhhosoZZ8#4<EkD+6<FmwVF6beJ2pz=&6tzd8zoOz4@
zLz(-(*i-RjV&MPJdZ&DVD!-DhN2W375B%BmtEMaoXMdgjI`t&~EG8iEXIY>yxL+aA
zFn$F5Pd}Mhzq)X47z&BNyng&9*x%d9|AiRfP$fkLB^(lrS7hc5fq>(|7$pQAjKnk5
z1jRw+k@)`$okk_n{V_fSbrO?DCRa>>{^SZM^;@b={@ojYH^NRHn3OR&0>hzJFgX-l
z4kafKg8b*hgUTx)v2ctWQ<hj57(s*+!5Dd@0vHd4;-N?w5~`r|OB;WX_umOm9t@MS
zg27M-xg9P1FN8;gE8^sl1UWE{s0arm;6wr#LnI==NGw7LDNlgGFbeR$XXC#a-k*a1
zJv<f2&h`Fxt*Su&A2t6n_{$A~ne|_7%o`8$J_h;YM)sQ=n5p<retxT>|Kt=v;J=gn
zBYyv->tDM55d;6o_+NGXOV>YQ;2#<PtFHesx;X!Q6eduZ|6l!?54!c#tZwE*G8@)V
zR|`M@JO=n@dcwamTlRYE+0y_3S+SjsB_LbPkJ-ph*EiN?|F}nZ7ijnAbLq<fz%EgJ
zEp@A%S1=kq_{<Nq)^k5#6Au#xiK}0X)7u}>Vt8OBUAWc_&B1n6*gz%tOK-}G$d&YT
z#f-^D3-dhJzKiVAxj=Mzucn#SNdN8{c2UvdzJ{RO(ppcy+abvz=Fd0N>7Rn1jMu(u
zPrlO);A)04zqqRsaAf@Rq}XP;bB<?btEs2XK%*IKeje7w@sBOPg(KZ=-1gd1dOLi;
zyzLrB-SxBl*JxFGF{yCCeItn2Hrqm%ARTT#(a9k>b#>xke`3l((#`X7P8vBw^WQS$
z>_bfVzf8QA_|DgdmEp^|g{{IfQd6t#(oGJmwnt*CF5QvLe^Gv@|JHX=$RvGqv+wiS
z@T!2LmE($^C+EHcpvulVAmQfE^dlxyE~{wm)6NUr!9J|uAFWSjt5#MrXE!n4L1X>I
zJ-&>v?5?Xh-|9*ly68`L14101xnuW`X5m*vq8+Dt&ZB2I)p7#YDmv;)HPk{DyKeJs
zehltreNvv!=GDsOo+h*6#JPM~gt9Noc>KFVz4ILf;f@6l0auAhIgjr4O8s-HXJ$DW
zO&)G^m-LmgRbS2J(pjE<f6fs5kYSE5$+mNA8zJ4fE7@bu<-Nv)%Gg!p7NnH-j;zkD
z_wit!FV0=Cy$z{3A2W1EbkS))U~=5*{1Jl_rDG)re&*m;Cb*ibK&uO4m9Q#LV^yi}
zV%>bTh9U%IK|pY5a`dzLVV2Bc<st>y?OIOPdeyftkeNP<R=4fa?8=fP@Lo5QQo7$g
zkIAXq1?Vm$ZC~Ykb9h_z%pO3>54ur4zofN5`qN#-yXVlm^3Trb0v$gqu+0NvYsNn2
zJ&7W~tY2>MqKdwnZE;v6za1TNd{JIkv@7b6pz*H0_K$7whKsa)p`L*G`b1s-uHr&f
z*4B9;V8T<WeJW~oEWwN)ZBvo`#=T=3mcz%YmQD;0p(HIcZ>zH3>@8m10P=dpmK)Zn
z0S`t4F3f&7e>V*XF&n>myn{n$;N}eP+aG{WDsK=qDzYUik8|I+N^&nU-x%V|xn)0)
rXKK5-nfI_~d!NFNPPv*l1vc5}gA-R^JT5cL`T^)`n`k}Ma1H-IOGEXF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 35003686d555624fcac17b387f726605cd147bd7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index fe470b0074272a504eac30798883e5e2c6c5e027..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 06932fff6fa7370f5410813dea7991e4cf15cae8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 553d9e2f64723d236c10d8feeb56c23836529b00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9782
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
LZBvHT-ot+bfr+RI

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 19b5dc75afffdae7d345415572ef0d33fb92b869..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10959
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
Ut|q6&?+>jkZ8l`B|7rjK0J;kVAOHXW

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index dfbe6e460dd870ae473d5042fa72e2cfeeed123c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 03b6d3cf8602c5439dd03c8d5bad3a157deca91f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10546
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
K>l=SM@IL^A4Qvnq

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index c818593ba46bff87d23d00c5112b215da5e0e884..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9675
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
Bn@j)z

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 5ce9bf097d39502939b7184dc3dd07095fc242f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10494
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
G>%RazGBOqb

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 3503762d73365fe88c1a01d3aa4297e916fe3b23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..631fcc2c946a0131aff878e41b8da273a212dd19
GIT binary patch
literal 8727
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..6377db6f2e65dae97ff2fe448a29c96196e57c01
GIT binary patch
literal 9455
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
a2hi|>*QIHm6bl{BIt>*a<)@0*ZvG!trPjOv

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..1055ce095cd7522fd695dc0ccd92a645ca009c12
GIT binary patch
literal 8689
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
Bf;9jD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa468b2390b544d69d79019d254584a10abd39fb
GIT binary patch
literal 9750
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..87fd745850387bc5509c30d040b8fe3bf1cc706c
GIT binary patch
literal 8865
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
K|B>#Qi2ndTT)86v

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1f137dca37aea0a072e0ee239e01b3a91f13b5a
GIT binary patch
literal 8433
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
HOF{ny>l_pd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d103cfa66729e5d5cc4a0383788456b758095c6
GIT binary patch
literal 9422
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
QD-58jsHIROXBqIn0Isk)A^-pY

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..ceb704581888a434c0169d51a01ee2fc823a4a09
GIT binary patch
literal 9418
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..b138d1416b77e292cf051eef49a9c7946a8b51e0
GIT binary patch
literal 9578
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png b/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png
deleted file mode 100644
index 024678fc209363462f2b44b707900f56c749dc56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 551
zcmV+?0@(eDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$;Ymb6R9J=WSHEk*Kp1_7xCN|8$yAPl!~GpuL`rsNagYuY2t}NVlS2_CgLIJM
z{~-P^5d;UPLnMkW0jV9##r(8Y(<;<AeRtoNyYKQIkGoW{SlrsSjY}Y%PD8Y98}$+c
z0F;{xU%|)goo}3Uo)ChRqA1&XiJ{is9Djr}VCW*6{R~9jnIuUVbaHM%r6nf1VXv`2
zpsLN?SO^wQrc1oM--9s*#+bku6SCRt*<)3kV=`Ta8Ven>JIv$xX^ff)P)a}fJf#!>
zKE1Wa<PBX!cbLapb>`bIr6|gFG#WvYB*?N1#uzB2yC!0EK`Di4nvuDvyrGNkT6~Z7
zdJRIzj)H(%1pxd50f69~&K(D8zs+}tdEeTh%`S<M1~_l$avqnrEbDLsQQY!h9LM`H
zd0CbL>}YTH9SQ;tbvEbU<bAka4MfC10-E@d29o4F2(E#0a{)p!@jl>*lh%X}*Q<e>
z5AYZ_AK1sh%?JLK4>)(YM0~(|$2_QkUSk7QGd*`W)4SNon&^VU(8s8?O$<6YsM-M^
z;I~%?iTOaSy@8>J-x{Hr$A=8wsxwqtGT{6|%d)t7Pab<8J+TdVUo1&O)uQL!27<rm
pFCMCdWRNNp3ft9cb)fg(#TS&@TbTH6xrYD%002ovPDHLkV1iA%_&Wdq

diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png b/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png
deleted file mode 100644
index 0d11fb19d36db7047aecdb29bc67d9cbc309e4a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 535
zcmV+y0_gpTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$(Md!>R9J=Wm$7c*KoEvMTUa{DM#2>?9JcivTyI4J9w4>5Ywj7Y;u+GUbDcIt
zULkK_+B*tw#Y$jBRw8_b*_>^1;2b82bo|w<|Iy4W|L7NMOsCT#&vQNkmSxe)^Bi?)
z03ffETEg&qP&;?c3n4JVFf7!iK^8CGeuX1oM?PQf9_i`H9LK?qe4P8IlQv#YtlDMG
zD(T!mv7T7Cu8Z-_KuT#!DNWaPky8Hid0UJ1#M-%FuQ}nxgTt?{Yx+PC1RMQ52m*jj
zHMcFVP}q^r#e>6=<^BQGm7>3mlO$=<)n=`E50C!n88uRHQ|8F)1R+EzL3LZxS!xb$
z2c)wUN{LKeP@gNkTJgGGI!kMk(@6dh>`0(>J4W+;{Bn6<2VT?lt(x!Shr=PTmHqCq
zl%U~IM{9n7ui^9Vz$-CyuoJCzpi9l0&^z!~AE0~9n|uwQcL&ZspkvNH@F#||5BwKC
z;QjD63WbNq;C9f752&lM9<V8Hiv0tmvlKh>>5raYG(2`EJUmuEdt~wAun*{euUmBH
z16jPlj{KeBj4%v~`F#HF50l!<NF$3EWG8J8#P#FL0L`E0Jszq;2#oP~T&z~B7NegA
ZzX9Q!OLX2m^49<W002ovPDHLkV1k5Q{I382

diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/meta.json b/Resources/Textures/Structures/cargo_pallets.rsi/meta.json
deleted file mode 100644
index 4751d95b9b..0000000000
--- a/Resources/Textures/Structures/cargo_pallets.rsi/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Created by TheShuEd (github) for Space Station 14)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "cargo_pallet_buy"
-        },
-        {
-            "name": "cargo_pallet_sell"
-        }
-    ]
-}
diff --git a/Scripts/bat/buildAllDebug.bat b/Scripts/bat/buildAllDebug.bat
index 1e3cc5442e..5cf4952175 100755
--- a/Scripts/bat/buildAllDebug.bat
+++ b/Scripts/bat/buildAllDebug.bat
@@ -1,6 +1,7 @@
 @echo off
 cd ../../
 
+call python RUN_THIS.py
 call git submodule update --init --recursive
 call dotnet build -c Debug
 
diff --git a/Scripts/bat/buildAllRelease.bat b/Scripts/bat/buildAllRelease.bat
index 730b39d26e..6a8cbac664 100755
--- a/Scripts/bat/buildAllRelease.bat
+++ b/Scripts/bat/buildAllRelease.bat
@@ -1,6 +1,7 @@
 @echo off
 cd ../../
 
+call python RUN_THIS.py
 call git submodule update --init --recursive
 call dotnet build -c Release
 
diff --git a/Scripts/bat/buildAllTools.bat b/Scripts/bat/buildAllTools.bat
index 37db01f459..7c878cbabb 100755
--- a/Scripts/bat/buildAllTools.bat
+++ b/Scripts/bat/buildAllTools.bat
@@ -1,6 +1,7 @@
 @echo off
 cd ../../
 
+call python RUN_THIS.py
 call git submodule update --init --recursive
 call dotnet build -c Tools
 
diff --git a/Scripts/sh/buildAllDebug.sh b/Scripts/sh/buildAllDebug.sh
index 1e62ef7742..1ee457ff2a 100755
--- a/Scripts/sh/buildAllDebug.sh
+++ b/Scripts/sh/buildAllDebug.sh
@@ -7,5 +7,6 @@ fi
 
 cd ../../
 
+python RUN_THIS.py
 git submodule update --init --recursive
 dotnet build -c Debug
diff --git a/Scripts/sh/buildAllRelease.sh b/Scripts/sh/buildAllRelease.sh
index 3cfb84b76c..b3749ac28d 100755
--- a/Scripts/sh/buildAllRelease.sh
+++ b/Scripts/sh/buildAllRelease.sh
@@ -7,5 +7,6 @@ fi
 
 cd ../../
 
+python RUN_THIS.py
 git submodule update --init --recursive
 dotnet build -c Release
diff --git a/Scripts/sh/buildAllTools.sh b/Scripts/sh/buildAllTools.sh
index 551db74fcb..14a68487af 100755
--- a/Scripts/sh/buildAllTools.sh
+++ b/Scripts/sh/buildAllTools.sh
@@ -7,5 +7,6 @@ fi
 
 cd ../../
 
+python RUN_THIS.py
 git submodule update --init --recursive
 dotnet build -c Tools
diff --git a/Tools/changelogs/changelog.js b/Tools/changelog/changelog.js
similarity index 100%
rename from Tools/changelogs/changelog.js
rename to Tools/changelog/changelog.js
diff --git a/Tools/changelogs/package.json b/Tools/changelog/package.json
similarity index 68%
rename from Tools/changelogs/package.json
rename to Tools/changelog/package.json
index 1f0899df96..512a3624c8 100644
--- a/Tools/changelogs/package.json
+++ b/Tools/changelog/package.json
@@ -1,7 +1,5 @@
 {
     "name": "changelogs",
-    "author": "DEATHB4DEFEAT",
-    "license": "MIT",
     "dependencies": {
         "axios": "^1.3.4",
         "js-yaml": "^4.1.0"
diff --git a/Tools/prtitlecase/index.js b/Tools/prtitlecase/index.js
deleted file mode 100644
index 0d72b71131..0000000000
--- a/Tools/prtitlecase/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import axios from 'axios';
-import { titleCase } from 'title-case';
-
-if (process.env.GITHUB_TOKEN) axios.defaults.headers.common['Authorization'] = `token ${process.env.GITHUB_TOKEN}`;
-else throw new Error('BOT_TOKEN was not provided in repository secrets or GITHUB_TOKEN was not set correctly.');
-
-
-// Get PR title
-let prTitle = await axios.get(`https://api.github.com/repos/${process.env.GITHUB_REPOSITORY}/pulls/${process.env.PR_NUMBER}`)
-    .then(res => res.data.title);
-
-// Title case PR title
-console.log(`Old PR title: ${prTitle}`);
-prTitle = titleCase(prTitle);
-console.log(`New PR title: ${prTitle}`);
-
-// Update PR title
-await axios.patch(`https://api.github.com/repos/${process.env.GITHUB_REPOSITORY}/pulls/${process.env.PR_NUMBER}`,
-    { title: prTitle });
diff --git a/Tools/prtitlecase/package.json b/Tools/prtitlecase/package.json
deleted file mode 100644
index ecba01099f..0000000000
--- a/Tools/prtitlecase/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "prtitlecase",
-  "description": "Converts PR titles to Title Case using title-case package",
-  "type": "module",
-  "exports": "./index.js",
-  "author": "DEATHB4DEFEAT",
-  "license": "MIT",
-  "dependencies": {
-    "axios": "^1.7.2",
-    "title-case": "^4.3.1"
-  }
-}
diff --git a/shell.nix b/shell.nix
index 85e97a4283..9a1b0ca429 100644
--- a/shell.nix
+++ b/shell.nix
@@ -41,6 +41,7 @@ let
     dbus
     at-spi2-core
     cups
+    python3
   ];
 in pkgs.mkShell {
   name = "space-station-14-devshell";

From df88298459e522f66a0a29c2226771a592393f6f Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Mon, 17 Jun 2024 17:15:47 -0400
Subject: [PATCH 59/84] Reapply "Merge branch 'master' of
 https://github.com/VMSolidus/Einstein-Engines"

This reverts commit 23f4302c4b246c6ce17c2d227eb3e1004e7c21fa.
---
 .github/workflows/changelog.yml               |   4 +-
 .github/workflows/prtitlecase.yml             |  34 +++
 BuildChecker/BuildChecker.csproj              |   4 +-
 BuildChecker/git_helper.py                    | 110 --------
 BuildChecker/hooks/post-checkout              |  13 -
 BuildChecker/hooks/post-merge                 |   5 -
 Content.Client/Gameplay/GameplayState.cs      |   8 +-
 ...Screen.xaml => OverlayChatGameScreen.xaml} |   4 +-
 ....xaml.cs => OverlayChatGameScreen.xaml.cs} |   4 +-
 .../UserInterface/Screens/ScreenType.cs       |   8 +-
 .../Systems/Chat/ChatUIController.cs          |  16 +-
 .../Systems/Vote/VoteUIController.cs          |   6 +-
 .../Cargo/Components/CargoPalletComponent.cs  |  21 +-
 .../Cargo/Systems/CargoSystem.Orders.cs       |   2 +-
 .../Cargo/Systems/CargoSystem.Shuttle.cs      |  15 +-
 .../Ensnaring/EnsnareableSystem.Ensnaring.cs  |   4 +-
 .../Explosion/EntitySystems/TriggerSystem.cs  |   4 +-
 Content.Server/LandMines/LandMineComponent.cs |   9 +-
 Content.Server/LandMines/LandMineSystem.cs    |  46 +--
 Content.Server/Tiles/LavaSystem.cs            |   4 +-
 Content.Shared/CCVar/CCVars.cs                |   6 +-
 Content.Shared/Chasm/ChasmSystem.cs           |   4 +-
 .../MovementSpeedModifierComponent.cs         |   2 +-
 .../Physics/FrictionRemoverSystem.cs          |  25 ++
 Content.Shared/Slippery/SlipperySystem.cs     |   4 +-
 .../Components/StepTriggerComponent.cs        |   8 +-
 .../StepTrigger/Systems/StepTriggerSystem.cs  |  41 ++-
 LEGAL.md                                      |   4 +-
 README.md                                     |  27 +-
 RUN_THIS.py                                   |  13 -
 Resources/Audio/Effects/attributions.yml      |   5 +
 Resources/Audio/Effects/beep_landmine.ogg     | Bin 0 -> 6034 bytes
 Resources/Changelog/Changelog.yml             |  44 ++-
 Resources/Credits/GitHub.txt                  |   2 +-
 Resources/Maps/Shuttles/trading_outpost.yml   | 263 ++++++++++--------
 .../Clothing/OuterClothing/wintercoats.yml    |  40 +--
 .../Prototypes/Entities/Mobs/Species/moth.yml |   4 +-
 .../Consumable/Drinks/drinks-cartons.yml      |  23 +-
 .../Consumable/Drinks/trash_drinks.yml        |  59 ++--
 .../Entities/Objects/Misc/land_mine.yml       |   8 +-
 .../Objects/Specific/Cargo/cargo_pallet.yml   |  31 +++
 .../Objects/Specific/Janitorial/janitor.yml   |   5 +
 .../Structures/Decoration/curtains.yml        |   4 +-
 .../Recipes/Construction/furniture.yml        |  40 +--
 .../equipped-OUTERCLOTHING.png                | Bin 9460 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 10509 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9875 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 10492 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9782 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 10959 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9936 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 10546 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9675 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 10494 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 10740 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 8727 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9455 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 8689 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9750 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 8865 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 8433 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9422 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9418 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9578 -> 0 bytes
 .../cargo_pallets.rsi/cargo_pallet_buy.png    | Bin 0 -> 551 bytes
 .../cargo_pallets.rsi/cargo_pallet_sell.png   | Bin 0 -> 535 bytes
 .../Structures/cargo_pallets.rsi/meta.json    |  17 ++
 Scripts/bat/buildAllDebug.bat                 |   1 -
 Scripts/bat/buildAllRelease.bat               |   1 -
 Scripts/bat/buildAllTools.bat                 |   1 -
 Scripts/sh/buildAllDebug.sh                   |   1 -
 Scripts/sh/buildAllRelease.sh                 |   1 -
 Scripts/sh/buildAllTools.sh                   |   1 -
 Tools/{changelog => changelogs}/changelog.js  |   0
 Tools/{changelog => changelogs}/package.json  |   2 +
 Tools/prtitlecase/index.js                    |  19 ++
 Tools/prtitlecase/package.json                |  12 +
 shell.nix                                     |   1 -
 98 files changed, 584 insertions(+), 456 deletions(-)
 create mode 100644 .github/workflows/prtitlecase.yml
 delete mode 100644 BuildChecker/git_helper.py
 delete mode 100755 BuildChecker/hooks/post-checkout
 delete mode 100755 BuildChecker/hooks/post-merge
 rename Content.Client/UserInterface/Screens/{DefaultGameScreen.xaml => OverlayChatGameScreen.xaml} (96%)
 rename Content.Client/UserInterface/Screens/{DefaultGameScreen.xaml.cs => OverlayChatGameScreen.xaml.cs} (94%)
 create mode 100644 Content.Shared/Physics/FrictionRemoverSystem.cs
 delete mode 100755 RUN_THIS.py
 create mode 100644 Resources/Audio/Effects/beep_landmine.ogg
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{bc_corpo_jacket.rsi => corpo_jacket_bishop_cybernetics.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{bc_corpo_jacket.rsi => corpo_jacket_bishop_cybernetics.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{cs_corpo_jacket.rsi => corpo_jacket_cybersun.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{cs_corpo_jacket.rsi => corpo_jacket_cybersun.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{dd_corpo_jacket.rsi => corpo_jacket_discount_dans.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{dd_corpo_jacket.rsi => corpo_jacket_discount_dans.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{ee_corpo_jacket.rsi => corpo_jacket_einstein_engines.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{ee_corpo_jacket.rsi => corpo_jacket_einstein_engines.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{fa_corpo_jacket.rsi => corpo_jacket_five_points_armory.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{fa_corpo_jacket.rsi => corpo_jacket_five_points_armory.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{ge_corpo_jacket.rsi => corpo_jacket_gilthari_exports.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{ge_corpo_jacket.rsi => corpo_jacket_gilthari_exports.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{hm_corpo_jacket.rsi => corpo_jacket_hawkmoon_aquisitions.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{hi_corpo_jacket.rsi => corpo_jacket_hawkmoon_aquisitions.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{hi_corpo_jacket.rsi => corpo_jacket_hephestus_industries.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{hm_corpo_jacket.rsi => corpo_jacket_hephestus_industries.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{id_corpo_jacket.rsi => corpo_jacket_interdyne.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{id_corpo_jacket.rsi => corpo_jacket_interdyne.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{zh_corpo_jacket.rsi => corpo_jacket_zeng_hu_pharma.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{zh_corpo_jacket.rsi => corpo_jacket_zeng_hu_pharma.rsi}/meta.json (100%)
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png
 create mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png
 create mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/meta.json
 rename Tools/{changelog => changelogs}/changelog.js (100%)
 rename Tools/{changelog => changelogs}/package.json (68%)
 create mode 100644 Tools/prtitlecase/index.js
 create mode 100644 Tools/prtitlecase/package.json

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index a44cac2cd1..877273d764 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -35,14 +35,14 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          cd "Tools/changelog"
+          cd "Tools/changelogs"
           npm install
         shell: bash
         continue-on-error: true
 
       - name: Generate Changelog
         run: |
-          cd "Tools/changelog"
+          cd "Tools/changelogs"
           node changelog.js
         shell: bash
         continue-on-error: true
diff --git a/.github/workflows/prtitlecase.yml b/.github/workflows/prtitlecase.yml
new file mode 100644
index 0000000000..0c5a38a4e8
--- /dev/null
+++ b/.github/workflows/prtitlecase.yml
@@ -0,0 +1,34 @@
+name: PR Title Case
+on:
+  pull_request_target:
+    types: [opened, edited, synchronize]
+
+env:
+  GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+  PR_NUMBER: ${{ github.event.pull_request.number }}
+
+jobs:
+  prtitlecase:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Master
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+
+      - name: Install Dependencies
+        run: |
+          cd "Tools/prtitlecase"
+          npm install
+        shell: bash
+
+      - name: Change Title
+        run: |
+          cd "Tools/prtitlecase"
+          node src/index.js
+        shell: bash
diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj
index 63d16fa970..d4f9a41254 100644
--- a/BuildChecker/BuildChecker.csproj
+++ b/BuildChecker/BuildChecker.csproj
@@ -14,8 +14,6 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
 -->
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Python>python3</Python>
-    <Python Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">py -3</Python>
     <ProjectGuid>{C899FCA4-7037-4E49-ABC2-44DE72487110}</ProjectGuid>
     <TargetFrameworkMoniker>.NETFramework, Version=v4.7.2</TargetFrameworkMoniker>
     <RestorePackages>false</RestorePackages>
@@ -39,7 +37,7 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
     <OutputPath>bin\DebugOpt\</OutputPath>
   </PropertyGroup>
   <Target Name="Build">
-    <Exec Command="$(Python) git_helper.py" CustomErrorRegularExpression="^Error" />
+    <Exec Command="git submodule update --init --recursive"/>
   </Target>
   <Target Name="Rebuild" DependsOnTargets="Build" />
   <Target Name="Clean">
diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py
deleted file mode 100644
index becd4506e8..0000000000
--- a/BuildChecker/git_helper.py
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/env python3
-# Installs git hooks, updates them, updates submodules, that kind of thing.
-
-import subprocess
-import sys
-import os
-import shutil
-from pathlib import Path
-from typing import List
-
-SOLUTION_PATH = Path("..") / "SpaceStation14.sln"
-# If this doesn't match the saved version we overwrite them all.
-CURRENT_HOOKS_VERSION = "2"
-QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"
-
-
-def run_command(command: List[str], capture: bool = False) -> subprocess.CompletedProcess:
-    """
-    Runs a command with pretty output.
-    """
-    text = ' '.join(command)
-    if not QUIET:
-        print("$ {}".format(text))
-
-    sys.stdout.flush()
-
-    completed = None
-
-    if capture:
-        completed = subprocess.run(command, cwd="..", stdout=subprocess.PIPE)
-    else:
-        completed = subprocess.run(command, cwd="..")
-
-    if completed.returncode != 0:
-        print("Error: command exited with code {}!".format(completed.returncode))
-
-    return completed
-
-
-def update_submodules():
-    """
-    Updates all submodules.
-    """
-
-    if ('GITHUB_ACTIONS' in os.environ):
-        return
-
-    if os.path.isfile("DISABLE_SUBMODULE_AUTOUPDATE"):
-        return
-
-    if shutil.which("git") is None:
-        raise FileNotFoundError("git not found in PATH")
-
-    # If the status doesn't match, force VS to reload the solution.
-    # status = run_command(["git", "submodule", "status"], capture=True)
-    run_command(["git", "submodule", "update", "--init", "--recursive"])
-    # status2 = run_command(["git", "submodule", "status"], capture=True)
-
-    # Something changed.
-    # if status.stdout != status2.stdout:
-    #     print("Git submodules changed. Reloading solution.")
-    #     reset_solution()
-
-
-def install_hooks():
-    """
-    Installs the necessary git hooks into .git/hooks.
-    """
-
-    # Read version file.
-    if os.path.isfile("INSTALLED_HOOKS_VERSION"):
-        with open("INSTALLED_HOOKS_VERSION", "r") as f:
-            if f.read() == CURRENT_HOOKS_VERSION:
-                if not QUIET:
-                    print("No hooks change detected.")
-                return
-
-    with open("INSTALLED_HOOKS_VERSION", "w") as f:
-        f.write(CURRENT_HOOKS_VERSION)
-
-    print("Hooks need updating.")
-
-    hooks_target_dir = Path("..")/".git"/"hooks"
-    hooks_source_dir = Path("hooks")
-
-    # Clear entire tree since we need to kill deleted files too.
-    for filename in os.listdir(str(hooks_target_dir)):
-        os.remove(str(hooks_target_dir/filename))
-
-    for filename in os.listdir(str(hooks_source_dir)):
-        print("Copying hook {}".format(filename))
-        shutil.copy2(str(hooks_source_dir/filename),
-                        str(hooks_target_dir/filename))
-
-
-def reset_solution():
-    """
-    Force VS to think the solution has been changed to prompt the user to reload it, thus fixing any load errors.
-    """
-
-    with SOLUTION_PATH.open("r") as f:
-        content = f.read()
-
-    with SOLUTION_PATH.open("w") as f:
-        f.write(content)
-
-
-if __name__ == '__main__':
-    install_hooks()
-    update_submodules()
diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout
deleted file mode 100755
index c5662445c2..0000000000
--- a/BuildChecker/hooks/post-checkout
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-gitroot=`git rev-parse --show-toplevel`
-
-cd "$gitroot/BuildChecker"
-
-if [[ `uname` == MINGW* || `uname` == CYGWIN* ]]; then
-    # Windows
-    py -3 git_helper.py --quiet
-else
-    # Not Windows, so probably some other Unix thing.
-    python3 git_helper.py --quiet
-fi
diff --git a/BuildChecker/hooks/post-merge b/BuildChecker/hooks/post-merge
deleted file mode 100755
index 85fe61d966..0000000000
--- a/BuildChecker/hooks/post-merge
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Just call post-checkout since it does the same thing.
-gitroot=`git rev-parse --show-toplevel`
-bash "$gitroot/.git/hooks/post-checkout"
diff --git a/Content.Client/Gameplay/GameplayState.cs b/Content.Client/Gameplay/GameplayState.cs
index 1efee978f3..2ea16521e8 100644
--- a/Content.Client/Gameplay/GameplayState.cs
+++ b/Content.Client/Gameplay/GameplayState.cs
@@ -93,17 +93,17 @@ private void LoadMainScreen()
             var screenTypeString = _configurationManager.GetCVar(CCVars.UILayout);
             if (!Enum.TryParse(screenTypeString, out ScreenType screenType))
             {
-                screenType = default;
+                screenType = ScreenType.Separated;
             }
 
             switch (screenType)
             {
-                case ScreenType.Default:
-                    _uiManager.LoadScreen<DefaultGameScreen>();
-                    break;
                 case ScreenType.Separated:
                     _uiManager.LoadScreen<SeparatedChatGameScreen>();
                     break;
+                case ScreenType.Overlay:
+                    _uiManager.LoadScreen<OverlayChatGameScreen>();
+                    break;
             }
 
             _loadController.LoadScreen();
diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
similarity index 96%
rename from Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
rename to Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
index 54aeffe72c..4ba820b339 100644
--- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
+++ b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
@@ -1,4 +1,4 @@
-<screens:DefaultGameScreen
+<screens:OverlayChatGameScreen
     xmlns="https://spacestation14.io"
     xmlns:screens="clr-namespace:Content.Client.UserInterface.Screens"
     xmlns:menuBar="clr-namespace:Content.Client.UserInterface.Systems.MenuBar.Widgets"
@@ -30,4 +30,4 @@
     <hotbar:HotbarGui Name="Hotbar" Access="Protected" />
     <chat:ResizableChatBox Name="Chat" Access="Protected" />
     <alerts:AlertsUI Name="Alerts" Access="Protected" />
-</screens:DefaultGameScreen>
+</screens:OverlayChatGameScreen>
diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs
similarity index 94%
rename from Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
rename to Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs
index 0fb1b7d507..c45ec9d4a0 100644
--- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs
@@ -6,9 +6,9 @@
 namespace Content.Client.UserInterface.Screens;
 
 [GenerateTypedNameReferences]
-public sealed partial class DefaultGameScreen : InGameScreen
+public sealed partial class OverlayChatGameScreen : InGameScreen
 {
-    public DefaultGameScreen()
+    public OverlayChatGameScreen()
     {
         RobustXamlLoader.Load(this);
 
diff --git a/Content.Client/UserInterface/Screens/ScreenType.cs b/Content.Client/UserInterface/Screens/ScreenType.cs
index 595dc79556..039cd7b128 100644
--- a/Content.Client/UserInterface/Screens/ScreenType.cs
+++ b/Content.Client/UserInterface/Screens/ScreenType.cs
@@ -3,11 +3,11 @@ namespace Content.Client.UserInterface.Screens;
 public enum ScreenType
 {
     /// <summary>
-    ///     The modern SS14 user interface.
+    ///     The classic SS13 user interface.
     /// </summary>
-    Default,
+    Separated,
     /// <summary>
-    ///     The classic SS13 user interface.
+    ///     The temporary SS14 user interface.
     /// </summary>
-    Separated
+    Overlay,
 }
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 79c1909eba..ecc57561cd 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -263,16 +263,16 @@ public void SetMainChat(bool setting)
 
         switch (UIManager.ActiveScreen)
         {
-            case DefaultGameScreen defaultScreen:
-                chatBox = defaultScreen.ChatBox;
-                chatSizeRaw = _config.GetCVar(CCVars.DefaultScreenChatSize);
-                SetChatSizing(chatSizeRaw, defaultScreen, setting);
-                break;
             case SeparatedChatGameScreen separatedScreen:
                 chatBox = separatedScreen.ChatBox;
                 chatSizeRaw = _config.GetCVar(CCVars.SeparatedScreenChatSize);
                 SetChatSizing(chatSizeRaw, separatedScreen, setting);
                 break;
+            case OverlayChatGameScreen overlayScreen:
+                chatBox = overlayScreen.ChatBox;
+                chatSizeRaw = _config.GetCVar(CCVars.OverlayScreenChatSize);
+                SetChatSizing(chatSizeRaw, overlayScreen, setting);
+                break;
             default:
                 // this could be better?
                 var maybeChat = UIManager.ActiveScreen.GetWidget<ChatBox>();
@@ -321,12 +321,12 @@ private void StoreChatSize(Vector2 size)
             $"{size.X.ToString(CultureInfo.InvariantCulture)},{size.Y.ToString(CultureInfo.InvariantCulture)}";
         switch (UIManager.ActiveScreen)
         {
-            case DefaultGameScreen _:
-                _config.SetCVar(CCVars.DefaultScreenChatSize, stringSize);
-                break;
             case SeparatedChatGameScreen _:
                 _config.SetCVar(CCVars.SeparatedScreenChatSize, stringSize);
                 break;
+            case OverlayChatGameScreen _:
+                _config.SetCVar(CCVars.OverlayScreenChatSize, stringSize);
+                break;
             default:
                 // do nothing
                 return;
diff --git a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
index 52d0348b79..ac37cebfa9 100644
--- a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
+++ b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
@@ -23,12 +23,12 @@ private void OnScreenLoad()
     {
         switch (UIManager.ActiveScreen)
         {
-            case DefaultGameScreen game:
-                _votes.SetPopupContainer(game.VoteMenu);
-                break;
             case SeparatedChatGameScreen separated:
                 _votes.SetPopupContainer(separated.VoteMenu);
                 break;
+            case OverlayChatGameScreen overlay:
+                _votes.SetPopupContainer(overlay.VoteMenu);
+                break;
         }
     }
 
diff --git a/Content.Server/Cargo/Components/CargoPalletComponent.cs b/Content.Server/Cargo/Components/CargoPalletComponent.cs
index ebf0be93e0..cdfd0a3874 100644
--- a/Content.Server/Cargo/Components/CargoPalletComponent.cs
+++ b/Content.Server/Cargo/Components/CargoPalletComponent.cs
@@ -1,7 +1,26 @@
 namespace Content.Server.Cargo.Components;
+using Content.Shared.Actions;
+using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
 /// <summary>
 /// Any entities intersecting when a shuttle is recalled will be sold.
 /// </summary>
+
+[Flags]
+public enum BuySellType : byte
+{
+    Buy = 1 << 0,
+    Sell = 1 << 1,
+    All = Buy | Sell
+}
+
+
 [RegisterComponent]
-public sealed partial class CargoPalletComponent : Component {}
+public sealed partial class CargoPalletComponent : Component
+{
+    /// <summary>
+    /// Whether the pad is a buy pad, a sell pad, or all.
+    /// </summary>
+    [DataField]
+    public BuySellType PalletType;
+}
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index ebe66ff029..d8b55a7237 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -205,7 +205,7 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
             // Try to fulfill from any station where possible, if the pad is not occupied.
             foreach (var trade in _listEnts)
             {
-                var tradePads = GetCargoPallets(trade);
+                var tradePads = GetCargoPallets(trade, BuySellType.Buy);
                 _random.Shuffle(tradePads);
 
                 var freePads = GetFreeCargoPallets(trade, tradePads);
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
index 3e39440da5..b8a491f4e8 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
@@ -198,13 +198,16 @@ private List<CargoOrderData> GetProjectedOrders(
     /// </summary>
     private int GetCargoSpace(EntityUid gridUid)
     {
-        var space = GetCargoPallets(gridUid).Count;
+        var space = GetCargoPallets(gridUid, BuySellType.Buy).Count;
         return space;
     }
 
-    private List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent PalletXform)> GetCargoPallets(EntityUid gridUid)
+    /// GetCargoPallets(gridUid, BuySellType.Sell) to return only Sell pads
+    /// GetCargoPallets(gridUid, BuySellType.Buy) to return only Buy pads
+    private List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent PalletXform)> GetCargoPallets(EntityUid gridUid, BuySellType requestType = BuySellType.All)
     {
         _pads.Clear();
+
         var query = AllEntityQuery<CargoPalletComponent, TransformComponent>();
 
         while (query.MoveNext(out var uid, out var comp, out var compXform))
@@ -215,7 +218,13 @@ private int GetCargoSpace(EntityUid gridUid)
                 continue;
             }
 
+            if ((requestType & comp.PalletType) == 0)
+            {
+                continue;
+            }
+
             _pads.Add((uid, comp, compXform));
+
         }
 
         return _pads;
@@ -275,7 +284,7 @@ private void GetPalletGoods(EntityUid gridUid, out HashSet<EntityUid> toSell, ou
         amount = 0;
         toSell = new HashSet<EntityUid>();
 
-        foreach (var (palletUid, _, _) in GetCargoPallets(gridUid))
+        foreach (var (palletUid, _, _) in GetCargoPallets(gridUid, BuySellType.Sell))
         {
             // Containers should already get the sell price of their children so can skip those.
             _setEnts.Clear();
diff --git a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
index 169daca07a..202d03bcda 100644
--- a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
+++ b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
@@ -25,7 +25,7 @@ public void InitializeEnsnaring()
     {
         SubscribeLocalEvent<EnsnaringComponent, ComponentRemove>(OnComponentRemove);
         SubscribeLocalEvent<EnsnaringComponent, StepTriggerAttemptEvent>(AttemptStepTrigger);
-        SubscribeLocalEvent<EnsnaringComponent, StepTriggeredEvent>(OnStepTrigger);
+        SubscribeLocalEvent<EnsnaringComponent, StepTriggeredOffEvent>(OnStepTrigger);
         SubscribeLocalEvent<EnsnaringComponent, ThrowDoHitEvent>(OnThrowHit);
         SubscribeLocalEvent<EnsnaringComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
     }
@@ -49,7 +49,7 @@ private void AttemptStepTrigger(EntityUid uid, EnsnaringComponent component, ref
         args.Continue = true;
     }
 
-    private void OnStepTrigger(EntityUid uid, EnsnaringComponent component, ref StepTriggeredEvent args)
+    private void OnStepTrigger(EntityUid uid, EnsnaringComponent component, ref StepTriggeredOffEvent args)
     {
         TryEnsnare(args.Tripper, uid, component);
     }
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index 9b9a042641..e24de5a2f6 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -88,7 +88,7 @@ public override void Initialize()
             SubscribeLocalEvent<TriggerOnCollideComponent, StartCollideEvent>(OnTriggerCollide);
             SubscribeLocalEvent<TriggerOnActivateComponent, ActivateInWorldEvent>(OnActivate);
             SubscribeLocalEvent<TriggerImplantActionComponent, ActivateImplantEvent>(OnImplantTrigger);
-            SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredEvent>(OnStepTriggered);
+            SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredOffEvent>(OnStepTriggered);
             SubscribeLocalEvent<TriggerOnSlipComponent, SlipEvent>(OnSlipTriggered);
             SubscribeLocalEvent<TriggerWhenEmptyComponent, OnEmptyGunShotEvent>(OnEmptyTriggered);
 
@@ -228,7 +228,7 @@ private void OnImplantTrigger(EntityUid uid, TriggerImplantActionComponent compo
             args.Handled = Trigger(uid);
         }
 
-        private void OnStepTriggered(EntityUid uid, TriggerOnStepTriggerComponent component, ref StepTriggeredEvent args)
+        private void OnStepTriggered(EntityUid uid, TriggerOnStepTriggerComponent component, ref StepTriggeredOffEvent args)
         {
             Trigger(uid, args.Tripper);
         }
diff --git a/Content.Server/LandMines/LandMineComponent.cs b/Content.Server/LandMines/LandMineComponent.cs
index 63e1e4b99f..1c4ba06691 100644
--- a/Content.Server/LandMines/LandMineComponent.cs
+++ b/Content.Server/LandMines/LandMineComponent.cs
@@ -1,6 +1,13 @@
-namespace Content.Server.LandMines;
+using Robust.Shared.Audio;
+
+namespace Content.Server.LandMines;
 
 [RegisterComponent]
 public sealed partial class LandMineComponent : Component
 {
+    /// <summary>
+    /// Trigger sound effect when stepping onto landmine
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public SoundSpecifier? Sound;
 }
diff --git a/Content.Server/LandMines/LandMineSystem.cs b/Content.Server/LandMines/LandMineSystem.cs
index 78c48ef99e..22dedb9337 100644
--- a/Content.Server/LandMines/LandMineSystem.cs
+++ b/Content.Server/LandMines/LandMineSystem.cs
@@ -1,43 +1,43 @@
-using Content.Server.Explosion.EntitySystems;
+using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Popups;
-using Content.Shared.StepTrigger;
 using Content.Shared.StepTrigger.Systems;
-using Robust.Shared.Player;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.LandMines;
 
 public sealed class LandMineSystem : EntitySystem
 {
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly TriggerSystem _trigger = default!;
 
-
     public override void Initialize()
     {
-        SubscribeLocalEvent<LandMineComponent, StepTriggeredEvent>(HandleTriggered);
-        SubscribeLocalEvent<LandMineComponent, StepTriggerAttemptEvent>(HandleTriggerAttempt);
+        SubscribeLocalEvent<LandMineComponent, StepTriggeredOnEvent>(HandleStepOnTriggered);
+        SubscribeLocalEvent<LandMineComponent, StepTriggeredOffEvent>(HandleStepOffTriggered);
+
+        SubscribeLocalEvent<LandMineComponent, StepTriggerAttemptEvent>(HandleStepTriggerAttempt);
     }
 
-    private static void HandleTriggerAttempt(
-        EntityUid uid,
-        LandMineComponent component,
-        ref StepTriggerAttemptEvent args)
+    private void HandleStepOnTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOnEvent args)
     {
-        args.Continue = true;
+        _popupSystem.PopupCoordinates(
+            Loc.GetString("land-mine-triggered", ("mine", uid)),
+            Transform(uid).Coordinates,
+            args.Tripper,
+            PopupType.LargeCaution);
+
+        _audioSystem.PlayPvs(component.Sound, uid);
     }
 
-    private void HandleTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredEvent args)
+    private void HandleStepOffTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOffEvent args)
     {
-        // This doesn't use TriggerOnStepTrigger since we don't want to display the popup if nothing happens
-        // and I didn't feel like making an `AfterTrigger` event
-        if (_trigger.Trigger(uid, args.Tripper))
-        {
-            _popupSystem.PopupCoordinates(
-                Loc.GetString("land-mine-triggered", ("mine", uid)),
-                Transform(uid).Coordinates,
-                args.Tripper,
-                PopupType.LargeCaution);
-        }
+        _trigger.Trigger(uid, args.Tripper);
     }
-}
 
+    private static void HandleStepTriggerAttempt(EntityUid uid, LandMineComponent component, ref StepTriggerAttemptEvent args)
+    {
+        args.Continue = true;
+    }
+}
diff --git a/Content.Server/Tiles/LavaSystem.cs b/Content.Server/Tiles/LavaSystem.cs
index 7aee0b6501..51bd6f8475 100644
--- a/Content.Server/Tiles/LavaSystem.cs
+++ b/Content.Server/Tiles/LavaSystem.cs
@@ -11,7 +11,7 @@ public sealed class LavaSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<LavaComponent, StepTriggeredEvent>(OnLavaStepTriggered);
+        SubscribeLocalEvent<LavaComponent, StepTriggeredOffEvent>(OnLavaStepTriggered);
         SubscribeLocalEvent<LavaComponent, StepTriggerAttemptEvent>(OnLavaStepTriggerAttempt);
     }
 
@@ -23,7 +23,7 @@ private void OnLavaStepTriggerAttempt(EntityUid uid, LavaComponent component, re
         args.Continue = true;
     }
 
-    private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredEvent args)
+    private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredOffEvent args)
     {
         var otherUid = args.Tripper;
 
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index f8943a9bf9..891c790d52 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1596,10 +1596,10 @@ public static readonly CVarDef<int>
          */
 
         public static readonly CVarDef<string> UILayout =
-            CVarDef.Create("ui.layout", "Default", CVar.CLIENTONLY | CVar.ARCHIVE);
+            CVarDef.Create("ui.layout", "Separated", CVar.CLIENTONLY | CVar.ARCHIVE);
 
-        public static readonly CVarDef<string> DefaultScreenChatSize =
-            CVarDef.Create("ui.default_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE);
+        public static readonly CVarDef<string> OverlayScreenChatSize =
+            CVarDef.Create("ui.overlay_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE);
 
         public static readonly CVarDef<string> SeparatedScreenChatSize =
             CVarDef.Create("ui.separated_chat_size", "0.6,0", CVar.CLIENTONLY | CVar.ARCHIVE);
diff --git a/Content.Shared/Chasm/ChasmSystem.cs b/Content.Shared/Chasm/ChasmSystem.cs
index 51299557db..86b8d4fc4d 100644
--- a/Content.Shared/Chasm/ChasmSystem.cs
+++ b/Content.Shared/Chasm/ChasmSystem.cs
@@ -24,7 +24,7 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<ChasmComponent, StepTriggeredEvent>(OnStepTriggered);
+        SubscribeLocalEvent<ChasmComponent, StepTriggeredOffEvent>(OnStepTriggered);
         SubscribeLocalEvent<ChasmComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
         SubscribeLocalEvent<ChasmFallingComponent, UpdateCanMoveEvent>(OnUpdateCanMove);
     }
@@ -47,7 +47,7 @@ public override void Update(float frameTime)
         }
     }
 
-    private void OnStepTriggered(EntityUid uid, ChasmComponent component, ref StepTriggeredEvent args)
+    private void OnStepTriggered(EntityUid uid, ChasmComponent component, ref StepTriggeredOffEvent args)
     {
         // already doomed
         if (HasComp<ChasmFallingComponent>(args.Tripper))
diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
index a0feab7052..813a18f974 100644
--- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
+++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class MovementSpeedModifierComponent : Component
         // Weightless
         public const float DefaultMinimumFrictionSpeed = 0.005f;
         public const float DefaultWeightlessFriction = 1f;
-        public const float DefaultWeightlessFrictionNoInput = 0.2f;
+        public const float DefaultWeightlessFrictionNoInput = 0f;
         public const float DefaultWeightlessModifier = 0.7f;
         public const float DefaultWeightlessAcceleration = 1f;
 
diff --git a/Content.Shared/Physics/FrictionRemoverSystem.cs b/Content.Shared/Physics/FrictionRemoverSystem.cs
new file mode 100644
index 0000000000..65bbe9e4d2
--- /dev/null
+++ b/Content.Shared/Physics/FrictionRemoverSystem.cs
@@ -0,0 +1,25 @@
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Systems;
+
+namespace Content.Shared.Physics;
+
+public sealed class FrictionRemoverSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PhysicsComponent, PhysicsSleepEvent>(RemoveDampening);
+    }
+
+
+    private void RemoveDampening(EntityUid uid, PhysicsComponent component, PhysicsSleepEvent args)
+    {
+        _physics.SetAngularDamping(uid, component, 0f, false);
+        _physics.SetLinearDamping(uid, component, 0f);
+    }
+}
diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs
index d20495cfa6..ff8b597a0d 100644
--- a/Content.Shared/Slippery/SlipperySystem.cs
+++ b/Content.Shared/Slippery/SlipperySystem.cs
@@ -31,14 +31,14 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<SlipperyComponent, StepTriggerAttemptEvent>(HandleAttemptCollide);
-        SubscribeLocalEvent<SlipperyComponent, StepTriggeredEvent>(HandleStepTrigger);
+        SubscribeLocalEvent<SlipperyComponent, StepTriggeredOffEvent>(HandleStepTrigger);
         SubscribeLocalEvent<NoSlipComponent, SlipAttemptEvent>(OnNoSlipAttempt);
         SubscribeLocalEvent<ThrownItemComponent, SlipCausingAttemptEvent>(OnThrownSlipAttempt);
         // as long as slip-resistant mice are never added, this should be fine (otherwise a mouse-hat will transfer it's power to the wearer).
         SubscribeLocalEvent<NoSlipComponent, InventoryRelayedEvent<SlipAttemptEvent>>((e, c, ev) => OnNoSlipAttempt(e, c, ev.Args));
     }
 
-    private void HandleStepTrigger(EntityUid uid, SlipperyComponent component, ref StepTriggeredEvent args)
+    private void HandleStepTrigger(EntityUid uid, SlipperyComponent component, ref StepTriggeredOffEvent args)
     {
         TrySlip(uid, component, args.Tripper);
     }
diff --git a/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs b/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
index f4731bf46a..b8483d021a 100644
--- a/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
+++ b/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
@@ -49,8 +49,14 @@ public sealed partial class StepTriggerComponent : Component
     ///     If this is true, steptrigger will still occur on entities that are in air / weightless. They do not
     ///     by default.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool IgnoreWeightless;
+
+    /// <summary>
+    /// Does this have separate "StepOn" and "StepOff" triggers.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool StepOn = false;
 }
 
 [RegisterComponent]
diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
index ede39b2aa9..b4ac2cde75 100644
--- a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
+++ b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
@@ -11,6 +11,7 @@ public sealed class StepTriggerSystem : EntitySystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly SharedGravitySystem _gravity = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
 
     public override void Initialize()
     {
@@ -40,7 +41,9 @@ public override void Update(float frameTime)
         while (enumerator.MoveNext(out var uid, out var active, out var trigger, out var transform))
         {
             if (!Update(uid, trigger, transform, query))
+            {
                 continue;
+            }
 
             RemCompDeferred(uid, active);
         }
@@ -56,7 +59,8 @@ private bool Update(EntityUid uid, StepTriggerComponent component, TransformComp
 
         if (component.Blacklist != null && TryComp<MapGridComponent>(transform.GridUid, out var grid))
         {
-            var anch = grid.GetAnchoredEntitiesEnumerator(grid.LocalToTile(transform.Coordinates));
+            var positon = _map.LocalToTile(uid, grid, transform.Coordinates);
+            var anch = _map.GetAnchoredEntitiesEnumerator(uid, grid, positon);
 
             while (anch.MoveNext(out var ent))
             {
@@ -109,8 +113,16 @@ private void UpdateColliding(EntityUid uid, StepTriggerComponent component, Tran
             return;
         }
 
-        var ev = new StepTriggeredEvent { Source = uid, Tripper = otherUid };
-        RaiseLocalEvent(uid, ref ev, true);
+        if (component.StepOn)
+        {
+            var evStep = new StepTriggeredOnEvent(uid, otherUid);
+            RaiseLocalEvent(uid, ref evStep);
+        }
+        else
+        {
+            var evStep = new StepTriggeredOffEvent(uid, otherUid);
+            RaiseLocalEvent(uid, ref evStep);
+        }
 
         component.CurrentlySteppedOn.Add(otherUid);
         Dirty(uid, component);
@@ -130,7 +142,7 @@ private bool CanTrigger(EntityUid uid, EntityUid otherUid, StepTriggerComponent
 
         var msg = new StepTriggerAttemptEvent { Source = uid, Tripper = otherUid };
 
-        RaiseLocalEvent(uid, ref msg, true);
+        RaiseLocalEvent(uid, ref msg);
 
         return msg.Continue && !msg.Cancelled;
     }
@@ -163,6 +175,12 @@ private void OnEndCollide(EntityUid uid, StepTriggerComponent component, ref End
         component.CurrentlySteppedOn.Remove(otherUid);
         Dirty(uid, component);
 
+        if (component.StepOn)
+        {
+            var evStepOff = new StepTriggeredOffEvent(uid, otherUid);
+            RaiseLocalEvent(uid, ref evStepOff);
+        }
+
         if (component.Colliding.Count == 0)
         {
             RemCompDeferred<StepTriggerActiveComponent>(uid);
@@ -230,9 +248,14 @@ public struct StepTriggerAttemptEvent
     public bool Cancelled;
 }
 
+/// <summary>
+/// Raised when an entity stands on a steptrigger initially (assuming it has both on and off states).
+/// </summary>
 [ByRefEvent]
-public struct StepTriggeredEvent
-{
-    public EntityUid Source;
-    public EntityUid Tripper;
-}
+public readonly record struct StepTriggeredOnEvent(EntityUid Source, EntityUid Tripper);
+
+/// <summary>
+/// Raised when an entity leaves a steptrigger if it has on and off states OR when an entity intersects a steptrigger.
+/// </summary>
+[ByRefEvent]
+public readonly record struct StepTriggeredOffEvent(EntityUid Source, EntityUid Tripper);
diff --git a/LEGAL.md b/LEGAL.md
index 2df3c39add..34cd4009d5 100644
--- a/LEGAL.md
+++ b/LEGAL.md
@@ -6,9 +6,9 @@ The Authors retain all copyright to their respective work submitted here.
 
 ## Code license
 
-Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated. See [LICENSE-AGPLv3](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-AGPLv3.txt).
+Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated. See [LICENSE-AGPLv3](./LICENSE-AGPLv3.txt).
 
-Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license unless otherwise stated. See [LICENSE-MIT](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-MIT.txt).
+Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license unless otherwise stated. See [LICENSE-MIT](./LICENSE-MIT.txt).
 
 [87c70a89a67d0521a56388e6b1c3f2cb947943e4](https://github.com/Simple-Station/Einstein-Engines/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4) was pushed on February 17th 2024 at 21:48 UTC
 
diff --git a/README.md b/README.md
index 3dbe1910e2..f102318611 100644
--- a/README.md
+++ b/README.md
@@ -41,27 +41,24 @@ We provide some scripts shown below to make the job easier.
 ### Build dependencies
 
 > - Git
-> - DOTNET SDK 7.0 or higher
-> - python 3.7 or higher
+> - .NET SDK 8.0.100
 
 
 ### Windows
 
 > 1. Clone this repository
-> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal
-> 3. Run the `Scripts/bat/run1buildDebug.bat`
-> 4. Run the `Scripts/bat/run2configDev.bat` if you need other configurations run other config scripts
-> 5. Run both the `Scripts/bat/run3server.bat` and `Scripts/bat/run4client.bat`
-> 6. Connect to localhost and play
+> 2. Run `git submodule update --init --recursive` in a terminal to download the engine
+> 3. Run `Scripts/bat/buildAllDebug.bat` after making any changes to the source
+> 4. Run `Scripts/bat/runQuickAll.bat` to launch the client and the server
+> 5. Connect to localhost in the client and play
 
 ### Linux
 
 > 1. Clone this repository
-> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal
-> 3. Run the `Scripts/sh/run1buildDebug.sh`
-> 4. Run the `Scripts/sh/run2configDev.sh` if you need other configurations run other config scripts
-> 5. Run both the `Scripts/sh/run3server.bat` and `scripts/sh/run4client.sh`
-> 6. Connect to localhost and play
+> 2. Run `git submodule update --init --recursive` in a terminal to download the engine
+> 3. Run `Scripts/bat/buildAllDebug.sh` after making any changes to the source
+> 4. Run `Scripts/bat/runQuickAll.sh` to launch the client and the server
+> 5. Connect to localhost in the client and play
 
 ### MacOS
 
@@ -70,12 +67,12 @@ We provide some scripts shown below to make the job easier.
 ## License
 
 Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 (`17 February 2024 23:00:00 UTC`) is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated.
-See [LICENSE-AGPLv3](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-AGPLv3.txt).
+See [LICENSE-AGPLv3](./LICENSE-AGPLv3.txt).
 
 Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 (`17 February 2024 23:00:00 UTC`) is licensed under the MIT license unless otherwise stated.
-See [LICENSE-MIT](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-MIT.txt).
+See [LICENSE-MIT](./LICENSE-MIT.txt).
 
 Most assets are licensed under [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) unless stated otherwise. Assets have their license and the copyright in the metadata file.
-[Example](https://github.com/Simple-Station/Einstein-Engines/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).
+[Example](./Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).
 
 Note that some assets are licensed under the non-commercial [CC-BY-NC-SA 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/) or similar non-commercial licenses and will need to be removed if you wish to use this project commercially.
diff --git a/RUN_THIS.py b/RUN_THIS.py
deleted file mode 100755
index 6ea9f8e707..0000000000
--- a/RUN_THIS.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python3
-
-# Import future so people on py2 still get the clear error that they need to upgrade.
-from __future__ import print_function
-import sys
-import subprocess
-
-version = sys.version_info
-if version.major < 3 or (version.major == 3 and version.minor < 5):
-    print("ERROR: You need at least Python 3.5 to build SS14.")
-    sys.exit(1)
-
-subprocess.run([sys.executable, "git_helper.py"], cwd="BuildChecker")
diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index 90445a31d1..6f18510d17 100644
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -226,3 +226,8 @@
   copyright: TGStation at 3df5d3b42bfb6b3b5adba1067ab41f83816255bb
   license: CC-BY-SA-3.0
   source: https://github.com/tgstation/tgstation/blob/3df5d3b42bfb6b3b5adba1067ab41f83816255bb/sound/misc/server-ready.ogg
+
+- files: [beep_landmine.ogg]
+  copyright: '"beep_landmine.ogg" by kaktuscsc of Discord for SS14'
+  license: "CC-BY-SA-3.0"
+  source: https://github.com/YuriyKiss/space-station-14/commit/971a135a9c83aed46e967aac9302ab5b35562b5f
diff --git a/Resources/Audio/Effects/beep_landmine.ogg b/Resources/Audio/Effects/beep_landmine.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..48bc5e21d962084a1db41c473f30892d914894ae
GIT binary patch
literal 6034
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
Bu4e!M

literal 0
HcmV?d00001

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 743c0add32..7fcb7aac22 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4051,7 +4051,7 @@ Entries:
     - type: Add
       message: >-
         Glass/Crystal shards and floor tiles now deal damage and embed in
-        victims when colliding with them. 
+        victims when colliding with them.
   id: 6107
   time: '2024-05-11T01:23:00.0000000+00:00'
 - author: FoxxoTrystan
@@ -4142,3 +4142,45 @@ Entries:
       message: Floors Looks Updated/Resprited.
   id: 6118
   time: '2024-06-03T19:23:51.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Add
+      message: All species can now bring their own cultures and languages
+  id: 6119
+  time: '2024-06-10T20:48:48.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Tweak
+      message: Rust Walls Sprites.
+    - type: Tweak
+      message: Armor, Bulletproof, Riot Suit Resprites.
+    - type: Tweak
+      message: New Banners Sprites.
+    - type: Tweak
+      message: Stunbaton, Fire Extinguisher New Sprites.
+    - type: Tweak
+      message: Rack/WallScreen resprites.
+    - type: Tweak
+      message: Stock Parts new sprites!
+    - type: Tweak
+      message: Radiation Collector has now a new sprite!
+  id: 6120
+  time: '2024-06-11T00:34:02.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Tweak
+      message: >-
+        UI layout now defaults to separated, the old one is still available in
+        settings
+  id: 6121
+  time: '2024-06-16T22:38:10.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Tweak
+      message: Space has suddenly become less dense (objects don't slow down in space)
+    - type: Remove
+      message: Moths are unable to move in space
+    - type: Tweak
+      message: Moths have way better control in zero gravity environments
+  id: 6122
+  time: '2024-06-17T07:58:34.0000000+00:00'
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 8c54ecb084..03d5059e95 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml
index a10f070bd2..f040d58253 100644
--- a/Resources/Maps/Shuttles/trading_outpost.yml
+++ b/Resources/Maps/Shuttles/trading_outpost.yml
@@ -3,20 +3,20 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  29: FloorDark
-  34: FloorDarkMono
-  37: FloorDarkPavementVertical
-  49: FloorGrassJungle
-  64: FloorMetalDiamond
-  77: FloorReinforced
-  89: FloorSteel
-  100: FloorSteelMono
-  104: FloorTechMaint
-  105: FloorTechMaint2
-  118: FloorWood
-  119: FloorWoodTile
-  120: Lattice
-  121: Plating
+  31: FloorDark
+  36: FloorDarkMono
+  39: FloorDarkPavementVertical
+  51: FloorGrassJungle
+  66: FloorMetalDiamond
+  79: FloorReinforced
+  93: FloorSteel
+  104: FloorSteelMono
+  108: FloorTechMaint
+  109: FloorTechMaint2
+  122: FloorWood
+  124: FloorWoodTile
+  125: Lattice
+  126: Plating
 entities:
 - proto: ""
   entities:
@@ -31,27 +31,27 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: WQAAAAABWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAADWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAIgAAAAABJQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAABIgAAAAAAIgAAAAAAIgAAAAACIgAAAAABIgAAAAAAIgAAAAAAIgAAAAABIgAAAAACeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdwAAAAABdwAAAAADdwAAAAACMQAAAAAAMQAAAAAAMQAAAAAAdwAAAAADdwAAAAABdwAAAAABdgAAAAACeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAADdwAAAAABdwAAAAADdwAAAAADdgAAAAADdgAAAAACdgAAAAADdwAAAAAAdwAAAAABdwAAAAAAdgAAAAACIgAAAAADJQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdgAAAAABdgAAAAACdgAAAAABdgAAAAAAdgAAAAACdgAAAAAAdgAAAAAAdgAAAAABdgAAAAADdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAABXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAJAAAAAABJwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAAAJAAAAAABJAAAAAAAJAAAAAAAJAAAAAACJAAAAAABJAAAAAAAJAAAAAAAJAAAAAABJAAAAAACfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAfAAAAAABfAAAAAADfAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAfAAAAAADfAAAAAABfAAAAAABegAAAAACfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAegAAAAADfAAAAAABfAAAAAADfAAAAAADegAAAAADegAAAAACegAAAAADfAAAAAAAfAAAAAABfAAAAAAAegAAAAACJAAAAAADJwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAABegAAAAACegAAAAABegAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: eQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAIgAAAAABIgAAAAABHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAABIgAAAAACIgAAAAAAIgAAAAAAIgAAAAABIgAAAAABIgAAAAACIgAAAAAAIgAAAAACeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAAAWQAAAAACWQAAAAABWQAAAAABeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAADWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAACZAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAWQAAAAABaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAAAZAAAAAACeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAWQAAAAAAaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAABZAAAAAACeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAADTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAACTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAACWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADZAAAAAADeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAAAJAAAAAAAJAAAAAABJAAAAAABJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAADXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAACaAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAXQAAAAABbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAAAaAAAAAACfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAXQAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAABaAAAAAACfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAADTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAACXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADaAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJQAAAAACIgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJQAAAAADIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJwAAAAACJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJwAAAAADJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAA
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAIgAAAAABIgAAAAACHQAAAAACHQAAAAADHQAAAAABHQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAHQAAAAABHQAAAAACHQAAAAABIgAAAAADIgAAAAADHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAJAAAAAABJAAAAAACHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAABJAAAAAADJAAAAAADHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -1889,276 +1889,303 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-17.5
       parent: 2
-- proto: CargoPallet
+- proto: CargoPalletBuy
   entities:
-  - uid: 20
-    components:
-    - type: Transform
-      pos: 7.5,0.5
-      parent: 2
   - uid: 21
     components:
     - type: Transform
-      pos: 8.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-9.5
       parent: 2
   - uid: 24
     components:
     - type: Transform
-      pos: 8.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-9.5
       parent: 2
   - uid: 25
     components:
     - type: Transform
-      pos: 7.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-8.5
       parent: 2
   - uid: 26
     components:
     - type: Transform
-      pos: 7.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-8.5
       parent: 2
   - uid: 27
     components:
     - type: Transform
-      pos: 8.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-7.5
       parent: 2
   - uid: 30
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 6.5,0.5
-      parent: 2
-  - uid: 32
-    components:
-    - type: Transform
       pos: 2.5,-7.5
       parent: 2
-  - uid: 34
+  - uid: 32
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 7.5,-7.5
+      pos: 4.5,-9.5
       parent: 2
   - uid: 35
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-0.5
       parent: 2
   - uid: 36
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-0.5
       parent: 2
   - uid: 37
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 8.5,-9.5
+      pos: 4.5,-7.5
       parent: 2
   - uid: 39
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-2.5
       parent: 2
   - uid: 41
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-1.5
       parent: 2
   - uid: 42
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-1.5
       parent: 2
   - uid: 43
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-2.5
       parent: 2
   - uid: 44
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-1.5
       parent: 2
-  - uid: 45
+  - uid: 47
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,0.5
       parent: 2
-  - uid: 46
+  - uid: 49
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-0.5
       parent: 2
-  - uid: 47
+  - uid: 50
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-2.5
       parent: 2
-  - uid: 48
+  - uid: 56
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 6.5,-7.5
+      pos: 4.5,-6.5
       parent: 2
-  - uid: 49
+  - uid: 61
     components:
     - type: Transform
-      pos: 7.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-8.5
       parent: 2
-  - uid: 50
+  - uid: 67
     components:
     - type: Transform
-      pos: 3.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-6.5
       parent: 2
-  - uid: 51
+  - uid: 71
     components:
     - type: Transform
-      pos: 3.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-6.5
       parent: 2
-  - uid: 52
+  - uid: 183
     components:
     - type: Transform
-      pos: 3.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,0.5
       parent: 2
-  - uid: 54
+  - uid: 900
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,0.5
       parent: 2
-  - uid: 55
+- proto: CargoPalletSell
+  entities:
+  - uid: 34
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 6.5,-2.5
+      pos: 4.5,-0.5
       parent: 2
-  - uid: 56
+  - uid: 45
     components:
     - type: Transform
-      pos: 3.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-7.5
       parent: 2
-  - uid: 57
+  - uid: 46
     components:
     - type: Transform
-      pos: 2.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-2.5
       parent: 2
-  - uid: 58
+  - uid: 48
     components:
     - type: Transform
-      pos: 3.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
       parent: 2
-  - uid: 59
+  - uid: 51
     components:
     - type: Transform
-      pos: 3.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-1.5
       parent: 2
-  - uid: 60
+  - uid: 52
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 6.5,-0.5
+      pos: 2.5,-2.5
       parent: 2
-  - uid: 61
+  - uid: 54
     components:
     - type: Transform
-      pos: 2.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-9.5
       parent: 2
-  - uid: 66
+  - uid: 55
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 7.5,-2.5
+      pos: 2.5,-1.5
       parent: 2
-  - uid: 67
+  - uid: 57
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-9.5
+      parent: 2
+  - uid: 58
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-2.5
+      pos: 4.5,0.5
       parent: 2
-  - uid: 68
+  - uid: 59
     components:
     - type: Transform
-      pos: 2.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-6.5
       parent: 2
-  - uid: 69
+  - uid: 60
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-7.5
       parent: 2
-  - uid: 70
+  - uid: 66
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 8.5,-2.5
+      pos: 3.5,0.5
       parent: 2
-  - uid: 71
+  - uid: 68
     components:
     - type: Transform
-      pos: 2.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-8.5
       parent: 2
-  - uid: 72
+  - uid: 69
     components:
     - type: Transform
-      pos: 2.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-8.5
       parent: 2
-  - uid: 73
+  - uid: 70
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-9.5
       parent: 2
-  - uid: 183
+  - uid: 72
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 1.5707963267948966 rad
       pos: 7.5,-6.5
       parent: 2
-  - uid: 900
+  - uid: 73
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-6.5
       parent: 2
   - uid: 901
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-6.5
+      pos: 2.5,-0.5
       parent: 2
   - uid: 903
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,0.5
+      pos: 3.5,-0.5
       parent: 2
   - uid: 907
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-7.5
       parent: 2
   - uid: 908
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-2.5
+      pos: 4.5,-1.5
       parent: 2
   - uid: 909
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-8.5
+      parent: 2
+  - uid: 960
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-7.5
+      parent: 2
+  - uid: 961
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-1.5
+      pos: 2.5,0.5
       parent: 2
 - proto: CarpetBlack
   entities:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index f3610178b9..aa4a7b50e6 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -549,9 +549,9 @@
   description: A cozy jacket with the Cybersun logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -560,9 +560,9 @@
   description: A cozy jacket with the Einstein Engines logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -571,9 +571,9 @@
   description: A cozy jacket with the Hephaestus Industries logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -582,9 +582,9 @@
   description: A cozy jacket with the Hawkmoon Acquisitions logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -593,9 +593,9 @@
   description: A cozy jacket with the Interdyne logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -604,9 +604,9 @@
   description: A cozy jacket with the Bishop Cybernetics logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -615,9 +615,9 @@
   description: A cozy jacket with the Discount Dan's logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -626,9 +626,9 @@
   description: A cozy jacket with the Five Points Armory logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -637,9 +637,9 @@
   description: A cozy jacket with the Gilthari Exports logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -648,6 +648,6 @@
   description: A cozy jacket with the Zeng-Hu Pharmaceuticals logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index 1680dd6cda..df7fad06dd 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -44,9 +44,7 @@
       Female: UnisexMoth
       Unsexed: UnisexMoth
   - type: MovementSpeedModifier
-    weightlessAcceleration: 1.5 # Move around more easily in space.
-    weightlessFriction: 1
-    weightlessModifier: 1
+    weightlessAcceleration: 2.5 # Move around more easily in space.
   - type: Flammable
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index f232bf1d34..67d7954038 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -17,7 +17,7 @@
   - type: Sprite
     state: icon
   - type: Item
-    size: Normal
+    size: Small
   - type: MeleeWeapon
     soundNoDamage:
       path: "/Audio/Effects/Fluids/splat.ogg"
@@ -39,6 +39,18 @@
   - type: TrashOnSolutionEmpty
     solution: drink
 
+- type: entity
+  parent: DrinkCartonBaseFull
+  id: DrinkCartonBaseLargeFull
+  abstract: true
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
+  - type: Item
+    size: Normal
+
 - type: entity
   id: DrinkCartonVisualsOpenable
   abstract: true
@@ -116,7 +128,7 @@
     sprite: Objects/Consumable/Drinks/cream.rsi
 
 - type: entity
-  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull]
   id: DrinkMilkCarton
   name: milk
   description: An opaque white liquid produced by the mammary glands of mammals.
@@ -124,7 +136,6 @@
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 100
         reagents:
         - ReagentId: Milk
           Quantity: 100
@@ -132,7 +143,7 @@
     sprite: Objects/Consumable/Drinks/milk.rsi
 
 - type: entity
-  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull]
   id: DrinkSoyMilkCarton
   name: soy milk
   description: White and nutritious soy goodness!
@@ -140,7 +151,6 @@
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 100
         reagents:
         - ReagentId: MilkSoy
           Quantity: 100
@@ -148,7 +158,7 @@
     sprite: Objects/Consumable/Drinks/soymilk.rsi
 
 - type: entity
-  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull]
   id: DrinkOatMilkCarton
   name: oat milk
   description: It's oat milk. Tan and nutritious goodness!
@@ -156,7 +166,6 @@
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 100
         reagents:
         - ReagentId: MilkOat
           Quantity: 100
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
index f6dd722261..86bc34f3c8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
@@ -8,6 +8,8 @@
   components:
   - type: Sprite
     state: icon
+  - type: Item
+    size: Normal
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -72,6 +74,19 @@
       Glass: 100
   - type: SpaceGarbage
 
+- type: entity
+  name: base empty bottle
+  id: DrinkBottleBaseSmallEmpty
+  parent: DrinkBottleBaseEmpty
+  abstract: true
+  components:
+  - type: Item
+    size: Small
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+
 - type: entity
   name: base empty carton
   id: DrinkCartonBaseEmpty
@@ -122,6 +137,19 @@
       Cardboard: 20
   - type: SpaceGarbage
 
+- type: entity
+  name: base empty bottle
+  id: DrinkCartonBaseLargeEmpty
+  parent: DrinkCartonBaseEmpty
+  abstract: true
+  components:
+  - type: Item
+    size: Normal
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
+
 # Containers
 - type: entity
   name: Jailbreaker Verte bottle
@@ -143,28 +171,20 @@
 
 - type: entity
   name: ale bottle
-  parent: DrinkBottleBaseEmpty
+  parent: DrinkBottleBaseSmallEmpty
   id: DrinkBottleAle
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 50
 
 
 - type: entity
   name: beer bottle
-  parent: DrinkBottleBaseEmpty
+  parent: DrinkBottleBaseSmallEmpty
   id: DrinkBottleBeer
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 50
 
 
 - type: entity
@@ -322,37 +342,24 @@
 
 - type: entity
   name: milk carton
-  parent: DrinkCartonBaseEmpty
+  parent: DrinkCartonBaseLargeEmpty
   id: DrinkCartonMilk
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/milk.rsi
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 100
-
 
 - type: entity
   name: soy milk carton
-  parent: DrinkCartonBaseEmpty
+  parent: DrinkCartonBaseLargeEmpty
   id: DrinkCartonSoyMilk
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/soymilk.rsi
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 100
 
 - type: entity
   name: oat milk carton
-  parent: DrinkCartonBaseEmpty
+  parent: DrinkCartonBaseLargeEmpty
   id: DrinkCartonOatMilk
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/oatmilk.rsi
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 100
diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
index 9088edc815..a3e3485bc6 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -35,9 +35,13 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: LandMine
-  - type: TriggerOnStepTrigger
+    sound:
+        path: /Audio/Effects/beep_landmine.ogg
+        params:
+            maxDistance: 10
   - type: StepTrigger
     requiredTriggeredSpeed: 0
+    stepOn: true
 
 - type: entity
   name: kick mine
@@ -57,7 +61,6 @@
   - type: Construction
     graph: ModularMineGraph
     node: emptyCase
-  - type: LandMine
 
 - type: entity
   name: explosive mine
@@ -71,4 +74,3 @@
     intensitySlope: 3
     totalIntensity: 120 # about a ~4 tile radius
     canCreateVacuum: false
-  - type: DeleteOnTrigger
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
index 925e036e09..c628d199a9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
@@ -21,6 +21,7 @@
         mask:
           - MachineMask
   - type: CargoPallet
+    palletType: All
   - type: StaticPrice
     price: 100
   - type: Sprite
@@ -53,3 +54,33 @@
   - type: GuideHelp
     guides:
     - Cargo
+
+- type: entity
+  id: CargoPalletSell
+  name: cargo selling pallet
+  description: Designates valid items to sell with a selling computer, or to CentCom when a shuttle is recalled.
+  parent: CargoPallet
+  components:
+  - type: CargoPallet
+    palletType: sell
+  - type: Sprite
+    drawdepth: FloorTiles
+    layers:
+    - sprite: Structures/cargo_pallets.rsi
+      state: cargo_pallet_sell
+
+
+- type: entity
+  id: CargoPalletBuy
+  name: cargo buying pallet
+  description: Designates where orders will appear when purchased.
+  parent: CargoPallet
+  components:
+  - type: CargoPallet
+    palletType: buy
+  - type: Sprite
+    drawdepth: FloorTiles
+    layers:
+    - sprite: Structures/cargo_pallets.rsi
+      state: cargo_pallet_buy
+
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 8d3c83e3e1..2ddb21b9e6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -230,6 +230,7 @@
   - type: StepTrigger
     intersectRatio: 0.2
     requiredTriggeredSpeed: 0
+    stepOn: true
   - type: CollisionWake
     enabled: false
   - type: Physics
@@ -251,6 +252,10 @@
         mask:
         - ItemMask
   - type: LandMine
+    sound:
+      path: /Audio/Effects/beep_landmine.ogg
+      params:
+        maxDistance: 10
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: HardBomb  # normally Default and max 5 total 60
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
index 85c9bdae3d..77b03d36f5 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
@@ -50,6 +50,8 @@
           MaterialCloth1:
             min: 1
             max: 2
+  - type: WallMount
+    arc: 360
         
 - type: entity
   id: HospitalCurtains
@@ -350,4 +352,4 @@
     graph: Curtains
     node: CurtainsWhiteOpen
   - type: Physics
-    canCollide: false
\ No newline at end of file
+    canCollide: false
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index 1a17b2f856..2597877187 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -731,9 +731,7 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
+  canBuildInImpassable: true
     
 - type: construction
   id: CurtainsBlack
@@ -748,9 +746,7 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked  
+  canBuildInImpassable: true
 
 - type: construction
   id: CurtainsBlue
@@ -765,9 +761,7 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked  
+  canBuildInImpassable: true
     
 - type: construction
   id: CurtainsCyan
@@ -782,9 +776,7 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
+  canBuildInImpassable: true
     
 - type: construction
   id: CurtainsGreen
@@ -799,9 +791,7 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
+  canBuildInImpassable: true
     
 - type: construction
   id: CurtainsOrange
@@ -816,9 +806,7 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
+  canBuildInImpassable: true
     
 - type: construction
   id: CurtainsPink
@@ -833,9 +821,7 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
+  canBuildInImpassable: true
     
 - type: construction
   id: CurtainsPurple
@@ -850,9 +836,7 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
+  canBuildInImpassable: true
     
 - type: construction
   id: CurtainsRed
@@ -867,9 +851,7 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked    
+  canBuildInImpassable: true
 
 - type: construction
   id: CurtainsWhite
@@ -884,9 +866,7 @@
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
+  canBuildInImpassable: true
 
 - type: construction
   id: Bookshelf
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 5eadcdc1c1ab3fbd2bf67c5055286b407e2e4a60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..35003686d555624fcac17b387f726605cd147bd7
GIT binary patch
literal 10509
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe470b0074272a504eac30798883e5e2c6c5e027
GIT binary patch
literal 9875
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..06932fff6fa7370f5410813dea7991e4cf15cae8
GIT binary patch
literal 10492
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..553d9e2f64723d236c10d8feeb56c23836529b00
GIT binary patch
literal 9782
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
LZBvHT-ot+bfr+RI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..19b5dc75afffdae7d345415572ef0d33fb92b869
GIT binary patch
literal 10959
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
Ut|q6&?+>jkZ8l`B|7rjK0J;kVAOHXW

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfbe6e460dd870ae473d5042fa72e2cfeeed123c
GIT binary patch
literal 9936
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..03b6d3cf8602c5439dd03c8d5bad3a157deca91f
GIT binary patch
literal 10546
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
K>l=SM@IL^A4Qvnq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..c818593ba46bff87d23d00c5112b215da5e0e884
GIT binary patch
literal 9675
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
Bn@j)z

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ce9bf097d39502939b7184dc3dd07095fc242f7
GIT binary patch
literal 10494
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
G>%RazGBOqb

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..3503762d73365fe88c1a01d3aa4297e916fe3b23
GIT binary patch
literal 10740
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 631fcc2c946a0131aff878e41b8da273a212dd19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8727
zcmeHMcTkh-vj!2Q2vS6l8Uq%DKnS5E6qR12NReJb3WSnSLJLwv5UGL`QJVDL4!sK~
zMJdvijv#_mrHkMVdWvW6ow;-7-rs*G^QC<I?moNw?Cv{xlMo#(6?$3@S~4;+dNox=
zUDEsY<0my0=`|ngJVi#vpg`0&BIqJK08TD=4Aub+Ab2^U0ccMwhK$T}Z1st8B!4ZF
z;&(4v?h7?B9kaBHRPd%0QHXsHZn&G8kxB>cp`<UwKRG!uk%S#-KC11xwnx*?%3>{?
zmreN0VwYR&tXq7LlQO+S`*C-l=Ar4g!=*Z}`q`R!*w=%;37)=dCF9lPYYKBhzU+&z
z+SOEiYzMtz)9I~*PJ5-un0@wKx%K*k`#wTt#RqRE=k9(v@;l>U5q8*=)!frTcVRB;
z{P{lV>V|E$=0=ZQMT_tE@LYV&$<@S2?YVsMkIIeQ^`mWxmft=P&*E)(xo~omd+(jt
zct#J|u4Prvjk|4rz8_J-?cK18P%3WJT#+lfvc4<s=em-D=1nY14+>-(Y|G8L__2Ef
zP|R@D5Wj~yQt92?*O&WXHwt*V$zk|W%%L(;)q!)Rq6b&M0!=zCZG?1sjgIW4Kap<#
z(#CKSz#d<-Q8tdYJlqO0ieTxVnQT1EGT%v*o9n)v;AO(&7T>Z$vvEdlA?Hlf*A>}$
zVA$sonWUF>N&X#>v#`SjQK0p1Ti$1>z5V^KZP%a2Ft*Pv1l(Qyw96<v=Hal<V%z5$
zJ(sL3(MNHb@+$j6q)<Ci-s$3UhUU(zUbMY4>caJitQgK>7IMyvM4<u7b(S&#Exk>3
zi5;2c^!k!E6-D6Jd9kv*CZ<A0;9ggnf7&^p)1vKXU4_cp<L}T4WTSMofK~B646ub*
zSK-=)+jnR##_PKXWX0b$-`=n&%v&(AD=HGTLC&|oE=p*RTdP}7>qsH4WsOczZJbBE
zh*su75A|m!`pVOb^~k&~EC<#556}u0SNvv-9v+r38utz6_89YeZ0_M5HpZ7fE$0WY
z+hG#-0A_vsVmegwbdxXbZdgAc^gNSm3-jlj)I$F5q3;YFsI{W?x{E(`hAtYR^c}Jd
zUOcce8mXxP;it;HA5QQ_CaNtxc6RmScTr9|po{hnOElhRs%E>DnD02JxY8^CVdg`Z
z+*-+i88+YWqixD%zwNzho?LWml*bwDY<k5)C-!FP=#F?|S2^=~nRj39WkXJ~Z6CM#
zeM2vN_hd-h2AUtg`vt6q_rHLPsxpWkjcnUm6x5%yvy5oTFdZ&QkSQxb+E>WB7Wlic
z6g}PIM6C}a?aCHfS{=^6+geiS`TVJI^Zm&KY|+x_;$(@;<=}U-<s+S~?kf!z+&w-6
zV%K-2BUX(yR^>h$rtO5s^>Y-x917O1xzt-LtJfp0p&@?aUFj&bvWDXmYdF~Gqx8IH
z@9L6DJKuJ~NQs2^4j-EN>~wb%a#`?xsY$pW3h>BkHymkI-b$AFY6CTv;3`3RI$xGa
zgZ6x1j$(4@1$BHQ{C;w0Me?gMMz(ly!I`(0;(a2_nalNzJsx^h$J%UqrVQ8g>%HHv
zb7rUGa2M_ig1aOx{^sy_y%3e?ILU7?t)O9|_r-NbgOBDCYf|jVS|x%Rp@<nF?O|L*
z#pX!!<_*}fFM<yd$*2;DW(lLL%?LY#*_DsEb81{C2eU?3#j&{9f8mf~u=eS_x2T)~
zF~|);uNm?ZglBCOt2$-!CP(QP@8QtMiyXFbjldf7{I$uwgd$7fE<Hdy-BqIKOi7gB
zQp;RiCJ-23_U)#u1K7$-HppDM`^DI4n-4oWtF3j9fK>x337V{3H1y7Wa|gE;jJbt7
zu@T{?U!{fcCkjMNIMFiRduL#z!uNz-tduK(MKAIFqlQ-$0{!EaO*SFAnZx3rcb`^y
zd;@SgK|;?l7*+X#>wF+%&77-`Ym0=N=FrR)R-^eRedZhXtIY!So)5~DEmwi|F25{m
z{}Sk=9qePvI`{y-^j-`*o;N|bNltGGbc|?Y4XXj=D|ew*6@^dOe`Cx&=R4$;zTAF0
zv=sCH*4)*m&r|#b`Jpe)DjLb=ogDB^PN%3AOu?VewAM!ToX+HeVpVC26?pd>)WP22
zLAo8!B?<+L-)dmqxovepoENEvA~J1&%je!q+Nyq|;(_adKd`@t)Ke&2>Yrg2ojYn-
z5gR|pz;AWpSq)3<%yx>(NK|Y6^Ej@JuK@IiZL_hP1|PPqxf4<y>FFRqo|e=?#lerY
z#rK441NjV%J_N3~=hbX&3>d`QQkevRgtk4WOCw5iXdgU)RjCCle<#O8G|STYf3Xig
zNJUIc0Q&sDweJaMnp7Tg&!!AlM5g+~BCpVmF@}e@c$E+rywah&IrCCnwJ(r5t8S-5
zuTN}Sxo)M`<b_@bUzpAOjVuI(?d<IFUA$)laf`H8J<}M6o;kI$K;G8Ue$YyL$A67H
z`rfG%_wRBtx2{;9$-P30J)@4g@%2H32R^?HJm`{N#=ZQ)ioTQ8VSZcDD$2M=G!wBM
z8>2qwmK6NxTAN8rMUs8Ft|tq)VT&#HQvMsr4N<ogwALjEP;jG7Uh>5Ss-(-`piHKf
zVcn%ydyTM^6R_x@NnXLiFB%nP7--Pc>1=w>%TA#A*rc%Qf;V3_Z^f(d^Le`Vhp$c2
zeiSTi5YL^fp-YzeC=j*yN+@%y+;feOKTeSdN>z>2)eg@ca1#0wC(YiB!(O<7c%b?O
z%%J`?Q|zun&NIopJYpvWMc4UmZJ(}fmQCaZO-R+%a<0xN*@g7XUa9QS`5o8XuPt=F
z%aQ<4+Hno@_QE0QQ;>9Zm8grpK%a=vtIns?2$%FJDl~e!%~P@tD2RTiOg34Dj!srA
zT+ThDvF*{;IbeCi!NuW->MC3N^m5wq;&=F7-)mic>sKyR^Hj2dA^Fnt&jal`@=Q<9
zKhW>;KlujNQgf?QNVB8WZvYw#BxrV9xN#-y_>!r4Tte#&n&LDCI-dPj&Lhrl#)#!y
zaKQ=PxaeyZBN^rVvC?Uh?veSuZu_B9rK`zx16tDjQ;l@iPs4~JS=Ft1tn(Qm!JXKW
z4NSD{gm%3bHO!{Vgl5Ci7E_5DpriRx65Qh<x9V@&eW*XQ9Tdqgrv7N?LQ!V8YI0b1
z8RzVMtgXm5gtN;e8>WH~T4=jEL@uZs0ClFezPWvQJTlAJq9NM6mwW-MvcrT~ZDn*h
z889(U)Ek5`!?dG{PiTkqDd(IUkf@+O-*3f{(%t$dmfg^9x=kK#G^@7Z`wdiC8q1*;
zHz@B&z3R1`^*X2EiKPeIE)yUxfgvcqSf8n(Gev}7_uTwLT}IFVpZEziV}mYM=~Ndl
zAz61j{o&5_1-+9QY3R%O6ycT1LBaQ~MC!aQ>haY1mOV1t#Ext9j^TOCeb;}dPHbG-
zHt}t{wdub3?#4mJe!0kz-?Qe~>rCecrmnxDZjzgE_>we`jx!18nrochNM^FNE8z^+
zt6<+j=mlQVy~lug!qimVA?kOf*U)1z{-(5qi2!$3h;G8C)kC?EfSt@6VCK;s{yiO~
z?v^pKRsLb@5I#roR)z67%@mI9%HdN3&su@?-Ph+r*vn!w>H&tPM-6`SJezB&jM!@c
zo@<QH=^8CXCqHGYQ>sOFo>Rz69}o^E8t}{CYH7D$s2{f=f{Zz?#9t3PT$B5H^{kvl
zhN$H9<jzZbRWd<l!Kh4WQ!>SJ)?nsBiMVmGSxCo5ZV9o8i%&-Nn&&G}ag=h#gq?=1
z%<I*<gL3i^B@{i|Eutr0)2;ge%JPC*J;qEaHR-neZP}B`nFU3W8e(N%-Bo*`X3Z5L
zkGu!JVxgsRx(YO-3@v#(Ib=EqfR$qF-WSqSCzhcX%Wo=Z(6tOMYQgERoR`abqKLRf
z;B`sksx1{V5ibsvUvN))kb_mx!db?>eUd~go_da5*HVCTss3(-J74~4;c`6O(URFW
z_vM>8Go#u1=CRLP&+-oXJ}k<8b@x$@-nIx)$f1>JJv}9qX*+zWW2xy46?2x&V4FsN
zU>VT~QCn2vq3=;~?O6oFs0tsPqBbXj-IafiLDvUoqTOSj;o#Ichy3k6;V~~IBg|!t
zzQFxnK<yYPb9m}Wk?dXjK=jhk`RwW{qQ;P%>EeUOO%Am7bsS4!<;o(RL}jJ50F-_n
zG=^9CJgAFk!u50^zld5b_&!uU8AHX+#NpTo!-|?r1x&?#s-IihXi~EAX1(R}P{$@o
zFRq+|Jf2+6X?+z3)bp*~9jj!uO^6BMe{pdx25fU#sxW-y9`6Z^{2j*pkJ<bW<iFn!
zJ-ax7(@1V?vQ%KZ;27IS5VKA4bw4?^12^K(Ju3BQG#@GNqo*EtA$xLAc<89O=alSn
z(atdEd$r_=QeB~q;0VJfxBSyS+*ltpopmh@+L3xjLt(#0ueoHcU*`92V!QsbH)wb|
zvvI$0b+ocosx$h2A1}Xa)8O4gt`CxlO_t2oUytk@E9-<}sBqCYsv5?TQTvAio6)z`
z!}vCNzpi8*@ftW@evU~#8>jB8)V8R_+48_G!FJM@dY_d|iKz0W(&jyR{;Acj8klSH
zVMb==>zJzSdt<@{S5x|V3c0RQIh+(6;L`Q+s^4Na%e>nE!m^NhWytQ1ppHqh`m>(-
zvksM<bOPMT!|mblg&QIz_|qxlM;EEoy|)c>aXjIP>FW=C?;Xjl^_=inKdtfjoJif>
zhy+S=oyxFPP0M12@SIGjmk7lZMX$T>hr0xr2Q91F<@hE!_PvbRw5@Jt);$j3$=Prj
zbI-0?iLIba*3yn-e(aXYamCT_GDLYbJl`YBT&0iq9rqpkAYz^EU<$GJyFU0Gb|xjy
zN4dKu(XV8|@7Z`-YyOdjX}is6kE~+d`hmBf4g00`D6S}tCez0t*|?6U8=st=Uwg2u
zo^E*?w9@H2(dj<+xba)#f%CdS!`poJ5DBmDlhc*Xqn<Vn`^)nBDx1?f72oIXGMq}6
zJEFIriz7g}+1km-$Z=Q&1syCBNjf|xxkdK~D&Asm_Y+ePV>f=r|3Ub^(3M-i4PB9F
zv&O`>VAjMvlzYsoy=?|i1r9>7L2vg=_RhS$YN{@v`zX1wB!bY`k^AIDZSuhpvDa&=
z*Nb5f>6I}vLNDKP75=#^S0eH0V1Ra@?XzTD0Jg0%hnYp~h<jafPrs2zr}1cd_oJ;z
zcMa8^d@JAm)w4kzfk;6m)6e&v5~DRlXxHg>rCqMi(q%2P`sybYZ4_8vKF@oq`BNU+
z-lzn@_wj7tK_FkyovuCD!#Xu7WDkF)`>U1Ki@p4}pagZH=$uY}eGSOLxa8hyBF0$e
z{x`>0Qtvw-vEZ9?FD^ZewhK*(7ST5Ta3rlg%EgmUIHQtw)Us(o1k_NbCZ_B<&v>N<
zGu8x)6@0RcPg0&%oG!GBmbEp$7qgk4jc;3m6DHnaFCT&^QC~G#QXZzkD2oi=NLhA$
zvPsS`RV{wSV&2*-y!GlRK1k#Zh0WGW(PVPcLEZpMI>;Mo-h?CZj=~5O-Wo0J>F7i{
z=#!DjT=R57AnnlvfHm3%i<1Se*Ea(JSd=W#P+SwN>7;<R#i|lr(0W8IeI(Hy2}1#|
z$<fMq!bt#*XaWM@>F9uSg?q{Zf8fGNpO3{NK)??bg1s!zNK*%(fOkOypu$jLFi6Q0
z>ka|R(E?;#P#CzbqVn$$q&r!lErH+!7ZLIB@DTP86UMvPh={^qFcC0B1Ofq(G(fIi
zI0C{GgmdLPhWLr0h;~J~V4Vn9JPvS-iLl1I5oCct(mLRe_#B-yHUEUix&F=qi4PG^
zgp-J<Fj&OVQRG((SAvo|3FP;H{znT}ebVnCBD!c-yqgOWt>liz5%_+EKq3FMcXD%a
z_>m3@DS~!DJCamgNnS<&=2AsXQ|C{MV+w4rj!r+UNM!#_lYqtiMb_V9J6`#b&aZ)x
z%>TswoAw{M|4=4rX==h1@kqDh@YED#fye&gC_EC2g8%r4Mj@dvC>jdFAYfn+R0@Rv
z!Ngz~kR%K#Dk>q0gd!1`U!c@*t^@=Qi9UuRfeT|vIFjN>6haJ!0!cs+7!cGN3<1F;
zr6fR5gp?=(1A$0kP~cx6v|X^Iu0%Ne8r3lriUb9fK%h}5Nox=Uf+hioN<u&gj1&YU
zi9$-jti{D8F%l9#pioG-GTy}zK`JNK5n+QCal+aBSU4seenUr176=jk>Gg+1#{ogW
zkPJvOfW@Kk9<F~W>th|!dIZEVpQ4hY5@Jws2?>}u1SSQ8{H1go?cz%6#bZ=au&~(A
zmE*#|N$HTNMI3i33E+nXDI2(g3mQSdyXfQb4zj@G5CF%Pe=cj11`35BAQTY<Gzk<8
zfx^M!aEPcr1OkVO!oe^Qm?Zf{ACJOfy#6=s<M9E={4BaE)|KSn>xby)OzEMWf8PDP
zb-?}@CIH~aSilj;pDDN^+|j5XagwlpE+K6ZI2$x+|M<OO|Bz$<hh{*6#Sus(OdKQ*
zMnXYQ2+|q^v&Kk(5MYR?q_`AV6oNwk9o-d=A$TBM&^K&IJd(H~HRunn09Sr5mB8Qi
zJ#5j(bs$kj;s_)L)`x)M;t;r)6j0<ppB@a1Lc&Nh1A>Sij|&Qo0wExxP!Jj_iL#c2
zp~bAFV1Ezy|B{|K$<3b~@ke?xBF7uzAH|dr`ETX^sqo7VN}}bbjI=Y8HhPgiclzJ?
zI^I+NgOA_a>_6y%1pTj*f5h*<bp1=$KVsk?DgWDD|I+o382CrZ|902^8(p-2ofXkI
z(ic1r(n%1J@`##rilnmEP*EgnB1<4s$~bY$oFt)fQZ;rZBNOI3ev*4;U2`W1PZ88K
zl};^Eo;x8xQ>m>&(xV`%Dc;a0{h9n!!=B~V*^cjCPu@zYX%>Ykjw?|Ukcq%pdDhr-
zymXSqp@1xD0h%p}2YXDk@xsGERmm|WHUmjoUB(->gAo@97fj-ATgN~hvy%yRs_Q5V
ztj(n-dyD%wI#CPVNv?fK-hDldrvTIeq)RGWs+(G+)jWOOflM%rSA17#&c_-HdN{nE
z%I$uhGh#PHrEBq>J3Fr6ekbdB(L$!!kuR(nhZa5JX`QCT?7>_sn?jYq0-^J1_DKb1
z(dFdXyv2|}V99=|J!YHJ<+>d~C$_<N=H$+Z@nV}n{FIg*p)^fPXYpF;h3K2_kM0Gl
z^2a>F34Tphjx9%~Opi$2nDShz`_x3_EE!2<=Tx!6a7^NPE`Y@%Uc9YAAKnK(ixR|Y
z|F-7zW^Z?0ZszkKTjhu4>xT^^gN_eWWM=~8US#mx)Y9Z~EQu3hgz>VFKQroVogRpM
zKLY<|mU~slU7%H48@FxW?s7Y7`Ak)+0`8FWo0)2;zvs}smvQFv!75;wcv`er`t%0C
z7TWkOj;a|IpZQTsOA~NSCSa&CbI4P+whs7AY=n<qMyOe2f`_s8nf9aFeIo1TC|~Fs
zPS4sIt4+%Ilx_~RezS$4XhHLW%yT;ngK7LWtY=_dg5}k&Z?Kbffq`&PKQCfwl%cu5
z6lZm_nVH0a)Pj-w^Y*@q_Xn0Qhy3n3z$qkZN(G!r<)F`G{kQ^5?0qwBcwDtVu5_)N
zMN=bVRFd_Vr>}4z9_ER+nArP%BHqP_H!;~qF%(#^g~|jD-2Q-i7i1F0S0$0+*mYo%
znNCwKkzjIeJ$(B?c_SCb8&-2@QR4%OqsxDK_gcRv<}rwpIlNZGCUfqc1%rPT<~eTb
z6H@}nj+1kZ3>IXjR=<8}{AxA5foy=z{BphuSe%+c=yrxiCml68qkGltc8UX$s^(6X
zWxfi#3G)nt(Xvm6FaC|wNkvkhX-^a?`^R)_9!WU0JdiIw2x%NQ+*IKH&64}dyn0P}
z15LG2g#Yy#4QQQ$1Ci(XfM(YB)USe5>34)6riNBmZ7gbt8U$%U1}Eay!C{VJpF=X8
zS%b4-b@}@0ZAd_A2XcRvYxvaL1v11#Lr=5blDODas^z7qW*^f*D~aU(qQT0s?}a<N
kZCsP5Ie!v)M7KlkWBPggdY$e%X)wvul(ZC!<*fq#3-~{}fB*mh

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 6377db6f2e65dae97ff2fe448a29c96196e57c01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9455
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
a2hi|>*QIHm6bl{BIt>*a<)@0*ZvG!trPjOv

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 1055ce095cd7522fd695dc0ccd92a645ca009c12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8689
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
Bf;9jD

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index fa468b2390b544d69d79019d254584a10abd39fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 87fd745850387bc5509c30d040b8fe3bf1cc706c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8865
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
K|B>#Qi2ndTT)86v

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index e1f137dca37aea0a072e0ee239e01b3a91f13b5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8433
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
HOF{ny>l_pd

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 2d103cfa66729e5d5cc4a0383788456b758095c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9422
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
QD-58jsHIROXBqIn0Isk)A^-pY

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index ceb704581888a434c0169d51a01ee2fc823a4a09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index b138d1416b77e292cf051eef49a9c7946a8b51e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png b/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png
new file mode 100644
index 0000000000000000000000000000000000000000..024678fc209363462f2b44b707900f56c749dc56
GIT binary patch
literal 551
zcmV+?0@(eDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$;Ymb6R9J=WSHEk*Kp1_7xCN|8$yAPl!~GpuL`rsNagYuY2t}NVlS2_CgLIJM
z{~-P^5d;UPLnMkW0jV9##r(8Y(<;<AeRtoNyYKQIkGoW{SlrsSjY}Y%PD8Y98}$+c
z0F;{xU%|)goo}3Uo)ChRqA1&XiJ{is9Djr}VCW*6{R~9jnIuUVbaHM%r6nf1VXv`2
zpsLN?SO^wQrc1oM--9s*#+bku6SCRt*<)3kV=`Ta8Ven>JIv$xX^ff)P)a}fJf#!>
zKE1Wa<PBX!cbLapb>`bIr6|gFG#WvYB*?N1#uzB2yC!0EK`Di4nvuDvyrGNkT6~Z7
zdJRIzj)H(%1pxd50f69~&K(D8zs+}tdEeTh%`S<M1~_l$avqnrEbDLsQQY!h9LM`H
zd0CbL>}YTH9SQ;tbvEbU<bAka4MfC10-E@d29o4F2(E#0a{)p!@jl>*lh%X}*Q<e>
z5AYZ_AK1sh%?JLK4>)(YM0~(|$2_QkUSk7QGd*`W)4SNon&^VU(8s8?O$<6YsM-M^
z;I~%?iTOaSy@8>J-x{Hr$A=8wsxwqtGT{6|%d)t7Pab<8J+TdVUo1&O)uQL!27<rm
pFCMCdWRNNp3ft9cb)fg(#TS&@TbTH6xrYD%002ovPDHLkV1iA%_&Wdq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png b/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d11fb19d36db7047aecdb29bc67d9cbc309e4a8
GIT binary patch
literal 535
zcmV+y0_gpTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$(Md!>R9J=Wm$7c*KoEvMTUa{DM#2>?9JcivTyI4J9w4>5Ywj7Y;u+GUbDcIt
zULkK_+B*tw#Y$jBRw8_b*_>^1;2b82bo|w<|Iy4W|L7NMOsCT#&vQNkmSxe)^Bi?)
z03ffETEg&qP&;?c3n4JVFf7!iK^8CGeuX1oM?PQf9_i`H9LK?qe4P8IlQv#YtlDMG
zD(T!mv7T7Cu8Z-_KuT#!DNWaPky8Hid0UJ1#M-%FuQ}nxgTt?{Yx+PC1RMQ52m*jj
zHMcFVP}q^r#e>6=<^BQGm7>3mlO$=<)n=`E50C!n88uRHQ|8F)1R+EzL3LZxS!xb$
z2c)wUN{LKeP@gNkTJgGGI!kMk(@6dh>`0(>J4W+;{Bn6<2VT?lt(x!Shr=PTmHqCq
zl%U~IM{9n7ui^9Vz$-CyuoJCzpi9l0&^z!~AE0~9n|uwQcL&ZspkvNH@F#||5BwKC
z;QjD63WbNq;C9f752&lM9<V8Hiv0tmvlKh>>5raYG(2`EJUmuEdt~wAun*{euUmBH
z16jPlj{KeBj4%v~`F#HF50l!<NF$3EWG8J8#P#FL0L`E0Jszq;2#oP~T&z~B7NegA
ZzX9Q!OLX2m^49<W002ovPDHLkV1k5Q{I382

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/meta.json b/Resources/Textures/Structures/cargo_pallets.rsi/meta.json
new file mode 100644
index 0000000000..4751d95b9b
--- /dev/null
+++ b/Resources/Textures/Structures/cargo_pallets.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by TheShuEd (github) for Space Station 14)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "cargo_pallet_buy"
+        },
+        {
+            "name": "cargo_pallet_sell"
+        }
+    ]
+}
diff --git a/Scripts/bat/buildAllDebug.bat b/Scripts/bat/buildAllDebug.bat
index 5cf4952175..1e3cc5442e 100755
--- a/Scripts/bat/buildAllDebug.bat
+++ b/Scripts/bat/buildAllDebug.bat
@@ -1,7 +1,6 @@
 @echo off
 cd ../../
 
-call python RUN_THIS.py
 call git submodule update --init --recursive
 call dotnet build -c Debug
 
diff --git a/Scripts/bat/buildAllRelease.bat b/Scripts/bat/buildAllRelease.bat
index 6a8cbac664..730b39d26e 100755
--- a/Scripts/bat/buildAllRelease.bat
+++ b/Scripts/bat/buildAllRelease.bat
@@ -1,7 +1,6 @@
 @echo off
 cd ../../
 
-call python RUN_THIS.py
 call git submodule update --init --recursive
 call dotnet build -c Release
 
diff --git a/Scripts/bat/buildAllTools.bat b/Scripts/bat/buildAllTools.bat
index 7c878cbabb..37db01f459 100755
--- a/Scripts/bat/buildAllTools.bat
+++ b/Scripts/bat/buildAllTools.bat
@@ -1,7 +1,6 @@
 @echo off
 cd ../../
 
-call python RUN_THIS.py
 call git submodule update --init --recursive
 call dotnet build -c Tools
 
diff --git a/Scripts/sh/buildAllDebug.sh b/Scripts/sh/buildAllDebug.sh
index 1ee457ff2a..1e62ef7742 100755
--- a/Scripts/sh/buildAllDebug.sh
+++ b/Scripts/sh/buildAllDebug.sh
@@ -7,6 +7,5 @@ fi
 
 cd ../../
 
-python RUN_THIS.py
 git submodule update --init --recursive
 dotnet build -c Debug
diff --git a/Scripts/sh/buildAllRelease.sh b/Scripts/sh/buildAllRelease.sh
index b3749ac28d..3cfb84b76c 100755
--- a/Scripts/sh/buildAllRelease.sh
+++ b/Scripts/sh/buildAllRelease.sh
@@ -7,6 +7,5 @@ fi
 
 cd ../../
 
-python RUN_THIS.py
 git submodule update --init --recursive
 dotnet build -c Release
diff --git a/Scripts/sh/buildAllTools.sh b/Scripts/sh/buildAllTools.sh
index 14a68487af..551db74fcb 100755
--- a/Scripts/sh/buildAllTools.sh
+++ b/Scripts/sh/buildAllTools.sh
@@ -7,6 +7,5 @@ fi
 
 cd ../../
 
-python RUN_THIS.py
 git submodule update --init --recursive
 dotnet build -c Tools
diff --git a/Tools/changelog/changelog.js b/Tools/changelogs/changelog.js
similarity index 100%
rename from Tools/changelog/changelog.js
rename to Tools/changelogs/changelog.js
diff --git a/Tools/changelog/package.json b/Tools/changelogs/package.json
similarity index 68%
rename from Tools/changelog/package.json
rename to Tools/changelogs/package.json
index 512a3624c8..1f0899df96 100644
--- a/Tools/changelog/package.json
+++ b/Tools/changelogs/package.json
@@ -1,5 +1,7 @@
 {
     "name": "changelogs",
+    "author": "DEATHB4DEFEAT",
+    "license": "MIT",
     "dependencies": {
         "axios": "^1.3.4",
         "js-yaml": "^4.1.0"
diff --git a/Tools/prtitlecase/index.js b/Tools/prtitlecase/index.js
new file mode 100644
index 0000000000..0d72b71131
--- /dev/null
+++ b/Tools/prtitlecase/index.js
@@ -0,0 +1,19 @@
+import axios from 'axios';
+import { titleCase } from 'title-case';
+
+if (process.env.GITHUB_TOKEN) axios.defaults.headers.common['Authorization'] = `token ${process.env.GITHUB_TOKEN}`;
+else throw new Error('BOT_TOKEN was not provided in repository secrets or GITHUB_TOKEN was not set correctly.');
+
+
+// Get PR title
+let prTitle = await axios.get(`https://api.github.com/repos/${process.env.GITHUB_REPOSITORY}/pulls/${process.env.PR_NUMBER}`)
+    .then(res => res.data.title);
+
+// Title case PR title
+console.log(`Old PR title: ${prTitle}`);
+prTitle = titleCase(prTitle);
+console.log(`New PR title: ${prTitle}`);
+
+// Update PR title
+await axios.patch(`https://api.github.com/repos/${process.env.GITHUB_REPOSITORY}/pulls/${process.env.PR_NUMBER}`,
+    { title: prTitle });
diff --git a/Tools/prtitlecase/package.json b/Tools/prtitlecase/package.json
new file mode 100644
index 0000000000..ecba01099f
--- /dev/null
+++ b/Tools/prtitlecase/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "prtitlecase",
+  "description": "Converts PR titles to Title Case using title-case package",
+  "type": "module",
+  "exports": "./index.js",
+  "author": "DEATHB4DEFEAT",
+  "license": "MIT",
+  "dependencies": {
+    "axios": "^1.7.2",
+    "title-case": "^4.3.1"
+  }
+}
diff --git a/shell.nix b/shell.nix
index 9a1b0ca429..85e97a4283 100644
--- a/shell.nix
+++ b/shell.nix
@@ -41,7 +41,6 @@ let
     dbus
     at-spi2-core
     cups
-    python3
   ];
 in pkgs.mkShell {
   name = "space-station-14-devshell";

From 8d721953fb2ec7d1da6d33eab917fb93f1455c06 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Date: Mon, 17 Jun 2024 14:36:15 -0700
Subject: [PATCH 60/84] Fix PRTitleCase Workflow (#472)

Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
---
 .github/workflows/prtitlecase.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/prtitlecase.yml b/.github/workflows/prtitlecase.yml
index 0c5a38a4e8..b3150dcc7e 100644
--- a/.github/workflows/prtitlecase.yml
+++ b/.github/workflows/prtitlecase.yml
@@ -30,5 +30,5 @@ jobs:
       - name: Change Title
         run: |
           cd "Tools/prtitlecase"
-          node src/index.js
+          node index.js
         shell: bash

From bc93199eb79d6d893f62cd11323d8a454b447dbd Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Mon, 17 Jun 2024 17:42:12 -0400
Subject: [PATCH 61/84] Port Station Goals (#465)

# Description

https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/pull/10

This adds a feature whereby a random goal for the shift is faxed to the
station's Captain at the start of every shift.
It is up to the Captain to decide if and how this goal is to be
completed.
Goals are randomly generated every shift, and are meant to help
encourage station activity and RP.
Admins are also able to send station goals via `sendstationgoal`.

---

<details><summary><h1>Media</h1></summary>
<p>


![stationgoals](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/4a2b5533-dfee-4388-bfbc-043ee71b2647)

---

</p>
</details>

# Changelog

:cl: VMSolidus
- add: Added station goals that get sent to the Command fax machine at
the start of every shift

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
---
 Content.Client/Entry/EntryPoint.cs            |   1 +
 Content.Server/Fax/FaxMachineComponent.cs     |   6 +
 .../GameTicking/Events/RoundEndedEvent.cs     |  13 +
 .../GameTicking/Events/RoundStartedEvent.cs   |  11 +
 .../GameTicking/GameTicker.RoundFlow.cs       |   2 +
 .../StationGoal/StationGoalCommand.cs         |  55 +++++
 .../StationGoal/StationGoalPaperComponent.cs  |   9 +
 .../StationGoal/StationGoalPaperSystem.cs     | 118 +++++++++
 .../StationGoal/StationGoalPrototype.cs       |  12 +
 Content.Shared/CCVar/CCVars.cs                |  12 +
 .../station-goal/station-goal-command.ftl     |   6 +
 .../en-US/station-goal/station-goals.ftl      | 224 ++++++++++++++++++
 .../Mobs/Customization/Markings/harpy.yml     |   2 +-
 .../Entities/Objects/Misc/paper.yml           |  13 +
 .../Structures/Machines/fax_machine.yml       |   2 +
 Resources/Prototypes/Objectives/goals.yml     |  87 +++++++
 16 files changed, 572 insertions(+), 1 deletion(-)
 create mode 100644 Content.Server/GameTicking/Events/RoundEndedEvent.cs
 create mode 100644 Content.Server/GameTicking/Events/RoundStartedEvent.cs
 create mode 100644 Content.Server/StationGoal/StationGoalCommand.cs
 create mode 100644 Content.Server/StationGoal/StationGoalPaperComponent.cs
 create mode 100644 Content.Server/StationGoal/StationGoalPaperSystem.cs
 create mode 100644 Content.Server/StationGoal/StationGoalPrototype.cs
 create mode 100644 Resources/Locale/en-US/station-goal/station-goal-command.ftl
 create mode 100644 Resources/Locale/en-US/station-goal/station-goals.ftl
 create mode 100644 Resources/Prototypes/Objectives/goals.yml

diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 53a8051eec..a1fc68bbd2 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -124,6 +124,7 @@ public override void Init()
             _prototypeManager.RegisterIgnore("wireLayout");
             _prototypeManager.RegisterIgnore("alertLevels");
             _prototypeManager.RegisterIgnore("nukeopsRole");
+            _prototypeManager.RegisterIgnore("stationGoal");
 
             _componentFactory.GenerateNetIds();
             _adminManager.Initialize();
diff --git a/Content.Server/Fax/FaxMachineComponent.cs b/Content.Server/Fax/FaxMachineComponent.cs
index d1f269dd37..a189bdc05a 100644
--- a/Content.Server/Fax/FaxMachineComponent.cs
+++ b/Content.Server/Fax/FaxMachineComponent.cs
@@ -51,6 +51,12 @@ public sealed partial class FaxMachineComponent : Component
     [DataField("receiveNukeCodes")]
     public bool ReceiveNukeCodes { get; set; } = false;
 
+    /// <summary>
+    /// 	Should this fax receive station goals
+    /// </summary>
+    [DataField]
+    public bool ReceiveStationGoal { get; set; } = false;
+
     /// <summary>
     /// Sound to play when fax has been emagged
     /// </summary>
diff --git a/Content.Server/GameTicking/Events/RoundEndedEvent.cs b/Content.Server/GameTicking/Events/RoundEndedEvent.cs
new file mode 100644
index 0000000000..36bd1f47a1
--- /dev/null
+++ b/Content.Server/GameTicking/Events/RoundEndedEvent.cs
@@ -0,0 +1,13 @@
+namespace Content.Server.GameTicking;
+
+public sealed class RoundEndedEvent : EntityEventArgs
+{
+    public int RoundId { get; }
+    public TimeSpan RoundDuration { get; }
+
+    public RoundEndedEvent(int roundId, TimeSpan roundDuration)
+    {
+        RoundId = roundId;
+        RoundDuration = roundDuration;
+    }
+}
diff --git a/Content.Server/GameTicking/Events/RoundStartedEvent.cs b/Content.Server/GameTicking/Events/RoundStartedEvent.cs
new file mode 100644
index 0000000000..1e285a6749
--- /dev/null
+++ b/Content.Server/GameTicking/Events/RoundStartedEvent.cs
@@ -0,0 +1,11 @@
+namespace Content.Server.GameTicking;
+
+public sealed class RoundStartedEvent : EntityEventArgs
+{
+    public int RoundId { get; }
+
+    public RoundStartedEvent(int roundId)
+    {
+        RoundId = roundId;
+    }
+}
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 004508ab91..6e02c4ac40 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -255,6 +255,7 @@ public void StartRound(bool force = false)
             AnnounceRound();
             UpdateInfoText();
             SendRoundStartedDiscordMessage();
+            RaiseLocalEvent(new RoundStartedEvent(RoundId));
 
 #if EXCEPTION_TOLERANCE
             }
@@ -402,6 +403,7 @@ public void ShowRoundEndScoreboard(string text = "")
 
             _replayRoundPlayerInfo = listOfPlayerInfoFinal;
             _replayRoundText = roundEndText;
+            RaiseLocalEvent(new RoundEndedEvent(RoundId, roundDuration));
         }
 
         private async void SendRoundEndDiscordMessage()
diff --git a/Content.Server/StationGoal/StationGoalCommand.cs b/Content.Server/StationGoal/StationGoalCommand.cs
new file mode 100644
index 0000000000..1c82509d69
--- /dev/null
+++ b/Content.Server/StationGoal/StationGoalCommand.cs
@@ -0,0 +1,55 @@
+using System.Linq;
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.StationGoal
+{
+    [AdminCommand(AdminFlags.Fun)]
+    public sealed class StationGoalCommand : IConsoleCommand
+    {
+        public string Command => "sendstationgoal";
+        public string Description => Loc.GetString("send-station-goal-command-description");
+        public string Help => Loc.GetString("send-station-goal-command-help-text", ("command", Command));
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            if (args.Length != 1)
+            {
+                shell.WriteError(Loc.GetString("shell-need-exactly-one-argument"));
+                return;
+            }
+
+            var protoId = args[0];
+            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
+            if (!prototypeManager.TryIndex<StationGoalPrototype>(protoId, out var proto))
+            {
+                shell.WriteError(Loc.GetString("send-station-goal-command-error-no-goal-proto", ("id", protoId)));
+                return;
+            }
+
+            var stationGoalPaper = IoCManager.Resolve<IEntityManager>().System<StationGoalPaperSystem>();
+            if (!stationGoalPaper.SendStationGoal(proto))
+            {
+                shell.WriteError(Loc.GetString("send-station-goal-command-error-couldnt-fax"));
+                return;
+            }
+        }
+
+        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        {
+            if (args.Length == 1)
+            {
+                var options = IoCManager.Resolve<IPrototypeManager>()
+                    .EnumeratePrototypes<StationGoalPrototype>()
+                    .OrderBy(p => p.ID)
+                    .Select(p => new CompletionOption(p.ID));
+
+                return CompletionResult.FromHintOptions(options, Loc.GetString("send-station-goal-command-arg-id"));
+            }
+
+            return CompletionResult.Empty;
+        }
+    }
+}
diff --git a/Content.Server/StationGoal/StationGoalPaperComponent.cs b/Content.Server/StationGoal/StationGoalPaperComponent.cs
new file mode 100644
index 0000000000..445b474681
--- /dev/null
+++ b/Content.Server/StationGoal/StationGoalPaperComponent.cs
@@ -0,0 +1,9 @@
+namespace Content.Server.StationGoal
+{
+    /// <summary>
+    ///     Paper with a written station goal in it.
+    /// </summary>
+    [RegisterComponent]
+    public sealed partial class StationGoalPaperComponent : Component { }
+}
+
diff --git a/Content.Server/StationGoal/StationGoalPaperSystem.cs b/Content.Server/StationGoal/StationGoalPaperSystem.cs
new file mode 100644
index 0000000000..6a059c37a3
--- /dev/null
+++ b/Content.Server/StationGoal/StationGoalPaperSystem.cs
@@ -0,0 +1,118 @@
+using System.Text.RegularExpressions;
+using Content.Server.GameTicking;
+using Content.Server.Fax;
+using Content.Server.Station.Systems;
+using Content.Shared.CCVar;
+using Content.Shared.Random;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Content.Shared.Dataset;
+
+namespace Content.Server.StationGoal;
+
+/// <summary>
+///     System for station goals
+/// </summary>
+public sealed class StationGoalPaperSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly FaxSystem _fax = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly StationSystem _station = default!;
+
+    private static readonly Regex StationIdRegex = new(@".*-(\d+)$");
+
+    [ValidatePrototypeId<WeightedRandomPrototype>]
+    private const string RandomPrototype = "StationGoals";
+    [ValidatePrototypeId<DatasetPrototype>]
+    private const string RandomSignature = "names_last";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RoundStartedEvent>(OnRoundStarted);
+    }
+
+
+    private void OnRoundStarted(RoundStartedEvent ev)
+    {
+        if (_config.GetCVar(CCVars.StationGoalsEnabled)
+        	&& _random.Prob(_config.GetCVar(CCVars.StationGoalsChance)))
+            SendRandomGoal();
+    }
+
+    /// <summary>
+    ///     Send a random station goal to all faxes which are authorized to receive it
+    /// </summary>
+    /// <returns>If the fax was successful</returns>
+    /// <exception cref="Exception">Raised when station goal types in the prototype is invalid</exception>
+    public bool SendRandomGoal()
+    {
+        // Get the random station goal list
+        if (!_prototype.TryIndex<WeightedRandomPrototype>(RandomPrototype, out var goals))
+        {
+            Log.Error($"StationGoalPaperSystem: Random station goal prototype '{RandomPrototype}' not found");
+            return false;
+        }
+
+        // Get a random goal
+        var goal = RecursiveRandom(goals);
+
+        // Send the goal
+        return SendStationGoal(goal);
+    }
+
+    private StationGoalPrototype RecursiveRandom(WeightedRandomPrototype random)
+    {
+        var goal = random.Pick(_random);
+
+        if (_prototype.TryIndex<StationGoalPrototype>(goal, out var goalPrototype))
+            return goalPrototype;
+
+        if (_prototype.TryIndex<WeightedRandomPrototype>(goal, out var goalRandom))
+            return RecursiveRandom(goalRandom);
+
+        throw new Exception($"StationGoalPaperSystem: Random station goal could not be found from prototypes {RandomPrototype} and {random.ID}");
+    }
+
+    /// <summary>
+    ///     Send a station goal to all faxes which are authorized to receive it
+    /// </summary>
+    /// <returns>True if at least one fax received paper</returns>
+    public bool SendStationGoal(StationGoalPrototype goal)
+    {
+        var enumerator = EntityManager.EntityQueryEnumerator<FaxMachineComponent>();
+        var wasSent = false;
+        var signerName = _prototype.Index<DatasetPrototype>(RandomSignature);
+
+        while (enumerator.MoveNext(out var uid, out var fax))
+        {
+            if (!fax.ReceiveStationGoal
+                || !TryComp<MetaDataComponent>(_station.GetOwningStation(uid), out var meta))
+                continue;
+
+            var stationId = StationIdRegex.Match(meta.EntityName).Groups[1].Value;
+
+            var printout = new FaxPrintout(
+                Loc.GetString("station-goal-fax-paper-header",
+                    ("date", DateTime.Now.AddYears(1000).ToString("yyyy MMMM dd")),
+                    ("station", string.IsNullOrEmpty(stationId) ? "???" : stationId),
+                    ("content", goal.Text),
+                    ("name", _random.Pick(signerName.Values))
+                ),
+                Loc.GetString("station-goal-fax-paper-name"),
+                "StationGoalPaper"
+            );
+
+            _fax.Receive(uid, printout, null, fax);
+
+            wasSent = true;
+        }
+
+        return wasSent;
+    }
+}
diff --git a/Content.Server/StationGoal/StationGoalPrototype.cs b/Content.Server/StationGoal/StationGoalPrototype.cs
new file mode 100644
index 0000000000..733759a37d
--- /dev/null
+++ b/Content.Server/StationGoal/StationGoalPrototype.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.StationGoal
+{
+    [Serializable, Prototype("stationGoal")]
+    public sealed class StationGoalPrototype : IPrototype
+    {
+        [IdDataFieldAttribute] public string ID { get; } = default!;
+
+        public string Text => Loc.GetString($"station-goal-{ID.ToLower()}");
+    }
+}
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 891c790d52..5aaf967dd1 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -2106,5 +2106,17 @@ public static readonly CVarDef<float>
         /// </summary>
         public static readonly CVarDef<bool> PsionicRollsEnabled =
             CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Enables station goals
+        /// </summary>
+        public static readonly CVarDef<bool> StationGoalsEnabled =
+            CVarDef.Create("game.station_goals", true, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Chance for a station goal to be sent
+        /// </summary>
+        public static readonly CVarDef<float> StationGoalsChance =
+            CVarDef.Create("game.station_goals_chance", 0.1f, CVar.SERVERONLY);
     }
 }
diff --git a/Resources/Locale/en-US/station-goal/station-goal-command.ftl b/Resources/Locale/en-US/station-goal/station-goal-command.ftl
new file mode 100644
index 0000000000..82ed4d5c8a
--- /dev/null
+++ b/Resources/Locale/en-US/station-goal/station-goal-command.ftl
@@ -0,0 +1,6 @@
+send-station-goal-command-description = Sends the selected station target to all faxes that can receive it
+send-station-goal-command-help-text = Usage: { $command } <Goal Prototype ID>
+send-station-goal-command-arg-id = Goal Prototype ID
+
+send-station-goal-command-error-no-goal-proto = No station goal found with ID {$id}
+send-station-goal-command-error-couldnt-fax = Couldn't send station goal, probably due to a lack of fax machines that are able to recieve it
diff --git a/Resources/Locale/en-US/station-goal/station-goals.ftl b/Resources/Locale/en-US/station-goal/station-goals.ftl
new file mode 100644
index 0000000000..f98190fa3c
--- /dev/null
+++ b/Resources/Locale/en-US/station-goal/station-goals.ftl
@@ -0,0 +1,224 @@
+station-goal-fax-paper-name = Station Goal
+
+station-goal-fax-paper-header =
+    ███╗░░██╗████████╗
+    ████╗░██║╚══██╔══╝ Form NT-No.{$station}-CC
+    ██╔██╗██║░░░██║░░░ Target Order
+    ██║╚████║░░░██║░░░ Date: {$date}
+    ██║░╚███║░░░██║░░░ Signed: CCO-{$name}
+    ╚═╝░░╚══╝░░░╚═╝░░░
+    ════════════════════════════════════════
+    {$content}
+    ════════════════════════════════════════
+
+
+station-goal-xeno=
+    Dear Station Command, the purpose of your shift is to build a Xenobiology Lab and then study exotic life forms.
+    Two containment chambers must be constructed according to the following requirements:
+    1. Must be well reinforced;
+    2. At least one of the chambers must be equipped with a gas supply system;
+    3. The entrance should be a cycling airlock system to prevent contamination.
+
+    Get the Salvage Team to capture at least 2 representatives of life forms (e.g. space carp) and transport them to the above-described chambers.
+
+    Capture requirements:
+    1. Exotic fauna should not have critical injuries at the time of placement in the research department;
+    2. When captured fauna dies, you are required to catch another, cloning is strictly prohibited.
+
+    Once you collect the required fauna, you must study them and write a report on their properties.
+    The report must be stamped by the head of the department and faxed to Central Command.
+
+    Experience Requirements:
+    1. Experience should be documented in detail;
+    2. Test activities may include: working with gases, smoke, foam, or injecting experimental reagents (e.g. Cognizine) into captured fauna.
+
+station-goal-museum=
+    Dear Command of the station, the purpose of your shift is to build a museum, the exhibits for which will be unique objects collected from the station.
+
+    Below are the requirements for the design of the museum:
+    1. The museum must be structurally connected to the station by a space-protected corridor, or be located within it;
+    2. The premises must be of a size that allows them to easily receive a large number of visitors;
+    3. The premises must be provided with a standard atmosphere, ventilation and stable power supply;
+    4. Room decoration should be visually pleasing;
+    5. Exhibits must be reinforced accordingly to what is contained in them.
+
+    Exhibit requirements:
+    1. Exhibits must be unique in their kind;
+    2. Each department must provide at least 2 exhibits for the museum fund;
+    3. The total number of exhibits must be at least 20.
+
+    Exhibits may include:
+    1. Exotic drinks and dishes that require an extraordinary method of production and/or non-standard ingredients;
+    2. Exotic matter/substance;
+    3. Works of art (e.g. statues, paintings);
+    4. Fully studied and documented artifacts (optionally provide a copy of the document);
+    5. High-tech devices or tools;
+    6. High-tech or high-power weapons;
+    7. Robotic entities (e.g. Mechs, Cyborgs, Drones);
+    8. Mutated biological organisms;
+    9. Domesticated wild animals or intelligent non-humanoid life forms;
+    10. Found treasures or items not available on the market.
+
+    Upon completion of the museum, it is required to provide the crew with at least 20 minutes of free time from work so that they can visit the museum.
+
+station-goal-area=
+    Dear Station Command, the goal of your shift is to increase the effective use of space at the station.
+
+    It is required to bring the abandoned premises into proper form and find a use for them.
+    Each department must equip and effectively use the area of adjacent maintenance tunnels.
+    Sufficiently spacious maintenance tunnels need to be converted into residential areas.
+    The remaining tunnels should be provided with floor coverings and adequate lighting.
+    In addition, it is necessary to provide a public, well-lit corridor connecting all the restored compartments and new bedrooms.
+
+station-goal-bureaucraticerror =
+    ACCESS TO THIS DOCUMENT IS PROHIBITED FOR PERSONS WHO DO NOT HAVE LEGAL IMMUNITY
+
+    Dear Station Command, we inform you that the purpose of your shift was lost as a result of a bureaucratic error.
+    With this news, Central Command gives you the opportunity to independently assign a new goal for the station.
+
+    New goal requirements:
+    1. Relevance: The goal must be relevant and relevant to the current situation;
+    2. Engagement: The goal should require the cooperation of as many departments as possible in the plans;
+    3. Scope: The goal should involve sufficient, but not excessive, amounts of work to ensure the effective completion of the task.
+
+    Please note that distribution of the contents of this document to persons who do not have legal immunity is strictly prohibited due to the possibility of discrediting the management of the Corporation.
+    Therefore, in order to present a new goal to the crew, the command staff must contact Central Command for approval of your ideas.
+
+station-goal-anomalies=
+    Dear Station Command, the purpose of your shift is to provide new information about anomalies to NanoTrasen.
+
+    It is necessary to conduct experimental studies aimed at testing the consequences of the collapse of at least 4 unique anomalies.
+    During or after the experiments, it is necessary to isolate and document the aforementioned anomalies.
+
+    Document requirements:
+    1. The official name of the anomaly;
+    2. Physical description;
+    3. Passive properties;
+    4. Reaction of the anomaly to different particles;
+    5. Consequences of the collapse;
+    6. Location of the anomaly.
+
+    The document must be certified by the stamp of the supervisor and faxed to Central Command.
+
+station-goal-combat=
+    Dear station Command, due to the increase in attacks of pirate ships in this sector, the purpose of your shift is to raise the overall combat readiness of the station.
+
+    Required:
+    1. Organize an inspection of every sentient being and cargo arriving at or leaving the station.
+    2. Build or modify an existing security checkpoint at arrivals and departures. The checkpoint must be able to completely block the ports from the main part of the station.
+        Each of the above checkpoints must have at least one cell for the temporary detention of detainees.
+    3. Organize a spare weapons storage in the opposite part of the station from the brig.
+        The vault arsenal should have enough weapons and equipment to fully equip all security personnel.
+    4. Organize the recruitment of a new combat subdepartment of security.
+        Squad members must be recruited from the station's crew.
+        Recruitment should be carried out on a voluntary-compulsory basis.
+        Composition of the squad:
+            1 Field Medic;
+            1 Field Engineer;
+            3 Combat Operatives.
+        All members of the squad must be trained in all the necessary skills to conduct combat and fulfill their role.
+    5. Open a public shooting range.
+        The shooting range should present all available types of weapons or their training counterparts.
+        Avoid providing lethal weaponry to unauthorized personnel.
+    6. Encourage the use of the station boxing ring.
+        If there is no boxing ring, you must create one.
+
+station-goal-shuttle=
+    Dear Station Command, the purpose of your shift is to build a space shuttle capable of being piloted.
+
+    Shuttle requirements:
+    1. The shuttle must have a locked bridge;
+        a medical room with the necessary medical supplies and chemical equipment;
+        a supply store surrounded by reinforced material;
+        a crew room with at least 12 seats.
+    2. There must be an intermediate room between the docking airlock and the main rooms to prevent possible depressurization.
+    3. The shuttle must have a standard atmosphere, and also have several air gas containers to maintain it.
+    4. The shuttle must be able to move in all directions (forward, backward, sideways) and turn reasonably well.
+
+    Upon completion, the shuttle crew must be recruited from the station personnel.
+    The shuttle crew must include:
+        1 pilot;
+        2 engineers;
+        1 medic/chemist;
+        1 security officer.
+
+    The shuttle should take on board all the station Command representatives as passengers and, in parallel with the evacuation shuttle, go to the Central Command station.
+
+station-goal-singularity=
+    Dear station Command, the goal of your shift is to build a generator based on the gravitational singularity.
+
+    The design requirements are:
+    1. The structure must be located at a significant distance from the station.
+    2. The structure must be protected from meteorites and space debris.
+    3. The containment field must be able to prevent the loss of a class 3 singularity.
+
+station-goal-solarpanels=
+    Dear station Command, the purpose of your shift is to organize a backup power system.
+
+    The following work is required:
+    1. Build two new branches of solar panels.
+    2. Allocate an area for a compartment with spare batteries.
+        This compartment should accommodate at least 3 fully charged SMES', which should not be connected to the main power system of the station unless needed.
+
+station-goal-artifacts=
+    Dear station Command, the purpose of your shift is to provide new information about alien artifacts to NanoTrasen.
+
+    It is required to organize the work of salvagers to search for and deliver artifacts from the wreckage around the station or expeditions.
+    After the delivery of the artifacts, they must be transferred to a special container to the research department.
+    It is necessary to deliver at least 2 fully studied and documented artifacts on the evacuation shuttle in special containment units.
+
+    Recommended information for the document:
+    1. Name of the artifact.
+    2. Physical description.
+    3. Properties of the object.
+    4. Location of where the artifact was found.
+    5. Additional notes.
+
+    The document must be certified by the stamp of the supervisor.
+
+station-goal-storage=
+    Dear station Command, the purpose of your shift is to build an orbital storage facility with supplies and technology.
+
+    The storage should be placed in space separately from the main station, make sure its design is strong, a random meteorite should not damage it.
+
+    4 boxes must be placed in the storage containing the following respectively:
+    - Advanced medicines;
+    - Stocks of the best seeds;
+    - Refrigerator box of food with a high nutritional value;
+    - Valuable, but not unique boards.
+
+    Monitor the safety of the contents in the storage until the end of the shift, a cleanup crew will come retrieve the contents as they prepare the station.
+
+station-goal-zoo=
+    Dear station Command, the purpose of your shift is to improve the recreational value of the personnel at the station.
+
+    It is necessary to build a zoo with at least 5 enclosures containing different types of animals ordered from the supply department.
+    Provide animals with food, at least one cleaning robot in each enclosure, and everything necessary for life, depending on the type of animal.
+    It is also necessary to build a bathhouse for the animals, water vapor must be supplied by Atmospheric Technicians.
+
+    Upon completion of the zoo, it is required to provide the crew with at least 20 minutes of free time from work so that they can visit the new zoo.
+
+station-goal-labor=
+    Dear station Command, the purpose of your shift is to increase the motivation of the personnel for the growth of labor productivity.
+
+    This requires that each of the heads during the shift closely monitors the performance of the duties of their employees and evaluates them.
+    After the time set by Command for evaluation, in each of the departments, the best, in the opinion of the head, employee should be selected, who will be invited to a dinner, where the Command staff will be obliged to award them a medal and a prize.
+    The heads must provide a report indicating the employee's position and merits for the shift.
+    Drinks and meals should be prepared for the dinner, as well as, if possible, several entertainment events that allow the presence of actors and musicians.
+    For the duration of the celebration, the dining room or other place chosen for the event must be inaccessible to the rest of the crew.
+
+    The duration of the shift for a more accurate assessment of the work of the personnel should be set by the Command staff.
+    After the dinner someone must announce the end of the shift and call the evacuation shuttle.
+
+station-goal-lectures=
+    Dear station Command, the purpose of your shift is to carry out a number of events within the framework of the Corporation's plan to increase the knowledge of its employees.
+
+    The Command staff are instructed to organize a platform for public lectures, if none exists, create one nearby the bridge entry.
+    The venue should be equipped with a large enough stage for speakers in the middle, a podium for the presenter to one side of it, plenty of seating for guests, and a special counter/table for brochures at the entrance.
+    A host/organizer of the event must also be selected.
+    Each department is required to present a group of employees consisting of at least 2 people.
+    Selected employees, under the supervision of the head of the department, should prepare a short lecture/presentation on a specific topic within their specialization (e.g. the harm of drugs and their reason for their criminalization, the effect of smoking on the body, acting, product pricing, cooking etc.), preferably with demonstration materials, and at least 10 brochures, on which the abstracts of the lecture should be indicated.
+    At the time indicated by the Command staff, the crew must be assembled on the site for the event, where lectures will be read.
+    There may be breaks between lectures to allow guests to read brochures and catch their breath.
+
+    After the end of the event someone must announce the end of the shift and call the evacuation shuttle.
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
index 9118692a08..4f65046ce9 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
@@ -117,7 +117,7 @@
         - !type:SimpleColoring
   sprites:
     - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi
-      state: finch_tail 
+      state: finch_tail
 
 - type: marking
   id: HarpyWing2ToneClassic
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 58457ebb7f..c1a5d9a1bf 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -255,6 +255,19 @@
   components:
   - type: NukeCodePaper
 
+- type: entity
+  parent: Paper
+  id: StationGoalPaper
+  name: station goal
+  description: It looks like you have a lot of work to do.
+  components:
+    - type: Paper
+      stampState: paper_stamp-centcom
+      stampedBy:
+      - stampedName: stamp-component-stamped-name-centcom
+        stampedColor: "#bb3232"
+
+
 - type: entity
   name: pen
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
index af15034257..cd4a22b790 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
@@ -108,5 +108,7 @@
     - type: FaxMachine
       name: "Captain's Office"
       receiveNukeCodes: true
+      receiveStationGoal: true
     - type: StealTarget
       stealGroup: FaxMachineCaptain
+
diff --git a/Resources/Prototypes/Objectives/goals.yml b/Resources/Prototypes/Objectives/goals.yml
new file mode 100644
index 0000000000..59e35ea8a5
--- /dev/null
+++ b/Resources/Prototypes/Objectives/goals.yml
@@ -0,0 +1,87 @@
+- type: stationGoal
+  id: Area
+
+- type: stationGoal
+  id: Anomalies
+
+- type: stationGoal
+  id: Artifacts
+
+- type: stationGoal
+  id: BureaucraticError
+
+- type: stationGoal
+  id: Combat
+
+- type: stationGoal
+  id: Labor
+
+- type: stationGoal
+  id: Lectures
+
+- type: stationGoal
+  id: Museum
+
+- type: stationGoal
+  id: Shuttle
+
+- type: stationGoal
+  id: Singularity
+
+- type: stationGoal
+  id: SolarPanels
+
+- type: stationGoal
+  id: Storage
+
+- type: stationGoal
+  id: Xeno
+
+- type: stationGoal
+  id: Zoo
+
+
+- type: weightedRandom
+  id: StationGoals
+  weights:
+    StationGoalDepartment: 1
+    StationGoalPower: 1
+    StationGoalStation: 1
+
+
+- type: weightedRandom
+  id: StationGoalDepartment
+  weights:
+    StationGoalScience: 1
+    StationGoalSecurity: 1
+
+
+- type: weightedRandom
+  id: StationGoalPower
+  weights:
+    Singularity: 1
+    SolarPanels: 1
+
+- type: weightedRandom
+  id: StationGoalScience
+  weights:
+    Anomalies: 1
+    Artifacts: 1
+    Xeno: 1
+
+- type: weightedRandom
+  id: StationGoalSecurity
+  weights:
+    Combat: 1
+
+- type: weightedRandom
+  id: StationGoalStation
+  weights:
+    Area: 1
+    BureaucraticError: 1
+    Labor: 1
+    Lectures: 1
+    Museum: 1
+    Shuttle: 1
+    Storage: 1
+    Zoo: 1

From 70badaafe1c3d70c995b06f3983d8b780919b6ee Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Mon, 17 Jun 2024 21:42:34 +0000
Subject: [PATCH 62/84] Automatic Changelog Update (#465)

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7fcb7aac22..c98ba4bf4c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4184,3 +4184,11 @@ Entries:
       message: Moths have way better control in zero gravity environments
   id: 6122
   time: '2024-06-17T07:58:34.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Added station goals that get sent to the Command fax machine at the
+        start of every shift
+  id: 6123
+  time: '2024-06-17T21:42:13.0000000+00:00'

From d1cae9a4394ce0f4281c8c86feea21561c6d44d1 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 18:07:28 -0400
Subject: [PATCH 63/84] Harpy Peacock Tail (#428)

Courtesy of @StillIcarus

This adds a new Peacock tail marking to Harpies. I'm also taking this
time to update them to the recent DeltaV changes to the birbs.

![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/4f776006-700e-4d92-802c-03e6dd201491)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/5fd143ab-069f-4d1c-b5e0-ee982a95b4b6)

The backside is semi cursed, but that's something I can't do within the
scope of this PR due to sprite system limitations that Death has planned
improvements for. Just ignore them. :)

Have a birb as consolation.

![faridaiscute](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/09373a57-f32f-48eb-b52b-6d12143f62ff)

:cl: VMSolidus
- add: Peacock Tails have been added for Harpies

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
---
 .../Locale/en-US/deltav/markings/harpy.ftl    |   4 ++
 .../Mobs/Customization/Markings/harpy.yml     |  64 +++++++++++-------
 .../DeltaV/Entities/Mobs/Species/harpy.yml    |  22 ++++--
 .../digitigrade_inventory_template.yml        |   7 --
 .../Harpy/harpy_chest.rsi/lower.png           | Bin
 .../Harpy/harpy_chest.rsi/meta.json           |   0
 .../Harpy/harpy_chest.rsi/upper.png           | Bin
 .../harpy_ears.rsi/harpy_ears_default.png     | Bin
 .../Harpy/harpy_ears.rsi/meta.json            |   0
 .../Harpy/harpy_legs.rsi/feet.png             | Bin
 .../Harpy/harpy_legs.rsi/meta.json            |   0
 .../Harpy/harpy_legs.rsi/talons.png           | Bin
 .../Harpy/harpy_legs.rsi/thighs.png           | Bin
 .../Harpy/harpy_tails.rsi/meta.json           |   0
 .../Harpy/harpy_tails.rsi/phoenix_tail.png    | Bin
 .../Harpy/harpy_tails.rsi/rooster_tail.png    | Bin
 .../harpy_tails36x36.rsi}/finch_tail.png      | Bin
 .../Harpy/harpy_tails36x36.rsi}/meta.json     |   0
 .../Harpy/harpy_tails48x48.rsi/meta.json      |  19 ++++++
 .../peacock_tail_eyes.png                     | Bin 0 -> 772 bytes
 .../peacock_tail_feathers.png                 | Bin 0 -> 1669 bytes
 .../Customization/Harpy/harpy_wingcover.png   | Bin
 .../Harpy/harpy_wings.rsi/classicharpy.png    | Bin
 .../Harpy/harpy_wings.rsi/harpy.png           | Bin
 .../Harpy/harpy_wings.rsi/harpy2tone1.png     | Bin
 .../Harpy/harpy_wings.rsi/harpy2tone2.png     | Bin
 .../Harpy/harpy_wings.rsi/harpy3tone1.png     | Bin
 .../Harpy/harpy_wings.rsi/harpy3tone2.png     | Bin
 .../Harpy/harpy_wings.rsi/harpy3tone3.png     | Bin
 .../Harpy/harpy_wings.rsi/harpyfolded.png     | Bin
 .../Harpy/harpy_wings.rsi/harpyspeckled1.png  | Bin
 .../Harpy/harpy_wings.rsi/harpyspeckled2.png  | Bin
 .../Harpy/harpy_wings.rsi/harpyundertone1.png | Bin
 .../Harpy/harpy_wings.rsi/harpyundertone2.png | Bin
 .../Harpy/harpy_wings.rsi/harpywingtip1.png   | Bin
 .../Harpy/harpy_wings.rsi/harpywingtip2.png   | Bin
 .../Harpy/harpy_wings.rsi/meta.json           |   0
 37 files changed, 81 insertions(+), 35 deletions(-)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png (100%)
 rename Resources/Textures/{DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi => Mobs/Customization/Harpy/harpy_tails36x36.rsi}/finch_tail.png (100%)
 rename Resources/Textures/{DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi => Mobs/Customization/Harpy/harpy_tails36x36.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wingcover.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png (100%)
 rename Resources/Textures/{DeltaV => }/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json (100%)

diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/deltav/markings/harpy.ftl
index 3c1a2e3b9b..871f2f1729 100644
--- a/Resources/Locale/en-US/deltav/markings/harpy.ftl
+++ b/Resources/Locale/en-US/deltav/markings/harpy.ftl
@@ -40,6 +40,10 @@ marking-HarpyTailRooster-rooster_tail = Tail
 marking-HarpyTailFinch = Finch Tail
 marking-HarpyTailFinch-finch_tail = Tail
 
+marking-HarpyTailPeacock = Peacock Tail
+marking-HarpyTailPeacock-peacock_tail_feathers = Feathers
+marking-HarpyTailPeacock-peacock_tail_eyes = Eyes
+
 marking-HarpyChestDefault = Wing & Groin Under-Clothes
 marking-HarpyChestDefault-upper = Wing Under-Clothes
 marking-HarpyChestDefault-lower = Groin Under-Clothes
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
index 4f65046ce9..bd1ad12a32 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
@@ -15,7 +15,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy
 
 - type: marking
@@ -32,7 +32,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: classicharpy
 
 - type: marking
@@ -49,7 +49,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyfolded
 
 - type: marking
@@ -66,7 +66,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_ears.rsi
       state: harpy_ears_default
 
 - type: marking
@@ -83,7 +83,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: phoenix_tail
 
 - type: marking
@@ -99,7 +99,7 @@
       fallbackTypes:
         - !type:SimpleColoring
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: rooster_tail
 
 
@@ -116,18 +116,36 @@
       fallbackTypes:
         - !type:SimpleColoring
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails36x36.rsi
       state: finch_tail
 
+- type: marking
+  id: HarpyTailPeacock
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Harpy]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:SimpleColoring
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
+      state: peacock_tail_feathers
+    - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
+      state: peacock_tail_eyes
+
 - type: marking
   id: HarpyWing2ToneClassic
   bodyPart: RArm
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy2tone1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy2tone2
 
 - type: marking
@@ -136,11 +154,11 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone2
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone3
 
 - type: marking
@@ -149,9 +167,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyspeckled1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyspeckled2
 
 - type: marking
@@ -160,9 +178,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyundertone1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyundertone2
 
 - type: marking
@@ -171,9 +189,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpywingtip1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpywingtip2
 
 - type: marking
@@ -190,9 +208,9 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
       state: upper
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
       state: lower
 
 - type: marking
@@ -209,7 +227,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: thighs
 
 - type: marking
@@ -223,7 +241,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: feet
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: talons
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index a4498299c9..0ddce8b0e6 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -54,7 +54,6 @@
         visible: false
       - map: [ "id" ]
       - map: [ "gloves" ]
-      - map: [ "shoes" ]
       - map: [ "ears" ]
       - map: [ "outerClothing" ]
       - map: [ "eyes" ]
@@ -122,12 +121,25 @@
   - type: MovementSpeedModifier
     baseWalkSpeed: 2.5
     baseSprintSpeed: 5.0
-  - type: Inventory 
+  - type: Inventory
     speciesId: harpy
     templateId: digitigrade
   - type: HarpyVisuals
   - type: UltraVision
-    
+  - type: Tag
+    tags:
+    - CanPilot
+    - FootstepSound
+    - DoorBumpOpener
+    - ShoesRequiredStepTriggerImmune
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - SolCommon
+    understands:
+    - GalacticCommon
+    - SolCommon
+
 - type: entity
   save: false
   name: Urist McHands
@@ -138,8 +150,9 @@
   components:
   - type: HumanoidAppearance
     species: Harpy
-  - type: Inventory 
+  - type: Inventory
     speciesId: harpy
+    templateId: digitigrade
   - type: Sprite
     scale: 0.9, 0.9
     layers:
@@ -160,7 +173,6 @@
       - map: ["enum.HumanoidVisualLayers.RHand"]
       - map: [ "id" ]
       - map: [ "gloves" ]
-      - map: [ "shoes" ]
       - map: [ "ears" ]
       - map: [ "outerClothing" ]
       - map: [ "eyes" ]
diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml b/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml
index 158541571a..fc7dbda932 100644
--- a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml
+++ b/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml
@@ -1,13 +1,6 @@
 - type: inventoryTemplate
   id: digitigrade
   slots:
-    - name: shoes
-      slotTexture: shoes
-      slotFlags: FEET
-      stripTime: 3
-      uiWindowPos: 1,0
-      strippingWindowPos: 1,3
-      displayName: Shoes
     - name: jumpsuit
       slotTexture: uniform
       slotFlags: INNERCLOTHING
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/finch_tail.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/finch_tail.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json
new file mode 100644
index 0000000000..2961db3707
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Peacock by stillxicarus (Discord)",
+    "size": {
+        "x": 48,
+        "y": 48
+    },
+    "states": [
+        {
+            "name": "peacock_tail_feathers",
+            "directions": 4
+        },
+        {
+            "name": "peacock_tail_eyes",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png
new file mode 100644
index 0000000000000000000000000000000000000000..71af693afd78b3c3a6c81ca03fc2f9db5913e590
GIT binary patch
literal 772
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!Wi-X*q7}lMWc?smOq&xaLGB9lH
z=l+w(3gjyW_=LDtRW-hRc_J~f)7Q5xIl1%y|NjRL)R&hxZQ4}w>eVTrswZhYEkKI9
zB*-rqC<_G)UjB@qfWn*w9+AZi419+`m{C;2tAT-mDb&-&F(kwJ?aYg1hZQ*5k~e10
z{$Brpago!NU2e0xW%tk3W#hDWniRY{_rH<%g404TKGm}><1}Z=edpY|?DrC%?a|r+
ziTh6)CY;Y=;b(Y|{L<d@!LuhP>P=f6PN*cE&-(I*n^FCEgYD{zpYy*y3!b(03e(!E
zKL`01i1hql(XgD6?f9(?EOWQBzM3eNHgmzM_EX0vel@o(`2AOc=Uq`{@2{S%a<gL8
zZhOtYc_}B0QATOi<!8MYW;kl^n9;C=ceiu%w{WJnF|Umec1b0A>=%h`o2b+9s8C>H
zpx0*yEwdB-39}Z23B0Y`x5Z?^jjt+SxTNGfYPsrC93*qJxYysE%<w=uu+9C0Z=@DW
zecd^M<7*WzB>nl!b?@pzv*U&iA`jFQoxf?#_u}_@Wt{T0h<V3@W^*phta{Z3ji)YW
z#SU7o*W!~qEdQtXK-w)~hWz4=f{P#boxi#~IA+2P<!4z1{F141r+)H${i3#sWtUE)
z9ykDD%x*!6-wl%t67|F`$ZPp0+pmnh+3d-x6tdzqOGdDjtBQ-K^-YxzPi&90=oO26
zpJIGFWls0(b(b&5`L_9pJ$UtF$4jejmJ>^_`Kmq5-Qe-3bVZ$zPv?|c7GX8cfPYi|
zF5rmun;0aqnJMW_X<*)qO$>Wd3>w3)UDTFX<LAb1#8lCKH?>BJC*Z#k%g2a+7tPH~
z8~6Kli1^Msdz2|;NuW<-AJbu7wHyIefqy3r9y)gaUz_lS%i`Mur58n?E#mK{Sn_>b
rcXDyRWMReq*qBB78xS7c@P5B*c|60ulNK9*sgA+Z)z4*}Q$iB}zuHxD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png
new file mode 100644
index 0000000000000000000000000000000000000000..d56b093d6ca8a5584adf01c6e4e1d6aeca3c48ec
GIT binary patch
literal 1669
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
P00000NkvXXu0mjfjI1Qj

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json

From 90bca5a1ab63e8e3597d882a66fc376ce7fad521 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Thu, 20 Jun 2024 22:07:52 +0000
Subject: [PATCH 64/84] Automatic Changelog Update (#428)

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c98ba4bf4c..ee5a9acb87 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4192,3 +4192,9 @@ Entries:
         start of every shift
   id: 6123
   time: '2024-06-17T21:42:13.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: Peacock Tails have been added for Harpies
+  id: 6124
+  time: '2024-06-20T22:07:29.0000000+00:00'

From af3a9633d9279128bb0409169ade8e83c4129a19 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 18:17:02 -0400
Subject: [PATCH 65/84] Port Randomly Fire Dropped Weapons (#471)

# Description

Ports
https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/pull/19

I have added a new stat for firearms, the "Reliability" stat, which is a
number between 0 and 1. It's used as a percentage chance for the weapon
to fire itself when violently thrown into anyone. This PR differs from
the original one slightly in that to get it to actually work without
crashing, I set the system to listen to an event that triggers whenever
the gun collides with another entity, not necessarily just the floor.
This is the same event responsible for the clown's cream pie system, or
for glass shards embedding in an entity.

# Changelog

:cl:
- add: NanoTrasen has disabled the unneeded safeties on your guns- Make
sure you're careful with them!
- tweak: All Firearms now have a reliability stat, some are more
reliable than others. The more reliable a weapon is, the less likely it
is to accidentally discharge when yeeted.
---
 .../Ranged/Systems/FireOnDropSystem.cs        | 27 +++++++++++++++++++
 .../Weapons/Ranged/Components/GunComponent.cs |  6 +++++
 .../Objects/Weapons/Guns/Basic/base_pka.yml   |  1 +
 .../Weapons/Guns/Battery/battery_guns.yml     |  1 +
 .../Objects/Weapons/Guns/Pistols/pistols.yml  | 14 +++++++++-
 .../Weapons/Guns/Revolvers/revolvers.yml      |  3 +++
 .../Objects/Weapons/Guns/Rifles/rifles.yml    |  2 ++
 .../Objects/Weapons/Guns/SMGs/smgs.yml        |  5 ++++
 .../Weapons/Guns/Shotguns/shotguns.yml        |  7 +++++
 .../Objects/Weapons/Guns/Snipers/snipers.yml  | 10 +++++++
 10 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs

diff --git a/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs b/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs
new file mode 100644
index 0000000000..a6112ad49c
--- /dev/null
+++ b/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Throwing;
+using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.Random;
+
+namespace Content.Server.Weapons.Ranged.Systems;
+
+public sealed class FireOnDropSystem : EntitySystem
+{
+    [Dependency] private readonly SharedGunSystem _gun = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GunComponent, ThrowDoHitEvent>(HandleLand);
+    }
+
+
+    private void HandleLand(EntityUid uid, GunComponent component, ref ThrowDoHitEvent args)
+    {
+        if (_random.Prob(component.FireOnDropChance))
+            _gun.AttemptShoot(uid, uid, component, Transform(uid).Coordinates.Offset(Transform(uid).LocalRotation.ToVec()));
+    }
+}
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index 0183a30a73..a18aac80ab 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -229,6 +229,12 @@ public sealed partial class GunComponent : Component
     /// </summary>
     [DataField]
     public bool ClumsyProof = false;
+
+    /// <summary>
+    ///     The percentage chance of a given gun to accidentally discharge if violently thrown into a wall or person
+    /// </summary>
+    [DataField]
+    public float FireOnDropChance = 0.1f;
 }
 
 [Flags]
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
index f85e93b893..93621bc3a2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
@@ -22,6 +22,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
+    fireOnDropChance: 1
   - type: AmmoCounter
   - type: Appearance
   - type: GenericVisualizer
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 202604b8bf..bf0c51849a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -18,6 +18,7 @@
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
+    fireOnDropChance: 0.15
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser.ogg
   - type: Battery
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 16cacb79df..410664e46e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -99,6 +99,15 @@
     containers:
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
+  - type: Gun
+    fireRate: 6
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
+    fireOnDropChance: 0.3
 
 - type: entity
   name: cobra
@@ -125,6 +134,7 @@
         volume: -14
     availableModes:
     - SemiAuto
+    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -169,6 +179,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
+    fireOnDropChance: 0.5
 
 - type: entity
   id: WeaponPistolMk58Nonlethal
@@ -198,7 +209,7 @@
   name: N1984
   parent: BaseWeaponPistol
   id: WeaponPistolN1984 # the spaces in description are for formatting.
-  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber. 
+  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/N1984.rsi
@@ -219,6 +230,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
+    fireOnDropChance: 0.6
   - type: ItemSlots
     slots:
       gun_magazine:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index bd043c997d..c5237cdad9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -29,6 +29,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
+    fireOnDropChance: 0.5
   - type: UseDelay
     delay: 0.66
   - type: ContainerContainer
@@ -127,6 +128,7 @@
       path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
       params:
         volume: 2.25
+    fireOnDropChance: 0.3
 
 - type: entity
   name: Python
@@ -155,6 +157,7 @@
     sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
   - type: Gun
     fireRate: 1
+    fireOnDropChance: 1
   - type: ContainerContainer
     containers:
       revolver-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index 5bc8125eba..c55b2b6b09 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -67,6 +67,7 @@
     fireRate: 5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
+    fireOnDropChance: 0.5
   - type: ChamberMagazineAmmoProvider
     soundRack:
       path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
@@ -159,6 +160,7 @@
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
+    fireOnDropChance: 0.2
   - type: ItemSlots
     slots:
       gun_magazine:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index b693bdba37..2dfc833bad 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -72,6 +72,7 @@
     fireRate: 10
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
+    fireOnDropChance: 0.3
   - type: MagazineVisuals
     magState: mag
     steps: 1
@@ -96,6 +97,7 @@
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg
+    fireOnDropChance: 0.3
   - type: ChamberMagazineAmmoProvider
     autoEject: true
   - type: MagazineVisuals
@@ -126,6 +128,7 @@
         path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
       availableModes:
         - FullAuto
+      fireOnDropChance: 0.2
     - type: ItemSlots
       slots:
         gun_magazine:
@@ -173,6 +176,7 @@
       path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
     availableModes:
     - FullAuto
+    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -225,6 +229,7 @@
     selectedMode: FullAuto
     availableModes:
     - FullAuto
+    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index a8d9f53991..52b05b6d60 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -28,6 +28,7 @@
       path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
+    fireOnDropChance: 0.2
   - type: BallisticAmmoProvider
     whitelist:
       tags:
@@ -75,6 +76,7 @@
       path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
+    fireOnDropChance: 0.3
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -115,6 +117,7 @@
     heldPrefix: db
   - type: Gun
     fireRate: 2
+    fireOnDropChance: 0.5
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -190,6 +193,7 @@
     heldPrefix: sawn
   - type: Gun
     fireRate: 4
+    fireOnDropChance: 0.5
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -226,6 +230,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/hm_pistol.rsi
   - type: Gun
     fireRate: 4
+    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
   - type: Construction
@@ -250,6 +255,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi
   - type: Gun
     fireRate: 2
+    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
   - type: StaticPrice
@@ -273,6 +279,7 @@
     heldPrefix: improvised
   - type: Gun
     fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
+    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
     proto: null
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index c97459629c..adb8e323f4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -46,6 +46,14 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
+  - type: Gun
+    fireRate: 0.75
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
+    fireOnDropChance: 1
 
 - type: entity
   name: Hristov
@@ -82,6 +90,7 @@
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
+    fireOnDropChance: 1
   - type: UseDelayOnShoot
   - type: UseDelay
     delay: 8 #it's a musket
@@ -111,6 +120,7 @@
   - type: Gun
     minAngle: 0
     maxAngle: 30 #miss him entirely because the barrel is smoothbore
+    fireOnDropChance: 1
   - type: Item
     size: Small
     storedRotation: 90

From 97f1960778c1289bcd2e6de0c9fd148d1c4b95ba Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Thu, 20 Jun 2024 22:17:23 +0000
Subject: [PATCH 66/84] Automatic Changelog Update (#471)

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ee5a9acb87..28f26a5cb0 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4198,3 +4198,16 @@ Entries:
       message: Peacock Tails have been added for Harpies
   id: 6124
   time: '2024-06-20T22:07:29.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        NanoTrasen has disabled the unneeded safeties on your guns- Make sure
+        you're careful with them!
+    - type: Tweak
+      message: >-
+        All Firearms now have a reliability stat, some are more reliable than
+        others. The more reliable a weapon is, the less likely it is to
+        accidentally discharge when yeeted.
+  id: 6125
+  time: '2024-06-20T22:17:03.0000000+00:00'

From 21771608f47ee59cef7d6ae0cdb060ecec22e90b Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 18:24:30 -0400
Subject: [PATCH 67/84] Port Random Bark System (#466)

# Description

https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/pull/11

Later, I would like to have this system not just for animals, but for
implementations of humanoid NPCs, since it can just as easily be used
for human NPCs.
I could make space bandits that CHEEKI BREEKI at people.

# Changelog

:cl: DEATHB4DEFEAT
- add: Animals will no longer be a silent, soulless shell

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
---
 .../Speech/Components/RandomBarkComponent.cs  | 63 ++++++++++++++++++
 .../Speech/Systems/RandomBarkSystem.cs        | 47 ++++++++++++++
 .../Prototypes/Entities/Mobs/NPCs/animals.yml | 65 +++++++++++++++++++
 .../Prototypes/Entities/Mobs/NPCs/pets.yml    |  4 ++
 .../Entities/Mobs/NPCs/simplemob.yml          |  1 +
 5 files changed, 180 insertions(+)
 create mode 100644 Content.Server/Speech/Components/RandomBarkComponent.cs
 create mode 100644 Content.Server/Speech/Systems/RandomBarkSystem.cs

diff --git a/Content.Server/Speech/Components/RandomBarkComponent.cs b/Content.Server/Speech/Components/RandomBarkComponent.cs
new file mode 100644
index 0000000000..7229428f53
--- /dev/null
+++ b/Content.Server/Speech/Components/RandomBarkComponent.cs
@@ -0,0 +1,63 @@
+namespace Content.Server.Speech.Components;
+
+/// <summary>
+///     Sends a random message from a list with a provided min/max time.
+/// </summary>
+[RegisterComponent]
+public sealed partial class RandomBarkComponent : Component
+{
+    /// <summary>
+    ///     Should the message be sent to the chat log?
+    /// </summary>
+    [DataField]
+    public bool ChatLog = false;
+
+    /// <summary>
+    ///     Minimum time an animal will go without speaking
+    /// </summary>
+    [DataField]
+    public int MinTime = 45;
+
+    /// <summary>
+    ///     Maximum time an animal will go without speaking
+    /// </summary>
+    [DataField]
+    public int MaxTime = 350;
+
+    /// <summary>
+    ///     Accumulator for counting time since the last bark
+    /// </summary>
+    [DataField]
+    public float BarkAccumulator = 8f;
+
+    /// <summary>
+    ///     Multiplier applied to the random time. Good for changing the frequency without having to specify exact values
+    /// </summary>
+    [DataField]
+    public float BarkMultiplier = 1f;
+
+    /// <summary>
+    ///     List of things to be said. Filled with garbage to be modified by an accent, but can be specified in the .yml
+    /// </summary>
+    [DataField]
+    public IReadOnlyList<string> Barks = new[]
+    {
+        "Bark",
+        "Boof",
+        "Woofums",
+        "Rawrl",
+        "Eeeeeee",
+        "Barkums",
+        "Awooooooooooooooooooo awoo awoooo",
+        "Grrrrrrrrrrrrrrrrrr",
+        "Rarrwrarrwr",
+        "Goddamn I love gold fish crackers",
+        "Bork bork boof boof bork bork boof boof boof bork",
+        "Bark",
+        "Boof",
+        "Woofums",
+        "Rawrl",
+        "Eeeeeee",
+        "Barkums",
+    };
+}
diff --git a/Content.Server/Speech/Systems/RandomBarkSystem.cs b/Content.Server/Speech/Systems/RandomBarkSystem.cs
new file mode 100644
index 0000000000..4fc9dd420d
--- /dev/null
+++ b/Content.Server/Speech/Systems/RandomBarkSystem.cs
@@ -0,0 +1,47 @@
+using Content.Server.Chat.Systems;
+using Content.Shared.Mind.Components;
+using Robust.Shared.Random;
+using Content.Server.Speech.Components;
+
+namespace Content.Server.Speech.Systems;
+
+public sealed class RandomBarkSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly EntityManager _entity = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RandomBarkComponent, ComponentInit>(OnInit);
+    }
+
+
+    private void OnInit(EntityUid uid, RandomBarkComponent barker, ComponentInit args)
+    {
+        barker.BarkAccumulator = _random.NextFloat(barker.MinTime, barker.MaxTime) * barker.BarkMultiplier;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<RandomBarkComponent>();
+        while (query.MoveNext(out var uid, out var barker))
+        {
+            barker.BarkAccumulator -= frameTime;
+            if (barker.BarkAccumulator > 0)
+                continue;
+
+            barker.BarkAccumulator = _random.NextFloat(barker.MinTime, barker.MaxTime) * barker.BarkMultiplier;
+            if (_entity.TryGetComponent<MindContainerComponent>(uid, out var actComp) &&
+                actComp.HasMind)
+                continue;
+
+            _chat.TrySendInGameICMessage(uid, _random.Pick(barker.Barks), InGameICChatType.Speak, barker.ChatLog ? ChatTransmitRange.Normal : ChatTransmitRange.HideChat);
+        }
+    }
+}
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 378b3f8a9d..93e19a829d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -61,6 +61,7 @@
   - type: Tag
     tags:
     - VimPilot
+  - type: RandomBark
 
 - type: entity
   name: bee
@@ -129,6 +130,13 @@
         - ReagentId: GroundBee
           Quantity: 5
   - type: ZombieImmune
+  - type: RandomBark
+    barks:
+      - Bzzzzz
+      - Bzzz bzzz
+      - Bzzzzzzzzzzzz
+      - Bzz
+    barkMultiplier: 1.5
 
 - type: entity
   name: bee
@@ -236,6 +244,7 @@
   - type: NpcFactionMember
     factions:
     - Passive
+  - type: RandomBark
 
 - type: entity
   parent: MobChicken
@@ -608,6 +617,8 @@
   - type: NpcFactionMember
     factions:
     - Passive
+  - type: RandomBark
+    barkMultiplier: 0.7
 
 - type: entity
   name: white duck #Quack
@@ -787,6 +798,16 @@
   - type: GuideHelp
     guides:
     - Chef
+  - type: RandomBark
+    barks:
+      - Mooooooo
+      - Moo
+      - Huff
+      - Mooooooooooo
+      - Moooooo
+      - Moooo
+    barkMultiplier: 3
+
 
 - type: entity
   name: crab
@@ -852,6 +873,12 @@
       task: RuminantCompound
   - type: Body
     prototype: AnimalHemocyanin
+  - type: RandomBark
+    barks:
+      - click clack
+      - clack
+      - clickity clack
+      - clack clack
 
 - type: entity
   name: goat
@@ -1446,6 +1473,8 @@
     makeSentient: true
     name: ghost-role-information-kobold-name
     description: ghost-role-information-kobold-description
+  - type: RandomBark
+    barkMultiplier: 0.65
 
 - type: entity
   name: guidebook monkey
@@ -1605,6 +1634,8 @@
   - type: BadFood
   - type: NonSpreaderZombie
   - type: PreventSpiller
+  - type: RandomBark
+    barkMultiplier: 0.3
 
 - type: entity
   parent: MobMouse
@@ -1840,6 +1871,18 @@
   - type: Tag
     tags:
     - VimPilot
+  - type: RandomBark
+    barkMultiplier: 1.3
+    barks:
+      - Croooaaaakkk
+      - Ribbit
+      - Ribbit
+      - Ribbit
+      - Crooaak
+      - Ribbit
+      - Ribbit
+      - Ribbit
+      - Bibbit
 
 # Would be cool to have some functionality for the parrot to be able to sit on stuff
 - type: entity
@@ -1953,6 +1996,10 @@
     heatDamage:
       types:
         Heat : 0.2 #per second, scales with temperature & other constants
+  - type: RandomBark
+    barks:
+      - Wank
+    barkMultiplier: 0.6
 
 - type: entity
   name: grenade penguin
@@ -2068,6 +2115,14 @@
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Scale
+  - type: RandomBark
+    barkMultiplier: 1.5
+    barks:
+      - Hsssssss
+      - Hss
+      - Hsssss
+      - Hisss
+      - Hshsss
 
 # Code unique spider prototypes or combine them all into one spider and get a
 # random sprite state when you spawn it.
@@ -2192,6 +2247,7 @@
       groups:
         Brute: -0.07
         Burn: -0.07
+  - type: RandomBark
 
 - type: entity
   name: tarantula
@@ -2536,6 +2592,7 @@
   - type: Tag
     tags:
     - VimPilot
+  - type: RandomBark
 
 - type: entity
   name: corrupted corgi
@@ -2692,6 +2749,7 @@
   - type: Tag
     tags:
     - VimPilot
+  - type: RandomBark
 
 - type: entity
   name: calico cat
@@ -2880,6 +2938,10 @@
   - type: Tag
     tags:
     - VimPilot
+  - type: RandomBark
+    barkMultiplier: 10
+    barks:
+      - Sloth
 
 - type: entity
   name: ferret
@@ -3076,6 +3138,8 @@
   - type: MobPrice
     price: 60
   - type: NonSpreaderZombie
+  - type: RandomBark
+    barkMultiplier: 0.45
 
 - type: entity
   name: pig
@@ -3236,3 +3300,4 @@
   components:
   - type: ReplacementAccent
     accent: nymph
+  - type: RandomBark
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 9981bb8bd9..274765a193 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -307,6 +307,8 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalMcGriff
+  - type: RandomBark
+    barkMultiplier: 1.3
 
 - type: entity
   name: Paperwork
@@ -406,6 +408,8 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalWalter
+  - type: RandomBark
+    barkMultiplier: 1.1
 
 - type: entity
   name: Morty
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 12ea40b1e3..8e84f46a69 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -104,3 +104,4 @@
   - type: MobPrice
     price: 150
   - type: FloatingVisuals
+  - type: Speech

From a17fb083518d1c14dc0d985791a65013804521c9 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Thu, 20 Jun 2024 22:24:53 +0000
Subject: [PATCH 68/84] Automatic Changelog Update (#466)

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 28f26a5cb0..d5adef7372 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4211,3 +4211,9 @@ Entries:
         accidentally discharge when yeeted.
   id: 6125
   time: '2024-06-20T22:17:03.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Add
+      message: Animals will no longer be a silent, soulless shell
+  id: 6126
+  time: '2024-06-20T22:24:30.0000000+00:00'

From 80217d6bf495d026e17a4544f481b6559e199956 Mon Sep 17 00:00:00 2001
From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com>
Date: Thu, 20 Jun 2024 15:25:18 -0700
Subject: [PATCH 69/84] Mirror 26250: Make all implants unable to be implanted
 more than once (#445)

## Mirror of PR #26250: [Make all implants unable to be implanted more
than once](https://github.com/space-wizards/space-station-14/pull/26250)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `771390bb6741074935e5f24c0aa9c87bc7b5ad09`

PR opened by <img
src="https://avatars.githubusercontent.com/u/63975668?v=4"
width="16"/><a href="https://github.com/Simyon264"> Simyon264</a> at
2024-03-19 00:44:21 UTC - merged at 2024-03-26 00:16:19 UTC

---

PR changed 3 files with 28 additions and 0 deletions.

The PR had the following labels:
- Status: Needs Review


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
>
> ## About the PR
> This PR makes mind shields unable to be implanted more than once.
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> PJB complained and people waste implants by injecting already injected
people.
>
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> Adds a new datafield to the Implanter component which is checked in
implanter system.
>
> ## Media
> <!--
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
>
> If you're unsure whether your PR will require media, ask a maintainer.
>
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
>
![image](https://github.com/space-wizards/space-station-14/assets/63975668/4907ddb2-de2f-490c-a35d-07c4f3b6c79b)
>
> - [x] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> N/A
>
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
>
> :cl: Simyon
> - tweak: All implants are now unable to be implanted more than once.
>


</details>

Co-authored-by: SimpleStation14 <Unknown>
---
 Content.Server/Implants/ImplanterSystem.cs    | 21 +++++++++++++++++++
 .../Implants/Components/ImplanterComponent.cs |  6 ++++++
 Resources/Locale/en-US/implant/implant.ftl    |  1 +
 3 files changed, 28 insertions(+)

diff --git a/Content.Server/Implants/ImplanterSystem.cs b/Content.Server/Implants/ImplanterSystem.cs
index 0d46241f41..3cfa3a9f5f 100644
--- a/Content.Server/Implants/ImplanterSystem.cs
+++ b/Content.Server/Implants/ImplanterSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Popups;
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
@@ -57,6 +58,17 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
                 return;
             }
 
+            // Check if we are trying to implant a implant which is already implanted
+            if (implant.HasValue && !component.AllowMultipleImplants && CheckSameImplant(target, implant.Value))
+            {
+                var name = Identity.Name(target, EntityManager, args.User);
+                var msg = Loc.GetString("implanter-component-implant-already", ("implant", implant), ("target", name));
+                _popup.PopupEntity(msg, target, args.User);
+                args.Handled = true;
+                return;
+            }
+
+
             //Implant self instantly, otherwise try to inject the target.
             if (args.User == target)
                 Implant(target, target, uid, component);
@@ -67,6 +79,15 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
         args.Handled = true;
     }
 
+    public bool CheckSameImplant(EntityUid target, EntityUid implant)
+    {
+        if (!TryComp<ImplantedComponent>(target, out var implanted))
+            return false;
+
+        var implantPrototype = Prototype(implant);
+        return implanted.ImplantContainer.ContainedEntities.Any(entity => Prototype(entity) == implantPrototype);
+    }
+
     /// <summary>
     /// Attempt to implant someone else.
     /// </summary>
diff --git a/Content.Shared/Implants/Components/ImplanterComponent.cs b/Content.Shared/Implants/Components/ImplanterComponent.cs
index 32a3636163..80330aa7e6 100644
--- a/Content.Shared/Implants/Components/ImplanterComponent.cs
+++ b/Content.Shared/Implants/Components/ImplanterComponent.cs
@@ -70,6 +70,12 @@ public sealed partial class ImplanterComponent : Component
     [DataField]
     public (string, string) ImplantData;
 
+    /// <summary>
+    /// Determines if the same type of implant can be implanted into an entity multiple times.
+    /// </summary>
+    [DataField]
+    public bool AllowMultipleImplants = false;
+
     /// <summary>
     /// The <see cref="ItemSlot"/> for this implanter
     /// </summary>
diff --git a/Resources/Locale/en-US/implant/implant.ftl b/Resources/Locale/en-US/implant/implant.ftl
index 22db4460af..2f6ab9e4e2 100644
--- a/Resources/Locale/en-US/implant/implant.ftl
+++ b/Resources/Locale/en-US/implant/implant.ftl
@@ -4,6 +4,7 @@ implanter-component-implanting-target = {$user} is trying to implant you with so
 implanter-component-implant-failed = The {$implant} cannot be given to {$target}!
 implanter-draw-failed-permanent = The {$implant} in {$target} is fused with them and cannot be removed!
 implanter-draw-failed = You tried to remove an implant but found nothing.
+implanter-component-implant-already = {$target} already has the {$implant}!
 
 ## UI
 implanter-draw-text = Draw

From 87084f898a101d22f9ae4d8260d257ef3870bb42 Mon Sep 17 00:00:00 2001
From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com>
Date: Thu, 20 Jun 2024 15:26:05 -0700
Subject: [PATCH 70/84] Mirror: Bumps LoneOps minimum required players to 20
 (#263)

## Mirror of PR #26244: [Bumps LoneOps minimum required players to
20](https://github.com/space-wizards/space-station-14/pull/26244) from
<img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `61e31f4062b568591448ff5be83ba8be851269e9`

PR opened by <img
src="https://avatars.githubusercontent.com/u/149967078?v=4"
width="16"/><a href="https://github.com/Boaz1111"> Boaz1111</a> at
2024-03-18 20:52:10 UTC

---

PR changed 1 files with 1 additions and 1 deletions.

The PR had the following labels:
- No C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
>
> ## About the PR
> <!-- What did you change in this PR? -->
> I bumped LoneOps minimum required players to 20
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> It was at 10, and loneops are extremely dangerous especially if
there's no sec.
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
>
> ## Media
> <!--
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
>
> If you're unsure whether your PR will require media, ask a maintainer.
>
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
>
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
>
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
>
> <!--
> Make sure to take this Changelog template out of the comment block in
order for it to show up.
> :cl:
> - add: Added fun!
> - remove: Removed fun!
> - tweak: Changed fun!
> - fix: Fixed fun!
> -->
> :cl: Boaz1111
> - tweak: Lone operatives now require a minimum of 20 players to spawn


</details>

Co-authored-by: SimpleStation14 <Unknown>
---
 Resources/Prototypes/GameRules/events.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 6812ca14f7..00ad5f54ea 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -418,9 +418,9 @@
   noSpawn: true
   components:
   - type: StationEvent
-    earliestStart: 60 # DeltaV - was 45
-    weight: 3 # DeltaV - was 5
-    minimumPlayers: 10
+    earliestStart: 60
+    weight: 3
+    minimumPlayers: 20
     reoccurrenceDelay: 30
     duration: 1
   - type: LoneOpsSpawnRule

From ff9fe083dc4c5ad1518a08e19510d9278e78e3b9 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Date: Thu, 20 Jun 2024 16:39:30 -0700
Subject: [PATCH 71/84] Trait Points (#434)

Some improvements to loadouts too.

---

- [x] Points logic
- [x] Server-side validation
- [x] Categorize traits
- [x] Assign points to traits
- [x] Header costs
- [x] Sort entries
- [x] Max traits
	- [x] Communicate max traits
- [x] Point bar
- [x] Group exclusivity
- Black outline on text
- [x] Fix existing component whitelists

---

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/c0ab2fbf-3bce-4e54-81d5-8e546d6b3c0b)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/09a3948e-0c9f-4f57-b297-f62063b11845)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/35d76095-0714-4613-a17b-73df25a9a832)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/87149e5c-0af2-4ac0-bbde-52f317a008a0)

</p>
</details>

---

:cl:
- add: Added trait points
- add: Added categories for traits

---------

Co-authored-by: VMSolidus <evilexecutive@gmail.com>
---
 .../Preferences/UI/HumanoidProfileEditor.xaml |  21 +-
 .../UI/HumanoidProfileEditor.xaml.cs          | 555 ++++++++++++++----
 Content.Client/Traits/ParacusiaSystem.cs      |   3 +-
 Content.Server/Flash/FlashSystem.cs           |   2 +-
 .../Events/MassHallucinationsRule.cs          |   2 +-
 .../Traits/Assorted/ParacusiaSystem.cs        |   2 +
 Content.Server/Traits/TraitSystem.cs          |  40 +-
 .../Zombies/ZombieSystem.Transform.cs         |   2 +-
 Content.Shared/CCVar/CCVars.cs                |  24 +-
 .../Prototypes/LoadoutCategoryPrototype.cs    |   1 +
 .../Loadouts/Prototypes/LoadoutPrototype.cs   |   6 +-
 .../Loadouts/Systems/LoadoutRequirements.cs   | 376 ------------
 .../Loadouts/Systems/LoadoutSystem.cs         |  40 +-
 .../Systems/CharacterRequirements.cs          | 529 +++++++++++++++++
 .../Systems/CharacterRequirementsSystem.cs    |  43 ++
 Content.Shared/Drunk/DrunkSystem.cs           |   2 +-
 .../Preferences/HumanoidCharacterProfile.cs   |  53 +-
 .../{ => Components}/AccentlessComponent.cs   |   2 +-
 .../LegsParalyzedComponent.cs                 |   5 +-
 .../LightweightDrunkComponent.cs              |   4 +-
 .../{ => Components}/ParacusiaComponent.cs    |   3 +-
 .../PermanentBlindnessComponent.cs            |   2 +-
 .../Traits/Assorted/LegsParalyzedSystem.cs    |  58 --
 .../{ => Systems}/AccentlessSystem.cs         |   8 +-
 .../Assorted/Systems/LegsParalyzedSystem.cs   |  58 ++
 .../{ => Systems}/PermanentBlindnessSystem.cs |  20 +-
 .../{ => Systems}/SharedParacusiaSystem.cs    |   2 +-
 .../Prototypes/TraitCategoryPrototype.cs      |  14 +
 .../Traits/Prototypes/TraitPrototype.cs       |  39 ++
 Content.Shared/Traits/TraitPrototype.cs       |  55 --
 .../customization/character-requirements.ftl  |  39 ++
 .../Locale/en-US/deltav/traits/traits.ftl     |  16 +-
 .../Locale/en-US/loadouts/categories.ftl      |   4 +-
 .../en-US/loadouts/loadout-requirements.ftl   |  13 -
 .../ui/humanoid-profile-editor.ftl            |  26 +-
 .../simplestation14/Traits/disabilities.ftl   |   5 +-
 Resources/Locale/en-US/traits/categories.ftl  |   8 +
 Resources/Locale/en-US/traits/traits.ftl      |  43 +-
 .../Prototypes/DeltaV/Traits/altvision.yml    |   8 +-
 .../Prototypes/DeltaV/Traits/neutral.yml      |   7 +-
 .../Loadouts/Jobs/Heads/captain.yml           |  26 +-
 .../Loadouts/Jobs/Heads/chiefEngineer.yml     |   8 +-
 .../Jobs/Heads/chiefMedicalOfficer.yml        |  12 +-
 .../Loadouts/Jobs/Heads/headOfPersonnel.yml   |  18 +-
 .../Loadouts/Jobs/Heads/headOfSecurity.yml    |  30 +-
 .../Loadouts/Jobs/Heads/quarterMaster.yml     |  12 +-
 .../Loadouts/Jobs/Heads/researchDirector.yml  |  10 +-
 Resources/Prototypes/Loadouts/Jobs/cargo.yml  |   4 +-
 .../Prototypes/Loadouts/Jobs/engineering.yml  |  36 +-
 .../Prototypes/Loadouts/Jobs/medical.yml      |  46 +-
 .../Prototypes/Loadouts/Jobs/science.yml      |  18 +-
 .../Prototypes/Loadouts/Jobs/security.yml     |  26 +-
 .../Prototypes/Loadouts/Jobs/service.yml      |  30 +-
 Resources/Prototypes/Loadouts/categories.yml  |   6 +-
 Resources/Prototypes/Loadouts/uniform.yml     |   2 +-
 .../SimpleStation14/Traits/disabilities.yml   |  15 +-
 Resources/Prototypes/Traits/categories.yml    |  19 +
 Resources/Prototypes/Traits/disabilities.yml  |  76 ++-
 .../Prototypes/Traits/inconveniences.yml      |  18 +-
 Resources/Prototypes/Traits/neutral.yml       |  25 +-
 60 files changed, 1627 insertions(+), 950 deletions(-)
 delete mode 100644 Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
 create mode 100644 Content.Shared/Customization/Systems/CharacterRequirements.cs
 create mode 100644 Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
 rename Content.Shared/Traits/Assorted/{ => Components}/AccentlessComponent.cs (89%)
 rename Content.Shared/Traits/Assorted/{ => Components}/LegsParalyzedComponent.cs (65%)
 rename Content.Shared/Traits/Assorted/{ => Components}/LightweightDrunkComponent.cs (90%)
 rename Content.Shared/Traits/Assorted/{ => Components}/ParacusiaComponent.cs (93%)
 rename Content.Shared/Traits/Assorted/{ => Components}/PermanentBlindnessComponent.cs (81%)
 delete mode 100644 Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
 rename Content.Shared/Traits/Assorted/{ => Systems}/AccentlessSystem.cs (62%)
 create mode 100644 Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
 rename Content.Shared/Traits/Assorted/{ => Systems}/PermanentBlindnessSystem.cs (59%)
 rename Content.Shared/Traits/Assorted/{ => Systems}/SharedParacusiaSystem.cs (56%)
 create mode 100644 Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
 create mode 100644 Content.Shared/Traits/Prototypes/TraitPrototype.cs
 delete mode 100644 Content.Shared/Traits/TraitPrototype.cs
 create mode 100644 Resources/Locale/en-US/customization/character-requirements.ftl
 delete mode 100644 Resources/Locale/en-US/loadouts/loadout-requirements.ftl
 create mode 100644 Resources/Locale/en-US/traits/categories.ftl
 create mode 100644 Resources/Prototypes/Traits/categories.yml

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index 9a70d67831..38d4a411ff 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -142,18 +142,29 @@
                         <BoxContainer Name="CAntagList" Orientation="Vertical" />
                     </ScrollContainer>
                 </BoxContainer>
-                <BoxContainer Orientation="Vertical" Margin="10">
+                <BoxContainer Name="CTraitsTab" Orientation="Vertical" Margin="10">
                     <!-- Traits -->
-                    <ScrollContainer VerticalExpand="True">
-                        <BoxContainer Name="CTraitsList" Orientation="Vertical" />
-                    </ScrollContainer>
+                    <Label Name="TraitPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
+                    <ProgressBar Name="TraitPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
+
+                    <Button Name="TraitsShowUnusableButton"
+                            Text="{Loc 'humanoid-profile-editor-traits-show-unusable-button'}"
+                            ToolTip="{Loc 'humanoid-profile-editor-traits-show-unusable-button-tooltip'}"
+                            ToggleMode="True"
+                            Margin="0 0 0 5" />
+
+                    <TabContainer Name="CTraitsTabs" VerticalExpand="True" />
                 </BoxContainer>
                 <BoxContainer Name="CLoadoutsTab" Orientation="Vertical" Margin="10">
                     <!-- Loadouts -->
                     <Label Name="LoadoutPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
                     <ProgressBar Name="LoadoutPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
 
-                    <Button Name="CHideShowUnusableButton" Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}" ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}" ToggleMode="True" Margin="0 0 0 5" />
+                    <Button Name="LoadoutsShowUnusableButton"
+                            Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}"
+                            ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}"
+                            ToggleMode="True"
+                            Margin="0 0 0 5" />
 
                     <TabContainer Name="CLoadoutsTabs" VerticalExpand="True" />
                 </BoxContainer>
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 8b88fc1e9b..fd84b67522 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -12,6 +12,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Clothing.Loadouts.Prototypes;
 using Content.Shared.Clothing.Loadouts.Systems;
+using Content.Shared.Customization.Systems;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
@@ -61,6 +62,7 @@ public sealed partial class HumanoidProfileEditor : Control
         private readonly IConfigurationManager _configurationManager;
         private readonly MarkingManager _markingManager;
         private readonly JobRequirementsManager _requirements;
+        private readonly CharacterRequirementsSystem _characterRequirementsSystem;
         private readonly LoadoutSystem _loadoutSystem;
 
         private LineEdit _ageEdit => CAgeEdit;
@@ -83,10 +85,15 @@ public sealed partial class HumanoidProfileEditor : Control
         private TabContainer _tabContainer => CTabContainer;
         private BoxContainer _jobList => CJobList;
         private BoxContainer _antagList => CAntagList;
-        private BoxContainer _traitsList => CTraitsList;
+        private Label _traitPointsLabel => TraitPointsLabel;
+        private int _traitCount;
+        private ProgressBar _traitPointsBar => TraitPointsBar;
+        private Button _traitsShowUnusableButton => TraitsShowUnusableButton;
+        private BoxContainer _traitsTab => CTraitsTab;
+        private TabContainer _traitsTabs => CTraitsTabs;
         private Label _loadoutPointsLabel => LoadoutPointsLabel;
         private ProgressBar _loadoutPointsBar => LoadoutPointsBar;
-        private Button _loadoutsShowUnusableButton => CHideShowUnusableButton;
+        private Button _loadoutsShowUnusableButton => LoadoutsShowUnusableButton;
         private BoxContainer _loadoutsTab => CLoadoutsTab;
         private TabContainer _loadoutsTabs => CLoadoutsTabs;
         private readonly List<JobPrioritySelector> _jobPriorities;
@@ -124,6 +131,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _preferencesManager = preferencesManager;
             _configurationManager = configurationManager;
             _markingManager = IoCManager.Resolve<MarkingManager>();
+            _characterRequirementsSystem = EntitySystem.Get<CharacterRequirementsSystem>();
             _loadoutSystem = EntitySystem.Get<LoadoutSystem>();
 
             SpeciesInfoButton.ToolTip = Loc.GetString("humanoid-profile-editor-guidebook-button-tooltip");
@@ -444,33 +452,19 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             #region Traits
 
-            var traits = prototypeManager.EnumeratePrototypes<TraitPrototype>().OrderBy(t => Loc.GetString(t.Name)).ToList();
-            _traitPreferences = new List<TraitPreferenceSelector>();
+            // Set up the traits tab
             _tabContainer.SetTabTitle(3, Loc.GetString("humanoid-profile-editor-traits-tab"));
+            _traitPreferences = new List<TraitPreferenceSelector>();
 
-            if (traits.Count > 0)
-            {
-                foreach (var trait in traits)
-                {
-                    var selector = new TraitPreferenceSelector(trait);
-                    _traitsList.AddChild(selector);
-                    _traitPreferences.Add(selector);
+            // Show/Hide the traits tab if they ever get enabled/disabled
+            var traitsEnabled = _configurationManager.GetCVar(CCVars.GameTraitsEnabled);
+            _tabContainer.SetTabVisible(3, traitsEnabled);
+            _configurationManager.OnValueChanged(CCVars.GameTraitsEnabled,
+                enabled => _tabContainer.SetTabVisible(3, enabled));
 
-                    selector.PreferenceChanged += preference =>
-                    {
-                        Profile = Profile?.WithTraitPreference(trait.ID, preference);
-                        IsDirty = true;
-                    };
-                }
-            }
-            else
-            {
-                _traitsList.AddChild(new Label
-                {
-                    Text = "No traits available :(",
-                    FontColorOverride = Color.Gray,
-                });
-            }
+            _traitsShowUnusableButton.OnToggled += args => UpdateTraits(args.Pressed);
+
+            UpdateTraits(false);
 
             #endregion
 
@@ -480,14 +474,17 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _tabContainer.SetTabTitle(4, Loc.GetString("humanoid-profile-editor-loadouts-tab"));
             _loadoutPreferences = new List<LoadoutPreferenceSelector>();
 
-            // Show/Hide loadouts tab if they ever get enabled/disabled
+            // Show/Hide the loadouts tab if they ever get enabled/disabled
             var loadoutsEnabled = _configurationManager.GetCVar(CCVars.GameLoadoutsEnabled);
             _tabContainer.SetTabVisible(4, loadoutsEnabled);
             ShowLoadouts.Visible = loadoutsEnabled;
-            _configurationManager.OnValueChanged(CCVars.GameLoadoutsEnabled, enabled => LoadoutsChanged(enabled));
+            _configurationManager.OnValueChanged(CCVars.GameLoadoutsEnabled,
+                enabled => LoadoutsChanged(enabled));
 
             _loadoutsShowUnusableButton.OnToggled += args => UpdateLoadouts(args.Pressed);
 
+            UpdateLoadouts(false);
+
             #endregion
 
             #region Save
@@ -542,8 +539,6 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _previewDummy = _entMan.SpawnEntity(dollProto, MapCoordinates.Nullspace);
             _previewSpriteView.SetEntity(_previewDummy);
 
-            UpdateLoadouts(false); // Initial UpdateLoadouts call has to have a dummy to get information from
-
             #endregion Dummy
 
             #endregion Left
@@ -562,6 +557,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             IsDirty = false;
         }
 
+
         private void LoadoutsChanged(bool enabled)
         {
             _tabContainer.SetTabVisible(4, enabled);
@@ -1449,12 +1445,264 @@ private void UpdateAntagPreferences()
 
         private void UpdateTraitPreferences()
         {
+            var points = _configurationManager.GetCVar(CCVars.GameTraitsDefaultPoints);
+            _traitCount = 0;
+
             foreach (var preferenceSelector in _traitPreferences)
             {
                 var traitId = preferenceSelector.Trait.ID;
                 var preference = Profile?.TraitPreferences.Contains(traitId) ?? false;
 
                 preferenceSelector.Preference = preference;
+
+                if (!preference)
+                    continue;
+
+                points += preferenceSelector.Trait.Points;
+                _traitCount += 1;
+            }
+
+            _traitPointsBar.Value = points;
+            _traitPointsLabel.Text = Loc.GetString("humanoid-profile-editor-traits-header",
+                ("points", points), ("traits", _traitCount),
+                ("maxTraits", _configurationManager.GetCVar(CCVars.GameTraitsMax)));
+        }
+
+        // Yeah this is mostly just copied from UpdateLoadouts
+        // This whole file is bad though and a lot of loadout code came from traits originally
+        //TODO Make this file not hell
+        private void UpdateTraits(bool showUnusable)
+        {
+            // Reset trait points so you don't get -14 points or something for no reason
+            var points = _configurationManager.GetCVar(CCVars.GameTraitsDefaultPoints);
+            _traitPointsLabel.Text = Loc.GetString("humanoid-profile-editor-traits-header",
+                ("points", points), ("traits", 0),
+                ("maxTraits", _configurationManager.GetCVar(CCVars.GameTraitsMax)));
+            _traitPointsBar.MaxValue = points;
+            _traitPointsBar.Value = points;
+
+            // Clear current listings
+            _traitPreferences.Clear();
+            _traitsTabs.DisposeAllChildren();
+
+
+            // Get the highest priority job to use for trait filtering
+            var highJob = _jobPriorities.FirstOrDefault(j => j.Priority == JobPriority.High);
+
+            // Get all trait prototypes
+            var enumeratedTraits = _prototypeManager.EnumeratePrototypes<TraitPrototype>().ToList();
+            // Get all trait categories
+            var categories = _prototypeManager.EnumeratePrototypes<TraitCategoryPrototype>().ToList();
+
+            // If showUnusable is false filter out traits that are unusable based on your current character setup
+            var traits = enumeratedTraits.Where(trait =>
+                showUnusable || // Ignore everything if this is true
+                _characterRequirementsSystem.CheckRequirementsValid(
+                    trait,
+                    trait.Requirements,
+                    highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                    new Dictionary<string, TimeSpan>(), //TODO Make this use real playtimes
+                    _entMan,
+                    _prototypeManager,
+                    _configurationManager,
+                    out _
+                )
+            ).ToList();
+
+            // Traits to highlight red when showUnusable is true
+            var traitsUnusable = enumeratedTraits.Where(trait =>
+                _characterRequirementsSystem.CheckRequirementsValid(
+                    trait,
+                    trait.Requirements,
+                    highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                    new Dictionary<string, TimeSpan>(),
+                    _entMan,
+                    _prototypeManager,
+                    _configurationManager,
+                    out _
+                )
+            ).ToList();
+
+            // Every trait not in the traits list
+            var otherTraits = enumeratedTraits.Where(trait => !traits.Contains(trait)).ToList();
+
+
+            if (traits.Count == 0)
+            {
+                _traitsTab.AddChild(new Label { Text = Loc.GetString("humanoid-profile-editor-traits-no-traits") });
+                return;
+            }
+
+            // Make Uncategorized category
+            var uncategorized = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                VerticalExpand = true,
+                Name = "Uncategorized_0",
+                // I hate ScrollContainers
+                Children =
+                {
+                    new ScrollContainer
+                    {
+                        HScrollEnabled = false,
+                        HorizontalExpand = true,
+                        VerticalExpand = true,
+                        Children =
+                        {
+                            new BoxContainer
+                            {
+                                Orientation = LayoutOrientation.Vertical,
+                                HorizontalExpand = true,
+                                VerticalExpand = true,
+                            },
+                        },
+                    },
+                },
+            };
+
+            _traitsTabs.AddChild(uncategorized);
+            _traitsTabs.SetTabTitle(0, Loc.GetString("trait-category-Uncategorized"));
+
+
+            // Make categories
+            var currentCategory = 1; // 1 because we already made 0 as Uncategorized, I am not not zero-indexing :)
+            foreach (var category in categories.OrderBy(c => Loc.GetString($"trait-category-{c.ID}")))
+            {
+                // Check for existing category
+                BoxContainer? match = null;
+                foreach (var child in _traitsTabs.Children)
+                {
+                    if (string.IsNullOrEmpty(child.Name))
+                        continue;
+
+                    if (child.Name.Split("_")[0] == category.ID)
+                        match = (BoxContainer) child;
+                }
+
+                // If there is a category do nothing
+                if (match != null)
+                    continue;
+
+                // If not, make it
+                var box = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Vertical,
+                    VerticalExpand = true,
+                    Name = $"{category.ID}_{currentCategory}",
+                    // I hate ScrollContainers
+                    Children =
+                    {
+                        new ScrollContainer
+                        {
+                            HScrollEnabled = false,
+                            HorizontalExpand = true,
+                            VerticalExpand = true,
+                            Children =
+                            {
+                                new BoxContainer
+                                {
+                                    Orientation = LayoutOrientation.Vertical,
+                                    HorizontalExpand = true,
+                                    VerticalExpand = true,
+                                },
+                            },
+                        },
+                    },
+                };
+
+                _traitsTabs.AddChild(box);
+                _traitsTabs.SetTabTitle(currentCategory, Loc.GetString($"trait-category-{category.ID}"));
+                currentCategory++;
+            }
+
+
+            // Fill categories
+            foreach (var trait in traits.OrderBy(t => -t.Points).ThenBy(t => Loc.GetString($"trait-name-{t.ID}")))
+            {
+                var selector = new TraitPreferenceSelector(trait, highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                    traitsUnusable.Contains(trait) ? "" : "ButtonColorRed",
+                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
+
+                // Look for an existing trait category
+                BoxContainer? match = null;
+                foreach (var child in _traitsTabs.Children)
+                {
+                    if (string.IsNullOrEmpty(child.Name))
+                        continue;
+
+                    // This is fucked up
+                    if (child.Name.Split("_")[0] == trait.Category
+                        && child.Children.FirstOrDefault()?.Children.FirstOrDefault(g =>
+                            g.GetType() == typeof(BoxContainer)) is {} g != default)
+                        match = (BoxContainer) g;
+                }
+
+                // If there is no category put it in Uncategorized
+                if (string.IsNullOrEmpty(match?.Parent?.Parent?.Name)
+                    || match.Parent.Parent.Name.Split("_")[0] != trait.Category)
+                    uncategorized.AddChild(selector);
+                else
+                    match.AddChild(selector);
+
+
+                AddSelector(selector, trait.Points, trait.ID);
+            }
+
+            // Add the selected unusable traits to the point counter
+            foreach (var trait in otherTraits.OrderBy(t => -t.Points).ThenBy(t => Loc.GetString($"trait-name-{t.ID}")))
+            {
+                var selector = new TraitPreferenceSelector(trait, highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "",
+                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
+
+
+                AddSelector(selector, trait.Points, trait.ID);
+            }
+
+
+            // Hide Uncategorized tab if it's empty, other tabs already shouldn't exist if they're empty
+            _traitsTabs.SetTabVisible(0, uncategorized.Children.Any());
+
+            // Add fake tabs until tab container is happy
+            for (var i = _traitsTabs.ChildCount - 1; i < _traitsTabs.CurrentTab; i++)
+            {
+                _traitsTabs.AddChild(new BoxContainer());
+                _traitsTabs.SetTabVisible(i + 1, false);
+            }
+
+            UpdateTraitPreferences();
+            return;
+
+
+            void AddSelector(TraitPreferenceSelector selector, int points, string id)
+            {
+                if (points > 0)
+                    _traitPointsBar.MaxValue += points;
+
+                _traitPreferences.Add(selector);
+                selector.PreferenceChanged += preference =>
+                {
+                    // Make sure they have enough trait points
+                    preference = preference ? CheckPoints(points, preference) : CheckPoints(-points, preference);
+                    // Don't allow having too many traits
+                    preference = preference && _traitCount + 1 <= _configurationManager.GetCVar(CCVars.GameTraitsMax);
+
+                    // Update Preferences
+                    Profile = Profile?.WithTraitPreference(id, preference);
+                    IsDirty = true;
+                    UpdateTraitPreferences();
+                    UpdateTraits(_traitsShowUnusableButton.Pressed);
+                    UpdateLoadouts(_loadoutsShowUnusableButton.Pressed);
+                };
+            }
+
+            bool CheckPoints(int points, bool preference)
+            {
+                var temp = _traitPointsBar.Value + points;
+                return preference ? !(temp < 0) : temp < 0;
             }
         }
 
@@ -1498,15 +1746,18 @@ private void UpdateLoadouts(bool showUnusable)
 
             // Get all loadout prototypes
             var enumeratedLoadouts = _prototypeManager.EnumeratePrototypes<LoadoutPrototype>().ToList();
+            // Get all loadout categories
+            var categories = _prototypeManager.EnumeratePrototypes<LoadoutCategoryPrototype>().ToList();
 
             // If showUnusable is false filter out loadouts that are unusable based on your current character setup
             var loadouts = enumeratedLoadouts.Where(loadout =>
                 showUnusable || // Ignore everything if this is true
-                _loadoutSystem.CheckRequirementsValid(
+                _characterRequirementsSystem.CheckRequirementsValid(
+                    loadout,
                     loadout.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(),
+                    new Dictionary<string, TimeSpan>(), //TODO Make this use real playtimes
                     _entMan,
                     _prototypeManager,
                     _configurationManager,
@@ -1516,7 +1767,8 @@ out _
 
             // Loadouts to highlight red when showUnusable is true
             var loadoutsUnusable = enumeratedLoadouts.Where(loadout =>
-                _loadoutSystem.CheckRequirementsValid(
+                _characterRequirementsSystem.CheckRequirementsValid(
+                    loadout,
                     loadout.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
@@ -1544,23 +1796,47 @@ out _
                 Orientation = LayoutOrientation.Vertical,
                 VerticalExpand = true,
                 Name = "Uncategorized_0",
+                // I hate ScrollContainers
+                Children =
+                {
+                    new ScrollContainer
+                    {
+                        HScrollEnabled = false,
+                        HorizontalExpand = true,
+                        VerticalExpand = true,
+                        Children =
+                        {
+                            new BoxContainer
+                            {
+                                Orientation = LayoutOrientation.Vertical,
+                                HorizontalExpand = true,
+                                VerticalExpand = true,
+                            },
+                        },
+                    },
+                },
             };
 
             _loadoutsTabs.AddChild(uncategorized);
-            _loadoutsTabs.SetTabTitle(0, Loc.GetString("humanoid-profile-editor-loadouts-uncategorized-tab"));
+            _loadoutsTabs.SetTabTitle(0, Loc.GetString("loadout-category-Uncategorized"));
+
 
             // Make categories
             var currentCategory = 1; // 1 because we already made 0 as Uncategorized, I am not not zero-indexing :)
-            foreach (var loadout in loadouts.OrderBy(l => l.Category))
+            foreach (var category in categories.OrderBy(c => Loc.GetString($"loadout-category-{c.ID}")))
             {
                 // Check for existing category
                 BoxContainer? match = null;
                 foreach (var child in _loadoutsTabs.Children)
                 {
-                    if (match != null || child.Name == null)
+                    if (string.IsNullOrEmpty(child.Name))
                         continue;
-                    if (child.Name.Split("_")[0] == loadout.Category)
-                        match = (BoxContainer) child;
+
+                    // This is fucked up
+                    if (child.Name.Split("_")[0] == category.ID
+                        && child.Children.FirstOrDefault()?.Children.FirstOrDefault(g =>
+                            g.GetType() == typeof(BoxContainer)) is {} g != default)
+                        match = (BoxContainer) g;
                 }
 
                 // If there is a category do nothing
@@ -1572,7 +1848,7 @@ out _
                 {
                     Orientation = LayoutOrientation.Vertical,
                     VerticalExpand = true,
-                    Name = $"{loadout.Category}_{currentCategory}",
+                    Name = $"{category.ID}_{currentCategory}",
                     // I hate ScrollContainers
                     Children =
                     {
@@ -1595,23 +1871,24 @@ out _
                 };
 
                 _loadoutsTabs.AddChild(box);
-                _loadoutsTabs.SetTabTitle(currentCategory, Loc.GetString($"loadout-category-{loadout.Category}"));
+                _loadoutsTabs.SetTabTitle(currentCategory, Loc.GetString($"loadout-category-{category.ID}"));
                 currentCategory++;
             }
 
+
             // Fill categories
-            foreach (var loadout in loadouts.OrderBy(l => l.ID))
+            foreach (var loadout in loadouts.OrderBy(l => l.Cost).ThenBy(l => Loc.GetString($"loadout-{l.ID}-name")))
             {
                 var selector = new LoadoutPreferenceSelector(loadout, highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    loadoutsUnusable.Contains(loadout) ? "" : "ButtonColorRed", _entMan, _prototypeManager,
-                    _configurationManager, _loadoutSystem);
+                    loadoutsUnusable.Contains(loadout) ? "" : "ButtonColorRed",
+                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
 
                 // Look for an existing loadout category
                 BoxContainer? match = null;
                 foreach (var child in _loadoutsTabs.Children)
                 {
-                    if (match != null || child.Name == null)
+                    if (string.IsNullOrEmpty(child.Name))
                         continue;
 
                     if (child.Name.Split("_")[0] == loadout.Category)
@@ -1619,80 +1896,30 @@ out _
                 }
 
                 // If there is no category put it in Uncategorized
-                if (match?.Parent?.Parent?.Name == null)
+                if (string.IsNullOrEmpty(match?.Parent?.Parent?.Name)
+                    || match.Parent.Parent.Name.Split("_")[0] != loadout.Category)
                     uncategorized.AddChild(selector);
                 else
                     match.AddChild(selector);
 
-                _loadoutPreferences.Add(selector);
-                selector.PreferenceChanged += preference =>
-                {
-                    // Make sure they have enough loadout points
-                    if (preference)
-                    {
-                        var temp = _loadoutPointsBar.Value - loadout.Cost;
-                        if (temp < 0)
-                            preference = false;
-                        else
-                        {
-                            _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
-                                ("points", temp), ("max", _loadoutPointsBar.MaxValue));
-                            _loadoutPointsBar.Value = temp;
-                        }
-                    }
-                    else
-                    {
-                        _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
-                            ("points", _loadoutPointsBar.Value), ("max", _loadoutPointsBar.MaxValue));
-                        _loadoutPointsBar.Value += loadout.Cost;
-                    }
-                    // Update Preference
-                    Profile = Profile?.WithLoadoutPreference(loadout.ID, preference);
-                    IsDirty = true;
-                    UpdateLoadoutPreferences();
-                };
+
+                AddSelector(selector, loadout.Cost, loadout.ID);
             }
 
             // Add the selected unusable loadouts to the point counter
-            foreach (var loadout in otherLoadouts.OrderBy(l => l.ID))
+            foreach (var loadout in otherLoadouts.OrderBy(l => l.Cost).ThenBy(l => Loc.GetString($"loadout-{l.ID}-name")))
             {
                 var selector = new LoadoutPreferenceSelector(loadout, highJob?.Proto ?? new JobPrototype(),
-                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "", _entMan, _prototypeManager,
-                    _configurationManager, _loadoutSystem);
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "",
+                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
 
-                _loadoutPreferences.Add(selector);
-                selector.PreferenceChanged += preference =>
-                {
-                    // Make sure they have enough loadout points
-                    if (preference)
-                    {
-                        var temp = _loadoutPointsBar.Value - loadout.Cost;
-                        if (temp < 0)
-                            preference = false;
-                        else
-                        {
-                            _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
-                                ("points", temp), ("max", _loadoutPointsBar.MaxValue));
-                            _loadoutPointsBar.Value = temp;
-                        }
-                    }
-                    else
-                    {
-                        _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
-                            ("points", _loadoutPointsBar.Value), ("max", _loadoutPointsBar.MaxValue));
-                        _loadoutPointsBar.Value += loadout.Cost;
-                    }
-                    // Update Preference
-                    Profile = Profile?.WithLoadoutPreference(loadout.ID, preference);
-                    IsDirty = true;
-                    UpdateLoadoutPreferences();
-                };
+
+                AddSelector(selector, loadout.Cost, loadout.ID);
             }
 
 
             // Hide Uncategorized tab if it's empty, other tabs already shouldn't exist if they're empty
-            if (!uncategorized.Children.Any())
-                _loadoutsTabs.SetTabVisible(0, false);
+            _loadoutsTabs.SetTabVisible(0, uncategorized.Children.Any());
 
             // Add fake tabs until tab container is happy
             for (var i = _loadoutsTabs.ChildCount - 1; i < _loadoutsTabs.CurrentTab; i++)
@@ -1702,6 +1929,31 @@ out _
             }
 
             UpdateLoadoutPreferences();
+            return;
+
+
+            void AddSelector(LoadoutPreferenceSelector selector, int points, string id)
+            {
+                _loadoutPreferences.Add(selector);
+                selector.PreferenceChanged += preference =>
+                {
+                    // Make sure they have enough loadout points
+                    preference = preference ? CheckPoints(points, preference) : CheckPoints(-points, preference);
+
+                    // Update Preferences
+                    Profile = Profile?.WithLoadoutPreference(id, preference);
+                    IsDirty = true;
+                    UpdateLoadoutPreferences();
+                    UpdateLoadouts(_loadoutsShowUnusableButton.Pressed);
+                    UpdateTraits(_traitsShowUnusableButton.Pressed);
+                };
+            }
+
+            bool CheckPoints(int points, bool preference)
+            {
+                var temp = _loadoutPointsBar.Value + points;
+                return preference ? !(temp < 0) : temp < 0;
+            }
         }
 
 
@@ -1753,19 +2005,68 @@ public bool Preference
 
             public event Action<bool>? PreferenceChanged;
 
-            public TraitPreferenceSelector(TraitPrototype trait)
+            public TraitPreferenceSelector(TraitPrototype trait, JobPrototype highJob,
+                HumanoidCharacterProfile profile, string style, IEntityManager entityManager, IPrototypeManager prototypeManager,
+                IConfigurationManager configManager, CharacterRequirementsSystem characterRequirementsSystem)
             {
                 Trait = trait;
 
-                _button = new Button {Text = Loc.GetString(trait.Name)};
-                _button.ToggleMode = true;
+                // Create a checkbox to get the loadout
+                _button = new Button
+                {
+                    VerticalAlignment = VAlignment.Center,
+                    ToggleMode = true,
+                    StyleClasses = { StyleBase.ButtonOpenLeft },
+                    Children =
+                    {
+                        new BoxContainer
+                        {
+                            Children =
+                            {
+                                new Label
+                                {
+                                    Text = trait.Points.ToString(),
+                                    StyleClasses = { StyleBase.StyleClassLabelHeading },
+                                    MinWidth = 32,
+                                    MaxWidth = 32,
+                                    ClipText = true,
+                                    Margin = new Thickness(0, 0, 8, 0),
+                                },
+                                new Label { Text = Loc.GetString($"trait-name-{trait.ID}") },
+                            },
+                        },
+                    },
+                };
                 _button.OnToggled += OnButtonToggled;
+                _button.AddStyleClass(style);
+
+                var tooltip = new StringBuilder();
+                // Add the loadout description to the tooltip if there is one
+                var desc = Loc.GetString($"trait-description-{trait.ID}");
+                if (!string.IsNullOrEmpty(desc) && desc != $"trait-description-{trait.ID}")
+                    tooltip.Append(desc);
+
+
+                // Get requirement reasons
+                characterRequirementsSystem.CheckRequirementsValid(trait, trait.Requirements, highJob, profile,
+                    new Dictionary<string, TimeSpan>(),
+                    entityManager, prototypeManager, configManager,
+                    out var reasons);
 
-                if (trait.Description is { } desc)
+                // Add requirement reasons to the tooltip
+                foreach (var reason in reasons)
+                    tooltip.Append($"\n{reason.ToMarkup()}");
+
+                // Combine the tooltip and format it in the checkbox supplier
+                if (tooltip.Length > 0)
                 {
-                    _button.ToolTip = Loc.GetString(desc);
+                    var formattedTooltip = new Tooltip();
+                    formattedTooltip.SetMessage(FormattedMessage.FromMarkupPermissive(tooltip.ToString()));
+                    _button.TooltipSupplier = _ => formattedTooltip;
                 }
 
+
+                // Add the loadout preview and the checkbox to the control
                 AddChild(new BoxContainer
                 {
                     Orientation = LayoutOrientation.Horizontal,
@@ -1794,7 +2095,7 @@ public bool Preference
 
             public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
                 HumanoidCharacterProfile profile, string style, IEntityManager entityManager, IPrototypeManager prototypeManager,
-                IConfigurationManager configManager, LoadoutSystem loadoutSystem)
+                IConfigurationManager configManager, CharacterRequirementsSystem characterRequirementsSystem)
             {
                 Loadout = loadout;
 
@@ -1816,11 +2117,32 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
                 // Create a checkbox to get the loadout
                 _button = new Button
                 {
-                    Text = $"[{loadout.Cost}] {(Loc.GetString($"loadout-name-{loadout.ID}") == $"loadout-name-{loadout.ID}"
-                        ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityName
-                        : Loc.GetString($"loadout-name-{loadout.ID}"))}",
-                    VerticalAlignment = VAlignment.Center,
                     ToggleMode = true,
+                    StyleClasses = { StyleBase.ButtonOpenLeft },
+                    Children =
+                    {
+                        new BoxContainer
+                        {
+                            Children =
+                            {
+                                new Label
+                                {
+                                    Text = loadout.Cost.ToString(),
+                                    StyleClasses = { StyleBase.StyleClassLabelHeading },
+                                    MinWidth = 32,
+                                    MaxWidth = 32,
+                                    ClipText = true,
+                                    Margin = new Thickness(0, 0, 8, 0),
+                                },
+                                new Label
+                                {
+                                    Text = Loc.GetString($"loadout-name-{loadout.ID}") == $"loadout-name-{loadout.ID}"
+                                        ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityName
+                                        : Loc.GetString($"loadout-name-{loadout.ID}"),
+                                },
+                            },
+                        },
+                    },
                 };
                 _button.OnToggled += OnButtonToggled;
                 _button.AddStyleClass(style);
@@ -1835,7 +2157,10 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
 
 
                 // Get requirement reasons
-                loadoutSystem.CheckRequirementsValid(loadout.Requirements, highJob, profile, new Dictionary<string, TimeSpan>(), entityManager, prototypeManager, configManager, out var reasons);
+                characterRequirementsSystem.CheckRequirementsValid(loadout, loadout.Requirements, highJob, profile,
+                    new Dictionary<string, TimeSpan>(),
+                    entityManager, prototypeManager, configManager,
+                    out var reasons);
 
                 // Add requirement reasons to the tooltip
                 foreach (var reason in reasons)
diff --git a/Content.Client/Traits/ParacusiaSystem.cs b/Content.Client/Traits/ParacusiaSystem.cs
index 3789f24cb0..d01c7c0005 100644
--- a/Content.Client/Traits/ParacusiaSystem.cs
+++ b/Content.Client/Traits/ParacusiaSystem.cs
@@ -1,11 +1,12 @@
 using System.Numerics;
-using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Random;
 using Robust.Client.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Client.Traits;
 
diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
index fe7eb81d1e..013ee37a41 100644
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -14,13 +14,13 @@
 using Content.Shared.Inventory;
 using Content.Shared.Physics;
 using Content.Shared.Tag;
-using Content.Shared.Traits.Assorted;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Timing;
 using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Flash
 {
diff --git a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
index 722a489541..4fc158f864 100644
--- a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
+++ b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
@@ -2,7 +2,7 @@
 using Content.Server.StationEvents.Components;
 using Content.Server.Traits.Assorted;
 using Content.Shared.Mind.Components;
-using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/Traits/Assorted/ParacusiaSystem.cs b/Content.Server/Traits/Assorted/ParacusiaSystem.cs
index 4b0205ff53..cf08e09e90 100644
--- a/Content.Server/Traits/Assorted/ParacusiaSystem.cs
+++ b/Content.Server/Traits/Assorted/ParacusiaSystem.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Audio;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Traits.Assorted;
 
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 22ee0e4861..be2c3c0503 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -1,7 +1,13 @@
+using System.Linq;
 using Content.Server.GameTicking;
+using Content.Server.Players.PlayTimeTracking;
+using Content.Shared.Customization.Systems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Roles;
 using Content.Shared.Traits;
+using Pidgin.Configuration;
+using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager;
 
@@ -9,9 +15,12 @@ namespace Content.Server.Traits;
 
 public sealed class TraitSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly ISerializationManager _serializationManager = default!;
-    [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly ISerializationManager _serialization = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly CharacterRequirementsSystem _characterRequirements = default!;
+    [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
 
     public override void Initialize()
     {
@@ -25,16 +34,17 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
     {
         foreach (var traitId in args.Profile.TraitPreferences)
         {
-            if (!_prototypeManager.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
+            if (!_prototype.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
             {
                 Log.Warning($"No trait found with ID {traitId}!");
                 return;
             }
 
-            if (traitPrototype.Whitelist != null && !traitPrototype.Whitelist.IsValid(args.Mob))
-                continue;
-
-            if (traitPrototype.Blacklist != null && traitPrototype.Blacklist.IsValid(args.Mob))
+            if (!_characterRequirements.CheckRequirementsValid(traitPrototype, traitPrototype.Requirements,
+                _prototype.Index<JobPrototype>(args.JobId ?? _prototype.EnumeratePrototypes<JobPrototype>().First().ID),
+                args.Profile, _playTimeTracking.GetTrackerTimes(args.Player),
+                EntityManager, _prototype, _configuration,
+                out _))
                 continue;
 
             // Add all components required by the prototype
@@ -43,22 +53,10 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
                 if (HasComp(args.Mob, entry.Component.GetType()))
                     continue;
 
-                var comp = (Component) _serializationManager.CreateCopy(entry.Component, notNullableOverride: true);
+                var comp = (Component) _serialization.CreateCopy(entry.Component, notNullableOverride: true);
                 comp.Owner = args.Mob;
                 EntityManager.AddComponent(args.Mob, comp);
             }
-
-            // Add item required by the trait
-            if (traitPrototype.TraitGear != null)
-            {
-                if (!TryComp(args.Mob, out HandsComponent? handsComponent))
-                    continue;
-
-                var coords = Transform(args.Mob).Coordinates;
-                var inhandEntity = EntityManager.SpawnEntity(traitPrototype.TraitGear, coords);
-                _sharedHandsSystem.TryPickup(args.Mob, inhandEntity, checkActionBlocker: false,
-                    handsComp: handsComponent);
-            }
         }
     }
 }
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 53128aade3..21f2508042 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -35,8 +35,8 @@
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Zombies;
 using Content.Shared.Prying.Components;
-using Content.Shared.Traits.Assorted;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Zombies
 {
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 5aaf967dd1..ab36977efb 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -341,14 +341,34 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> DebugCoordinatesAdminOnly =
             CVarDef.Create("game.debug_coordinates_admin_only", true, CVar.SERVER | CVar.REPLICATED);
 
+
+        /// <summary>
+        ///     Whether to allow characters to select traits.
+        /// </summary>
+        public static readonly CVarDef<bool> GameTraitsEnabled =
+            CVarDef.Create("game.traits_enabled", true, CVar.REPLICATED);
+
+        /// <summary>
+        ///     How many traits a character can have at most.
+        /// </summary>
+        public static readonly CVarDef<int> GameTraitsMax =
+            CVarDef.Create("game.traits_max", 5, CVar.REPLICATED);
+
+        /// <summary>
+        ///     How many points a character should start with.
+        /// </summary>
+        public static readonly CVarDef<int> GameTraitsDefaultPoints =
+            CVarDef.Create("game.traits_default_points", 5, CVar.REPLICATED);
+
+
         /// <summary>
-        /// Whether or not to allow characters to select loadout items.
+        ///     Whether to allow characters to select loadout items.
         /// </summary>
         public static readonly CVarDef<bool> GameLoadoutsEnabled =
             CVarDef.Create("game.loadouts_enabled", true, CVar.REPLICATED);
 
         /// <summary>
-        /// How many points to give to each player for loadouts.
+        ///     How many points to give to each player for loadouts.
         /// </summary>
         public static readonly CVarDef<int> GameLoadoutsPoints =
             CVarDef.Create("game.loadouts_points", 14, CVar.REPLICATED);
diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
index 5dd880d3f1..445cbc10e6 100644
--- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
+++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
@@ -2,6 +2,7 @@
 
 namespace Content.Shared.Clothing.Loadouts.Prototypes;
 
+
 /// <summary>
 ///     A prototype defining a valid category for <see cref="LoadoutPrototype"/>s to go into.
 /// </summary>
diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
index bc31fc1570..9ca575fa72 100644
--- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
+++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
@@ -1,10 +1,12 @@
 using Content.Shared.Clothing.Loadouts.Systems;
+using Content.Shared.Customization.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Clothing.Loadouts.Prototypes;
 
+
 [Prototype("loadout")]
 public sealed class LoadoutPrototype : IPrototype
 {
@@ -17,7 +19,7 @@ public sealed class LoadoutPrototype : IPrototype
     /// <summary>
     ///     Which tab category to put this under
     /// </summary>
-    [DataField(customTypeSerializer:typeof(PrototypeIdSerializer<LoadoutCategoryPrototype>))]
+    [DataField, ValidatePrototypeId<LoadoutCategoryPrototype>]
     public string Category = "Uncategorized";
 
     /// <summary>
@@ -41,5 +43,5 @@ public sealed class LoadoutPrototype : IPrototype
 
 
     [DataField]
-    public List<LoadoutRequirement> Requirements = new();
+    public List<CharacterRequirement> Requirements = new();
 }
diff --git a/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs b/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
deleted file mode 100644
index 422a5b15a4..0000000000
--- a/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
+++ /dev/null
@@ -1,376 +0,0 @@
-using System.Linq;
-using Content.Shared.CCVar;
-using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.Players.PlayTimeTracking;
-using Content.Shared.Preferences;
-using Content.Shared.Roles;
-using Content.Shared.Roles.Jobs;
-using Content.Shared.Traits;
-using JetBrains.Annotations;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.Clothing.Loadouts.Systems;
-
-[ImplicitDataDefinitionForInheritors, MeansImplicitUse]
-[Serializable, NetSerializable]
-public abstract partial class LoadoutRequirement
-{
-    /// <summary>
-    ///     If true valid requirements will be treated as invalid and vice versa
-    /// </summary>
-    [DataField]
-    public bool Inverted = false;
-
-    /// <summary>
-    ///     Checks if this loadout requirement is valid for the given parameters
-    /// </summary>
-    /// <param name="reason">Description for the requirement, shown when not null</param>
-    public abstract bool IsValid(
-        JobPrototype job,
-        HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager,
-        IPrototypeManager prototypeManager,
-        IConfigurationManager configManager,
-        out FormattedMessage? reason
-    );
-}
-
-
-#region HumanoidCharacterProfile
-
-/// <summary>
-///     Requires the profile to be within an age range
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutAgeRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public int Min;
-
-    [DataField(required: true)]
-    public int Max;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-age-requirement",
-            ("min", Min), ("max", Max)));
-        return profile.Age >= Min && profile.Age <= Max;
-    }
-}
-
-/// <summary>
-///   Requires the profile to use either a Backpack, Satchel, or Duffelbag
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutBackpackTypeRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public BackpackPreference Preference;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-backpack-type-requirement",
-            ("type", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
-        return profile.Backpack == Preference;
-    }
-}
-
-/// <summary>
-///     Requires the profile to use either Jumpsuits or Jumpskirts
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutClothingPreferenceRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public ClothingPreference Preference;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-clothing-preference-requirement",
-            ("preference", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
-        return profile.Clothing == Preference;
-    }
-}
-
-/// <summary>
-///     Requires the profile to be a certain species
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutSpeciesRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public List<ProtoId<SpeciesPrototype>> Species;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        var speciesString = string.Join(", ", Species.Select(j => Loc.GetString(prototypeManager.Index(j).Name)));
-        speciesString = Loc.GetString("loadout-species-requirement", ("species", speciesString));
-        reason = FormattedMessage.FromMarkup(speciesString);
-        return Species.Contains(profile.Species);
-    }
-}
-
-/// <summary>
-///     Requires the profile to have a certain trait
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutTraitRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public ProtoId<TraitPrototype> Trait;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-trait-requirement",
-            ("trait", Loc.GetString($"trait-{Trait.ToString().ToLower()}-name"))));
-        return profile.TraitPreferences.Contains(Trait.ToString());
-    }
-}
-
-#endregion
-
-#region Jobs
-
-/// <summary>
-///     Requires the selected job to be a certain one
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutJobRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public List<ProtoId<JobPrototype>> Jobs;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        // Join localized job names with a comma
-        var jobsString = string.Join(", ", Jobs.Select(j => Loc.GetString(prototypeManager.Index(j).Name)));
-        // Form the reason message
-        jobsString = Loc.GetString("loadout-job-requirement", ("job", jobsString));
-
-        reason = FormattedMessage.FromMarkup(jobsString);
-        return Jobs.Contains(job.ID);
-    }
-}
-
-/// <summary>
-///     Requires the playtime for a department to be within a certain range
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutDepartmentTimeRequirement : LoadoutRequirement
-{
-    [DataField]
-    public TimeSpan Min = TimeSpan.MinValue;
-
-    [DataField]
-    public TimeSpan Max = TimeSpan.MaxValue;
-
-    [DataField(required: true)]
-    public ProtoId<DepartmentPrototype> Department;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        // Disable the requirement if the role timers are disabled
-        if (!configManager.GetCVar(CCVars.GameRoleTimers))
-        {
-            reason = null;
-            return !Inverted;
-        }
-
-        var department = prototypeManager.Index(Department);
-
-        // Combine all of this department's job playtimes
-        var playtime = TimeSpan.Zero;
-        foreach (var other in department.Roles)
-        {
-            var proto = prototypeManager.Index<JobPrototype>(other).PlayTimeTracker;
-
-            playTimes.TryGetValue(proto, out var otherTime);
-            playtime += otherTime;
-        }
-
-        if (playtime > Max)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-department-too-high",
-                    ("time", playtime.Minutes - Max.Minutes),
-                    ("department", Loc.GetString($"department-{department.ID}")),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        if (playtime < Min)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-department-insufficient",
-                    ("time", Min.Minutes - playtime.Minutes),
-                    ("department", Loc.GetString($"department-{department.ID}")),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        reason = null;
-        return true;
-    }
-}
-
-/// <summary>
-///     Requires the player to have a certain amount of overall job time
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutOverallTimeRequirement : LoadoutRequirement
-{
-    [DataField]
-    public TimeSpan Min = TimeSpan.MinValue;
-
-    [DataField]
-    public TimeSpan Max = TimeSpan.MaxValue;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        // Disable the requirement if the role timers are disabled
-        if (!configManager.GetCVar(CCVars.GameRoleTimers))
-        {
-            reason = null;
-            return !Inverted;
-        }
-
-        // Get the overall time
-        var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
-
-        if (overallTime > Max)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-overall-too-high",
-                    ("time", overallTime.Minutes - Max.Minutes)));
-            return false;
-        }
-
-        if (overallTime < Min)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-overall-insufficient",
-                    ("time", Min.Minutes - overallTime.Minutes)));
-            return false;
-        }
-
-        reason = null;
-        return true;
-    }
-}
-
-/// <summary>
-///     Requires the playtime for a tracker to be within a certain range
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutPlaytimeRequirement : LoadoutRequirement
-{
-    [DataField]
-    public TimeSpan Min = TimeSpan.MinValue;
-
-    [DataField]
-    public TimeSpan Max = TimeSpan.MaxValue;
-
-    [DataField(required: true)]
-    public ProtoId<PlayTimeTrackerPrototype> Tracker;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        // Disable the requirement if the role timers are disabled
-        if (!configManager.GetCVar(CCVars.GameRoleTimers))
-        {
-            reason = null;
-            return !Inverted;
-        }
-
-        // Get SharedJobSystem
-        if (!entityManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
-        {
-            DebugTools.Assert("LoadoutRequirements: SharedJobSystem not found");
-            reason = null;
-            return false;
-        }
-
-        // Get the JobPrototype of the Tracker
-        var trackerJob = jobSystem.GetJobPrototype(Tracker);
-
-        // Get the primary department of the Tracker
-        if (!jobSystem.TryGetPrimaryDepartment(trackerJob, out var department) &&
-            !jobSystem.TryGetDepartment(trackerJob, out department))
-        {
-            DebugTools.Assert($"LoadoutRequirements: Department not found for job {trackerJob}");
-            reason = null;
-            return false;
-        }
-
-        // Get the time for the tracker
-        playTimes.TryGetValue(Tracker, out var time);
-        reason = null;
-
-        if (time > Max)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-role-too-high",
-                    ("time", time.Minutes - Max.Minutes),
-                    ("job", trackerJob),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        if (time < Min)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-role-insufficient",
-                    ("time", Min.Minutes - time.Minutes),
-                    ("job", trackerJob),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        return true;
-    }
-}
-
-#endregion
diff --git a/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs b/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
index eb9a5dcbc8..09e3db3793 100644
--- a/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
+++ b/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.Loadouts.Prototypes;
+using Content.Shared.Customization.Systems;
 using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
@@ -17,7 +18,8 @@ public sealed class LoadoutSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
+    [Dependency] private readonly CharacterRequirementsSystem _characterRequirements = default!;
 
     public override void Initialize()
     {
@@ -66,8 +68,9 @@ public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, JobPrototype job, Hu
                 continue;
 
 
-            if (!CheckRequirementsValid(loadoutProto.Requirements, job, profile,
-                playTimes ?? new Dictionary<string, TimeSpan>(), EntityManager, _prototype, _configurationManager,
+            if (!_characterRequirements.CheckRequirementsValid(loadoutProto, loadoutProto.Requirements, job, profile,
+                playTimes ?? new Dictionary<string, TimeSpan>(),
+                EntityManager, _prototype, _configuration,
                 out _))
                 continue;
 
@@ -115,35 +118,4 @@ public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, JobPrototype job, Hu
         // The server has more information about the inventory system than the client does and the client doesn't need to put loadouts in backpacks
         return failedLoadouts;
     }
-
-
-    public bool CheckRequirementsValid(List<LoadoutRequirement> requirements, JobPrototype job,
-        HumanoidCharacterProfile profile, Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager,
-        IPrototypeManager prototypeManager, IConfigurationManager configManager, out List<FormattedMessage> reasons)
-    {
-        reasons = new List<FormattedMessage>();
-        var valid = true;
-
-        foreach (var requirement in requirements)
-        {
-            // Set valid to false if the requirement is invalid and not inverted, if it's inverted set it to true when it's valid
-            if (!requirement.IsValid(job, profile, playTimes, entityManager, prototypeManager, configManager, out var reason))
-            {
-                if (valid)
-                    valid = requirement.Inverted;
-            }
-            else
-            {
-                if (valid)
-                    valid = !requirement.Inverted;
-            }
-
-            if (reason != null)
-            {
-                reasons.Add(reason);
-            }
-        }
-
-        return valid;
-    }
 }
diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.cs b/Content.Shared/Customization/Systems/CharacterRequirements.cs
new file mode 100644
index 0000000000..b7200c60e8
--- /dev/null
+++ b/Content.Shared/Customization/Systems/CharacterRequirements.cs
@@ -0,0 +1,529 @@
+using System.Linq;
+using Content.Shared.CCVar;
+using Content.Shared.Clothing.Loadouts.Prototypes;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
+using Content.Shared.Traits;
+using JetBrains.Annotations;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Customization.Systems;
+
+
+[ImplicitDataDefinitionForInheritors, MeansImplicitUse]
+[Serializable, NetSerializable]
+public abstract partial class CharacterRequirement
+{
+    /// <summary>
+    ///     If true valid requirements will be treated as invalid and vice versa
+    /// </summary>
+    [DataField]
+    public bool Inverted;
+
+    /// <summary>
+    ///     Checks if this character requirement is valid for the given parameters
+    /// </summary>
+    /// <param name="reason">Description for the requirement, shown when not null</param>
+    public abstract bool IsValid(
+        IPrototype prototype,
+        JobPrototype job,
+        HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager,
+        IPrototypeManager prototypeManager,
+        IConfigurationManager configManager,
+        out FormattedMessage? reason
+    );
+}
+
+
+#region HumanoidCharacterProfile
+
+/// <summary>
+///     Requires the profile to be within an age range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterAgeRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public int Min;
+
+    [DataField(required: true)]
+    public int Max;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-age-requirement",
+            ("inverted", Inverted), ("min", Min), ("max", Max)));
+        return profile.Age >= Min && profile.Age <= Max;
+    }
+}
+
+/// <summary>
+///   Requires the profile to use either a Backpack, Satchel, or Duffelbag
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterBackpackTypeRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public BackpackPreference Preference;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-backpack-type-requirement",
+            ("inverted", Inverted),
+            ("type", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
+        return profile.Backpack == Preference;
+    }
+}
+
+/// <summary>
+///     Requires the profile to use either Jumpsuits or Jumpskirts
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterClothingPreferenceRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public ClothingPreference Preference;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-clothing-preference-requirement",
+            ("inverted", Inverted),
+            ("preference", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
+        return profile.Clothing == Preference;
+    }
+}
+
+/// <summary>
+///     Requires the profile to be a certain species
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterSpeciesRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public ProtoId<SpeciesPrototype> Species;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-species-requirement",
+            ("inverted", Inverted),
+            ("species", Loc.GetString($"species-name-{Species.ToString().ToLower()}"))));
+        return profile.Species == Species;
+    }
+}
+
+/// <summary>
+///     Requires the profile to have one of the specified traits
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterTraitRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<TraitPrototype>> Traits;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-trait-requirement", ("inverted", Inverted),
+            ("traits", string.Join(", ", Traits.Select(t => Loc.GetString($"trait-name-{t}"))))));
+
+        return Traits.Any(t => profile.TraitPreferences.Contains(t.ToString()));
+    }
+}
+
+/// <summary>
+///     Requires the profile to have one of the specified loadouts
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterLoadoutRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<LoadoutPrototype>> Loadouts;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-loadout-requirement", ("inverted", Inverted),
+            ("loadouts", string.Join(", ", Loadouts.Select(l => Loc.GetString($"loadout-{l}"))))));
+
+        return Loadouts.Any(l => profile.LoadoutPreferences.Contains(l.ToString()));
+    }
+}
+
+#endregion
+
+#region Jobs
+
+/// <summary>
+///     Requires the selected job to be one of the specified jobs
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterJobRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<JobPrototype>> Jobs;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        var jobs = new List<FormattedMessage>();
+
+        // Get the job names and department colors
+        foreach (var j in Jobs)
+        {
+            var jobProto = prototypeManager.Index(j);
+            var color = Color.LightBlue;
+
+            foreach (var dept in prototypeManager.EnumeratePrototypes<DepartmentPrototype>()
+                .OrderBy(d => Loc.GetString($"department-{d.ID}")))
+            {
+                if (!dept.Roles.Contains(j))
+                    continue;
+
+                color = dept.Color;
+                break;
+            }
+
+            jobs.Add(FormattedMessage.FromMarkup($"[color={color.ToHex()}]{Loc.GetString(jobProto.Name)}[/color]"));
+        }
+
+        // Join the job names
+        var jobsList = string.Join(", ", jobs.Select(j => j.ToMarkup()));
+        var jobsString = Loc.GetString("character-job-requirement",
+            ("inverted", Inverted), ("jobs", jobsList));
+
+        reason = FormattedMessage.FromMarkup(jobsString);
+        return Jobs.Contains(job.ID);
+    }
+}
+
+/// <summary>
+///     Requires the selected job to be in one of the specified departments
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterDepartmentRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<DepartmentPrototype>> Departments;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        var departments = new List<FormattedMessage>();
+
+        // Get the department names and colors
+        foreach (var d in Departments)
+        {
+            var deptProto = prototypeManager.Index(d);
+            var color = deptProto.Color;
+
+            departments.Add(FormattedMessage.FromMarkup($"[color={color.ToHex()}]{Loc.GetString($"department-{deptProto.ID}")}[/color]"));
+        }
+
+        // Join the department names
+        var departmentsList = string.Join(", ", departments.Select(d => d.ToMarkup()));
+        var departmentsString = Loc.GetString("character-department-requirement",
+            ("inverted", Inverted), ("departments", departmentsList));
+
+        reason = FormattedMessage.FromMarkup(departmentsString);
+        return Departments.Any(d => prototypeManager.Index(d).Roles.Contains(job.ID));
+    }
+}
+
+/// <summary>
+///     Requires the playtime for a department to be within a certain range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterDepartmentTimeRequirement : CharacterRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    [DataField(required: true)]
+    public ProtoId<DepartmentPrototype> Department;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        var department = prototypeManager.Index(Department);
+
+        // Combine all of this department's job playtimes
+        var playtime = TimeSpan.Zero;
+        foreach (var other in department.Roles)
+        {
+            var proto = prototypeManager.Index<JobPrototype>(other).PlayTimeTracker;
+
+            playTimes.TryGetValue(proto, out var otherTime);
+            playtime += otherTime;
+        }
+
+        if (playtime > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-department-too-high",
+                    ("time", playtime.Minutes - Max.Minutes),
+                    ("department", Loc.GetString($"department-{department.ID}")),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        if (playtime < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-department-insufficient",
+                    ("time", Min.Minutes - playtime.Minutes),
+                    ("department", Loc.GetString($"department-{department.ID}")),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        reason = null;
+        return true;
+    }
+}
+
+/// <summary>
+///     Requires the player to have a certain amount of overall job time
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterOverallTimeRequirement : CharacterRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        // Get the overall time
+        var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
+
+        if (overallTime > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-overall-too-high",
+                    ("time", overallTime.Minutes - Max.Minutes)));
+            return false;
+        }
+
+        if (overallTime < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-overall-insufficient",
+                    ("time", Min.Minutes - overallTime.Minutes)));
+            return false;
+        }
+
+        reason = null;
+        return true;
+    }
+}
+
+/// <summary>
+///     Requires the playtime for a tracker to be within a certain range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterPlaytimeRequirement : CharacterRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    [DataField(required: true)]
+    public ProtoId<PlayTimeTrackerPrototype> Tracker;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        // Get SharedJobSystem
+        if (!entityManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
+        {
+            DebugTools.Assert("CharacterRequirements: SharedJobSystem not found");
+            reason = null;
+            return false;
+        }
+
+        // Get the JobPrototype of the Tracker
+        var trackerJob = jobSystem.GetJobPrototype(Tracker);
+
+        // Get the primary department of the Tracker
+        if (!jobSystem.TryGetPrimaryDepartment(trackerJob, out var department) &&
+            !jobSystem.TryGetDepartment(trackerJob, out department))
+        {
+            DebugTools.Assert($"CharacterRequirements: Department not found for job {trackerJob}");
+            reason = null;
+            return false;
+        }
+
+        // Get the time for the tracker
+        var time = playTimes.GetValueOrDefault(Tracker);
+        reason = null;
+
+        if (time > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-role-too-high",
+                    ("time", time.Minutes - Max.Minutes),
+                    ("job", trackerJob),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        if (time < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-role-insufficient",
+                    ("time", Min.Minutes - time.Minutes),
+                    ("job", trackerJob),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        return true;
+    }
+}
+
+#endregion
+
+#region Prototype Groups
+
+/// <summary>
+///     Requires the profile to not have any of the specified traits
+/// </summary>
+/// <remarks>
+///     Only works if you put this prototype in the denied prototypes' requirements too.
+///     Can't be inverted, use <see cref="CharacterTraitRequirement"/>
+/// </remarks>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class TraitGroupExclusionRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<TraitPrototype>> Prototypes;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        var invalid = profile.TraitPreferences.Any(t => Prototypes.Contains(t));
+
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-trait-group-exclusion-requirement",
+            ("traits", string.Join(", ", Prototypes.Select(t => Loc.GetString($"trait-name-{t}"))))));
+
+        return Inverted ? invalid : !invalid;
+    }
+}
+
+/// <summary>
+///     Requires the profile to not have any of the specified loadouts
+/// </summary>
+/// <remarks>
+///     Only works if you put this prototype in the denied prototypes' requirements too.
+///     Can't be inverted, use <see cref="CharacterLoadoutRequirement"/>
+/// </remarks>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutGroupExclusionRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<LoadoutPrototype>> Prototypes;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        var invalid = profile.LoadoutPreferences.Any(l => Prototypes.Contains(l));
+
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-loadout-group-exclusion-requirement",
+            ("loadouts", string.Join(", ", Prototypes.Select(l => Loc.GetString($"loadout-{l}"))))));
+
+        return Inverted ? invalid : !invalid;
+    }
+}
+
+#endregion
diff --git a/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs b/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
new file mode 100644
index 0000000000..e93c933a6a
--- /dev/null
+++ b/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Customization.Systems;
+
+
+public sealed class CharacterRequirementsSystem : EntitySystem
+{
+    public bool CheckRequirementsValid(IPrototype prototype, List<CharacterRequirement> requirements, JobPrototype job,
+        HumanoidCharacterProfile profile, Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out List<FormattedMessage> reasons)
+    {
+        reasons = new List<FormattedMessage>();
+        var valid = true;
+
+        foreach (var requirement in requirements)
+        {
+            // Set valid to false if the requirement is invalid and not inverted
+            // If it's inverted set valid to false when it's valid
+            if (!requirement.IsValid(prototype, job, profile, playTimes,
+                entityManager, prototypeManager, configManager,
+                out var reason))
+            {
+                if (valid)
+                    valid = requirement.Inverted;
+            }
+            else
+            {
+                if (valid)
+                    valid = !requirement.Inverted;
+            }
+
+            if (reason != null) // To appease the compiler
+                reasons.Add(reason);
+        }
+
+        return valid;
+    }
+}
diff --git a/Content.Shared/Drunk/DrunkSystem.cs b/Content.Shared/Drunk/DrunkSystem.cs
index 4f9429b6a6..161d4729ed 100644
--- a/Content.Shared/Drunk/DrunkSystem.cs
+++ b/Content.Shared/Drunk/DrunkSystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
-using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Shared.Drunk;
 
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index ece9a82bb2..8cf504582d 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -393,19 +393,19 @@ public HumanoidCharacterProfile WithLoadoutPreference(string loadoutId, bool pre
 
         public bool MemberwiseEquals(ICharacterProfile maybeOther)
         {
-            if (maybeOther is not HumanoidCharacterProfile other ||
-                Name != other.Name ||
-                Age != other.Age ||
-                Sex != other.Sex ||
-                Gender != other.Gender ||
-                PreferenceUnavailable != other.PreferenceUnavailable ||
-                Clothing != other.Clothing ||
-                Backpack != other.Backpack ||
-                SpawnPriority != other.SpawnPriority ||
-                !_jobPriorities.SequenceEqual(other._jobPriorities) ||
-                !_antagPreferences.SequenceEqual(other._antagPreferences) ||
-                !_traitPreferences.SequenceEqual(other._traitPreferences) ||
-                !_loadoutPreferences.SequenceEqual(other._loadoutPreferences))
+            if (maybeOther is not HumanoidCharacterProfile other
+                || Name != other.Name
+                || Age != other.Age
+                || Sex != other.Sex
+                || Gender != other.Gender
+                || PreferenceUnavailable != other.PreferenceUnavailable
+                || Clothing != other.Clothing
+                || Backpack != other.Backpack
+                || SpawnPriority != other.SpawnPriority
+                || !_jobPriorities.SequenceEqual(other._jobPriorities)
+                || !_antagPreferences.SequenceEqual(other._antagPreferences)
+                || !_traitPreferences.SequenceEqual(other._traitPreferences)
+                || !_loadoutPreferences.SequenceEqual(other._loadoutPreferences))
                 return false;
 
             return Appearance.MemberwiseEquals(other.Appearance);
@@ -545,23 +545,42 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
                 .Where(prototypeManager.HasIndex<TraitPrototype>)
                 .ToList();
 
+            var maxTraits = configManager.GetCVar(CCVars.GameTraitsMax);
+            var currentTraits = 0;
+            var traitPoints = configManager.GetCVar(CCVars.GameTraitsDefaultPoints);
+
+            foreach (var trait in traits.OrderBy(t => -prototypeManager.Index<TraitPrototype>(t).Points).ToList())
+            {
+                var proto = prototypeManager.Index<TraitPrototype>(trait);
+
+                if (traitPoints + proto.Points < 0 || currentTraits + 1 > maxTraits)
+                    traits.Remove(trait);
+                else
+                {
+                    traitPoints += proto.Points;
+                    currentTraits++;
+                }
+            }
+
+
             var loadouts = LoadoutPreferences
                 .Where(prototypeManager.HasIndex<LoadoutPrototype>)
                 .ToList();
 
-            var maxLoadouts = configManager.GetCVar(CCVars.GameLoadoutsPoints);
-            var currentLoadouts = 0;
+            var loadoutPoints = configManager.GetCVar(CCVars.GameLoadoutsPoints);
+            var currentPoints = 0;
 
             foreach (var loadout in loadouts.ToList())
             {
                 var proto = prototypeManager.Index<LoadoutPrototype>(loadout);
 
-                if (currentLoadouts + proto.Cost > maxLoadouts)
+                if (currentPoints + proto.Cost > loadoutPoints)
                     loadouts.Remove(loadout);
                 else
-                    currentLoadouts += proto.Cost;
+                    currentPoints += proto.Cost;
             }
 
+
             Name = name;
             FlavorText = flavortext;
             Age = age;
diff --git a/Content.Shared/Traits/Assorted/AccentlessComponent.cs b/Content.Shared/Traits/Assorted/Components/AccentlessComponent.cs
similarity index 89%
rename from Content.Shared/Traits/Assorted/AccentlessComponent.cs
rename to Content.Shared/Traits/Assorted/Components/AccentlessComponent.cs
index 96ebf4d83f..084a1e1d92 100644
--- a/Content.Shared/Traits/Assorted/AccentlessComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/AccentlessComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// This is used for the accentless trait
diff --git a/Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs b/Content.Shared/Traits/Assorted/Components/LegsParalyzedComponent.cs
similarity index 65%
rename from Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
rename to Content.Shared/Traits/Assorted/Components/LegsParalyzedComponent.cs
index 59f9ca758b..d0639e5933 100644
--- a/Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/LegsParalyzedComponent.cs
@@ -1,6 +1,7 @@
-using Robust.Shared.GameStates;
+using Content.Shared.Traits.Assorted.Systems;
+using Robust.Shared.GameStates;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// Set player speed to zero and standing state to down, simulating leg paralysis.
diff --git a/Content.Shared/Traits/Assorted/LightweightDrunkComponent.cs b/Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
similarity index 90%
rename from Content.Shared/Traits/Assorted/LightweightDrunkComponent.cs
rename to Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
index 5d353ac963..62d2f5899a 100644
--- a/Content.Shared/Traits/Assorted/LightweightDrunkComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
@@ -1,7 +1,7 @@
-using Robust.Shared.GameStates;
 using Content.Shared.Drunk;
+using Robust.Shared.GameStates;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// Used for the lightweight trait. DrunkSystem will check for this component and modify the boozePower accordingly if it finds it.
diff --git a/Content.Shared/Traits/Assorted/ParacusiaComponent.cs b/Content.Shared/Traits/Assorted/Components/ParacusiaComponent.cs
similarity index 93%
rename from Content.Shared/Traits/Assorted/ParacusiaComponent.cs
rename to Content.Shared/Traits/Assorted/Components/ParacusiaComponent.cs
index 1db698359b..ff62e55c2a 100644
--- a/Content.Shared/Traits/Assorted/ParacusiaComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/ParacusiaComponent.cs
@@ -1,8 +1,9 @@
+using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// This component is used for paracusia, which causes auditory hallucinations.
diff --git a/Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs b/Content.Shared/Traits/Assorted/Components/PermanentBlindnessComponent.cs
similarity index 81%
rename from Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs
rename to Content.Shared/Traits/Assorted/Components/PermanentBlindnessComponent.cs
index 76ff3e1005..c1bf7e1639 100644
--- a/Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/PermanentBlindnessComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// This is used for making something blind forever.
diff --git a/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs b/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
deleted file mode 100644
index 7c91366937..0000000000
--- a/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Content.Shared.Body.Systems;
-using Content.Shared.Buckle.Components;
-using Content.Shared.Movement.Events;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Standing;
-using Content.Shared.Throwing;
-
-namespace Content.Shared.Traits.Assorted;
-
-public sealed class LegsParalyzedSystem : EntitySystem
-{
-    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!;
-    [Dependency] private readonly StandingStateSystem _standingSystem = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<LegsParalyzedComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<LegsParalyzedComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<LegsParalyzedComponent, BuckleChangeEvent>(OnBuckleChange);
-        SubscribeLocalEvent<LegsParalyzedComponent, ThrowPushbackAttemptEvent>(OnThrowPushbackAttempt);
-        SubscribeLocalEvent<LegsParalyzedComponent, UpdateCanMoveEvent>(OnUpdateCanMoveEvent);
-    }
-
-    private void OnStartup(EntityUid uid, LegsParalyzedComponent component, ComponentStartup args)
-    {
-        // TODO: In future probably must be surgery related wound
-        _movementSpeedModifierSystem.ChangeBaseSpeed(uid, 0, 0, 20);
-    }
-
-    private void OnShutdown(EntityUid uid, LegsParalyzedComponent component, ComponentShutdown args)
-    {
-        _standingSystem.Stand(uid);
-        _bodySystem.UpdateMovementSpeed(uid);
-    }
-
-    private void OnBuckleChange(EntityUid uid, LegsParalyzedComponent component, ref BuckleChangeEvent args)
-    {
-        if (args.Buckling)
-        {
-            _standingSystem.Stand(args.BuckledEntity);
-        }
-        else
-        {
-            _standingSystem.Down(args.BuckledEntity);
-        }
-    }
-
-    private void OnUpdateCanMoveEvent(EntityUid uid, LegsParalyzedComponent component, UpdateCanMoveEvent args)
-    {
-        args.Cancel();
-    }
-
-    private void OnThrowPushbackAttempt(EntityUid uid, LegsParalyzedComponent component, ThrowPushbackAttemptEvent args)
-    {
-        args.Cancel();
-    }
-}
diff --git a/Content.Shared/Traits/Assorted/AccentlessSystem.cs b/Content.Shared/Traits/Assorted/Systems/AccentlessSystem.cs
similarity index 62%
rename from Content.Shared/Traits/Assorted/AccentlessSystem.cs
rename to Content.Shared/Traits/Assorted/Systems/AccentlessSystem.cs
index 2242bc6e52..f4e077bc1a 100644
--- a/Content.Shared/Traits/Assorted/AccentlessSystem.cs
+++ b/Content.Shared/Traits/Assorted/Systems/AccentlessSystem.cs
@@ -1,6 +1,4 @@
-using Robust.Shared.Serialization.Manager;
-
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Systems;
 
 /// <summary>
 /// This handles removing accents when using the accentless trait.
@@ -12,10 +10,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<AccentlessComponent, ComponentStartup>(RemoveAccents);
+        SubscribeLocalEvent<Components.AccentlessComponent, ComponentStartup>(RemoveAccents);
     }
 
-    private void RemoveAccents(EntityUid uid, AccentlessComponent component, ComponentStartup args)
+    private void RemoveAccents(EntityUid uid, Components.AccentlessComponent component, ComponentStartup args)
     {
         foreach (var accent in component.RemovedAccents.Values)
         {
diff --git a/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs b/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
new file mode 100644
index 0000000000..8ae0f251b8
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Body.Systems;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Standing;
+using Content.Shared.Throwing;
+
+namespace Content.Shared.Traits.Assorted.Systems;
+
+public sealed class LegsParalyzedSystem : EntitySystem
+{
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!;
+    [Dependency] private readonly StandingStateSystem _standingSystem = default!;
+    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, BuckleChangeEvent>(OnBuckleChange);
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, ThrowPushbackAttemptEvent>(OnThrowPushbackAttempt);
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, UpdateCanMoveEvent>(OnUpdateCanMoveEvent);
+    }
+
+    private void OnStartup(EntityUid uid, Components.LegsParalyzedComponent component, ComponentStartup args)
+    {
+        // TODO: In future probably must be surgery related wound
+        _movementSpeedModifierSystem.ChangeBaseSpeed(uid, 0, 0, 20);
+    }
+
+    private void OnShutdown(EntityUid uid, Components.LegsParalyzedComponent component, ComponentShutdown args)
+    {
+        _standingSystem.Stand(uid);
+        _bodySystem.UpdateMovementSpeed(uid);
+    }
+
+    private void OnBuckleChange(EntityUid uid, Components.LegsParalyzedComponent component, ref BuckleChangeEvent args)
+    {
+        if (args.Buckling)
+        {
+            _standingSystem.Stand(args.BuckledEntity);
+        }
+        else
+        {
+            _standingSystem.Down(args.BuckledEntity);
+        }
+    }
+
+    private void OnUpdateCanMoveEvent(EntityUid uid, Components.LegsParalyzedComponent component, UpdateCanMoveEvent args)
+    {
+        args.Cancel();
+    }
+
+    private void OnThrowPushbackAttempt(EntityUid uid, Components.LegsParalyzedComponent component, ThrowPushbackAttemptEvent args)
+    {
+        args.Cancel();
+    }
+}
diff --git a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs b/Content.Shared/Traits/Assorted/Systems/PermanentBlindnessSystem.cs
similarity index 59%
rename from Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
rename to Content.Shared/Traits/Assorted/Systems/PermanentBlindnessSystem.cs
index 9fd5db8497..113939f66b 100644
--- a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
+++ b/Content.Shared/Traits/Assorted/Systems/PermanentBlindnessSystem.cs
@@ -4,7 +4,7 @@
 using Content.Shared.IdentityManagement;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Systems;
 
 /// <summary>
 /// This handles permanent blindness, both the examine and the actual effect.
@@ -18,26 +18,26 @@ public sealed class PermanentBlindnessSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<PermanentBlindnessComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<PermanentBlindnessComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<PermanentBlindnessComponent, EyeDamageChangedEvent>(OnDamageChanged);
-        SubscribeLocalEvent<PermanentBlindnessComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<Components.PermanentBlindnessComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<Components.PermanentBlindnessComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<Components.PermanentBlindnessComponent, EyeDamageChangedEvent>(OnDamageChanged);
+        SubscribeLocalEvent<Components.PermanentBlindnessComponent, ExaminedEvent>(OnExamined);
     }
 
-    private void OnExamined(Entity<PermanentBlindnessComponent> blindness, ref ExaminedEvent args)
+    private void OnExamined(Entity<Components.PermanentBlindnessComponent> blindness, ref ExaminedEvent args)
     {
         if (args.IsInDetailsRange && !_net.IsClient)
         {
-            args.PushMarkup(Loc.GetString("permanent-blindness-trait-examined", ("target", Identity.Entity(blindness, EntityManager))));
+            args.PushMarkup(Loc.GetString("trait-examined-Blindness", ("target", Identity.Entity(blindness, EntityManager))));
         }
     }
 
-    private void OnShutdown(Entity<PermanentBlindnessComponent> blindness, ref ComponentShutdown args)
+    private void OnShutdown(Entity<Components.PermanentBlindnessComponent> blindness, ref ComponentShutdown args)
     {
         _blinding.UpdateIsBlind(blindness.Owner);
     }
 
-    private void OnStartup(Entity<PermanentBlindnessComponent> blindness, ref ComponentStartup args)
+    private void OnStartup(Entity<Components.PermanentBlindnessComponent> blindness, ref ComponentStartup args)
     {
         if (!_entityManager.TryGetComponent<BlindableComponent>(blindness, out var blindable))
             return;
@@ -50,7 +50,7 @@ private void OnStartup(Entity<PermanentBlindnessComponent> blindness, ref Compon
         _blinding.AdjustEyeDamage(blindness.Owner, damageToDeal);
     }
 
-    private void OnDamageChanged(Entity<PermanentBlindnessComponent> blindness, ref EyeDamageChangedEvent args)
+    private void OnDamageChanged(Entity<Components.PermanentBlindnessComponent> blindness, ref EyeDamageChangedEvent args)
     {
         if (args.Damage >= BlurryVisionComponent.MaxMagnitude)
             return;
diff --git a/Content.Shared/Traits/Assorted/SharedParacusiaSystem.cs b/Content.Shared/Traits/Assorted/Systems/SharedParacusiaSystem.cs
similarity index 56%
rename from Content.Shared/Traits/Assorted/SharedParacusiaSystem.cs
rename to Content.Shared/Traits/Assorted/Systems/SharedParacusiaSystem.cs
index 2bfb0da1f5..151e748445 100644
--- a/Content.Shared/Traits/Assorted/SharedParacusiaSystem.cs
+++ b/Content.Shared/Traits/Assorted/Systems/SharedParacusiaSystem.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Systems;
 
 public abstract class SharedParacusiaSystem : EntitySystem
 {
diff --git a/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs b/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
new file mode 100644
index 0000000000..efbac1ca7d
--- /dev/null
+++ b/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Traits;
+
+
+/// <summary>
+///     A prototype defining a valid category for <see cref="TraitPrototype"/>s to go into.
+/// </summary>
+[Prototype("traitCategory")]
+public sealed partial class TraitCategoryPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; } = default!;
+}
diff --git a/Content.Shared/Traits/Prototypes/TraitPrototype.cs b/Content.Shared/Traits/Prototypes/TraitPrototype.cs
new file mode 100644
index 0000000000..2e6b7cc066
--- /dev/null
+++ b/Content.Shared/Traits/Prototypes/TraitPrototype.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Customization.Systems;
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Traits;
+
+
+/// <summary>
+///     Describes a trait.
+/// </summary>
+[Prototype("trait")]
+public sealed partial class TraitPrototype : IPrototype
+{
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    ///     Which customization tab to place this entry in
+    /// </summary>
+    [DataField(required: true), ValidatePrototypeId<TraitCategoryPrototype>]
+    public string Category = "Uncategorized";
+
+    /// <summary>
+    ///     How many points this will give the character
+    /// </summary>
+    [DataField]
+    public int Points = 0;
+
+
+    [DataField]
+    public List<CharacterRequirement> Requirements = new();
+
+    /// <summary>
+    ///     The components that get added to the player when they pick this trait.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry Components { get; private set; } = default!;
+}
diff --git a/Content.Shared/Traits/TraitPrototype.cs b/Content.Shared/Traits/TraitPrototype.cs
deleted file mode 100644
index 34feb8da22..0000000000
--- a/Content.Shared/Traits/TraitPrototype.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Content.Shared.Whitelist;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-// don't worry about it
-
-namespace Content.Shared.Traits
-{
-    /// <summary>
-    ///     Describes a trait.
-    /// </summary>
-    [Prototype("trait")]
-    public sealed partial class TraitPrototype : IPrototype
-    {
-        [ViewVariables]
-        [IdDataField]
-        public string ID { get; private set; } = default!;
-
-        /// <summary>
-        ///     The name of this trait.
-        /// </summary>
-        [DataField("name")]
-        public string Name { get; private set; } = "";
-
-        /// <summary>
-        ///     The description of this trait.
-        /// </summary>
-        [DataField("description")]
-        public string? Description { get; private set; }
-
-        /// <summary>
-        ///     Don't apply this trait to entities this whitelist IS NOT valid for.
-        /// </summary>
-        [DataField("whitelist")]
-        public EntityWhitelist? Whitelist;
-
-        /// <summary>
-        ///     Don't apply this trait to entities this whitelist IS valid for. (hence, a blacklist)
-        /// </summary>
-        [DataField("blacklist")]
-        public EntityWhitelist? Blacklist;
-
-        /// <summary>
-        ///     The components that get added to the player, when they pick this trait.
-        /// </summary>
-        [DataField("components")]
-        public ComponentRegistry Components { get; private set; } = default!;
-
-        /// <summary>
-        ///     Gear that is given to the player, when they pick this trait.
-        /// </summary>
-        [DataField("traitGear", required: false, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? TraitGear;
-    }
-}
diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl
new file mode 100644
index 0000000000..b073bdb773
--- /dev/null
+++ b/Resources/Locale/en-US/customization/character-requirements.ftl
@@ -0,0 +1,39 @@
+character-age-requirement = You must {$inverted ->
+    [true] not be
+    *[other] be
+} be within [color=yellow]{$min}[/color] and [color=yellow]{$max}[/color] years old
+character-species-requirement = You must {$inverted ->
+    [true] not be
+    *[other] be
+} a [color=green]{$species}[/color]
+character-trait-requirement = You must {$inverted ->
+    [true] not have
+    *[other] have
+} the trait [color=lightblue]{$trait}[/color]
+character-backpack-type-requirement = You must {$inverted ->
+    [true] not use
+    *[other] use
+} a [color=lightblue]{$type}[/color] as your bag
+character-clothing-preference-requirement = You must {$inverted ->
+    [true] not wear
+    *[other] wear
+} a [color=lightblue]{$type}[/color]
+
+character-job-requirement = You must {$inverted ->
+    [true] not be
+    *[other] be
+} one of these jobs: {$jobs}
+character-department-requirement = You must {$inverted ->
+    [true] not be
+    *[other] be
+} in one of these departments: {$departments}
+
+character-timer-department-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of [color={$departmentColor}]{$department}[/color] department playtime
+character-timer-department-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes in [color={$departmentColor}]{$department}[/color] department
+character-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of playtime
+character-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime
+character-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color]
+character-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color]
+
+character-trait-group-exclusion-requirement = You cannot have one of the following traits if you select this: {$traits}
+character-loadout-group-exclusion-requirement = You cannot have one of the following loadouts if you select this: {$loadouts}
diff --git a/Resources/Locale/en-US/deltav/traits/traits.ftl b/Resources/Locale/en-US/deltav/traits/traits.ftl
index e00cec4707..914a5c9f1b 100644
--- a/Resources/Locale/en-US/deltav/traits/traits.ftl
+++ b/Resources/Locale/en-US/deltav/traits/traits.ftl
@@ -1,13 +1,13 @@
-trait-scottish-accent-name = Scottish Accent
-trait-scottish-accent-desc = Fer tha folk who come frae Hielan clan.
+trait-name-ScottishAccent = Scottish Accent
+trait-description-ScottishAccent = Fer tha folk who come frae Hielan clan.
 
-trait-ultravision-name = Ultraviolet Vision
-trait-ultravision-desc = Whether through custom bionic eyes, random mutation,
+trait-name-UltraVision = Ultraviolet Vision
+trait-description-UltraVision = Whether through custom bionic eyes, random mutation,
                          or being a Harpy, you perceive the world with ultraviolet light.
 
-trait-deuteranopia-name = Deuteranopia
-trait-deuteranopia-desc = Whether through custom bionic eyes, random mutation,
+trait-name-DogVision = Deuteranopia
+trait-description-DogVision = Whether through custom bionic eyes, random mutation,
                           or being a Vulpkanin, you have red–green colour blindness.
 
-trait-uncloneable-name = Uncloneable
-trait-uncloneable-desc = Cannot be cloned
+trait-name-Uncloneable = Uncloneable
+trait-description-Uncloneable = Cannot be cloned
diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index 207b72d3ad..55dbab656f 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -1,4 +1,6 @@
-# Alphabetically ordered
+# Alphabetically ordered, except for Uncategorized since it is always first
+
+loadout-category-Uncategorized = Uncategorized
 loadout-category-Accessories = Accessories
 loadout-category-Eyes = Eyes
 loadout-category-Hands = Hands
diff --git a/Resources/Locale/en-US/loadouts/loadout-requirements.ftl b/Resources/Locale/en-US/loadouts/loadout-requirements.ftl
deleted file mode 100644
index d72557f1e8..0000000000
--- a/Resources/Locale/en-US/loadouts/loadout-requirements.ftl
+++ /dev/null
@@ -1,13 +0,0 @@
-loadout-age-requirement = You must be within {$min} and {$max} years old
-loadout-species-requirement = You must be one of these species: {$species}
-loadout-trait-requirement = You must have the trait {$trait}
-loadout-backpack-type-requirement = You must use a {$type} as your bag
-loadout-clothing-preference-requirement = You must wear a {$type}
-
-loadout-job-requirement = You must be one of these jobs: {$job}
-loadout-timer-department-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of [color={$departmentColor}]{$department}[/color] department playtime
-loadout-timer-department-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes in [color={$departmentColor}]{$department}[/color] department
-loadout-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of playtime
-loadout-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime
-loadout-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color]
-loadout-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color]
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index b929da9655..9b8eb74d96 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -44,20 +44,40 @@ humanoid-profile-editor-department-jobs-label = {$departmentName} jobs
 humanoid-profile-editor-antags-tab = Antags
 humanoid-profile-editor-antag-preference-yes-button = Yes
 humanoid-profile-editor-antag-preference-no-button = No
+
 humanoid-profile-editor-traits-tab = Traits
+humanoid-profile-editor-traits-header = You have {$points ->
+    [1] 1 point
+    *[other] {$points} points
+} and {$maxTraits ->
+    [2147483648] {$traits ->
+        [1] {$traits} trait
+        *[other] {$traits} traits
+    }
+    *[other] {$traits}/{$maxTraits} traits
+}
+humanoid-profile-editor-traits-show-unusable-button = Show Unusable
+humanoid-profile-editor-traits-show-unusable-button-tooltip =
+    When enabled, traits that your current character setup cannot use will be shown highlighted in red.
+    You will still not be able to use the invalid traits unless your character setup changes to fit the requirements.
+    This is most likely useful only if there's a bug hiding traits you actually can use or if you want to see other species' traits or something.
+humanoid-profile-editor-traits-no-traits = No traits found
+
 humanoid-profile-editor-job-priority-high-button = High
 humanoid-profile-editor-job-priority-medium-button = Medium
 humanoid-profile-editor-job-priority-low-button = Low
 humanoid-profile-editor-job-priority-never-button = Never
+
 humanoid-profile-editor-naming-rules-warning = Warning: Offensive or LRP IC names and descriptions will lead to admin intervention on this server. Read our \[Rules\] for more.
+
 humanoid-profile-editor-loadouts-tab = Loadout
-humanoid-profile-editor-loadouts-uncategorized-tab = Uncategorized
-humanoid-profile-editor-loadouts-no-loadouts = No loadouts found
 humanoid-profile-editor-loadouts-points-label = You have {$points}/{$max} points
 humanoid-profile-editor-loadouts-show-unusable-button = Show Unusable
 humanoid-profile-editor-loadouts-show-unusable-button-tooltip =
     When enabled, loadouts that your current character setup cannot use will be shown highlighted in red.
     You will still not be able to use the invalid loadouts unless your character setup changes to fit the requirements.
-    This may be useful if you like switching between multiple jobs and don't want to have to reselect your loadout every time.
+    This may be useful if you like switching between multiple jobs and don't want to have to reselect your loadout every
+humanoid-profile-editor-loadouts-no-loadouts = No loadouts foundtime.
+
 humanoid-profile-editor-markings-tab = Markings
 humanoid-profile-editor-flavortext-tab = Description
diff --git a/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl b/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl
index 3d8af06139..8360aaeb9d 100644
--- a/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl
+++ b/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl
@@ -1,3 +1,2 @@
-trait-nearsighted-name = Nearsighted
-trait-nearsighted-desc = You require glasses to see properly.
-trait-nearsighted-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are pretty unfocused. It doesn't seem like {SUBJECT($target)} can see things that well.[/color]
+trait-name-Nearsighted = Nearsighted
+trait-description-Nearsighted = You require glasses to see properly.
diff --git a/Resources/Locale/en-US/traits/categories.ftl b/Resources/Locale/en-US/traits/categories.ftl
new file mode 100644
index 0000000000..56f0adeb47
--- /dev/null
+++ b/Resources/Locale/en-US/traits/categories.ftl
@@ -0,0 +1,8 @@
+# Alphabetically ordered, except for Uncategorized since it is always first
+
+trait-category-Uncategorized = Uncategorized
+trait-category-Auditory = Auditory
+trait-category-Mental = Mental
+trait-category-Physical = Physical
+trait-category-Speech = Speech
+trait-category-Visual = Visual
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index c097a689dd..e3eb6ebb82 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -1,31 +1,36 @@
-trait-blindness-name = Blindness
-trait-blindness-desc = You are legally blind, and can't see clearly past a few meters in front of you.
+trait-name-Blindness = Blindness
+trait-description-Blindness = You are legally blind, and can't see clearly past a few meters in front of you.
+trait-examined-Blindness = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are glassy and unfocused. It doesn't seem like {SUBJECT($target)} can see you well, if at all.[/color]
 
-trait-narcolepsy-name = Narcolepsy
-trait-narcolepsy-desc = You fall asleep randomly
+trait-name-Narcolepsy = Narcolepsy
+trait-description-Narcolepsy = You fall asleep randomly
 
-trait-pacifist-name = Pacifist
-trait-pacifist-desc = You cannot attack or hurt any living beings.
+trait-name-Pacifist = Pacifist
+trait-description-Pacifist = You cannot attack or hurt any living beings.
 
-permanent-blindness-trait-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are glassy and unfocused. It doesn't seem like {SUBJECT($target)} can see you well, if at all.[/color]
+trait-name-LightweightDrunk = Lightweight Drunk
+trait-description-LightweightDrunk = Alcohol has a stronger effect on you
 
-trait-lightweight-name = Lightweight Drunk
-trait-lightweight-desc = Alcohol has a stronger effect on you
+trait-name-Muted = Muted
+trait-description-Muted = You can't speak
 
-trait-muted-name = Muted
-trait-muted-desc = You can't speak
+trait-name-Paracusia = Paracusia
+trait-description-Paracusia = You hear sounds that aren't really there
 
-trait-paracusia-name = Paracusia
-trait-paracusia-desc = You hear sounds that aren't really there
+trait-name-PirateAccent = Pirate Accent
+trait-description-PirateAccent = You can't stop speaking like a pirate!
 
-trait-pirate-accent-name = Pirate Accent
-trait-pirate-accent-desc = You can't stop speaking like a pirate!
+trait-name-Accentless = Accentless
+trait-description-Accentless = You don't have the accent that your species would usually have
 
-trait-accentless-name = Accentless
-trait-accentless-desc = You don't have the accent that your species would usually have
+trait-name-FrontalLisp = Frontal Lisp
+trait-description-FrontalLisp = You thpeak with a lithp
 
-trait-frontal-lisp-name = Frontal Lisp
-trait-frontal-lisp-desc = You thpeak with a lithp
+trait-name-SocialAnxiety = Social Anxiety
+trait-description-SocialAnxiety = You are anxious when you speak and stutter.
 
 trait-socialanxiety-name = Social Anxiety
 trait-socialanxiety-desc = You are anxious when you speak and stutter.
+
+trait-name-Snoring = Snoring
+trait-description-Snoring = You will snore while sleeping.
diff --git a/Resources/Prototypes/DeltaV/Traits/altvision.yml b/Resources/Prototypes/DeltaV/Traits/altvision.yml
index c361d1b51d..d1980bc23a 100644
--- a/Resources/Prototypes/DeltaV/Traits/altvision.yml
+++ b/Resources/Prototypes/DeltaV/Traits/altvision.yml
@@ -1,13 +1,13 @@
 - type: trait
   id: UltraVision
-  name: trait-ultravision-name
-  description: trait-ultravision-desc
+  category: Visual
+  points: -1
   components:
     - type: UltraVision
 
 - type: trait
   id: DogVision
-  name: trait-deuteranopia-name
-  description: trait-deuteranopia-desc
+  category: Visual
+  points: -1
   components:
     - type: DogVision
diff --git a/Resources/Prototypes/DeltaV/Traits/neutral.yml b/Resources/Prototypes/DeltaV/Traits/neutral.yml
index 79a6771a36..6168d7045a 100644
--- a/Resources/Prototypes/DeltaV/Traits/neutral.yml
+++ b/Resources/Prototypes/DeltaV/Traits/neutral.yml
@@ -1,7 +1,6 @@
 - type: trait
   id: ScottishAccent
-  name: trait-scottish-accent-name
-  description: trait-scottish-accent-desc
-  traitGear: BagpipeInstrument
+  category: Speech
+  points: 0
   components:
-    - type: ScottishAccent
\ No newline at end of file
+    - type: ScottishAccent
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
index 05f51baf1c..d8849472ff 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -28,7 +28,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -40,7 +40,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -52,7 +52,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -63,7 +63,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -74,7 +74,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -85,7 +85,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -96,7 +96,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -107,7 +107,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -118,7 +118,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -130,7 +130,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -141,7 +141,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
index e184e0a60a..c490559112 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefEngineer
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefEngineer
   items:
@@ -27,7 +27,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefEngineer
   items:
@@ -39,7 +39,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefEngineer
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
index 32e1a6e43e..c75c871b01 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -27,7 +27,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -38,7 +38,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -49,7 +49,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -61,7 +61,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
index f4a583e39a..3d3799c0ad 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -28,7 +28,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -40,7 +40,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -52,7 +52,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -63,7 +63,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -74,7 +74,7 @@
   category: Jobs
   cost: 4
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -85,7 +85,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -97,7 +97,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
index 60c6bbdb00..4f0d785b14 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -28,7 +28,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -40,7 +40,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -52,7 +52,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -64,7 +64,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -76,7 +76,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -88,7 +88,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -100,7 +100,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -112,7 +112,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -123,7 +123,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -134,7 +134,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -145,7 +145,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -156,7 +156,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -168,7 +168,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
index 802bc65de5..3359d8f5d7 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
@@ -5,7 +5,7 @@
 #   cost: 2
 #   exclusive: true
 #   requirements:
-#     - !type:LoadoutJobRequirement
+#     - !type:CharacterJobRequirement
 #       jobs:
 #         - Quartermaster
 #   items:
@@ -17,7 +17,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -29,7 +29,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -41,7 +41,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -52,7 +52,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -64,7 +64,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
index cf24ffd852..87cb0db179 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -27,7 +27,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -38,7 +38,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -50,7 +50,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/cargo.yml b/Resources/Prototypes/Loadouts/Jobs/cargo.yml
index fe835d6823..8746386201 100644
--- a/Resources/Prototypes/Loadouts/Jobs/cargo.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/cargo.yml
@@ -4,10 +4,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SalvageSpecialist
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobSalvageSpecialist
       min: 36000 # 10 hours
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
index 820825e236..44ef2262bc 100644
--- a/Resources/Prototypes/Loadouts/Jobs/engineering.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
   items:
@@ -28,16 +28,16 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobAtmosphericTechnician
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobStationEngineer
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Engineering
       min: 216000 # 60 hours
   items:
@@ -49,16 +49,16 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobAtmosphericTechnician
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobStationEngineer
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Engineering
       min: 216000 # 60 hours
   items:
@@ -70,7 +70,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - AtmosphericTechnician
   items:
@@ -83,7 +83,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -96,7 +96,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -110,7 +110,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -123,7 +123,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -136,7 +136,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -149,7 +149,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -162,7 +162,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml
index 429732cf1e..0a010a52f8 100644
--- a/Resources/Prototypes/Loadouts/Jobs/medical.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml
@@ -4,7 +4,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Paramedic
@@ -20,7 +20,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -33,7 +33,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - ChiefMedicalOfficer
@@ -47,7 +47,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -62,7 +62,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -77,7 +77,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -180,7 +180,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Chemist
   items:
@@ -191,7 +191,7 @@
   category: Jobs
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Chemist
   items:
@@ -203,7 +203,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Paramedic
   items:
@@ -215,7 +215,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Paramedic
   items:
@@ -227,19 +227,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
         - Paramedic
         - ChiefMedicalOfficer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobMedicalDoctor
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 216000 # 60 hours
   items:
@@ -251,19 +251,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
         - Paramedic
         - ChiefMedicalOfficer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobMedicalDoctor
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 216000 # 60 hours
   items:
@@ -275,7 +275,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
   items:
@@ -287,19 +287,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
         - Paramedic
         - ChiefMedicalOfficer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobMedicalDoctor
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 216000 # 60 hours
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
index c4e1755f8b..406c3dd116 100644
--- a/Resources/Prototypes/Loadouts/Jobs/science.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -4,10 +4,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
   items:
@@ -19,10 +19,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
   items:
@@ -34,7 +34,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
@@ -48,7 +48,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
@@ -62,10 +62,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
   items:
@@ -77,7 +77,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index 67c75d1f74..ca6fe6499d 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -19,7 +19,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - SecurityCadet
@@ -61,19 +61,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobWarden
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobDetective
       min: 7200 # 2 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobSecurityOfficer
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 216000 # 60 hours
   items:
@@ -85,19 +85,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobWarden
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobDetective
       min: 7200 # 2 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobSecurityOfficer
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 216000 # 60 hours
   items:
@@ -211,7 +211,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Warden
         - HeadOfSecurity
@@ -224,7 +224,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Detective
         - SecurityOfficer
diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml
index 1eecebec53..31cabcd302 100644
--- a/Resources/Prototypes/Loadouts/Jobs/service.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/service.yml
@@ -5,7 +5,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Clown
   items:
@@ -19,7 +19,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Clown
   items:
@@ -34,7 +34,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Bartender
   items:
@@ -47,7 +47,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
      jobs:
         - Botanist
   items:
@@ -60,7 +60,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
      jobs:
         - Lawyer
   items:
@@ -72,7 +72,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -84,7 +84,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -96,7 +96,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -108,7 +108,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -120,7 +120,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -132,7 +132,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -144,7 +144,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -156,7 +156,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Reporter
   items:
@@ -169,7 +169,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Reporter
   items:
@@ -181,7 +181,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Reporter
   items:
diff --git a/Resources/Prototypes/Loadouts/categories.yml b/Resources/Prototypes/Loadouts/categories.yml
index f1e8c34294..7942b4bdf9 100644
--- a/Resources/Prototypes/Loadouts/categories.yml
+++ b/Resources/Prototypes/Loadouts/categories.yml
@@ -1,4 +1,8 @@
-# Alphabetically ordered
+# Alphabetically ordered, except for Uncategorized since it is always first
+
+- type: loadoutCategory
+  id: Uncategorized
+
 - type: loadoutCategory
   id: Accessories
 
diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml
index 26e50802fe..1b8e7ab1c3 100644
--- a/Resources/Prototypes/Loadouts/uniform.yml
+++ b/Resources/Prototypes/Loadouts/uniform.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Passenger
   items:
diff --git a/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml b/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml
index 25aa23a5af..b7aa00353c 100644
--- a/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml
+++ b/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml
@@ -1,11 +1,12 @@
 - type: trait
   id: Nearsighted
-  name: trait-nearsighted-name
-  description: You require glasses to see properly.
-  traitGear: ClothingEyesGlasses
+  category: Visual
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Nearsighted
-  whitelist: # Delta V fix to borgs spawning with it.
-    components:
-      - Blindable
-
diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml
new file mode 100644
index 0000000000..ba3fd7b345
--- /dev/null
+++ b/Resources/Prototypes/Traits/categories.yml
@@ -0,0 +1,19 @@
+# Alphabetically ordered, except for Uncategorized since it is always first
+
+- type: traitCategory
+  id: Uncategorized
+
+- type: traitCategory
+  id: Auditory
+
+- type: traitCategory
+  id: Mental
+
+- type: traitCategory
+  id: Physical
+
+- type: traitCategory
+  id: Speech
+
+- type: traitCategory
+  id: Visual
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index 064b34adba..eb96d37e01 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -1,18 +1,26 @@
 - type: trait
   id: Blindness
-  name: trait-blindness-name
-  description: trait-blindness-desc
-  traitGear: WhiteCane
-  whitelist:
-    components:
-      - Blindable
+  category: Visual
+  points: 2
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: PermanentBlindness
 
 - type: trait
   id: Narcolepsy
-  name: trait-narcolepsy-name
-  description: trait-narcolepsy-desc
+  category: Mental
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Narcolepsy
       timeBetweenIncidents: 300, 600
@@ -20,15 +28,15 @@
 
 - type: trait
   id: Pacifist
-  name: trait-pacifist-name
-  description: trait-pacifist-desc
+  category: Mental
+  points: 3
   components:
     - type: Pacified
 
 - type: trait
   id: Paracusia
-  name: trait-paracusia-name
-  description: trait-paracusia-desc
+  category: Auditory
+  points: 1
   components:
     - type: Paracusia
       minTimeBetweenIncidents: 0.1
@@ -39,24 +47,50 @@
 
 - type: trait
   id: Muted
-  name: trait-muted-name
-  description: trait-muted-desc
-  blacklist:
-    components:
-      - BorgChassis
+  category: Speech
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Muted
 
 - type: trait
   id: Uncloneable
-  name: trait-uncloneable-name
-  description: trait-uncloneable-desc
+  category: Physical
+  points: 2
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Uncloneable
 
 - type: trait
   id: FrontalLisp
-  name: trait-frontal-lisp-name
-  description: trait-frontal-lisp-desc
+  category: Speech
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: FrontalLisp
+
+- type: trait
+  id: Snoring
+  category: Auditory
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+  components:
+    - type: Snoring
diff --git a/Resources/Prototypes/Traits/inconveniences.yml b/Resources/Prototypes/Traits/inconveniences.yml
index 657781d1b5..dcf53d9ab7 100644
--- a/Resources/Prototypes/Traits/inconveniences.yml
+++ b/Resources/Prototypes/Traits/inconveniences.yml
@@ -1,15 +1,25 @@
 - type: trait
   id: LightweightDrunk
-  name: trait-lightweight-name
-  description: trait-lightweight-desc
+  category: Physical
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: LightweightDrunk
       boozeStrengthMultiplier: 2
 
 - type: trait
   id: SocialAnxiety
-  name: trait-socialanxiety-name
-  description: trait-socialanxiety-desc
+  category: Mental
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: StutteringAccent
       matchRandomProb: 0.1
diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml
index 9e7f765507..3a3dc943cd 100644
--- a/Resources/Prototypes/Traits/neutral.yml
+++ b/Resources/Prototypes/Traits/neutral.yml
@@ -1,18 +1,23 @@
 - type: trait
   id: PirateAccent
-  name: trait-pirate-accent-name
-  description: trait-pirate-accent-desc
+  category: Speech
   components:
     - type: PirateAccent
 
 - type: trait
   id: Accentless
-  name: trait-accentless-name
-  description: trait-accentless-desc
+  category: Speech
+  points: -1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
-  - type: Accentless
-    removes:
-    - type: LizardAccent
-    - type: MothAccent
-    - type: ReplacementAccent
-      accent: dwarf
+    - type: Accentless
+      removes:
+      - type: LizardAccent
+      - type: MothAccent
+      - type: ReplacementAccent
+        accent: dwarf

From d0bf466d9d2a02b90f696f16aa111ceeb1b55e4c Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Thu, 20 Jun 2024 23:39:50 +0000
Subject: [PATCH 72/84] Automatic Changelog Update (#434)

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index d5adef7372..49b2d5358d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4217,3 +4217,11 @@ Entries:
       message: Animals will no longer be a silent, soulless shell
   id: 6126
   time: '2024-06-20T22:24:30.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Add
+      message: Added trait points
+    - type: Add
+      message: Added categories for traits
+  id: 6127
+  time: '2024-06-20T23:39:31.0000000+00:00'

From 02427b44985460804c4644190e9855d2d3ad481b Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 20:09:38 -0400
Subject: [PATCH 73/84] Revert "Merge remote-tracking branch 'upstream/master'
 into Additional-Loadout-Items"

This reverts commit 694717bb9067bcb81c9f368833e683bd3752fd56, reversing
changes made to 04774ed25f95352d3a171d774a7a6c9d6e15f52b.
---
 .github/workflows/prtitlecase.yml             |   2 +-
 Content.Client/Entry/EntryPoint.cs            |   1 -
 .../Preferences/UI/HumanoidProfileEditor.xaml |  21 +-
 .../UI/HumanoidProfileEditor.xaml.cs          | 555 ++++--------------
 Content.Client/Traits/ParacusiaSystem.cs      |   3 +-
 Content.Server/Fax/FaxMachineComponent.cs     |   6 -
 Content.Server/Flash/FlashSystem.cs           |   2 +-
 .../GameTicking/Events/RoundEndedEvent.cs     |  13 -
 .../GameTicking/Events/RoundStartedEvent.cs   |  11 -
 .../GameTicking/GameTicker.RoundFlow.cs       |   2 -
 Content.Server/Implants/ImplanterSystem.cs    |  21 -
 .../Speech/Components/RandomBarkComponent.cs  |  63 --
 .../Speech/Systems/RandomBarkSystem.cs        |  47 --
 .../Events/MassHallucinationsRule.cs          |   2 +-
 .../StationGoal/StationGoalCommand.cs         |  55 --
 .../StationGoal/StationGoalPaperComponent.cs  |   9 -
 .../StationGoal/StationGoalPaperSystem.cs     | 118 ----
 .../StationGoal/StationGoalPrototype.cs       |  12 -
 .../Traits/Assorted/ParacusiaSystem.cs        |   2 -
 Content.Server/Traits/TraitSystem.cs          |  40 +-
 .../Ranged/Systems/FireOnDropSystem.cs        |  27 -
 .../Zombies/ZombieSystem.Transform.cs         |   2 +-
 Content.Shared/CCVar/CCVars.cs                |  36 +-
 .../Prototypes/LoadoutCategoryPrototype.cs    |   1 -
 .../Loadouts/Prototypes/LoadoutPrototype.cs   |   6 +-
 .../Loadouts/Systems/LoadoutRequirements.cs   | 376 ++++++++++++
 .../Loadouts/Systems/LoadoutSystem.cs         |  40 +-
 .../Systems/CharacterRequirements.cs          | 529 -----------------
 .../Systems/CharacterRequirementsSystem.cs    |  43 --
 Content.Shared/Drunk/DrunkSystem.cs           |   2 +-
 .../Implants/Components/ImplanterComponent.cs |   6 -
 .../Preferences/HumanoidCharacterProfile.cs   |  53 +-
 .../{Components => }/AccentlessComponent.cs   |   2 +-
 .../{Systems => }/AccentlessSystem.cs         |   8 +-
 .../LegsParalyzedComponent.cs                 |   5 +-
 .../Traits/Assorted/LegsParalyzedSystem.cs    |  58 ++
 .../LightweightDrunkComponent.cs              |   4 +-
 .../{Components => }/ParacusiaComponent.cs    |   3 +-
 .../PermanentBlindnessComponent.cs            |   2 +-
 .../{Systems => }/PermanentBlindnessSystem.cs |  20 +-
 .../{Systems => }/SharedParacusiaSystem.cs    |   2 +-
 .../Assorted/Systems/LegsParalyzedSystem.cs   |  58 --
 .../Prototypes/TraitCategoryPrototype.cs      |  14 -
 .../Traits/Prototypes/TraitPrototype.cs       |  39 --
 Content.Shared/Traits/TraitPrototype.cs       |  55 ++
 .../Weapons/Ranged/Components/GunComponent.cs |   6 -
 Resources/Changelog/Changelog.yml             |  41 --
 .../customization/character-requirements.ftl  |  39 --
 .../Locale/en-US/deltav/markings/harpy.ftl    |   4 -
 .../Locale/en-US/deltav/traits/traits.ftl     |  16 +-
 Resources/Locale/en-US/implant/implant.ftl    |   1 -
 .../Locale/en-US/loadouts/categories.ftl      |   4 +-
 .../en-US/loadouts/loadout-requirements.ftl   |  13 +
 .../ui/humanoid-profile-editor.ftl            |  26 +-
 .../simplestation14/Traits/disabilities.ftl   |   5 +-
 .../station-goal/station-goal-command.ftl     |   6 -
 .../en-US/station-goal/station-goals.ftl      | 224 -------
 Resources/Locale/en-US/traits/categories.ftl  |   8 -
 Resources/Locale/en-US/traits/traits.ftl      |  43 +-
 .../Mobs/Customization/Markings/harpy.yml     |  66 +--
 .../DeltaV/Entities/Mobs/Species/harpy.yml    |  22 +-
 .../digitigrade_inventory_template.yml        |   7 +
 .../Prototypes/DeltaV/Traits/altvision.yml    |   8 +-
 .../Prototypes/DeltaV/Traits/neutral.yml      |   7 +-
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |  65 --
 .../Prototypes/Entities/Mobs/NPCs/pets.yml    |   4 -
 .../Entities/Mobs/NPCs/simplemob.yml          |   1 -
 .../Entities/Objects/Misc/paper.yml           |  13 -
 .../Objects/Weapons/Guns/Basic/base_pka.yml   |   1 -
 .../Weapons/Guns/Battery/battery_guns.yml     |   1 -
 .../Objects/Weapons/Guns/Pistols/pistols.yml  |  14 +-
 .../Weapons/Guns/Revolvers/revolvers.yml      |   3 -
 .../Objects/Weapons/Guns/Rifles/rifles.yml    |   2 -
 .../Objects/Weapons/Guns/SMGs/smgs.yml        |   5 -
 .../Weapons/Guns/Shotguns/shotguns.yml        |   7 -
 .../Objects/Weapons/Guns/Snipers/snipers.yml  |  10 -
 .../Structures/Machines/fax_machine.yml       |   2 -
 Resources/Prototypes/GameRules/events.yml     |   6 +-
 .../Loadouts/Jobs/Heads/captain.yml           |  26 +-
 .../Loadouts/Jobs/Heads/chiefEngineer.yml     |   8 +-
 .../Jobs/Heads/chiefMedicalOfficer.yml        |  12 +-
 .../Loadouts/Jobs/Heads/headOfPersonnel.yml   |  18 +-
 .../Loadouts/Jobs/Heads/headOfSecurity.yml    |  30 +-
 .../Loadouts/Jobs/Heads/quarterMaster.yml     |  12 +-
 .../Loadouts/Jobs/Heads/researchDirector.yml  |  10 +-
 Resources/Prototypes/Loadouts/Jobs/cargo.yml  |   4 +-
 .../Prototypes/Loadouts/Jobs/engineering.yml  |  36 +-
 .../Prototypes/Loadouts/Jobs/medical.yml      |  46 +-
 .../Prototypes/Loadouts/Jobs/science.yml      |  18 +-
 .../Prototypes/Loadouts/Jobs/security.yml     |  26 +-
 .../Prototypes/Loadouts/Jobs/service.yml      |  30 +-
 Resources/Prototypes/Loadouts/categories.yml  |   6 +-
 Resources/Prototypes/Loadouts/uniform.yml     |   2 +-
 Resources/Prototypes/Objectives/goals.yml     |  87 ---
 .../SimpleStation14/Traits/disabilities.yml   |  15 +-
 Resources/Prototypes/Traits/categories.yml    |  19 -
 Resources/Prototypes/Traits/disabilities.yml  |  76 +--
 .../Prototypes/Traits/inconveniences.yml      |  18 +-
 Resources/Prototypes/Traits/neutral.yml       |  25 +-
 .../Harpy/harpy_chest.rsi/lower.png           | Bin
 .../Harpy/harpy_chest.rsi/meta.json           |   0
 .../Harpy/harpy_chest.rsi/upper.png           | Bin
 .../harpy_ears.rsi/harpy_ears_default.png     | Bin
 .../Harpy/harpy_ears.rsi/meta.json            |   0
 .../Harpy/harpy_legs.rsi/feet.png             | Bin
 .../Harpy/harpy_legs.rsi/meta.json            |   0
 .../Harpy/harpy_legs.rsi/talons.png           | Bin
 .../Harpy/harpy_legs.rsi/thighs.png           | Bin
 .../Harpy/harpy_tails.rsi/meta.json           |   0
 .../Harpy/harpy_tails.rsi/phoenix_tail.png    | Bin
 .../Harpy/harpy_tails.rsi/rooster_tail.png    | Bin
 .../Harpy/harpy_tailsx72.rsi}/finch_tail.png  | Bin
 .../Harpy/harpy_tailsx72.rsi}/meta.json       |   0
 .../Customization/Harpy/harpy_wingcover.png   | Bin
 .../Harpy/harpy_wings.rsi/classicharpy.png    | Bin
 .../Harpy/harpy_wings.rsi/harpy.png           | Bin
 .../Harpy/harpy_wings.rsi/harpy2tone1.png     | Bin
 .../Harpy/harpy_wings.rsi/harpy2tone2.png     | Bin
 .../Harpy/harpy_wings.rsi/harpy3tone1.png     | Bin
 .../Harpy/harpy_wings.rsi/harpy3tone2.png     | Bin
 .../Harpy/harpy_wings.rsi/harpy3tone3.png     | Bin
 .../Harpy/harpy_wings.rsi/harpyfolded.png     | Bin
 .../Harpy/harpy_wings.rsi/harpyspeckled1.png  | Bin
 .../Harpy/harpy_wings.rsi/harpyspeckled2.png  | Bin
 .../Harpy/harpy_wings.rsi/harpyundertone1.png | Bin
 .../Harpy/harpy_wings.rsi/harpyundertone2.png | Bin
 .../Harpy/harpy_wings.rsi/harpywingtip1.png   | Bin
 .../Harpy/harpy_wings.rsi/harpywingtip2.png   | Bin
 .../Harpy/harpy_wings.rsi/meta.json           |   0
 .../Harpy/harpy_tails48x48.rsi/meta.json      |  19 -
 .../peacock_tail_eyes.png                     | Bin 772 -> 0 bytes
 .../peacock_tail_feathers.png                 | Bin 1669 -> 0 bytes
 132 files changed, 991 insertions(+), 2608 deletions(-)
 delete mode 100644 Content.Server/GameTicking/Events/RoundEndedEvent.cs
 delete mode 100644 Content.Server/GameTicking/Events/RoundStartedEvent.cs
 delete mode 100644 Content.Server/Speech/Components/RandomBarkComponent.cs
 delete mode 100644 Content.Server/Speech/Systems/RandomBarkSystem.cs
 delete mode 100644 Content.Server/StationGoal/StationGoalCommand.cs
 delete mode 100644 Content.Server/StationGoal/StationGoalPaperComponent.cs
 delete mode 100644 Content.Server/StationGoal/StationGoalPaperSystem.cs
 delete mode 100644 Content.Server/StationGoal/StationGoalPrototype.cs
 delete mode 100644 Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs
 create mode 100644 Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
 delete mode 100644 Content.Shared/Customization/Systems/CharacterRequirements.cs
 delete mode 100644 Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
 rename Content.Shared/Traits/Assorted/{Components => }/AccentlessComponent.cs (89%)
 rename Content.Shared/Traits/Assorted/{Systems => }/AccentlessSystem.cs (62%)
 rename Content.Shared/Traits/Assorted/{Components => }/LegsParalyzedComponent.cs (65%)
 create mode 100644 Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
 rename Content.Shared/Traits/Assorted/{Components => }/LightweightDrunkComponent.cs (90%)
 rename Content.Shared/Traits/Assorted/{Components => }/ParacusiaComponent.cs (93%)
 rename Content.Shared/Traits/Assorted/{Components => }/PermanentBlindnessComponent.cs (81%)
 rename Content.Shared/Traits/Assorted/{Systems => }/PermanentBlindnessSystem.cs (59%)
 rename Content.Shared/Traits/Assorted/{Systems => }/SharedParacusiaSystem.cs (56%)
 delete mode 100644 Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
 delete mode 100644 Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
 delete mode 100644 Content.Shared/Traits/Prototypes/TraitPrototype.cs
 create mode 100644 Content.Shared/Traits/TraitPrototype.cs
 delete mode 100644 Resources/Locale/en-US/customization/character-requirements.ftl
 create mode 100644 Resources/Locale/en-US/loadouts/loadout-requirements.ftl
 delete mode 100644 Resources/Locale/en-US/station-goal/station-goal-command.ftl
 delete mode 100644 Resources/Locale/en-US/station-goal/station-goals.ftl
 delete mode 100644 Resources/Locale/en-US/traits/categories.ftl
 delete mode 100644 Resources/Prototypes/Objectives/goals.yml
 delete mode 100644 Resources/Prototypes/Traits/categories.yml
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png (100%)
 rename Resources/Textures/{Mobs/Customization/Harpy/harpy_tails36x36.rsi => DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi}/finch_tail.png (100%)
 rename Resources/Textures/{Mobs/Customization/Harpy/harpy_tails36x36.rsi => DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi}/meta.json (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wingcover.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png (100%)
 rename Resources/Textures/{ => DeltaV}/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json (100%)
 delete mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json
 delete mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png
 delete mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png

diff --git a/.github/workflows/prtitlecase.yml b/.github/workflows/prtitlecase.yml
index b3150dcc7e..0c5a38a4e8 100644
--- a/.github/workflows/prtitlecase.yml
+++ b/.github/workflows/prtitlecase.yml
@@ -30,5 +30,5 @@ jobs:
       - name: Change Title
         run: |
           cd "Tools/prtitlecase"
-          node index.js
+          node src/index.js
         shell: bash
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index a1fc68bbd2..53a8051eec 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -124,7 +124,6 @@ public override void Init()
             _prototypeManager.RegisterIgnore("wireLayout");
             _prototypeManager.RegisterIgnore("alertLevels");
             _prototypeManager.RegisterIgnore("nukeopsRole");
-            _prototypeManager.RegisterIgnore("stationGoal");
 
             _componentFactory.GenerateNetIds();
             _adminManager.Initialize();
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index 38d4a411ff..9a70d67831 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -142,29 +142,18 @@
                         <BoxContainer Name="CAntagList" Orientation="Vertical" />
                     </ScrollContainer>
                 </BoxContainer>
-                <BoxContainer Name="CTraitsTab" Orientation="Vertical" Margin="10">
+                <BoxContainer Orientation="Vertical" Margin="10">
                     <!-- Traits -->
-                    <Label Name="TraitPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
-                    <ProgressBar Name="TraitPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
-
-                    <Button Name="TraitsShowUnusableButton"
-                            Text="{Loc 'humanoid-profile-editor-traits-show-unusable-button'}"
-                            ToolTip="{Loc 'humanoid-profile-editor-traits-show-unusable-button-tooltip'}"
-                            ToggleMode="True"
-                            Margin="0 0 0 5" />
-
-                    <TabContainer Name="CTraitsTabs" VerticalExpand="True" />
+                    <ScrollContainer VerticalExpand="True">
+                        <BoxContainer Name="CTraitsList" Orientation="Vertical" />
+                    </ScrollContainer>
                 </BoxContainer>
                 <BoxContainer Name="CLoadoutsTab" Orientation="Vertical" Margin="10">
                     <!-- Loadouts -->
                     <Label Name="LoadoutPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
                     <ProgressBar Name="LoadoutPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
 
-                    <Button Name="LoadoutsShowUnusableButton"
-                            Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}"
-                            ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}"
-                            ToggleMode="True"
-                            Margin="0 0 0 5" />
+                    <Button Name="CHideShowUnusableButton" Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}" ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}" ToggleMode="True" Margin="0 0 0 5" />
 
                     <TabContainer Name="CLoadoutsTabs" VerticalExpand="True" />
                 </BoxContainer>
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index fd84b67522..8b88fc1e9b 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -12,7 +12,6 @@
 using Content.Shared.CCVar;
 using Content.Shared.Clothing.Loadouts.Prototypes;
 using Content.Shared.Clothing.Loadouts.Systems;
-using Content.Shared.Customization.Systems;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
@@ -62,7 +61,6 @@ public sealed partial class HumanoidProfileEditor : Control
         private readonly IConfigurationManager _configurationManager;
         private readonly MarkingManager _markingManager;
         private readonly JobRequirementsManager _requirements;
-        private readonly CharacterRequirementsSystem _characterRequirementsSystem;
         private readonly LoadoutSystem _loadoutSystem;
 
         private LineEdit _ageEdit => CAgeEdit;
@@ -85,15 +83,10 @@ public sealed partial class HumanoidProfileEditor : Control
         private TabContainer _tabContainer => CTabContainer;
         private BoxContainer _jobList => CJobList;
         private BoxContainer _antagList => CAntagList;
-        private Label _traitPointsLabel => TraitPointsLabel;
-        private int _traitCount;
-        private ProgressBar _traitPointsBar => TraitPointsBar;
-        private Button _traitsShowUnusableButton => TraitsShowUnusableButton;
-        private BoxContainer _traitsTab => CTraitsTab;
-        private TabContainer _traitsTabs => CTraitsTabs;
+        private BoxContainer _traitsList => CTraitsList;
         private Label _loadoutPointsLabel => LoadoutPointsLabel;
         private ProgressBar _loadoutPointsBar => LoadoutPointsBar;
-        private Button _loadoutsShowUnusableButton => LoadoutsShowUnusableButton;
+        private Button _loadoutsShowUnusableButton => CHideShowUnusableButton;
         private BoxContainer _loadoutsTab => CLoadoutsTab;
         private TabContainer _loadoutsTabs => CLoadoutsTabs;
         private readonly List<JobPrioritySelector> _jobPriorities;
@@ -131,7 +124,6 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _preferencesManager = preferencesManager;
             _configurationManager = configurationManager;
             _markingManager = IoCManager.Resolve<MarkingManager>();
-            _characterRequirementsSystem = EntitySystem.Get<CharacterRequirementsSystem>();
             _loadoutSystem = EntitySystem.Get<LoadoutSystem>();
 
             SpeciesInfoButton.ToolTip = Loc.GetString("humanoid-profile-editor-guidebook-button-tooltip");
@@ -452,19 +444,33 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             #region Traits
 
-            // Set up the traits tab
-            _tabContainer.SetTabTitle(3, Loc.GetString("humanoid-profile-editor-traits-tab"));
+            var traits = prototypeManager.EnumeratePrototypes<TraitPrototype>().OrderBy(t => Loc.GetString(t.Name)).ToList();
             _traitPreferences = new List<TraitPreferenceSelector>();
+            _tabContainer.SetTabTitle(3, Loc.GetString("humanoid-profile-editor-traits-tab"));
 
-            // Show/Hide the traits tab if they ever get enabled/disabled
-            var traitsEnabled = _configurationManager.GetCVar(CCVars.GameTraitsEnabled);
-            _tabContainer.SetTabVisible(3, traitsEnabled);
-            _configurationManager.OnValueChanged(CCVars.GameTraitsEnabled,
-                enabled => _tabContainer.SetTabVisible(3, enabled));
-
-            _traitsShowUnusableButton.OnToggled += args => UpdateTraits(args.Pressed);
+            if (traits.Count > 0)
+            {
+                foreach (var trait in traits)
+                {
+                    var selector = new TraitPreferenceSelector(trait);
+                    _traitsList.AddChild(selector);
+                    _traitPreferences.Add(selector);
 
-            UpdateTraits(false);
+                    selector.PreferenceChanged += preference =>
+                    {
+                        Profile = Profile?.WithTraitPreference(trait.ID, preference);
+                        IsDirty = true;
+                    };
+                }
+            }
+            else
+            {
+                _traitsList.AddChild(new Label
+                {
+                    Text = "No traits available :(",
+                    FontColorOverride = Color.Gray,
+                });
+            }
 
             #endregion
 
@@ -474,17 +480,14 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _tabContainer.SetTabTitle(4, Loc.GetString("humanoid-profile-editor-loadouts-tab"));
             _loadoutPreferences = new List<LoadoutPreferenceSelector>();
 
-            // Show/Hide the loadouts tab if they ever get enabled/disabled
+            // Show/Hide loadouts tab if they ever get enabled/disabled
             var loadoutsEnabled = _configurationManager.GetCVar(CCVars.GameLoadoutsEnabled);
             _tabContainer.SetTabVisible(4, loadoutsEnabled);
             ShowLoadouts.Visible = loadoutsEnabled;
-            _configurationManager.OnValueChanged(CCVars.GameLoadoutsEnabled,
-                enabled => LoadoutsChanged(enabled));
+            _configurationManager.OnValueChanged(CCVars.GameLoadoutsEnabled, enabled => LoadoutsChanged(enabled));
 
             _loadoutsShowUnusableButton.OnToggled += args => UpdateLoadouts(args.Pressed);
 
-            UpdateLoadouts(false);
-
             #endregion
 
             #region Save
@@ -539,6 +542,8 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _previewDummy = _entMan.SpawnEntity(dollProto, MapCoordinates.Nullspace);
             _previewSpriteView.SetEntity(_previewDummy);
 
+            UpdateLoadouts(false); // Initial UpdateLoadouts call has to have a dummy to get information from
+
             #endregion Dummy
 
             #endregion Left
@@ -557,7 +562,6 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             IsDirty = false;
         }
 
-
         private void LoadoutsChanged(bool enabled)
         {
             _tabContainer.SetTabVisible(4, enabled);
@@ -1445,264 +1449,12 @@ private void UpdateAntagPreferences()
 
         private void UpdateTraitPreferences()
         {
-            var points = _configurationManager.GetCVar(CCVars.GameTraitsDefaultPoints);
-            _traitCount = 0;
-
             foreach (var preferenceSelector in _traitPreferences)
             {
                 var traitId = preferenceSelector.Trait.ID;
                 var preference = Profile?.TraitPreferences.Contains(traitId) ?? false;
 
                 preferenceSelector.Preference = preference;
-
-                if (!preference)
-                    continue;
-
-                points += preferenceSelector.Trait.Points;
-                _traitCount += 1;
-            }
-
-            _traitPointsBar.Value = points;
-            _traitPointsLabel.Text = Loc.GetString("humanoid-profile-editor-traits-header",
-                ("points", points), ("traits", _traitCount),
-                ("maxTraits", _configurationManager.GetCVar(CCVars.GameTraitsMax)));
-        }
-
-        // Yeah this is mostly just copied from UpdateLoadouts
-        // This whole file is bad though and a lot of loadout code came from traits originally
-        //TODO Make this file not hell
-        private void UpdateTraits(bool showUnusable)
-        {
-            // Reset trait points so you don't get -14 points or something for no reason
-            var points = _configurationManager.GetCVar(CCVars.GameTraitsDefaultPoints);
-            _traitPointsLabel.Text = Loc.GetString("humanoid-profile-editor-traits-header",
-                ("points", points), ("traits", 0),
-                ("maxTraits", _configurationManager.GetCVar(CCVars.GameTraitsMax)));
-            _traitPointsBar.MaxValue = points;
-            _traitPointsBar.Value = points;
-
-            // Clear current listings
-            _traitPreferences.Clear();
-            _traitsTabs.DisposeAllChildren();
-
-
-            // Get the highest priority job to use for trait filtering
-            var highJob = _jobPriorities.FirstOrDefault(j => j.Priority == JobPriority.High);
-
-            // Get all trait prototypes
-            var enumeratedTraits = _prototypeManager.EnumeratePrototypes<TraitPrototype>().ToList();
-            // Get all trait categories
-            var categories = _prototypeManager.EnumeratePrototypes<TraitCategoryPrototype>().ToList();
-
-            // If showUnusable is false filter out traits that are unusable based on your current character setup
-            var traits = enumeratedTraits.Where(trait =>
-                showUnusable || // Ignore everything if this is true
-                _characterRequirementsSystem.CheckRequirementsValid(
-                    trait,
-                    trait.Requirements,
-                    highJob?.Proto ?? new JobPrototype(),
-                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(), //TODO Make this use real playtimes
-                    _entMan,
-                    _prototypeManager,
-                    _configurationManager,
-                    out _
-                )
-            ).ToList();
-
-            // Traits to highlight red when showUnusable is true
-            var traitsUnusable = enumeratedTraits.Where(trait =>
-                _characterRequirementsSystem.CheckRequirementsValid(
-                    trait,
-                    trait.Requirements,
-                    highJob?.Proto ?? new JobPrototype(),
-                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(),
-                    _entMan,
-                    _prototypeManager,
-                    _configurationManager,
-                    out _
-                )
-            ).ToList();
-
-            // Every trait not in the traits list
-            var otherTraits = enumeratedTraits.Where(trait => !traits.Contains(trait)).ToList();
-
-
-            if (traits.Count == 0)
-            {
-                _traitsTab.AddChild(new Label { Text = Loc.GetString("humanoid-profile-editor-traits-no-traits") });
-                return;
-            }
-
-            // Make Uncategorized category
-            var uncategorized = new BoxContainer
-            {
-                Orientation = LayoutOrientation.Vertical,
-                VerticalExpand = true,
-                Name = "Uncategorized_0",
-                // I hate ScrollContainers
-                Children =
-                {
-                    new ScrollContainer
-                    {
-                        HScrollEnabled = false,
-                        HorizontalExpand = true,
-                        VerticalExpand = true,
-                        Children =
-                        {
-                            new BoxContainer
-                            {
-                                Orientation = LayoutOrientation.Vertical,
-                                HorizontalExpand = true,
-                                VerticalExpand = true,
-                            },
-                        },
-                    },
-                },
-            };
-
-            _traitsTabs.AddChild(uncategorized);
-            _traitsTabs.SetTabTitle(0, Loc.GetString("trait-category-Uncategorized"));
-
-
-            // Make categories
-            var currentCategory = 1; // 1 because we already made 0 as Uncategorized, I am not not zero-indexing :)
-            foreach (var category in categories.OrderBy(c => Loc.GetString($"trait-category-{c.ID}")))
-            {
-                // Check for existing category
-                BoxContainer? match = null;
-                foreach (var child in _traitsTabs.Children)
-                {
-                    if (string.IsNullOrEmpty(child.Name))
-                        continue;
-
-                    if (child.Name.Split("_")[0] == category.ID)
-                        match = (BoxContainer) child;
-                }
-
-                // If there is a category do nothing
-                if (match != null)
-                    continue;
-
-                // If not, make it
-                var box = new BoxContainer
-                {
-                    Orientation = LayoutOrientation.Vertical,
-                    VerticalExpand = true,
-                    Name = $"{category.ID}_{currentCategory}",
-                    // I hate ScrollContainers
-                    Children =
-                    {
-                        new ScrollContainer
-                        {
-                            HScrollEnabled = false,
-                            HorizontalExpand = true,
-                            VerticalExpand = true,
-                            Children =
-                            {
-                                new BoxContainer
-                                {
-                                    Orientation = LayoutOrientation.Vertical,
-                                    HorizontalExpand = true,
-                                    VerticalExpand = true,
-                                },
-                            },
-                        },
-                    },
-                };
-
-                _traitsTabs.AddChild(box);
-                _traitsTabs.SetTabTitle(currentCategory, Loc.GetString($"trait-category-{category.ID}"));
-                currentCategory++;
-            }
-
-
-            // Fill categories
-            foreach (var trait in traits.OrderBy(t => -t.Points).ThenBy(t => Loc.GetString($"trait-name-{t.ID}")))
-            {
-                var selector = new TraitPreferenceSelector(trait, highJob?.Proto ?? new JobPrototype(),
-                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    traitsUnusable.Contains(trait) ? "" : "ButtonColorRed",
-                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
-
-                // Look for an existing trait category
-                BoxContainer? match = null;
-                foreach (var child in _traitsTabs.Children)
-                {
-                    if (string.IsNullOrEmpty(child.Name))
-                        continue;
-
-                    // This is fucked up
-                    if (child.Name.Split("_")[0] == trait.Category
-                        && child.Children.FirstOrDefault()?.Children.FirstOrDefault(g =>
-                            g.GetType() == typeof(BoxContainer)) is {} g != default)
-                        match = (BoxContainer) g;
-                }
-
-                // If there is no category put it in Uncategorized
-                if (string.IsNullOrEmpty(match?.Parent?.Parent?.Name)
-                    || match.Parent.Parent.Name.Split("_")[0] != trait.Category)
-                    uncategorized.AddChild(selector);
-                else
-                    match.AddChild(selector);
-
-
-                AddSelector(selector, trait.Points, trait.ID);
-            }
-
-            // Add the selected unusable traits to the point counter
-            foreach (var trait in otherTraits.OrderBy(t => -t.Points).ThenBy(t => Loc.GetString($"trait-name-{t.ID}")))
-            {
-                var selector = new TraitPreferenceSelector(trait, highJob?.Proto ?? new JobPrototype(),
-                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "",
-                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
-
-
-                AddSelector(selector, trait.Points, trait.ID);
-            }
-
-
-            // Hide Uncategorized tab if it's empty, other tabs already shouldn't exist if they're empty
-            _traitsTabs.SetTabVisible(0, uncategorized.Children.Any());
-
-            // Add fake tabs until tab container is happy
-            for (var i = _traitsTabs.ChildCount - 1; i < _traitsTabs.CurrentTab; i++)
-            {
-                _traitsTabs.AddChild(new BoxContainer());
-                _traitsTabs.SetTabVisible(i + 1, false);
-            }
-
-            UpdateTraitPreferences();
-            return;
-
-
-            void AddSelector(TraitPreferenceSelector selector, int points, string id)
-            {
-                if (points > 0)
-                    _traitPointsBar.MaxValue += points;
-
-                _traitPreferences.Add(selector);
-                selector.PreferenceChanged += preference =>
-                {
-                    // Make sure they have enough trait points
-                    preference = preference ? CheckPoints(points, preference) : CheckPoints(-points, preference);
-                    // Don't allow having too many traits
-                    preference = preference && _traitCount + 1 <= _configurationManager.GetCVar(CCVars.GameTraitsMax);
-
-                    // Update Preferences
-                    Profile = Profile?.WithTraitPreference(id, preference);
-                    IsDirty = true;
-                    UpdateTraitPreferences();
-                    UpdateTraits(_traitsShowUnusableButton.Pressed);
-                    UpdateLoadouts(_loadoutsShowUnusableButton.Pressed);
-                };
-            }
-
-            bool CheckPoints(int points, bool preference)
-            {
-                var temp = _traitPointsBar.Value + points;
-                return preference ? !(temp < 0) : temp < 0;
             }
         }
 
@@ -1746,18 +1498,15 @@ private void UpdateLoadouts(bool showUnusable)
 
             // Get all loadout prototypes
             var enumeratedLoadouts = _prototypeManager.EnumeratePrototypes<LoadoutPrototype>().ToList();
-            // Get all loadout categories
-            var categories = _prototypeManager.EnumeratePrototypes<LoadoutCategoryPrototype>().ToList();
 
             // If showUnusable is false filter out loadouts that are unusable based on your current character setup
             var loadouts = enumeratedLoadouts.Where(loadout =>
                 showUnusable || // Ignore everything if this is true
-                _characterRequirementsSystem.CheckRequirementsValid(
-                    loadout,
+                _loadoutSystem.CheckRequirementsValid(
                     loadout.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(), //TODO Make this use real playtimes
+                    new Dictionary<string, TimeSpan>(),
                     _entMan,
                     _prototypeManager,
                     _configurationManager,
@@ -1767,8 +1516,7 @@ out _
 
             // Loadouts to highlight red when showUnusable is true
             var loadoutsUnusable = enumeratedLoadouts.Where(loadout =>
-                _characterRequirementsSystem.CheckRequirementsValid(
-                    loadout,
+                _loadoutSystem.CheckRequirementsValid(
                     loadout.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
@@ -1796,47 +1544,23 @@ out _
                 Orientation = LayoutOrientation.Vertical,
                 VerticalExpand = true,
                 Name = "Uncategorized_0",
-                // I hate ScrollContainers
-                Children =
-                {
-                    new ScrollContainer
-                    {
-                        HScrollEnabled = false,
-                        HorizontalExpand = true,
-                        VerticalExpand = true,
-                        Children =
-                        {
-                            new BoxContainer
-                            {
-                                Orientation = LayoutOrientation.Vertical,
-                                HorizontalExpand = true,
-                                VerticalExpand = true,
-                            },
-                        },
-                    },
-                },
             };
 
             _loadoutsTabs.AddChild(uncategorized);
-            _loadoutsTabs.SetTabTitle(0, Loc.GetString("loadout-category-Uncategorized"));
-
+            _loadoutsTabs.SetTabTitle(0, Loc.GetString("humanoid-profile-editor-loadouts-uncategorized-tab"));
 
             // Make categories
             var currentCategory = 1; // 1 because we already made 0 as Uncategorized, I am not not zero-indexing :)
-            foreach (var category in categories.OrderBy(c => Loc.GetString($"loadout-category-{c.ID}")))
+            foreach (var loadout in loadouts.OrderBy(l => l.Category))
             {
                 // Check for existing category
                 BoxContainer? match = null;
                 foreach (var child in _loadoutsTabs.Children)
                 {
-                    if (string.IsNullOrEmpty(child.Name))
+                    if (match != null || child.Name == null)
                         continue;
-
-                    // This is fucked up
-                    if (child.Name.Split("_")[0] == category.ID
-                        && child.Children.FirstOrDefault()?.Children.FirstOrDefault(g =>
-                            g.GetType() == typeof(BoxContainer)) is {} g != default)
-                        match = (BoxContainer) g;
+                    if (child.Name.Split("_")[0] == loadout.Category)
+                        match = (BoxContainer) child;
                 }
 
                 // If there is a category do nothing
@@ -1848,7 +1572,7 @@ out _
                 {
                     Orientation = LayoutOrientation.Vertical,
                     VerticalExpand = true,
-                    Name = $"{category.ID}_{currentCategory}",
+                    Name = $"{loadout.Category}_{currentCategory}",
                     // I hate ScrollContainers
                     Children =
                     {
@@ -1871,24 +1595,23 @@ out _
                 };
 
                 _loadoutsTabs.AddChild(box);
-                _loadoutsTabs.SetTabTitle(currentCategory, Loc.GetString($"loadout-category-{category.ID}"));
+                _loadoutsTabs.SetTabTitle(currentCategory, Loc.GetString($"loadout-category-{loadout.Category}"));
                 currentCategory++;
             }
 
-
             // Fill categories
-            foreach (var loadout in loadouts.OrderBy(l => l.Cost).ThenBy(l => Loc.GetString($"loadout-{l.ID}-name")))
+            foreach (var loadout in loadouts.OrderBy(l => l.ID))
             {
                 var selector = new LoadoutPreferenceSelector(loadout, highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    loadoutsUnusable.Contains(loadout) ? "" : "ButtonColorRed",
-                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
+                    loadoutsUnusable.Contains(loadout) ? "" : "ButtonColorRed", _entMan, _prototypeManager,
+                    _configurationManager, _loadoutSystem);
 
                 // Look for an existing loadout category
                 BoxContainer? match = null;
                 foreach (var child in _loadoutsTabs.Children)
                 {
-                    if (string.IsNullOrEmpty(child.Name))
+                    if (match != null || child.Name == null)
                         continue;
 
                     if (child.Name.Split("_")[0] == loadout.Category)
@@ -1896,30 +1619,80 @@ out _
                 }
 
                 // If there is no category put it in Uncategorized
-                if (string.IsNullOrEmpty(match?.Parent?.Parent?.Name)
-                    || match.Parent.Parent.Name.Split("_")[0] != loadout.Category)
+                if (match?.Parent?.Parent?.Name == null)
                     uncategorized.AddChild(selector);
                 else
                     match.AddChild(selector);
 
-
-                AddSelector(selector, loadout.Cost, loadout.ID);
+                _loadoutPreferences.Add(selector);
+                selector.PreferenceChanged += preference =>
+                {
+                    // Make sure they have enough loadout points
+                    if (preference)
+                    {
+                        var temp = _loadoutPointsBar.Value - loadout.Cost;
+                        if (temp < 0)
+                            preference = false;
+                        else
+                        {
+                            _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
+                                ("points", temp), ("max", _loadoutPointsBar.MaxValue));
+                            _loadoutPointsBar.Value = temp;
+                        }
+                    }
+                    else
+                    {
+                        _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
+                            ("points", _loadoutPointsBar.Value), ("max", _loadoutPointsBar.MaxValue));
+                        _loadoutPointsBar.Value += loadout.Cost;
+                    }
+                    // Update Preference
+                    Profile = Profile?.WithLoadoutPreference(loadout.ID, preference);
+                    IsDirty = true;
+                    UpdateLoadoutPreferences();
+                };
             }
 
             // Add the selected unusable loadouts to the point counter
-            foreach (var loadout in otherLoadouts.OrderBy(l => l.Cost).ThenBy(l => Loc.GetString($"loadout-{l.ID}-name")))
+            foreach (var loadout in otherLoadouts.OrderBy(l => l.ID))
             {
                 var selector = new LoadoutPreferenceSelector(loadout, highJob?.Proto ?? new JobPrototype(),
-                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "",
-                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "", _entMan, _prototypeManager,
+                    _configurationManager, _loadoutSystem);
 
-
-                AddSelector(selector, loadout.Cost, loadout.ID);
+                _loadoutPreferences.Add(selector);
+                selector.PreferenceChanged += preference =>
+                {
+                    // Make sure they have enough loadout points
+                    if (preference)
+                    {
+                        var temp = _loadoutPointsBar.Value - loadout.Cost;
+                        if (temp < 0)
+                            preference = false;
+                        else
+                        {
+                            _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
+                                ("points", temp), ("max", _loadoutPointsBar.MaxValue));
+                            _loadoutPointsBar.Value = temp;
+                        }
+                    }
+                    else
+                    {
+                        _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
+                            ("points", _loadoutPointsBar.Value), ("max", _loadoutPointsBar.MaxValue));
+                        _loadoutPointsBar.Value += loadout.Cost;
+                    }
+                    // Update Preference
+                    Profile = Profile?.WithLoadoutPreference(loadout.ID, preference);
+                    IsDirty = true;
+                    UpdateLoadoutPreferences();
+                };
             }
 
 
             // Hide Uncategorized tab if it's empty, other tabs already shouldn't exist if they're empty
-            _loadoutsTabs.SetTabVisible(0, uncategorized.Children.Any());
+            if (!uncategorized.Children.Any())
+                _loadoutsTabs.SetTabVisible(0, false);
 
             // Add fake tabs until tab container is happy
             for (var i = _loadoutsTabs.ChildCount - 1; i < _loadoutsTabs.CurrentTab; i++)
@@ -1929,31 +1702,6 @@ out _
             }
 
             UpdateLoadoutPreferences();
-            return;
-
-
-            void AddSelector(LoadoutPreferenceSelector selector, int points, string id)
-            {
-                _loadoutPreferences.Add(selector);
-                selector.PreferenceChanged += preference =>
-                {
-                    // Make sure they have enough loadout points
-                    preference = preference ? CheckPoints(points, preference) : CheckPoints(-points, preference);
-
-                    // Update Preferences
-                    Profile = Profile?.WithLoadoutPreference(id, preference);
-                    IsDirty = true;
-                    UpdateLoadoutPreferences();
-                    UpdateLoadouts(_loadoutsShowUnusableButton.Pressed);
-                    UpdateTraits(_traitsShowUnusableButton.Pressed);
-                };
-            }
-
-            bool CheckPoints(int points, bool preference)
-            {
-                var temp = _loadoutPointsBar.Value + points;
-                return preference ? !(temp < 0) : temp < 0;
-            }
         }
 
 
@@ -2005,68 +1753,19 @@ public bool Preference
 
             public event Action<bool>? PreferenceChanged;
 
-            public TraitPreferenceSelector(TraitPrototype trait, JobPrototype highJob,
-                HumanoidCharacterProfile profile, string style, IEntityManager entityManager, IPrototypeManager prototypeManager,
-                IConfigurationManager configManager, CharacterRequirementsSystem characterRequirementsSystem)
+            public TraitPreferenceSelector(TraitPrototype trait)
             {
                 Trait = trait;
 
-                // Create a checkbox to get the loadout
-                _button = new Button
-                {
-                    VerticalAlignment = VAlignment.Center,
-                    ToggleMode = true,
-                    StyleClasses = { StyleBase.ButtonOpenLeft },
-                    Children =
-                    {
-                        new BoxContainer
-                        {
-                            Children =
-                            {
-                                new Label
-                                {
-                                    Text = trait.Points.ToString(),
-                                    StyleClasses = { StyleBase.StyleClassLabelHeading },
-                                    MinWidth = 32,
-                                    MaxWidth = 32,
-                                    ClipText = true,
-                                    Margin = new Thickness(0, 0, 8, 0),
-                                },
-                                new Label { Text = Loc.GetString($"trait-name-{trait.ID}") },
-                            },
-                        },
-                    },
-                };
+                _button = new Button {Text = Loc.GetString(trait.Name)};
+                _button.ToggleMode = true;
                 _button.OnToggled += OnButtonToggled;
-                _button.AddStyleClass(style);
-
-                var tooltip = new StringBuilder();
-                // Add the loadout description to the tooltip if there is one
-                var desc = Loc.GetString($"trait-description-{trait.ID}");
-                if (!string.IsNullOrEmpty(desc) && desc != $"trait-description-{trait.ID}")
-                    tooltip.Append(desc);
-
-
-                // Get requirement reasons
-                characterRequirementsSystem.CheckRequirementsValid(trait, trait.Requirements, highJob, profile,
-                    new Dictionary<string, TimeSpan>(),
-                    entityManager, prototypeManager, configManager,
-                    out var reasons);
 
-                // Add requirement reasons to the tooltip
-                foreach (var reason in reasons)
-                    tooltip.Append($"\n{reason.ToMarkup()}");
-
-                // Combine the tooltip and format it in the checkbox supplier
-                if (tooltip.Length > 0)
+                if (trait.Description is { } desc)
                 {
-                    var formattedTooltip = new Tooltip();
-                    formattedTooltip.SetMessage(FormattedMessage.FromMarkupPermissive(tooltip.ToString()));
-                    _button.TooltipSupplier = _ => formattedTooltip;
+                    _button.ToolTip = Loc.GetString(desc);
                 }
 
-
-                // Add the loadout preview and the checkbox to the control
                 AddChild(new BoxContainer
                 {
                     Orientation = LayoutOrientation.Horizontal,
@@ -2095,7 +1794,7 @@ public bool Preference
 
             public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
                 HumanoidCharacterProfile profile, string style, IEntityManager entityManager, IPrototypeManager prototypeManager,
-                IConfigurationManager configManager, CharacterRequirementsSystem characterRequirementsSystem)
+                IConfigurationManager configManager, LoadoutSystem loadoutSystem)
             {
                 Loadout = loadout;
 
@@ -2117,32 +1816,11 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
                 // Create a checkbox to get the loadout
                 _button = new Button
                 {
+                    Text = $"[{loadout.Cost}] {(Loc.GetString($"loadout-name-{loadout.ID}") == $"loadout-name-{loadout.ID}"
+                        ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityName
+                        : Loc.GetString($"loadout-name-{loadout.ID}"))}",
+                    VerticalAlignment = VAlignment.Center,
                     ToggleMode = true,
-                    StyleClasses = { StyleBase.ButtonOpenLeft },
-                    Children =
-                    {
-                        new BoxContainer
-                        {
-                            Children =
-                            {
-                                new Label
-                                {
-                                    Text = loadout.Cost.ToString(),
-                                    StyleClasses = { StyleBase.StyleClassLabelHeading },
-                                    MinWidth = 32,
-                                    MaxWidth = 32,
-                                    ClipText = true,
-                                    Margin = new Thickness(0, 0, 8, 0),
-                                },
-                                new Label
-                                {
-                                    Text = Loc.GetString($"loadout-name-{loadout.ID}") == $"loadout-name-{loadout.ID}"
-                                        ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityName
-                                        : Loc.GetString($"loadout-name-{loadout.ID}"),
-                                },
-                            },
-                        },
-                    },
                 };
                 _button.OnToggled += OnButtonToggled;
                 _button.AddStyleClass(style);
@@ -2157,10 +1835,7 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
 
 
                 // Get requirement reasons
-                characterRequirementsSystem.CheckRequirementsValid(loadout, loadout.Requirements, highJob, profile,
-                    new Dictionary<string, TimeSpan>(),
-                    entityManager, prototypeManager, configManager,
-                    out var reasons);
+                loadoutSystem.CheckRequirementsValid(loadout.Requirements, highJob, profile, new Dictionary<string, TimeSpan>(), entityManager, prototypeManager, configManager, out var reasons);
 
                 // Add requirement reasons to the tooltip
                 foreach (var reason in reasons)
diff --git a/Content.Client/Traits/ParacusiaSystem.cs b/Content.Client/Traits/ParacusiaSystem.cs
index d01c7c0005..3789f24cb0 100644
--- a/Content.Client/Traits/ParacusiaSystem.cs
+++ b/Content.Client/Traits/ParacusiaSystem.cs
@@ -1,12 +1,11 @@
 using System.Numerics;
-using Content.Shared.Traits.Assorted.Systems;
+using Content.Shared.Traits.Assorted;
 using Robust.Shared.Random;
 using Robust.Client.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
-using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Client.Traits;
 
diff --git a/Content.Server/Fax/FaxMachineComponent.cs b/Content.Server/Fax/FaxMachineComponent.cs
index a189bdc05a..d1f269dd37 100644
--- a/Content.Server/Fax/FaxMachineComponent.cs
+++ b/Content.Server/Fax/FaxMachineComponent.cs
@@ -51,12 +51,6 @@ public sealed partial class FaxMachineComponent : Component
     [DataField("receiveNukeCodes")]
     public bool ReceiveNukeCodes { get; set; } = false;
 
-    /// <summary>
-    /// 	Should this fax receive station goals
-    /// </summary>
-    [DataField]
-    public bool ReceiveStationGoal { get; set; } = false;
-
     /// <summary>
     /// Sound to play when fax has been emagged
     /// </summary>
diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
index 013ee37a41..fe7eb81d1e 100644
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -14,13 +14,13 @@
 using Content.Shared.Inventory;
 using Content.Shared.Physics;
 using Content.Shared.Tag;
+using Content.Shared.Traits.Assorted;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Timing;
 using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
-using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Flash
 {
diff --git a/Content.Server/GameTicking/Events/RoundEndedEvent.cs b/Content.Server/GameTicking/Events/RoundEndedEvent.cs
deleted file mode 100644
index 36bd1f47a1..0000000000
--- a/Content.Server/GameTicking/Events/RoundEndedEvent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Content.Server.GameTicking;
-
-public sealed class RoundEndedEvent : EntityEventArgs
-{
-    public int RoundId { get; }
-    public TimeSpan RoundDuration { get; }
-
-    public RoundEndedEvent(int roundId, TimeSpan roundDuration)
-    {
-        RoundId = roundId;
-        RoundDuration = roundDuration;
-    }
-}
diff --git a/Content.Server/GameTicking/Events/RoundStartedEvent.cs b/Content.Server/GameTicking/Events/RoundStartedEvent.cs
deleted file mode 100644
index 1e285a6749..0000000000
--- a/Content.Server/GameTicking/Events/RoundStartedEvent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Server.GameTicking;
-
-public sealed class RoundStartedEvent : EntityEventArgs
-{
-    public int RoundId { get; }
-
-    public RoundStartedEvent(int roundId)
-    {
-        RoundId = roundId;
-    }
-}
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 6e02c4ac40..004508ab91 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -255,7 +255,6 @@ public void StartRound(bool force = false)
             AnnounceRound();
             UpdateInfoText();
             SendRoundStartedDiscordMessage();
-            RaiseLocalEvent(new RoundStartedEvent(RoundId));
 
 #if EXCEPTION_TOLERANCE
             }
@@ -403,7 +402,6 @@ public void ShowRoundEndScoreboard(string text = "")
 
             _replayRoundPlayerInfo = listOfPlayerInfoFinal;
             _replayRoundText = roundEndText;
-            RaiseLocalEvent(new RoundEndedEvent(RoundId, roundDuration));
         }
 
         private async void SendRoundEndDiscordMessage()
diff --git a/Content.Server/Implants/ImplanterSystem.cs b/Content.Server/Implants/ImplanterSystem.cs
index 3cfa3a9f5f..0d46241f41 100644
--- a/Content.Server/Implants/ImplanterSystem.cs
+++ b/Content.Server/Implants/ImplanterSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Server.Popups;
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
@@ -58,17 +57,6 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
                 return;
             }
 
-            // Check if we are trying to implant a implant which is already implanted
-            if (implant.HasValue && !component.AllowMultipleImplants && CheckSameImplant(target, implant.Value))
-            {
-                var name = Identity.Name(target, EntityManager, args.User);
-                var msg = Loc.GetString("implanter-component-implant-already", ("implant", implant), ("target", name));
-                _popup.PopupEntity(msg, target, args.User);
-                args.Handled = true;
-                return;
-            }
-
-
             //Implant self instantly, otherwise try to inject the target.
             if (args.User == target)
                 Implant(target, target, uid, component);
@@ -79,15 +67,6 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
         args.Handled = true;
     }
 
-    public bool CheckSameImplant(EntityUid target, EntityUid implant)
-    {
-        if (!TryComp<ImplantedComponent>(target, out var implanted))
-            return false;
-
-        var implantPrototype = Prototype(implant);
-        return implanted.ImplantContainer.ContainedEntities.Any(entity => Prototype(entity) == implantPrototype);
-    }
-
     /// <summary>
     /// Attempt to implant someone else.
     /// </summary>
diff --git a/Content.Server/Speech/Components/RandomBarkComponent.cs b/Content.Server/Speech/Components/RandomBarkComponent.cs
deleted file mode 100644
index 7229428f53..0000000000
--- a/Content.Server/Speech/Components/RandomBarkComponent.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-///     Sends a random message from a list with a provided min/max time.
-/// </summary>
-[RegisterComponent]
-public sealed partial class RandomBarkComponent : Component
-{
-    /// <summary>
-    ///     Should the message be sent to the chat log?
-    /// </summary>
-    [DataField]
-    public bool ChatLog = false;
-
-    /// <summary>
-    ///     Minimum time an animal will go without speaking
-    /// </summary>
-    [DataField]
-    public int MinTime = 45;
-
-    /// <summary>
-    ///     Maximum time an animal will go without speaking
-    /// </summary>
-    [DataField]
-    public int MaxTime = 350;
-
-    /// <summary>
-    ///     Accumulator for counting time since the last bark
-    /// </summary>
-    [DataField]
-    public float BarkAccumulator = 8f;
-
-    /// <summary>
-    ///     Multiplier applied to the random time. Good for changing the frequency without having to specify exact values
-    /// </summary>
-    [DataField]
-    public float BarkMultiplier = 1f;
-
-    /// <summary>
-    ///     List of things to be said. Filled with garbage to be modified by an accent, but can be specified in the .yml
-    /// </summary>
-    [DataField]
-    public IReadOnlyList<string> Barks = new[]
-    {
-        "Bark",
-        "Boof",
-        "Woofums",
-        "Rawrl",
-        "Eeeeeee",
-        "Barkums",
-        "Awooooooooooooooooooo awoo awoooo",
-        "Grrrrrrrrrrrrrrrrrr",
-        "Rarrwrarrwr",
-        "Goddamn I love gold fish crackers",
-        "Bork bork boof boof bork bork boof boof boof bork",
-        "Bark",
-        "Boof",
-        "Woofums",
-        "Rawrl",
-        "Eeeeeee",
-        "Barkums",
-    };
-}
diff --git a/Content.Server/Speech/Systems/RandomBarkSystem.cs b/Content.Server/Speech/Systems/RandomBarkSystem.cs
deleted file mode 100644
index 4fc9dd420d..0000000000
--- a/Content.Server/Speech/Systems/RandomBarkSystem.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Content.Server.Chat.Systems;
-using Content.Shared.Mind.Components;
-using Robust.Shared.Random;
-using Content.Server.Speech.Components;
-
-namespace Content.Server.Speech.Systems;
-
-public sealed class RandomBarkSystem : EntitySystem
-{
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly EntityManager _entity = default!;
-
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RandomBarkComponent, ComponentInit>(OnInit);
-    }
-
-
-    private void OnInit(EntityUid uid, RandomBarkComponent barker, ComponentInit args)
-    {
-        barker.BarkAccumulator = _random.NextFloat(barker.MinTime, barker.MaxTime) * barker.BarkMultiplier;
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<RandomBarkComponent>();
-        while (query.MoveNext(out var uid, out var barker))
-        {
-            barker.BarkAccumulator -= frameTime;
-            if (barker.BarkAccumulator > 0)
-                continue;
-
-            barker.BarkAccumulator = _random.NextFloat(barker.MinTime, barker.MaxTime) * barker.BarkMultiplier;
-            if (_entity.TryGetComponent<MindContainerComponent>(uid, out var actComp) &&
-                actComp.HasMind)
-                continue;
-
-            _chat.TrySendInGameICMessage(uid, _random.Pick(barker.Barks), InGameICChatType.Speak, barker.ChatLog ? ChatTransmitRange.Normal : ChatTransmitRange.HideChat);
-        }
-    }
-}
diff --git a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
index 4fc158f864..722a489541 100644
--- a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
+++ b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
@@ -2,7 +2,7 @@
 using Content.Server.StationEvents.Components;
 using Content.Server.Traits.Assorted;
 using Content.Shared.Mind.Components;
-using Content.Shared.Traits.Assorted.Components;
+using Content.Shared.Traits.Assorted;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/StationGoal/StationGoalCommand.cs b/Content.Server/StationGoal/StationGoalCommand.cs
deleted file mode 100644
index 1c82509d69..0000000000
--- a/Content.Server/StationGoal/StationGoalCommand.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Linq;
-using Content.Server.Administration;
-using Content.Shared.Administration;
-using Robust.Shared.Console;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.StationGoal
-{
-    [AdminCommand(AdminFlags.Fun)]
-    public sealed class StationGoalCommand : IConsoleCommand
-    {
-        public string Command => "sendstationgoal";
-        public string Description => Loc.GetString("send-station-goal-command-description");
-        public string Help => Loc.GetString("send-station-goal-command-help-text", ("command", Command));
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            if (args.Length != 1)
-            {
-                shell.WriteError(Loc.GetString("shell-need-exactly-one-argument"));
-                return;
-            }
-
-            var protoId = args[0];
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            if (!prototypeManager.TryIndex<StationGoalPrototype>(protoId, out var proto))
-            {
-                shell.WriteError(Loc.GetString("send-station-goal-command-error-no-goal-proto", ("id", protoId)));
-                return;
-            }
-
-            var stationGoalPaper = IoCManager.Resolve<IEntityManager>().System<StationGoalPaperSystem>();
-            if (!stationGoalPaper.SendStationGoal(proto))
-            {
-                shell.WriteError(Loc.GetString("send-station-goal-command-error-couldnt-fax"));
-                return;
-            }
-        }
-
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
-        {
-            if (args.Length == 1)
-            {
-                var options = IoCManager.Resolve<IPrototypeManager>()
-                    .EnumeratePrototypes<StationGoalPrototype>()
-                    .OrderBy(p => p.ID)
-                    .Select(p => new CompletionOption(p.ID));
-
-                return CompletionResult.FromHintOptions(options, Loc.GetString("send-station-goal-command-arg-id"));
-            }
-
-            return CompletionResult.Empty;
-        }
-    }
-}
diff --git a/Content.Server/StationGoal/StationGoalPaperComponent.cs b/Content.Server/StationGoal/StationGoalPaperComponent.cs
deleted file mode 100644
index 445b474681..0000000000
--- a/Content.Server/StationGoal/StationGoalPaperComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Content.Server.StationGoal
-{
-    /// <summary>
-    ///     Paper with a written station goal in it.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class StationGoalPaperComponent : Component { }
-}
-
diff --git a/Content.Server/StationGoal/StationGoalPaperSystem.cs b/Content.Server/StationGoal/StationGoalPaperSystem.cs
deleted file mode 100644
index 6a059c37a3..0000000000
--- a/Content.Server/StationGoal/StationGoalPaperSystem.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System.Text.RegularExpressions;
-using Content.Server.GameTicking;
-using Content.Server.Fax;
-using Content.Server.Station.Systems;
-using Content.Shared.CCVar;
-using Content.Shared.Random;
-using Content.Shared.Random.Helpers;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Content.Shared.Dataset;
-
-namespace Content.Server.StationGoal;
-
-/// <summary>
-///     System for station goals
-/// </summary>
-public sealed class StationGoalPaperSystem : EntitySystem
-{
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly FaxSystem _fax = default!;
-    [Dependency] private readonly IConfigurationManager _config = default!;
-    [Dependency] private readonly StationSystem _station = default!;
-
-    private static readonly Regex StationIdRegex = new(@".*-(\d+)$");
-
-    [ValidatePrototypeId<WeightedRandomPrototype>]
-    private const string RandomPrototype = "StationGoals";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string RandomSignature = "names_last";
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RoundStartedEvent>(OnRoundStarted);
-    }
-
-
-    private void OnRoundStarted(RoundStartedEvent ev)
-    {
-        if (_config.GetCVar(CCVars.StationGoalsEnabled)
-        	&& _random.Prob(_config.GetCVar(CCVars.StationGoalsChance)))
-            SendRandomGoal();
-    }
-
-    /// <summary>
-    ///     Send a random station goal to all faxes which are authorized to receive it
-    /// </summary>
-    /// <returns>If the fax was successful</returns>
-    /// <exception cref="Exception">Raised when station goal types in the prototype is invalid</exception>
-    public bool SendRandomGoal()
-    {
-        // Get the random station goal list
-        if (!_prototype.TryIndex<WeightedRandomPrototype>(RandomPrototype, out var goals))
-        {
-            Log.Error($"StationGoalPaperSystem: Random station goal prototype '{RandomPrototype}' not found");
-            return false;
-        }
-
-        // Get a random goal
-        var goal = RecursiveRandom(goals);
-
-        // Send the goal
-        return SendStationGoal(goal);
-    }
-
-    private StationGoalPrototype RecursiveRandom(WeightedRandomPrototype random)
-    {
-        var goal = random.Pick(_random);
-
-        if (_prototype.TryIndex<StationGoalPrototype>(goal, out var goalPrototype))
-            return goalPrototype;
-
-        if (_prototype.TryIndex<WeightedRandomPrototype>(goal, out var goalRandom))
-            return RecursiveRandom(goalRandom);
-
-        throw new Exception($"StationGoalPaperSystem: Random station goal could not be found from prototypes {RandomPrototype} and {random.ID}");
-    }
-
-    /// <summary>
-    ///     Send a station goal to all faxes which are authorized to receive it
-    /// </summary>
-    /// <returns>True if at least one fax received paper</returns>
-    public bool SendStationGoal(StationGoalPrototype goal)
-    {
-        var enumerator = EntityManager.EntityQueryEnumerator<FaxMachineComponent>();
-        var wasSent = false;
-        var signerName = _prototype.Index<DatasetPrototype>(RandomSignature);
-
-        while (enumerator.MoveNext(out var uid, out var fax))
-        {
-            if (!fax.ReceiveStationGoal
-                || !TryComp<MetaDataComponent>(_station.GetOwningStation(uid), out var meta))
-                continue;
-
-            var stationId = StationIdRegex.Match(meta.EntityName).Groups[1].Value;
-
-            var printout = new FaxPrintout(
-                Loc.GetString("station-goal-fax-paper-header",
-                    ("date", DateTime.Now.AddYears(1000).ToString("yyyy MMMM dd")),
-                    ("station", string.IsNullOrEmpty(stationId) ? "???" : stationId),
-                    ("content", goal.Text),
-                    ("name", _random.Pick(signerName.Values))
-                ),
-                Loc.GetString("station-goal-fax-paper-name"),
-                "StationGoalPaper"
-            );
-
-            _fax.Receive(uid, printout, null, fax);
-
-            wasSent = true;
-        }
-
-        return wasSent;
-    }
-}
diff --git a/Content.Server/StationGoal/StationGoalPrototype.cs b/Content.Server/StationGoal/StationGoalPrototype.cs
deleted file mode 100644
index 733759a37d..0000000000
--- a/Content.Server/StationGoal/StationGoalPrototype.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.StationGoal
-{
-    [Serializable, Prototype("stationGoal")]
-    public sealed class StationGoalPrototype : IPrototype
-    {
-        [IdDataFieldAttribute] public string ID { get; } = default!;
-
-        public string Text => Loc.GetString($"station-goal-{ID.ToLower()}");
-    }
-}
diff --git a/Content.Server/Traits/Assorted/ParacusiaSystem.cs b/Content.Server/Traits/Assorted/ParacusiaSystem.cs
index cf08e09e90..4b0205ff53 100644
--- a/Content.Server/Traits/Assorted/ParacusiaSystem.cs
+++ b/Content.Server/Traits/Assorted/ParacusiaSystem.cs
@@ -1,7 +1,5 @@
 using Content.Shared.Traits.Assorted;
-using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Audio;
-using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Traits.Assorted;
 
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index be2c3c0503..22ee0e4861 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -1,13 +1,7 @@
-using System.Linq;
 using Content.Server.GameTicking;
-using Content.Server.Players.PlayTimeTracking;
-using Content.Shared.Customization.Systems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Roles;
 using Content.Shared.Traits;
-using Pidgin.Configuration;
-using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager;
 
@@ -15,12 +9,9 @@ namespace Content.Server.Traits;
 
 public sealed class TraitSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
-    [Dependency] private readonly ISerializationManager _serialization = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly CharacterRequirementsSystem _characterRequirements = default!;
-    [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
-    [Dependency] private readonly IConfigurationManager _configuration = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly ISerializationManager _serializationManager = default!;
+    [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
 
     public override void Initialize()
     {
@@ -34,17 +25,16 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
     {
         foreach (var traitId in args.Profile.TraitPreferences)
         {
-            if (!_prototype.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
+            if (!_prototypeManager.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
             {
                 Log.Warning($"No trait found with ID {traitId}!");
                 return;
             }
 
-            if (!_characterRequirements.CheckRequirementsValid(traitPrototype, traitPrototype.Requirements,
-                _prototype.Index<JobPrototype>(args.JobId ?? _prototype.EnumeratePrototypes<JobPrototype>().First().ID),
-                args.Profile, _playTimeTracking.GetTrackerTimes(args.Player),
-                EntityManager, _prototype, _configuration,
-                out _))
+            if (traitPrototype.Whitelist != null && !traitPrototype.Whitelist.IsValid(args.Mob))
+                continue;
+
+            if (traitPrototype.Blacklist != null && traitPrototype.Blacklist.IsValid(args.Mob))
                 continue;
 
             // Add all components required by the prototype
@@ -53,10 +43,22 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
                 if (HasComp(args.Mob, entry.Component.GetType()))
                     continue;
 
-                var comp = (Component) _serialization.CreateCopy(entry.Component, notNullableOverride: true);
+                var comp = (Component) _serializationManager.CreateCopy(entry.Component, notNullableOverride: true);
                 comp.Owner = args.Mob;
                 EntityManager.AddComponent(args.Mob, comp);
             }
+
+            // Add item required by the trait
+            if (traitPrototype.TraitGear != null)
+            {
+                if (!TryComp(args.Mob, out HandsComponent? handsComponent))
+                    continue;
+
+                var coords = Transform(args.Mob).Coordinates;
+                var inhandEntity = EntityManager.SpawnEntity(traitPrototype.TraitGear, coords);
+                _sharedHandsSystem.TryPickup(args.Mob, inhandEntity, checkActionBlocker: false,
+                    handsComp: handsComponent);
+            }
         }
     }
 }
diff --git a/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs b/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs
deleted file mode 100644
index a6112ad49c..0000000000
--- a/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Shared.Throwing;
-using Content.Shared.Weapons.Ranged.Components;
-using Content.Shared.Weapons.Ranged.Systems;
-using Robust.Shared.Random;
-
-namespace Content.Server.Weapons.Ranged.Systems;
-
-public sealed class FireOnDropSystem : EntitySystem
-{
-    [Dependency] private readonly SharedGunSystem _gun = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<GunComponent, ThrowDoHitEvent>(HandleLand);
-    }
-
-
-    private void HandleLand(EntityUid uid, GunComponent component, ref ThrowDoHitEvent args)
-    {
-        if (_random.Prob(component.FireOnDropChance))
-            _gun.AttemptShoot(uid, uid, component, Transform(uid).Coordinates.Offset(Transform(uid).LocalRotation.ToVec()));
-    }
-}
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 21f2508042..53128aade3 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -35,8 +35,8 @@
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Zombies;
 using Content.Shared.Prying.Components;
+using Content.Shared.Traits.Assorted;
 using Robust.Shared.Audio.Systems;
-using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Zombies
 {
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index ab36977efb..891c790d52 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -341,34 +341,14 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> DebugCoordinatesAdminOnly =
             CVarDef.Create("game.debug_coordinates_admin_only", true, CVar.SERVER | CVar.REPLICATED);
 
-
         /// <summary>
-        ///     Whether to allow characters to select traits.
-        /// </summary>
-        public static readonly CVarDef<bool> GameTraitsEnabled =
-            CVarDef.Create("game.traits_enabled", true, CVar.REPLICATED);
-
-        /// <summary>
-        ///     How many traits a character can have at most.
-        /// </summary>
-        public static readonly CVarDef<int> GameTraitsMax =
-            CVarDef.Create("game.traits_max", 5, CVar.REPLICATED);
-
-        /// <summary>
-        ///     How many points a character should start with.
-        /// </summary>
-        public static readonly CVarDef<int> GameTraitsDefaultPoints =
-            CVarDef.Create("game.traits_default_points", 5, CVar.REPLICATED);
-
-
-        /// <summary>
-        ///     Whether to allow characters to select loadout items.
+        /// Whether or not to allow characters to select loadout items.
         /// </summary>
         public static readonly CVarDef<bool> GameLoadoutsEnabled =
             CVarDef.Create("game.loadouts_enabled", true, CVar.REPLICATED);
 
         /// <summary>
-        ///     How many points to give to each player for loadouts.
+        /// How many points to give to each player for loadouts.
         /// </summary>
         public static readonly CVarDef<int> GameLoadoutsPoints =
             CVarDef.Create("game.loadouts_points", 14, CVar.REPLICATED);
@@ -2126,17 +2106,5 @@ public static readonly CVarDef<float>
         /// </summary>
         public static readonly CVarDef<bool> PsionicRollsEnabled =
             CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Enables station goals
-        /// </summary>
-        public static readonly CVarDef<bool> StationGoalsEnabled =
-            CVarDef.Create("game.station_goals", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Chance for a station goal to be sent
-        /// </summary>
-        public static readonly CVarDef<float> StationGoalsChance =
-            CVarDef.Create("game.station_goals_chance", 0.1f, CVar.SERVERONLY);
     }
 }
diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
index 445cbc10e6..5dd880d3f1 100644
--- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
+++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
@@ -2,7 +2,6 @@
 
 namespace Content.Shared.Clothing.Loadouts.Prototypes;
 
-
 /// <summary>
 ///     A prototype defining a valid category for <see cref="LoadoutPrototype"/>s to go into.
 /// </summary>
diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
index 9ca575fa72..bc31fc1570 100644
--- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
+++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
@@ -1,12 +1,10 @@
 using Content.Shared.Clothing.Loadouts.Systems;
-using Content.Shared.Customization.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Clothing.Loadouts.Prototypes;
 
-
 [Prototype("loadout")]
 public sealed class LoadoutPrototype : IPrototype
 {
@@ -19,7 +17,7 @@ public sealed class LoadoutPrototype : IPrototype
     /// <summary>
     ///     Which tab category to put this under
     /// </summary>
-    [DataField, ValidatePrototypeId<LoadoutCategoryPrototype>]
+    [DataField(customTypeSerializer:typeof(PrototypeIdSerializer<LoadoutCategoryPrototype>))]
     public string Category = "Uncategorized";
 
     /// <summary>
@@ -43,5 +41,5 @@ public sealed class LoadoutPrototype : IPrototype
 
 
     [DataField]
-    public List<CharacterRequirement> Requirements = new();
+    public List<LoadoutRequirement> Requirements = new();
 }
diff --git a/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs b/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
new file mode 100644
index 0000000000..422a5b15a4
--- /dev/null
+++ b/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
@@ -0,0 +1,376 @@
+using System.Linq;
+using Content.Shared.CCVar;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
+using Content.Shared.Traits;
+using JetBrains.Annotations;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Clothing.Loadouts.Systems;
+
+[ImplicitDataDefinitionForInheritors, MeansImplicitUse]
+[Serializable, NetSerializable]
+public abstract partial class LoadoutRequirement
+{
+    /// <summary>
+    ///     If true valid requirements will be treated as invalid and vice versa
+    /// </summary>
+    [DataField]
+    public bool Inverted = false;
+
+    /// <summary>
+    ///     Checks if this loadout requirement is valid for the given parameters
+    /// </summary>
+    /// <param name="reason">Description for the requirement, shown when not null</param>
+    public abstract bool IsValid(
+        JobPrototype job,
+        HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager,
+        IPrototypeManager prototypeManager,
+        IConfigurationManager configManager,
+        out FormattedMessage? reason
+    );
+}
+
+
+#region HumanoidCharacterProfile
+
+/// <summary>
+///     Requires the profile to be within an age range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutAgeRequirement : LoadoutRequirement
+{
+    [DataField(required: true)]
+    public int Min;
+
+    [DataField(required: true)]
+    public int Max;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-age-requirement",
+            ("min", Min), ("max", Max)));
+        return profile.Age >= Min && profile.Age <= Max;
+    }
+}
+
+/// <summary>
+///   Requires the profile to use either a Backpack, Satchel, or Duffelbag
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutBackpackTypeRequirement : LoadoutRequirement
+{
+    [DataField(required: true)]
+    public BackpackPreference Preference;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-backpack-type-requirement",
+            ("type", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
+        return profile.Backpack == Preference;
+    }
+}
+
+/// <summary>
+///     Requires the profile to use either Jumpsuits or Jumpskirts
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutClothingPreferenceRequirement : LoadoutRequirement
+{
+    [DataField(required: true)]
+    public ClothingPreference Preference;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-clothing-preference-requirement",
+            ("preference", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
+        return profile.Clothing == Preference;
+    }
+}
+
+/// <summary>
+///     Requires the profile to be a certain species
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutSpeciesRequirement : LoadoutRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<SpeciesPrototype>> Species;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        var speciesString = string.Join(", ", Species.Select(j => Loc.GetString(prototypeManager.Index(j).Name)));
+        speciesString = Loc.GetString("loadout-species-requirement", ("species", speciesString));
+        reason = FormattedMessage.FromMarkup(speciesString);
+        return Species.Contains(profile.Species);
+    }
+}
+
+/// <summary>
+///     Requires the profile to have a certain trait
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutTraitRequirement : LoadoutRequirement
+{
+    [DataField(required: true)]
+    public ProtoId<TraitPrototype> Trait;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-trait-requirement",
+            ("trait", Loc.GetString($"trait-{Trait.ToString().ToLower()}-name"))));
+        return profile.TraitPreferences.Contains(Trait.ToString());
+    }
+}
+
+#endregion
+
+#region Jobs
+
+/// <summary>
+///     Requires the selected job to be a certain one
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutJobRequirement : LoadoutRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<JobPrototype>> Jobs;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        // Join localized job names with a comma
+        var jobsString = string.Join(", ", Jobs.Select(j => Loc.GetString(prototypeManager.Index(j).Name)));
+        // Form the reason message
+        jobsString = Loc.GetString("loadout-job-requirement", ("job", jobsString));
+
+        reason = FormattedMessage.FromMarkup(jobsString);
+        return Jobs.Contains(job.ID);
+    }
+}
+
+/// <summary>
+///     Requires the playtime for a department to be within a certain range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutDepartmentTimeRequirement : LoadoutRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    [DataField(required: true)]
+    public ProtoId<DepartmentPrototype> Department;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        var department = prototypeManager.Index(Department);
+
+        // Combine all of this department's job playtimes
+        var playtime = TimeSpan.Zero;
+        foreach (var other in department.Roles)
+        {
+            var proto = prototypeManager.Index<JobPrototype>(other).PlayTimeTracker;
+
+            playTimes.TryGetValue(proto, out var otherTime);
+            playtime += otherTime;
+        }
+
+        if (playtime > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-department-too-high",
+                    ("time", playtime.Minutes - Max.Minutes),
+                    ("department", Loc.GetString($"department-{department.ID}")),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        if (playtime < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-department-insufficient",
+                    ("time", Min.Minutes - playtime.Minutes),
+                    ("department", Loc.GetString($"department-{department.ID}")),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        reason = null;
+        return true;
+    }
+}
+
+/// <summary>
+///     Requires the player to have a certain amount of overall job time
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutOverallTimeRequirement : LoadoutRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        // Get the overall time
+        var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
+
+        if (overallTime > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-overall-too-high",
+                    ("time", overallTime.Minutes - Max.Minutes)));
+            return false;
+        }
+
+        if (overallTime < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-overall-insufficient",
+                    ("time", Min.Minutes - overallTime.Minutes)));
+            return false;
+        }
+
+        reason = null;
+        return true;
+    }
+}
+
+/// <summary>
+///     Requires the playtime for a tracker to be within a certain range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutPlaytimeRequirement : LoadoutRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    [DataField(required: true)]
+    public ProtoId<PlayTimeTrackerPrototype> Tracker;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        // Get SharedJobSystem
+        if (!entityManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
+        {
+            DebugTools.Assert("LoadoutRequirements: SharedJobSystem not found");
+            reason = null;
+            return false;
+        }
+
+        // Get the JobPrototype of the Tracker
+        var trackerJob = jobSystem.GetJobPrototype(Tracker);
+
+        // Get the primary department of the Tracker
+        if (!jobSystem.TryGetPrimaryDepartment(trackerJob, out var department) &&
+            !jobSystem.TryGetDepartment(trackerJob, out department))
+        {
+            DebugTools.Assert($"LoadoutRequirements: Department not found for job {trackerJob}");
+            reason = null;
+            return false;
+        }
+
+        // Get the time for the tracker
+        playTimes.TryGetValue(Tracker, out var time);
+        reason = null;
+
+        if (time > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-role-too-high",
+                    ("time", time.Minutes - Max.Minutes),
+                    ("job", trackerJob),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        if (time < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-role-insufficient",
+                    ("time", Min.Minutes - time.Minutes),
+                    ("job", trackerJob),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        return true;
+    }
+}
+
+#endregion
diff --git a/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs b/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
index 09e3db3793..eb9a5dcbc8 100644
--- a/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
+++ b/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.Loadouts.Prototypes;
-using Content.Shared.Customization.Systems;
 using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
@@ -18,8 +17,7 @@ public sealed class LoadoutSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly IConfigurationManager _configuration = default!;
-    [Dependency] private readonly CharacterRequirementsSystem _characterRequirements = default!;
+    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
 
     public override void Initialize()
     {
@@ -68,9 +66,8 @@ public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, JobPrototype job, Hu
                 continue;
 
 
-            if (!_characterRequirements.CheckRequirementsValid(loadoutProto, loadoutProto.Requirements, job, profile,
-                playTimes ?? new Dictionary<string, TimeSpan>(),
-                EntityManager, _prototype, _configuration,
+            if (!CheckRequirementsValid(loadoutProto.Requirements, job, profile,
+                playTimes ?? new Dictionary<string, TimeSpan>(), EntityManager, _prototype, _configurationManager,
                 out _))
                 continue;
 
@@ -118,4 +115,35 @@ public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, JobPrototype job, Hu
         // The server has more information about the inventory system than the client does and the client doesn't need to put loadouts in backpacks
         return failedLoadouts;
     }
+
+
+    public bool CheckRequirementsValid(List<LoadoutRequirement> requirements, JobPrototype job,
+        HumanoidCharacterProfile profile, Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager,
+        IPrototypeManager prototypeManager, IConfigurationManager configManager, out List<FormattedMessage> reasons)
+    {
+        reasons = new List<FormattedMessage>();
+        var valid = true;
+
+        foreach (var requirement in requirements)
+        {
+            // Set valid to false if the requirement is invalid and not inverted, if it's inverted set it to true when it's valid
+            if (!requirement.IsValid(job, profile, playTimes, entityManager, prototypeManager, configManager, out var reason))
+            {
+                if (valid)
+                    valid = requirement.Inverted;
+            }
+            else
+            {
+                if (valid)
+                    valid = !requirement.Inverted;
+            }
+
+            if (reason != null)
+            {
+                reasons.Add(reason);
+            }
+        }
+
+        return valid;
+    }
 }
diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.cs b/Content.Shared/Customization/Systems/CharacterRequirements.cs
deleted file mode 100644
index b7200c60e8..0000000000
--- a/Content.Shared/Customization/Systems/CharacterRequirements.cs
+++ /dev/null
@@ -1,529 +0,0 @@
-using System.Linq;
-using Content.Shared.CCVar;
-using Content.Shared.Clothing.Loadouts.Prototypes;
-using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.Players.PlayTimeTracking;
-using Content.Shared.Preferences;
-using Content.Shared.Roles;
-using Content.Shared.Roles.Jobs;
-using Content.Shared.Traits;
-using JetBrains.Annotations;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.Customization.Systems;
-
-
-[ImplicitDataDefinitionForInheritors, MeansImplicitUse]
-[Serializable, NetSerializable]
-public abstract partial class CharacterRequirement
-{
-    /// <summary>
-    ///     If true valid requirements will be treated as invalid and vice versa
-    /// </summary>
-    [DataField]
-    public bool Inverted;
-
-    /// <summary>
-    ///     Checks if this character requirement is valid for the given parameters
-    /// </summary>
-    /// <param name="reason">Description for the requirement, shown when not null</param>
-    public abstract bool IsValid(
-        IPrototype prototype,
-        JobPrototype job,
-        HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager,
-        IPrototypeManager prototypeManager,
-        IConfigurationManager configManager,
-        out FormattedMessage? reason
-    );
-}
-
-
-#region HumanoidCharacterProfile
-
-/// <summary>
-///     Requires the profile to be within an age range
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class CharacterAgeRequirement : CharacterRequirement
-{
-    [DataField(required: true)]
-    public int Min;
-
-    [DataField(required: true)]
-    public int Max;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("character-age-requirement",
-            ("inverted", Inverted), ("min", Min), ("max", Max)));
-        return profile.Age >= Min && profile.Age <= Max;
-    }
-}
-
-/// <summary>
-///   Requires the profile to use either a Backpack, Satchel, or Duffelbag
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class CharacterBackpackTypeRequirement : CharacterRequirement
-{
-    [DataField(required: true)]
-    public BackpackPreference Preference;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("character-backpack-type-requirement",
-            ("inverted", Inverted),
-            ("type", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
-        return profile.Backpack == Preference;
-    }
-}
-
-/// <summary>
-///     Requires the profile to use either Jumpsuits or Jumpskirts
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class CharacterClothingPreferenceRequirement : CharacterRequirement
-{
-    [DataField(required: true)]
-    public ClothingPreference Preference;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("character-clothing-preference-requirement",
-            ("inverted", Inverted),
-            ("preference", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
-        return profile.Clothing == Preference;
-    }
-}
-
-/// <summary>
-///     Requires the profile to be a certain species
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class CharacterSpeciesRequirement : CharacterRequirement
-{
-    [DataField(required: true)]
-    public ProtoId<SpeciesPrototype> Species;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("character-species-requirement",
-            ("inverted", Inverted),
-            ("species", Loc.GetString($"species-name-{Species.ToString().ToLower()}"))));
-        return profile.Species == Species;
-    }
-}
-
-/// <summary>
-///     Requires the profile to have one of the specified traits
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class CharacterTraitRequirement : CharacterRequirement
-{
-    [DataField(required: true)]
-    public List<ProtoId<TraitPrototype>> Traits;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("character-trait-requirement", ("inverted", Inverted),
-            ("traits", string.Join(", ", Traits.Select(t => Loc.GetString($"trait-name-{t}"))))));
-
-        return Traits.Any(t => profile.TraitPreferences.Contains(t.ToString()));
-    }
-}
-
-/// <summary>
-///     Requires the profile to have one of the specified loadouts
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class CharacterLoadoutRequirement : CharacterRequirement
-{
-    [DataField(required: true)]
-    public List<ProtoId<LoadoutPrototype>> Loadouts;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("character-loadout-requirement", ("inverted", Inverted),
-            ("loadouts", string.Join(", ", Loadouts.Select(l => Loc.GetString($"loadout-{l}"))))));
-
-        return Loadouts.Any(l => profile.LoadoutPreferences.Contains(l.ToString()));
-    }
-}
-
-#endregion
-
-#region Jobs
-
-/// <summary>
-///     Requires the selected job to be one of the specified jobs
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class CharacterJobRequirement : CharacterRequirement
-{
-    [DataField(required: true)]
-    public List<ProtoId<JobPrototype>> Jobs;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out FormattedMessage? reason)
-    {
-        var jobs = new List<FormattedMessage>();
-
-        // Get the job names and department colors
-        foreach (var j in Jobs)
-        {
-            var jobProto = prototypeManager.Index(j);
-            var color = Color.LightBlue;
-
-            foreach (var dept in prototypeManager.EnumeratePrototypes<DepartmentPrototype>()
-                .OrderBy(d => Loc.GetString($"department-{d.ID}")))
-            {
-                if (!dept.Roles.Contains(j))
-                    continue;
-
-                color = dept.Color;
-                break;
-            }
-
-            jobs.Add(FormattedMessage.FromMarkup($"[color={color.ToHex()}]{Loc.GetString(jobProto.Name)}[/color]"));
-        }
-
-        // Join the job names
-        var jobsList = string.Join(", ", jobs.Select(j => j.ToMarkup()));
-        var jobsString = Loc.GetString("character-job-requirement",
-            ("inverted", Inverted), ("jobs", jobsList));
-
-        reason = FormattedMessage.FromMarkup(jobsString);
-        return Jobs.Contains(job.ID);
-    }
-}
-
-/// <summary>
-///     Requires the selected job to be in one of the specified departments
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class CharacterDepartmentRequirement : CharacterRequirement
-{
-    [DataField(required: true)]
-    public List<ProtoId<DepartmentPrototype>> Departments;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out FormattedMessage? reason)
-    {
-        var departments = new List<FormattedMessage>();
-
-        // Get the department names and colors
-        foreach (var d in Departments)
-        {
-            var deptProto = prototypeManager.Index(d);
-            var color = deptProto.Color;
-
-            departments.Add(FormattedMessage.FromMarkup($"[color={color.ToHex()}]{Loc.GetString($"department-{deptProto.ID}")}[/color]"));
-        }
-
-        // Join the department names
-        var departmentsList = string.Join(", ", departments.Select(d => d.ToMarkup()));
-        var departmentsString = Loc.GetString("character-department-requirement",
-            ("inverted", Inverted), ("departments", departmentsList));
-
-        reason = FormattedMessage.FromMarkup(departmentsString);
-        return Departments.Any(d => prototypeManager.Index(d).Roles.Contains(job.ID));
-    }
-}
-
-/// <summary>
-///     Requires the playtime for a department to be within a certain range
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class CharacterDepartmentTimeRequirement : CharacterRequirement
-{
-    [DataField]
-    public TimeSpan Min = TimeSpan.MinValue;
-
-    [DataField]
-    public TimeSpan Max = TimeSpan.MaxValue;
-
-    [DataField(required: true)]
-    public ProtoId<DepartmentPrototype> Department;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out FormattedMessage? reason)
-    {
-        // Disable the requirement if the role timers are disabled
-        if (!configManager.GetCVar(CCVars.GameRoleTimers))
-        {
-            reason = null;
-            return !Inverted;
-        }
-
-        var department = prototypeManager.Index(Department);
-
-        // Combine all of this department's job playtimes
-        var playtime = TimeSpan.Zero;
-        foreach (var other in department.Roles)
-        {
-            var proto = prototypeManager.Index<JobPrototype>(other).PlayTimeTracker;
-
-            playTimes.TryGetValue(proto, out var otherTime);
-            playtime += otherTime;
-        }
-
-        if (playtime > Max)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-department-too-high",
-                    ("time", playtime.Minutes - Max.Minutes),
-                    ("department", Loc.GetString($"department-{department.ID}")),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        if (playtime < Min)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-department-insufficient",
-                    ("time", Min.Minutes - playtime.Minutes),
-                    ("department", Loc.GetString($"department-{department.ID}")),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        reason = null;
-        return true;
-    }
-}
-
-/// <summary>
-///     Requires the player to have a certain amount of overall job time
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class CharacterOverallTimeRequirement : CharacterRequirement
-{
-    [DataField]
-    public TimeSpan Min = TimeSpan.MinValue;
-
-    [DataField]
-    public TimeSpan Max = TimeSpan.MaxValue;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out FormattedMessage? reason)
-    {
-        // Disable the requirement if the role timers are disabled
-        if (!configManager.GetCVar(CCVars.GameRoleTimers))
-        {
-            reason = null;
-            return !Inverted;
-        }
-
-        // Get the overall time
-        var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
-
-        if (overallTime > Max)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-overall-too-high",
-                    ("time", overallTime.Minutes - Max.Minutes)));
-            return false;
-        }
-
-        if (overallTime < Min)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-overall-insufficient",
-                    ("time", Min.Minutes - overallTime.Minutes)));
-            return false;
-        }
-
-        reason = null;
-        return true;
-    }
-}
-
-/// <summary>
-///     Requires the playtime for a tracker to be within a certain range
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class CharacterPlaytimeRequirement : CharacterRequirement
-{
-    [DataField]
-    public TimeSpan Min = TimeSpan.MinValue;
-
-    [DataField]
-    public TimeSpan Max = TimeSpan.MaxValue;
-
-    [DataField(required: true)]
-    public ProtoId<PlayTimeTrackerPrototype> Tracker;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out FormattedMessage? reason)
-    {
-        // Disable the requirement if the role timers are disabled
-        if (!configManager.GetCVar(CCVars.GameRoleTimers))
-        {
-            reason = null;
-            return !Inverted;
-        }
-
-        // Get SharedJobSystem
-        if (!entityManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
-        {
-            DebugTools.Assert("CharacterRequirements: SharedJobSystem not found");
-            reason = null;
-            return false;
-        }
-
-        // Get the JobPrototype of the Tracker
-        var trackerJob = jobSystem.GetJobPrototype(Tracker);
-
-        // Get the primary department of the Tracker
-        if (!jobSystem.TryGetPrimaryDepartment(trackerJob, out var department) &&
-            !jobSystem.TryGetDepartment(trackerJob, out department))
-        {
-            DebugTools.Assert($"CharacterRequirements: Department not found for job {trackerJob}");
-            reason = null;
-            return false;
-        }
-
-        // Get the time for the tracker
-        var time = playTimes.GetValueOrDefault(Tracker);
-        reason = null;
-
-        if (time > Max)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-role-too-high",
-                    ("time", time.Minutes - Max.Minutes),
-                    ("job", trackerJob),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        if (time < Min)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-role-insufficient",
-                    ("time", Min.Minutes - time.Minutes),
-                    ("job", trackerJob),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        return true;
-    }
-}
-
-#endregion
-
-#region Prototype Groups
-
-/// <summary>
-///     Requires the profile to not have any of the specified traits
-/// </summary>
-/// <remarks>
-///     Only works if you put this prototype in the denied prototypes' requirements too.
-///     Can't be inverted, use <see cref="CharacterTraitRequirement"/>
-/// </remarks>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class TraitGroupExclusionRequirement : CharacterRequirement
-{
-    [DataField(required: true)]
-    public List<ProtoId<TraitPrototype>> Prototypes;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out FormattedMessage? reason)
-    {
-        var invalid = profile.TraitPreferences.Any(t => Prototypes.Contains(t));
-
-        reason = FormattedMessage.FromMarkup(Loc.GetString("character-trait-group-exclusion-requirement",
-            ("traits", string.Join(", ", Prototypes.Select(t => Loc.GetString($"trait-name-{t}"))))));
-
-        return Inverted ? invalid : !invalid;
-    }
-}
-
-/// <summary>
-///     Requires the profile to not have any of the specified loadouts
-/// </summary>
-/// <remarks>
-///     Only works if you put this prototype in the denied prototypes' requirements too.
-///     Can't be inverted, use <see cref="CharacterLoadoutRequirement"/>
-/// </remarks>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutGroupExclusionRequirement : CharacterRequirement
-{
-    [DataField(required: true)]
-    public List<ProtoId<LoadoutPrototype>> Prototypes;
-
-    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out FormattedMessage? reason)
-    {
-        var invalid = profile.LoadoutPreferences.Any(l => Prototypes.Contains(l));
-
-        reason = FormattedMessage.FromMarkup(Loc.GetString("character-loadout-group-exclusion-requirement",
-            ("loadouts", string.Join(", ", Prototypes.Select(l => Loc.GetString($"loadout-{l}"))))));
-
-        return Inverted ? invalid : !invalid;
-    }
-}
-
-#endregion
diff --git a/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs b/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
deleted file mode 100644
index e93c933a6a..0000000000
--- a/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Shared.Preferences;
-using Content.Shared.Roles;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.Customization.Systems;
-
-
-public sealed class CharacterRequirementsSystem : EntitySystem
-{
-    public bool CheckRequirementsValid(IPrototype prototype, List<CharacterRequirement> requirements, JobPrototype job,
-        HumanoidCharacterProfile profile, Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
-        out List<FormattedMessage> reasons)
-    {
-        reasons = new List<FormattedMessage>();
-        var valid = true;
-
-        foreach (var requirement in requirements)
-        {
-            // Set valid to false if the requirement is invalid and not inverted
-            // If it's inverted set valid to false when it's valid
-            if (!requirement.IsValid(prototype, job, profile, playTimes,
-                entityManager, prototypeManager, configManager,
-                out var reason))
-            {
-                if (valid)
-                    valid = requirement.Inverted;
-            }
-            else
-            {
-                if (valid)
-                    valid = !requirement.Inverted;
-            }
-
-            if (reason != null) // To appease the compiler
-                reasons.Add(reason);
-        }
-
-        return valid;
-    }
-}
diff --git a/Content.Shared/Drunk/DrunkSystem.cs b/Content.Shared/Drunk/DrunkSystem.cs
index 161d4729ed..4f9429b6a6 100644
--- a/Content.Shared/Drunk/DrunkSystem.cs
+++ b/Content.Shared/Drunk/DrunkSystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
-using Content.Shared.Traits.Assorted.Components;
+using Content.Shared.Traits.Assorted;
 
 namespace Content.Shared.Drunk;
 
diff --git a/Content.Shared/Implants/Components/ImplanterComponent.cs b/Content.Shared/Implants/Components/ImplanterComponent.cs
index 80330aa7e6..32a3636163 100644
--- a/Content.Shared/Implants/Components/ImplanterComponent.cs
+++ b/Content.Shared/Implants/Components/ImplanterComponent.cs
@@ -70,12 +70,6 @@ public sealed partial class ImplanterComponent : Component
     [DataField]
     public (string, string) ImplantData;
 
-    /// <summary>
-    /// Determines if the same type of implant can be implanted into an entity multiple times.
-    /// </summary>
-    [DataField]
-    public bool AllowMultipleImplants = false;
-
     /// <summary>
     /// The <see cref="ItemSlot"/> for this implanter
     /// </summary>
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 8cf504582d..ece9a82bb2 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -393,19 +393,19 @@ public HumanoidCharacterProfile WithLoadoutPreference(string loadoutId, bool pre
 
         public bool MemberwiseEquals(ICharacterProfile maybeOther)
         {
-            if (maybeOther is not HumanoidCharacterProfile other
-                || Name != other.Name
-                || Age != other.Age
-                || Sex != other.Sex
-                || Gender != other.Gender
-                || PreferenceUnavailable != other.PreferenceUnavailable
-                || Clothing != other.Clothing
-                || Backpack != other.Backpack
-                || SpawnPriority != other.SpawnPriority
-                || !_jobPriorities.SequenceEqual(other._jobPriorities)
-                || !_antagPreferences.SequenceEqual(other._antagPreferences)
-                || !_traitPreferences.SequenceEqual(other._traitPreferences)
-                || !_loadoutPreferences.SequenceEqual(other._loadoutPreferences))
+            if (maybeOther is not HumanoidCharacterProfile other ||
+                Name != other.Name ||
+                Age != other.Age ||
+                Sex != other.Sex ||
+                Gender != other.Gender ||
+                PreferenceUnavailable != other.PreferenceUnavailable ||
+                Clothing != other.Clothing ||
+                Backpack != other.Backpack ||
+                SpawnPriority != other.SpawnPriority ||
+                !_jobPriorities.SequenceEqual(other._jobPriorities) ||
+                !_antagPreferences.SequenceEqual(other._antagPreferences) ||
+                !_traitPreferences.SequenceEqual(other._traitPreferences) ||
+                !_loadoutPreferences.SequenceEqual(other._loadoutPreferences))
                 return false;
 
             return Appearance.MemberwiseEquals(other.Appearance);
@@ -545,42 +545,23 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
                 .Where(prototypeManager.HasIndex<TraitPrototype>)
                 .ToList();
 
-            var maxTraits = configManager.GetCVar(CCVars.GameTraitsMax);
-            var currentTraits = 0;
-            var traitPoints = configManager.GetCVar(CCVars.GameTraitsDefaultPoints);
-
-            foreach (var trait in traits.OrderBy(t => -prototypeManager.Index<TraitPrototype>(t).Points).ToList())
-            {
-                var proto = prototypeManager.Index<TraitPrototype>(trait);
-
-                if (traitPoints + proto.Points < 0 || currentTraits + 1 > maxTraits)
-                    traits.Remove(trait);
-                else
-                {
-                    traitPoints += proto.Points;
-                    currentTraits++;
-                }
-            }
-
-
             var loadouts = LoadoutPreferences
                 .Where(prototypeManager.HasIndex<LoadoutPrototype>)
                 .ToList();
 
-            var loadoutPoints = configManager.GetCVar(CCVars.GameLoadoutsPoints);
-            var currentPoints = 0;
+            var maxLoadouts = configManager.GetCVar(CCVars.GameLoadoutsPoints);
+            var currentLoadouts = 0;
 
             foreach (var loadout in loadouts.ToList())
             {
                 var proto = prototypeManager.Index<LoadoutPrototype>(loadout);
 
-                if (currentPoints + proto.Cost > loadoutPoints)
+                if (currentLoadouts + proto.Cost > maxLoadouts)
                     loadouts.Remove(loadout);
                 else
-                    currentPoints += proto.Cost;
+                    currentLoadouts += proto.Cost;
             }
 
-
             Name = name;
             FlavorText = flavortext;
             Age = age;
diff --git a/Content.Shared/Traits/Assorted/Components/AccentlessComponent.cs b/Content.Shared/Traits/Assorted/AccentlessComponent.cs
similarity index 89%
rename from Content.Shared/Traits/Assorted/Components/AccentlessComponent.cs
rename to Content.Shared/Traits/Assorted/AccentlessComponent.cs
index 084a1e1d92..96ebf4d83f 100644
--- a/Content.Shared/Traits/Assorted/Components/AccentlessComponent.cs
+++ b/Content.Shared/Traits/Assorted/AccentlessComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Traits.Assorted.Components;
+namespace Content.Shared.Traits.Assorted;
 
 /// <summary>
 /// This is used for the accentless trait
diff --git a/Content.Shared/Traits/Assorted/Systems/AccentlessSystem.cs b/Content.Shared/Traits/Assorted/AccentlessSystem.cs
similarity index 62%
rename from Content.Shared/Traits/Assorted/Systems/AccentlessSystem.cs
rename to Content.Shared/Traits/Assorted/AccentlessSystem.cs
index f4e077bc1a..2242bc6e52 100644
--- a/Content.Shared/Traits/Assorted/Systems/AccentlessSystem.cs
+++ b/Content.Shared/Traits/Assorted/AccentlessSystem.cs
@@ -1,4 +1,6 @@
-namespace Content.Shared.Traits.Assorted.Systems;
+using Robust.Shared.Serialization.Manager;
+
+namespace Content.Shared.Traits.Assorted;
 
 /// <summary>
 /// This handles removing accents when using the accentless trait.
@@ -10,10 +12,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<Components.AccentlessComponent, ComponentStartup>(RemoveAccents);
+        SubscribeLocalEvent<AccentlessComponent, ComponentStartup>(RemoveAccents);
     }
 
-    private void RemoveAccents(EntityUid uid, Components.AccentlessComponent component, ComponentStartup args)
+    private void RemoveAccents(EntityUid uid, AccentlessComponent component, ComponentStartup args)
     {
         foreach (var accent in component.RemovedAccents.Values)
         {
diff --git a/Content.Shared/Traits/Assorted/Components/LegsParalyzedComponent.cs b/Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
similarity index 65%
rename from Content.Shared/Traits/Assorted/Components/LegsParalyzedComponent.cs
rename to Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
index d0639e5933..59f9ca758b 100644
--- a/Content.Shared/Traits/Assorted/Components/LegsParalyzedComponent.cs
+++ b/Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
@@ -1,7 +1,6 @@
-using Content.Shared.Traits.Assorted.Systems;
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
-namespace Content.Shared.Traits.Assorted.Components;
+namespace Content.Shared.Traits.Assorted;
 
 /// <summary>
 /// Set player speed to zero and standing state to down, simulating leg paralysis.
diff --git a/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs b/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
new file mode 100644
index 0000000000..7c91366937
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Body.Systems;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Standing;
+using Content.Shared.Throwing;
+
+namespace Content.Shared.Traits.Assorted;
+
+public sealed class LegsParalyzedSystem : EntitySystem
+{
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!;
+    [Dependency] private readonly StandingStateSystem _standingSystem = default!;
+    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<LegsParalyzedComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<LegsParalyzedComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<LegsParalyzedComponent, BuckleChangeEvent>(OnBuckleChange);
+        SubscribeLocalEvent<LegsParalyzedComponent, ThrowPushbackAttemptEvent>(OnThrowPushbackAttempt);
+        SubscribeLocalEvent<LegsParalyzedComponent, UpdateCanMoveEvent>(OnUpdateCanMoveEvent);
+    }
+
+    private void OnStartup(EntityUid uid, LegsParalyzedComponent component, ComponentStartup args)
+    {
+        // TODO: In future probably must be surgery related wound
+        _movementSpeedModifierSystem.ChangeBaseSpeed(uid, 0, 0, 20);
+    }
+
+    private void OnShutdown(EntityUid uid, LegsParalyzedComponent component, ComponentShutdown args)
+    {
+        _standingSystem.Stand(uid);
+        _bodySystem.UpdateMovementSpeed(uid);
+    }
+
+    private void OnBuckleChange(EntityUid uid, LegsParalyzedComponent component, ref BuckleChangeEvent args)
+    {
+        if (args.Buckling)
+        {
+            _standingSystem.Stand(args.BuckledEntity);
+        }
+        else
+        {
+            _standingSystem.Down(args.BuckledEntity);
+        }
+    }
+
+    private void OnUpdateCanMoveEvent(EntityUid uid, LegsParalyzedComponent component, UpdateCanMoveEvent args)
+    {
+        args.Cancel();
+    }
+
+    private void OnThrowPushbackAttempt(EntityUid uid, LegsParalyzedComponent component, ThrowPushbackAttemptEvent args)
+    {
+        args.Cancel();
+    }
+}
diff --git a/Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs b/Content.Shared/Traits/Assorted/LightweightDrunkComponent.cs
similarity index 90%
rename from Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
rename to Content.Shared/Traits/Assorted/LightweightDrunkComponent.cs
index 62d2f5899a..5d353ac963 100644
--- a/Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
+++ b/Content.Shared/Traits/Assorted/LightweightDrunkComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.Drunk;
 using Robust.Shared.GameStates;
+using Content.Shared.Drunk;
 
-namespace Content.Shared.Traits.Assorted.Components;
+namespace Content.Shared.Traits.Assorted;
 
 /// <summary>
 /// Used for the lightweight trait. DrunkSystem will check for this component and modify the boozePower accordingly if it finds it.
diff --git a/Content.Shared/Traits/Assorted/Components/ParacusiaComponent.cs b/Content.Shared/Traits/Assorted/ParacusiaComponent.cs
similarity index 93%
rename from Content.Shared/Traits/Assorted/Components/ParacusiaComponent.cs
rename to Content.Shared/Traits/Assorted/ParacusiaComponent.cs
index ff62e55c2a..1db698359b 100644
--- a/Content.Shared/Traits/Assorted/Components/ParacusiaComponent.cs
+++ b/Content.Shared/Traits/Assorted/ParacusiaComponent.cs
@@ -1,9 +1,8 @@
-using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Shared.Traits.Assorted.Components;
+namespace Content.Shared.Traits.Assorted;
 
 /// <summary>
 /// This component is used for paracusia, which causes auditory hallucinations.
diff --git a/Content.Shared/Traits/Assorted/Components/PermanentBlindnessComponent.cs b/Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs
similarity index 81%
rename from Content.Shared/Traits/Assorted/Components/PermanentBlindnessComponent.cs
rename to Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs
index c1bf7e1639..76ff3e1005 100644
--- a/Content.Shared/Traits/Assorted/Components/PermanentBlindnessComponent.cs
+++ b/Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Traits.Assorted.Components;
+namespace Content.Shared.Traits.Assorted;
 
 /// <summary>
 /// This is used for making something blind forever.
diff --git a/Content.Shared/Traits/Assorted/Systems/PermanentBlindnessSystem.cs b/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
similarity index 59%
rename from Content.Shared/Traits/Assorted/Systems/PermanentBlindnessSystem.cs
rename to Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
index 113939f66b..9fd5db8497 100644
--- a/Content.Shared/Traits/Assorted/Systems/PermanentBlindnessSystem.cs
+++ b/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
@@ -4,7 +4,7 @@
 using Content.Shared.IdentityManagement;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Traits.Assorted.Systems;
+namespace Content.Shared.Traits.Assorted;
 
 /// <summary>
 /// This handles permanent blindness, both the examine and the actual effect.
@@ -18,26 +18,26 @@ public sealed class PermanentBlindnessSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<Components.PermanentBlindnessComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<Components.PermanentBlindnessComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<Components.PermanentBlindnessComponent, EyeDamageChangedEvent>(OnDamageChanged);
-        SubscribeLocalEvent<Components.PermanentBlindnessComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<PermanentBlindnessComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<PermanentBlindnessComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<PermanentBlindnessComponent, EyeDamageChangedEvent>(OnDamageChanged);
+        SubscribeLocalEvent<PermanentBlindnessComponent, ExaminedEvent>(OnExamined);
     }
 
-    private void OnExamined(Entity<Components.PermanentBlindnessComponent> blindness, ref ExaminedEvent args)
+    private void OnExamined(Entity<PermanentBlindnessComponent> blindness, ref ExaminedEvent args)
     {
         if (args.IsInDetailsRange && !_net.IsClient)
         {
-            args.PushMarkup(Loc.GetString("trait-examined-Blindness", ("target", Identity.Entity(blindness, EntityManager))));
+            args.PushMarkup(Loc.GetString("permanent-blindness-trait-examined", ("target", Identity.Entity(blindness, EntityManager))));
         }
     }
 
-    private void OnShutdown(Entity<Components.PermanentBlindnessComponent> blindness, ref ComponentShutdown args)
+    private void OnShutdown(Entity<PermanentBlindnessComponent> blindness, ref ComponentShutdown args)
     {
         _blinding.UpdateIsBlind(blindness.Owner);
     }
 
-    private void OnStartup(Entity<Components.PermanentBlindnessComponent> blindness, ref ComponentStartup args)
+    private void OnStartup(Entity<PermanentBlindnessComponent> blindness, ref ComponentStartup args)
     {
         if (!_entityManager.TryGetComponent<BlindableComponent>(blindness, out var blindable))
             return;
@@ -50,7 +50,7 @@ private void OnStartup(Entity<Components.PermanentBlindnessComponent> blindness,
         _blinding.AdjustEyeDamage(blindness.Owner, damageToDeal);
     }
 
-    private void OnDamageChanged(Entity<Components.PermanentBlindnessComponent> blindness, ref EyeDamageChangedEvent args)
+    private void OnDamageChanged(Entity<PermanentBlindnessComponent> blindness, ref EyeDamageChangedEvent args)
     {
         if (args.Damage >= BlurryVisionComponent.MaxMagnitude)
             return;
diff --git a/Content.Shared/Traits/Assorted/Systems/SharedParacusiaSystem.cs b/Content.Shared/Traits/Assorted/SharedParacusiaSystem.cs
similarity index 56%
rename from Content.Shared/Traits/Assorted/Systems/SharedParacusiaSystem.cs
rename to Content.Shared/Traits/Assorted/SharedParacusiaSystem.cs
index 151e748445..2bfb0da1f5 100644
--- a/Content.Shared/Traits/Assorted/Systems/SharedParacusiaSystem.cs
+++ b/Content.Shared/Traits/Assorted/SharedParacusiaSystem.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Traits.Assorted.Systems;
+namespace Content.Shared.Traits.Assorted;
 
 public abstract class SharedParacusiaSystem : EntitySystem
 {
diff --git a/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs b/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
deleted file mode 100644
index 8ae0f251b8..0000000000
--- a/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Content.Shared.Body.Systems;
-using Content.Shared.Buckle.Components;
-using Content.Shared.Movement.Events;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Standing;
-using Content.Shared.Throwing;
-
-namespace Content.Shared.Traits.Assorted.Systems;
-
-public sealed class LegsParalyzedSystem : EntitySystem
-{
-    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!;
-    [Dependency] private readonly StandingStateSystem _standingSystem = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<Components.LegsParalyzedComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<Components.LegsParalyzedComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<Components.LegsParalyzedComponent, BuckleChangeEvent>(OnBuckleChange);
-        SubscribeLocalEvent<Components.LegsParalyzedComponent, ThrowPushbackAttemptEvent>(OnThrowPushbackAttempt);
-        SubscribeLocalEvent<Components.LegsParalyzedComponent, UpdateCanMoveEvent>(OnUpdateCanMoveEvent);
-    }
-
-    private void OnStartup(EntityUid uid, Components.LegsParalyzedComponent component, ComponentStartup args)
-    {
-        // TODO: In future probably must be surgery related wound
-        _movementSpeedModifierSystem.ChangeBaseSpeed(uid, 0, 0, 20);
-    }
-
-    private void OnShutdown(EntityUid uid, Components.LegsParalyzedComponent component, ComponentShutdown args)
-    {
-        _standingSystem.Stand(uid);
-        _bodySystem.UpdateMovementSpeed(uid);
-    }
-
-    private void OnBuckleChange(EntityUid uid, Components.LegsParalyzedComponent component, ref BuckleChangeEvent args)
-    {
-        if (args.Buckling)
-        {
-            _standingSystem.Stand(args.BuckledEntity);
-        }
-        else
-        {
-            _standingSystem.Down(args.BuckledEntity);
-        }
-    }
-
-    private void OnUpdateCanMoveEvent(EntityUid uid, Components.LegsParalyzedComponent component, UpdateCanMoveEvent args)
-    {
-        args.Cancel();
-    }
-
-    private void OnThrowPushbackAttempt(EntityUid uid, Components.LegsParalyzedComponent component, ThrowPushbackAttemptEvent args)
-    {
-        args.Cancel();
-    }
-}
diff --git a/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs b/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
deleted file mode 100644
index efbac1ca7d..0000000000
--- a/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Traits;
-
-
-/// <summary>
-///     A prototype defining a valid category for <see cref="TraitPrototype"/>s to go into.
-/// </summary>
-[Prototype("traitCategory")]
-public sealed partial class TraitCategoryPrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; } = default!;
-}
diff --git a/Content.Shared/Traits/Prototypes/TraitPrototype.cs b/Content.Shared/Traits/Prototypes/TraitPrototype.cs
deleted file mode 100644
index 2e6b7cc066..0000000000
--- a/Content.Shared/Traits/Prototypes/TraitPrototype.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared.Customization.Systems;
-using Content.Shared.Whitelist;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Traits;
-
-
-/// <summary>
-///     Describes a trait.
-/// </summary>
-[Prototype("trait")]
-public sealed partial class TraitPrototype : IPrototype
-{
-    [ViewVariables]
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    /// <summary>
-    ///     Which customization tab to place this entry in
-    /// </summary>
-    [DataField(required: true), ValidatePrototypeId<TraitCategoryPrototype>]
-    public string Category = "Uncategorized";
-
-    /// <summary>
-    ///     How many points this will give the character
-    /// </summary>
-    [DataField]
-    public int Points = 0;
-
-
-    [DataField]
-    public List<CharacterRequirement> Requirements = new();
-
-    /// <summary>
-    ///     The components that get added to the player when they pick this trait.
-    /// </summary>
-    [DataField(required: true)]
-    public ComponentRegistry Components { get; private set; } = default!;
-}
diff --git a/Content.Shared/Traits/TraitPrototype.cs b/Content.Shared/Traits/TraitPrototype.cs
new file mode 100644
index 0000000000..34feb8da22
--- /dev/null
+++ b/Content.Shared/Traits/TraitPrototype.cs
@@ -0,0 +1,55 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+// don't worry about it
+
+namespace Content.Shared.Traits
+{
+    /// <summary>
+    ///     Describes a trait.
+    /// </summary>
+    [Prototype("trait")]
+    public sealed partial class TraitPrototype : IPrototype
+    {
+        [ViewVariables]
+        [IdDataField]
+        public string ID { get; private set; } = default!;
+
+        /// <summary>
+        ///     The name of this trait.
+        /// </summary>
+        [DataField("name")]
+        public string Name { get; private set; } = "";
+
+        /// <summary>
+        ///     The description of this trait.
+        /// </summary>
+        [DataField("description")]
+        public string? Description { get; private set; }
+
+        /// <summary>
+        ///     Don't apply this trait to entities this whitelist IS NOT valid for.
+        /// </summary>
+        [DataField("whitelist")]
+        public EntityWhitelist? Whitelist;
+
+        /// <summary>
+        ///     Don't apply this trait to entities this whitelist IS valid for. (hence, a blacklist)
+        /// </summary>
+        [DataField("blacklist")]
+        public EntityWhitelist? Blacklist;
+
+        /// <summary>
+        ///     The components that get added to the player, when they pick this trait.
+        /// </summary>
+        [DataField("components")]
+        public ComponentRegistry Components { get; private set; } = default!;
+
+        /// <summary>
+        ///     Gear that is given to the player, when they pick this trait.
+        /// </summary>
+        [DataField("traitGear", required: false, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string? TraitGear;
+    }
+}
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index a18aac80ab..0183a30a73 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -229,12 +229,6 @@ public sealed partial class GunComponent : Component
     /// </summary>
     [DataField]
     public bool ClumsyProof = false;
-
-    /// <summary>
-    ///     The percentage chance of a given gun to accidentally discharge if violently thrown into a wall or person
-    /// </summary>
-    [DataField]
-    public float FireOnDropChance = 0.1f;
 }
 
 [Flags]
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 49b2d5358d..7fcb7aac22 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4184,44 +4184,3 @@ Entries:
       message: Moths have way better control in zero gravity environments
   id: 6122
   time: '2024-06-17T07:58:34.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Add
-      message: >-
-        Added station goals that get sent to the Command fax machine at the
-        start of every shift
-  id: 6123
-  time: '2024-06-17T21:42:13.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Add
-      message: Peacock Tails have been added for Harpies
-  id: 6124
-  time: '2024-06-20T22:07:29.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Add
-      message: >-
-        NanoTrasen has disabled the unneeded safeties on your guns- Make sure
-        you're careful with them!
-    - type: Tweak
-      message: >-
-        All Firearms now have a reliability stat, some are more reliable than
-        others. The more reliable a weapon is, the less likely it is to
-        accidentally discharge when yeeted.
-  id: 6125
-  time: '2024-06-20T22:17:03.0000000+00:00'
-- author: DEATHB4DEFEAT
-  changes:
-    - type: Add
-      message: Animals will no longer be a silent, soulless shell
-  id: 6126
-  time: '2024-06-20T22:24:30.0000000+00:00'
-- author: DEATHB4DEFEAT
-  changes:
-    - type: Add
-      message: Added trait points
-    - type: Add
-      message: Added categories for traits
-  id: 6127
-  time: '2024-06-20T23:39:31.0000000+00:00'
diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl
deleted file mode 100644
index b073bdb773..0000000000
--- a/Resources/Locale/en-US/customization/character-requirements.ftl
+++ /dev/null
@@ -1,39 +0,0 @@
-character-age-requirement = You must {$inverted ->
-    [true] not be
-    *[other] be
-} be within [color=yellow]{$min}[/color] and [color=yellow]{$max}[/color] years old
-character-species-requirement = You must {$inverted ->
-    [true] not be
-    *[other] be
-} a [color=green]{$species}[/color]
-character-trait-requirement = You must {$inverted ->
-    [true] not have
-    *[other] have
-} the trait [color=lightblue]{$trait}[/color]
-character-backpack-type-requirement = You must {$inverted ->
-    [true] not use
-    *[other] use
-} a [color=lightblue]{$type}[/color] as your bag
-character-clothing-preference-requirement = You must {$inverted ->
-    [true] not wear
-    *[other] wear
-} a [color=lightblue]{$type}[/color]
-
-character-job-requirement = You must {$inverted ->
-    [true] not be
-    *[other] be
-} one of these jobs: {$jobs}
-character-department-requirement = You must {$inverted ->
-    [true] not be
-    *[other] be
-} in one of these departments: {$departments}
-
-character-timer-department-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of [color={$departmentColor}]{$department}[/color] department playtime
-character-timer-department-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes in [color={$departmentColor}]{$department}[/color] department
-character-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of playtime
-character-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime
-character-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color]
-character-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color]
-
-character-trait-group-exclusion-requirement = You cannot have one of the following traits if you select this: {$traits}
-character-loadout-group-exclusion-requirement = You cannot have one of the following loadouts if you select this: {$loadouts}
diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/deltav/markings/harpy.ftl
index 871f2f1729..3c1a2e3b9b 100644
--- a/Resources/Locale/en-US/deltav/markings/harpy.ftl
+++ b/Resources/Locale/en-US/deltav/markings/harpy.ftl
@@ -40,10 +40,6 @@ marking-HarpyTailRooster-rooster_tail = Tail
 marking-HarpyTailFinch = Finch Tail
 marking-HarpyTailFinch-finch_tail = Tail
 
-marking-HarpyTailPeacock = Peacock Tail
-marking-HarpyTailPeacock-peacock_tail_feathers = Feathers
-marking-HarpyTailPeacock-peacock_tail_eyes = Eyes
-
 marking-HarpyChestDefault = Wing & Groin Under-Clothes
 marking-HarpyChestDefault-upper = Wing Under-Clothes
 marking-HarpyChestDefault-lower = Groin Under-Clothes
diff --git a/Resources/Locale/en-US/deltav/traits/traits.ftl b/Resources/Locale/en-US/deltav/traits/traits.ftl
index 914a5c9f1b..e00cec4707 100644
--- a/Resources/Locale/en-US/deltav/traits/traits.ftl
+++ b/Resources/Locale/en-US/deltav/traits/traits.ftl
@@ -1,13 +1,13 @@
-trait-name-ScottishAccent = Scottish Accent
-trait-description-ScottishAccent = Fer tha folk who come frae Hielan clan.
+trait-scottish-accent-name = Scottish Accent
+trait-scottish-accent-desc = Fer tha folk who come frae Hielan clan.
 
-trait-name-UltraVision = Ultraviolet Vision
-trait-description-UltraVision = Whether through custom bionic eyes, random mutation,
+trait-ultravision-name = Ultraviolet Vision
+trait-ultravision-desc = Whether through custom bionic eyes, random mutation,
                          or being a Harpy, you perceive the world with ultraviolet light.
 
-trait-name-DogVision = Deuteranopia
-trait-description-DogVision = Whether through custom bionic eyes, random mutation,
+trait-deuteranopia-name = Deuteranopia
+trait-deuteranopia-desc = Whether through custom bionic eyes, random mutation,
                           or being a Vulpkanin, you have red–green colour blindness.
 
-trait-name-Uncloneable = Uncloneable
-trait-description-Uncloneable = Cannot be cloned
+trait-uncloneable-name = Uncloneable
+trait-uncloneable-desc = Cannot be cloned
diff --git a/Resources/Locale/en-US/implant/implant.ftl b/Resources/Locale/en-US/implant/implant.ftl
index 2f6ab9e4e2..22db4460af 100644
--- a/Resources/Locale/en-US/implant/implant.ftl
+++ b/Resources/Locale/en-US/implant/implant.ftl
@@ -4,7 +4,6 @@ implanter-component-implanting-target = {$user} is trying to implant you with so
 implanter-component-implant-failed = The {$implant} cannot be given to {$target}!
 implanter-draw-failed-permanent = The {$implant} in {$target} is fused with them and cannot be removed!
 implanter-draw-failed = You tried to remove an implant but found nothing.
-implanter-component-implant-already = {$target} already has the {$implant}!
 
 ## UI
 implanter-draw-text = Draw
diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index 55dbab656f..207b72d3ad 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -1,6 +1,4 @@
-# Alphabetically ordered, except for Uncategorized since it is always first
-
-loadout-category-Uncategorized = Uncategorized
+# Alphabetically ordered
 loadout-category-Accessories = Accessories
 loadout-category-Eyes = Eyes
 loadout-category-Hands = Hands
diff --git a/Resources/Locale/en-US/loadouts/loadout-requirements.ftl b/Resources/Locale/en-US/loadouts/loadout-requirements.ftl
new file mode 100644
index 0000000000..d72557f1e8
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/loadout-requirements.ftl
@@ -0,0 +1,13 @@
+loadout-age-requirement = You must be within {$min} and {$max} years old
+loadout-species-requirement = You must be one of these species: {$species}
+loadout-trait-requirement = You must have the trait {$trait}
+loadout-backpack-type-requirement = You must use a {$type} as your bag
+loadout-clothing-preference-requirement = You must wear a {$type}
+
+loadout-job-requirement = You must be one of these jobs: {$job}
+loadout-timer-department-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of [color={$departmentColor}]{$department}[/color] department playtime
+loadout-timer-department-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes in [color={$departmentColor}]{$department}[/color] department
+loadout-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of playtime
+loadout-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime
+loadout-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color]
+loadout-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color]
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index 9b8eb74d96..b929da9655 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -44,40 +44,20 @@ humanoid-profile-editor-department-jobs-label = {$departmentName} jobs
 humanoid-profile-editor-antags-tab = Antags
 humanoid-profile-editor-antag-preference-yes-button = Yes
 humanoid-profile-editor-antag-preference-no-button = No
-
 humanoid-profile-editor-traits-tab = Traits
-humanoid-profile-editor-traits-header = You have {$points ->
-    [1] 1 point
-    *[other] {$points} points
-} and {$maxTraits ->
-    [2147483648] {$traits ->
-        [1] {$traits} trait
-        *[other] {$traits} traits
-    }
-    *[other] {$traits}/{$maxTraits} traits
-}
-humanoid-profile-editor-traits-show-unusable-button = Show Unusable
-humanoid-profile-editor-traits-show-unusable-button-tooltip =
-    When enabled, traits that your current character setup cannot use will be shown highlighted in red.
-    You will still not be able to use the invalid traits unless your character setup changes to fit the requirements.
-    This is most likely useful only if there's a bug hiding traits you actually can use or if you want to see other species' traits or something.
-humanoid-profile-editor-traits-no-traits = No traits found
-
 humanoid-profile-editor-job-priority-high-button = High
 humanoid-profile-editor-job-priority-medium-button = Medium
 humanoid-profile-editor-job-priority-low-button = Low
 humanoid-profile-editor-job-priority-never-button = Never
-
 humanoid-profile-editor-naming-rules-warning = Warning: Offensive or LRP IC names and descriptions will lead to admin intervention on this server. Read our \[Rules\] for more.
-
 humanoid-profile-editor-loadouts-tab = Loadout
+humanoid-profile-editor-loadouts-uncategorized-tab = Uncategorized
+humanoid-profile-editor-loadouts-no-loadouts = No loadouts found
 humanoid-profile-editor-loadouts-points-label = You have {$points}/{$max} points
 humanoid-profile-editor-loadouts-show-unusable-button = Show Unusable
 humanoid-profile-editor-loadouts-show-unusable-button-tooltip =
     When enabled, loadouts that your current character setup cannot use will be shown highlighted in red.
     You will still not be able to use the invalid loadouts unless your character setup changes to fit the requirements.
-    This may be useful if you like switching between multiple jobs and don't want to have to reselect your loadout every
-humanoid-profile-editor-loadouts-no-loadouts = No loadouts foundtime.
-
+    This may be useful if you like switching between multiple jobs and don't want to have to reselect your loadout every time.
 humanoid-profile-editor-markings-tab = Markings
 humanoid-profile-editor-flavortext-tab = Description
diff --git a/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl b/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl
index 8360aaeb9d..3d8af06139 100644
--- a/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl
+++ b/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl
@@ -1,2 +1,3 @@
-trait-name-Nearsighted = Nearsighted
-trait-description-Nearsighted = You require glasses to see properly.
+trait-nearsighted-name = Nearsighted
+trait-nearsighted-desc = You require glasses to see properly.
+trait-nearsighted-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are pretty unfocused. It doesn't seem like {SUBJECT($target)} can see things that well.[/color]
diff --git a/Resources/Locale/en-US/station-goal/station-goal-command.ftl b/Resources/Locale/en-US/station-goal/station-goal-command.ftl
deleted file mode 100644
index 82ed4d5c8a..0000000000
--- a/Resources/Locale/en-US/station-goal/station-goal-command.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-send-station-goal-command-description = Sends the selected station target to all faxes that can receive it
-send-station-goal-command-help-text = Usage: { $command } <Goal Prototype ID>
-send-station-goal-command-arg-id = Goal Prototype ID
-
-send-station-goal-command-error-no-goal-proto = No station goal found with ID {$id}
-send-station-goal-command-error-couldnt-fax = Couldn't send station goal, probably due to a lack of fax machines that are able to recieve it
diff --git a/Resources/Locale/en-US/station-goal/station-goals.ftl b/Resources/Locale/en-US/station-goal/station-goals.ftl
deleted file mode 100644
index f98190fa3c..0000000000
--- a/Resources/Locale/en-US/station-goal/station-goals.ftl
+++ /dev/null
@@ -1,224 +0,0 @@
-station-goal-fax-paper-name = Station Goal
-
-station-goal-fax-paper-header =
-    ███╗░░██╗████████╗
-    ████╗░██║╚══██╔══╝ Form NT-No.{$station}-CC
-    ██╔██╗██║░░░██║░░░ Target Order
-    ██║╚████║░░░██║░░░ Date: {$date}
-    ██║░╚███║░░░██║░░░ Signed: CCO-{$name}
-    ╚═╝░░╚══╝░░░╚═╝░░░
-    ════════════════════════════════════════
-    {$content}
-    ════════════════════════════════════════
-
-
-station-goal-xeno=
-    Dear Station Command, the purpose of your shift is to build a Xenobiology Lab and then study exotic life forms.
-    Two containment chambers must be constructed according to the following requirements:
-    1. Must be well reinforced;
-    2. At least one of the chambers must be equipped with a gas supply system;
-    3. The entrance should be a cycling airlock system to prevent contamination.
-
-    Get the Salvage Team to capture at least 2 representatives of life forms (e.g. space carp) and transport them to the above-described chambers.
-
-    Capture requirements:
-    1. Exotic fauna should not have critical injuries at the time of placement in the research department;
-    2. When captured fauna dies, you are required to catch another, cloning is strictly prohibited.
-
-    Once you collect the required fauna, you must study them and write a report on their properties.
-    The report must be stamped by the head of the department and faxed to Central Command.
-
-    Experience Requirements:
-    1. Experience should be documented in detail;
-    2. Test activities may include: working with gases, smoke, foam, or injecting experimental reagents (e.g. Cognizine) into captured fauna.
-
-station-goal-museum=
-    Dear Command of the station, the purpose of your shift is to build a museum, the exhibits for which will be unique objects collected from the station.
-
-    Below are the requirements for the design of the museum:
-    1. The museum must be structurally connected to the station by a space-protected corridor, or be located within it;
-    2. The premises must be of a size that allows them to easily receive a large number of visitors;
-    3. The premises must be provided with a standard atmosphere, ventilation and stable power supply;
-    4. Room decoration should be visually pleasing;
-    5. Exhibits must be reinforced accordingly to what is contained in them.
-
-    Exhibit requirements:
-    1. Exhibits must be unique in their kind;
-    2. Each department must provide at least 2 exhibits for the museum fund;
-    3. The total number of exhibits must be at least 20.
-
-    Exhibits may include:
-    1. Exotic drinks and dishes that require an extraordinary method of production and/or non-standard ingredients;
-    2. Exotic matter/substance;
-    3. Works of art (e.g. statues, paintings);
-    4. Fully studied and documented artifacts (optionally provide a copy of the document);
-    5. High-tech devices or tools;
-    6. High-tech or high-power weapons;
-    7. Robotic entities (e.g. Mechs, Cyborgs, Drones);
-    8. Mutated biological organisms;
-    9. Domesticated wild animals or intelligent non-humanoid life forms;
-    10. Found treasures or items not available on the market.
-
-    Upon completion of the museum, it is required to provide the crew with at least 20 minutes of free time from work so that they can visit the museum.
-
-station-goal-area=
-    Dear Station Command, the goal of your shift is to increase the effective use of space at the station.
-
-    It is required to bring the abandoned premises into proper form and find a use for them.
-    Each department must equip and effectively use the area of adjacent maintenance tunnels.
-    Sufficiently spacious maintenance tunnels need to be converted into residential areas.
-    The remaining tunnels should be provided with floor coverings and adequate lighting.
-    In addition, it is necessary to provide a public, well-lit corridor connecting all the restored compartments and new bedrooms.
-
-station-goal-bureaucraticerror =
-    ACCESS TO THIS DOCUMENT IS PROHIBITED FOR PERSONS WHO DO NOT HAVE LEGAL IMMUNITY
-
-    Dear Station Command, we inform you that the purpose of your shift was lost as a result of a bureaucratic error.
-    With this news, Central Command gives you the opportunity to independently assign a new goal for the station.
-
-    New goal requirements:
-    1. Relevance: The goal must be relevant and relevant to the current situation;
-    2. Engagement: The goal should require the cooperation of as many departments as possible in the plans;
-    3. Scope: The goal should involve sufficient, but not excessive, amounts of work to ensure the effective completion of the task.
-
-    Please note that distribution of the contents of this document to persons who do not have legal immunity is strictly prohibited due to the possibility of discrediting the management of the Corporation.
-    Therefore, in order to present a new goal to the crew, the command staff must contact Central Command for approval of your ideas.
-
-station-goal-anomalies=
-    Dear Station Command, the purpose of your shift is to provide new information about anomalies to NanoTrasen.
-
-    It is necessary to conduct experimental studies aimed at testing the consequences of the collapse of at least 4 unique anomalies.
-    During or after the experiments, it is necessary to isolate and document the aforementioned anomalies.
-
-    Document requirements:
-    1. The official name of the anomaly;
-    2. Physical description;
-    3. Passive properties;
-    4. Reaction of the anomaly to different particles;
-    5. Consequences of the collapse;
-    6. Location of the anomaly.
-
-    The document must be certified by the stamp of the supervisor and faxed to Central Command.
-
-station-goal-combat=
-    Dear station Command, due to the increase in attacks of pirate ships in this sector, the purpose of your shift is to raise the overall combat readiness of the station.
-
-    Required:
-    1. Organize an inspection of every sentient being and cargo arriving at or leaving the station.
-    2. Build or modify an existing security checkpoint at arrivals and departures. The checkpoint must be able to completely block the ports from the main part of the station.
-        Each of the above checkpoints must have at least one cell for the temporary detention of detainees.
-    3. Organize a spare weapons storage in the opposite part of the station from the brig.
-        The vault arsenal should have enough weapons and equipment to fully equip all security personnel.
-    4. Organize the recruitment of a new combat subdepartment of security.
-        Squad members must be recruited from the station's crew.
-        Recruitment should be carried out on a voluntary-compulsory basis.
-        Composition of the squad:
-            1 Field Medic;
-            1 Field Engineer;
-            3 Combat Operatives.
-        All members of the squad must be trained in all the necessary skills to conduct combat and fulfill their role.
-    5. Open a public shooting range.
-        The shooting range should present all available types of weapons or their training counterparts.
-        Avoid providing lethal weaponry to unauthorized personnel.
-    6. Encourage the use of the station boxing ring.
-        If there is no boxing ring, you must create one.
-
-station-goal-shuttle=
-    Dear Station Command, the purpose of your shift is to build a space shuttle capable of being piloted.
-
-    Shuttle requirements:
-    1. The shuttle must have a locked bridge;
-        a medical room with the necessary medical supplies and chemical equipment;
-        a supply store surrounded by reinforced material;
-        a crew room with at least 12 seats.
-    2. There must be an intermediate room between the docking airlock and the main rooms to prevent possible depressurization.
-    3. The shuttle must have a standard atmosphere, and also have several air gas containers to maintain it.
-    4. The shuttle must be able to move in all directions (forward, backward, sideways) and turn reasonably well.
-
-    Upon completion, the shuttle crew must be recruited from the station personnel.
-    The shuttle crew must include:
-        1 pilot;
-        2 engineers;
-        1 medic/chemist;
-        1 security officer.
-
-    The shuttle should take on board all the station Command representatives as passengers and, in parallel with the evacuation shuttle, go to the Central Command station.
-
-station-goal-singularity=
-    Dear station Command, the goal of your shift is to build a generator based on the gravitational singularity.
-
-    The design requirements are:
-    1. The structure must be located at a significant distance from the station.
-    2. The structure must be protected from meteorites and space debris.
-    3. The containment field must be able to prevent the loss of a class 3 singularity.
-
-station-goal-solarpanels=
-    Dear station Command, the purpose of your shift is to organize a backup power system.
-
-    The following work is required:
-    1. Build two new branches of solar panels.
-    2. Allocate an area for a compartment with spare batteries.
-        This compartment should accommodate at least 3 fully charged SMES', which should not be connected to the main power system of the station unless needed.
-
-station-goal-artifacts=
-    Dear station Command, the purpose of your shift is to provide new information about alien artifacts to NanoTrasen.
-
-    It is required to organize the work of salvagers to search for and deliver artifacts from the wreckage around the station or expeditions.
-    After the delivery of the artifacts, they must be transferred to a special container to the research department.
-    It is necessary to deliver at least 2 fully studied and documented artifacts on the evacuation shuttle in special containment units.
-
-    Recommended information for the document:
-    1. Name of the artifact.
-    2. Physical description.
-    3. Properties of the object.
-    4. Location of where the artifact was found.
-    5. Additional notes.
-
-    The document must be certified by the stamp of the supervisor.
-
-station-goal-storage=
-    Dear station Command, the purpose of your shift is to build an orbital storage facility with supplies and technology.
-
-    The storage should be placed in space separately from the main station, make sure its design is strong, a random meteorite should not damage it.
-
-    4 boxes must be placed in the storage containing the following respectively:
-    - Advanced medicines;
-    - Stocks of the best seeds;
-    - Refrigerator box of food with a high nutritional value;
-    - Valuable, but not unique boards.
-
-    Monitor the safety of the contents in the storage until the end of the shift, a cleanup crew will come retrieve the contents as they prepare the station.
-
-station-goal-zoo=
-    Dear station Command, the purpose of your shift is to improve the recreational value of the personnel at the station.
-
-    It is necessary to build a zoo with at least 5 enclosures containing different types of animals ordered from the supply department.
-    Provide animals with food, at least one cleaning robot in each enclosure, and everything necessary for life, depending on the type of animal.
-    It is also necessary to build a bathhouse for the animals, water vapor must be supplied by Atmospheric Technicians.
-
-    Upon completion of the zoo, it is required to provide the crew with at least 20 minutes of free time from work so that they can visit the new zoo.
-
-station-goal-labor=
-    Dear station Command, the purpose of your shift is to increase the motivation of the personnel for the growth of labor productivity.
-
-    This requires that each of the heads during the shift closely monitors the performance of the duties of their employees and evaluates them.
-    After the time set by Command for evaluation, in each of the departments, the best, in the opinion of the head, employee should be selected, who will be invited to a dinner, where the Command staff will be obliged to award them a medal and a prize.
-    The heads must provide a report indicating the employee's position and merits for the shift.
-    Drinks and meals should be prepared for the dinner, as well as, if possible, several entertainment events that allow the presence of actors and musicians.
-    For the duration of the celebration, the dining room or other place chosen for the event must be inaccessible to the rest of the crew.
-
-    The duration of the shift for a more accurate assessment of the work of the personnel should be set by the Command staff.
-    After the dinner someone must announce the end of the shift and call the evacuation shuttle.
-
-station-goal-lectures=
-    Dear station Command, the purpose of your shift is to carry out a number of events within the framework of the Corporation's plan to increase the knowledge of its employees.
-
-    The Command staff are instructed to organize a platform for public lectures, if none exists, create one nearby the bridge entry.
-    The venue should be equipped with a large enough stage for speakers in the middle, a podium for the presenter to one side of it, plenty of seating for guests, and a special counter/table for brochures at the entrance.
-    A host/organizer of the event must also be selected.
-    Each department is required to present a group of employees consisting of at least 2 people.
-    Selected employees, under the supervision of the head of the department, should prepare a short lecture/presentation on a specific topic within their specialization (e.g. the harm of drugs and their reason for their criminalization, the effect of smoking on the body, acting, product pricing, cooking etc.), preferably with demonstration materials, and at least 10 brochures, on which the abstracts of the lecture should be indicated.
-    At the time indicated by the Command staff, the crew must be assembled on the site for the event, where lectures will be read.
-    There may be breaks between lectures to allow guests to read brochures and catch their breath.
-
-    After the end of the event someone must announce the end of the shift and call the evacuation shuttle.
diff --git a/Resources/Locale/en-US/traits/categories.ftl b/Resources/Locale/en-US/traits/categories.ftl
deleted file mode 100644
index 56f0adeb47..0000000000
--- a/Resources/Locale/en-US/traits/categories.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Alphabetically ordered, except for Uncategorized since it is always first
-
-trait-category-Uncategorized = Uncategorized
-trait-category-Auditory = Auditory
-trait-category-Mental = Mental
-trait-category-Physical = Physical
-trait-category-Speech = Speech
-trait-category-Visual = Visual
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index e3eb6ebb82..c097a689dd 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -1,36 +1,31 @@
-trait-name-Blindness = Blindness
-trait-description-Blindness = You are legally blind, and can't see clearly past a few meters in front of you.
-trait-examined-Blindness = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are glassy and unfocused. It doesn't seem like {SUBJECT($target)} can see you well, if at all.[/color]
+trait-blindness-name = Blindness
+trait-blindness-desc = You are legally blind, and can't see clearly past a few meters in front of you.
 
-trait-name-Narcolepsy = Narcolepsy
-trait-description-Narcolepsy = You fall asleep randomly
+trait-narcolepsy-name = Narcolepsy
+trait-narcolepsy-desc = You fall asleep randomly
 
-trait-name-Pacifist = Pacifist
-trait-description-Pacifist = You cannot attack or hurt any living beings.
+trait-pacifist-name = Pacifist
+trait-pacifist-desc = You cannot attack or hurt any living beings.
 
-trait-name-LightweightDrunk = Lightweight Drunk
-trait-description-LightweightDrunk = Alcohol has a stronger effect on you
+permanent-blindness-trait-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are glassy and unfocused. It doesn't seem like {SUBJECT($target)} can see you well, if at all.[/color]
 
-trait-name-Muted = Muted
-trait-description-Muted = You can't speak
+trait-lightweight-name = Lightweight Drunk
+trait-lightweight-desc = Alcohol has a stronger effect on you
 
-trait-name-Paracusia = Paracusia
-trait-description-Paracusia = You hear sounds that aren't really there
+trait-muted-name = Muted
+trait-muted-desc = You can't speak
 
-trait-name-PirateAccent = Pirate Accent
-trait-description-PirateAccent = You can't stop speaking like a pirate!
+trait-paracusia-name = Paracusia
+trait-paracusia-desc = You hear sounds that aren't really there
 
-trait-name-Accentless = Accentless
-trait-description-Accentless = You don't have the accent that your species would usually have
+trait-pirate-accent-name = Pirate Accent
+trait-pirate-accent-desc = You can't stop speaking like a pirate!
 
-trait-name-FrontalLisp = Frontal Lisp
-trait-description-FrontalLisp = You thpeak with a lithp
+trait-accentless-name = Accentless
+trait-accentless-desc = You don't have the accent that your species would usually have
 
-trait-name-SocialAnxiety = Social Anxiety
-trait-description-SocialAnxiety = You are anxious when you speak and stutter.
+trait-frontal-lisp-name = Frontal Lisp
+trait-frontal-lisp-desc = You thpeak with a lithp
 
 trait-socialanxiety-name = Social Anxiety
 trait-socialanxiety-desc = You are anxious when you speak and stutter.
-
-trait-name-Snoring = Snoring
-trait-description-Snoring = You will snore while sleeping.
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
index bd1ad12a32..9118692a08 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
@@ -15,7 +15,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy
 
 - type: marking
@@ -32,7 +32,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: classicharpy
 
 - type: marking
@@ -49,7 +49,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyfolded
 
 - type: marking
@@ -66,7 +66,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_ears.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi
       state: harpy_ears_default
 
 - type: marking
@@ -83,7 +83,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
       state: phoenix_tail
 
 - type: marking
@@ -99,7 +99,7 @@
       fallbackTypes:
         - !type:SimpleColoring
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
       state: rooster_tail
 
 
@@ -116,26 +116,8 @@
       fallbackTypes:
         - !type:SimpleColoring
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_tails36x36.rsi
-      state: finch_tail
-
-- type: marking
-  id: HarpyTailPeacock
-  bodyPart: Tail
-  markingCategory: Tail
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      type:
-        !type:CategoryColoring
-          category: Hair
-      fallbackTypes:
-        - !type:SimpleColoring
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
-      state: peacock_tail_feathers
-    - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
-      state: peacock_tail_eyes
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi
+      state: finch_tail 
 
 - type: marking
   id: HarpyWing2ToneClassic
@@ -143,9 +125,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy2tone1
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy2tone2
 
 - type: marking
@@ -154,11 +136,11 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone1
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone2
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone3
 
 - type: marking
@@ -167,9 +149,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyspeckled1
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyspeckled2
 
 - type: marking
@@ -178,9 +160,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyundertone1
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyundertone2
 
 - type: marking
@@ -189,9 +171,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpywingtip1
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpywingtip2
 
 - type: marking
@@ -208,9 +190,9 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
       state: upper
-    - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
       state: lower
 
 - type: marking
@@ -227,7 +209,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
       state: thighs
 
 - type: marking
@@ -241,7 +223,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
       state: feet
-    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
       state: talons
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index 0ddce8b0e6..a4498299c9 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -54,6 +54,7 @@
         visible: false
       - map: [ "id" ]
       - map: [ "gloves" ]
+      - map: [ "shoes" ]
       - map: [ "ears" ]
       - map: [ "outerClothing" ]
       - map: [ "eyes" ]
@@ -121,25 +122,12 @@
   - type: MovementSpeedModifier
     baseWalkSpeed: 2.5
     baseSprintSpeed: 5.0
-  - type: Inventory
+  - type: Inventory 
     speciesId: harpy
     templateId: digitigrade
   - type: HarpyVisuals
   - type: UltraVision
-  - type: Tag
-    tags:
-    - CanPilot
-    - FootstepSound
-    - DoorBumpOpener
-    - ShoesRequiredStepTriggerImmune
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - SolCommon
-    understands:
-    - GalacticCommon
-    - SolCommon
-
+    
 - type: entity
   save: false
   name: Urist McHands
@@ -150,9 +138,8 @@
   components:
   - type: HumanoidAppearance
     species: Harpy
-  - type: Inventory
+  - type: Inventory 
     speciesId: harpy
-    templateId: digitigrade
   - type: Sprite
     scale: 0.9, 0.9
     layers:
@@ -173,6 +160,7 @@
       - map: ["enum.HumanoidVisualLayers.RHand"]
       - map: [ "id" ]
       - map: [ "gloves" ]
+      - map: [ "shoes" ]
       - map: [ "ears" ]
       - map: [ "outerClothing" ]
       - map: [ "eyes" ]
diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml b/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml
index fc7dbda932..158541571a 100644
--- a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml
+++ b/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml
@@ -1,6 +1,13 @@
 - type: inventoryTemplate
   id: digitigrade
   slots:
+    - name: shoes
+      slotTexture: shoes
+      slotFlags: FEET
+      stripTime: 3
+      uiWindowPos: 1,0
+      strippingWindowPos: 1,3
+      displayName: Shoes
     - name: jumpsuit
       slotTexture: uniform
       slotFlags: INNERCLOTHING
diff --git a/Resources/Prototypes/DeltaV/Traits/altvision.yml b/Resources/Prototypes/DeltaV/Traits/altvision.yml
index d1980bc23a..c361d1b51d 100644
--- a/Resources/Prototypes/DeltaV/Traits/altvision.yml
+++ b/Resources/Prototypes/DeltaV/Traits/altvision.yml
@@ -1,13 +1,13 @@
 - type: trait
   id: UltraVision
-  category: Visual
-  points: -1
+  name: trait-ultravision-name
+  description: trait-ultravision-desc
   components:
     - type: UltraVision
 
 - type: trait
   id: DogVision
-  category: Visual
-  points: -1
+  name: trait-deuteranopia-name
+  description: trait-deuteranopia-desc
   components:
     - type: DogVision
diff --git a/Resources/Prototypes/DeltaV/Traits/neutral.yml b/Resources/Prototypes/DeltaV/Traits/neutral.yml
index 6168d7045a..79a6771a36 100644
--- a/Resources/Prototypes/DeltaV/Traits/neutral.yml
+++ b/Resources/Prototypes/DeltaV/Traits/neutral.yml
@@ -1,6 +1,7 @@
 - type: trait
   id: ScottishAccent
-  category: Speech
-  points: 0
+  name: trait-scottish-accent-name
+  description: trait-scottish-accent-desc
+  traitGear: BagpipeInstrument
   components:
-    - type: ScottishAccent
+    - type: ScottishAccent
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 93e19a829d..378b3f8a9d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -61,7 +61,6 @@
   - type: Tag
     tags:
     - VimPilot
-  - type: RandomBark
 
 - type: entity
   name: bee
@@ -130,13 +129,6 @@
         - ReagentId: GroundBee
           Quantity: 5
   - type: ZombieImmune
-  - type: RandomBark
-    barks:
-      - Bzzzzz
-      - Bzzz bzzz
-      - Bzzzzzzzzzzzz
-      - Bzz
-    barkMultiplier: 1.5
 
 - type: entity
   name: bee
@@ -244,7 +236,6 @@
   - type: NpcFactionMember
     factions:
     - Passive
-  - type: RandomBark
 
 - type: entity
   parent: MobChicken
@@ -617,8 +608,6 @@
   - type: NpcFactionMember
     factions:
     - Passive
-  - type: RandomBark
-    barkMultiplier: 0.7
 
 - type: entity
   name: white duck #Quack
@@ -798,16 +787,6 @@
   - type: GuideHelp
     guides:
     - Chef
-  - type: RandomBark
-    barks:
-      - Mooooooo
-      - Moo
-      - Huff
-      - Mooooooooooo
-      - Moooooo
-      - Moooo
-    barkMultiplier: 3
-
 
 - type: entity
   name: crab
@@ -873,12 +852,6 @@
       task: RuminantCompound
   - type: Body
     prototype: AnimalHemocyanin
-  - type: RandomBark
-    barks:
-      - click clack
-      - clack
-      - clickity clack
-      - clack clack
 
 - type: entity
   name: goat
@@ -1473,8 +1446,6 @@
     makeSentient: true
     name: ghost-role-information-kobold-name
     description: ghost-role-information-kobold-description
-  - type: RandomBark
-    barkMultiplier: 0.65
 
 - type: entity
   name: guidebook monkey
@@ -1634,8 +1605,6 @@
   - type: BadFood
   - type: NonSpreaderZombie
   - type: PreventSpiller
-  - type: RandomBark
-    barkMultiplier: 0.3
 
 - type: entity
   parent: MobMouse
@@ -1871,18 +1840,6 @@
   - type: Tag
     tags:
     - VimPilot
-  - type: RandomBark
-    barkMultiplier: 1.3
-    barks:
-      - Croooaaaakkk
-      - Ribbit
-      - Ribbit
-      - Ribbit
-      - Crooaak
-      - Ribbit
-      - Ribbit
-      - Ribbit
-      - Bibbit
 
 # Would be cool to have some functionality for the parrot to be able to sit on stuff
 - type: entity
@@ -1996,10 +1953,6 @@
     heatDamage:
       types:
         Heat : 0.2 #per second, scales with temperature & other constants
-  - type: RandomBark
-    barks:
-      - Wank
-    barkMultiplier: 0.6
 
 - type: entity
   name: grenade penguin
@@ -2115,14 +2068,6 @@
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Scale
-  - type: RandomBark
-    barkMultiplier: 1.5
-    barks:
-      - Hsssssss
-      - Hss
-      - Hsssss
-      - Hisss
-      - Hshsss
 
 # Code unique spider prototypes or combine them all into one spider and get a
 # random sprite state when you spawn it.
@@ -2247,7 +2192,6 @@
       groups:
         Brute: -0.07
         Burn: -0.07
-  - type: RandomBark
 
 - type: entity
   name: tarantula
@@ -2592,7 +2536,6 @@
   - type: Tag
     tags:
     - VimPilot
-  - type: RandomBark
 
 - type: entity
   name: corrupted corgi
@@ -2749,7 +2692,6 @@
   - type: Tag
     tags:
     - VimPilot
-  - type: RandomBark
 
 - type: entity
   name: calico cat
@@ -2938,10 +2880,6 @@
   - type: Tag
     tags:
     - VimPilot
-  - type: RandomBark
-    barkMultiplier: 10
-    barks:
-      - Sloth
 
 - type: entity
   name: ferret
@@ -3138,8 +3076,6 @@
   - type: MobPrice
     price: 60
   - type: NonSpreaderZombie
-  - type: RandomBark
-    barkMultiplier: 0.45
 
 - type: entity
   name: pig
@@ -3300,4 +3236,3 @@
   components:
   - type: ReplacementAccent
     accent: nymph
-  - type: RandomBark
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 274765a193..9981bb8bd9 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -307,8 +307,6 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalMcGriff
-  - type: RandomBark
-    barkMultiplier: 1.3
 
 - type: entity
   name: Paperwork
@@ -408,8 +406,6 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalWalter
-  - type: RandomBark
-    barkMultiplier: 1.1
 
 - type: entity
   name: Morty
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 8e84f46a69..12ea40b1e3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -104,4 +104,3 @@
   - type: MobPrice
     price: 150
   - type: FloatingVisuals
-  - type: Speech
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index c1a5d9a1bf..58457ebb7f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -255,19 +255,6 @@
   components:
   - type: NukeCodePaper
 
-- type: entity
-  parent: Paper
-  id: StationGoalPaper
-  name: station goal
-  description: It looks like you have a lot of work to do.
-  components:
-    - type: Paper
-      stampState: paper_stamp-centcom
-      stampedBy:
-      - stampedName: stamp-component-stamped-name-centcom
-        stampedColor: "#bb3232"
-
-
 - type: entity
   name: pen
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
index 93621bc3a2..f85e93b893 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
@@ -22,7 +22,6 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
-    fireOnDropChance: 1
   - type: AmmoCounter
   - type: Appearance
   - type: GenericVisualizer
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 bf0c51849a..202604b8bf 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -18,7 +18,6 @@
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
-    fireOnDropChance: 0.15
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser.ogg
   - type: Battery
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 410664e46e..16cacb79df 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -99,15 +99,6 @@
     containers:
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
-  - type: Gun
-    fireRate: 6
-    selectedMode: SemiAuto
-    availableModes:
-      - SemiAuto
-      - FullAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
-    fireOnDropChance: 0.3
 
 - type: entity
   name: cobra
@@ -134,7 +125,6 @@
         volume: -14
     availableModes:
     - SemiAuto
-    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -179,7 +169,6 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
-    fireOnDropChance: 0.5
 
 - type: entity
   id: WeaponPistolMk58Nonlethal
@@ -209,7 +198,7 @@
   name: N1984
   parent: BaseWeaponPistol
   id: WeaponPistolN1984 # the spaces in description are for formatting.
-  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber.
+  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber. 
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/N1984.rsi
@@ -230,7 +219,6 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
-    fireOnDropChance: 0.6
   - type: ItemSlots
     slots:
       gun_magazine:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index c5237cdad9..bd043c997d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -29,7 +29,6 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
-    fireOnDropChance: 0.5
   - type: UseDelay
     delay: 0.66
   - type: ContainerContainer
@@ -128,7 +127,6 @@
       path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
       params:
         volume: 2.25
-    fireOnDropChance: 0.3
 
 - type: entity
   name: Python
@@ -157,7 +155,6 @@
     sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
   - type: Gun
     fireRate: 1
-    fireOnDropChance: 1
   - type: ContainerContainer
     containers:
       revolver-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index c55b2b6b09..5bc8125eba 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -67,7 +67,6 @@
     fireRate: 5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
-    fireOnDropChance: 0.5
   - type: ChamberMagazineAmmoProvider
     soundRack:
       path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
@@ -160,7 +159,6 @@
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
-    fireOnDropChance: 0.2
   - type: ItemSlots
     slots:
       gun_magazine:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 2dfc833bad..b693bdba37 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -72,7 +72,6 @@
     fireRate: 10
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
-    fireOnDropChance: 0.3
   - type: MagazineVisuals
     magState: mag
     steps: 1
@@ -97,7 +96,6 @@
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg
-    fireOnDropChance: 0.3
   - type: ChamberMagazineAmmoProvider
     autoEject: true
   - type: MagazineVisuals
@@ -128,7 +126,6 @@
         path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
       availableModes:
         - FullAuto
-      fireOnDropChance: 0.2
     - type: ItemSlots
       slots:
         gun_magazine:
@@ -176,7 +173,6 @@
       path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
     availableModes:
     - FullAuto
-    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -229,7 +225,6 @@
     selectedMode: FullAuto
     availableModes:
     - FullAuto
-    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 52b05b6d60..a8d9f53991 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -28,7 +28,6 @@
       path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
-    fireOnDropChance: 0.2
   - type: BallisticAmmoProvider
     whitelist:
       tags:
@@ -76,7 +75,6 @@
       path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
-    fireOnDropChance: 0.3
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -117,7 +115,6 @@
     heldPrefix: db
   - type: Gun
     fireRate: 2
-    fireOnDropChance: 0.5
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -193,7 +190,6 @@
     heldPrefix: sawn
   - type: Gun
     fireRate: 4
-    fireOnDropChance: 0.5
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -230,7 +226,6 @@
     sprite: Objects/Weapons/Guns/Shotguns/hm_pistol.rsi
   - type: Gun
     fireRate: 4
-    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
   - type: Construction
@@ -255,7 +250,6 @@
     sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi
   - type: Gun
     fireRate: 2
-    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
   - type: StaticPrice
@@ -279,7 +273,6 @@
     heldPrefix: improvised
   - type: Gun
     fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
-    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
     proto: null
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index adb8e323f4..c97459629c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -46,14 +46,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
-  - type: Gun
-    fireRate: 0.75
-    selectedMode: SemiAuto
-    availableModes:
-    - SemiAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
-    fireOnDropChance: 1
 
 - type: entity
   name: Hristov
@@ -90,7 +82,6 @@
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
-    fireOnDropChance: 1
   - type: UseDelayOnShoot
   - type: UseDelay
     delay: 8 #it's a musket
@@ -120,7 +111,6 @@
   - type: Gun
     minAngle: 0
     maxAngle: 30 #miss him entirely because the barrel is smoothbore
-    fireOnDropChance: 1
   - type: Item
     size: Small
     storedRotation: 90
diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
index cd4a22b790..af15034257 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
@@ -108,7 +108,5 @@
     - type: FaxMachine
       name: "Captain's Office"
       receiveNukeCodes: true
-      receiveStationGoal: true
     - type: StealTarget
       stealGroup: FaxMachineCaptain
-
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 00ad5f54ea..6812ca14f7 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -418,9 +418,9 @@
   noSpawn: true
   components:
   - type: StationEvent
-    earliestStart: 60
-    weight: 3
-    minimumPlayers: 20
+    earliestStart: 60 # DeltaV - was 45
+    weight: 3 # DeltaV - was 5
+    minimumPlayers: 10
     reoccurrenceDelay: 30
     duration: 1
   - type: LoneOpsSpawnRule
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
index d8849472ff..05f51baf1c 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
@@ -28,7 +28,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
@@ -40,7 +40,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
@@ -52,7 +52,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
@@ -63,7 +63,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
@@ -74,7 +74,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
@@ -85,7 +85,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
@@ -96,7 +96,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
@@ -107,7 +107,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
@@ -118,7 +118,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
@@ -130,7 +130,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
@@ -141,7 +141,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Captain
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
index c490559112..e184e0a60a 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ChiefEngineer
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ChiefEngineer
   items:
@@ -27,7 +27,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ChiefEngineer
   items:
@@ -39,7 +39,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ChiefEngineer
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
index c75c871b01..32e1a6e43e 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -27,7 +27,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -38,7 +38,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -49,7 +49,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -61,7 +61,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
index 3d3799c0ad..f4a583e39a 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -28,7 +28,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -40,7 +40,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -52,7 +52,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -63,7 +63,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -74,7 +74,7 @@
   category: Jobs
   cost: 4
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -85,7 +85,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -97,7 +97,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
index 4f0d785b14..60c6bbdb00 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -28,7 +28,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -40,7 +40,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -52,7 +52,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -64,7 +64,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -76,7 +76,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -88,7 +88,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -100,7 +100,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -112,7 +112,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -123,7 +123,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -134,7 +134,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -145,7 +145,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -156,7 +156,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -168,7 +168,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - HeadOfSecurity
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
index 3359d8f5d7..802bc65de5 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
@@ -5,7 +5,7 @@
 #   cost: 2
 #   exclusive: true
 #   requirements:
-#     - !type:CharacterJobRequirement
+#     - !type:LoadoutJobRequirement
 #       jobs:
 #         - Quartermaster
 #   items:
@@ -17,7 +17,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -29,7 +29,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -41,7 +41,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -52,7 +52,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -64,7 +64,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Quartermaster
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
index 87cb0db179..cf24ffd852 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -27,7 +27,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -38,7 +38,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -50,7 +50,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - ResearchDirector
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/cargo.yml b/Resources/Prototypes/Loadouts/Jobs/cargo.yml
index 8746386201..fe835d6823 100644
--- a/Resources/Prototypes/Loadouts/Jobs/cargo.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/cargo.yml
@@ -4,10 +4,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - SalvageSpecialist
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobSalvageSpecialist
       min: 36000 # 10 hours
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
index 44ef2262bc..820825e236 100644
--- a/Resources/Prototypes/Loadouts/Jobs/engineering.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - StationEngineer
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - StationEngineer
   items:
@@ -28,16 +28,16 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - StationEngineer
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobAtmosphericTechnician
       min: 21600 # 6 hours
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobStationEngineer
       min: 21600 # 6 hours
-    - !type:CharacterDepartmentTimeRequirement
+    - !type:LoadoutDepartmentTimeRequirement
       department: Engineering
       min: 216000 # 60 hours
   items:
@@ -49,16 +49,16 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - StationEngineer
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobAtmosphericTechnician
       min: 21600 # 6 hours
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobStationEngineer
       min: 21600 # 6 hours
-    - !type:CharacterDepartmentTimeRequirement
+    - !type:LoadoutDepartmentTimeRequirement
       department: Engineering
       min: 216000 # 60 hours
   items:
@@ -70,7 +70,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - AtmosphericTechnician
   items:
@@ -83,7 +83,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -96,7 +96,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -110,7 +110,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -123,7 +123,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -136,7 +136,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -149,7 +149,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -162,7 +162,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml
index 0a010a52f8..429732cf1e 100644
--- a/Resources/Prototypes/Loadouts/Jobs/medical.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml
@@ -4,7 +4,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - MedicalDoctor
         - Paramedic
@@ -20,7 +20,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -33,7 +33,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - MedicalDoctor
         - ChiefMedicalOfficer
@@ -47,7 +47,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -62,7 +62,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -77,7 +77,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -180,7 +180,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Chemist
   items:
@@ -191,7 +191,7 @@
   category: Jobs
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Chemist
   items:
@@ -203,7 +203,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Paramedic
   items:
@@ -215,7 +215,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Paramedic
   items:
@@ -227,19 +227,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
         - Paramedic
         - ChiefMedicalOfficer
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobMedicalDoctor
       min: 21600 # 6 hours
-    - !type:CharacterDepartmentTimeRequirement
+    - !type:LoadoutDepartmentTimeRequirement
       department: Medical
       min: 216000 # 60 hours
   items:
@@ -251,19 +251,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
         - Paramedic
         - ChiefMedicalOfficer
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobMedicalDoctor
       min: 21600 # 6 hours
-    - !type:CharacterDepartmentTimeRequirement
+    - !type:LoadoutDepartmentTimeRequirement
       department: Medical
       min: 216000 # 60 hours
   items:
@@ -275,7 +275,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - MedicalDoctor
   items:
@@ -287,19 +287,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
         - Paramedic
         - ChiefMedicalOfficer
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobMedicalDoctor
       min: 21600 # 6 hours
-    - !type:CharacterDepartmentTimeRequirement
+    - !type:LoadoutDepartmentTimeRequirement
       department: Medical
       min: 216000 # 60 hours
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
index 406c3dd116..c4e1755f8b 100644
--- a/Resources/Prototypes/Loadouts/Jobs/science.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -4,10 +4,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Scientist
-    - !type:CharacterDepartmentTimeRequirement
+    - !type:LoadoutDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
   items:
@@ -19,10 +19,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Scientist
-    - !type:CharacterDepartmentTimeRequirement
+    - !type:LoadoutDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
   items:
@@ -34,7 +34,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
@@ -48,7 +48,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
@@ -62,10 +62,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Scientist
-    - !type:CharacterDepartmentTimeRequirement
+    - !type:LoadoutDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
   items:
@@ -77,7 +77,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index ca6fe6499d..67c75d1f74 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -19,7 +19,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - SecurityOfficer
         - SecurityCadet
@@ -61,19 +61,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - SecurityOfficer
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobWarden
       min: 21600 # 6 hours
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobDetective
       min: 7200 # 2 hours
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobSecurityOfficer
       min: 21600 # 6 hours
-    - !type:CharacterDepartmentTimeRequirement
+    - !type:LoadoutDepartmentTimeRequirement
       department: Security
       min: 216000 # 60 hours
   items:
@@ -85,19 +85,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - SecurityOfficer
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobWarden
       min: 21600 # 6 hours
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobDetective
       min: 7200 # 2 hours
-    - !type:CharacterPlaytimeRequirement
+    - !type:LoadoutPlaytimeRequirement
       tracker: JobSecurityOfficer
       min: 21600 # 6 hours
-    - !type:CharacterDepartmentTimeRequirement
+    - !type:LoadoutDepartmentTimeRequirement
       department: Security
       min: 216000 # 60 hours
   items:
@@ -211,7 +211,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Warden
         - HeadOfSecurity
@@ -224,7 +224,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Detective
         - SecurityOfficer
diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml
index 31cabcd302..1eecebec53 100644
--- a/Resources/Prototypes/Loadouts/Jobs/service.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/service.yml
@@ -5,7 +5,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Clown
   items:
@@ -19,7 +19,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Clown
   items:
@@ -34,7 +34,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Bartender
   items:
@@ -47,7 +47,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
      jobs:
         - Botanist
   items:
@@ -60,7 +60,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
      jobs:
         - Lawyer
   items:
@@ -72,7 +72,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Lawyer
   items:
@@ -84,7 +84,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Lawyer
   items:
@@ -96,7 +96,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Lawyer
   items:
@@ -108,7 +108,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Lawyer
   items:
@@ -120,7 +120,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Lawyer
   items:
@@ -132,7 +132,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Lawyer
   items:
@@ -144,7 +144,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Lawyer
   items:
@@ -156,7 +156,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Reporter
   items:
@@ -169,7 +169,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Reporter
   items:
@@ -181,7 +181,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Reporter
   items:
diff --git a/Resources/Prototypes/Loadouts/categories.yml b/Resources/Prototypes/Loadouts/categories.yml
index 7942b4bdf9..f1e8c34294 100644
--- a/Resources/Prototypes/Loadouts/categories.yml
+++ b/Resources/Prototypes/Loadouts/categories.yml
@@ -1,8 +1,4 @@
-# Alphabetically ordered, except for Uncategorized since it is always first
-
-- type: loadoutCategory
-  id: Uncategorized
-
+# Alphabetically ordered
 - type: loadoutCategory
   id: Accessories
 
diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml
index 1b8e7ab1c3..26e50802fe 100644
--- a/Resources/Prototypes/Loadouts/uniform.yml
+++ b/Resources/Prototypes/Loadouts/uniform.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:CharacterJobRequirement
+    - !type:LoadoutJobRequirement
       jobs:
         - Passenger
   items:
diff --git a/Resources/Prototypes/Objectives/goals.yml b/Resources/Prototypes/Objectives/goals.yml
deleted file mode 100644
index 59e35ea8a5..0000000000
--- a/Resources/Prototypes/Objectives/goals.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-- type: stationGoal
-  id: Area
-
-- type: stationGoal
-  id: Anomalies
-
-- type: stationGoal
-  id: Artifacts
-
-- type: stationGoal
-  id: BureaucraticError
-
-- type: stationGoal
-  id: Combat
-
-- type: stationGoal
-  id: Labor
-
-- type: stationGoal
-  id: Lectures
-
-- type: stationGoal
-  id: Museum
-
-- type: stationGoal
-  id: Shuttle
-
-- type: stationGoal
-  id: Singularity
-
-- type: stationGoal
-  id: SolarPanels
-
-- type: stationGoal
-  id: Storage
-
-- type: stationGoal
-  id: Xeno
-
-- type: stationGoal
-  id: Zoo
-
-
-- type: weightedRandom
-  id: StationGoals
-  weights:
-    StationGoalDepartment: 1
-    StationGoalPower: 1
-    StationGoalStation: 1
-
-
-- type: weightedRandom
-  id: StationGoalDepartment
-  weights:
-    StationGoalScience: 1
-    StationGoalSecurity: 1
-
-
-- type: weightedRandom
-  id: StationGoalPower
-  weights:
-    Singularity: 1
-    SolarPanels: 1
-
-- type: weightedRandom
-  id: StationGoalScience
-  weights:
-    Anomalies: 1
-    Artifacts: 1
-    Xeno: 1
-
-- type: weightedRandom
-  id: StationGoalSecurity
-  weights:
-    Combat: 1
-
-- type: weightedRandom
-  id: StationGoalStation
-  weights:
-    Area: 1
-    BureaucraticError: 1
-    Labor: 1
-    Lectures: 1
-    Museum: 1
-    Shuttle: 1
-    Storage: 1
-    Zoo: 1
diff --git a/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml b/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml
index b7aa00353c..25aa23a5af 100644
--- a/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml
+++ b/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml
@@ -1,12 +1,11 @@
 - type: trait
   id: Nearsighted
-  category: Visual
-  points: 1
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
+  name: trait-nearsighted-name
+  description: You require glasses to see properly.
+  traitGear: ClothingEyesGlasses
   components:
     - type: Nearsighted
+  whitelist: # Delta V fix to borgs spawning with it.
+    components:
+      - Blindable
+
diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml
deleted file mode 100644
index ba3fd7b345..0000000000
--- a/Resources/Prototypes/Traits/categories.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Alphabetically ordered, except for Uncategorized since it is always first
-
-- type: traitCategory
-  id: Uncategorized
-
-- type: traitCategory
-  id: Auditory
-
-- type: traitCategory
-  id: Mental
-
-- type: traitCategory
-  id: Physical
-
-- type: traitCategory
-  id: Speech
-
-- type: traitCategory
-  id: Visual
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index eb96d37e01..064b34adba 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -1,26 +1,18 @@
 - type: trait
   id: Blindness
-  category: Visual
-  points: 2
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
+  name: trait-blindness-name
+  description: trait-blindness-desc
+  traitGear: WhiteCane
+  whitelist:
+    components:
+      - Blindable
   components:
     - type: PermanentBlindness
 
 - type: trait
   id: Narcolepsy
-  category: Mental
-  points: 1
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
+  name: trait-narcolepsy-name
+  description: trait-narcolepsy-desc
   components:
     - type: Narcolepsy
       timeBetweenIncidents: 300, 600
@@ -28,15 +20,15 @@
 
 - type: trait
   id: Pacifist
-  category: Mental
-  points: 3
+  name: trait-pacifist-name
+  description: trait-pacifist-desc
   components:
     - type: Pacified
 
 - type: trait
   id: Paracusia
-  category: Auditory
-  points: 1
+  name: trait-paracusia-name
+  description: trait-paracusia-desc
   components:
     - type: Paracusia
       minTimeBetweenIncidents: 0.1
@@ -47,50 +39,24 @@
 
 - type: trait
   id: Muted
-  category: Speech
-  points: 1
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
+  name: trait-muted-name
+  description: trait-muted-desc
+  blacklist:
+    components:
+      - BorgChassis
   components:
     - type: Muted
 
 - type: trait
   id: Uncloneable
-  category: Physical
-  points: 2
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
+  name: trait-uncloneable-name
+  description: trait-uncloneable-desc
   components:
     - type: Uncloneable
 
 - type: trait
   id: FrontalLisp
-  category: Speech
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
+  name: trait-frontal-lisp-name
+  description: trait-frontal-lisp-desc
   components:
     - type: FrontalLisp
-
-- type: trait
-  id: Snoring
-  category: Auditory
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
-  components:
-    - type: Snoring
diff --git a/Resources/Prototypes/Traits/inconveniences.yml b/Resources/Prototypes/Traits/inconveniences.yml
index dcf53d9ab7..657781d1b5 100644
--- a/Resources/Prototypes/Traits/inconveniences.yml
+++ b/Resources/Prototypes/Traits/inconveniences.yml
@@ -1,25 +1,15 @@
 - type: trait
   id: LightweightDrunk
-  category: Physical
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
+  name: trait-lightweight-name
+  description: trait-lightweight-desc
   components:
     - type: LightweightDrunk
       boozeStrengthMultiplier: 2
 
 - type: trait
   id: SocialAnxiety
-  category: Mental
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
+  name: trait-socialanxiety-name
+  description: trait-socialanxiety-desc
   components:
     - type: StutteringAccent
       matchRandomProb: 0.1
diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml
index 3a3dc943cd..9e7f765507 100644
--- a/Resources/Prototypes/Traits/neutral.yml
+++ b/Resources/Prototypes/Traits/neutral.yml
@@ -1,23 +1,18 @@
 - type: trait
   id: PirateAccent
-  category: Speech
+  name: trait-pirate-accent-name
+  description: trait-pirate-accent-desc
   components:
     - type: PirateAccent
 
 - type: trait
   id: Accentless
-  category: Speech
-  points: -1
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
+  name: trait-accentless-name
+  description: trait-accentless-desc
   components:
-    - type: Accentless
-      removes:
-      - type: LizardAccent
-      - type: MothAccent
-      - type: ReplacementAccent
-        accent: dwarf
+  - type: Accentless
+    removes:
+    - type: LizardAccent
+    - type: MothAccent
+    - type: ReplacementAccent
+      accent: dwarf
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/finch_tail.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/finch_tail.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/meta.json
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
rename to Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json
deleted file mode 100644
index 2961db3707..0000000000
--- a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Peacock by stillxicarus (Discord)",
-    "size": {
-        "x": 48,
-        "y": 48
-    },
-    "states": [
-        {
-            "name": "peacock_tail_feathers",
-            "directions": 4
-        },
-        {
-            "name": "peacock_tail_eyes",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png
deleted file mode 100644
index 71af693afd78b3c3a6c81ca03fc2f9db5913e590..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 772
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!Wi-X*q7}lMWc?smOq&xaLGB9lH
z=l+w(3gjyW_=LDtRW-hRc_J~f)7Q5xIl1%y|NjRL)R&hxZQ4}w>eVTrswZhYEkKI9
zB*-rqC<_G)UjB@qfWn*w9+AZi419+`m{C;2tAT-mDb&-&F(kwJ?aYg1hZQ*5k~e10
z{$Brpago!NU2e0xW%tk3W#hDWniRY{_rH<%g404TKGm}><1}Z=edpY|?DrC%?a|r+
ziTh6)CY;Y=;b(Y|{L<d@!LuhP>P=f6PN*cE&-(I*n^FCEgYD{zpYy*y3!b(03e(!E
zKL`01i1hql(XgD6?f9(?EOWQBzM3eNHgmzM_EX0vel@o(`2AOc=Uq`{@2{S%a<gL8
zZhOtYc_}B0QATOi<!8MYW;kl^n9;C=ceiu%w{WJnF|Umec1b0A>=%h`o2b+9s8C>H
zpx0*yEwdB-39}Z23B0Y`x5Z?^jjt+SxTNGfYPsrC93*qJxYysE%<w=uu+9C0Z=@DW
zecd^M<7*WzB>nl!b?@pzv*U&iA`jFQoxf?#_u}_@Wt{T0h<V3@W^*phta{Z3ji)YW
z#SU7o*W!~qEdQtXK-w)~hWz4=f{P#boxi#~IA+2P<!4z1{F141r+)H${i3#sWtUE)
z9ykDD%x*!6-wl%t67|F`$ZPp0+pmnh+3d-x6tdzqOGdDjtBQ-K^-YxzPi&90=oO26
zpJIGFWls0(b(b&5`L_9pJ$UtF$4jejmJ>^_`Kmq5-Qe-3bVZ$zPv?|c7GX8cfPYi|
zF5rmun;0aqnJMW_X<*)qO$>Wd3>w3)UDTFX<LAb1#8lCKH?>BJC*Z#k%g2a+7tPH~
z8~6Kli1^Msdz2|;NuW<-AJbu7wHyIefqy3r9y)gaUz_lS%i`Mur58n?E#mK{Sn_>b
rcXDyRWMReq*qBB78xS7c@P5B*c|60ulNK9*sgA+Z)z4*}Q$iB}zuHxD

diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png
deleted file mode 100644
index d56b093d6ca8a5584adf01c6e4e1d6aeca3c48ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1669
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
P00000NkvXXu0mjfjI1Qj


From e6e1e46c1976cfeb53c01cb3c02bf4d6902b6541 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 20:09:43 -0400
Subject: [PATCH 74/84] Revert "Merge branch 'master' into
 Additional-Loadout-Items"

This reverts commit 04774ed25f95352d3a171d774a7a6c9d6e15f52b, reversing
changes made to ce097f56d46e0d36934addc76d6b86d8b4b3a13a.
---
 .github/workflows/changelog.yml               |   4 +-
 .github/workflows/prtitlecase.yml             |  34 --
 .vscode/extensions.json                       |   8 +-
 BuildChecker/BuildChecker.csproj              |   4 +-
 BuildChecker/git_helper.py                    | 110 ++++
 BuildChecker/hooks/post-checkout              |  13 +
 BuildChecker/hooks/post-merge                 |   5 +
 .../CardboardBox/CardboardBoxSystem.cs        |   5 +-
 .../Cargo/UI/CargoConsoleMenu.xaml.cs         |   4 +-
 .../Construction/ConstructionSystem.cs        |   3 +-
 .../ContextMenu/UI/EntityMenuUIController.cs  |   2 +-
 Content.Client/Gameplay/GameplayState.cs      |   8 +-
 Content.Client/Gameplay/GameplayStateBase.cs  |   2 +-
 Content.Client/Input/ContentContexts.cs       |   1 +
 .../Language/LanguageMenuWindow.xaml          |  18 +
 .../Language/LanguageMenuWindow.xaml.cs       | 134 +++++
 .../Language/Systems/LanguageSystem.cs        |  76 +++
 .../Systems/TranslatorImplanterSystem.cs      |   8 +
 Content.Client/NPC/PathfindingSystem.cs       |  10 +-
 .../Cartridges}/GlimmerMonitorUi.cs           |   3 +-
 .../Cartridges}/GlimmerMonitorUiFragment.xaml |   2 +-
 .../GlimmerMonitorUiFragment.xaml.cs          |   4 +-
 .../Chat}/PsionicChatUpdateSystem.cs          |   4 +-
 .../Glimmer/GlimmerReactiveVisuals.cs         |   0
 .../Psionics/UI}/AcceptPsionicsEUI.cs         |   0
 .../Psionics/UI}/AcceptPsionicsWindow.cs      |   0
 .../UserInterface/GlimmerGraph.cs             |   2 +-
 .../Options/UI/Tabs/KeyRebindTab.xaml.cs      |   1 +
 Content.Client/Popups/PopupOverlay.cs         |  11 +-
 Content.Client/Popups/PopupSystem.cs          |   5 +
 .../Overlays/RadiationPulseOverlay.cs         |   5 +-
 Content.Client/Sandbox/SandboxSystem.cs       |   3 +-
 ...GameScreen.xaml => DefaultGameScreen.xaml} |   4 +-
 ...reen.xaml.cs => DefaultGameScreen.xaml.cs} |   4 +-
 .../UserInterface/Screens/ScreenType.cs       |   8 +-
 .../Systems/Chat/ChatUIController.cs          |  27 +-
 .../Systems/Chat/Controls/ChatInputBox.cs     |   1 +
 .../Language/LanguageMenuUIController.cs      |  89 ++++
 .../MenuBar/GameTopMenuBarUIController.cs     |   4 +
 .../MenuBar/Widgets/GameTopMenuBar.xaml       |  10 +
 .../Systems/Vote/VoteUIController.cs          |   6 +-
 Content.Client/Verbs/VerbSystem.cs            |   8 +-
 .../Tests/Wires/WireLayoutTest.cs             | 103 ++++
 .../Abilities/Mime/MimePowersSystem.cs        |   2 +-
 .../Administration/Managers/AdminManager.cs   |   2 +-
 .../Systems/AdminVerbSystem.Tools.cs          |  16 +-
 .../Administration/Systems/AdminVerbSystem.cs |   3 +-
 .../Anomaly/AnomalySystem.Psionics.cs         |   4 +-
 .../Atmos/Components/AirtightComponent.cs     |  32 +-
 .../Components/IgniteOnCollideComponent.cs    |   4 +-
 .../Atmos/EntitySystems/AirtightSystem.cs     |   2 -
 .../AtmosphereSystem.GridAtmosphere.cs        |   8 +-
 .../AtmosphereSystem.HighPressureDelta.cs     |   2 +-
 .../AtmosphereSystem.Monstermos.cs            |   2 +-
 .../AtmosphereSystem.Processing.cs            |   2 +-
 .../EntitySystems/AtmosphereSystem.Utils.cs   |   3 +-
 Content.Server/Atmos/GasMixture.cs            |   7 +-
 Content.Server/Atmos/TileAtmosphere.cs        |   3 +
 .../Bed/Components/SnoringComponent.cs        |  10 +
 Content.Server/Bed/Sleep/SleepingSystem.cs    |   5 +-
 .../Cargo/Components/CargoPalletComponent.cs  |  21 +-
 .../Cargo/Systems/CargoSystem.Orders.cs       |   2 +-
 .../Cargo/Systems/CargoSystem.Shuttle.cs      |  15 +-
 Content.Server/Chat/Systems/ChatSystem.cs     | 155 ++++--
 .../TypingIndicator/TypingIndicatorSystem.cs  |   2 +-
 .../Chemistry/EntitySystems/VaporSystem.cs    |   4 +-
 .../Chemistry/ReagentEffects/MakeSentient.cs  |  20 +-
 .../Conditions/ComponentInTile.cs             |   3 +-
 .../ConstructionSystem.Initial.cs             |   7 +-
 .../Events/GlimmerMobSpawnRule.cs             |   2 +-
 .../Systems/DeviceNetworkJammerSystem.cs      |  38 ++
 .../Systems/DeviceNetworkSystem.cs            |  11 +-
 .../Systems/SingletonDeviceNetServerSystem.cs |   5 +-
 Content.Server/Dragon/DragonSystem.cs         |   3 +-
 .../Ensnaring/EnsnareableSystem.Ensnaring.cs  |   4 +-
 .../EntitySystems/ExplosionSystem.cs          |   2 +-
 .../Explosion/EntitySystems/TriggerSystem.cs  |   4 +-
 .../GameTicking/GameTicker.Spawning.cs        |   2 +-
 .../GameTicking/Rules/PiratesRuleSystem.cs    |   4 +-
 Content.Server/Guardian/GuardianSystem.cs     |   3 +-
 Content.Server/Hands/Systems/HandsSystem.cs   |   3 +-
 .../Implants/SubdermalImplantSystem.cs        |   2 +-
 Content.Server/LandMines/LandMineComponent.cs |   9 +-
 Content.Server/LandMines/LandMineSystem.cs    |  46 +-
 .../Language/Commands/ListLanguagesCommand.cs |  39 ++
 .../Language/Commands/SayLanguageCommand.cs   |  53 ++
 .../Commands/SelectLanguageCommand.cs         |  48 ++
 .../Language/DetermineEntityLanguagesEvent.cs |  29 ++
 .../Language/LanguageSystem.Networking.cs     |  59 +++
 Content.Server/Language/LanguageSystem.cs     | 289 ++++++++++
 .../Language/TranslatorImplanterSystem.cs     |  72 +++
 Content.Server/Language/TranslatorSystem.cs   | 225 ++++++++
 Content.Server/Magic/MagicSystem.cs           |   2 +-
 .../Mind/Commands/MakeSentientCommand.cs      |  10 +
 .../CoordinatesInRangePrecondition.cs         |   2 +-
 .../CoordinatesNotInRangePrecondition.cs      |   2 +-
 .../TargetInRangePrecondition.cs              |   2 +-
 .../NPC/Pathfinding/PathfindingSystem.cs      |   2 +-
 .../NPC/Systems/NPCSteeringSystem.Context.cs  |  25 +-
 .../NPC/Systems/NPCUtilitySystem.cs           |   5 +-
 .../Psionics/Abilities/DispelPowerSystem.cs   |  31 +-
 .../Abilities/MetapsionicPowerSystem.cs       |  74 +++
 .../Psionics/Abilities/MindSwapPowerSystem.cs |  62 +--
 .../Abilities/MindSwappedComponent.cs         |   5 +-
 .../Abilities/NoosphericZapPowerSystem.cs     |  44 +-
 .../PsionicInvisibilityPowerSystem.cs         |  94 +---
 .../PsionicRegenerationPowerSystem.cs         | 129 +++++
 .../Abilities/PyrokinesisPowerSystem.cs       |  66 +++
 .../Abilities/TelegnosisPowerSystem.cs        |  67 +++
 .../Psionics}/PsionicAbilitiesSystem.cs       |  89 ++--
 .../Audio/GlimmerSoundComponent.cs            |   6 +-
 .../Chat/NyanoChatSystem.cs}                  |  18 +-
 .../Chat}/TSayCommand.cs                      |   3 +-
 .../Chat}/TelepathicRepeaterComponent.cs      |   2 +-
 .../Chemistry/Effects/ChemRemovePsionic.cs    |   2 +-
 .../BecomePsionicConditionComponent.cs        |  11 +
 .../Systems/BecomePsionicConditionSystem.cs   |  32 ++
 .../Psionics/AcceptPsionicsEui.cs             |   2 +-
 .../Psionics/AntiPsychicWeaponComponent.cs    |   0
 .../Psionics/Dreams/DreamSystem.cs            |   3 +
 .../Psionics/Glimmer/GlimmerCommands.cs       |   0
 .../Psionics/Glimmer/GlimmerReactiveSystem.cs |   5 +-
 .../Glimmer/PassiveGlimmerReductionSystem.cs  |   2 +
 .../Structures/GlimmerSourceComponent.cs      |   0
 .../Structures/GlimmerStructuresSystem.cs     |   0
 .../Invisibility/PsionicInvisibilitySystem.cs |  25 +-
 .../PsionicInvisibleContactsComponent.cs      |   1 +
 .../PsionicInvisibleContactsSystem.cs         |   2 +
 .../PsionicallyInvisibleComponent.cs          |   0
 .../Psionics/PotentialPsionicComponent.cs     |  14 +
 .../PsionicAwaitingPlayerComponent.cs         |   0
 .../Psionics/PsionicBonusChanceComponent.cs   |   0
 .../Psionics/PsionicsCommands.cs              |   6 +-
 .../Psionics/PsionicsSystem.cs                |  23 +-
 .../Research/Oracle/OracleSystem.cs           |   2 +-
 .../SophicScribe/SophicScribeSystem.cs        |   2 +-
 .../Events/GlimmerWispSpawnRule.cs            |   2 +-
 .../StationEvents/Events/MassMindSwapRule.cs  |   5 +-
 .../StationEvents/Events/NoosphericFryRule.cs |   2 +-
 .../Events/NoosphericStormRule.cs             |   4 +-
 .../StationEvents/Events/NoosphericZapRule.cs |   2 +-
 .../Events/PsionicCatGotYourTongueRule.cs     |   2 +-
 .../Pointing/EntitySystems/PointingSystem.cs  |  10 +-
 .../EntitySystems/PowerReceiverSystem.cs      |  17 +-
 .../Abilities/MetapsionicPowerSystem.cs       | 188 -------
 .../PsionicRegenerationPowerSystem.cs         | 179 -------
 .../Abilities/PyrokinesisPowerSystem.cs       |  93 ----
 .../RegenerativeStasisPowerSystem.cs          |  76 ---
 .../Abilities/TelegnosisPowerSystem.cs        | 106 ----
 .../Psionics/PotentialPsionicComponent.cs     |  21 -
 .../Radio/EntitySystems/HeadsetSystem.cs      |  16 +-
 .../Radio/EntitySystems/JammerSystem.cs       |  17 +
 .../Radio/EntitySystems/RadioDeviceSystem.cs  |   5 +-
 .../Radio/EntitySystems/RadioSystem.cs        |  66 ++-
 Content.Server/Radio/RadioEvent.cs            |  14 +-
 Content.Server/Remotes/DoorRemoteSystem.cs    |   3 +-
 .../Respawn/SpecialRespawnSystem.cs           |   5 +-
 .../EntitySystems/EventHorizonSystem.cs       |   4 +-
 .../EntitySystems/GravityWellSystem.cs        |   8 +-
 .../SingularityAttractorSystem.cs             |  11 +-
 .../Speech/EntitySystems/ListeningSystem.cs   |   7 +-
 .../EntitySystems/BluespaceLockerSystem.cs    |   3 +-
 .../Store/Systems/StoreSystem.Ui.cs           |   9 +-
 .../Tabletop/TabletopSystem.Session.cs        |   2 +-
 Content.Server/Tiles/LavaSystem.cs            |   4 +-
 Content.Server/Wires/WireLayout.cs            |   2 +
 .../Systems/Carvers/NoiseRangeCarverSystem.cs |   3 +-
 .../Zombies/ZombieSystem.Transform.cs         |   4 +-
 Content.Shared.Database/LogType.cs            |   1 +
 Content.Shared/Anomaly/SharedAnomalySystem.cs |   2 +-
 .../Audio/SharedAmbientSoundSystem.cs         |  11 +-
 Content.Shared/CCVar/CCVars.cs                |   6 +-
 Content.Shared/Chasm/ChasmSystem.cs           |   4 +-
 .../Chemistry/Components/InjectorComponent.cs |  14 +-
 .../Conditions/WallmountCondition.cs          |   3 +-
 .../DeviceNetworkJammerComponent.cs           |  24 +
 Content.Shared/Examine/ExamineSystemShared.cs |  12 +-
 .../EntitySystems/SharedHandsSystem.Pickup.cs |   2 +-
 Content.Shared/Input/ContentKeyFunctions.cs   |   1 +
 .../Interaction/SharedInteractionSystem.cs    |   6 +-
 .../Components/LanguageSpeakerComponent.cs    |  29 ++
 .../TranslatorImplanterComponent.cs           |  35 ++
 .../Translators/BaseTranslatorComponent.cs    |  47 ++
 .../HandheldTranslatorComponent.cs            |  15 +
 .../Translators/HoldsTranslatorComponent.cs   |  11 +
 .../ImplantedTranslatorComponent.cs           |   9 +
 .../IntrinsicTranslatorComponent.cs           |  10 +
 .../UniversalLanguageSpeakerComponent.cs      |  11 +
 .../Language/Events/LanguagesSetMessage.cs    |  13 +
 .../Language/Events/LanguagesUpdateEvent.cs   |   8 +
 .../Events/LanguagesUpdatedMessage.cs         |  15 +
 .../Events/RequestLanguagesMessage.cs         |  10 +
 Content.Shared/Language/LanguagePrototype.cs  |  37 ++
 .../Language/Systems/SharedLanguageSystem.cs  |  39 ++
 .../SharedTranslatorImplanterSystem.cs        |  36 ++
 .../Systems/SharedTranslatorSystem.cs         |  34 ++
 .../MovementSpeedModifierComponent.cs         |   2 +-
 .../Abilities/AcceptPsionicsEuiMessage.cs     |   0
 .../Dispel/DamageOnDispelComponent.cs         |   4 +-
 .../Abilities/Dispel/DispelPowerComponent.cs  |   8 +-
 .../Abilities/Dispel/DispellableComponent.cs  |   2 +-
 .../MassSleep/MassSleepPowerComponent.cs      |  18 +
 .../MassSleep/MassSleepPowerSystem.cs         |  59 +++
 .../Metapsionics/MetapsionicPowerComponent.cs |  21 +
 .../MindSwap/MindSwapPowerComponent.cs        |   5 +-
 .../NoosphericZapPowerComponent.cs            |   5 +-
 .../PsionicInvisibilityPowerComponent.cs      |   8 +-
 .../PsionicInvisibilityUsedComponent.cs       |   3 +-
 .../PsionicRegenerationPowerComponent.cs      |  10 +-
 .../Pyrokinesis/PyrokinesisPowerComponent.cs  |   5 +-
 .../Telegnosis/TelegnosisPowerComponent.cs    |  10 +-
 .../TelegnosticProjectionComponent.cs         |   6 +
 .../ClothingGrantPsionicPowerComponent.cs     |   2 +-
 .../Psionics/Items/HeadCageComponent.cs       |   2 +-
 .../Psionics/Items/HeadCagedComponent.cs      |   2 +-
 .../Psionics/Items/PsionicItemsSystem.cs      |   2 +-
 .../Psionics/Items/TinfoilHatComponent.cs     |   2 +-
 .../Abilities}/Psionics/PsionicComponent.cs   |  16 +-
 .../Psionics/PsionicInsulationComponent.cs    |   2 +-
 .../Psionics/PsionicsDisabledComponent.cs     |   2 +-
 .../Psionics/SharedPsionicAbilitiesSystem.cs  |   4 +-
 .../Events/MassSleepPowerActionEvent.cs       |   2 +
 .../Events/MetapsionicPowerActionEvent.cs     |   3 +-
 .../Events/PyrokinesisPowerActionEvent.cs     |   4 +-
 .../RegenerativeStasisPowerActionEvent.cs     |   2 -
 Content.Shared/Nyanotrasen/Psionics/Events.cs |  28 +
 .../Psionics/Glimmer/GlimmerSystem.cs         |   2 +-
 .../Glimmer/SharedGlimmerReactiveComponent.cs |   0
 .../Glimmer/SharedGlimmerReactiveVisuals.cs   |   0
 .../Physics/FrictionRemoverSystem.cs          |  25 -
 .../Metapsionics/MetapsionicPowerComponent.cs |  38 --
 .../RegenerativeStasisPowerComponent.cs       |  20 -
 .../TelegnosticProjectionComponent.cs         |   8 -
 Content.Shared/Psionics/Events.cs             |  64 ---
 .../Psionics/SharedPsionicSystem.Insulated.cs |   4 -
 Content.Shared/Slippery/SlipperySystem.cs     |   4 +-
 .../Spawning/EntitySystemExtensions.cs        |   2 +-
 .../Components/StepTriggerComponent.cs        |   8 +-
 .../StepTrigger/Systems/StepTriggerSystem.cs  |  41 +-
 Content.Shared/Store/ListingPrototype.cs      |   5 +-
 .../Systems/SharedGunSystem.Ballistic.cs      |   2 +-
 LEGAL.md                                      |   4 +-
 README.md                                     |  27 +-
 RUN_THIS.py                                   |  13 +
 Resources/Audio/Effects/attributions.yml      |   5 -
 Resources/Audio/Effects/beep_landmine.ogg     | Bin 6034 -> 0 bytes
 .../Audio/Nyanotrasen/heartbeat_fast.ogg      | Bin 39983 -> 0 bytes
 Resources/Changelog/Changelog.yml             |  20 +-
 Resources/Credits/GitHub.txt                  |   2 +-
 Resources/Locale/en-US/language/commands.ftl  |   8 +
 .../Locale/en-US/language/language-menu.ftl   |   4 +
 Resources/Locale/en-US/language/languages.ftl |  71 +++
 .../Locale/en-US/language/technologies.ftl    |   2 +
 .../Locale/en-US/language/translator.ftl      |   8 +
 .../en-US/nyanotrasen/abilities/psionic.ftl   |  18 +-
 .../nyanotrasen/psionics/psychic-feedback.ftl |  21 -
 .../Locale/en-US/paper/book-authorbooks.ftl   |   8 +
 .../catalog/cargo/cargoproduct-categories.ftl |  16 +
 .../Locale/en-US/speech/speech-chatsan.ftl    |   3 +
 Resources/Locale/en-US/traits/traits.ftl      |   3 +
 Resources/Maps/Shuttles/trading_outpost.yml   | 263 +++++-----
 .../Prototypes/Accents/word_replacements.yml  |  17 +-
 Resources/Prototypes/Actions/types.yml        |   2 +-
 .../Prototypes/Catalog/Cargo/cargo_armory.yml |  12 +-
 .../Catalog/Cargo/cargo_atmospherics.yml      |  22 +-
 .../Prototypes/Catalog/Cargo/cargo_botany.yml |  10 +-
 .../Prototypes/Catalog/Cargo/cargo_cargo.yml  |   4 +-
 .../Catalog/Cargo/cargo_circuitboards.yml     |   2 +-
 .../Catalog/Cargo/cargo_emergency.yml         |  16 +-
 .../Catalog/Cargo/cargo_engineering.yml       |  28 +-
 .../Catalog/Cargo/cargo_engines.yml           |  36 +-
 .../Prototypes/Catalog/Cargo/cargo_food.yml   |  16 +-
 .../Prototypes/Catalog/Cargo/cargo_fun.yml    |  58 +--
 .../Catalog/Cargo/cargo_livestock.yml         |  46 +-
 .../Catalog/Cargo/cargo_materials.yml         |  22 +-
 .../Catalog/Cargo/cargo_medical.yml           |  30 +-
 .../Catalog/Cargo/cargo_science.yml           |   6 +-
 .../Catalog/Cargo/cargo_security.yml          |  18 +-
 .../Catalog/Cargo/cargo_service.yml           |  38 +-
 .../Catalog/Cargo/cargo_shuttle.yml           |   6 +-
 .../Catalog/Cargo/cargo_vending.yml           |  50 +-
 .../VendingMachines/Inventories/theater.yml   |   1 +
 .../Prototypes/Catalog/uplink_catalog.yml     |  12 +-
 .../DeltaV/Entities/Mobs/NPCs/animals.yml     |  13 +-
 .../DeltaV/Entities/Mobs/NPCs/familiars.yml   |  12 +-
 .../DeltaV/Entities/Mobs/NPCs/nukiemouse.yml  |  10 +-
 .../DeltaV/Entities/Mobs/Player/harpy.yml     |   1 +
 .../DeltaV/Entities/Mobs/Player/vulpkanin.yml |   1 +
 .../DeltaV/Entities/Mobs/Species/harpy.yml    |  13 +-
 .../Entities/Mobs/Species/vulpkanin.yml       |   7 +
 .../Entities/Clothing/Head/hats.yml           |   5 +-
 .../Entities/Clothing/Masks/masks.yml         |  10 +
 .../Clothing/OuterClothing/wintercoats.yml    |  40 +-
 .../Entities/Clothing/Shoes/misc.yml          |   3 +
 .../Mobs/Cyborgs/base_borg_chassis.yml        |   7 +
 .../Prototypes/Entities/Mobs/NPCs/animals.yml | 129 ++++-
 .../Entities/Mobs/NPCs/argocyte.yml           |   7 +-
 .../Prototypes/Entities/Mobs/NPCs/pets.yml    |  65 ++-
 .../Entities/Mobs/NPCs/regalrat.yml           |  13 +
 .../Entities/Mobs/NPCs/revenant.yml           |   1 +
 .../Prototypes/Entities/Mobs/NPCs/shadows.yml |  11 +-
 .../Prototypes/Entities/Mobs/NPCs/silicon.yml |   7 +
 .../Prototypes/Entities/Mobs/NPCs/slimes.yml  |   7 +-
 .../Prototypes/Entities/Mobs/NPCs/space.yml   |  23 +-
 .../Prototypes/Entities/Mobs/NPCs/xeno.yml    |  12 +
 .../Entities/Mobs/Player/arachnid.yml         |   1 +
 .../Prototypes/Entities/Mobs/Player/diona.yml |   1 +
 .../Prototypes/Entities/Mobs/Player/dwarf.yml |   2 +
 .../Prototypes/Entities/Mobs/Player/human.yml |   2 +
 .../Prototypes/Entities/Mobs/Player/moth.yml  |   2 +
 .../Entities/Mobs/Player/observer.yml         |   1 +
 .../Entities/Mobs/Player/replay_observer.yml  |   1 +
 .../Entities/Mobs/Player/reptilian.yml        |   2 +
 .../Prototypes/Entities/Mobs/Player/slime.yml |   2 +
 .../Prototypes/Entities/Mobs/Species/base.yml |   9 +-
 .../Entities/Mobs/Species/diona.yml           |   7 +
 .../Entities/Mobs/Species/dwarf.yml           |   7 +
 .../Entities/Mobs/Species/human.yml           |   8 +
 .../Prototypes/Entities/Mobs/Species/moth.yml |  11 +-
 .../Entities/Mobs/Species/reptilian.yml       |   7 +
 .../Entities/Mobs/Species/slime.yml           |   7 +
 .../Prototypes/Entities/Mobs/Species/vox.yml  |   2 +
 .../reinforcement_teleporter.yml              |   2 +-
 .../Objects/Devices/translator_implants.yml   | 132 +++++
 .../Entities/Objects/Devices/translators.yml  | 205 ++++++++
 .../Fun/Instruments/instruments_misc.yml      |   3 +
 .../Instruments/instruments_percussion.yml    |   2 +
 .../Fun/Instruments/instruments_wind.yml      |   5 +-
 .../Prototypes/Entities/Objects/Fun/toys.yml  |   3 +
 .../Entities/Objects/Misc/authorbooks.yml     |  14 +
 .../Entities/Objects/Misc/land_mine.yml       |   8 +-
 .../Objects/Specific/Cargo/cargo_pallet.yml   |  31 --
 .../Objects/Specific/Janitorial/janitor.yml   |   5 -
 .../Objects/Specific/Medical/healing.yml      |  28 +-
 .../Entities/Objects/Specific/chemistry.yml   |   7 +
 .../Entities/Objects/Specific/syndicate.yml   |   4 +-
 .../Structures/Doors/Airlocks/access.yml      | 189 ++++++-
 .../Doors/Airlocks/base_structureairlocks.yml |   4 -
 .../Structures/Doors/Airlocks/shuttle.yml     |   1 -
 .../Structures/Doors/Firelocks/firelock.yml   |   2 -
 .../Doors/MaterialDoors/material_doors.yml    |   4 -
 .../Doors/SecretDoor/secret_door.yml          |   1 -
 .../Structures/Doors/Shutter/shutters.yml     |   4 -
 .../Doors/Windoors/base_structurewindoors.yml |   1 -
 .../Entities/Structures/Furniture/chairs.yml  |  14 +-
 .../Entities/Structures/Machines/lathe.yml    |  18 +
 .../Structures/Machines/vending_machines.yml  |   7 +
 .../Entities/Structures/Windows/window.yml    |   4 +-
 .../Entities/Structures/plastic_flaps.yml     |   2 -
 Resources/Prototypes/Language/languages.yml   | 493 ++++++++++++++++++
 .../Prototypes/Nyanotrasen/Actions/types.yml  |  34 +-
 .../Markers/Spawners/Random/books.yml         |   1 +
 .../Markers/Spawners/Random/boxes.yml         |   8 +
 .../Markers/Spawners/Random/devices.yml       |  34 +-
 .../Entities/Markers/Spawners/Random/hats.yml |  20 +
 .../Markers/Spawners/Random/machineparts.yml  |   2 +-
 .../Markers/Spawners/Random/seeds.yml         |   3 +
 .../Nyanotrasen/Entities/Mobs/Player/Oni.yml  |   1 +
 .../Entities/Mobs/Player/felinid.yml          |   2 +
 .../Nyanotrasen/Entities/Mobs/Species/Oni.yml |   7 +
 .../Entities/Mobs/Species/felinid.yml         |   9 +
 .../Machines/metempsychoticMachine.yml        |   3 -
 .../Entities/Structures/Research/oracle.yml   |   3 -
 .../Structures/Research/sophicscribe.yml      |   2 -
 .../Nyanotrasen/Objectives/traitor.yml        |  23 +
 .../Roles/Jobs/Epistemics/forensicmantis.yml  |  15 +-
 .../Nyanotrasen/Traits/psionics.yml           |   6 -
 .../Prototypes/Nyanotrasen/psionicPowers.yml  |   6 +-
 .../Prototypes/Objectives/objectiveGroups.yml |   1 +
 .../Graphs/clothing/ducky_slippers.yml        |  22 +
 .../Recipes/Construction/clothing.yml         |  11 +
 .../Prototypes/Recipes/Lathes/language.yml    | 190 +++++++
 .../Prototypes/Recipes/Reactions/drinks.yml   |   6 +-
 .../Prototypes/Research/civilianservices.yml  |  40 ++
 .../Roles/Jobs/Science/research_director.yml  |  28 +-
 Resources/Prototypes/Traits/disabilities.yml  |   7 +
 Resources/Prototypes/Wires/layouts.yml        |  20 +
 Resources/Prototypes/tags.yml                 |   3 +
 .../ServerInfo/Guidebook/Engineering/TEG.xml  | 179 ++++++-
 .../Guidebook/Science/ArtifactReports.xml     |   2 +-
 .../Clothing/Ears/Headsets/base.rsi/icon.png  | Bin 309 -> 387 bytes
 .../Clothing/Ears/Headsets/base.rsi/meta.json |   2 +-
 .../Ears/Headsets/base_syndicate.rsi/icon.png | Bin 288 -> 332 bytes
 .../Headsets/base_syndicate.rsi/meta.json     |   2 +-
 .../Clothing/Ears/Headsets/cargo.rsi/icon.png | Bin 326 -> 402 bytes
 .../Ears/Headsets/cargo.rsi/icon_alt.png      | Bin 516 -> 366 bytes
 .../Ears/Headsets/cargo.rsi/meta.json         |   2 +-
 .../Ears/Headsets/centcom.rsi/icon.png        | Bin 315 -> 307 bytes
 .../Ears/Headsets/centcom.rsi/icon_alt.png    | Bin 469 -> 371 bytes
 .../Ears/Headsets/centcom.rsi/meta.json       |   2 +-
 .../Ears/Headsets/command.rsi/icon.png        | Bin 325 -> 396 bytes
 .../Ears/Headsets/command.rsi/icon_alt.png    | Bin 504 -> 576 bytes
 .../Ears/Headsets/command.rsi/meta.json       |   2 +-
 .../Ears/Headsets/engineering.rsi/icon.png    | Bin 282 -> 405 bytes
 .../Headsets/engineering.rsi/icon_alt.png     | Bin 490 -> 366 bytes
 .../Ears/Headsets/engineering.rsi/meta.json   |   2 +-
 .../Ears/Headsets/freelance.rsi/icon.png      | Bin 799 -> 402 bytes
 .../Ears/Headsets/freelance.rsi/icon_alt.png  | Bin 991 -> 366 bytes
 .../Ears/Headsets/freelance.rsi/meta.json     |   2 +-
 .../Ears/Headsets/medical.rsi/icon.png        | Bin 287 -> 392 bytes
 .../Ears/Headsets/medical.rsi/icon_alt.png    | Bin 469 -> 453 bytes
 .../Ears/Headsets/medical.rsi/meta.json       |   2 +-
 .../Ears/Headsets/medicalscience.rsi/icon.png | Bin 316 -> 418 bytes
 .../Headsets/medicalscience.rsi/meta.json     |   2 +-
 .../Ears/Headsets/mining.rsi/icon.png         | Bin 396 -> 469 bytes
 .../Ears/Headsets/mining.rsi/meta.json        |   2 +-
 .../Ears/Headsets/robotics.rsi/icon.png       | Bin 296 -> 324 bytes
 .../Ears/Headsets/robotics.rsi/meta.json      |   2 +-
 .../Ears/Headsets/science.rsi/icon.png        | Bin 311 -> 396 bytes
 .../Ears/Headsets/science.rsi/icon_alt.png    | Bin 498 -> 361 bytes
 .../Ears/Headsets/science.rsi/meta.json       |   2 +-
 .../Ears/Headsets/security.rsi/icon.png       | Bin 283 -> 408 bytes
 .../Ears/Headsets/security.rsi/icon_alt.png   | Bin 455 -> 570 bytes
 .../Ears/Headsets/security.rsi/meta.json      |   2 +-
 .../Ears/Headsets/service.rsi/icon.png        | Bin 311 -> 418 bytes
 .../Ears/Headsets/service.rsi/meta.json       |   2 +-
 .../Headsets/servicesecurity.rsi/icon.png     | Bin 294 -> 418 bytes
 .../Headsets/servicesecurity.rsi/meta.json    |   2 +-
 .../Ears/Headsets/syndicate.rsi/icon_alt.png  | Bin 485 -> 515 bytes
 .../Ears/Headsets/syndicate.rsi/meta.json     |   2 +-
 .../equipped-MASK-reptilian.png               | Bin 0 -> 442 bytes
 .../Mask/neckgaiterred.rsi/equipped-MASK.png  | Bin 0 -> 409 bytes
 .../Clothing/Mask/neckgaiterred.rsi/icon.png  | Bin 0 -> 307 bytes
 .../Mask/neckgaiterred.rsi/inhand-left.png    | Bin 0 -> 332 bytes
 .../Mask/neckgaiterred.rsi/inhand-right.png   | Bin 0 -> 349 bytes
 .../Clothing/Mask/neckgaiterred.rsi/meta.json |  30 ++
 .../equipped-OUTERCLOTHING.png                | Bin 411 -> 622 bytes
 .../Armor/bulletproof.rsi/icon.png            | Bin 244 -> 236 bytes
 .../Armor/bulletproof.rsi/meta.json           |   2 +-
 .../Armor/riot.rsi/equipped-OUTERCLOTHING.png | Bin 1562 -> 648 bytes
 .../OuterClothing/Armor/riot.rsi/icon.png     | Bin 293 -> 231 bytes
 .../OuterClothing/Armor/riot.rsi/meta.json    |   4 +-
 .../security.rsi/equipped-OUTERCLOTHING.png   | Bin 343 -> 413 bytes
 .../OuterClothing/Armor/security.rsi/icon.png | Bin 252 -> 193 bytes
 .../Armor/security.rsi/meta.json              |   2 +-
 .../equipped-OUTERCLOTHING.png                | Bin 428 -> 484 bytes
 .../Armor/security_slim.rsi/icon.png          | Bin 277 -> 195 bytes
 .../Armor/security_slim.rsi/meta.json         |   2 +-
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9460 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 10509 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9875 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 10492 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9782 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 10959 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9936 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 10546 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 9675 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 10494 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 10740 -> 0 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 8727 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9455 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 8689 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9750 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 8865 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 8433 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9422 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9418 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 9578 bytes
 .../icon.png                                  | Bin
 .../meta.json                                 |   0
 .../Ears/Headsets/prisoner.rsi/icon.png       | Bin 390 -> 317 bytes
 .../Ears/Headsets/prisoner.rsi/meta.json      |   2 +-
 .../Headsets/securitymedical.rsi/icon.png     | Bin 371 -> 408 bytes
 .../Headsets/securitymedical.rsi/meta.json    |   2 +-
 .../Ears/Headsets/service.rsi/icon_alt.png    | Bin 915 -> 576 bytes
 .../Ears/Headsets/service.rsi/meta.json       |   2 +-
 .../syndicate_listening.rsi/icon_alt.png      | Bin 531 -> 515 bytes
 .../syndicate_listening.rsi/meta.json         |   2 +-
 Resources/Textures/Interface/language.png     | Bin 0 -> 739 bytes
 .../Devices/communication.rsi/beacon.png      | Bin 317 -> 447 bytes
 .../Devices/communication.rsi/beacon_dead.png | Bin 253 -> 274 bytes
 .../Devices/communication.rsi/meta.json       |  36 +-
 .../old-radio-inhand-left.png                 | Bin 215 -> 0 bytes
 .../old-radio-inhand-right.png                | Bin 243 -> 0 bytes
 .../Devices/communication.rsi/old-radio.png   | Bin 401 -> 0 bytes
 .../communication.rsi/radio-inhand-left.png   | Bin 311 -> 215 bytes
 .../communication.rsi/radio-inhand-right.png  | Bin 263 -> 243 bytes
 .../Devices/communication.rsi/radio.png       | Bin 536 -> 1365 bytes
 .../Devices/communication.rsi/signaller.png   | Bin 369 -> 456 bytes
 .../communication.rsi/walkietalkie-off.png    | Bin 290 -> 348 bytes
 .../communication.rsi/walkietalkie-on.png     | Bin 116 -> 207 bytes
 .../communication.rsi/walkietalkie.png        | Bin 299 -> 509 bytes
 .../Objects/Devices/jammer.rsi/jammer-on.png  | Bin 0 -> 537 bytes
 .../Objects/Devices/jammer.rsi/jammer.png     | Bin 495 -> 329 bytes
 .../Objects/Devices/jammer.rsi/meta.json      |  16 +-
 .../Objects/Devices/signaller.rsi/meta.json   |   4 +-
 .../Devices/signaller.rsi/signaller.png       | Bin 280 -> 456 bytes
 .../Devices/station_beacon.rsi/blink.png      | Bin 373 -> 447 bytes
 .../Devices/station_beacon.rsi/icon.png       | Bin 302 -> 274 bytes
 .../Devices/station_beacon.rsi/meta.json      |   2 +-
 .../Objects/Devices/translator.rsi/icon.png   | Bin 0 -> 278 bytes
 .../Objects/Devices/translator.rsi/meta.json  |  17 +
 .../Devices/translator.rsi/translator.png     | Bin 0 -> 202 bytes
 .../fire_extinguisher_closed.png              | Bin 429 -> 303 bytes
 .../fire_extinguisher_open.png                | Bin 420 -> 315 bytes
 .../Misc/fire_extinguisher.rsi/meta.json      |   2 +-
 .../Misc/stock_parts.rsi/adv_capacitor.png    | Bin 420 -> 345 bytes
 .../Misc/stock_parts.rsi/adv_scan_module.png  | Bin 927 -> 725 bytes
 .../stock_parts.rsi/advanced_matter_bin.png   | Bin 426 -> 430 bytes
 .../stock_parts.rsi/bluespace_matter_bin.png  | Bin 627 -> 1283 bytes
 .../Misc/stock_parts.rsi/capacitor.png        | Bin 254 -> 391 bytes
 .../Misc/stock_parts.rsi/femto_mani.png       | Bin 589 -> 416 bytes
 .../Misc/stock_parts.rsi/high_micro_laser.png | Bin 278 -> 333 bytes
 .../Misc/stock_parts.rsi/matter_bin.png       | Bin 462 -> 457 bytes
 .../Objects/Misc/stock_parts.rsi/meta.json    |  50 +-
 .../Misc/stock_parts.rsi/micro_laser.png      | Bin 263 -> 357 bytes
 .../Misc/stock_parts.rsi/micro_mani.png       | Bin 366 -> 390 bytes
 .../Misc/stock_parts.rsi/nano_mani.png        | Bin 394 -> 428 bytes
 .../Misc/stock_parts.rsi/pico_mani.png        | Bin 373 -> 404 bytes
 .../stock_parts.rsi/quadratic_capacitor.png   | Bin 729 -> 367 bytes
 .../stock_parts.rsi/quadultra_micro_laser.png | Bin 371 -> 421 bytes
 .../Misc/stock_parts.rsi/scan_module.png      | Bin 491 -> 478 bytes
 .../Misc/stock_parts.rsi/super_capacitor.png  | Bin 419 -> 291 bytes
 .../Misc/stock_parts.rsi/super_matter_bin.png | Bin 397 -> 523 bytes
 .../stock_parts.rsi/super_scan_module.png     | Bin 1182 -> 564 bytes
 .../stock_parts.rsi/triphasic_scan_module.png | Bin 631 -> 770 bytes
 .../ultra_high_micro_laser.png                | Bin 304 -> 389 bytes
 .../Objects/Tools/crowbar.rsi/icon.png        | Bin 174 -> 371 bytes
 .../Objects/Tools/crowbar.rsi/meta.json       |   2 +-
 .../Objects/Tools/crowbar.rsi/red-icon.png    | Bin 200 -> 446 bytes
 .../Objects/Tools/drill.rsi/drill_bolt.png    | Bin 886 -> 702 bytes
 .../Objects/Tools/drill.rsi/drill_screw.png   | Bin 887 -> 691 bytes
 .../Objects/Tools/drill.rsi/meta.json         |   2 +-
 .../Objects/Tools/geiger.rsi/geiger_base.png  | Bin 427 -> 467 bytes
 .../Tools/geiger.rsi/geiger_on_ext.png        | Bin 228 -> 260 bytes
 .../Tools/geiger.rsi/geiger_on_high.png       | Bin 176 -> 218 bytes
 .../Tools/geiger.rsi/geiger_on_idle.png       | Bin 173 -> 218 bytes
 .../Tools/geiger.rsi/geiger_on_low.png        | Bin 176 -> 218 bytes
 .../Tools/geiger.rsi/geiger_on_med.png        | Bin 176 -> 218 bytes
 .../Objects/Tools/geiger.rsi/meta.json        |   2 +-
 .../Tools/hand_labeler.rsi/hand_labeler.png   | Bin 273 -> 479 bytes
 .../Objects/Tools/hand_labeler.rsi/meta.json  |   2 +-
 .../Tools/multitool.rsi/green-unlit.png       | Bin 123 -> 176 bytes
 .../Objects/Tools/multitool.rsi/icon.png      | Bin 359 -> 540 bytes
 .../Objects/Tools/multitool.rsi/meta.json     |   2 +-
 .../Objects/Tools/multitool.rsi/red-unlit.png | Bin 117 -> 175 bytes
 .../Tools/multitool.rsi/yellow-unlit.png      | Bin 121 -> 174 bytes
 .../Textures/Objects/Tools/rcd.rsi/icon.png   | Bin 638 -> 857 bytes
 .../Objects/Tools/screwdriver.rsi/meta.json   |   2 +-
 .../Tools/screwdriver.rsi/screwdriver-map.png | Bin 262 -> 310 bytes
 .../screwdriver-screwybits.png                | Bin 152 -> 225 bytes
 .../Tools/screwdriver.rsi/screwdriver.png     | Bin 227 -> 223 bytes
 .../Objects/Tools/seclite.rsi/meta.json       |   2 +-
 .../Objects/Tools/seclite.rsi/seclite-on.png  | Bin 287 -> 260 bytes
 .../Tools/seclite.rsi/seclite-overlay.png     | Bin 121 -> 279 bytes
 .../Objects/Tools/seclite.rsi/seclite.png     | Bin 286 -> 321 bytes
 .../Objects/Tools/spray_painter.rsi/meta.json |   2 +-
 .../Tools/spray_painter.rsi/spray_painter.png | Bin 518 -> 772 bytes
 .../Objects/Tools/welder.rsi/icon.png         | Bin 290 -> 568 bytes
 .../Objects/Tools/welder.rsi/meta.json        |   2 +-
 .../Objects/Tools/welder.rsi/welder_flame.png | Bin 181 -> 255 bytes
 .../Tools/welder_experimental.rsi/icon.png    | Bin 564 -> 907 bytes
 .../Tools/welder_experimental.rsi/meta.json   |   2 +-
 .../welder_experimental.rsi/welder_flame.png  | Bin 295 -> 247 bytes
 .../Tools/welder_industrial.rsi/icon.png      | Bin 345 -> 462 bytes
 .../Tools/welder_industrial.rsi/meta.json     |   2 +-
 .../welder_industrial.rsi/welder_flame.png    | Bin 296 -> 247 bytes
 .../Tools/welder_industrialadv.rsi/icon.png   | Bin 396 -> 548 bytes
 .../Tools/welder_industrialadv.rsi/meta.json  |   2 +-
 .../welder_industrialadv.rsi/welder_flame.png | Bin 297 -> 247 bytes
 .../wirecutters.rsi/cutters-cutty-thingy.png  | Bin 217 -> 239 bytes
 .../Tools/wirecutters.rsi/cutters-map.png     | Bin 331 -> 411 bytes
 .../Objects/Tools/wirecutters.rsi/cutters.png | Bin 228 -> 231 bytes
 .../Objects/Tools/wirecutters.rsi/meta.json   |   2 +-
 .../Objects/Tools/wrench.rsi/icon.png         | Bin 230 -> 484 bytes
 .../Objects/Tools/wrench.rsi/meta.json        |   2 +-
 .../Weapons/Melee/stunbaton.rsi/meta.json     |   2 +-
 .../Melee/stunbaton.rsi/stunbaton_nocell.png  | Bin 431 -> 253 bytes
 .../Melee/stunbaton.rsi/stunbaton_off.png     | Bin 362 -> 224 bytes
 .../Melee/stunbaton.rsi/stunbaton_on.png      | Bin 1091 -> 1753 bytes
 .../Decoration/banner.rsi/banner.png          | Bin 1577 -> 397 bytes
 .../Decoration/banner.rsi/banner_cargo.png    | Bin 519 -> 415 bytes
 .../banner.rsi/banner_engineering.png         | Bin 724 -> 381 bytes
 .../Decoration/banner.rsi/banner_medical.png  | Bin 428 -> 420 bytes
 .../Decoration/banner.rsi/banner_science.png  | Bin 537 -> 417 bytes
 .../Decoration/banner.rsi/banner_security.png | Bin 742 -> 402 bytes
 .../banner.rsi/banner_syndicate.png           | Bin 569 -> 394 bytes
 .../Decoration/banner.rsi/meta.json           |   2 +-
 .../Doors/secret_door.rsi/assembly.png        | Bin 305 -> 178 bytes
 .../Doors/secret_door.rsi/closed.png          | Bin 171 -> 117 bytes
 .../Doors/secret_door.rsi/closing.png         | Bin 516 -> 563 bytes
 .../Doors/secret_door.rsi/meta.json           |  24 +-
 .../Structures/Doors/secret_door.rsi/open.png | Bin 219 -> 170 bytes
 .../Doors/secret_door.rsi/opening.png         | Bin 530 -> 582 bytes
 .../Furniture/furniture.rsi/meta.json         |   4 +-
 .../Furniture/furniture.rsi/rack.png          | Bin 250 -> 315 bytes
 .../Singularity/collector.rsi/ca-o0.png       | Bin 1477 -> 152 bytes
 .../Singularity/collector.rsi/ca-o1.png       | Bin 1415 -> 149 bytes
 .../Singularity/collector.rsi/ca-o2.png       | Bin 1383 -> 151 bytes
 .../Singularity/collector.rsi/ca-o3.png       | Bin 1421 -> 148 bytes
 .../Singularity/collector.rsi/ca-tank.png     | Bin 2071 -> 198 bytes
 .../Singularity/collector.rsi/ca_active.png   | Bin 10749 -> 3159 bytes
 .../Singularity/collector.rsi/ca_deactive.png | Bin 10791 -> 3131 bytes
 .../Singularity/collector.rsi/ca_off.png      | Bin 2755 -> 990 bytes
 .../Singularity/collector.rsi/ca_on.png       | Bin 3212 -> 1521 bytes
 .../Singularity/collector.rsi/cu.png          | Bin 558 -> 990 bytes
 .../Singularity/collector.rsi/meta.json       |   2 +-
 .../Singularity/collector.rsi/static.png      | Bin 664 -> 1608 bytes
 .../Wallmounts/screen.rsi/meta.json           |   2 +-
 .../Wallmounts/screen.rsi/screen.png          | Bin 266 -> 398 bytes
 .../Walls/reinforced_diagonal.rsi/meta.json   |   2 +-
 .../Walls/reinforced_diagonal.rsi/state0.png  | Bin 666 -> 5943 bytes
 .../Walls/reinforced_diagonal.rsi/state1.png  | Bin 639 -> 5829 bytes
 .../Structures/Walls/shuttle.rsi/meta.json    |  20 +-
 .../Walls/shuttle.rsi/shuttle_construct-0.png | Bin 0 -> 632 bytes
 .../Walls/shuttle.rsi/shuttle_construct-1.png | Bin 0 -> 652 bytes
 .../Walls/shuttle.rsi/shuttle_construct-2.png | Bin 0 -> 689 bytes
 .../Walls/shuttle.rsi/shuttle_construct-3.png | Bin 0 -> 690 bytes
 .../Walls/shuttle.rsi/shuttle_construct-4.png | Bin 0 -> 675 bytes
 .../Walls/shuttle.rsi/shuttle_construct-5.png | Bin 0 -> 671 bytes
 .../Structures/Walls/solid.rsi/full.png       | Bin 547 -> 168 bytes
 .../Structures/Walls/solid.rsi/meta.json      |   2 +-
 .../Walls/solid.rsi/reinf_construct-0.png     | Bin 891 -> 225 bytes
 .../Walls/solid.rsi/reinf_construct-1.png     | Bin 863 -> 266 bytes
 .../Walls/solid.rsi/reinf_construct-2.png     | Bin 956 -> 264 bytes
 .../Walls/solid.rsi/reinf_construct-3.png     | Bin 956 -> 262 bytes
 .../Walls/solid.rsi/reinf_construct-4.png     | Bin 963 -> 265 bytes
 .../Walls/solid.rsi/reinf_construct-5.png     | Bin 1016 -> 258 bytes
 .../Walls/solid.rsi/reinf_over0.png           | Bin 1128 -> 481 bytes
 .../Walls/solid.rsi/reinf_over1.png           | Bin 994 -> 395 bytes
 .../Walls/solid.rsi/reinf_over2.png           | Bin 1128 -> 481 bytes
 .../Walls/solid.rsi/reinf_over3.png           | Bin 994 -> 395 bytes
 .../Walls/solid.rsi/reinf_over4.png           | Bin 991 -> 393 bytes
 .../Walls/solid.rsi/reinf_over5.png           | Bin 880 -> 352 bytes
 .../Walls/solid.rsi/reinf_over6.png           | Bin 991 -> 393 bytes
 .../Walls/solid.rsi/reinf_over7.png           | Bin 763 -> 204 bytes
 .../Structures/Walls/solid.rsi/rgeneric.png   | Bin 864 -> 225 bytes
 .../Structures/Walls/solid.rsi/solid0.png     | Bin 782 -> 391 bytes
 .../Structures/Walls/solid.rsi/solid1.png     | Bin 415 -> 274 bytes
 .../Structures/Walls/solid.rsi/solid2.png     | Bin 782 -> 391 bytes
 .../Structures/Walls/solid.rsi/solid3.png     | Bin 415 -> 274 bytes
 .../Structures/Walls/solid.rsi/solid4.png     | Bin 423 -> 280 bytes
 .../Structures/Walls/solid.rsi/solid5.png     | Bin 448 -> 352 bytes
 .../Structures/Walls/solid.rsi/solid6.png     | Bin 423 -> 280 bytes
 .../Structures/Walls/solid.rsi/solid7.png     | Bin 261 -> 204 bytes
 .../Walls/solid_diagonal.rsi/state0.png       | Bin 316 -> 316 bytes
 .../Walls/solid_diagonal.rsi/state1.png       | Bin 297 -> 292 bytes
 .../Structures/Walls/solid_rust.rsi/full.png  | Bin 2155 -> 2228 bytes
 .../Structures/Walls/solid_rust.rsi/meta.json |   2 +-
 .../solid_rust.rsi/reinf_construct-0.png      | Bin 2293 -> 2248 bytes
 .../solid_rust.rsi/reinf_construct-1.png      | Bin 2303 -> 2272 bytes
 .../solid_rust.rsi/reinf_construct-2.png      | Bin 2340 -> 2269 bytes
 .../solid_rust.rsi/reinf_construct-3.png      | Bin 2339 -> 2272 bytes
 .../solid_rust.rsi/reinf_construct-4.png      | Bin 2372 -> 2268 bytes
 .../solid_rust.rsi/reinf_construct-5.png      | Bin 2381 -> 2265 bytes
 .../Walls/solid_rust.rsi/reinf_over0.png      | Bin 3230 -> 3233 bytes
 .../Walls/solid_rust.rsi/reinf_over1.png      | Bin 2990 -> 3206 bytes
 .../Walls/solid_rust.rsi/reinf_over2.png      | Bin 3230 -> 3233 bytes
 .../Walls/solid_rust.rsi/reinf_over3.png      | Bin 2990 -> 3206 bytes
 .../Walls/solid_rust.rsi/reinf_over4.png      | Bin 2903 -> 3191 bytes
 .../Walls/solid_rust.rsi/reinf_over5.png      | Bin 2908 -> 3128 bytes
 .../Walls/solid_rust.rsi/reinf_over6.png      | Bin 2903 -> 3191 bytes
 .../Walls/solid_rust.rsi/reinf_over7.png      | Bin 2840 -> 3083 bytes
 .../Walls/solid_rust.rsi/rgeneric.png         | Bin 2332 -> 2248 bytes
 .../Walls/solid_rust.rsi/solid0.png           | Bin 2943 -> 3281 bytes
 .../Walls/solid_rust.rsi/solid1.png           | Bin 2638 -> 3147 bytes
 .../Walls/solid_rust.rsi/solid2.png           | Bin 2943 -> 3281 bytes
 .../Walls/solid_rust.rsi/solid3.png           | Bin 2638 -> 3147 bytes
 .../Walls/solid_rust.rsi/solid4.png           | Bin 2554 -> 3156 bytes
 .../Walls/solid_rust.rsi/solid5.png           | Bin 2565 -> 3128 bytes
 .../Walls/solid_rust.rsi/solid6.png           | Bin 2531 -> 3156 bytes
 .../Walls/solid_rust.rsi/solid7.png           | Bin 2495 -> 3083 bytes
 .../Windows/plasma_diagonal.rsi/state0.png    | Bin 15748 -> 729 bytes
 .../Windows/plasma_diagonal.rsi/state1.png    | Bin 15665 -> 704 bytes
 .../Windows/plasma_window.rsi/full.png        | Bin 1597 -> 430 bytes
 .../Windows/plasma_window.rsi/meta.json       |   2 +-
 .../Windows/plasma_window.rsi/pwindow0.png    | Bin 2063 -> 762 bytes
 .../Windows/plasma_window.rsi/pwindow1.png    | Bin 1099 -> 735 bytes
 .../Windows/plasma_window.rsi/pwindow2.png    | Bin 2063 -> 762 bytes
 .../Windows/plasma_window.rsi/pwindow3.png    | Bin 1099 -> 735 bytes
 .../Windows/plasma_window.rsi/pwindow4.png    | Bin 1161 -> 734 bytes
 .../Windows/plasma_window.rsi/pwindow5.png    | Bin 1064 -> 680 bytes
 .../Windows/plasma_window.rsi/pwindow6.png    | Bin 1161 -> 734 bytes
 .../Windows/plasma_window.rsi/pwindow7.png    | Bin 247 -> 270 bytes
 .../reinforced_plasma_diagonal.rsi/state0.png | Bin 15911 -> 764 bytes
 .../reinforced_plasma_diagonal.rsi/state1.png | Bin 15885 -> 737 bytes
 .../reinforced_plasma_window.rsi/full.png     | Bin 2495 -> 443 bytes
 .../reinforced_plasma_window.rsi/meta.json    |   2 +-
 .../rpwindow0.png                             | Bin 2930 -> 776 bytes
 .../rpwindow1.png                             | Bin 1696 -> 877 bytes
 .../rpwindow2.png                             | Bin 2930 -> 776 bytes
 .../rpwindow3.png                             | Bin 1696 -> 877 bytes
 .../rpwindow4.png                             | Bin 1745 -> 874 bytes
 .../rpwindow5.png                             | Bin 1695 -> 721 bytes
 .../rpwindow6.png                             | Bin 1745 -> 874 bytes
 .../rpwindow7.png                             | Bin 910 -> 270 bytes
 .../state0.png                                | Bin 15734 -> 765 bytes
 .../state1.png                                | Bin 15695 -> 739 bytes
 .../reinforced_uranium_window.rsi/full.png    | Bin 2067 -> 452 bytes
 .../reinforced_uranium_window.rsi/meta.json   |  90 ++--
 .../ruwindow0.png                             | Bin 2366 -> 750 bytes
 .../ruwindow1.png                             | Bin 1169 -> 872 bytes
 .../ruwindow2.png                             | Bin 2342 -> 750 bytes
 .../ruwindow3.png                             | Bin 1138 -> 872 bytes
 .../ruwindow4.png                             | Bin 1133 -> 874 bytes
 .../ruwindow5.png                             | Bin 1088 -> 704 bytes
 .../ruwindow6.png                             | Bin 1129 -> 874 bytes
 .../ruwindow7.png                             | Bin 267 -> 270 bytes
 .../Windows/reinforced_window.rsi/full.png    | Bin 2063 -> 437 bytes
 .../Windows/reinforced_window.rsi/meta.json   |   2 +-
 .../reinforced_window.rsi/rwindow0.png        | Bin 2229 -> 758 bytes
 .../reinforced_window.rsi/rwindow1.png        | Bin 1148 -> 620 bytes
 .../reinforced_window.rsi/rwindow2.png        | Bin 2229 -> 758 bytes
 .../reinforced_window.rsi/rwindow3.png        | Bin 1148 -> 620 bytes
 .../reinforced_window.rsi/rwindow4.png        | Bin 1130 -> 615 bytes
 .../reinforced_window.rsi/rwindow5.png        | Bin 1025 -> 706 bytes
 .../reinforced_window.rsi/rwindow6.png        | Bin 1130 -> 615 bytes
 .../reinforced_window.rsi/rwindow7.png        | Bin 272 -> 268 bytes
 .../reinforced_window_diagonal.rsi/state0.png | Bin 16179 -> 768 bytes
 .../reinforced_window_diagonal.rsi/state1.png | Bin 16152 -> 741 bytes
 .../Windows/tinted_window.rsi/full.png        | Bin 9436 -> 387 bytes
 .../Windows/tinted_window.rsi/meta.json       |   2 +-
 .../Windows/tinted_window.rsi/twindow0.png    | Bin 10814 -> 2397 bytes
 .../Windows/tinted_window.rsi/twindow1.png    | Bin 8214 -> 2230 bytes
 .../Windows/tinted_window.rsi/twindow2.png    | Bin 10815 -> 2397 bytes
 .../Windows/tinted_window.rsi/twindow3.png    | Bin 8477 -> 2230 bytes
 .../Windows/tinted_window.rsi/twindow4.png    | Bin 8217 -> 2236 bytes
 .../Windows/tinted_window.rsi/twindow5.png    | Bin 6896 -> 2336 bytes
 .../Windows/tinted_window.rsi/twindow6.png    | Bin 8464 -> 2236 bytes
 .../Windows/tinted_window.rsi/twindow7.png    | Bin 4882 -> 1915 bytes
 .../Windows/uranium_window.rsi/full.png       | Bin 1321 -> 432 bytes
 .../Windows/uranium_window.rsi/meta.json      |  90 ++--
 .../Windows/uranium_window.rsi/uwindow0.png   | Bin 1688 -> 773 bytes
 .../Windows/uranium_window.rsi/uwindow1.png   | Bin 1225 -> 739 bytes
 .../Windows/uranium_window.rsi/uwindow2.png   | Bin 1688 -> 773 bytes
 .../Windows/uranium_window.rsi/uwindow3.png   | Bin 1225 -> 739 bytes
 .../Windows/uranium_window.rsi/uwindow4.png   | Bin 1216 -> 739 bytes
 .../Windows/uranium_window.rsi/uwindow5.png   | Bin 795 -> 664 bytes
 .../Windows/uranium_window.rsi/uwindow6.png   | Bin 1229 -> 739 bytes
 .../Windows/uranium_window.rsi/uwindow7.png   | Bin 297 -> 270 bytes
 .../uranium_window_diagonal.rsi/state0.png    | Bin 15629 -> 729 bytes
 .../uranium_window_diagonal.rsi/state1.png    | Bin 15604 -> 703 bytes
 .../Structures/Windows/window.rsi/full.png    | Bin 1224 -> 427 bytes
 .../Structures/Windows/window.rsi/meta.json   |   2 +-
 .../Structures/Windows/window.rsi/window0.png | Bin 1632 -> 714 bytes
 .../Structures/Windows/window.rsi/window1.png | Bin 1183 -> 518 bytes
 .../Structures/Windows/window.rsi/window2.png | Bin 1632 -> 714 bytes
 .../Structures/Windows/window.rsi/window3.png | Bin 1183 -> 518 bytes
 .../Structures/Windows/window.rsi/window4.png | Bin 1187 -> 523 bytes
 .../Structures/Windows/window.rsi/window5.png | Bin 800 -> 666 bytes
 .../Structures/Windows/window.rsi/window6.png | Bin 1187 -> 523 bytes
 .../Structures/Windows/window.rsi/window7.png | Bin 301 -> 268 bytes
 .../Windows/window_diagonal.rsi/state0.png    | Bin 15988 -> 735 bytes
 .../Windows/window_diagonal.rsi/state1.png    | Bin 15966 -> 702 bytes
 .../cargo_pallets.rsi/cargo_pallet_buy.png    | Bin 551 -> 0 bytes
 .../cargo_pallets.rsi/cargo_pallet_sell.png   | Bin 535 -> 0 bytes
 .../Structures/cargo_pallets.rsi/meta.json    |  17 -
 Resources/engineCommandPerms.yml              |   1 +
 Resources/keybinds.yml                        |   3 +
 Scripts/bat/buildAllDebug.bat                 |   1 +
 Scripts/bat/buildAllRelease.bat               |   1 +
 Scripts/bat/buildAllTools.bat                 |   1 +
 Scripts/sh/buildAllDebug.sh                   |   1 +
 Scripts/sh/buildAllRelease.sh                 |   1 +
 Scripts/sh/buildAllTools.sh                   |   1 +
 Tools/{changelogs => changelog}/changelog.js  |   0
 Tools/{changelogs => changelog}/package.json  |   2 -
 Tools/prtitlecase/index.js                    |  19 -
 Tools/prtitlecase/package.json                |  12 -
 shell.nix                                     |   3 +-
 778 files changed, 6065 insertions(+), 2493 deletions(-)
 delete mode 100644 .github/workflows/prtitlecase.yml
 create mode 100644 BuildChecker/git_helper.py
 create mode 100755 BuildChecker/hooks/post-checkout
 create mode 100755 BuildChecker/hooks/post-merge
 create mode 100644 Content.Client/Language/LanguageMenuWindow.xaml
 create mode 100644 Content.Client/Language/LanguageMenuWindow.xaml.cs
 create mode 100644 Content.Client/Language/Systems/LanguageSystem.cs
 create mode 100644 Content.Client/Language/Systems/TranslatorImplanterSystem.cs
 rename Content.Client/{Psionics/GlimmerMonitor => Nyanotrasen/CartridgeLoader/Cartridges}/GlimmerMonitorUi.cs (92%)
 rename Content.Client/{Psionics/GlimmerMonitor => Nyanotrasen/CartridgeLoader/Cartridges}/GlimmerMonitorUiFragment.xaml (93%)
 rename Content.Client/{Psionics/GlimmerMonitor => Nyanotrasen/CartridgeLoader/Cartridges}/GlimmerMonitorUiFragment.xaml.cs (96%)
 rename Content.Client/{Psionics/Telepathy => Nyanotrasen/Chat}/PsionicChatUpdateSystem.cs (92%)
 rename Content.Client/{ => Nyanotrasen}/Psionics/Glimmer/GlimmerReactiveVisuals.cs (100%)
 rename Content.Client/{Psionics/UserInterface => Nyanotrasen/Psionics/UI}/AcceptPsionicsEUI.cs (100%)
 rename Content.Client/{Psionics/UserInterface => Nyanotrasen/Psionics/UI}/AcceptPsionicsWindow.cs (100%)
 rename Content.Client/{Psionics => Nyanotrasen}/UserInterface/GlimmerGraph.cs (97%)
 rename Content.Client/UserInterface/Screens/{OverlayChatGameScreen.xaml => DefaultGameScreen.xaml} (96%)
 rename Content.Client/UserInterface/Screens/{OverlayChatGameScreen.xaml.cs => DefaultGameScreen.xaml.cs} (94%)
 create mode 100644 Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs
 create mode 100644 Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs
 create mode 100644 Content.Server/Bed/Components/SnoringComponent.cs
 create mode 100644 Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs
 create mode 100644 Content.Server/Language/Commands/ListLanguagesCommand.cs
 create mode 100644 Content.Server/Language/Commands/SayLanguageCommand.cs
 create mode 100644 Content.Server/Language/Commands/SelectLanguageCommand.cs
 create mode 100644 Content.Server/Language/DetermineEntityLanguagesEvent.cs
 create mode 100644 Content.Server/Language/LanguageSystem.Networking.cs
 create mode 100644 Content.Server/Language/LanguageSystem.cs
 create mode 100644 Content.Server/Language/TranslatorImplanterSystem.cs
 create mode 100644 Content.Server/Language/TranslatorSystem.cs
 rename Content.Server/{ => Nyanotrasen/Abilities}/Psionics/Abilities/DispelPowerSystem.cs (83%)
 create mode 100644 Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
 rename Content.Server/{ => Nyanotrasen/Abilities}/Psionics/Abilities/MindSwapPowerSystem.cs (78%)
 rename Content.Server/{ => Nyanotrasen/Abilities}/Psionics/Abilities/MindSwappedComponent.cs (79%)
 rename Content.Server/{ => Nyanotrasen/Abilities}/Psionics/Abilities/NoosphericZapPowerSystem.cs (54%)
 rename Content.Server/{ => Nyanotrasen/Abilities}/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs (57%)
 create mode 100644 Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
 create mode 100644 Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
 create mode 100644 Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
 rename Content.Server/{Psionics/Abilities => Nyanotrasen/Abilities/Psionics}/PsionicAbilitiesSystem.cs (54%)
 rename Content.Server/{Psionics => Nyanotrasen}/Audio/GlimmerSoundComponent.cs (80%)
 rename Content.Server/{Psionics/Telepathy/TelepathyChatSystem.cs => Nyanotrasen/Chat/NyanoChatSystem.cs} (85%)
 rename Content.Server/{Psionics/Telepathy => Nyanotrasen/Chat}/TSayCommand.cs (95%)
 rename Content.Server/{Psionics/Telepathy => Nyanotrasen/Chat}/TelepathicRepeaterComponent.cs (82%)
 create mode 100644 Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs
 create mode 100644 Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs
 rename Content.Server/{ => Nyanotrasen}/Psionics/AcceptPsionicsEui.cs (95%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/AntiPsychicWeaponComponent.cs (100%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/Dreams/DreamSystem.cs (93%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/Glimmer/GlimmerCommands.cs (100%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/Glimmer/GlimmerReactiveSystem.cs (99%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs (94%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs (100%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs (100%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/Invisibility/PsionicInvisibilitySystem.cs (88%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs (95%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs (95%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/Invisibility/PsionicallyInvisibleComponent.cs (100%)
 create mode 100644 Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs
 rename Content.Server/{ => Nyanotrasen}/Psionics/PsionicAwaitingPlayerComponent.cs (100%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/PsionicBonusChanceComponent.cs (100%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/PsionicsCommands.cs (84%)
 rename Content.Server/{ => Nyanotrasen}/Psionics/PsionicsSystem.cs (91%)
 delete mode 100644 Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
 delete mode 100644 Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
 delete mode 100644 Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
 delete mode 100644 Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs
 delete mode 100644 Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
 delete mode 100644 Content.Server/Psionics/PotentialPsionicComponent.cs
 create mode 100644 Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs
 create mode 100644 Content.Shared/Language/Components/LanguageSpeakerComponent.cs
 create mode 100644 Content.Shared/Language/Components/TranslatorImplanterComponent.cs
 create mode 100644 Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs
 create mode 100644 Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs
 create mode 100644 Content.Shared/Language/Components/Translators/HoldsTranslatorComponent.cs
 create mode 100644 Content.Shared/Language/Components/Translators/ImplantedTranslatorComponent.cs
 create mode 100644 Content.Shared/Language/Components/Translators/IntrinsicTranslatorComponent.cs
 create mode 100644 Content.Shared/Language/Components/UniversalLanguageSpeakerComponent.cs
 create mode 100644 Content.Shared/Language/Events/LanguagesSetMessage.cs
 create mode 100644 Content.Shared/Language/Events/LanguagesUpdateEvent.cs
 create mode 100644 Content.Shared/Language/Events/LanguagesUpdatedMessage.cs
 create mode 100644 Content.Shared/Language/Events/RequestLanguagesMessage.cs
 create mode 100644 Content.Shared/Language/LanguagePrototype.cs
 create mode 100644 Content.Shared/Language/Systems/SharedLanguageSystem.cs
 create mode 100644 Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs
 create mode 100644 Content.Shared/Language/Systems/SharedTranslatorSystem.cs
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Abilities/AcceptPsionicsEuiMessage.cs (100%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs (77%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Abilities/Dispel/DispelPowerComponent.cs (79%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Abilities/Dispel/DispellableComponent.cs (69%)
 create mode 100644 Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
 create mode 100644 Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
 create mode 100644 Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs (76%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs (77%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs (71%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs (94%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs (76%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs (79%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs (73%)
 create mode 100644 Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Items/ClothingGrantPsionicPowerComponent.cs (84%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Items/HeadCageComponent.cs (96%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Items/HeadCagedComponent.cs (81%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Items/PsionicItemsSystem.cs (98%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/Items/TinfoilHatComponent.cs (90%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/PsionicComponent.cs (51%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/PsionicInsulationComponent.cs (82%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/PsionicsDisabledComponent.cs (84%)
 rename Content.Shared/{ => Nyanotrasen/Abilities}/Psionics/SharedPsionicAbilitiesSystem.cs (97%)
 create mode 100644 Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs
 delete mode 100644 Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs
 create mode 100644 Content.Shared/Nyanotrasen/Psionics/Events.cs
 rename Content.Shared/{ => Nyanotrasen}/Psionics/Glimmer/GlimmerSystem.cs (98%)
 rename Content.Shared/{ => Nyanotrasen}/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs (100%)
 rename Content.Shared/{ => Nyanotrasen}/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs (100%)
 delete mode 100644 Content.Shared/Physics/FrictionRemoverSystem.cs
 delete mode 100644 Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
 delete mode 100644 Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs
 delete mode 100644 Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
 delete mode 100644 Content.Shared/Psionics/Events.cs
 delete mode 100644 Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs
 create mode 100755 RUN_THIS.py
 delete mode 100644 Resources/Audio/Effects/beep_landmine.ogg
 delete mode 100644 Resources/Audio/Nyanotrasen/heartbeat_fast.ogg
 create mode 100644 Resources/Locale/en-US/language/commands.ftl
 create mode 100644 Resources/Locale/en-US/language/language-menu.ftl
 create mode 100644 Resources/Locale/en-US/language/languages.ftl
 create mode 100644 Resources/Locale/en-US/language/technologies.ftl
 create mode 100644 Resources/Locale/en-US/language/translator.ftl
 delete mode 100644 Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
 create mode 100644 Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl
 create mode 100644 Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml
 create mode 100644 Resources/Prototypes/Entities/Objects/Devices/translators.yml
 create mode 100644 Resources/Prototypes/Language/languages.yml
 delete mode 100644 Resources/Prototypes/Nyanotrasen/Traits/psionics.yml
 create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml
 create mode 100644 Resources/Prototypes/Recipes/Lathes/language.yml
 create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png
 create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_bishop_cybernetics.rsi => bc_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_bishop_cybernetics.rsi => bc_corpo_jacket.rsi}/meta.json (100%)
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_cybersun.rsi => cs_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_cybersun.rsi => cs_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_discount_dans.rsi => dd_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_discount_dans.rsi => dd_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_einstein_engines.rsi => ee_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_einstein_engines.rsi => ee_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_five_points_armory.rsi => fa_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_five_points_armory.rsi => fa_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_gilthari_exports.rsi => ge_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_gilthari_exports.rsi => ge_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_hephestus_industries.rsi => hi_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_hawkmoon_aquisitions.rsi => hi_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_hawkmoon_aquisitions.rsi => hm_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_hephestus_industries.rsi => hm_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_interdyne.rsi => id_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_interdyne.rsi => id_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_zeng_hu_pharma.rsi => zh_corpo_jacket.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{corpo_jacket_zeng_hu_pharma.rsi => zh_corpo_jacket.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/Interface/language.png
 delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-left.png
 delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-right.png
 delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio.png
 create mode 100644 Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png
 create mode 100644 Resources/Textures/Objects/Devices/translator.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Devices/translator.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Devices/translator.rsi/translator.png
 create mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-0.png
 create mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-1.png
 create mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-2.png
 create mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-3.png
 create mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-4.png
 create mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-5.png
 delete mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png
 delete mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png
 delete mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/meta.json
 rename Tools/{changelogs => changelog}/changelog.js (100%)
 rename Tools/{changelogs => changelog}/package.json (68%)
 delete mode 100644 Tools/prtitlecase/index.js
 delete mode 100644 Tools/prtitlecase/package.json

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 877273d764..a44cac2cd1 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -35,14 +35,14 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          cd "Tools/changelogs"
+          cd "Tools/changelog"
           npm install
         shell: bash
         continue-on-error: true
 
       - name: Generate Changelog
         run: |
-          cd "Tools/changelogs"
+          cd "Tools/changelog"
           node changelog.js
         shell: bash
         continue-on-error: true
diff --git a/.github/workflows/prtitlecase.yml b/.github/workflows/prtitlecase.yml
deleted file mode 100644
index 0c5a38a4e8..0000000000
--- a/.github/workflows/prtitlecase.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: PR Title Case
-on:
-  pull_request_target:
-    types: [opened, edited, synchronize]
-
-env:
-  GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
-  PR_NUMBER: ${{ github.event.pull_request.number }}
-
-jobs:
-  prtitlecase:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Master
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.BOT_TOKEN }}
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18.x
-
-      - name: Install Dependencies
-        run: |
-          cd "Tools/prtitlecase"
-          npm install
-        shell: bash
-
-      - name: Change Title
-        run: |
-          cd "Tools/prtitlecase"
-          node src/index.js
-        shell: bash
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 83bca6f97b..737b90563e 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,12 @@
 {
     "recommendations": [
         "ms-dotnettools.csharp",
-        "editorconfig.editorconfig"
+        "editorconfig.editorconfig",
+        "aaron-bond.better-comments",
+        "tamasfe.even-better-toml",
+        "slava0135.robust-yaml",
+        "slevesque.shader",
+        "macabeus.vscode-fluent",
+        "redhat.vscode-yaml"
     ]
 }
diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj
index d4f9a41254..63d16fa970 100644
--- a/BuildChecker/BuildChecker.csproj
+++ b/BuildChecker/BuildChecker.csproj
@@ -14,6 +14,8 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
 -->
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <Python>python3</Python>
+    <Python Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">py -3</Python>
     <ProjectGuid>{C899FCA4-7037-4E49-ABC2-44DE72487110}</ProjectGuid>
     <TargetFrameworkMoniker>.NETFramework, Version=v4.7.2</TargetFrameworkMoniker>
     <RestorePackages>false</RestorePackages>
@@ -37,7 +39,7 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
     <OutputPath>bin\DebugOpt\</OutputPath>
   </PropertyGroup>
   <Target Name="Build">
-    <Exec Command="git submodule update --init --recursive"/>
+    <Exec Command="$(Python) git_helper.py" CustomErrorRegularExpression="^Error" />
   </Target>
   <Target Name="Rebuild" DependsOnTargets="Build" />
   <Target Name="Clean">
diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py
new file mode 100644
index 0000000000..becd4506e8
--- /dev/null
+++ b/BuildChecker/git_helper.py
@@ -0,0 +1,110 @@
+#!/usr/bin/env python3
+# Installs git hooks, updates them, updates submodules, that kind of thing.
+
+import subprocess
+import sys
+import os
+import shutil
+from pathlib import Path
+from typing import List
+
+SOLUTION_PATH = Path("..") / "SpaceStation14.sln"
+# If this doesn't match the saved version we overwrite them all.
+CURRENT_HOOKS_VERSION = "2"
+QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"
+
+
+def run_command(command: List[str], capture: bool = False) -> subprocess.CompletedProcess:
+    """
+    Runs a command with pretty output.
+    """
+    text = ' '.join(command)
+    if not QUIET:
+        print("$ {}".format(text))
+
+    sys.stdout.flush()
+
+    completed = None
+
+    if capture:
+        completed = subprocess.run(command, cwd="..", stdout=subprocess.PIPE)
+    else:
+        completed = subprocess.run(command, cwd="..")
+
+    if completed.returncode != 0:
+        print("Error: command exited with code {}!".format(completed.returncode))
+
+    return completed
+
+
+def update_submodules():
+    """
+    Updates all submodules.
+    """
+
+    if ('GITHUB_ACTIONS' in os.environ):
+        return
+
+    if os.path.isfile("DISABLE_SUBMODULE_AUTOUPDATE"):
+        return
+
+    if shutil.which("git") is None:
+        raise FileNotFoundError("git not found in PATH")
+
+    # If the status doesn't match, force VS to reload the solution.
+    # status = run_command(["git", "submodule", "status"], capture=True)
+    run_command(["git", "submodule", "update", "--init", "--recursive"])
+    # status2 = run_command(["git", "submodule", "status"], capture=True)
+
+    # Something changed.
+    # if status.stdout != status2.stdout:
+    #     print("Git submodules changed. Reloading solution.")
+    #     reset_solution()
+
+
+def install_hooks():
+    """
+    Installs the necessary git hooks into .git/hooks.
+    """
+
+    # Read version file.
+    if os.path.isfile("INSTALLED_HOOKS_VERSION"):
+        with open("INSTALLED_HOOKS_VERSION", "r") as f:
+            if f.read() == CURRENT_HOOKS_VERSION:
+                if not QUIET:
+                    print("No hooks change detected.")
+                return
+
+    with open("INSTALLED_HOOKS_VERSION", "w") as f:
+        f.write(CURRENT_HOOKS_VERSION)
+
+    print("Hooks need updating.")
+
+    hooks_target_dir = Path("..")/".git"/"hooks"
+    hooks_source_dir = Path("hooks")
+
+    # Clear entire tree since we need to kill deleted files too.
+    for filename in os.listdir(str(hooks_target_dir)):
+        os.remove(str(hooks_target_dir/filename))
+
+    for filename in os.listdir(str(hooks_source_dir)):
+        print("Copying hook {}".format(filename))
+        shutil.copy2(str(hooks_source_dir/filename),
+                        str(hooks_target_dir/filename))
+
+
+def reset_solution():
+    """
+    Force VS to think the solution has been changed to prompt the user to reload it, thus fixing any load errors.
+    """
+
+    with SOLUTION_PATH.open("r") as f:
+        content = f.read()
+
+    with SOLUTION_PATH.open("w") as f:
+        f.write(content)
+
+
+if __name__ == '__main__':
+    install_hooks()
+    update_submodules()
diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout
new file mode 100755
index 0000000000..c5662445c2
--- /dev/null
+++ b/BuildChecker/hooks/post-checkout
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+gitroot=`git rev-parse --show-toplevel`
+
+cd "$gitroot/BuildChecker"
+
+if [[ `uname` == MINGW* || `uname` == CYGWIN* ]]; then
+    # Windows
+    py -3 git_helper.py --quiet
+else
+    # Not Windows, so probably some other Unix thing.
+    python3 git_helper.py --quiet
+fi
diff --git a/BuildChecker/hooks/post-merge b/BuildChecker/hooks/post-merge
new file mode 100755
index 0000000000..85fe61d966
--- /dev/null
+++ b/BuildChecker/hooks/post-merge
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Just call post-checkout since it does the same thing.
+gitroot=`git rev-parse --show-toplevel`
+bash "$gitroot/.git/hooks/post-checkout"
diff --git a/Content.Client/CardboardBox/CardboardBoxSystem.cs b/Content.Client/CardboardBox/CardboardBoxSystem.cs
index 50f9de239d..90a21d8e41 100644
--- a/Content.Client/CardboardBox/CardboardBoxSystem.cs
+++ b/Content.Client/CardboardBox/CardboardBoxSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Shared.CardboardBox;
 using Content.Shared.CardboardBox.Components;
 using Content.Shared.Examine;
@@ -11,6 +11,7 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly ExamineSystemShared _examine = default!;
 
     public override void Initialize()
     {
@@ -55,7 +56,7 @@ private void OnBoxEffect(PlayBoxEffectMessage msg)
         foreach (var mob in mobMoverEntities)
         {
             var mapPos = _transform.GetMapCoordinates(mob);
-            if (!ExamineSystemShared.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null))
+            if (!_examine.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null))
                 continue;
 
             var ent = Spawn(box.Effect, mapPos);
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index baf0d31f1f..e60335bc45 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -93,7 +93,7 @@ public void PopulateProducts()
                 if (search.Length == 0 && _category == null ||
                     search.Length != 0 && prototype.Name.ToLowerInvariant().Contains(search) ||
                     search.Length != 0 && prototype.Description.ToLowerInvariant().Contains(search) ||
-                    search.Length == 0 && _category != null && prototype.Category.Equals(_category))
+                    search.Length == 0 && _category != null && Loc.GetString(prototype.Category).Equals(_category))
                 {
                     var button = new CargoProductRow
                     {
@@ -122,7 +122,7 @@ public void PopulateCategories()
 
             foreach (var prototype in ProductPrototypes)
             {
-                if (!_categoryStrings.Contains(prototype.Category))
+                if (!_categoryStrings.Contains(Loc.GetString(prototype.Category)))
                 {
                     _categoryStrings.Add(Loc.GetString(prototype.Category));
                 }
diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs
index ae1724c3bf..66000a8457 100644
--- a/Content.Client/Construction/ConstructionSystem.cs
+++ b/Content.Client/Construction/ConstructionSystem.cs
@@ -27,6 +27,7 @@ public sealed class ConstructionSystem : SharedConstructionSystem
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
 
         private readonly Dictionary<int, EntityUid> _ghosts = new();
@@ -195,7 +196,7 @@ public bool TrySpawnGhost(
                 return false;
 
             // This InRangeUnobstructed should probably be replaced with "is there something blocking us in that tile?"
-            var predicate = GetPredicate(prototype.CanBuildInImpassable, loc.ToMap(EntityManager));
+            var predicate = GetPredicate(prototype.CanBuildInImpassable, loc.ToMap(EntityManager, _transformSystem));
             if (!_interactionSystem.InRangeUnobstructed(user, loc, 20f, predicate: predicate))
                 return false;
 
diff --git a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
index ae1b3ec3bf..a60619baa3 100644
--- a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
+++ b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
@@ -170,7 +170,7 @@ private bool HandleOpenEntityMenu(in PointerInputCmdHandler.PointerInputCmdArgs
             if (_combatMode.IsInCombatMode(args.Session?.AttachedEntity))
                 return false;
 
-            var coords = args.Coordinates.ToMap(_entityManager);
+            var coords = args.Coordinates.ToMap(_entityManager, _xform);
 
             if (_verbSystem.TryGetEntityMenuEntities(coords, out var entities))
                 OpenRootMenu(entities);
diff --git a/Content.Client/Gameplay/GameplayState.cs b/Content.Client/Gameplay/GameplayState.cs
index 2ea16521e8..1efee978f3 100644
--- a/Content.Client/Gameplay/GameplayState.cs
+++ b/Content.Client/Gameplay/GameplayState.cs
@@ -93,17 +93,17 @@ private void LoadMainScreen()
             var screenTypeString = _configurationManager.GetCVar(CCVars.UILayout);
             if (!Enum.TryParse(screenTypeString, out ScreenType screenType))
             {
-                screenType = ScreenType.Separated;
+                screenType = default;
             }
 
             switch (screenType)
             {
+                case ScreenType.Default:
+                    _uiManager.LoadScreen<DefaultGameScreen>();
+                    break;
                 case ScreenType.Separated:
                     _uiManager.LoadScreen<SeparatedChatGameScreen>();
                     break;
-                case ScreenType.Overlay:
-                    _uiManager.LoadScreen<OverlayChatGameScreen>();
-                    break;
             }
 
             _loadController.LoadScreen();
diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs
index bdbd69d108..6236cd8e95 100644
--- a/Content.Client/Gameplay/GameplayStateBase.cs
+++ b/Content.Client/Gameplay/GameplayStateBase.cs
@@ -104,7 +104,7 @@ private bool HandleInspect(ICommonSession? session, EntityCoordinates coords, En
 
         public IEnumerable<EntityUid> GetClickableEntities(EntityCoordinates coordinates)
         {
-            return GetClickableEntities(coordinates.ToMap(_entityManager));
+            return GetClickableEntities(coordinates.ToMap(_entityManager, _entitySystemManager.GetEntitySystem<SharedTransformSystem>()));
         }
 
         public IEnumerable<EntityUid> GetClickableEntities(MapCoordinates coordinates)
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index 03f4f3f38b..fa63193810 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -55,6 +55,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.UseItemInHand);
             human.AddFunction(ContentKeyFunctions.AltUseItemInHand);
             human.AddFunction(ContentKeyFunctions.OpenCharacterMenu);
+            human.AddFunction(ContentKeyFunctions.OpenLanguageMenu);
             human.AddFunction(ContentKeyFunctions.ActivateItemInWorld);
             human.AddFunction(ContentKeyFunctions.ThrowItemInHand);
             human.AddFunction(ContentKeyFunctions.AltActivateItemInWorld);
diff --git a/Content.Client/Language/LanguageMenuWindow.xaml b/Content.Client/Language/LanguageMenuWindow.xaml
new file mode 100644
index 0000000000..ff33a6ddf5
--- /dev/null
+++ b/Content.Client/Language/LanguageMenuWindow.xaml
@@ -0,0 +1,18 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+               Title="{Loc language-menu-window-title}"
+               SetSize="300 300">
+    <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
+        <PanelContainer Name="CurrentLanguageContainer" Access="Public" StyleClasses="PdaBorderRect">
+            <Label Name="CurrentLanguageLabel" Access="Public" Text="Current Language:" HorizontalExpand="True"></Label>
+        </PanelContainer>
+
+        <ui:HLine></ui:HLine>
+
+        <ScrollContainer HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="False" VScrollEnabled="True" MinHeight="50">
+            <BoxContainer Name="OptionsList" Access="Public" HorizontalExpand="True" SeparationOverride="2" Orientation="Vertical">
+                <!-- The rest here is generated programmatically -->
+            </BoxContainer>
+        </ScrollContainer>
+    </BoxContainer>
+</DefaultWindow>
diff --git a/Content.Client/Language/LanguageMenuWindow.xaml.cs b/Content.Client/Language/LanguageMenuWindow.xaml.cs
new file mode 100644
index 0000000000..312814aca3
--- /dev/null
+++ b/Content.Client/Language/LanguageMenuWindow.xaml.cs
@@ -0,0 +1,134 @@
+using Content.Client.Language.Systems;
+using Content.Shared.Language;
+using Content.Shared.Language.Systems;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Console;
+using Robust.Shared.Utility;
+using Serilog;
+using static Content.Shared.Language.Systems.SharedLanguageSystem;
+
+namespace Content.Client.Language;
+
+[GenerateTypedNameReferences]
+public sealed partial class LanguageMenuWindow : DefaultWindow
+{
+    private readonly LanguageSystem _clientLanguageSystem;
+    private readonly List<EntryState> _entries = new();
+
+
+    public LanguageMenuWindow()
+    {
+        RobustXamlLoader.Load(this);
+        _clientLanguageSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
+    }
+
+    protected override void Opened()
+    {
+        // Refresh the window when it gets opened.
+        // This actually causes two refreshes: one immediately, and one after the server sends a state message.
+        UpdateState(_clientLanguageSystem.CurrentLanguage, _clientLanguageSystem.SpokenLanguages);
+        _clientLanguageSystem.RequestStateUpdate();
+    }
+
+
+    public void UpdateState(string currentLanguage, List<string> spokenLanguages)
+    {
+        var langName = Loc.GetString($"language-{currentLanguage}-name");
+        CurrentLanguageLabel.Text = Loc.GetString("language-menu-current-language", ("language", langName));
+
+        OptionsList.RemoveAllChildren();
+        _entries.Clear();
+
+        foreach (var language in spokenLanguages)
+        {
+            AddLanguageEntry(language);
+        }
+
+        // Disable the button for the currently chosen language
+        foreach (var entry in _entries)
+        {
+            if (entry.button != null)
+                entry.button.Disabled = entry.language == currentLanguage;
+        }
+    }
+
+    private void AddLanguageEntry(string language)
+    {
+        var proto = _clientLanguageSystem.GetLanguagePrototype(language);
+        var state = new EntryState { language = language };
+
+        var container = new BoxContainer { Orientation = BoxContainer.LayoutOrientation.Vertical };
+
+        #region Header
+        var header = new BoxContainer
+        {
+            Orientation = BoxContainer.LayoutOrientation.Horizontal,
+            HorizontalExpand = true,
+            SeparationOverride = 2
+        };
+
+        var name = new Label
+        {
+            Text = proto?.Name ?? Loc.GetString("generic-error"),
+            MinWidth = 50,
+            HorizontalExpand = true
+        };
+
+        var button = new Button { Text = "Choose" };
+        button.OnPressed += _ => OnLanguageChosen(language);
+        state.button = button;
+
+        header.AddChild(name);
+        header.AddChild(button);
+
+        container.AddChild(header);
+        #endregion
+
+        #region Collapsible description
+        var body = new CollapsibleBody
+        {
+            HorizontalExpand = true,
+            Margin = new Thickness(4f, 4f)
+        };
+
+        var description = new RichTextLabel { HorizontalExpand = true };
+        description.SetMessage(proto?.Description ?? Loc.GetString("generic-error"));
+        body.AddChild(description);
+
+        var collapser = new Collapsible(Loc.GetString("language-menu-description-header"), body)
+        {
+            Orientation = BoxContainer.LayoutOrientation.Vertical,
+            HorizontalExpand = true
+        };
+
+        container.AddChild(collapser);
+        #endregion
+
+        // Before adding, wrap the new container in a PanelContainer to give it a distinct look
+        var wrapper = new PanelContainer();
+        wrapper.StyleClasses.Add("PdaBorderRect");
+
+        wrapper.AddChild(container);
+        OptionsList.AddChild(wrapper);
+
+        _entries.Add(state);
+    }
+
+
+    private void OnLanguageChosen(string id)
+    {
+        var proto = _clientLanguageSystem.GetLanguagePrototype(id);
+        if (proto != null)
+            _clientLanguageSystem.RequestSetLanguage(proto);
+    }
+
+
+    private struct EntryState
+    {
+        public string language;
+        public Button? button;
+    }
+}
diff --git a/Content.Client/Language/Systems/LanguageSystem.cs b/Content.Client/Language/Systems/LanguageSystem.cs
new file mode 100644
index 0000000000..9714078b2c
--- /dev/null
+++ b/Content.Client/Language/Systems/LanguageSystem.cs
@@ -0,0 +1,76 @@
+using Content.Shared.Language;
+using Content.Shared.Language.Events;
+using Content.Shared.Language.Systems;
+using Robust.Client;
+using Robust.Shared.Console;
+
+namespace Content.Client.Language.Systems;
+
+/// <summary>
+///   Client-side language system.
+/// </summary>
+/// <remarks>
+///   Unlike the server, the client is not aware of other entities' languages; it's only notified about the entity that it posesses.
+///   Due to that, this system stores such information in a static manner.
+/// </remarks>
+public sealed class LanguageSystem : SharedLanguageSystem
+{
+    [Dependency] private readonly IBaseClient _client = default!;
+
+    /// <summary>
+    ///   The current language of the entity currently possessed by the player.
+    /// </summary>
+    public string CurrentLanguage { get; private set; } = default!;
+    /// <summary>
+    ///   The list of languages the currently possessed entity can speak.
+    /// </summary>
+    public List<string> SpokenLanguages { get; private set; } = new();
+    /// <summary>
+    ///   The list of languages the currently possessed entity can understand.
+    /// </summary>
+    public List<string> UnderstoodLanguages { get; private set; } = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeNetworkEvent<LanguagesUpdatedMessage>(OnLanguagesUpdated);
+        _client.RunLevelChanged += OnRunLevelChanged;
+    }
+
+    private void OnLanguagesUpdated(LanguagesUpdatedMessage message)
+    {
+        CurrentLanguage = message.CurrentLanguage;
+        SpokenLanguages = message.Spoken;
+        UnderstoodLanguages = message.Understood;
+    }
+
+    private void OnRunLevelChanged(object? sender, RunLevelChangedEventArgs args)
+    {
+        // Request an update when entering a game
+        if (args.NewLevel == ClientRunLevel.InGame)
+            RequestStateUpdate();
+    }
+
+    /// <summary>
+    ///   Sends a network request to the server to update this system's state.
+    ///   The server may ignore the said request if the player is not possessing an entity.
+    /// </summary>
+    public void RequestStateUpdate()
+    {
+        RaiseNetworkEvent(new RequestLanguagesMessage());
+    }
+
+    public void RequestSetLanguage(LanguagePrototype language)
+    {
+        if (language.ID == CurrentLanguage)
+            return;
+
+        RaiseNetworkEvent(new LanguagesSetMessage(language.ID));
+
+        // May cause some minor desync...
+        // So to reduce the probability of desync, we replicate the change locally too
+        if (SpokenLanguages.Contains(language.ID))
+            CurrentLanguage = language.ID;
+    }
+}
diff --git a/Content.Client/Language/Systems/TranslatorImplanterSystem.cs b/Content.Client/Language/Systems/TranslatorImplanterSystem.cs
new file mode 100644
index 0000000000..da19b3decf
--- /dev/null
+++ b/Content.Client/Language/Systems/TranslatorImplanterSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Language.Systems;
+
+namespace Content.Client.Language.Systems;
+
+public sealed class TranslatorImplanterSystem : SharedTranslatorImplanterSystem
+{
+
+}
diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs
index 548edd601c..7bf3df1f0b 100644
--- a/Content.Client/NPC/PathfindingSystem.cs
+++ b/Content.Client/NPC/PathfindingSystem.cs
@@ -23,6 +23,7 @@ public sealed class PathfindingSystem : SharedPathfindingSystem
         [Dependency] private readonly IResourceCache _cache = default!;
         [Dependency] private readonly NPCSteeringSystem _steering = default!;
         [Dependency] private readonly MapSystem _mapSystem = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
         public PathfindingDebugMode Modes
         {
@@ -39,7 +40,7 @@ public PathfindingDebugMode Modes
                 }
                 else if (!overlayManager.HasOverlay<PathfindingOverlay>())
                 {
-                    overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem));
+                    overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem, _transformSystem));
                 }
 
                 if ((value & PathfindingDebugMode.Steering) != 0x0)
@@ -140,6 +141,7 @@ public sealed class PathfindingOverlay : Overlay
         private readonly IMapManager _mapManager;
         private readonly PathfindingSystem _system;
         private readonly MapSystem _mapSystem;
+        private readonly SharedTransformSystem _transformSystem;
 
         public override OverlaySpace Space => OverlaySpace.ScreenSpace | OverlaySpace.WorldSpace;
 
@@ -153,7 +155,8 @@ public PathfindingOverlay(
             IMapManager mapManager,
             IResourceCache cache,
             PathfindingSystem system,
-            MapSystem mapSystem)
+            MapSystem mapSystem,
+            SharedTransformSystem transformSystem)
         {
             _entManager = entManager;
             _eyeManager = eyeManager;
@@ -161,6 +164,7 @@ public PathfindingOverlay(
             _mapManager = mapManager;
             _system = system;
             _mapSystem = mapSystem;
+            _transformSystem = transformSystem;
             _font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
         }
 
@@ -480,7 +484,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
                                     if (neighborPoly.NetEntity != poly.GraphUid)
                                     {
                                         color = Color.Green;
-                                        var neighborMap = _entManager.GetCoordinates(neighborPoly).ToMap(_entManager);
+                                        var neighborMap = _entManager.GetCoordinates(neighborPoly).ToMap(_entManager, _transformSystem);
 
                                         if (neighborMap.MapId != args.MapId)
                                             continue;
diff --git a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs b/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
similarity index 92%
rename from Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs
rename to Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
index 0d8accb9f8..0b5fc7ad38 100644
--- a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs
+++ b/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
@@ -1,11 +1,10 @@
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
-using Content.Client.Psionics.UI;
 using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Content.Shared.CartridgeLoader;
 
-namespace Content.Client.Psionics.GlimmerMonitor;
+namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
 
 public sealed partial class GlimmerMonitorUi : UIFragment
 {
diff --git a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml b/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
similarity index 93%
rename from Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml
rename to Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
index 3044680e27..119a1831e6 100644
--- a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml
+++ b/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
@@ -1,4 +1,4 @@
-<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Psionics.GlimmerMonitor"
+<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Nyanotrasen.CartridgeLoader.Cartridges"
                                  xmlns="https://spacestation14.io" Margin="1 0 2 0">
     <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
     <BoxContainer Name="SettingsBox" Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="False">
diff --git a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs b/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
similarity index 96%
rename from Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs
rename to Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
index 58bbee38a2..43d9202aa4 100644
--- a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs
+++ b/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Numerics;
-using Content.Client.Psionics.UI;
+using Content.Client.Nyanotrasen.UserInterface;
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Psionics.GlimmerMonitor;
+namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
 
 [GenerateTypedNameReferences]
 public sealed partial class GlimmerMonitorUiFragment : BoxContainer
diff --git a/Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs b/Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs
similarity index 92%
rename from Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs
rename to Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs
index 7bb88764a1..84602052fe 100644
--- a/Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs
+++ b/Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs
@@ -1,8 +1,8 @@
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Client.Chat.Managers;
 using Robust.Client.Player;
 
-namespace Content.Client.Psionics.Chat
+namespace Content.Client.Nyanotrasen.Chat
 {
     public sealed class PsionicChatUpdateSystem : EntitySystem
     {
diff --git a/Content.Client/Psionics/Glimmer/GlimmerReactiveVisuals.cs b/Content.Client/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveVisuals.cs
similarity index 100%
rename from Content.Client/Psionics/Glimmer/GlimmerReactiveVisuals.cs
rename to Content.Client/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveVisuals.cs
diff --git a/Content.Client/Psionics/UserInterface/AcceptPsionicsEUI.cs b/Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsEUI.cs
similarity index 100%
rename from Content.Client/Psionics/UserInterface/AcceptPsionicsEUI.cs
rename to Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsEUI.cs
diff --git a/Content.Client/Psionics/UserInterface/AcceptPsionicsWindow.cs b/Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsWindow.cs
similarity index 100%
rename from Content.Client/Psionics/UserInterface/AcceptPsionicsWindow.cs
rename to Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsWindow.cs
diff --git a/Content.Client/Psionics/UserInterface/GlimmerGraph.cs b/Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs
similarity index 97%
rename from Content.Client/Psionics/UserInterface/GlimmerGraph.cs
rename to Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs
index 111c810acb..c4a9109dcd 100644
--- a/Content.Client/Psionics/UserInterface/GlimmerGraph.cs
+++ b/Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs
@@ -4,7 +4,7 @@
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.Psionics.UI;
+namespace Content.Client.Nyanotrasen.UserInterface;
 
 public sealed class GlimmerGraph : Control
 {
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index f0537079b9..49e8099e0f 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -212,6 +212,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.OpenCraftingMenu);
             AddButton(ContentKeyFunctions.OpenGuidebook);
             AddButton(ContentKeyFunctions.OpenInventoryMenu);
+            AddButton(ContentKeyFunctions.OpenLanguageMenu);
             AddButton(ContentKeyFunctions.OpenAHelp);
             AddButton(ContentKeyFunctions.OpenActionsMenu);
             AddButton(ContentKeyFunctions.OpenEntitySpawnWindow);
diff --git a/Content.Client/Popups/PopupOverlay.cs b/Content.Client/Popups/PopupOverlay.cs
index 1305d8bb94..fb6bb3bf56 100644
--- a/Content.Client/Popups/PopupOverlay.cs
+++ b/Content.Client/Popups/PopupOverlay.cs
@@ -21,7 +21,8 @@ public sealed class PopupOverlay : Overlay
     private readonly IUserInterfaceManager _uiManager;
     private readonly PopupSystem _popup;
     private readonly PopupUIController _controller;
-
+    private readonly ExamineSystemShared _examine;
+    private readonly SharedTransformSystem _transform;
     private readonly ShaderInstance _shader;
 
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
@@ -33,12 +34,16 @@ public PopupOverlay(
         IPrototypeManager protoManager,
         IUserInterfaceManager uiManager,
         PopupUIController controller,
+        ExamineSystemShared examine,
+        SharedTransformSystem transform,
         PopupSystem popup)
     {
         _configManager = configManager;
         _entManager = entManager;
         _playerMgr = playerMgr;
         _uiManager = uiManager;
+        _examine = examine;
+        _transform = transform;
         _popup = popup;
         _controller = controller;
 
@@ -73,7 +78,7 @@ private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, fl
 
         foreach (var popup in _popup.WorldLabels)
         {
-            var mapPos = popup.InitialPos.ToMap(_entManager);
+            var mapPos = popup.InitialPos.ToMap(_entManager, _transform);
 
             if (mapPos.MapId != args.MapId)
                 continue;
@@ -81,7 +86,7 @@ private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, fl
             var distance = (mapPos.Position - args.WorldBounds.Center).Length();
 
             // Should handle fade here too wyci.
-            if (!args.WorldBounds.Contains(mapPos.Position) || !ExamineSystemShared.InRangeUnOccluded(viewPos, mapPos, distance,
+            if (!args.WorldBounds.Contains(mapPos.Position) || !_examine.InRangeUnOccluded(viewPos, mapPos, distance,
                     e => e == popup.InitialPos.EntityId || e == ourEntity, entMan: _entManager))
                 continue;
 
diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index cf96c41241..479fb02906 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared.Examine;
 using Content.Shared.GameTicking;
 using Content.Shared.Popups;
 using Robust.Client.Graphics;
@@ -26,6 +27,8 @@ public sealed class PopupSystem : SharedPopupSystem
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
         [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         public IReadOnlyList<WorldPopupLabel> WorldLabels => _aliveWorldLabels;
         public IReadOnlyList<CursorPopupLabel> CursorLabels => _aliveCursorLabels;
@@ -51,6 +54,8 @@ public override void Initialize()
                     _prototype,
                     _uiManager,
                     _uiManager.GetUIController<PopupUIController>(),
+                    _examine,
+                    _transform,
                     this));
         }
 
diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
index adc535b268..9012767ef3 100644
--- a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
+++ b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
@@ -121,7 +121,10 @@ private void RadiationQuery(IEye? currentEye)
 
         private bool PulseQualifies(EntityUid pulseEntity, MapCoordinates currentEyeLoc)
         {
-            return _entityManager.GetComponent<TransformComponent>(pulseEntity).MapID == currentEyeLoc.MapId && _entityManager.GetComponent<TransformComponent>(pulseEntity).Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, _entityManager.GetComponent<TransformComponent>(pulseEntity).ParentUid, currentEyeLoc), MaxDist);
+            var transformComponent = _entityManager.GetComponent<TransformComponent>(pulseEntity);
+            var transformSystem = _entityManager.System<SharedTransformSystem>();
+            return transformComponent.MapID == currentEyeLoc.MapId
+                && transformComponent.Coordinates.InRange(_entityManager, transformSystem, EntityCoordinates.FromMap(transformComponent.ParentUid, currentEyeLoc, transformSystem, _entityManager), MaxDist);
         }
 
         private sealed record RadiationShaderInstance(MapCoordinates CurrentMapCoords, float Range, TimeSpan Start, float Duration)
diff --git a/Content.Client/Sandbox/SandboxSystem.cs b/Content.Client/Sandbox/SandboxSystem.cs
index d16751e371..6a1129bb75 100644
--- a/Content.Client/Sandbox/SandboxSystem.cs
+++ b/Content.Client/Sandbox/SandboxSystem.cs
@@ -16,6 +16,7 @@ public sealed class SandboxSystem : SharedSandboxSystem
         [Dependency] private readonly IMapManager _map = default!;
         [Dependency] private readonly IPlacementManager _placement = default!;
         [Dependency] private readonly ContentEyeSystem _contentEye = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         private bool _sandboxEnabled;
         public bool SandboxAllowed { get; private set; }
@@ -108,7 +109,7 @@ public bool Copy(ICommonSession? session, EntityCoordinates coords, EntityUid ui
             }
 
             // Try copy tile.
-            if (!_map.TryFindGridAt(coords.ToMap(EntityManager), out _, out var grid) || !grid.TryGetTileRef(coords, out var tileRef))
+            if (!_map.TryFindGridAt(coords.ToMap(EntityManager, _transform), out _, out var grid) || !grid.TryGetTileRef(coords, out var tileRef))
                 return false;
 
             if (_placement.Eraser)
diff --git a/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
similarity index 96%
rename from Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
rename to Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
index 4ba820b339..54aeffe72c 100644
--- a/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
+++ b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
@@ -1,4 +1,4 @@
-<screens:OverlayChatGameScreen
+<screens:DefaultGameScreen
     xmlns="https://spacestation14.io"
     xmlns:screens="clr-namespace:Content.Client.UserInterface.Screens"
     xmlns:menuBar="clr-namespace:Content.Client.UserInterface.Systems.MenuBar.Widgets"
@@ -30,4 +30,4 @@
     <hotbar:HotbarGui Name="Hotbar" Access="Protected" />
     <chat:ResizableChatBox Name="Chat" Access="Protected" />
     <alerts:AlertsUI Name="Alerts" Access="Protected" />
-</screens:OverlayChatGameScreen>
+</screens:DefaultGameScreen>
diff --git a/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
similarity index 94%
rename from Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs
rename to Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
index c45ec9d4a0..0fb1b7d507 100644
--- a/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
@@ -6,9 +6,9 @@
 namespace Content.Client.UserInterface.Screens;
 
 [GenerateTypedNameReferences]
-public sealed partial class OverlayChatGameScreen : InGameScreen
+public sealed partial class DefaultGameScreen : InGameScreen
 {
-    public OverlayChatGameScreen()
+    public DefaultGameScreen()
     {
         RobustXamlLoader.Load(this);
 
diff --git a/Content.Client/UserInterface/Screens/ScreenType.cs b/Content.Client/UserInterface/Screens/ScreenType.cs
index 039cd7b128..595dc79556 100644
--- a/Content.Client/UserInterface/Screens/ScreenType.cs
+++ b/Content.Client/UserInterface/Screens/ScreenType.cs
@@ -3,11 +3,11 @@ namespace Content.Client.UserInterface.Screens;
 public enum ScreenType
 {
     /// <summary>
-    ///     The classic SS13 user interface.
+    ///     The modern SS14 user interface.
     /// </summary>
-    Separated,
+    Default,
     /// <summary>
-    ///     The temporary SS14 user interface.
+    ///     The classic SS13 user interface.
     /// </summary>
-    Overlay,
+    Separated
 }
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index ecc57561cd..0ad78f974e 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -20,6 +20,7 @@
 using Content.Shared.Examine;
 using Content.Shared.Input;
 using Content.Shared.Radio;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
@@ -36,7 +37,7 @@
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Client.Psionics.Chat;
+using Content.Client.Nyanotrasen.Chat; //Nyano - Summary: chat namespace.
 
 namespace Content.Client.UserInterface.Systems.Chat;
 
@@ -60,7 +61,7 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly GhostSystem? _ghost = default;
     [UISystemDependency] private readonly TypingIndicatorSystem? _typingIndicator = default;
     [UISystemDependency] private readonly ChatSystem? _chatSys = default;
-    [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //EE - Summary: makes the psionic chat available.
+    [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //Nyano - Summary: makes the psionic chat available.
 
     [ValidatePrototypeId<ColorPalettePrototype>]
     private const string ChatNamePalette = "ChatNames";
@@ -81,7 +82,7 @@ public sealed class ChatUIController : UIController
         {SharedChatSystem.AdminPrefix, ChatSelectChannel.Admin},
         {SharedChatSystem.RadioCommonPrefix, ChatSelectChannel.Radio},
         {SharedChatSystem.DeadPrefix, ChatSelectChannel.Dead},
-        {SharedChatSystem.TelepathicPrefix, ChatSelectChannel.Telepathic} //EE - Summary: adds the telepathic prefix =.
+        {SharedChatSystem.TelepathicPrefix, ChatSelectChannel.Telepathic} //Nyano - Summary: adds the telepathic prefix =.
     };
 
     public static readonly Dictionary<ChatSelectChannel, char> ChannelPrefixes = new()
@@ -95,7 +96,7 @@ public sealed class ChatUIController : UIController
         {ChatSelectChannel.Admin, SharedChatSystem.AdminPrefix},
         {ChatSelectChannel.Radio, SharedChatSystem.RadioCommonPrefix},
         {ChatSelectChannel.Dead, SharedChatSystem.DeadPrefix},
-        {ChatSelectChannel.Telepathic, SharedChatSystem.TelepathicPrefix } //EE - Summary: associates telepathic with =.
+        {ChatSelectChannel.Telepathic, SharedChatSystem.TelepathicPrefix } //Nyano - Summary: associates telepathic with =.
     };
 
     /// <summary>
@@ -263,16 +264,16 @@ public void SetMainChat(bool setting)
 
         switch (UIManager.ActiveScreen)
         {
+            case DefaultGameScreen defaultScreen:
+                chatBox = defaultScreen.ChatBox;
+                chatSizeRaw = _config.GetCVar(CCVars.DefaultScreenChatSize);
+                SetChatSizing(chatSizeRaw, defaultScreen, setting);
+                break;
             case SeparatedChatGameScreen separatedScreen:
                 chatBox = separatedScreen.ChatBox;
                 chatSizeRaw = _config.GetCVar(CCVars.SeparatedScreenChatSize);
                 SetChatSizing(chatSizeRaw, separatedScreen, setting);
                 break;
-            case OverlayChatGameScreen overlayScreen:
-                chatBox = overlayScreen.ChatBox;
-                chatSizeRaw = _config.GetCVar(CCVars.OverlayScreenChatSize);
-                SetChatSizing(chatSizeRaw, overlayScreen, setting);
-                break;
             default:
                 // this could be better?
                 var maybeChat = UIManager.ActiveScreen.GetWidget<ChatBox>();
@@ -321,12 +322,12 @@ private void StoreChatSize(Vector2 size)
             $"{size.X.ToString(CultureInfo.InvariantCulture)},{size.Y.ToString(CultureInfo.InvariantCulture)}";
         switch (UIManager.ActiveScreen)
         {
+            case DefaultGameScreen _:
+                _config.SetCVar(CCVars.DefaultScreenChatSize, stringSize);
+                break;
             case SeparatedChatGameScreen _:
                 _config.SetCVar(CCVars.SeparatedScreenChatSize, stringSize);
                 break;
-            case OverlayChatGameScreen _:
-                _config.SetCVar(CCVars.OverlayScreenChatSize, stringSize);
-                break;
             default:
                 // do nothing
                 return;
@@ -626,7 +627,7 @@ private void UpdateQueuedSpeechBubbles(FrameEventArgs delta)
 
             var otherPos = EntityManager.GetComponent<TransformComponent>(ent).MapPosition;
 
-            if (occluded && !ExamineSystemShared.InRangeUnOccluded(
+            if (occluded && !_examine.InRangeUnOccluded(
                     playerPos,
                     otherPos, 0f,
                     (ent, player), predicate))
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs
index 843fd46c1a..31a3f11b19 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Chat;
 using Content.Shared.Input;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.UserInterface.Systems.Chat.Controls;
diff --git a/Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs b/Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs
new file mode 100644
index 0000000000..f36521ce81
--- /dev/null
+++ b/Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs
@@ -0,0 +1,89 @@
+using Content.Client.Language;
+using Content.Client.Gameplay;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Input;
+using Content.Shared.Language.Events;
+using Robust.Client.UserInterface.Controllers;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BaseButton;
+using JetBrains.Annotations;
+
+namespace Content.Client.UserInterface.Systems.Language;
+
+[UsedImplicitly]
+public sealed class LanguageMenuUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>
+{
+    public LanguageMenuWindow? LanguageWindow;
+    private MenuButton? LanguageButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.LanguageButton;
+
+    public override void Initialize()
+    {
+        SubscribeNetworkEvent((LanguagesUpdatedMessage message, EntitySessionEventArgs _) =>
+            LanguageWindow?.UpdateState(message.CurrentLanguage, message.Spoken));
+    }
+
+    public void OnStateEntered(GameplayState state)
+    {
+        DebugTools.Assert(LanguageWindow == null);
+
+        LanguageWindow = UIManager.CreateWindow<LanguageMenuWindow>();
+        LayoutContainer.SetAnchorPreset(LanguageWindow, LayoutContainer.LayoutPreset.CenterTop);
+
+        CommandBinds.Builder.Bind(ContentKeyFunctions.OpenLanguageMenu,
+            InputCmdHandler.FromDelegate(_ => ToggleWindow())).Register<LanguageMenuUIController>();
+    }
+
+    public void OnStateExited(GameplayState state)
+    {
+        if (LanguageWindow != null)
+        {
+            LanguageWindow.Dispose();
+            LanguageWindow = null;
+        }
+
+        CommandBinds.Unregister<LanguageMenuUIController>();
+    }
+
+    public void UnloadButton()
+    {
+        if (LanguageButton == null)
+            return;
+
+        LanguageButton.OnPressed -= LanguageButtonPressed;
+    }
+
+    public void LoadButton()
+    {
+        if (LanguageButton == null)
+            return;
+
+        LanguageButton.OnPressed += LanguageButtonPressed;
+
+        if (LanguageWindow == null)
+            return;
+
+        LanguageWindow.OnClose += () => LanguageButton.Pressed = false;
+        LanguageWindow.OnOpen += () => LanguageButton.Pressed = true;
+    }
+
+    private void LanguageButtonPressed(ButtonEventArgs args)
+    {
+        ToggleWindow();
+    }
+
+    private void ToggleWindow()
+    {
+        if (LanguageWindow == null)
+            return;
+
+        if (LanguageButton != null)
+            LanguageButton.SetClickPressed(!LanguageWindow.IsOpen);
+
+        if (LanguageWindow.IsOpen)
+            LanguageWindow.Close();
+        else
+            LanguageWindow.Open();
+    }
+}
diff --git a/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs b/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs
index 1505db48a7..156fa63884 100644
--- a/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs
+++ b/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs
@@ -9,6 +9,7 @@
 using Content.Client.UserInterface.Systems.MenuBar.Widgets;
 using Content.Client.UserInterface.Systems.Sandbox;
 using Robust.Client.UserInterface.Controllers;
+using Content.Client.UserInterface.Systems.Language;
 
 namespace Content.Client.UserInterface.Systems.MenuBar;
 
@@ -22,6 +23,7 @@ public sealed class GameTopMenuBarUIController : UIController
     [Dependency] private readonly ActionUIController _action = default!;
     [Dependency] private readonly SandboxUIController _sandbox = default!;
     [Dependency] private readonly GuidebookUIController _guidebook = default!;
+    [Dependency] private readonly LanguageMenuUIController _language = default!;
 
     private GameTopMenuBar? GameTopMenuBar => UIManager.GetActiveUIWidgetOrNull<GameTopMenuBar>();
 
@@ -44,6 +46,7 @@ public void UnloadButtons()
         _ahelp.UnloadButton();
         _action.UnloadButton();
         _sandbox.UnloadButton();
+        _language.UnloadButton();
     }
 
     public void LoadButtons()
@@ -56,5 +59,6 @@ public void LoadButtons()
         _ahelp.LoadButton();
         _action.LoadButton();
         _sandbox.LoadButton();
+        _language.LoadButton();
     }
 }
diff --git a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
index 3c8cd1d164..a76943ace8 100644
--- a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
+++ b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
@@ -63,6 +63,16 @@
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
         />
+    <ui:MenuButton
+        Name="LanguageButton"
+        Access="Internal"
+        Icon="{xe:Tex '/Textures/Interface/language.png'}"
+        BoundKey = "{x:Static is:ContentKeyFunctions.OpenLanguageMenu}"
+        ToolTip="Open the Language Menu"
+        MinSize="42 64"
+        HorizontalExpand="True"
+        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
+        />
     <ui:MenuButton
         Name="AdminButton"
         Access="Internal"
diff --git a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
index ac37cebfa9..52d0348b79 100644
--- a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
+++ b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
@@ -23,12 +23,12 @@ private void OnScreenLoad()
     {
         switch (UIManager.ActiveScreen)
         {
+            case DefaultGameScreen game:
+                _votes.SetPopupContainer(game.VoteMenu);
+                break;
             case SeparatedChatGameScreen separated:
                 _votes.SetPopupContainer(separated.VoteMenu);
                 break;
-            case OverlayChatGameScreen overlay:
-                _votes.SetPopupContainer(overlay.VoteMenu);
-                break;
         }
     }
 
diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
index 329a8977a6..77f46a3fc9 100644
--- a/Content.Client/Verbs/VerbSystem.cs
+++ b/Content.Client/Verbs/VerbSystem.cs
@@ -20,7 +20,7 @@ namespace Content.Client.Verbs
     public sealed class VerbSystem : SharedVerbSystem
     {
         [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly ExamineSystem _examineSystem = default!;
+        [Dependency] private readonly ExamineSystem _examine = default!;
         [Dependency] private readonly TagSystem _tagSystem = default!;
         [Dependency] private readonly IStateManager _stateManager = default!;
         [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
@@ -77,7 +77,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
                 bool Predicate(EntityUid e) => e == player || entitiesUnderMouse.Contains(e);
 
                 // first check the general location.
-                if (!_examineSystem.CanExamine(player.Value, targetPos, Predicate))
+                if (!_examine.CanExamine(player.Value, targetPos, Predicate))
                     return false;
 
                 TryComp(player.Value, out ExaminerComponent? examiner);
@@ -86,7 +86,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
                 entities = new();
                 foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize))
                 {
-                    if (_examineSystem.CanExamine(player.Value, targetPos, Predicate, ent, examiner))
+                    if (_examine.CanExamine(player.Value, targetPos, Predicate, ent, examiner))
                         entities.Add(ent);
                 }
             }
@@ -147,7 +147,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
                 {
                     var entity = entities[i];
 
-                    if (!ExamineSystemShared.InRangeUnOccluded(
+                    if (!_examine.InRangeUnOccluded(
                         playerPos,
                         xformQuery.GetComponent(entity).MapPosition,
                         ExamineSystemShared.ExamineRange,
diff --git a/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs b/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs
new file mode 100644
index 0000000000..920dc08818
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs
@@ -0,0 +1,103 @@
+using Content.Server.Doors;
+using Content.Server.Power;
+using Content.Server.Wires;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
+
+namespace Content.IntegrationTests.Tests.Wires;
+
+[TestFixture]
+[Parallelizable(ParallelScope.All)]
+[TestOf(typeof(WiresSystem))]
+public sealed class WireLayoutTest
+{
+    [TestPrototypes]
+    public const string Prototypes = """
+        - type: wireLayout
+          id: WireLayoutTest
+          dummyWires: 2
+          wires:
+          - !type:PowerWireAction
+          - !type:DoorBoltWireAction
+
+        - type: wireLayout
+          id: WireLayoutTest2
+          parent: WireLayoutTest
+          wires:
+          - !type:PowerWireAction
+
+        - type: wireLayout
+          id: WireLayoutTest3
+          parent: WireLayoutTest
+
+        - type: entity
+          id: WireLayoutTest
+          components:
+          - type: Wires
+            layoutId: WireLayoutTest
+
+        - type: entity
+          id: WireLayoutTest2
+          components:
+          - type: Wires
+            layoutId: WireLayoutTest2
+
+        - type: entity
+          id: WireLayoutTest3
+          components:
+          - type: Wires
+            layoutId: WireLayoutTest3
+        """;
+
+    [Test]
+    public async Task TestLayoutInheritance()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+        var testMap = await pair.CreateTestMap();
+
+        await server.WaitAssertion(() =>
+        {
+            var wires = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<WiresSystem>();
+
+            // Need to spawn these entities to make sure the wire layouts are initialized.
+            var ent1 = SpawnWithComp<WiresComponent>(server.EntMan, "WireLayoutTest", testMap.MapCoords);
+            var ent2 = SpawnWithComp<WiresComponent>(server.EntMan, "WireLayoutTest2", testMap.MapCoords);
+            var ent3 = SpawnWithComp<WiresComponent>(server.EntMan, "WireLayoutTest3", testMap.MapCoords);
+
+            // Assert.That(wires.TryGetLayout("WireLayoutTest", out var layout1));
+            // Assert.That(wires.TryGetLayout("WireLayoutTest2", out var layout2));
+            // Assert.That(wires.TryGetLayout("WireLayoutTest3", out var layout3));
+
+            Assert.Multiple(() =>
+            {
+                // Entity 1.
+                Assert.That(ent1.Comp.WiresList, Has.Count.EqualTo(4));
+                Assert.That(ent1.Comp.WiresList, Has.Exactly(2).With.Property("Action").Null, "2 dummy wires");
+                Assert.That(ent1.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<PowerWireAction>(), "1 power wire");
+                Assert.That(ent1.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<DoorBoltWireAction>(), "1 door bolt wire");
+
+                Assert.That(ent2.Comp.WiresList, Has.Count.EqualTo(5));
+                Assert.That(ent2.Comp.WiresList, Has.Exactly(2).With.Property("Action").Null, "2 dummy wires");
+                Assert.That(ent2.Comp.WiresList, Has.Exactly(2).With.Property("Action").InstanceOf<PowerWireAction>(), "2 power wire");
+                Assert.That(ent2.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<DoorBoltWireAction>(), "1 door bolt wire");
+
+                Assert.That(ent3.Comp.WiresList, Has.Count.EqualTo(4));
+                Assert.That(ent3.Comp.WiresList, Has.Exactly(2).With.Property("Action").Null, "2 dummy wires");
+                Assert.That(ent3.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<PowerWireAction>(), "1 power wire");
+                Assert.That(ent3.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<DoorBoltWireAction>(), "1 door bolt wire");
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+
+    private static Entity<T> SpawnWithComp<T>(IEntityManager entityManager, string prototype, MapCoordinates coords)
+        where T : IComponent, new()
+    {
+        var ent = entityManager.Spawn(prototype, coords);
+        var comp = entityManager.EnsureComponent<T>(ent);
+        return new Entity<T>(ent, comp);
+    }
+}
diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs
index b3bd339243..c1d2643d6f 100644
--- a/Content.Server/Abilities/Mime/MimePowersSystem.cs
+++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs
@@ -10,7 +10,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics; //Nyano - Summary: Makes Mime psionic.
 using Content.Shared.Speech.Muting;
 
 namespace Content.Server.Abilities.Mime
diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs
index b1cca46e63..57d6e089bd 100644
--- a/Content.Server/Administration/Managers/AdminManager.cs
+++ b/Content.Server/Administration/Managers/AdminManager.cs
@@ -315,7 +315,7 @@ private async void LoginAdminMaybe(ICommonSession session)
 
             _admins.Add(session, reg);
 
-            if (!session.ContentData()!.ExplicitlyDeadminned)
+            if (!session.ContentData()?.ExplicitlyDeadminned ?? false)
             {
                 reg.Data.Active = true;
 
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index c68336deab..9d66338c8b 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -718,9 +718,21 @@ private void AddTricksVerbs(GetVerbsEvent<Verb> args)
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Fun/caps.rsi"), "mag-6"),
                 Act = () =>
                 {
-                    _quickDialog.OpenDialog(player, "Set Bullet Amount", $"Amount (max {ballisticAmmo.Capacity}):", (int amount) =>
+                    _quickDialog.OpenDialog(player, "Set Bullet Amount", $"Amount (standard {ballisticAmmo.Capacity}):", (string amount) =>
                     {
-                        ballisticAmmo.UnspawnedCount = amount;
+                        if (!int.TryParse(amount, out var result))
+                            return;
+
+                        if (result > 0)
+                        {
+                            ballisticAmmo.UnspawnedCount = result;
+                        }
+                        else
+                        {
+                            ballisticAmmo.UnspawnedCount = 0;
+                        }
+
+                        _gun.UpdateBallisticAppearance(args.Target, ballisticAmmo);
                     });
                 },
                 Impact = LogImpact.Medium,
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index c4754af934..f5b237b449 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -66,6 +66,7 @@ public sealed partial class AdminVerbSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly StationSystem _stations = default!;
         [Dependency] private readonly StationSpawningSystem _spawning = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
 
         private readonly Dictionary<ICommonSession, List<EditSolutionsEui>> _openSolutionUis = new();
 
@@ -416,7 +417,7 @@ private void AddDebugVerbs(GetVerbsEvent<Verb> args)
                     Act = () =>
                     {
 
-                        var message = ExamineSystemShared.InRangeUnOccluded(args.User, args.Target)
+                        var message = _examine.InRangeUnOccluded(args.User, args.Target)
                             ? Loc.GetString("in-range-unoccluded-verb-on-activate-not-occluded")
                             : Loc.GetString("in-range-unoccluded-verb-on-activate-occluded");
 
diff --git a/Content.Server/Anomaly/AnomalySystem.Psionics.cs b/Content.Server/Anomaly/AnomalySystem.Psionics.cs
index 84f200f47b..95fda1d503 100644
--- a/Content.Server/Anomaly/AnomalySystem.Psionics.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Psionics.cs
@@ -1,4 +1,4 @@
-using Content.Server.Psionics.Abilities;
+using Content.Server.Abilities.Psionics; //Nyano - Summary: the psniocs bin where dispel is located.
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
 using Robust.Shared.Random;
@@ -14,6 +14,8 @@ private void InitializePsionics()
     {
         SubscribeLocalEvent<AnomalyComponent, DispelledEvent>(OnDispelled);
     }
+
+    //Nyano - Summary: gives dispellable behavior to Anomalies. 
     private void OnDispelled(EntityUid uid, AnomalyComponent component, DispelledEvent args)
     {
         _dispel.DealDispelDamage(uid);
diff --git a/Content.Server/Atmos/Components/AirtightComponent.cs b/Content.Server/Atmos/Components/AirtightComponent.cs
index ca107eafbe..69488a7130 100644
--- a/Content.Server/Atmos/Components/AirtightComponent.cs
+++ b/Content.Server/Atmos/Components/AirtightComponent.cs
@@ -9,27 +9,53 @@ public sealed partial class AirtightComponent : Component
     {
         public (EntityUid Grid, Vector2i Tile) LastPosition { get; set; }
 
+        /// <summary>
+        /// The directions in which this entity should block airflow, relative to its own reference frame.
+        /// </summary>
         [DataField("airBlockedDirection", customTypeSerializer: typeof(FlagSerializer<AtmosDirectionFlags>))]
         public int InitialAirBlockedDirection { get; set; } = (int) AtmosDirection.All;
 
+        /// <summary>
+        /// The directions in which the entity is currently blocking airflow, relative to the grid that the entity is on.
+        /// I.e., this is a variant of <see cref="InitialAirBlockedDirection"/> that takes into account the entity's
+        /// current rotation.
+        /// </summary>
         [ViewVariables]
         public int CurrentAirBlockedDirection;
 
-        [DataField("airBlocked")]
+        /// <summary>
+        /// Whether the airtight entity is currently blocking airflow.
+        /// </summary>
+        [DataField]
         public bool AirBlocked { get; set; } = true;
 
-        [DataField("fixVacuum")]
+        /// <summary>
+        /// If true, entities on this tile will attempt to draw air from surrounding tiles when they become unblocked
+        /// and currently have no air. This is generally only required when <see cref="NoAirWhenFullyAirBlocked"/> is
+        /// true, or if the entity is likely to occupy the same tile as another no-air airtight entity.
+        /// </summary>
+        [DataField]
         public bool FixVacuum { get; set; } = true;
+        // I think fixvacuum exists to ensure that repeatedly closing/opening air-blocking doors doesn't end up
+        // depressurizing a room. However it can also effectively be used as a means of generating gasses for free
+        // TODO ATMOS Mass conservation. Make it actually push/pull air from adjacent tiles instead of destroying & creating,
 
+
+        // TODO ATMOS Do we need these two fields?
         [DataField("rotateAirBlocked")]
         public bool RotateAirBlocked { get; set; } = true;
 
+        // TODO ATMOS remove this? What is this even for??
         [DataField("fixAirBlockedDirectionInitialize")]
         public bool FixAirBlockedDirectionInitialize { get; set; } = true;
 
-        [DataField("noAirWhenFullyAirBlocked")]
+        /// <summary>
+        /// If true, then the tile that this entity is on will have no air at all if all directions are blocked.
+        /// </summary>
+        [DataField]
         public bool NoAirWhenFullyAirBlocked { get; set; } = true;
 
+        /// <inheritdoc cref="CurrentAirBlockedDirection"/>
         [Access(Other = AccessPermissions.ReadWriteExecute)]
         public AtmosDirection AirBlockedDirection => (AtmosDirection)CurrentAirBlockedDirection;
     }
diff --git a/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs b/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs
index 710c37b62f..a58d3a3c12 100644
--- a/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs
+++ b/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs
@@ -1,6 +1,8 @@
+using Content.Server.Atmos.EntitySystems;
+
 namespace Content.Server.Atmos.Components;
 
-[RegisterComponent]
+[RegisterComponent, Access(typeof(FlammableSystem))]
 public sealed partial class IgniteOnCollideComponent : Component
 {
     /// <summary>
diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
index 548d6a3692..152fba8fc4 100644
--- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
@@ -85,8 +85,6 @@ private void OnAirtightMoved(Entity<AirtightComponent> airtight, ref MoveEvent e
         private bool AirtightMove(Entity<AirtightComponent> ent, ref MoveEvent ev)
         {
             var (owner, airtight) = ent;
-            if (!airtight.RotateAirBlocked || airtight.InitialAirBlockedDirection == (int)AtmosDirection.Invalid)
-                return false;
 
             airtight.CurrentAirBlockedDirection = (int) Rotate((AtmosDirection)airtight.InitialAirBlockedDirection, ev.NewRotation);
             var pos = airtight.LastPosition;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
index d43cc81b0f..beddef4be7 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
@@ -399,10 +399,7 @@ private void GridIsHotspotActive(EntityUid uid, GridAtmosphereComponent componen
         args.Handled = true;
     }
 
-    private void GridFixTileVacuum(
-        Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
-        TileAtmosphere tile,
-        float volume)
+    private void GridFixTileVacuum(TileAtmosphere tile)
     {
         DebugTools.AssertNotNull(tile.Air);
         DebugTools.Assert(tile.Air?.Immutable == false );
@@ -416,6 +413,9 @@ private void GridFixTileVacuum(
                 count++;
         }
 
+        if (count == 0)
+            return;
+
         var ratio = 1f / count;
         var totalTemperature = 0f;
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
index 77b5bf18af..cb50ff114e 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
@@ -236,7 +236,7 @@ public void ExperiencePressureDifference(
                     // TODO: Technically these directions won't be correct but uhh I'm just here for optimisations buddy not to fix my old bugs.
                     if (throwTarget != EntityCoordinates.Invalid)
                     {
-                        var pos = ((throwTarget.ToMap(EntityManager).Position - xform.WorldPosition).Normalized() + dirVec).Normalized();
+                        var pos = ((throwTarget.ToMap(EntityManager, _transformSystem).Position - xform.WorldPosition).Normalized() + dirVec).Normalized();
                         _physics.ApplyLinearImpulse(uid, pos * moveForce, body: physics);
                     }
                     else
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
index f156125b0f..dcbc1e86ee 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
@@ -661,7 +661,7 @@ private void AdjustEqMovement(TileAtmosphere tile, AtmosDirection direction, flo
             // Turns out: no they don't. Temporary debug checks to figure out which caller is causing problems:
             if (tile == null)
             {
-                Logger.Error($"Encountered null-tile in {nameof(AdjustEqMovement)}. Trace: {Environment.StackTrace}");
+                Log.Error($"Encountered null-tile in {nameof(AdjustEqMovement)}. Trace: {Environment.StackTrace}");
                 return;
             }
             var adj = tile.AdjacentTiles[direction.ToIndex()];
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
index 1f3ca2145b..eba398c182 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
@@ -272,7 +272,7 @@ private void UpdateTileAir(
             tile.Air = new GasMixture(volume){Temperature = Atmospherics.T20C};
 
             if (data.FixVacuum)
-                GridFixTileVacuum(ent, tile, volume);
+                GridFixTileVacuum(tile);
         }
 
         private void QueueRunTiles(
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
index 9b0d0d9670..67c6d5998d 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
@@ -78,12 +78,13 @@ private AirtightData GetAirtightData(EntityUid uid, MapGridComponent grid, Vecto
             if (!_airtightQuery.TryGetComponent(ent, out var airtight))
                 continue;
 
+            fixVacuum |= airtight.FixVacuum;
+
             if(!airtight.AirBlocked)
                 continue;
 
             blockedDirs |= airtight.AirBlockedDirection;
             noAirWhenBlocked |= airtight.NoAirWhenFullyAirBlocked;
-            fixVacuum |= airtight.FixVacuum;
 
             if (blockedDirs == AtmosDirection.All && noAirWhenBlocked && fixVacuum)
                 break;
diff --git a/Content.Server/Atmos/GasMixture.cs b/Content.Server/Atmos/GasMixture.cs
index 77fd701833..3d73a4d0b1 100644
--- a/Content.Server/Atmos/GasMixture.cs
+++ b/Content.Server/Atmos/GasMixture.cs
@@ -62,9 +62,9 @@ public float Temperature
             get => _temperature;
             set
             {
-                DebugTools.Assert(!float.IsNaN(_temperature));
-                if (Immutable) return;
-                _temperature = MathF.Min(MathF.Max(value, Atmospherics.TCMB), Atmospherics.Tmax);
+                DebugTools.Assert(!float.IsNaN(value));
+                if (!Immutable)
+                    _temperature = MathF.Min(MathF.Max(value, Atmospherics.TCMB), Atmospherics.Tmax);
             }
         }
 
@@ -91,6 +91,7 @@ public GasMixture(float[] moles, float temp, float volume = Atmospherics.CellVol
             if (volume < 0)
                 volume = 0;
 
+            DebugTools.Assert(!float.IsNaN(temp));
             _temperature = temp;
             Moles = moles;
             Volume = volume;
diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs
index 0dd35a29e7..0026dbbf4f 100644
--- a/Content.Server/Atmos/TileAtmosphere.cs
+++ b/Content.Server/Atmos/TileAtmosphere.cs
@@ -28,6 +28,9 @@ public sealed class TileAtmosphere : IGasMixtureHolder
         [ViewVariables]
         public TileAtmosphere? PressureSpecificTarget { get; set; }
 
+        /// <summary>
+        /// This is either the pressure difference, or the quantity of moles transferred if monstermos is enabled.
+        /// </summary>
         [ViewVariables]
         public float PressureDifference { get; set; }
 
diff --git a/Content.Server/Bed/Components/SnoringComponent.cs b/Content.Server/Bed/Components/SnoringComponent.cs
new file mode 100644
index 0000000000..09f80327ba
--- /dev/null
+++ b/Content.Server/Bed/Components/SnoringComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server.Bed.Sleep;
+
+/// <summary>
+/// This is used for the snoring trait.
+/// </summary>
+[RegisterComponent]
+public sealed partial class SnoringComponent : Component
+{
+
+}
diff --git a/Content.Server/Bed/Sleep/SleepingSystem.cs b/Content.Server/Bed/Sleep/SleepingSystem.cs
index 685b1087d7..b497254433 100644
--- a/Content.Server/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Server/Bed/Sleep/SleepingSystem.cs
@@ -67,7 +67,10 @@ private void OnSleepStateChanged(EntityUid uid, MobStateComponent component, Sle
                 if (TryComp<SleepEmitSoundComponent>(uid, out var sleepSound))
                 {
                     var emitSound = EnsureComp<SpamEmitSoundComponent>(uid);
-                    emitSound.Sound = sleepSound.Snore;
+                    if (HasComp<SnoringComponent>(uid))
+                    {
+                        emitSound.Sound = sleepSound.Snore;
+                    }
                     emitSound.PlayChance = sleepSound.Chance;
                     emitSound.RollInterval = sleepSound.Interval;
                     emitSound.PopUp = sleepSound.PopUp;
diff --git a/Content.Server/Cargo/Components/CargoPalletComponent.cs b/Content.Server/Cargo/Components/CargoPalletComponent.cs
index cdfd0a3874..ebf0be93e0 100644
--- a/Content.Server/Cargo/Components/CargoPalletComponent.cs
+++ b/Content.Server/Cargo/Components/CargoPalletComponent.cs
@@ -1,26 +1,7 @@
 namespace Content.Server.Cargo.Components;
-using Content.Shared.Actions;
-using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
 /// <summary>
 /// Any entities intersecting when a shuttle is recalled will be sold.
 /// </summary>
-
-[Flags]
-public enum BuySellType : byte
-{
-    Buy = 1 << 0,
-    Sell = 1 << 1,
-    All = Buy | Sell
-}
-
-
 [RegisterComponent]
-public sealed partial class CargoPalletComponent : Component
-{
-    /// <summary>
-    /// Whether the pad is a buy pad, a sell pad, or all.
-    /// </summary>
-    [DataField]
-    public BuySellType PalletType;
-}
+public sealed partial class CargoPalletComponent : Component {}
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index d8b55a7237..ebe66ff029 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -205,7 +205,7 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
             // Try to fulfill from any station where possible, if the pad is not occupied.
             foreach (var trade in _listEnts)
             {
-                var tradePads = GetCargoPallets(trade, BuySellType.Buy);
+                var tradePads = GetCargoPallets(trade);
                 _random.Shuffle(tradePads);
 
                 var freePads = GetFreeCargoPallets(trade, tradePads);
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
index b8a491f4e8..3e39440da5 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
@@ -198,16 +198,13 @@ private List<CargoOrderData> GetProjectedOrders(
     /// </summary>
     private int GetCargoSpace(EntityUid gridUid)
     {
-        var space = GetCargoPallets(gridUid, BuySellType.Buy).Count;
+        var space = GetCargoPallets(gridUid).Count;
         return space;
     }
 
-    /// GetCargoPallets(gridUid, BuySellType.Sell) to return only Sell pads
-    /// GetCargoPallets(gridUid, BuySellType.Buy) to return only Buy pads
-    private List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent PalletXform)> GetCargoPallets(EntityUid gridUid, BuySellType requestType = BuySellType.All)
+    private List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent PalletXform)> GetCargoPallets(EntityUid gridUid)
     {
         _pads.Clear();
-
         var query = AllEntityQuery<CargoPalletComponent, TransformComponent>();
 
         while (query.MoveNext(out var uid, out var comp, out var compXform))
@@ -218,13 +215,7 @@ private int GetCargoSpace(EntityUid gridUid)
                 continue;
             }
 
-            if ((requestType & comp.PalletType) == 0)
-            {
-                continue;
-            }
-
             _pads.Add((uid, comp, compXform));
-
         }
 
         return _pads;
@@ -284,7 +275,7 @@ private void GetPalletGoods(EntityUid gridUid, out HashSet<EntityUid> toSell, ou
         amount = 0;
         toSell = new HashSet<EntityUid>();
 
-        foreach (var (palletUid, _, _) in GetCargoPallets(gridUid, BuySellType.Sell))
+        foreach (var (palletUid, _, _) in GetCargoPallets(gridUid))
         {
             // Containers should already get the sell price of their children so can skip those.
             _setEnts.Clear();
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 6cdb088dbb..7eecaa32b4 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -5,9 +5,11 @@
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
+using Content.Server.Language;
+using Content.Server.Speech;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.EntitySystems;
-using Content.Server.Psionics.Telepathy;
+using Content.Server.Nyanotrasen.Chat;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.EntitySystems;
 using Content.Server.Station.Components;
@@ -17,6 +19,7 @@
 using Content.Shared.Chat;
 using Content.Shared.Database;
 using Content.Shared.Ghost;
+using Content.Shared.Language;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
@@ -60,6 +63,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly ReplacementAccentSystem _wordreplacement = default!;
+    [Dependency] private readonly LanguageSystem _language = default!;
 
     //Nyano - Summary: pulls in the nyano chat system for psionics.
     [Dependency] private readonly NyanoChatSystem _nyanoChatSystem = default!;
@@ -68,6 +72,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
     public const int WhisperMuffledRange = 5; // how far whisper goes at all, in world units
     public const string DefaultAnnouncementSound = "/Audio/Announcements/announce.ogg";
+    public const float DefaultObfuscationFactor = 0.2f; // Percentage of symbols in a whispered message that can be seen even by "far" listeners
 
     private bool _loocEnabled = true;
     private bool _deadLoocEnabled;
@@ -173,7 +178,8 @@ public void TrySendInGameICMessage(
         ICommonSession? player = null,
         string? nameOverride = null,
         bool checkRadioPrefix = true,
-        bool ignoreActionBlocker = false
+        bool ignoreActionBlocker = false,
+        LanguagePrototype? languageOverride = null
         )
     {
         if (HasComp<GhostComponent>(source))
@@ -249,10 +255,10 @@ public void TrySendInGameICMessage(
         switch (desiredType)
         {
             case InGameICChatType.Speak:
-                SendEntitySpeak(source, message, range, nameOverride, hideLog, ignoreActionBlocker);
+                SendEntitySpeak(source, message, range, nameOverride, hideLog, ignoreActionBlocker, languageOverride: languageOverride);
                 break;
             case InGameICChatType.Whisper:
-                SendEntityWhisper(source, message, range, null, nameOverride, hideLog, ignoreActionBlocker);
+                SendEntityWhisper(source, message, range, null, nameOverride, hideLog, ignoreActionBlocker, languageOverride: languageOverride);
                 break;
             case InGameICChatType.Emote:
                 SendEntityEmote(source, message, range, nameOverride, hideLog: hideLog, ignoreActionBlocker: ignoreActionBlocker);
@@ -382,12 +388,14 @@ private void SendEntitySpeak(
         ChatTransmitRange range,
         string? nameOverride,
         bool hideLog = false,
-        bool ignoreActionBlocker = false
+        bool ignoreActionBlocker = false,
+        LanguagePrototype? languageOverride = null
         )
     {
         if (!_actionBlocker.CanSpeak(source) && !ignoreActionBlocker)
             return;
 
+        // The original message
         var message = TransformSpeech(source, FormattedMessage.RemoveMarkup(originalMessage));
 
         if (message.Length == 0)
@@ -411,18 +419,19 @@ private void SendEntitySpeak(
                 speech = proto;
         }
 
-        name = FormattedMessage.EscapeText(name);
+        var language = languageOverride ?? _language.GetLanguage(source);
 
-        var wrappedMessage = Loc.GetString(speech.Bold ? "chat-manager-entity-say-bold-wrap-message" : "chat-manager-entity-say-wrap-message",
-            ("entityName", name),
-            ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
-            ("fontType", speech.FontId),
-            ("fontSize", speech.FontSize),
-            ("message", FormattedMessage.EscapeText(message)));
+        name = FormattedMessage.EscapeText(name);
+        // The chat message wrapped in a "x says y" string
+        var wrappedMessage = WrapPublicMessage(source, name, message);
+        // The chat message obfuscated via language obfuscation
+        var obfuscated = SanitizeInGameICMessage(source, _language.ObfuscateSpeech(message, language), out var emoteStr, true, _configurationManager.GetCVar(CCVars.ChatPunctuation), (!CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Parent.Name == "en") || (CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Name == "en"));
+        // The language-obfuscated message wrapped in a "x says y" string
+        var wrappedObfuscated = WrapPublicMessage(source, name, obfuscated);
 
-        SendInVoiceRange(ChatChannel.Local, message, wrappedMessage, source, range);
+        SendInVoiceRange(ChatChannel.Local, name, message, wrappedMessage, obfuscated, wrappedObfuscated, source, range, languageOverride: language);
 
-        var ev = new EntitySpokeEvent(source, message, null, null);
+        var ev = new EntitySpokeEvent(source, message, null, false, language);
         RaiseLocalEvent(source, ev, true);
 
         // To avoid logging any messages sent by entities that are not players, like vendors, cloning, etc.
@@ -455,7 +464,8 @@ private void SendEntityWhisper(
         RadioChannelPrototype? channel,
         string? nameOverride,
         bool hideLog = false,
-        bool ignoreActionBlocker = false
+        bool ignoreActionBlocker = false,
+        LanguagePrototype? languageOverride = null
         )
     {
         if (!_actionBlocker.CanSpeak(source) && !ignoreActionBlocker)
@@ -465,8 +475,6 @@ private void SendEntityWhisper(
         if (message.Length == 0)
             return;
 
-        var obfuscatedMessage = ObfuscateMessageReadability(message, 0.2f);
-
         // get the entity's name by visual identity (if no override provided).
         string nameIdentity = FormattedMessage.EscapeText(nameOverride ?? Identity.Name(source, EntityManager));
         // get the entity's name by voice (if no override provided).
@@ -483,41 +491,57 @@ private void SendEntityWhisper(
         }
         name = FormattedMessage.EscapeText(name);
 
-        var wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
-            ("entityName", name), ("message", FormattedMessage.EscapeText(message)));
-
-        var wrappedobfuscatedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
-            ("entityName", nameIdentity), ("message", FormattedMessage.EscapeText(obfuscatedMessage)));
-
-        var wrappedUnknownMessage = Loc.GetString("chat-manager-entity-whisper-unknown-wrap-message",
-            ("message", FormattedMessage.EscapeText(obfuscatedMessage)));
-
+        var language = languageOverride ?? _language.GetLanguage(source);
+        var languageObfuscatedMessage = SanitizeInGameICMessage(source, _language.ObfuscateSpeech(message, language), out var emoteStr, true, _configurationManager.GetCVar(CCVars.ChatPunctuation), (!CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Parent.Name == "en") || (CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Name == "en"));
 
         foreach (var (session, data) in GetRecipients(source, WhisperMuffledRange))
         {
-            EntityUid listener;
-
-            if (session.AttachedEntity is not { Valid: true } playerEntity)
+            if (session.AttachedEntity is not { Valid: true } listener)
                 continue;
-            listener = session.AttachedEntity.Value;
 
             if (MessageRangeCheck(session, data, range) != MessageRangeCheckResult.Full)
                 continue; // Won't get logged to chat, and ghosts are too far away to see the pop-up, so we just won't send it to them.
 
+            var canUnderstandLanguage = _language.CanUnderstand(listener, language);
+            // How the entity perceives the message depends on whether it can understand its language
+            var perceivedMessage = canUnderstandLanguage ? message : languageObfuscatedMessage;
+
+            // Result is the intermediate message derived from the perceived one via obfuscation
+            // Wrapped message is the result wrapped in an "x says y" string
+            string result, wrappedMessage;
             if (data.Range <= WhisperClearRange)
-                _chatManager.ChatMessageToOne(ChatChannel.Whisper, message, wrappedMessage, source, false, session.Channel);
-            //If listener is too far, they only hear fragments of the message
-            //Collisiongroup.Opaque is not ideal for this use. Preferably, there should be a check specifically with "Can Ent1 see Ent2" in mind
-            else if (_interactionSystem.InRangeUnobstructed(source, listener, WhisperMuffledRange, Shared.Physics.CollisionGroup.Opaque)) //Shared.Physics.CollisionGroup.Opaque
-                _chatManager.ChatMessageToOne(ChatChannel.Whisper, obfuscatedMessage, wrappedobfuscatedMessage, source, false, session.Channel);
-            //If listener is too far and has no line of sight, they can't identify the whisperer's identity
+            {
+                // Scenario 1: the listener can clearly understand the message
+                result = perceivedMessage;
+                wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
+                    ("entityName", name),
+                    ("message", FormattedMessage.EscapeText(result)));
+            }
+            else if (_interactionSystem.InRangeUnobstructed(source, listener, WhisperMuffledRange, Shared.Physics.CollisionGroup.Opaque))
+            {
+                // Scenerio 2: if the listener is too far, they only hear fragments of the message
+                // Collisiongroup.Opaque is not ideal for this use. Preferably, there should be a check specifically with "Can Ent1 see Ent2" in mind
+                result = ObfuscateMessageReadability(perceivedMessage);
+                wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
+                    ("entityName", nameIdentity), ("message", FormattedMessage.EscapeText(result)));
+            }
             else
-                _chatManager.ChatMessageToOne(ChatChannel.Whisper, obfuscatedMessage, wrappedUnknownMessage, source, false, session.Channel);
+            {
+                // Scenario 3: If listener is too far and has no line of sight, they can't identify the whisperer's identity
+                result = ObfuscateMessageReadability(perceivedMessage);
+                wrappedMessage = Loc.GetString("chat-manager-entity-whisper-unknown-wrap-message",
+                    ("message", FormattedMessage.EscapeText(result)));
+            }
+
+            _chatManager.ChatMessageToOne(ChatChannel.Whisper, result, wrappedMessage, source, false, session.Channel);
         }
 
-        _replay.RecordServerMessage(new ChatMessage(ChatChannel.Whisper, message, wrappedMessage, GetNetEntity(source), null, MessageRangeHideChatForReplay(range)));
+        var replayWrap = Loc.GetString("chat-manager-entity-whisper-wrap-message",
+            ("entityName", name),
+            ("message", FormattedMessage.EscapeText(message)));
+        _replay.RecordServerMessage(new ChatMessage(ChatChannel.Whisper, message, replayWrap, GetNetEntity(source), null, MessageRangeHideChatForReplay(range)));
 
-        var ev = new EntitySpokeEvent(source, message, channel, obfuscatedMessage);
+        var ev = new EntitySpokeEvent(source, message, channel, true, language);
         RaiseLocalEvent(source, ev, true);
         if (!hideLog)
             if (originalMessage == message)
@@ -564,7 +588,7 @@ private void SendEntityEmote(
 
         if (checkEmote)
             TryEmoteChatInput(source, action);
-        SendInVoiceRange(ChatChannel.Emotes, action, wrappedMessage, source, range, author);
+        SendInVoiceRange(ChatChannel.Emotes, name, action, wrappedMessage, obfuscated: "", obfuscatedWrappedMessage: "", source, range, author);
         if (!hideLog)
             if (name != Name(source))
                 _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Emote from {ToPrettyString(source):user} as {name}: {action}");
@@ -591,7 +615,13 @@ private void SendLOOC(EntityUid source, ICommonSession player, string message, b
             ("entityName", name),
             ("message", FormattedMessage.EscapeText(message)));
 
-        SendInVoiceRange(ChatChannel.LOOC, message, wrappedMessage, source, hideChat ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal, player.UserId);
+        SendInVoiceRange(ChatChannel.LOOC, name, message, wrappedMessage,
+            obfuscated: string.Empty,
+            obfuscatedWrappedMessage: string.Empty, // will be skipped anyway
+            source,
+            hideChat ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal,
+            player.UserId,
+            languageOverride: LanguageSystem.Universal);
         _adminLogger.Add(LogType.Chat, LogImpact.Low, $"LOOC from {player:Player}: {message}");
     }
 
@@ -672,15 +702,29 @@ private MessageRangeCheckResult MessageRangeCheck(ICommonSession session, ICChat
     /// <summary>
     ///     Sends a chat message to the given players in range of the source entity.
     /// </summary>
-    private void SendInVoiceRange(ChatChannel channel, string message, string wrappedMessage, EntityUid source, ChatTransmitRange range, NetUserId? author = null)
+    private void SendInVoiceRange(ChatChannel channel, string name, string message, string wrappedMessage, string obfuscated, string obfuscatedWrappedMessage, EntityUid source, ChatTransmitRange range, NetUserId? author = null, LanguagePrototype? languageOverride = null)
     {
+        var language = languageOverride ?? _language.GetLanguage(source);
         foreach (var (session, data) in GetRecipients(source, VoiceRange))
         {
             var entRange = MessageRangeCheck(session, data, range);
             if (entRange == MessageRangeCheckResult.Disallowed)
                 continue;
             var entHideChat = entRange == MessageRangeCheckResult.HideChat;
-            _chatManager.ChatMessageToOne(channel, message, wrappedMessage, source, entHideChat, session.Channel, author: author);
+            if (session.AttachedEntity is not { Valid: true } playerEntity)
+                continue;
+            EntityUid listener = session.AttachedEntity.Value;
+
+
+            // If the channel does not support languages, or the entity can understand the message, send the original message, otherwise send the obfuscated version
+            if (channel == ChatChannel.LOOC || channel == ChatChannel.Emotes || _language.CanUnderstand(listener, language))
+            {
+                _chatManager.ChatMessageToOne(channel, message, wrappedMessage, source, entHideChat, session.Channel, author: author);
+            }
+            else
+            {
+                _chatManager.ChatMessageToOne(channel, obfuscated, obfuscatedWrappedMessage, source, entHideChat, session.Channel, author: author);
+            }
         }
 
         _replay.RecordServerMessage(new ChatMessage(channel, message, wrappedMessage, GetNetEntity(source), null, MessageRangeHideChatForReplay(range)));
@@ -790,6 +834,21 @@ public string SanitizeMessageReplaceWords(string message)
         return msg;
     }
 
+    /// <summary>
+    ///     Wraps a message sent by the specified entity into an "x says y" string.
+    /// </summary>
+    public string WrapPublicMessage(EntityUid source, string name, string message)
+    {
+        var speech = GetSpeechVerb(source, message);
+        var verbName = Loc.GetString(_random.Pick(speech.SpeechVerbStrings));
+        return Loc.GetString(speech.Bold ? "chat-manager-entity-say-bold-wrap-message" : "chat-manager-entity-say-wrap-message",
+            ("entityName", name),
+            ("verb", verbName),
+            ("fontType", speech.FontId),
+            ("fontSize", speech.FontSize),
+            ("message", FormattedMessage.EscapeText(message)));
+    }
+
     /// <summary>
     ///     Returns list of players and ranges for all players withing some range. Also returns observers with a range of -1.
     /// </summary>
@@ -836,7 +895,7 @@ public readonly record struct ICChatRecipientData(float Range, bool Observer, bo
     {
     }
 
-    private string ObfuscateMessageReadability(string message, float chance)
+    public string ObfuscateMessageReadability(string message, float chance = DefaultObfuscationFactor)
     {
         var modifiedMessage = new StringBuilder(message);
 
@@ -925,7 +984,8 @@ public sealed class EntitySpokeEvent : EntityEventArgs
 {
     public readonly EntityUid Source;
     public readonly string Message;
-    public readonly string? ObfuscatedMessage; // not null if this was a whisper
+    public readonly bool IsWhisper;
+    public readonly LanguagePrototype Language;
 
     /// <summary>
     ///     If the entity was trying to speak into a radio, this was the channel they were trying to access. If a radio
@@ -933,12 +993,13 @@ public sealed class EntitySpokeEvent : EntityEventArgs
     /// </summary>
     public RadioChannelPrototype? Channel;
 
-    public EntitySpokeEvent(EntityUid source, string message, RadioChannelPrototype? channel, string? obfuscatedMessage)
+    public EntitySpokeEvent(EntityUid source, string message, RadioChannelPrototype? channel, bool isWhisper, LanguagePrototype language)
     {
         Source = source;
         Message = message;
         Channel = channel;
-        ObfuscatedMessage = obfuscatedMessage;
+        IsWhisper = isWhisper;
+        Language = language;
     }
 }
 
diff --git a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
index 761e9456bc..c923738930 100644
--- a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
+++ b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
@@ -39,7 +39,7 @@ private void OnClientTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs
         var uid = args.SenderSession.AttachedEntity;
         if (!Exists(uid))
         {
-            Logger.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity.");
+            Log.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity.");
             return;
         }
 
diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
index 7d3f70bc0d..1415b6cad3 100644
--- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
@@ -22,8 +22,8 @@ namespace Content.Server.Chemistry.EntitySystems
     [UsedImplicitly]
     internal sealed class VaporSystem : EntitySystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IPrototypeManager _protoManager = default!;
+        [Dependency] private readonly SharedMapSystem _map = default!;
         [Dependency] private readonly SharedPhysicsSystem _physics = default!;
         [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
         [Dependency] private readonly ThrowingSystem _throwing = default!;
@@ -115,7 +115,7 @@ private void Update(float frameTime, Entity<VaporComponent> ent, Entity<Solution
             {
                 vapor.ReactTimer = 0;
 
-                var tile = gridComp.GetTileRef(xform.Coordinates.ToVector2i(EntityManager, _mapManager));
+                var tile = _map.GetTileRef(xform.GridUid.Value, gridComp, xform.Coordinates);
                 foreach (var reagentQuantity in contents.Contents.ToArray())
                 {
                     if (reagentQuantity.Quantity == FixedPoint2.Zero) continue;
diff --git a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs b/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
index bf7691fe37..da16529d51 100644
--- a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
+++ b/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
@@ -1,10 +1,14 @@
+using System.Linq;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Speech.Components;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Language;
+using Content.Shared.Language.Systems;
 using Content.Shared.Mind.Components;
 using Robust.Shared.Prototypes;
 using Content.Server.Psionics; //Nyano - Summary: pulls in the ability for the sentient creature to become psionic.
 using Content.Shared.Humanoid; //Delta-V - Banning humanoids from becoming ghost roles.
+using Content.Shared.Language.Events;
 
 namespace Content.Server.Chemistry.ReagentEffects;
 
@@ -24,6 +28,20 @@ public override void Effect(ReagentEffectArgs args)
         entityManager.RemoveComponent<ReplacementAccentComponent>(uid);
         entityManager.RemoveComponent<MonkeyAccentComponent>(uid);
 
+        var speaker = entityManager.EnsureComponent<LanguageSpeakerComponent>(uid);
+        var fallback = SharedLanguageSystem.FallbackLanguagePrototype;
+
+        if (!speaker.UnderstoodLanguages.Contains(fallback))
+            speaker.UnderstoodLanguages.Add(fallback);
+
+        if (!speaker.SpokenLanguages.Contains(fallback))
+        {
+            speaker.CurrentLanguage = fallback;
+            speaker.SpokenLanguages.Add(fallback);
+        }
+
+        args.EntityManager.EventBus.RaiseLocalEvent(uid, new LanguagesUpdateEvent(), true);
+
         // Stops from adding a ghost role to things like people who already have a mind
         if (entityManager.TryGetComponent<MindContainerComponent>(uid, out var mindContainer) && mindContainer.HasMind)
         {
@@ -47,7 +65,7 @@ public override void Effect(ReagentEffectArgs args)
 
         ghostRole = entityManager.AddComponent<GhostRoleComponent>(uid);
         entityManager.EnsureComponent<GhostTakeoverAvailableComponent>(uid);
-        entityManager.EnsureComponent<PotentialPsionicComponent>(uid); //Nyano - Summary:. Makes the animated body able to get psionics. 
+        entityManager.EnsureComponent<PotentialPsionicComponent>(uid); //Nyano - Summary:. Makes the animated body able to get psionics.
 
         var entityData = entityManager.GetComponent<MetaDataComponent>(uid);
         ghostRole.RoleName = entityData.EntityName;
diff --git a/Content.Server/Construction/Conditions/ComponentInTile.cs b/Content.Server/Construction/Conditions/ComponentInTile.cs
index 36705e4c0e..429c4fdabf 100644
--- a/Content.Server/Construction/Conditions/ComponentInTile.cs
+++ b/Content.Server/Construction/Conditions/ComponentInTile.cs
@@ -47,7 +47,8 @@ public bool Condition(EntityUid uid, IEntityManager entityManager)
             if (transform.GridUid == null)
                 return false;
 
-            var indices = transform.Coordinates.ToVector2i(entityManager, IoCManager.Resolve<IMapManager>());
+            var transformSys = entityManager.System<SharedTransformSystem>();
+            var indices = transform.Coordinates.ToVector2i(entityManager, IoCManager.Resolve<IMapManager>(), transformSys);
             var lookup = entityManager.EntitySysManager.GetEntitySystem<EntityLookupSystem>();
 
 
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index e0bdf09629..39705fc197 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Construction.Components;
-using Content.Server.Storage.EntitySystems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Construction;
 using Content.Shared.Construction.Prototypes;
@@ -15,7 +14,6 @@
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
 using Content.Shared.Storage;
-using Content.Shared.Tag;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
@@ -30,8 +28,7 @@ public sealed partial class ConstructionSystem
         [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
-        [Dependency] private readonly StorageSystem _storageSystem = default!;
-        [Dependency] private readonly TagSystem _tagSystem = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
         // --- WARNING! LEGACY CODE AHEAD! ---
         // This entire file contains the legacy code for initial construction.
@@ -466,7 +463,7 @@ void Cleanup()
                 return;
             }
 
-            var mapPos = location.ToMap(EntityManager);
+            var mapPos = location.ToMap(EntityManager, _transformSystem);
             var predicate = GetPredicate(constructionPrototype.CanBuildInImpassable, mapPos);
 
             if (!_interactionSystem.InRangeUnobstructed(user, mapPos, predicate: predicate))
diff --git a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs
index 22d96a5414..ec9ec77031 100644
--- a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs
+++ b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs
@@ -5,7 +5,7 @@
 using Content.Server.Psionics.Glimmer;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Psionics.Glimmer;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs
new file mode 100644
index 0000000000..3d3820562d
--- /dev/null
+++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs
@@ -0,0 +1,38 @@
+using Content.Server.DeviceNetwork.Components;
+using Content.Shared.DeviceNetwork.Components;
+using Robust.Server.GameObjects;
+
+namespace Content.Server.DeviceNetwork.Systems;
+
+public sealed class DeviceNetworkJammerSystem : EntitySystem
+{
+    [Dependency] private TransformSystem _transform = default!;
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TransformComponent, BeforePacketSentEvent>(BeforePacketSent);
+    }
+
+    private void BeforePacketSent(EntityUid uid, TransformComponent xform, BeforePacketSentEvent ev)
+    {
+        if (ev.Cancelled)
+            return;
+
+        var query = EntityQueryEnumerator<DeviceNetworkJammerComponent, TransformComponent>();
+
+        while (query.MoveNext(out _, out var jammerComp, out var jammerXform))
+        {
+            if (!jammerComp.JammableNetworks.Contains(ev.NetworkId))
+                continue;
+
+            if (jammerXform.Coordinates.InRange(EntityManager, _transform, ev.SenderTransform.Coordinates, jammerComp.Range)
+                || jammerXform.Coordinates.InRange(EntityManager, _transform, xform.Coordinates, jammerComp.Range))
+            {
+                ev.Cancel();
+                return;
+            }
+        }
+    }
+
+}
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
index 83967c9bbd..20ee7a5dd1 100644
--- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
@@ -351,13 +351,14 @@ private void SendToConnections(ReadOnlySpan<DeviceNetworkComponent> connections,
 
             var xform = Transform(packet.Sender);
 
-            BeforePacketSentEvent beforeEv = new(packet.Sender, xform, _transformSystem.GetWorldPosition(xform));
+            var senderPos = _transformSystem.GetWorldPosition(xform);
 
             foreach (var connection in connections)
             {
                 if (connection.Owner == packet.Sender)
                     continue;
 
+                BeforePacketSentEvent beforeEv = new(packet.Sender, xform, senderPos, connection.NetIdEnum.ToString());
                 RaiseLocalEvent(connection.Owner, beforeEv, false);
 
                 if (!beforeEv.Cancelled)
@@ -386,11 +387,17 @@ public sealed class BeforePacketSentEvent : CancellableEntityEventArgs
         /// </summary>
         public readonly Vector2 SenderPosition;
 
-        public BeforePacketSentEvent(EntityUid sender, TransformComponent xform, Vector2 senderPosition)
+        /// <summary>
+        /// The network the packet will be sent to.
+        /// </summary>
+        public readonly string NetworkId;
+
+        public BeforePacketSentEvent(EntityUid sender, TransformComponent xform, Vector2 senderPosition, string networkId)
         {
             Sender = sender;
             SenderTransform = xform;
             SenderPosition = senderPosition;
+            NetworkId = networkId;
         }
     }
 
diff --git a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
index fd62514d00..cdc083feac 100644
--- a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
@@ -1,4 +1,5 @@
-using Content.Server.DeviceNetwork.Components;
+using System.Diagnostics.CodeAnalysis;
+using Content.Server.DeviceNetwork.Components;
 using Content.Server.Medical.CrewMonitoring;
 using Content.Server.Power.Components;
 using Content.Server.Station.Systems;
@@ -38,7 +39,7 @@ public bool IsActiveServer(EntityUid serverId, SingletonDeviceNetServerComponent
     /// <param name="address">The address of the active server if it exists</param>
     /// <typeparam name="TComp">The component type that determines what type of server you're getting the address of</typeparam>
     /// <returns>True if there is an active serve. False otherwise</returns>
-    public bool TryGetActiveServerAddress<TComp>(EntityUid stationId, out string? address) where TComp : IComponent
+    public bool TryGetActiveServerAddress<TComp>(EntityUid stationId, [NotNullWhen(true)] out string? address) where TComp : IComponent
     {
         var servers = EntityQueryEnumerator<
             SingletonDeviceNetServerComponent,
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 93d6bc8db0..6400472d03 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -28,6 +28,7 @@ public sealed partial class DragonSystem : EntitySystem
     [Dependency] private readonly RoleSystem _role = default!;
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     private EntityQuery<CarpRiftsConditionComponent> _objQuery;
 
@@ -146,7 +147,7 @@ private void OnSpawnRift(EntityUid uid, DragonComponent component, DragonSpawnRi
         // cant stack rifts near eachother
         foreach (var (_, riftXform) in EntityQuery<DragonRiftComponent, TransformComponent>(true))
         {
-            if (riftXform.Coordinates.InRange(EntityManager, xform.Coordinates, RiftRange))
+            if (riftXform.Coordinates.InRange(EntityManager, _transform, xform.Coordinates, RiftRange))
             {
                 _popup.PopupEntity(Loc.GetString("carp-rift-proximity", ("proximity", RiftRange)), uid, uid);
                 return;
diff --git a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
index 202d03bcda..169daca07a 100644
--- a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
+++ b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
@@ -25,7 +25,7 @@ public void InitializeEnsnaring()
     {
         SubscribeLocalEvent<EnsnaringComponent, ComponentRemove>(OnComponentRemove);
         SubscribeLocalEvent<EnsnaringComponent, StepTriggerAttemptEvent>(AttemptStepTrigger);
-        SubscribeLocalEvent<EnsnaringComponent, StepTriggeredOffEvent>(OnStepTrigger);
+        SubscribeLocalEvent<EnsnaringComponent, StepTriggeredEvent>(OnStepTrigger);
         SubscribeLocalEvent<EnsnaringComponent, ThrowDoHitEvent>(OnThrowHit);
         SubscribeLocalEvent<EnsnaringComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
     }
@@ -49,7 +49,7 @@ private void AttemptStepTrigger(EntityUid uid, EnsnaringComponent component, ref
         args.Continue = true;
     }
 
-    private void OnStepTrigger(EntityUid uid, EnsnaringComponent component, ref StepTriggeredOffEvent args)
+    private void OnStepTrigger(EntityUid uid, EnsnaringComponent component, ref StepTriggeredEvent args)
     {
         TryEnsnare(args.Tripper, uid, component);
     }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 1a5a5c4011..6351d999a9 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -331,7 +331,7 @@ public void QueueExplosion(MapCoordinates epicenter,
         CameraShake(iterationIntensity.Count * 4f, epicenter, totalIntensity);
 
         //For whatever bloody reason, sound system requires ENTITY coordinates.
-        var mapEntityCoords = EntityCoordinates.FromMap(EntityManager, _mapManager.GetMapEntityId(epicenter.MapId), epicenter);
+        var mapEntityCoords = EntityCoordinates.FromMap(_mapManager.GetMapEntityId(epicenter.MapId), epicenter, _transformSystem, EntityManager);
 
         // play sound.
         // for the normal audio, we want everyone in pvs range
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index e24de5a2f6..9b9a042641 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -88,7 +88,7 @@ public override void Initialize()
             SubscribeLocalEvent<TriggerOnCollideComponent, StartCollideEvent>(OnTriggerCollide);
             SubscribeLocalEvent<TriggerOnActivateComponent, ActivateInWorldEvent>(OnActivate);
             SubscribeLocalEvent<TriggerImplantActionComponent, ActivateImplantEvent>(OnImplantTrigger);
-            SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredOffEvent>(OnStepTriggered);
+            SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredEvent>(OnStepTriggered);
             SubscribeLocalEvent<TriggerOnSlipComponent, SlipEvent>(OnSlipTriggered);
             SubscribeLocalEvent<TriggerWhenEmptyComponent, OnEmptyGunShotEvent>(OnEmptyTriggered);
 
@@ -228,7 +228,7 @@ private void OnImplantTrigger(EntityUid uid, TriggerImplantActionComponent compo
             args.Handled = Trigger(uid);
         }
 
-        private void OnStepTriggered(EntityUid uid, TriggerOnStepTriggerComponent component, ref StepTriggeredOffEvent args)
+        private void OnStepTriggered(EntityUid uid, TriggerOnStepTriggerComponent component, ref StepTriggeredEvent args)
         {
             Trigger(uid, args.Tripper);
         }
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 54587e95be..bf69b4b909 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -394,7 +394,7 @@ public EntityCoordinates GetObserverSpawnPoint()
                 // Ideally engine would just spawn them on grid directly I guess? Right now grid traversal is handling it during
                 // update which means we need to add a hack somewhere around it.
                 var spawn = _robustRandom.Pick(_possiblePositions);
-                var toMap = spawn.ToMap(EntityManager);
+                var toMap = spawn.ToMap(EntityManager, _transform);
 
                 if (_mapManager.TryFindGridAt(toMap, out var gridUid, out _))
                 {
diff --git a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
index f83d719c21..98926536b9 100644
--- a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
@@ -201,7 +201,7 @@ private void OnPlayerSpawningEvent(RulePlayerSpawningEvent ev)
 
             if (!gridId.HasValue)
             {
-                Logger.ErrorS("pirates", $"Gridid was null when loading \"{map}\", aborting.");
+                Log.Error($"Gridid was null when loading \"{map}\", aborting.");
                 foreach (var session in ops)
                 {
                     ev.PlayerPool.Add(session);
@@ -230,7 +230,7 @@ private void OnPlayerSpawningEvent(RulePlayerSpawningEvent ev)
             if (spawns.Count == 0)
             {
                 spawns.Add(Transform(pirates.PirateShip).Coordinates);
-                Logger.WarningS("pirates", $"Fell back to default spawn for pirates!");
+                Log.Warning($"Fell back to default spawn for pirates!");
             }
 
             for (var i = 0; i < ops.Length; i++)
diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs
index 627c336a36..d3a717c74a 100644
--- a/Content.Server/Guardian/GuardianSystem.cs
+++ b/Content.Server/Guardian/GuardianSystem.cs
@@ -34,6 +34,7 @@ public sealed class GuardianSystem : EntitySystem
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly BodySystem _bodySystem = default!;
         [Dependency] private readonly SharedContainerSystem _container = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         public override void Initialize()
         {
@@ -328,7 +329,7 @@ private void CheckGuardianMove(
             if (!guardianComponent.GuardianLoose)
                 return;
 
-            if (!guardianXform.Coordinates.InRange(EntityManager, hostXform.Coordinates, guardianComponent.DistanceAllowed))
+            if (!guardianXform.Coordinates.InRange(EntityManager, _transform, hostXform.Coordinates, guardianComponent.DistanceAllowed))
                 RetractGuardian(hostUid, hostComponent, guardianUid, guardianComponent);
         }
 
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index a783a9e096..a0e872dbeb 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -31,6 +31,7 @@ public sealed class HandsSystem : SharedHandsSystem
         [Dependency] private readonly VirtualItemSystem _virtualItemSystem = default!;
         [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly PullingSystem _pullingSystem = default!;
         [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
 
@@ -191,7 +192,7 @@ hands.ActiveHandEntity is not { } throwEnt ||
                 throwEnt = splitStack.Value;
             }
 
-            var direction = coordinates.ToMapPos(EntityManager) - Transform(player).WorldPosition;
+            var direction = coordinates.ToMapPos(EntityManager, _transformSystem) - Transform(player).WorldPosition;
             if (direction == Vector2.Zero)
                 return true;
 
diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs
index ac415a0434..8eb2741448 100644
--- a/Content.Server/Implants/SubdermalImplantSystem.cs
+++ b/Content.Server/Implants/SubdermalImplantSystem.cs
@@ -99,7 +99,7 @@ private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component,
             return;
 
         var xform = Transform(ent);
-        var entityCoords = xform.Coordinates.ToMap(EntityManager);
+        var entityCoords = xform.Coordinates.ToMap(EntityManager, _xform);
 
         // try to find a valid position to teleport to, teleport to whatever works if we can't
         var targetCoords = new MapCoordinates();
diff --git a/Content.Server/LandMines/LandMineComponent.cs b/Content.Server/LandMines/LandMineComponent.cs
index 1c4ba06691..63e1e4b99f 100644
--- a/Content.Server/LandMines/LandMineComponent.cs
+++ b/Content.Server/LandMines/LandMineComponent.cs
@@ -1,13 +1,6 @@
-using Robust.Shared.Audio;
-
-namespace Content.Server.LandMines;
+namespace Content.Server.LandMines;
 
 [RegisterComponent]
 public sealed partial class LandMineComponent : Component
 {
-    /// <summary>
-    /// Trigger sound effect when stepping onto landmine
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public SoundSpecifier? Sound;
 }
diff --git a/Content.Server/LandMines/LandMineSystem.cs b/Content.Server/LandMines/LandMineSystem.cs
index 22dedb9337..78c48ef99e 100644
--- a/Content.Server/LandMines/LandMineSystem.cs
+++ b/Content.Server/LandMines/LandMineSystem.cs
@@ -1,43 +1,43 @@
-using Content.Server.Explosion.EntitySystems;
+using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Popups;
+using Content.Shared.StepTrigger;
 using Content.Shared.StepTrigger.Systems;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Server.LandMines;
 
 public sealed class LandMineSystem : EntitySystem
 {
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly TriggerSystem _trigger = default!;
 
+
     public override void Initialize()
     {
-        SubscribeLocalEvent<LandMineComponent, StepTriggeredOnEvent>(HandleStepOnTriggered);
-        SubscribeLocalEvent<LandMineComponent, StepTriggeredOffEvent>(HandleStepOffTriggered);
-
-        SubscribeLocalEvent<LandMineComponent, StepTriggerAttemptEvent>(HandleStepTriggerAttempt);
+        SubscribeLocalEvent<LandMineComponent, StepTriggeredEvent>(HandleTriggered);
+        SubscribeLocalEvent<LandMineComponent, StepTriggerAttemptEvent>(HandleTriggerAttempt);
     }
 
-    private void HandleStepOnTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOnEvent args)
+    private static void HandleTriggerAttempt(
+        EntityUid uid,
+        LandMineComponent component,
+        ref StepTriggerAttemptEvent args)
     {
-        _popupSystem.PopupCoordinates(
-            Loc.GetString("land-mine-triggered", ("mine", uid)),
-            Transform(uid).Coordinates,
-            args.Tripper,
-            PopupType.LargeCaution);
-
-        _audioSystem.PlayPvs(component.Sound, uid);
-    }
-
-    private void HandleStepOffTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOffEvent args)
-    {
-        _trigger.Trigger(uid, args.Tripper);
+        args.Continue = true;
     }
 
-    private static void HandleStepTriggerAttempt(EntityUid uid, LandMineComponent component, ref StepTriggerAttemptEvent args)
+    private void HandleTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredEvent args)
     {
-        args.Continue = true;
+        // This doesn't use TriggerOnStepTrigger since we don't want to display the popup if nothing happens
+        // and I didn't feel like making an `AfterTrigger` event
+        if (_trigger.Trigger(uid, args.Tripper))
+        {
+            _popupSystem.PopupCoordinates(
+                Loc.GetString("land-mine-triggered", ("mine", uid)),
+                Transform(uid).Coordinates,
+                args.Tripper,
+                PopupType.LargeCaution);
+        }
     }
 }
+
diff --git a/Content.Server/Language/Commands/ListLanguagesCommand.cs b/Content.Server/Language/Commands/ListLanguagesCommand.cs
new file mode 100644
index 0000000000..6698e1b645
--- /dev/null
+++ b/Content.Server/Language/Commands/ListLanguagesCommand.cs
@@ -0,0 +1,39 @@
+using System.Linq;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+using Robust.Shared.Enums;
+
+namespace Content.Server.Language.Commands;
+
+[AnyCommand]
+public sealed class ListLanguagesCommand : IConsoleCommand
+{
+    public string Command => "languagelist";
+    public string Description => Loc.GetString("command-list-langs-desc");
+    public string Help => Loc.GetString("command-list-langs-help", ("command", Command));
+
+    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (shell.Player is not { } player)
+        {
+            shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
+            return;
+        }
+
+        if (player.Status != SessionStatus.InGame)
+            return;
+
+        if (player.AttachedEntity is not {} playerEntity)
+        {
+            shell.WriteError(Loc.GetString("shell-must-be-attached-to-entity"));
+            return;
+        }
+
+        var languages = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
+
+        var (spokenLangs, knownLangs) = languages.GetAllLanguages(playerEntity);
+
+        shell.WriteLine("Spoken:\n" + string.Join("\n", spokenLangs));
+        shell.WriteLine("Understood:\n" + string.Join("\n", knownLangs));
+    }
+}
diff --git a/Content.Server/Language/Commands/SayLanguageCommand.cs b/Content.Server/Language/Commands/SayLanguageCommand.cs
new file mode 100644
index 0000000000..2e4a27b1dc
--- /dev/null
+++ b/Content.Server/Language/Commands/SayLanguageCommand.cs
@@ -0,0 +1,53 @@
+using Content.Server.Chat.Systems;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+using Robust.Shared.Enums;
+
+namespace Content.Server.Language.Commands;
+
+[AnyCommand]
+public sealed class SayLanguageCommand : IConsoleCommand
+{
+    public string Command => "saylang";
+    public string Description => Loc.GetString("command-saylang-desc");
+    public string Help => Loc.GetString("command-saylang-help", ("command", Command));
+
+    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (shell.Player is not { } player)
+        {
+            shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
+            return;
+        }
+
+        if (player.Status != SessionStatus.InGame)
+            return;
+
+        if (player.AttachedEntity is not {} playerEntity)
+        {
+            shell.WriteError(Loc.GetString("shell-must-be-attached-to-entity"));
+            return;
+        }
+
+        if (args.Length < 2)
+            return;
+
+        var languageId = args[0];
+        var message = string.Join(" ", args, startIndex: 1, count: args.Length - 1).Trim();
+
+        if (string.IsNullOrEmpty(message))
+            return;
+
+        var languages = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
+        var chats = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
+
+        var language = languages.GetLanguagePrototype(languageId);
+        if (language == null || !languages.CanSpeak(playerEntity, language.ID))
+        {
+            shell.WriteError($"Language {languageId} is invalid or you cannot speak it!");
+            return;
+        }
+
+        chats.TrySendInGameICMessage(playerEntity, message, InGameICChatType.Speak, ChatTransmitRange.Normal, false, shell, player, languageOverride: language);
+    }
+}
diff --git a/Content.Server/Language/Commands/SelectLanguageCommand.cs b/Content.Server/Language/Commands/SelectLanguageCommand.cs
new file mode 100644
index 0000000000..e336384653
--- /dev/null
+++ b/Content.Server/Language/Commands/SelectLanguageCommand.cs
@@ -0,0 +1,48 @@
+using System.Linq;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+using Robust.Shared.Enums;
+
+namespace Content.Server.Language.Commands;
+
+[AnyCommand]
+public sealed class SelectLanguageCommand : IConsoleCommand
+{
+    public string Command => "languageselect";
+    public string Description => Loc.GetString("command-language-select-desc");
+    public string Help => Loc.GetString("command-language-select-help", ("command", Command));
+
+    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (shell.Player is not { } player)
+        {
+            shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
+            return;
+        }
+
+        if (player.Status != SessionStatus.InGame)
+            return;
+
+        if (player.AttachedEntity is not { } playerEntity)
+        {
+            shell.WriteError(Loc.GetString("shell-must-be-attached-to-entity"));
+            return;
+        }
+
+        if (args.Length < 1)
+            return;
+
+        var languageId = args[0];
+
+        var languages = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
+
+        var language = languages.GetLanguagePrototype(languageId);
+        if (language == null || !languages.CanSpeak(playerEntity, language.ID))
+        {
+            shell.WriteError($"Language {languageId} is invalid or you cannot speak it!");
+            return;
+        }
+
+        languages.SetLanguage(playerEntity, language.ID);
+    }
+}
diff --git a/Content.Server/Language/DetermineEntityLanguagesEvent.cs b/Content.Server/Language/DetermineEntityLanguagesEvent.cs
new file mode 100644
index 0000000000..13ab2cac27
--- /dev/null
+++ b/Content.Server/Language/DetermineEntityLanguagesEvent.cs
@@ -0,0 +1,29 @@
+namespace Content.Server.Language;
+
+/// <summary>
+///   Raised in order to determine the language an entity speaks at the current moment,
+///   as well as the list of all languages the entity may speak and understand.
+/// </summary>
+public sealed class DetermineEntityLanguagesEvent : EntityEventArgs
+{
+    /// <summary>
+    ///   The default language of this entity. If empty, remain unchanged.
+    ///   This field has no effect if the entity decides to speak in a concrete language.
+    /// </summary>
+    public string CurrentLanguage;
+    /// <summary>
+    ///   The list of all languages the entity may speak. Must NOT be held as a reference!
+    /// </summary>
+    public List<string> SpokenLanguages;
+    /// <summary>
+    ///   The list of all languages the entity may understand. Must NOT be held as a reference!
+    /// </summary>
+    public List<string> UnderstoodLanguages;
+
+    public DetermineEntityLanguagesEvent(string currentLanguage, List<string> spokenLanguages, List<string> understoodLanguages)
+    {
+        CurrentLanguage = currentLanguage;
+        SpokenLanguages = spokenLanguages;
+        UnderstoodLanguages = understoodLanguages;
+    }
+}
diff --git a/Content.Server/Language/LanguageSystem.Networking.cs b/Content.Server/Language/LanguageSystem.Networking.cs
new file mode 100644
index 0000000000..7517b4185e
--- /dev/null
+++ b/Content.Server/Language/LanguageSystem.Networking.cs
@@ -0,0 +1,59 @@
+using Content.Server.Mind;
+using Content.Shared.Language;
+using Content.Shared.Language.Events;
+using Content.Shared.Mind;
+using Content.Shared.Mind.Components;
+using Robust.Shared.Player;
+
+namespace Content.Server.Language;
+
+/// <summary>
+///   LanguageSystem Networking
+///   This is used to update client state when mind change entity.
+/// </summary>
+
+public sealed partial class LanguageSystem
+{
+    [Dependency] private readonly MindSystem _mind = default!;
+
+
+    public void InitializeNet()
+    {
+        // Refresh the client's state when its mind hops to a different entity
+        SubscribeLocalEvent<MindContainerComponent, MindAddedMessage>((uid, _, _) => SendLanguageStateToClient(uid));
+        SubscribeLocalEvent<MindComponent, MindGotRemovedEvent>((_, _, args) =>
+        {
+            if (args.Mind.Comp.Session != null)
+                SendLanguageStateToClient(args.Mind.Comp.Session);
+        });
+
+        SubscribeLocalEvent<LanguageSpeakerComponent, LanguagesUpdateEvent>((uid, comp, _) => SendLanguageStateToClient(uid, comp));
+        SubscribeNetworkEvent<RequestLanguagesMessage>((_, session) => SendLanguageStateToClient(session.SenderSession));
+    }
+
+
+    private void SendLanguageStateToClient(EntityUid uid, LanguageSpeakerComponent? comp = null)
+    {
+        // Try to find a mind inside the entity and notify its session
+        if (!_mind.TryGetMind(uid, out _, out var mindComp) || mindComp.Session == null)
+            return;
+
+        SendLanguageStateToClient(uid, mindComp.Session, comp);
+    }
+
+    private void SendLanguageStateToClient(ICommonSession session, LanguageSpeakerComponent? comp = null)
+    {
+        // Try to find an entity associated with the session and resolve the languages from it
+        if (session.AttachedEntity is not { Valid: true } entity)
+            return;
+
+        SendLanguageStateToClient(entity, session, comp);
+    }
+
+    private void SendLanguageStateToClient(EntityUid uid, ICommonSession session, LanguageSpeakerComponent? component = null)
+    {
+        var langs = GetLanguages(uid, component);
+        var message = new LanguagesUpdatedMessage(langs.CurrentLanguage, langs.SpokenLanguages, langs.UnderstoodLanguages);
+        RaiseNetworkEvent(message, session);
+    }
+}
diff --git a/Content.Server/Language/LanguageSystem.cs b/Content.Server/Language/LanguageSystem.cs
new file mode 100644
index 0000000000..f1bf44c1f4
--- /dev/null
+++ b/Content.Server/Language/LanguageSystem.cs
@@ -0,0 +1,289 @@
+using System.Linq;
+using System.Text;
+using Content.Server.GameTicking.Events;
+using Content.Shared.Language;
+using Content.Shared.Language.Events;
+using Content.Shared.Language.Systems;
+using Robust.Shared.Random;
+using UniversalLanguageSpeakerComponent = Content.Shared.Language.Components.UniversalLanguageSpeakerComponent;
+
+namespace Content.Server.Language;
+
+public sealed partial class LanguageSystem : SharedLanguageSystem
+{
+    // Static and re-used event instances used to minimize memory allocations during language processing, which can happen many times per tick.
+    // These are used in the method GetLanguages and returned from it. They should never be mutated outside of that method or returned outside this system.
+    private readonly DetermineEntityLanguagesEvent
+        _determineLanguagesEvent = new(string.Empty, new(), new()),
+        _universalLanguagesEvent = new(UniversalPrototype, [UniversalPrototype], [UniversalPrototype]); // Returned for universal speakers only
+
+    /// <summary>
+    ///   A random number added to each pseudo-random number's seed. Changes every round.
+    /// </summary>
+    public int RandomRoundSeed { get; private set; }
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeNetworkEvent<LanguagesSetMessage>(OnClientSetLanguage);
+        SubscribeLocalEvent<LanguageSpeakerComponent, ComponentInit>(OnInitLanguageSpeaker);
+        SubscribeLocalEvent<RoundStartingEvent>(_ => RandomRoundSeed = _random.Next());
+
+        InitializeNet();
+    }
+
+
+    #region public api
+    /// <summary>
+    ///   Obfuscate a message using an entity's default language.
+    /// </summary>
+    public string ObfuscateSpeech(EntityUid source, string message)
+    {
+        var language = GetLanguage(source) ?? Universal;
+        return ObfuscateSpeech(message, language);
+    }
+
+    /// <summary>
+    ///     Obfuscate a message using the given language.
+    /// </summary>
+    public string ObfuscateSpeech(string message, LanguagePrototype language)
+    {
+        var builder = new StringBuilder();
+        if (language.ObfuscateSyllables)
+            ObfuscateSyllables(builder, message, language);
+        else
+            ObfuscatePhrases(builder, message, language);
+
+        return builder.ToString();
+    }
+
+    public bool CanUnderstand(EntityUid listener, LanguagePrototype language, LanguageSpeakerComponent? listenerLanguageComp = null)
+    {
+        if (language.ID == UniversalPrototype || HasComp<UniversalLanguageSpeakerComponent>(listener))
+            return true;
+
+        var listenerLanguages = GetLanguages(listener, listenerLanguageComp)?.UnderstoodLanguages;
+
+        return listenerLanguages?.Contains(language.ID, StringComparer.Ordinal) ?? false;
+    }
+
+    public bool CanSpeak(EntityUid speaker, string language, LanguageSpeakerComponent? speakerComp = null)
+    {
+        if (HasComp<UniversalLanguageSpeakerComponent>(speaker))
+            return true;
+
+        var langs = GetLanguages(speaker, speakerComp)?.UnderstoodLanguages;
+        return langs?.Contains(language, StringComparer.Ordinal) ?? false;
+    }
+
+    /// <summary>
+    ///     Returns the current language of the given entity.
+    ///     Assumes Universal if not specified.
+    /// </summary>
+    public LanguagePrototype GetLanguage(EntityUid speaker, LanguageSpeakerComponent? languageComp = null)
+    {
+        var id = GetLanguages(speaker, languageComp)?.CurrentLanguage;
+        if (id == null)
+            return Universal; // Fallback
+
+        _prototype.TryIndex(id, out LanguagePrototype? proto);
+
+        return proto ?? Universal;
+    }
+
+    public void SetLanguage(EntityUid speaker, string language, LanguageSpeakerComponent? languageComp = null)
+    {
+        if (!CanSpeak(speaker, language) || HasComp<UniversalLanguageSpeakerComponent>(speaker))
+            return;
+
+        if (languageComp == null && !TryComp(speaker, out languageComp))
+            return;
+
+        if (languageComp.CurrentLanguage == language)
+            return;
+
+        languageComp.CurrentLanguage = language;
+
+        RaiseLocalEvent(speaker, new LanguagesUpdateEvent(), true);
+    }
+
+    /// <summary>
+    ///   Adds a new language to the lists of understood and/or spoken languages of the given component.
+    /// </summary>
+    public void AddLanguage(LanguageSpeakerComponent comp, string language, bool addSpoken = true, bool addUnderstood = true)
+    {
+        if (addSpoken && !comp.SpokenLanguages.Contains(language))
+            comp.SpokenLanguages.Add(language);
+
+        if (addUnderstood && !comp.UnderstoodLanguages.Contains(language))
+            comp.UnderstoodLanguages.Add(language);
+
+        RaiseLocalEvent(comp.Owner, new LanguagesUpdateEvent(), true);
+    }
+
+    public (List<string> spoken, List<string> understood) GetAllLanguages(EntityUid speaker)
+    {
+        var languages = GetLanguages(speaker);
+        // The lists need to be copied because the internal ones are re-used for performance reasons.
+        return (new List<string>(languages.SpokenLanguages), new List<string>(languages.UnderstoodLanguages));
+    }
+
+    /// <summary>
+    ///   Ensures the given entity has a valid language as its current language.
+    ///   If not, sets it to the first entry of its SpokenLanguages list, or universal if it's empty.
+    /// </summary>
+    public void EnsureValidLanguage(EntityUid entity, LanguageSpeakerComponent? comp = null)
+    {
+        if (comp == null && !TryComp(entity, out comp))
+            return;
+
+        var langs = GetLanguages(entity, comp);
+        if (!langs.SpokenLanguages.Contains(comp!.CurrentLanguage, StringComparer.Ordinal))
+        {
+            comp.CurrentLanguage = langs.SpokenLanguages.FirstOrDefault(UniversalPrototype);
+            RaiseLocalEvent(comp.Owner, new LanguagesUpdateEvent(), true);
+        }
+    }
+    #endregion
+
+    #region event handling
+    private void OnInitLanguageSpeaker(EntityUid uid, LanguageSpeakerComponent component, ComponentInit args)
+    {
+        if (string.IsNullOrEmpty(component.CurrentLanguage))
+            component.CurrentLanguage = component.SpokenLanguages.FirstOrDefault(UniversalPrototype);
+    }
+    #endregion
+
+    #region internal api - obfuscation
+    private void ObfuscateSyllables(StringBuilder builder, string message, LanguagePrototype language)
+    {
+        // Go through each word. Calculate its hash sum and count the number of letters.
+        // Replicate it with pseudo-random syllables of pseudo-random (but similar) length. Use the hash code as the seed.
+        // This means that identical words will be obfuscated identically. Simple words like "hello" or "yes" in different langs can be memorized.
+        var wordBeginIndex = 0;
+        var hashCode = 0;
+        for (var i = 0; i < message.Length; i++)
+        {
+            var ch = char.ToLower(message[i]);
+            // A word ends when one of the following is found: a space, a sentence end, or EOM
+            if (char.IsWhiteSpace(ch) || IsSentenceEnd(ch) || i == message.Length - 1)
+            {
+                var wordLength = i - wordBeginIndex;
+                if (wordLength > 0)
+                {
+                    var newWordLength = PseudoRandomNumber(hashCode, 1, 4);
+
+                    for (var j = 0; j < newWordLength; j++)
+                    {
+                        var index = PseudoRandomNumber(hashCode + j, 0, language.Replacement.Count);
+                        builder.Append(language.Replacement[index]);
+                    }
+                }
+
+                builder.Append(ch);
+                hashCode = 0;
+                wordBeginIndex = i + 1;
+            }
+            else
+                hashCode = hashCode * 31 + ch;
+        }
+    }
+
+    private void ObfuscatePhrases(StringBuilder builder, string message, LanguagePrototype language)
+    {
+        // In a similar manner, each phrase is obfuscated with a random number of conjoined obfuscation phrases.
+        // However, the number of phrases depends on the number of characters in the original phrase.
+        var sentenceBeginIndex = 0;
+        for (var i = 0; i < message.Length; i++)
+        {
+            var ch = char.ToLower(message[i]);
+            if (IsSentenceEnd(ch) || i == message.Length - 1)
+            {
+                var length = i - sentenceBeginIndex;
+                if (length > 0)
+                {
+                    var newLength = (int) Math.Clamp(Math.Cbrt(length) - 1, 1, 4); // 27+ chars for 2 phrases, 64+ for 3, 125+ for 4.
+
+                    for (var j = 0; j < newLength; j++)
+                    {
+                        var phrase = _random.Pick(language.Replacement);
+                        builder.Append(phrase);
+                    }
+                }
+                sentenceBeginIndex = i + 1;
+
+                if (IsSentenceEnd(ch))
+                    builder.Append(ch).Append(" ");
+            }
+        }
+    }
+
+    private static bool IsSentenceEnd(char ch)
+    {
+        return ch is '.' or '!' or '?';
+    }
+    #endregion
+
+    #region internal api - misc
+    /// <summary>
+    ///   Dynamically resolves the current language of the entity and the list of all languages it speaks.
+    ///
+    ///   If the entity is not a language speaker, or is a universal language speaker, then it's assumed to speak Universal,
+    ///   aka all languages at once and none at the same time.
+    /// </summary>
+    /// <remarks>
+    ///   The returned event is reused and thus must not be held as a reference anywhere but inside the caller function.
+    /// </remarks>
+    private DetermineEntityLanguagesEvent GetLanguages(EntityUid speaker, LanguageSpeakerComponent? comp = null)
+    {
+        // This is a shortcut for ghosts and entities that should not speak normally (admemes)
+        if (HasComp<UniversalLanguageSpeakerComponent>(speaker) || !TryComp(speaker, out comp))
+            return _universalLanguagesEvent;
+
+        var ev = _determineLanguagesEvent;
+        ev.SpokenLanguages.Clear();
+        ev.UnderstoodLanguages.Clear();
+
+        ev.CurrentLanguage = comp.CurrentLanguage;
+        ev.SpokenLanguages.AddRange(comp.SpokenLanguages);
+        ev.UnderstoodLanguages.AddRange(comp.UnderstoodLanguages);
+
+        RaiseLocalEvent(speaker, ev, true);
+
+        if (ev.CurrentLanguage.Length == 0)
+            ev.CurrentLanguage = !string.IsNullOrEmpty(comp.CurrentLanguage) ? comp.CurrentLanguage : UniversalPrototype; // Fall back to account for admemes like admins possessing a bread
+        return ev;
+    }
+
+    /// <summary>
+    ///   Generates a stable pseudo-random number in the range (min, max) for the given seed.
+    ///   Each input seed corresponds to exactly one random number.
+    /// </summary>
+    private int PseudoRandomNumber(int seed, int min, int max)
+    {
+        // This is not a uniform distribution, but it shouldn't matter given there's 2^31 possible random numbers,
+        //   the bias of this function should be so tiny it will never be noticed.
+        seed += RandomRoundSeed;
+        var random = ((seed * 1103515245) + 12345) & 0x7fffffff; // Source: http://cs.uccs.edu/~cs591/bufferOverflow/glibc-2.2.4/stdlib/random_r.c
+        return random % (max - min) + min;
+    }
+
+    /// <summary>
+    ///   Set CurrentLanguage of the client, the client must be able to Understand the language requested.
+    /// </summary>
+    private void OnClientSetLanguage(LanguagesSetMessage message, EntitySessionEventArgs args)
+    {
+        if (args.SenderSession.AttachedEntity is not {Valid: true} speaker)
+            return;
+
+        var language = GetLanguagePrototype(message.CurrentLanguage);
+
+        if (language == null || !CanSpeak(speaker, language.ID))
+            return;
+
+        SetLanguage(speaker, language.ID);
+    }
+    #endregion
+}
diff --git a/Content.Server/Language/TranslatorImplanterSystem.cs b/Content.Server/Language/TranslatorImplanterSystem.cs
new file mode 100644
index 0000000000..1e0c13375e
--- /dev/null
+++ b/Content.Server/Language/TranslatorImplanterSystem.cs
@@ -0,0 +1,72 @@
+using System.Linq;
+using Content.Server.Administration.Logs;
+using Content.Server.Popups;
+using Content.Shared.Database;
+using Content.Shared.Interaction;
+using Content.Shared.Language;
+using Content.Shared.Language.Components;
+using Content.Shared.Language.Events;
+using Content.Shared.Language.Systems;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Language.Components.Translators;
+
+namespace Content.Server.Language;
+
+public sealed class TranslatorImplanterSystem : SharedTranslatorImplanterSystem
+{
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly LanguageSystem _language = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TranslatorImplanterComponent, AfterInteractEvent>(OnImplant);
+    }
+
+
+    private void OnImplant(EntityUid implanter, TranslatorImplanterComponent component, AfterInteractEvent args)
+    {
+        if (component.Used || !args.CanReach || args.Target is not { Valid: true } target)
+            return;
+
+        if (!TryComp<LanguageSpeakerComponent>(target, out var speaker))
+            return;
+
+        if (component.MobsOnly && !HasComp<MobStateComponent>(target))
+        {
+            _popup.PopupEntity("translator-implanter-refuse", component.Owner);
+            return;
+        }
+
+        var understood = _language.GetAllLanguages(target).understood;
+        if (component.RequiredLanguages.Count > 0 && !component.RequiredLanguages.Any(lang => understood.Contains(lang)))
+        {
+            _popup.PopupEntity(Loc.GetString("translator-implanter-refuse",
+                ("implanter", implanter), ("target", target)), implanter);
+            return;
+        }
+
+        var intrinsic = EnsureComp<ImplantedTranslatorComponent>(target);
+        intrinsic.Enabled = true;
+
+        foreach (var lang in component.SpokenLanguages.Where(lang => !intrinsic.SpokenLanguages.Contains(lang)))
+            intrinsic.SpokenLanguages.Add(lang);
+
+        foreach (var lang in component.UnderstoodLanguages.Where(lang => !intrinsic.UnderstoodLanguages.Contains(lang)))
+            intrinsic.UnderstoodLanguages.Add(lang);
+
+        component.Used = true;
+        _popup.PopupEntity(Loc.GetString("translator-implanter-success",
+            ("implanter", implanter), ("target", target)), implanter);
+
+        _adminLogger.Add(LogType.Action, LogImpact.Medium,
+            $"{ToPrettyString(args.User):player} used {ToPrettyString(implanter):implanter} to give {ToPrettyString(target):target} the following languages:"
+            + $"\nSpoken: {string.Join(", ", component.SpokenLanguages)}; Understood: {string.Join(", ", component.UnderstoodLanguages)}");
+
+        OnAppearanceChange(implanter, component);
+        RaiseLocalEvent(target, new LanguagesUpdateEvent(), true);
+    }
+}
diff --git a/Content.Server/Language/TranslatorSystem.cs b/Content.Server/Language/TranslatorSystem.cs
new file mode 100644
index 0000000000..3b7704b9a7
--- /dev/null
+++ b/Content.Server/Language/TranslatorSystem.cs
@@ -0,0 +1,225 @@
+using System.Linq;
+using Content.Server.Popups;
+using Content.Server.PowerCell;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Language;
+using Content.Shared.Language.Events;
+using Content.Shared.Language.Systems;
+using Content.Shared.PowerCell;
+using Content.Shared.Language.Components.Translators;
+
+namespace Content.Server.Language;
+
+// This does not support holding multiple translators at once.
+// That shouldn't be an issue for now, but it needs to be fixed later.
+public sealed class TranslatorSystem : SharedTranslatorSystem
+{
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly LanguageSystem _language = default!;
+    [Dependency] private readonly PowerCellSystem _powerCell = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        // I wanna die. But my death won't help us discover polymorphism.
+        SubscribeLocalEvent<IntrinsicTranslatorComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
+        SubscribeLocalEvent<HoldsTranslatorComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
+        SubscribeLocalEvent<ImplantedTranslatorComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
+
+        SubscribeLocalEvent<HandheldTranslatorComponent, ActivateInWorldEvent>(OnTranslatorToggle);
+        SubscribeLocalEvent<HandheldTranslatorComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
+
+        // TODO: why does this use InteractHandEvent??
+        SubscribeLocalEvent<HandheldTranslatorComponent, InteractHandEvent>(OnTranslatorInteract);
+        SubscribeLocalEvent<HandheldTranslatorComponent, DroppedEvent>(OnTranslatorDropped);
+    }
+
+    private void OnDetermineLanguages(EntityUid uid, IntrinsicTranslatorComponent component,
+        DetermineEntityLanguagesEvent ev)
+    {
+        if (!component.Enabled)
+            return;
+
+        if (!_powerCell.HasActivatableCharge(uid))
+            return;
+
+        var addUnderstood = true;
+        var addSpoken = true;
+        if (component.RequiredLanguages.Count > 0)
+        {
+            if (component.RequiresAllLanguages)
+            {
+                // Add langs when the wielder has all of the required languages
+                foreach (var language in component.RequiredLanguages)
+                {
+                    if (!ev.SpokenLanguages.Contains(language, StringComparer.Ordinal))
+                        addSpoken = false;
+
+                    if (!ev.UnderstoodLanguages.Contains(language, StringComparer.Ordinal))
+                        addUnderstood = false;
+                }
+            }
+            else
+            {
+                // Add langs when the wielder has at least one of the required languages
+                addUnderstood = false;
+                addSpoken = false;
+                foreach (var language in component.RequiredLanguages)
+                {
+                    if (ev.SpokenLanguages.Contains(language, StringComparer.Ordinal))
+                        addSpoken = true;
+
+                    if (ev.UnderstoodLanguages.Contains(language, StringComparer.Ordinal))
+                        addUnderstood = true;
+                }
+            }
+        }
+
+        if (addSpoken)
+        {
+            foreach (var language in component.SpokenLanguages)
+                AddIfNotExists(ev.SpokenLanguages, language);
+
+            if (component.DefaultLanguageOverride != null && ev.CurrentLanguage.Length == 0)
+                ev.CurrentLanguage = component.DefaultLanguageOverride;
+        }
+
+        if (addUnderstood)
+            foreach (var language in component.UnderstoodLanguages)
+                AddIfNotExists(ev.UnderstoodLanguages, language);
+    }
+
+    private void OnTranslatorInteract( EntityUid translator, HandheldTranslatorComponent component, InteractHandEvent args)
+    {
+        var holder = args.User;
+        if (!EntityManager.HasComponent<LanguageSpeakerComponent>(holder))
+            return;
+
+        var intrinsic = EnsureComp<HoldsTranslatorComponent>(holder);
+        UpdateBoundIntrinsicComp(component, intrinsic, component.Enabled);
+
+        RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
+    }
+
+    private void OnTranslatorDropped(EntityUid translator, HandheldTranslatorComponent component, DroppedEvent args)
+    {
+        var holder = args.User;
+        if (!EntityManager.TryGetComponent<HoldsTranslatorComponent>(holder, out var intrinsic))
+            return;
+
+        if (intrinsic.Issuer == component)
+        {
+            intrinsic.Enabled = false;
+            RemCompDeferred(holder, intrinsic);
+        }
+
+        _language.EnsureValidLanguage(holder);
+
+        RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
+    }
+
+    private void OnTranslatorToggle(EntityUid translator, HandheldTranslatorComponent component, ActivateInWorldEvent args)
+    {
+        if (!component.ToggleOnInteract)
+            return;
+
+        var hasPower = _powerCell.HasDrawCharge(translator);
+
+        if (Transform(args.Target).ParentUid is { Valid: true } holder
+            && EntityManager.HasComponent<LanguageSpeakerComponent>(holder))
+        {
+            // This translator is held by a language speaker and thus has an intrinsic counterpart bound to it.
+            // Make sure it's up-to-date.
+            var intrinsic = EnsureComp<HoldsTranslatorComponent>(holder);
+            var isEnabled = !component.Enabled;
+            if (intrinsic.Issuer != component)
+            {
+                // The intrinsic comp wasn't owned by this handheld component, so this comp wasn't the active translator.
+                // Thus it needs to be turned on regardless of its previous state.
+                intrinsic.Issuer = component;
+                isEnabled = true;
+            }
+
+            isEnabled &= hasPower;
+            UpdateBoundIntrinsicComp(component, intrinsic, isEnabled);
+            component.Enabled = isEnabled;
+            _powerCell.SetPowerCellDrawEnabled(translator, isEnabled);
+
+            _language.EnsureValidLanguage(holder);
+            RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
+        }
+        else
+        {
+            // This is a standalone translator (e.g. lying on the ground), toggle its state.
+            component.Enabled = !component.Enabled && hasPower;
+            _powerCell.SetPowerCellDrawEnabled(translator, !component.Enabled && hasPower);
+        }
+
+        OnAppearanceChange(translator, component);
+
+        // HasPower shows a popup when there's no power, so we do not proceed in that case
+        if (hasPower)
+        {
+            var message = Loc.GetString(
+                component.Enabled
+                    ? "translator-component-turnon"
+                    : "translator-component-shutoff",
+                ("translator", component.Owner));
+            _popup.PopupEntity(message, component.Owner, args.User);
+        }
+    }
+
+    private void OnPowerCellSlotEmpty(EntityUid translator, HandheldTranslatorComponent component, PowerCellSlotEmptyEvent args)
+    {
+        component.Enabled = false;
+        _powerCell.SetPowerCellDrawEnabled(translator, false);
+        OnAppearanceChange(translator, component);
+
+        if (Transform(translator).ParentUid is { Valid: true } holder
+            && EntityManager.HasComponent<LanguageSpeakerComponent>(holder))
+        {
+            if (!EntityManager.TryGetComponent<HoldsTranslatorComponent>(holder, out var intrinsic))
+                return;
+
+            if (intrinsic.Issuer == component)
+            {
+                intrinsic.Enabled = false;
+                EntityManager.RemoveComponent(holder, intrinsic);
+            }
+
+            _language.EnsureValidLanguage(holder);
+            RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
+        }
+    }
+
+    /// <summary>
+    ///   Copies the state from the handheld to the intrinsic component
+    /// </summary>
+    private void UpdateBoundIntrinsicComp(HandheldTranslatorComponent comp, HoldsTranslatorComponent intrinsic, bool isEnabled)
+    {
+        if (isEnabled)
+        {
+            intrinsic.SpokenLanguages = new List<string>(comp.SpokenLanguages);
+            intrinsic.UnderstoodLanguages = new List<string>(comp.UnderstoodLanguages);
+            intrinsic.DefaultLanguageOverride = comp.DefaultLanguageOverride;
+        }
+        else
+        {
+            intrinsic.SpokenLanguages.Clear();
+            intrinsic.UnderstoodLanguages.Clear();
+            intrinsic.DefaultLanguageOverride = null;
+        }
+
+        intrinsic.Enabled = isEnabled;
+        intrinsic.Issuer = comp;
+    }
+
+    private static void AddIfNotExists(List<string> list, string item)
+    {
+        if (list.Contains(item))
+            return;
+        list.Add(item);
+    }
+}
diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs
index 2c9b11dbd3..92cd794ce2 100644
--- a/Content.Server/Magic/MagicSystem.cs
+++ b/Content.Server/Magic/MagicSystem.cs
@@ -168,7 +168,7 @@ private void OnProjectileSpell(ProjectileSpellEvent ev)
         foreach (var pos in GetSpawnPositions(xform, ev.Pos))
         {
             // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
-            var mapPos = pos.ToMap(EntityManager);
+            var mapPos = pos.ToMap(EntityManager, _transformSystem);
             var spawnCoords = _mapManager.TryFindGridAt(mapPos, out var gridUid, out _)
                 ? pos.WithEntityId(gridUid, EntityManager)
                 : new(_mapManager.GetMapEntityId(mapPos.MapId), mapPos.Position);
diff --git a/Content.Server/Mind/Commands/MakeSentientCommand.cs b/Content.Server/Mind/Commands/MakeSentientCommand.cs
index 5e19d135b6..cacd499ab8 100644
--- a/Content.Server/Mind/Commands/MakeSentientCommand.cs
+++ b/Content.Server/Mind/Commands/MakeSentientCommand.cs
@@ -1,7 +1,10 @@
 using Content.Server.Administration;
+using Content.Server.Language;
 using Content.Shared.Administration;
 using Content.Shared.Emoting;
 using Content.Shared.Examine;
+using Content.Shared.Language;
+using Content.Shared.Language.Systems;
 using Content.Shared.Mind.Components;
 using Content.Shared.Movement.Components;
 using Content.Shared.Speech;
@@ -55,6 +58,13 @@ public static void MakeSentient(EntityUid uid, IEntityManager entityManager, boo
             {
                 entityManager.EnsureComponent<SpeechComponent>(uid);
                 entityManager.EnsureComponent<EmotingComponent>(uid);
+
+                var language = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
+                var speaker = entityManager.EnsureComponent<LanguageSpeakerComponent>(uid);
+                // If the speaker knows any language (like monkey or robot), they keep those
+                // Otherwise, we give them the fallback
+                if (speaker.SpokenLanguages.Count == 0)
+                    language.AddLanguage(speaker, SharedLanguageSystem.FallbackLanguagePrototype);
             }
 
             entityManager.EnsureComponent<ExaminerComponent>(uid);
diff --git a/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs
index 3e030aa819..3485bd2a18 100644
--- a/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs
@@ -22,6 +22,6 @@ public override bool IsMet(NPCBlackboard blackboard)
         if (!blackboard.TryGetValue<EntityCoordinates>(TargetKey, out var target, _entManager))
             return false;
 
-        return coordinates.InRange(_entManager, target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
+        return coordinates.InRange(_entManager, _entManager.System<SharedTransformSystem>(), target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
     }
 }
diff --git a/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs
index 6d8977bb7a..9d000ca2eb 100644
--- a/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs
@@ -22,7 +22,7 @@ public override bool IsMet(NPCBlackboard blackboard)
         if (!blackboard.TryGetValue<EntityCoordinates>(TargetKey, out var target, _entManager))
             return false;
 
-        return !coordinates.InRange(_entManager, target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
+        return !coordinates.InRange(_entManager, _entManager.System<SharedTransformSystem>(), target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
     }
 }
 
diff --git a/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs
index 5d616ba630..aaccb426d7 100644
--- a/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs
@@ -23,6 +23,6 @@ public override bool IsMet(NPCBlackboard blackboard)
             !_entManager.TryGetComponent<TransformComponent>(target, out var targetXform))
             return false;
 
-        return coordinates.InRange(_entManager, targetXform.Coordinates, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
+        return coordinates.InRange(_entManager, _entManager.System<SharedTransformSystem>(), targetXform.Coordinates, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
     }
 }
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
index 95f931cdd6..a59af88ff5 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
@@ -405,7 +405,7 @@ public async void GetPathEvent(
                 return null;
             }
 
-            var localPos = xform.InvWorldMatrix.Transform(coordinates.ToMapPos(EntityManager));
+            var localPos = xform.InvWorldMatrix.Transform(coordinates.ToMapPos(EntityManager, _transform));
             var origin = GetOrigin(localPos);
 
             if (!TryGetChunk(origin, comp, out var chunk))
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
index 7ac6768e35..e7af2c9107 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
@@ -56,7 +56,30 @@ private bool IsFreeSpace(
             return true;
         }
 
-        return false;
+        // TODO: Ideally for "FreeSpace" we check all entities on the tile and build flags dynamically (pathfinder refactor in future).
+        var ents = _entSetPool.Get();
+        _lookup.GetLocalEntitiesIntersecting(node.GraphUid, node.ChunkOrigin, ents, flags: LookupFlags.Static);
+        var result = true;
+
+        if (ents.Count > 0)
+        {
+            var fixtures = _fixturesQuery.GetComponent(uid);
+            var physics = _physicsQuery.GetComponent(uid);
+
+            foreach (var intersecting in ents)
+            {
+                if (!_physics.IsCurrentlyHardCollidable((uid, fixtures, physics), intersecting))
+                {
+                    continue;
+                }
+
+                result = false;
+                break;
+            }
+        }
+
+        _entSetPool.Return(ents);
+        return result;
     }
 
     /// <summary>
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index fc483f68c3..33941be929 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -43,6 +43,7 @@ public sealed class NPCUtilitySystem : EntitySystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SolutionContainerSystem _solutions = default!;
     [Dependency] private readonly WeldableSystem _weldable = default!;
+    [Dependency] private readonly ExamineSystemShared _examine = default!;
 
     private EntityQuery<PuddleComponent> _puddleQuery;
     private EntityQuery<TransformComponent> _xformQuery;
@@ -296,7 +297,7 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
             {
                 var radius = blackboard.GetValueOrDefault<float>(NPCBlackboard.VisionRadius, EntityManager);
 
-                return ExamineSystemShared.InRangeUnOccluded(owner, targetUid, radius + 0.5f, null) ? 1f : 0f;
+                return _examine.InRangeUnOccluded(owner, targetUid, radius + 0.5f, null) ? 1f : 0f;
             }
             case TargetInLOSOrCurrentCon:
             {
@@ -313,7 +314,7 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
                     return 1f;
                 }
 
-                return ExamineSystemShared.InRangeUnOccluded(owner, targetUid, radius + bufferRange, null) ? 1f : 0f;
+                return _examine.InRangeUnOccluded(owner, targetUid, radius + bufferRange, null) ? 1f : 0f;
             }
             case TargetIsAliveCon:
             {
diff --git a/Content.Server/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
similarity index 83%
rename from Content.Server/Psionics/Abilities/DispelPowerSystem.cs
rename to Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
index cb7ef8313c..d338a5a5bc 100644
--- a/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
@@ -1,20 +1,24 @@
 using Content.Shared.Actions;
 using Content.Shared.StatusEffect;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Damage;
 using Content.Shared.Revenant.Components;
 using Content.Server.Guardian;
 using Content.Server.Bible.Components;
 using Content.Server.Popups;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
+using Content.Shared.Mind;
 using Content.Shared.Actions.Events;
 using Robust.Shared.Audio.Systems;
 
-namespace Content.Server.Psionics.Abilities
+namespace Content.Server.Abilities.Psionics
 {
     public sealed class DispelPowerSystem : EntitySystem
     {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly DamageableSystem _damageableSystem = default!;
@@ -23,6 +27,8 @@ public sealed class DispelPowerSystem : EntitySystem
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
 
 
         public override void Initialize()
@@ -46,13 +52,10 @@ private void OnInit(EntityUid uid, DispelPowerComponent component, ComponentInit
             _actions.TryGetActionData( component.DispelActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.DispelActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
             {
+                psionic.PsionicAbility = component.DispelActionEntity;
                 psionic.ActivePowers.Add(component);
-                psionic.PsychicFeedback.Add(component.DispelFeedback);
-                //It's fully intended that Dispel doesn't increase Amplification, and instead heavily spikes Dampening
-                //Antimage archetype.
-                psionic.Dampening += 1f;
             }
         }
 
@@ -63,16 +66,12 @@ private void OnShutdown(EntityUid uid, DispelPowerComponent component, Component
             if (TryComp<PsionicComponent>(uid, out var psionic))
             {
                 psionic.ActivePowers.Remove(component);
-                psionic.PsychicFeedback.Remove(component.DispelFeedback);
-                psionic.Dampening -= 1f;
             }
         }
 
         private void OnPowerUsed(DispelPowerActionEvent args)
         {
-            if (HasComp<PsionicInsulationComponent>(args.Target) || HasComp<PsionicInsulationComponent>(args.Performer))
-                return;
-            if (!TryComp<PsionicComponent>(args.Performer, out var psionic) || !HasComp<PsionicComponent>(args.Target))
+            if (HasComp<PsionicInsulationComponent>(args.Target))
                 return;
 
             var ev = new DispelledEvent();
@@ -81,9 +80,7 @@ private void OnPowerUsed(DispelPowerActionEvent args)
             if (ev.Handled)
             {
                 args.Handled = true;
-                _psionics.LogPowerUsed(args.Performer, "dispel",
-                    (int) MathF.Round(-2 * psionic.Dampening + psionic.Amplification),
-                    (int) MathF.Round(-4 * psionic.Dampening + psionic.Amplification));
+                _psionics.LogPowerUsed(args.Performer, "dispel");
             }
         }
 
@@ -99,7 +96,7 @@ private void OnDispelled(EntityUid uid, DispellableComponent component, Dispelle
         private void OnDmgDispelled(EntityUid uid, DamageOnDispelComponent component, DispelledEvent args)
         {
             var damage = component.Damage;
-            var modifier = 1 + component.Variance - _random.NextFloat(0, component.Variance * 2);
+            var modifier = (1 + component.Variance) - (_random.NextFloat(0, component.Variance * 2));
 
             damage *= modifier;
             DealDispelDamage(uid, damage);
@@ -148,3 +145,5 @@ public void DealDispelDamage(EntityUid uid, DamageSpecifier? damage = null)
     }
     public sealed class DispelledEvent : HandledEntityEventArgs {}
 }
+
+
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
new file mode 100644
index 0000000000..b775117b71
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
@@ -0,0 +1,74 @@
+using Content.Shared.Actions;
+using Content.Shared.Abilities.Psionics;
+using Content.Shared.StatusEffect;
+using Content.Shared.Popups;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Content.Shared.Mind;
+using Content.Shared.Actions.Events;
+
+namespace Content.Server.Abilities.Psionics
+{
+    public sealed class MetapsionicPowerSystem : EntitySystem
+    {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+        [Dependency] private readonly SharedActionsSystem _actions = default!;
+        [Dependency] private readonly EntityLookupSystem _lookup = default!;
+        [Dependency] private readonly SharedPopupSystem _popups = default!;
+        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<MetapsionicPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<MetapsionicPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<MetapsionicPowerComponent, MetapsionicPowerActionEvent>(OnPowerUsed);
+        }
+
+        private void OnInit(EntityUid uid, MetapsionicPowerComponent component, ComponentInit args)
+        {
+            _actions.AddAction(uid, ref component.MetapsionicActionEntity, component.MetapsionicActionId );
+            _actions.TryGetActionData( component.MetapsionicActionEntity, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.MetapsionicActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            {
+                psionic.PsionicAbility = component.MetapsionicActionEntity;
+                psionic.ActivePowers.Add(component);
+            }
+
+        }
+
+        private void OnShutdown(EntityUid uid, MetapsionicPowerComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.MetapsionicActionEntity);
+
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+            }
+        }
+
+        private void OnPowerUsed(EntityUid uid, MetapsionicPowerComponent component, MetapsionicPowerActionEvent args)
+        {
+            foreach (var entity in _lookup.GetEntitiesInRange(uid, component.Range))
+            {
+                if (HasComp<PsionicComponent>(entity) && entity != uid && !HasComp<PsionicInsulationComponent>(entity) &&
+                    !(HasComp<ClothingGrantPsionicPowerComponent>(entity) && Transform(entity).ParentUid == uid))
+                {
+                    _popups.PopupEntity(Loc.GetString("metapsionic-pulse-success"), uid, uid, PopupType.LargeCaution);
+                    args.Handled = true;
+                    return;
+                }
+            }
+            _popups.PopupEntity(Loc.GetString("metapsionic-pulse-failure"), uid, uid, PopupType.Large);
+            _psionics.LogPowerUsed(uid, "metapsionic pulse", 2, 4);
+
+            args.Handled = true;
+        }
+    }
+}
diff --git a/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
similarity index 78%
rename from Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
rename to Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
index 1e50a586b4..b23224cab4 100644
--- a/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Actions;
-using Content.Shared.Psionics.Abilities;
-using Content.Shared.Psionics;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Speech;
 using Content.Shared.Stealth.Components;
 using Content.Shared.Mobs.Components;
@@ -11,15 +10,19 @@
 using Content.Server.Popups;
 using Content.Server.Psionics;
 using Content.Server.GameTicking;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
 using Content.Shared.Mind;
 using Content.Shared.Actions.Events;
 
-namespace Content.Server.Psionics.Abilities
+namespace Content.Server.Abilities.Psionics
 {
     public sealed class MindSwapPowerSystem : EntitySystem
     {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly MindSystem _mindSystem = default!;
@@ -35,22 +38,20 @@ public override void Initialize()
             SubscribeLocalEvent<MindSwappedComponent, DispelledEvent>(OnDispelled);
             SubscribeLocalEvent<MindSwappedComponent, MobStateChangedEvent>(OnMobStateChanged);
             SubscribeLocalEvent<GhostAttemptHandleEvent>(OnGhostAttempt);
+            //
             SubscribeLocalEvent<MindSwappedComponent, ComponentInit>(OnSwapInit);
-            SubscribeLocalEvent<MindSwappedComponent, ComponentShutdown>(OnSwapShutdown);
-            SubscribeLocalEvent<MindSwappedComponent, PsionicInsulationEvent>(OnInsulated);
         }
 
         private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.MindSwapActionEntity, component.MindSwapActionId);
-            _actions.TryGetActionData( component.MindSwapActionEntity, out var actionData);
+            _actions.AddAction(uid, ref component.MindSwapActionEntity, component.MindSwapActionId );
+            _actions.TryGetActionData( component.MindSwapActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.MindSwapActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
             {
+                psionic.PsionicAbility = component.MindSwapActionEntity;
                 psionic.ActivePowers.Add(component);
-                psionic.PsychicFeedback.Add(component.MindSwapFeedback);
-                psionic.Amplification += 1f;
             }
         }
 
@@ -60,26 +61,20 @@ private void OnShutdown(EntityUid uid, MindSwapPowerComponent component, Compone
             if (TryComp<PsionicComponent>(uid, out var psionic))
             {
                 psionic.ActivePowers.Remove(component);
-                psionic.PsychicFeedback.Remove(component.MindSwapFeedback);
-                psionic.Amplification -= 1f;
             }
         }
 
         private void OnPowerUsed(MindSwapPowerActionEvent args)
         {
-
             if (!(TryComp<DamageableComponent>(args.Target, out var damageable) && damageable.DamageContainerID == "Biological"))
                 return;
 
             if (HasComp<PsionicInsulationComponent>(args.Target))
                 return;
 
-            if (!TryComp<PsionicComponent>(args.Performer, out var psionic))
-                return;
-
             Swap(args.Performer, args.Target);
 
-            _psionics.LogPowerUsed(args.Performer, "mind swap", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 8), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 12));
+            _psionics.LogPowerUsed(args.Performer, "mind swap");
             args.Handled = true;
         }
 
@@ -130,8 +125,8 @@ private void OnDispelled(EntityUid uid, MindSwappedComponent component, Dispelle
 
         private void OnMobStateChanged(EntityUid uid, MindSwappedComponent component, MobStateChangedEvent args)
         {
-            if (args.NewMobState == MobState.Dead || args.NewMobState == MobState.Critical)
-                Swap(uid, component.OriginalEntity, true);
+            if (args.NewMobState == MobState.Dead)
+                RemComp<MindSwappedComponent>(uid);
         }
 
         private void OnGhostAttempt(GhostAttemptHandleEvent args)
@@ -156,21 +151,8 @@ private void OnSwapInit(EntityUid uid, MindSwappedComponent component, Component
             _actions.TryGetActionData( component.MindSwapReturnActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.MindSwapReturnActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Add(component);
-                psionic.PsychicFeedback.Add(component.MindSwappedFeedback);
-            }
-        }
-
-        private void OnSwapShutdown(EntityUid uid, MindSwappedComponent component, ComponentShutdown args)
-        {
-            _actions.RemoveAction(uid, component.MindSwapReturnActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-                psionic.PsychicFeedback.Remove(component.MindSwappedFeedback);
-            }
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+                psionic.PsionicAbility = component.MindSwapReturnActionEntity;
         }
 
         public void Swap(EntityUid performer, EntityUid target, bool end = false)
@@ -183,13 +165,11 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false)
             MindComponent? targetMind = null;
 
             // This is here to prevent missing MindContainerComponent Resolve errors.
-            if (!_mindSystem.TryGetMind(performer, out var performerMindId, out performerMind))
-            {
+            if(!_mindSystem.TryGetMind(performer, out var performerMindId, out performerMind)){
                 performerMind = null;
             };
 
-            if (!_mindSystem.TryGetMind(target, out var targetMindId, out targetMind))
-            {
+            if(!_mindSystem.TryGetMind(target, out var targetMindId, out targetMind)){
                 targetMind = null;
             };
             //This is a terrible way to 'unattach' minds. I wanted to use UnVisit but in TransferTo's code they say
@@ -222,7 +202,7 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false)
             perfComp.OriginalEntity = target;
             targetComp.OriginalEntity = performer;
         }
-        //It shouldn't actually be possible anymore to get trapped under most circumstances, but for niche edge cases, I am leaving this here
+
         public void GetTrapped(EntityUid uid)
         {
 
@@ -240,9 +220,5 @@ public void GetTrapped(EntityUid uid)
                 _metaDataSystem.SetEntityDescription(uid, Loc.GetString("telegnostic-trapped-entity-desc"));
             }
         }
-        public void OnInsulated(EntityUid uid, MindSwappedComponent component, PsionicInsulationEvent args)
-        {
-            Swap(uid, component.OriginalEntity, true);
-        }
     }
 }
diff --git a/Content.Server/Psionics/Abilities/MindSwappedComponent.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
similarity index 79%
rename from Content.Server/Psionics/Abilities/MindSwappedComponent.cs
rename to Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
index 82c0313bca..72cd6a66ef 100644
--- a/Content.Server/Psionics/Abilities/MindSwappedComponent.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Psionics.Abilities
+namespace Content.Server.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class MindSwappedComponent : Component
@@ -14,8 +14,5 @@ public sealed partial class MindSwappedComponent : Component
 
         [DataField("mindSwapReturnActionEntity")]
         public EntityUid? MindSwapReturnActionEntity;
-
-        [DataField("mindSwappedFeedback")]
-        public string MindSwappedFeedback = "mindswapped-feedback";
     }
 }
diff --git a/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
similarity index 54%
rename from Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
rename to Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
index c935bc0123..0fd261ef12 100644
--- a/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
@@ -1,21 +1,26 @@
 using Content.Shared.Actions;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
+using Content.Server.Psionics;
 using Content.Shared.StatusEffect;
-using Content.Server.Electrocution;
 using Content.Server.Stunnable;
 using Content.Server.Beam;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Content.Server.Mind;
 using Content.Shared.Actions.Events;
 
-namespace Content.Server.Psionics.Abilities
+namespace Content.Server.Abilities.Psionics
 {
     public sealed class NoosphericZapPowerSystem : EntitySystem
     {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly StunSystem _stunSystem = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly BeamSystem _beam = default!;
-        [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
+        [Dependency] private readonly MindSystem _mindSystem = default!;
 
 
         public override void Initialize()
@@ -32,11 +37,10 @@ private void OnInit(EntityUid uid, NoosphericZapPowerComponent component, Compon
             _actions.TryGetActionData( component.NoosphericZapActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.NoosphericZapActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
             {
+                psionic.PsionicAbility = component.NoosphericZapActionEntity;
                 psionic.ActivePowers.Add(component);
-                psionic.PsychicFeedback.Add(component.NoosphericZapFeedback);
-                psionic.Amplification += 1f;
             }
         }
 
@@ -46,34 +50,24 @@ private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, Co
             if (TryComp<PsionicComponent>(uid, out var psionic))
             {
                 psionic.ActivePowers.Remove(component);
-                psionic.PsychicFeedback.Remove(component.NoosphericZapFeedback);
-                psionic.Amplification -= 1f;
             }
         }
 
         private void OnPowerUsed(NoosphericZapPowerActionEvent args)
         {
-            if (!TryComp<PsionicComponent>(args.Performer, out var psionic))
+            if (!HasComp<PotentialPsionicComponent>(args.Target))
                 return;
 
-            if (!HasComp<PsionicInsulationComponent>(args.Target) && !HasComp<PsionicInsulationComponent>(args.Performer))
-            {
-                _beam.TryCreateBeam(args.Performer, args.Target, "LightningNoospheric");
-                _stunSystem.TryParalyze(args.Target, TimeSpan.FromSeconds(1 * psionic.Amplification), false);
+            if (HasComp<PsionicInsulationComponent>(args.Target))
+                return;
 
-                _electrocution.TryDoElectrocution(args.Target, null,
-                    (int) MathF.Round(5f * psionic.Amplification),
-                    new TimeSpan((long) MathF.Round(1f * psionic.Amplification)),
-                    true,
-                    ignoreInsulation: true);
+            _beam.TryCreateBeam(args.Performer, args.Target, "LightningNoospheric");
 
-                _statusEffectsSystem.TryAddStatusEffect(args.Target, "Stutter", TimeSpan.FromSeconds(2 * psionic.Amplification), false, "StutteringAccent");
+            _stunSystem.TryParalyze(args.Target, TimeSpan.FromSeconds(5), false);
+            _statusEffectsSystem.TryAddStatusEffect(args.Target, "Stutter", TimeSpan.FromSeconds(10), false, "StutteringAccent");
 
-                _psionics.LogPowerUsed(args.Performer, "noopsheric zap",
-                    (int) MathF.Round(6 * psionic.Amplification - psionic.Dampening),
-                    (int) MathF.Round(8 * psionic.Amplification - psionic.Dampening));
-                args.Handled = true;
-            }
+            _psionics.LogPowerUsed(args.Performer, "noospheric zap");
+            args.Handled = true;
         }
     }
 }
diff --git a/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
similarity index 57%
rename from Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
rename to Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
index 0c50efb5cf..5ca1dc7a6d 100644
--- a/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
@@ -1,31 +1,31 @@
-using Content.Server.DoAfter;
 using Content.Shared.Actions;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.CombatMode.Pacification;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Damage;
-using Content.Shared.DoAfter;
 using Content.Shared.Stunnable;
 using Content.Shared.Stealth;
 using Content.Shared.Stealth.Components;
-using Content.Shared.Psionics.Events;
+using Content.Server.Psionics;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Player;
+using Robust.Shared.Audio;
+using Robust.Shared.Timing;
+using Content.Server.Mind;
 using Content.Shared.Actions.Events;
 using Robust.Shared.Audio.Systems;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Weapons.Ranged.Events;
-using Content.Shared.Throwing;
-using Robust.Shared.Timing;
-using Content.Shared.Psionics;
 
-namespace Content.Server.Psionics.Abilities
+namespace Content.Server.Abilities.Psionics
 {
     public sealed class PsionicInvisibilityPowerSystem : EntitySystem
     {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly SharedStunSystem _stunSystem = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly SharedStealthSystem _stealth = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
+        [Dependency] private readonly MindSystem _mindSystem = default!;
+        [Dependency] private readonly SharedAudioSystem _audio = default!;
 
         public override void Initialize()
         {
@@ -37,61 +37,43 @@ public override void Initialize()
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ComponentInit>(OnStart);
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ComponentShutdown>(OnEnd);
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, DamageChangedEvent>(OnDamageChanged);
-            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, AttackAttemptEvent>(OnAttackAttempt);
-            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ShotAttemptedEvent>(OnShootAttempt);
-            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ThrowAttemptEvent>(OnThrowAttempt);
-            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, PsionicInsulationEvent>(OnInsulated);
         }
 
         private void OnInit(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.PsionicInvisibilityActionEntity, component.PsionicInvisibilityActionId);
-            _actions.TryGetActionData( component.PsionicInvisibilityActionEntity, out var actionData);
+            _actions.AddAction(uid, ref component.PsionicInvisibilityActionEntity, component.PsionicInvisibilityActionId );
+            _actions.TryGetActionData( component.PsionicInvisibilityActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.PsionicInvisibilityActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
             {
+                psionic.PsionicAbility = component.PsionicInvisibilityActionEntity;
                 psionic.ActivePowers.Add(component);
-                psionic.PsychicFeedback.Add(component.InvisibilityFeedback);
-                psionic.Amplification += 0.5f;
             }
         }
 
         private void OnShutdown(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentShutdown args)
         {
-            RemComp<PsionicInvisibilityUsedComponent>(uid);
-            RemComp<PsionicallyInvisibleComponent>(uid);
             _actions.RemoveAction(uid, component.PsionicInvisibilityActionEntity);
             if (TryComp<PsionicComponent>(uid, out var psionic))
             {
                 psionic.ActivePowers.Remove(component);
-                psionic.PsychicFeedback.Remove(component.InvisibilityFeedback);
-                psionic.Amplification -= 0.5f;
             }
         }
 
         private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityPowerActionEvent args)
         {
-            if (!TryComp<PsionicComponent>(uid, out var psionic))
-                return;
-
-            if (HasComp<PsionicInsulationComponent>(uid))
+            if (HasComp<PsionicInvisibilityUsedComponent>(uid))
                 return;
 
-            var ev = new PsionicInvisibilityTimerEvent(_gameTiming.CurTime);
-            var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseTimer, ev, uid) { Hidden = true };
-            _doAfterSystem.TryStartDoAfter(doAfterArgs);
-
             ToggleInvisibility(args.Performer);
             var action = Spawn(PsionicInvisibilityUsedComponent.PsionicInvisibilityUsedActionPrototype);
             _actions.AddAction(uid, action, action);
-            _actions.TryGetActionData(action, out var actionData);
+            _actions.TryGetActionData( action, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(action);
 
-            _psionics.LogPowerUsed(uid, "psionic invisibility",
-                (int) MathF.Round(8 * psionic.Amplification - 2 * psionic.Dampening),
-                (int) MathF.Round(12 * psionic.Amplification - 2 * psionic.Dampening));
+            _psionics.LogPowerUsed(uid, "psionic invisibility");
             args.Handled = true;
         }
 
@@ -107,6 +89,7 @@ private void OnPowerOff(RemovePsionicInvisibilityOffPowerActionEvent args)
         private void OnStart(EntityUid uid, PsionicInvisibilityUsedComponent component, ComponentInit args)
         {
             EnsureComp<PsionicallyInvisibleComponent>(uid);
+            EnsureComp<PacifiedComponent>(uid);
             var stealth = EnsureComp<StealthComponent>(uid);
             _stealth.SetVisibility(uid, 0.66f, stealth);
             _audio.PlayPvs("/Audio/Effects/toss.ogg", uid);
@@ -119,37 +102,24 @@ private void OnEnd(EntityUid uid, PsionicInvisibilityUsedComponent component, Co
                 return;
 
             RemComp<PsionicallyInvisibleComponent>(uid);
+            RemComp<PacifiedComponent>(uid);
             RemComp<StealthComponent>(uid);
             _audio.PlayPvs("/Audio/Effects/toss.ogg", uid);
+            //Pretty sure this DOESN'T work as intended.
             _actions.RemoveAction(uid, component.PsionicInvisibilityUsedActionEntity);
-            DirtyEntity(uid);
-        }
 
-        private void OnAttackAttempt(EntityUid uid, PsionicInvisibilityUsedComponent component, AttackAttemptEvent args)
-        {
-            RemComp<PsionicInvisibilityUsedComponent>(uid);
-        }
-
-        private void OnShootAttempt(EntityUid uid, PsionicInvisibilityUsedComponent component, ShotAttemptedEvent args)
-        {
-            RemComp<PsionicInvisibilityUsedComponent>(uid);
+            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(8), false);
+            DirtyEntity(uid);
         }
 
-        private void OnThrowAttempt(EntityUid uid, PsionicInvisibilityUsedComponent component, ThrowAttemptEvent args)
-        {
-            RemComp<PsionicInvisibilityUsedComponent>(uid);
-        }
         private void OnDamageChanged(EntityUid uid, PsionicInvisibilityUsedComponent component, DamageChangedEvent args)
         {
-            if (!TryComp<PsionicComponent>(uid, out var psionic))
-                return;
-
             if (!args.DamageIncreased)
                 return;
 
             ToggleInvisibility(uid);
-            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(4f / psionic.Dampening + psionic.Amplification), false);
         }
+
         public void ToggleInvisibility(EntityUid uid)
         {
             if (!HasComp<PsionicInvisibilityUsedComponent>(uid))
@@ -160,19 +130,5 @@ public void ToggleInvisibility(EntityUid uid)
                 RemComp<PsionicInvisibilityUsedComponent>(uid);
             }
         }
-
-        public void OnDoAfter(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityTimerEvent args)
-        {
-            RemComp<PsionicInvisibilityUsedComponent>(uid);
-        }
-
-        private void OnInsulated(EntityUid uid, PsionicInvisibilityUsedComponent component, PsionicInsulationEvent args)
-        {
-            if (!TryComp<PsionicComponent>(uid, out var psionic))
-                return;
-
-            RemComp<PsionicInvisibilityUsedComponent>(uid);
-            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(4f / psionic.Dampening + psionic.Amplification), false);
-        }
     }
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
new file mode 100644
index 0000000000..097a0cb750
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
@@ -0,0 +1,129 @@
+using Robust.Shared.Audio;
+using Robust.Server.GameObjects;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Server.Chemistry.EntitySystems;
+using Content.Server.DoAfter;
+using Content.Shared.Abilities.Psionics;
+using Content.Shared.Actions;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Popups;
+using Content.Shared.Psionics.Events;
+using Content.Shared.Tag;
+using Content.Shared.Examine;
+using static Content.Shared.Examine.ExamineSystemShared;
+using Robust.Shared.Timing;
+using Content.Server.Mind;
+using Content.Shared.Actions.Events;
+using Content.Shared.Chemistry.EntitySystems;
+using Robust.Server.Audio;
+
+namespace Content.Server.Abilities.Psionics
+{
+    public sealed class PsionicRegenerationPowerSystem : EntitySystem
+    {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly SharedActionsSystem _actions = default!;
+        [Dependency] private readonly SolutionContainerSystem _solutionSystem = default!;
+        [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
+        [Dependency] private readonly AudioSystem _audioSystem = default!;
+        [Dependency] private readonly TagSystem _tagSystem = default!;
+        [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
+        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly MindSystem _mindSystem = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
+
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<PsionicRegenerationPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<PsionicRegenerationPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<PsionicRegenerationPowerComponent, PsionicRegenerationPowerActionEvent>(OnPowerUsed);
+
+            SubscribeLocalEvent<PsionicRegenerationPowerComponent, DispelledEvent>(OnDispelled);
+            SubscribeLocalEvent<PsionicRegenerationPowerComponent, PsionicRegenerationDoAfterEvent>(OnDoAfter);
+        }
+
+        private void OnInit(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentInit args)
+        {
+            _actions.AddAction(uid, ref component.PsionicRegenerationActionEntity, component.PsionicRegenerationActionId );
+            _actions.TryGetActionData( component.PsionicRegenerationActionEntity, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.PsionicRegenerationActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            {
+                psionic.PsionicAbility = component.PsionicRegenerationActionEntity;
+                psionic.ActivePowers.Add(component);
+            }
+        }
+
+        private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationPowerActionEvent args)
+        {
+            var ev = new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime);
+            var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseDelay, ev, uid);
+
+            _doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId);
+
+            component.DoAfter = doAfterId;
+
+            _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-begin", ("entity", uid)),
+                uid,
+                // TODO: Use LoS-based Filter when one is available.
+                Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)),
+                true,
+                PopupType.Medium);
+
+            _audioSystem.PlayPvs(component.SoundUse, component.Owner, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
+            _psionics.LogPowerUsed(uid, "psionic regeneration");
+            args.Handled = true;
+        }
+
+        private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.PsionicRegenerationActionEntity);
+
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+            }
+        }
+
+        private void OnDispelled(EntityUid uid, PsionicRegenerationPowerComponent component, DispelledEvent args)
+        {
+            if (component.DoAfter == null)
+                return;
+
+            _doAfterSystem.Cancel(component.DoAfter);
+            component.DoAfter = null;
+
+            args.Handled = true;
+        }
+
+        private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationDoAfterEvent args)
+        {
+            component.DoAfter = null;
+
+            if (!TryComp<BloodstreamComponent>(uid, out var stream))
+                return;
+
+            // DoAfter has no way to run a callback during the process to give
+            // small doses of the reagent, so we wait until either the action
+            // is cancelled (by being dispelled) or complete to give the
+            // appropriate dose. A timestamp delta is used to accomplish this.
+            var percentageComplete = Math.Min(1f, (_gameTiming.CurTime - args.StartedAt).TotalSeconds / component.UseDelay);
+
+            var solution = new Solution();
+            solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(component.EssenceAmount * percentageComplete));
+            _bloodstreamSystem.TryAddToChemicals(uid, solution, stream);
+        }
+    }
+}
+
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
new file mode 100644
index 0000000000..407b72c6b5
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -0,0 +1,66 @@
+using Content.Shared.Actions;
+using Content.Shared.Abilities.Psionics;
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Popups;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Content.Server.Mind;
+using Content.Shared.Actions.Events;
+
+namespace Content.Server.Abilities.Psionics
+{
+    public sealed class PyrokinesisPowerSystem : EntitySystem
+    {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly SharedActionsSystem _actions = default!;
+        [Dependency] private readonly FlammableSystem _flammableSystem = default!;
+        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+        [Dependency] private readonly PopupSystem _popupSystem = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly MindSystem _mindSystem = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<PyrokinesisPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<PyrokinesisPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<PyrokinesisPowerActionEvent>(OnPowerUsed);
+        }
+
+        private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, ComponentInit args)
+        {
+            _actions.AddAction(uid, ref component.PyrokinesisActionEntity, component.PyrokinesisActionId );
+            _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.PyrokinesisActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            {
+                psionic.PsionicAbility = component.PyrokinesisActionEntity;
+                psionic.ActivePowers.Add(component);
+            }
+        }
+
+        private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.PyrokinesisActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+            }
+        }
+
+        private void OnPowerUsed(PyrokinesisPowerActionEvent args)
+        {
+            if (!TryComp<FlammableComponent>(args.Target, out var flammableComponent))
+                return;
+
+            flammableComponent.FireStacks += 5;
+            _flammableSystem.Ignite(args.Target, args.Target);
+            _popupSystem.PopupEntity(Loc.GetString("pyrokinesis-power-used", ("target", args.Target)), args.Target, Shared.Popups.PopupType.LargeCaution);
+
+            _psionics.LogPowerUsed(args.Performer, "pyrokinesis");
+            args.Handled = true;
+        }
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
new file mode 100644
index 0000000000..f7ae04b61e
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
@@ -0,0 +1,67 @@
+using Content.Shared.Actions;
+using Content.Shared.StatusEffect;
+using Content.Shared.Abilities.Psionics;
+using Content.Shared.Mind.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Content.Server.Mind;
+using Content.Shared.Actions.Events;
+
+namespace Content.Server.Abilities.Psionics
+{
+    public sealed class TelegnosisPowerSystem : EntitySystem
+    {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+        [Dependency] private readonly SharedActionsSystem _actions = default!;
+        [Dependency] private readonly MindSwapPowerSystem _mindSwap = default!;
+        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly MindSystem _mindSystem = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<TelegnosisPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<TelegnosisPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<TelegnosisPowerComponent, TelegnosisPowerActionEvent>(OnPowerUsed);
+            SubscribeLocalEvent<TelegnosticProjectionComponent, MindRemovedMessage>(OnMindRemoved);
+        }
+
+        private void OnInit(EntityUid uid, TelegnosisPowerComponent component, ComponentInit args)
+        {
+            _actions.AddAction(uid, ref component.TelegnosisActionEntity, component.TelegnosisActionId );
+            _actions.TryGetActionData( component.TelegnosisActionEntity, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.TelegnosisActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            {
+                psionic.PsionicAbility = component.TelegnosisActionEntity;
+                psionic.ActivePowers.Add(component);
+            }
+        }
+
+        private void OnShutdown(EntityUid uid, TelegnosisPowerComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.TelegnosisActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+            }
+        }
+
+        private void OnPowerUsed(EntityUid uid, TelegnosisPowerComponent component, TelegnosisPowerActionEvent args)
+        {
+            var projection = Spawn(component.Prototype, Transform(uid).Coordinates);
+            Transform(projection).AttachToGridOrMap();
+            _mindSwap.Swap(uid, projection);
+
+            _psionics.LogPowerUsed(uid, "telegnosis");
+            args.Handled = true;
+        }
+        private void OnMindRemoved(EntityUid uid, TelegnosticProjectionComponent component, MindRemovedMessage args)
+        {
+            QueueDel(uid);
+        }
+    }
+}
diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
similarity index 54%
rename from Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
rename to Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
index 915abd1222..ee16aaccfb 100644
--- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
@@ -1,41 +1,77 @@
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Actions;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
+using Content.Server.EUI;
+using Content.Server.Psionics;
+using Content.Server.Mind;
+using Content.Shared.Mind;
+using Content.Shared.Mind.Components;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Random;
 using Robust.Shared.Prototypes;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
 using Robust.Shared.Player;
-using Content.Shared.Examine;
-using Content.Shared.Popups;
-using static Content.Shared.Examine.ExamineSystemShared;
 
-namespace Content.Server.Psionics.Abilities
+namespace Content.Server.Abilities.Psionics
 {
     public sealed class PsionicAbilitiesSystem : EntitySystem
     {
         [Dependency] private readonly IComponentFactory _componentFactory = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly EuiManager _euiManager = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
         [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly SharedPopupSystem _popups = default!;
+        [Dependency] private readonly MindSystem _mindSystem = default!;
 
         public override void Initialize()
         {
             base.Initialize();
+            SubscribeLocalEvent<PsionicAwaitingPlayerComponent, PlayerAttachedEvent>(OnPlayerAttached);
         }
 
-        /// <summary>
-        /// Adds a psychic power once a character rolls one. This used to be a system you have to select for. However the opt-in is no longer the text window, but is now done at character creation.
-        /// TODO: This is going to get removed when I reach Part 3 of my reworks, when I touch upon the GlimmerSystem itself and overhaul how players get powers.
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="component"></param>
-        /// <param name="args"></param>
-        public void AddPsionics(EntityUid uid)
+        private void OnPlayerAttached(EntityUid uid, PsionicAwaitingPlayerComponent component, PlayerAttachedEvent args)
+        {
+            if (TryComp<PsionicBonusChanceComponent>(uid, out var bonus) && bonus.Warn == true)
+                _euiManager.OpenEui(new AcceptPsionicsEui(uid, this), args.Player);
+            else
+                AddRandomPsionicPower(uid);
+            RemCompDeferred<PsionicAwaitingPlayerComponent>(uid);
+        }
+
+        public void AddPsionics(EntityUid uid, bool warn = true)
+        {
+            if (Deleted(uid))
+                return;
+
+            if (HasComp<PsionicComponent>(uid))
+                return;
+
+            //Don't know if this will work. New mind state vs old.
+            if (!TryComp<MindContainerComponent>(uid, out var mindContainer) ||
+                !_mindSystem.TryGetMind(uid, out _, out var mind ))
+            //||
+            //!_mindSystem.TryGetMind(uid, out var mind, mindContainer))
+            {
+                EnsureComp<PsionicAwaitingPlayerComponent>(uid);
+                return;
+            }
+
+            if (!_mindSystem.TryGetSession(mind, out var client))
+                return;
+
+            if (warn && TryComp<ActorComponent>(uid, out var actor))
+                _euiManager.OpenEui(new AcceptPsionicsEui(uid, this), client);
+            else
+                AddRandomPsionicPower(uid);
+        }
+
+        public void AddPsionics(EntityUid uid, string powerComp)
         {
             if (Deleted(uid))
                 return;
@@ -43,11 +79,17 @@ public void AddPsionics(EntityUid uid)
             if (HasComp<PsionicComponent>(uid))
                 return;
 
-            AddRandomPsionicPower(uid);
+            AddComp<PsionicComponent>(uid);
+
+            var newComponent = (Component) _componentFactory.GetComponent(powerComp);
+            newComponent.Owner = uid;
+
+            EntityManager.AddComponent(uid, newComponent);
         }
+
         public void AddRandomPsionicPower(EntityUid uid)
         {
-            EnsureComp<PsionicComponent>(uid, out var psionic);
+            AddComp<PsionicComponent>(uid);
 
             if (!_prototypeManager.TryIndex<WeightedRandomPrototype>("RandomPsionicPowerPool", out var pool))
             {
@@ -61,21 +103,11 @@ public void AddRandomPsionicPower(EntityUid uid)
 
             EntityManager.AddComponent(uid, newComponent);
 
-            _glimmerSystem.Glimmer += _random.Next((int) MathF.Round(psionic.Amplification * psionic.Dampening * 1), (int) MathF.Round(psionic.Amplification * psionic.Dampening * 5));
+            _glimmerSystem.Glimmer += _random.Next(1, 5);
         }
 
         public void RemovePsionics(EntityUid uid)
         {
-            if (RemComp<PotentialPsionicComponent>(uid))
-            {
-                _popups.PopupEntity(Loc.GetString("mindbreaking-feedback", ("entity", uid)),
-                    uid,
-                    // TODO: Use LoS-based Filter when one is available.
-                    Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)),
-                    true,
-                    PopupType.Medium);
-            }
-
             if (!TryComp<PsionicComponent>(uid, out var psionic))
                 return;
 
@@ -98,15 +130,14 @@ public void RemovePsionics(EntityUid uid)
             if (psionic.PsionicAbility != null){
                 _actionsSystem.TryGetActionData( psionic.PsionicAbility, out var psiAbility );
                 if (psiAbility != null){
+                    var owner = psiAbility.Owner;
                     _actionsSystem.RemoveAction(uid, psiAbility.Owner);
                 }
             }
 
             _statusEffectsSystem.TryAddStatusEffect(uid, "Stutter", TimeSpan.FromMinutes(5), false, "StutteringAccent");
 
-            _glimmerSystem.Glimmer += _random.Next((int) MathF.Round(psionic.Amplification * psionic.Dampening * -10), (int) MathF.Round(psionic.Amplification * psionic.Dampening * -5));
             RemComp<PsionicComponent>(uid);
-            RemComp<PotentialPsionicComponent>(uid);
         }
     }
 }
diff --git a/Content.Server/Psionics/Audio/GlimmerSoundComponent.cs b/Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs
similarity index 80%
rename from Content.Server/Psionics/Audio/GlimmerSoundComponent.cs
rename to Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs
index 9a6c62381b..850be3e831 100644
--- a/Content.Server/Psionics/Audio/GlimmerSoundComponent.cs
+++ b/Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs
@@ -2,8 +2,12 @@
 using Content.Shared.Audio;
 using Content.Shared.Psionics.Glimmer;
 using Robust.Shared.Audio;
+using Robust.Shared.ComponentTrees;
+using Robust.Shared.GameStates;
+using Robust.Shared.Physics;
+using Robust.Shared.Serialization;
 
-namespace Content.Server.Psionics.Audio
+namespace Content.Server.Audio
 {
     [RegisterComponent]
     [Access(typeof(SharedAmbientSoundSystem), typeof(GlimmerReactiveSystem))]
diff --git a/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs b/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
similarity index 85%
rename from Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
rename to Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
index ad49075e65..58ed178274 100644
--- a/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
+++ b/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
@@ -2,7 +2,7 @@
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Managers;
 using Content.Server.Chat.Systems;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Chat;
 using Content.Shared.Database;
@@ -16,10 +16,10 @@
 using System.Linq;
 using System.Text;
 
-namespace Content.Server.Psionics.Telepathy
+namespace Content.Server.Nyanotrasen.Chat
 {
     /// <summary>
-    /// Extensions for Telepathic Chat
+    /// Extensions for nyano's chat stuff
     /// </summary>
 
     public sealed class NyanoChatSystem : EntitySystem
@@ -47,9 +47,7 @@ private IEnumerable<INetChannel> GetAdminClients()
         private List<INetChannel> GetDreamers(IEnumerable<INetChannel> removeList)
         {
             var filtered = Filter.Empty()
-                .AddWhereAttachedEntity(entity => HasComp<SleepingComponent>(entity)
-                || HasComp<SeeingRainbowsComponent>(entity) && !HasComp<PsionicsDisabledComponent>(entity) && !HasComp<PsionicInsulationComponent>(entity)
-                || HasComp<PotentialPsionicComponent>(entity) && !HasComp<PsionicComponent>(entity) && !HasComp<PsionicInsulationComponent>(entity))
+                .AddWhereAttachedEntity(entity => HasComp<SleepingComponent>(entity) || HasComp<SeeingRainbowsComponent>(entity) && !HasComp<PsionicsDisabledComponent>(entity) && !HasComp<PsionicInsulationComponent>(entity))
                 .Recipients
                 .Select(p => p.ConnectedClient);
 
@@ -63,7 +61,7 @@ private List<INetChannel> GetDreamers(IEnumerable<INetChannel> removeList)
 
         private bool IsEligibleForTelepathy(EntityUid entity)
         {
-            return TryComp<PsionicComponent>(entity, out var psionic) && psionic.Telepath
+            return HasComp<PsionicComponent>(entity)
                 && !HasComp<PsionicsDisabledComponent>(entity)
                 && !HasComp<PsionicInsulationComponent>(entity)
                 && (!TryComp<MobStateComponent>(entity, out var mobstate) || mobstate.CurrentState == MobState.Alive);
@@ -94,9 +92,9 @@ public void SendTelepathicChat(EntityUid source, string message, bool hideChat)
             if (_random.Prob(0.1f))
                 _glimmerSystem.Glimmer++;
 
-            if (_random.Prob(Math.Min(0.33f + (float) _glimmerSystem.Glimmer / 1500, 1)))
+            if (_random.Prob(Math.Min(0.33f + ((float) _glimmerSystem.Glimmer / 1500), 1)))
             {
-                float obfuscation = 0.25f + (float) _glimmerSystem.Glimmer / 2000;
+                float obfuscation = (0.25f + (float) _glimmerSystem.Glimmer / 2000);
                 var obfuscated = ObfuscateMessageReadability(message, obfuscation);
                 _chatManager.ChatMessageToMany(ChatChannel.Telepathic, obfuscated, messageWrap, source, hideChat, false, GetDreamers(clients), Color.PaleVioletRed);
             }
@@ -113,7 +111,7 @@ private string ObfuscateMessageReadability(string message, float chance)
 
             for (var i = 0; i < message.Length; i++)
             {
-                if (char.IsWhiteSpace(modifiedMessage[i]))
+                if (char.IsWhiteSpace((modifiedMessage[i])))
                 {
                     continue;
                 }
diff --git a/Content.Server/Psionics/Telepathy/TSayCommand.cs b/Content.Server/Nyanotrasen/Chat/TSayCommand.cs
similarity index 95%
rename from Content.Server/Psionics/Telepathy/TSayCommand.cs
rename to Content.Server/Nyanotrasen/Chat/TSayCommand.cs
index 8fbaa5e17b..9ba27b65d7 100644
--- a/Content.Server/Psionics/Telepathy/TSayCommand.cs
+++ b/Content.Server/Nyanotrasen/Chat/TSayCommand.cs
@@ -1,10 +1,11 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Administration;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 using Robust.Shared.Player;
 
-namespace Content.Server.Psionics.Telepathy
+namespace Content.Server.Chat.Commands
 {
     [AnyCommand]
     internal sealed class TSayCommand : IConsoleCommand
diff --git a/Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs b/Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs
similarity index 82%
rename from Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs
rename to Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs
index 6e194f76c8..fc199f4332 100644
--- a/Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs
+++ b/Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Psionics.Telepathy
+namespace Content.Server.Nyanotrasen.Chat
 {
     /// <summary>
     /// Repeats whatever is happening in telepathic chat.
diff --git a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
index 0ce3f9d7c6..a23a5b3d77 100644
--- a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
+++ b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Chemistry.Reagent;
-using Content.Server.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs b/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs
new file mode 100644
index 0000000000..3b677bab2d
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs
@@ -0,0 +1,11 @@
+using Content.Server.Objectives.Systems;
+
+namespace Content.Server.Objectives.Components;
+
+/// <summary>
+/// Requires that the player dies to be complete.
+/// </summary>
+[RegisterComponent, Access(typeof(BecomePsionicConditionSystem))]
+public sealed partial class BecomePsionicConditionComponent : Component
+{
+}
\ No newline at end of file
diff --git a/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs b/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs
new file mode 100644
index 0000000000..d090c320a4
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Abilities.Psionics;
+using Content.Server.Objectives.Components;
+using Content.Shared.Mind;
+using Content.Shared.Objectives.Components;
+
+namespace Content.Server.Objectives.Systems
+{
+    public sealed class BecomePsionicConditionSystem : EntitySystem
+    {
+        private EntityQuery<MetaDataComponent> _metaQuery;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<BecomePsionicConditionComponent, ObjectiveGetProgressEvent>(OnGetProgress);
+        }
+
+        private void OnGetProgress(EntityUid uid, BecomePsionicConditionComponent comp, ref ObjectiveGetProgressEvent args)
+        {
+            args.Progress = GetProgress(args.Mind);
+        }
+
+        private float GetProgress(MindComponent mind)
+        {
+            var entMan = IoCManager.Resolve<IEntityManager>();
+            if (HasComp<PsionicComponent>(mind.CurrentEntity))
+                return 1;
+            return 0;
+        }
+    }
+}
diff --git a/Content.Server/Psionics/AcceptPsionicsEui.cs b/Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs
similarity index 95%
rename from Content.Server/Psionics/AcceptPsionicsEui.cs
rename to Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs
index 7c652664c6..80fd8946f2 100644
--- a/Content.Server/Psionics/AcceptPsionicsEui.cs
+++ b/Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Psionics;
 using Content.Shared.Eui;
 using Content.Server.EUI;
-using Content.Server.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
 
 namespace Content.Server.Psionics
 {
diff --git a/Content.Server/Psionics/AntiPsychicWeaponComponent.cs b/Content.Server/Nyanotrasen/Psionics/AntiPsychicWeaponComponent.cs
similarity index 100%
rename from Content.Server/Psionics/AntiPsychicWeaponComponent.cs
rename to Content.Server/Nyanotrasen/Psionics/AntiPsychicWeaponComponent.cs
diff --git a/Content.Server/Psionics/Dreams/DreamSystem.cs b/Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs
similarity index 93%
rename from Content.Server/Psionics/Dreams/DreamSystem.cs
rename to Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs
index 1731c7a9bf..d6067717c9 100644
--- a/Content.Server/Psionics/Dreams/DreamSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs
@@ -1,14 +1,17 @@
 using Content.Shared.Dataset;
 using Content.Shared.Bed.Sleep;
+using Content.Server.Chat.Systems;
 using Content.Server.Chat.Managers;
 using Robust.Shared.Random;
 using Robust.Shared.Prototypes;
+using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 
 namespace Content.Server.Psionics.Dreams
 {
     public sealed class DreamsSystem : EntitySystem
     {
+        [Dependency] private readonly ChatSystem _chat = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IChatManager _chatManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
diff --git a/Content.Server/Psionics/Glimmer/GlimmerCommands.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs
similarity index 100%
rename from Content.Server/Psionics/Glimmer/GlimmerCommands.cs
rename to Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs
diff --git a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs
similarity index 99%
rename from Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
rename to Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs
index c0802c8b67..da3b07d6da 100644
--- a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs
@@ -1,12 +1,14 @@
-using Content.Server.Psionics.Audio;
+using Content.Server.Audio;
 using Content.Server.Power.Components;
 using Content.Server.Electrocution;
 using Content.Server.Lightning;
 using Content.Server.Explosion.EntitySystems;
+using Content.Server.Construction;
 using Content.Server.Ghost;
 using Content.Server.Revenant.EntitySystems;
 using Content.Shared.Audio;
 using Content.Shared.Construction.EntitySystems;
+using Content.Shared.Coordinates.Helpers;
 using Content.Shared.GameTicking;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Verbs;
@@ -14,6 +16,7 @@
 using Content.Shared.Damage;
 using Content.Shared.Destructible;
 using Content.Shared.Construction.Components;
+using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Weapons.Melee.Components;
 using Robust.Shared.Audio;
diff --git a/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
similarity index 94%
rename from Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
rename to Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
index 57c74398b0..f0da85ce45 100644
--- a/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.GameTicking;
+using Content.Server.CartridgeLoader.Cartridges;
 
 namespace Content.Server.Psionics.Glimmer
 {
@@ -16,6 +17,7 @@ public sealed class PassiveGlimmerReductionSystem : EntitySystem
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly GlimmerMonitorCartridgeSystem _cartridgeSys = default!;
 
         /// List of glimmer values spaced by minute.
         public List<int> GlimmerValues = new();
diff --git a/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
similarity index 100%
rename from Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
rename to Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
diff --git a/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
similarity index 100%
rename from Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
rename to Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
diff --git a/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
similarity index 88%
rename from Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
rename to Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
index 9583f45fdc..31e6b89f13 100644
--- a/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
@@ -1,6 +1,5 @@
-using Content.Shared.Psionics.Abilities;
-using Content.Shared.Psionics;
-using Content.Server.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
+using Content.Server.Abilities.Psionics;
 using Content.Shared.Eye;
 using Content.Server.NPC.Systems;
 using Robust.Shared.Containers;
@@ -21,6 +20,7 @@ public override void Initialize()
             SubscribeLocalEvent<PotentialPsionicComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<PsionicInsulationComponent, ComponentInit>(OnInsulInit);
             SubscribeLocalEvent<PsionicInsulationComponent, ComponentShutdown>(OnInsulShutdown);
+            SubscribeLocalEvent<EyeComponent, ComponentInit>(OnEyeInit);
 
             /// Layer
             SubscribeLocalEvent<PsionicallyInvisibleComponent, ComponentInit>(OnInvisInit);
@@ -36,16 +36,10 @@ private void OnInit(EntityUid uid, PotentialPsionicComponent component, Componen
             SetCanSeePsionicInvisiblity(uid, false);
         }
 
-        /// <summary>
-        /// Being able to see invisible by default is no longer tracked by "Not having Potential Psionic".
-        /// Anything intended to be immune to invisibility(and mind magic in general) should instead have PsionicInsulation as a built-in component
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="component"></param>
-        /// <param name="args"></param>
         private void OnInsulInit(EntityUid uid, PsionicInsulationComponent component, ComponentInit args)
         {
-            RaiseLocalEvent(uid, new PsionicInsulationEvent());
+            if (!HasComp<PotentialPsionicComponent>(uid))
+                return;
 
             if (HasComp<PsionicInvisibilityUsedComponent>(uid))
                 _invisSystem.ToggleInvisibility(uid);
@@ -67,6 +61,9 @@ private void OnInsulInit(EntityUid uid, PsionicInsulationComponent component, Co
 
         private void OnInsulShutdown(EntityUid uid, PsionicInsulationComponent component, ComponentShutdown args)
         {
+            if (!HasComp<PotentialPsionicComponent>(uid))
+                return;
+
             SetCanSeePsionicInvisiblity(uid, false);
 
             if (!HasComp<PsionicComponent>(uid))
@@ -102,6 +99,10 @@ private void OnInvisShutdown(EntityUid uid, PsionicallyInvisibleComponent compon
             }
         }
 
+        private void OnEyeInit(EntityUid uid, EyeComponent component, ComponentInit args)
+        {
+            //SetCanSeePsionicInvisiblity(uid, true); //JJ Comment - Not allowed to modifies .yml on spawn any longer. See UninitializedSaveTest.
+        }
         private void OnEntInserted(EntityUid uid, PsionicallyInvisibleComponent component, EntInsertedIntoContainerMessage args)
         {
             DirtyEntity(args.Entity);
@@ -124,7 +125,7 @@ public void SetCanSeePsionicInvisiblity(EntityUid uid, bool set)
             {
                 if (EntityManager.TryGetComponent(uid, out EyeComponent? eye))
                 {
-                    _eye.SetVisibilityMask(uid, eye.VisibilityMask & ~(int) VisibilityFlags.PsionicInvisibility, eye);
+                    _eye.SetVisibilityMask(uid, eye.VisibilityMask & ~ (int) VisibilityFlags.PsionicInvisibility, eye);
                 }
             }
         }
diff --git a/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
similarity index 95%
rename from Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
rename to Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
index 268deddf6d..859ceb7b83 100644
--- a/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Whitelist;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Psionics
 {
diff --git a/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
similarity index 95%
rename from Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
rename to Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
index 403e059261..cec755e326 100644
--- a/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Stealth.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Psionics
 {
@@ -11,6 +12,7 @@ namespace Content.Server.Psionics
     public sealed class PsionicInvisibleContactsSystem : EntitySystem
     {
         [Dependency] private readonly SharedStealthSystem _stealth = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         public override void Initialize()
         {
diff --git a/Content.Server/Psionics/Invisibility/PsionicallyInvisibleComponent.cs b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
similarity index 100%
rename from Content.Server/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
rename to Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs b/Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs
new file mode 100644
index 0000000000..9499497cd1
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Server.Psionics
+{
+    [RegisterComponent]
+    public sealed partial class PotentialPsionicComponent : Component
+    {
+        [DataField("chance")]
+        public float Chance = 0.04f;
+
+        /// <summary>
+        /// YORO (you only reroll once)
+        /// </summary>
+        public bool Rerolled = false;
+    }
+}
diff --git a/Content.Server/Psionics/PsionicAwaitingPlayerComponent.cs b/Content.Server/Nyanotrasen/Psionics/PsionicAwaitingPlayerComponent.cs
similarity index 100%
rename from Content.Server/Psionics/PsionicAwaitingPlayerComponent.cs
rename to Content.Server/Nyanotrasen/Psionics/PsionicAwaitingPlayerComponent.cs
diff --git a/Content.Server/Psionics/PsionicBonusChanceComponent.cs b/Content.Server/Nyanotrasen/Psionics/PsionicBonusChanceComponent.cs
similarity index 100%
rename from Content.Server/Psionics/PsionicBonusChanceComponent.cs
rename to Content.Server/Nyanotrasen/Psionics/PsionicBonusChanceComponent.cs
diff --git a/Content.Server/Psionics/PsionicsCommands.cs b/Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs
similarity index 84%
rename from Content.Server/Psionics/PsionicsCommands.cs
rename to Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs
index 3f9ee794b3..959251d1fb 100644
--- a/Content.Server/Psionics/PsionicsCommands.cs
+++ b/Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs
@@ -1,8 +1,9 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Mobs.Components;
 using Robust.Shared.Console;
+using Robust.Server.GameObjects;
 using Content.Shared.Actions;
 using Robust.Shared.Player;
 
@@ -18,8 +19,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         SharedActionsSystem actions = default!;
         var entMan = IoCManager.Resolve<IEntityManager>();
-        foreach (var (actor, psionic, meta) in entMan.EntityQuery<ActorComponent, PsionicComponent, MetaDataComponent>())
-        {
+        foreach (var (actor, mob, psionic, meta) in entMan.EntityQuery<ActorComponent, MobStateComponent, PsionicComponent, MetaDataComponent>()){
             // filter out xenos, etc, with innate telepathy
             actions.TryGetActionData( psionic.PsionicAbility, out var actionData );
             if (actionData == null || actionData.ToString() == null)
diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
similarity index 91%
rename from Content.Server/Psionics/PsionicsSystem.cs
rename to Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
index bf82947760..5a96af2e96 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
@@ -1,14 +1,19 @@
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.StatusEffect;
+using Content.Shared.Mobs;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Damage.Events;
+using Content.Shared.IdentityManagement;
 using Content.Shared.CCVar;
-using Content.Server.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
+using Content.Server.Chat.Systems;
 using Content.Server.Electrocution;
 using Content.Server.NPC.Components;
 using Content.Server.NPC.Systems;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Random;
 
@@ -22,6 +27,7 @@ public sealed class PsionicsSystem : EntitySystem
         [Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!;
         [Dependency] private readonly MindSwapPowerSystem _mindSwapPowerSystem = default!;
         [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
+        [Dependency] private readonly ChatSystem _chat = default!;
         [Dependency] private readonly NpcFactionSystem _npcFactonSystem = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -48,7 +54,6 @@ public override void Initialize()
             SubscribeLocalEvent<AntiPsionicWeaponComponent, StaminaMeleeHitEvent>(OnStamHit);
 
             SubscribeLocalEvent<PsionicComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<PsionicComponent, MapInitEvent>(OnStartup);
             SubscribeLocalEvent<PsionicComponent, ComponentRemove>(OnRemove);
         }
 
@@ -82,11 +87,7 @@ private void OnMeleeHit(EntityUid uid, AntiPsionicWeaponComponent component, Mel
                     _electrocutionSystem.TryDoElectrocution(args.User, null, 20, TimeSpan.FromSeconds(5), false);
             }
         }
-        private void OnStartup(EntityUid uid, PsionicComponent component, MapInitEvent args)
-        {
-            component.Amplification = _random.NextFloat(0.3f, 1.1f);
-            component.Dampening = _random.NextFloat(0.3f, 1.1f);
-        }
+
         private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit args)
         {
             if (!component.Removable)
@@ -103,7 +104,7 @@ private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit arg
 
         private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove args)
         {
-            if (!HasComp<NpcFactionMemberComponent>(uid))
+            if (!TryComp<NpcFactionMemberComponent>(uid, out var factions))
                 return;
 
             _npcFactonSystem.RemoveFaction(uid, "PsionicInterloper");
@@ -143,14 +144,14 @@ public void RollPsionics(EntityUid uid, PotentialPsionicComponent component, boo
             }
 
             if (applyGlimmer)
-                chance += (float) _glimmerSystem.Glimmer / 1000;
+                chance += ((float) _glimmerSystem.Glimmer / 1000);
 
             chance *= multiplier;
 
             chance = Math.Clamp(chance, 0, 1);
 
             if (_random.Prob(chance))
-                _psionicAbilitiesSystem.AddPsionics(uid);
+                _psionicAbilitiesSystem.AddPsionics(uid, warn);
         }
 
         public void RerollPsionics(EntityUid uid, PotentialPsionicComponent? psionic = null, float bonusMuliplier = 1f)
diff --git a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
index 24459d29e2..148598fe2c 100644
--- a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
+++ b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
@@ -5,7 +5,7 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Psionics;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Chat;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
diff --git a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
index b8cdcb56d4..bc3c22cc35 100644
--- a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
+++ b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
 using Content.Server.Chat.Systems;
 using Content.Server.Radio.Components;
 using Content.Server.Radio.EntitySystems;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs
index 89b5a176f2..66eea988ae 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs
@@ -5,7 +5,7 @@
 using Content.Server.Psionics.Glimmer;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Psionics.Glimmer;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
index 89f3bc9750..6394456326 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
@@ -1,9 +1,10 @@
+using Robust.Server.GameObjects;
 using Robust.Shared.Random;
-using Content.Server.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Psionics;
 using Content.Server.StationEvents.Components;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.Player;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
index 6a2c1c3ba7..c04543d219 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
@@ -10,7 +10,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.Psionics.Glimmer;
 using Content.Server.StationEvents.Components;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Damage;
 using Content.Shared.Inventory;
 using Content.Shared.Mobs.Components;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
index 8812ed1fe3..175318e15b 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
@@ -1,9 +1,9 @@
 using Robust.Shared.Random;
-using Content.Server.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.Psionics;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Zombies;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
index 3672d317d9..82c3d72b13 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
@@ -3,7 +3,7 @@
 using Content.Server.Psionics;
 using Content.Server.StationEvents.Components;
 using Content.Server.Stunnable;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.StatusEffect;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
index 753b2e2572..63e0a435cb 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
@@ -4,7 +4,7 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Mobs.Components;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.StatusEffect;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
index a7c455e6a5..9b2e14eff8 100644
--- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -36,7 +36,9 @@ internal sealed class PointingSystem : SharedPointingSystem
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly VisibilitySystem _visibilitySystem = default!;
         [Dependency] private readonly SharedMindSystem _minds = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
 
         private static readonly TimeSpan PointDelay = TimeSpan.FromSeconds(0.5f);
 
@@ -96,11 +98,11 @@ public bool InRange(EntityUid pointer, EntityCoordinates coordinates)
         {
             if (HasComp<GhostComponent>(pointer))
             {
-                return Transform(pointer).Coordinates.InRange(EntityManager, coordinates, 15);
+                return Transform(pointer).Coordinates.InRange(EntityManager, _transform, coordinates, 15);
             }
             else
             {
-                return ExamineSystemShared.InRangeUnOccluded(pointer, coordinates, 15, predicate: e => e == pointer);
+                return _examine.InRangeUnOccluded(pointer, coordinates, 15, predicate: e => e == pointer);
             }
         }
 
@@ -141,7 +143,7 @@ public bool TryPoint(ICommonSession? session, EntityCoordinates coordsPointed, E
                 return false;
             }
 
-            var mapCoordsPointed = coordsPointed.ToMap(EntityManager);
+            var mapCoordsPointed = coordsPointed.ToMap(EntityManager, _transform);
             _rotateToFaceSystem.TryFaceCoordinates(player, mapCoordsPointed.Position);
 
             var arrow = EntityManager.SpawnEntity("PointingArrow", coordsPointed);
@@ -149,7 +151,7 @@ public bool TryPoint(ICommonSession? session, EntityCoordinates coordsPointed, E
             if (TryComp<PointingArrowComponent>(arrow, out var pointing))
             {
                 if (TryComp(player, out TransformComponent? xformPlayer))
-                    pointing.StartPosition = EntityCoordinates.FromMap(arrow, xformPlayer.Coordinates.ToMap(EntityManager)).Position;
+                    pointing.StartPosition = EntityCoordinates.FromMap(arrow, xformPlayer.Coordinates.ToMap(EntityManager, _transform), _transform).Position;
 
                 pointing.EndTime = _gameTiming.CurTime + PointDuration;
 
diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
index 5ed39d5178..048fda2355 100644
--- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
@@ -20,6 +20,8 @@ public sealed class PowerReceiverSystem : EntitySystem
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly AppearanceSystem _appearance = default!;
         [Dependency] private readonly AudioSystem _audio = default!;
+        private EntityQuery<ApcPowerReceiverComponent> _recQuery;
+        private EntityQuery<ApcPowerProviderComponent> _provQuery;
 
         public override void Initialize()
         {
@@ -35,6 +37,9 @@ public override void Initialize()
 
             SubscribeLocalEvent<ApcPowerReceiverComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
             SubscribeLocalEvent<PowerSwitchComponent, GetVerbsEvent<AlternativeVerb>>(AddSwitchPowerVerb);
+
+            _recQuery = GetEntityQuery<ApcPowerReceiverComponent>();
+            _provQuery = GetEntityQuery<ApcPowerProviderComponent>();
         }
 
         private void OnGetVerbs(EntityUid uid, ApcPowerReceiverComponent component, GetVerbsEvent<Verb> args)
@@ -77,7 +82,7 @@ private void OnProviderShutdown(EntityUid uid, ApcPowerProviderComponent compone
         private void OnProviderConnected(Entity<ApcPowerReceiverComponent> receiver, ref ExtensionCableSystem.ProviderConnectedEvent args)
         {
             var providerUid = args.Provider.Owner;
-            if (!EntityManager.TryGetComponent<ApcPowerProviderComponent>(providerUid, out var provider))
+            if (!_provQuery.TryGetComponent(providerUid, out var provider))
                 return;
 
             receiver.Comp.Provider = provider;
@@ -94,7 +99,7 @@ private void OnProviderDisconnected(Entity<ApcPowerReceiverComponent> receiver,
 
         private void OnReceiverConnected(Entity<ApcPowerProviderComponent> provider, ref ExtensionCableSystem.ReceiverConnectedEvent args)
         {
-            if (EntityManager.TryGetComponent(args.Receiver, out ApcPowerReceiverComponent? receiver))
+            if (_recQuery.TryGetComponent(args.Receiver, out var receiver))
             {
                 provider.Comp.AddReceiver(receiver);
             }
@@ -102,7 +107,7 @@ private void OnReceiverConnected(Entity<ApcPowerProviderComponent> provider, ref
 
         private void OnReceiverDisconnected(EntityUid uid, ApcPowerProviderComponent provider, ExtensionCableSystem.ReceiverDisconnectedEvent args)
         {
-            if (EntityManager.TryGetComponent(args.Receiver, out ApcPowerReceiverComponent? receiver))
+            if (_recQuery.TryGetComponent(args.Receiver, out var receiver))
             {
                 provider.RemoveReceiver(receiver);
             }
@@ -116,7 +121,7 @@ private void AddSwitchPowerVerb(EntityUid uid, PowerSwitchComponent component, G
             if (!HasComp<HandsComponent>(args.User))
                 return;
 
-            if (!TryComp<ApcPowerReceiverComponent>(uid, out var receiver))
+            if (!_recQuery.TryGetComponent(uid, out var receiver))
                 return;
 
             if (!receiver.NeedsPower)
@@ -152,7 +157,7 @@ private void ProviderChanged(Entity<ApcPowerReceiverComponent> receiver)
         /// </summary>
         public bool IsPowered(EntityUid uid, ApcPowerReceiverComponent? receiver = null)
         {
-            if (!Resolve(uid, ref receiver, false))
+            if (!_recQuery.Resolve(uid, ref receiver, false))
                 return true;
 
             return receiver.Powered;
@@ -164,7 +169,7 @@ public bool IsPowered(EntityUid uid, ApcPowerReceiverComponent? receiver = null)
         /// </summary>
         public bool TogglePower(EntityUid uid, bool playSwitchSound = true, ApcPowerReceiverComponent? receiver = null, EntityUid? user = null)
         {
-            if (!Resolve(uid, ref receiver, false))
+            if (!_recQuery.Resolve(uid, ref receiver, false))
                 return true;
 
             // it'll save a lot of confusion if 'always powered' means 'always powered'
diff --git a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
deleted file mode 100644
index 7b3a417c53..0000000000
--- a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Actions.Events;
-using Content.Shared.Psionics.Abilities;
-using Content.Shared.DoAfter;
-using Content.Shared.Examine;
-using static Content.Shared.Examine.ExamineSystemShared;
-using Content.Shared.Popups;
-using Robust.Server.Audio;
-using Robust.Shared.Audio;
-using Robust.Shared.Timing;
-using Robust.Shared.Player;
-using Content.Server.DoAfter;
-using Content.Shared.Psionics.Events;
-using Content.Server.Psionics;
-
-namespace Content.Server.Psionics.Abilities
-{
-    public sealed class MetapsionicPowerSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly EntityLookupSystem _lookup = default!;
-        [Dependency] private readonly SharedPopupSystem _popups = default!;
-        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
-        [Dependency] private readonly AudioSystem _audioSystem = default!;
-
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<MetapsionicPowerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<MetapsionicPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<MetapsionicPowerComponent, WideMetapsionicPowerActionEvent>(OnWidePowerUsed);
-            SubscribeLocalEvent<FocusedMetapsionicPowerActionEvent>(OnFocusedPowerUsed);
-            SubscribeLocalEvent<MetapsionicPowerComponent, FocusedMetapsionicDoAfterEvent>(OnDoAfter);
-        }
-
-        private void OnInit(EntityUid uid, MetapsionicPowerComponent component, ComponentInit args)
-        {
-            if (!TryComp(uid, out ActionsComponent? comp))
-                return;
-            _actions.AddAction(uid, ref component.ActionWideMetapsionicEntity, component.ActionWideMetapsionic, component: comp);
-            _actions.AddAction(uid, ref component.ActionFocusedMetapsionicEntity, component.ActionFocusedMetapsionic, component: comp);
-            _actions.TryGetActionData(component.ActionWideMetapsionicEntity, out var actionData);
-            if (actionData is { UseDelay: not null })
-            {
-                _actions.StartUseDelay(component.ActionWideMetapsionicEntity);
-                _actions.StartUseDelay(component.ActionFocusedMetapsionicEntity);
-            }
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Add(component);
-                psionic.PsychicFeedback.Add(component.MetapsionicFeedback);
-                psionic.Amplification += 0.1f;
-                psionic.Dampening += 0.5f;
-            }
-
-        }
-
-        private void UpdateActions(EntityUid uid, MetapsionicPowerComponent? component = null)
-        {
-            if (!Resolve(uid, ref component))
-                return;
-            _actions.StartUseDelay(component.ActionWideMetapsionicEntity);
-            _actions.StartUseDelay(component.ActionFocusedMetapsionicEntity);
-        }
-
-        private void OnShutdown(EntityUid uid, MetapsionicPowerComponent component, ComponentShutdown args)
-        {
-            _actions.RemoveAction(uid, component.ActionWideMetapsionicEntity);
-            _actions.RemoveAction(uid, component.ActionFocusedMetapsionicEntity);
-
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-                psionic.PsychicFeedback.Remove(component.MetapsionicFeedback);
-                psionic.Amplification -= 0.1f;
-                psionic.Dampening -= 0.5f;
-            }
-        }
-
-        private void OnWidePowerUsed(EntityUid uid, MetapsionicPowerComponent component, WideMetapsionicPowerActionEvent args)
-        {
-            if (HasComp<PsionicInsulationComponent>(uid))
-                return;
-
-            if (!TryComp<PsionicComponent>(uid, out var psionic))
-                return;
-
-            foreach (var entity in _lookup.GetEntitiesInRange(uid, component.Range))
-            {
-                if (HasComp<PsionicComponent>(entity) && entity != uid && !HasComp<PsionicInsulationComponent>(entity) &&
-                    !(HasComp<ClothingGrantPsionicPowerComponent>(entity) && Transform(entity).ParentUid == uid))
-                {
-                    _popups.PopupEntity(Loc.GetString("metapsionic-pulse-success"), uid, uid, PopupType.LargeCaution);
-                    args.Handled = true;
-                    return;
-                }
-            }
-            _popups.PopupEntity(Loc.GetString("metapsionic-pulse-failure"), uid, uid, PopupType.Large);
-            _psionics.LogPowerUsed(uid, "metapsionic pulse",
-                (int) MathF.Round(2 * psionic.Amplification - psionic.Dampening),
-                (int) MathF.Round(4 * psionic.Amplification - psionic.Dampening));
-            UpdateActions(uid, component);
-            args.Handled = true;
-        }
-
-        private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args)
-        {
-            if (!TryComp<PsionicComponent>(args.Performer, out var psionic))
-                return;
-
-            if (HasComp<PsionicInsulationComponent>(args.Target))
-                return;
-
-            if (!TryComp<MetapsionicPowerComponent>(args.Performer, out var component))
-                return;
-
-            var ev = new FocusedMetapsionicDoAfterEvent(_gameTiming.CurTime);
-
-            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.Performer, component.UseDelay - psionic.Amplification, ev, args.Performer, args.Target, args.Performer)
-            {
-                BlockDuplicate = true,
-                BreakOnUserMove = true,
-                BreakOnTargetMove = true,
-                BreakOnDamage = true,
-            }, out var doAfterId);
-
-            component.DoAfter = doAfterId;
-
-            _popups.PopupEntity(Loc.GetString("focused-metapsionic-pulse-begin", ("entity", args.Target)),
-                args.Performer,
-                // TODO: Use LoS-based Filter when one is available.
-                Filter.Pvs(args.Performer).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(args.Performer, entity, ExamineRange, null)),
-                true,
-                PopupType.Medium);
-
-            _audioSystem.PlayPvs(component.SoundUse, args.Performer, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
-            _psionics.LogPowerUsed(args.Performer, "focused metapsionic pulse",
-                (int) MathF.Round(3 * psionic.Amplification - psionic.Dampening),
-                (int) MathF.Round(6 * psionic.Amplification - psionic.Dampening));
-            args.Handled = true;
-
-            UpdateActions(args.Performer, component);
-        }
-
-        private void OnDoAfter(EntityUid uid, MetapsionicPowerComponent component, FocusedMetapsionicDoAfterEvent args)
-        {
-            if (!TryComp<PsionicComponent>(args.Target, out var psychic))
-                return;
-
-            component.DoAfter = null;
-
-            if (args.Target == null) return;
-
-            if (TryComp<MindSwappedComponent>(args.Target, out var swapped))
-            {
-                _popups.PopupEntity(Loc.GetString(swapped.MindSwappedFeedback, ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
-                return;
-            }
-
-            if (args.Target == uid)
-            {
-                _popups.PopupEntity(Loc.GetString("metapulse-self", ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
-                return;
-            }
-
-            if (!HasComp<PotentialPsionicComponent>(args.Target))
-            {
-                _popups.PopupEntity(Loc.GetString("no-powers", ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
-                return;
-            }
-
-            if (HasComp<PotentialPsionicComponent>(args.Target) & !HasComp<PsionicComponent>(args.Target))
-            {
-                _popups.PopupEntity(Loc.GetString("psychic-potential", ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
-                return;
-            }
-
-            foreach (var psychicFeedback in psychic.PsychicFeedback)
-            {
-                _popups.PopupEntity(Loc.GetString(psychicFeedback, ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
-            }
-
-        }
-    }
-}
diff --git a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
deleted file mode 100644
index 6958170a5c..0000000000
--- a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.Player;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Server.DoAfter;
-using Content.Shared.Psionics.Abilities;
-using Content.Shared.Actions;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.DoAfter;
-using Content.Shared.FixedPoint;
-using Content.Shared.Mobs;
-using Content.Shared.Popups;
-using Content.Shared.Psionics.Events;
-using Content.Shared.Examine;
-using Robust.Shared.Timing;
-using Content.Shared.Actions.Events;
-using Robust.Server.Audio;
-
-namespace Content.Server.Psionics.Abilities
-{
-    public sealed class PsionicRegenerationPowerSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
-        [Dependency] private readonly AudioSystem _audioSystem = default!;
-        [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
-        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly ExamineSystemShared _examine = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<PsionicRegenerationPowerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<PsionicRegenerationPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<PsionicRegenerationPowerComponent, PsionicRegenerationPowerActionEvent>(OnPowerUsed);
-            SubscribeLocalEvent<PsionicRegenerationPowerComponent, MobStateChangedEvent>(OnMobStateChangedEvent);
-            SubscribeLocalEvent<PsionicRegenerationPowerComponent, DispelledEvent>(OnDispelled);
-            SubscribeLocalEvent<PsionicRegenerationPowerComponent, PsionicRegenerationDoAfterEvent>(OnDoAfter);
-        }
-
-        private void OnInit(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentInit args)
-        {
-            _actions.AddAction(uid, ref component.PsionicRegenerationActionEntity, component.PsionicRegenerationActionId );
-            _actions.TryGetActionData( component.PsionicRegenerationActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.PsionicRegenerationActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Add(component);
-                psionic.PsychicFeedback.Add(component.RegenerationFeedback);
-                psionic.Amplification += 0.5f;
-                psionic.Dampening += 0.5f;
-            }
-        }
-
-        private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationPowerActionEvent args)
-        {
-            if (!TryComp<PsionicComponent>(uid, out var psionic))
-                return;
-
-            var ev = new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime);
-            var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseDelay, ev, uid);
-
-            //Prevent the power from ignoring its own cooldown
-            _actions.TryGetActionData(component.PsionicRegenerationActionEntity, out var actionData);
-            var curTime = _gameTiming.CurTime;
-            if (actionData != null && actionData.Cooldown.HasValue && actionData.Cooldown.Value.End > curTime)
-                return;
-
-            _doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId);
-
-            component.DoAfter = doAfterId;
-
-            _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-begin", ("entity", uid)), uid, PopupType.Medium);
-            _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
-
-            _psionics.LogPowerUsed(uid, "psionic regeneration",
-            (int) Math.Round(6 * psionic.Amplification - psionic.Dampening),
-            (int) Math.Round(8 * psionic.Amplification - psionic.Dampening));
-
-            args.Handled = true;
-        }
-
-        /// <summary>
-        /// Regenerators automatically activate upon crit, provided the power was off cooldown at that exact point in time.
-        /// Self-rescusitation is also far more costly, and extremely obvious
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="component"></param>
-        /// <param name="args"></param>
-        private void OnMobStateChangedEvent(EntityUid uid, PsionicRegenerationPowerComponent component, MobStateChangedEvent args)
-        {
-            if (!TryComp<PsionicComponent>(uid, out var psionic))
-                return;
-
-            if (HasComp<PsionicInsulationComponent>(uid))
-                return;
-
-            if (args.NewMobState is MobState.Critical)
-            {
-                _actions.TryGetActionData(component.PsionicRegenerationActionEntity, out var actionData);
-                var curTime = _gameTiming.CurTime;
-                if (actionData != null && actionData.Cooldown.HasValue && actionData.Cooldown.Value.End > curTime)
-                    return;
-
-                if (actionData is { UseDelay: not null })
-                {
-                    component.SelfRevive = true;
-                    _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.UseDelay, new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime), uid, args.Target, uid)
-                    {
-                        BreakOnUserMove = false,
-                        BreakOnTargetMove = false,
-                        BreakOnWeightlessMove = false,
-                        BreakOnDamage = false,
-                        RequireCanInteract = false,
-                    });
-                    _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-self-revive", ("entity", uid)), uid, PopupType.MediumCaution);
-                    _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
-
-                    _psionics.LogPowerUsed(uid, "psionic regeneration",
-                        (int) Math.Round(10 * psionic.Amplification - 2 * psionic.Dampening),
-                        (int) Math.Round(20 * psionic.Amplification - 2 * psionic.Dampening));
-
-                    _actions.StartUseDelay(component.PsionicRegenerationActionEntity);
-                }
-            }
-        }
-
-        private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentShutdown args)
-        {
-            _actions.RemoveAction(uid, component.PsionicRegenerationActionEntity);
-
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-                psionic.PsychicFeedback.Remove(component.RegenerationFeedback);
-                psionic.Amplification -= 0.5f;
-                psionic.Dampening -= 0.5f;
-            }
-        }
-
-        private void OnDispelled(EntityUid uid, PsionicRegenerationPowerComponent component, DispelledEvent args)
-        {
-            if (component.DoAfter == null)
-                return;
-
-            _doAfterSystem.Cancel(component.DoAfter);
-            component.DoAfter = null;
-
-            args.Handled = true;
-        }
-
-        private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationDoAfterEvent args)
-        {
-            component.DoAfter = null;
-
-            if (!TryComp<PsionicComponent>(uid, out var psionic))
-                return;
-
-            if (!TryComp<BloodstreamComponent>(uid, out var stream))
-                return;
-
-            var percentageComplete = Math.Min(1f, (_gameTiming.CurTime - args.StartedAt).TotalSeconds / component.UseDelay);
-
-            var solution = new Solution();
-            solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(Math.Min(component.EssenceAmount * percentageComplete + 10f * psionic.Dampening, 15f)));
-            _bloodstreamSystem.TryAddToChemicals(uid, solution, stream);
-            if (component.SelfRevive == true)
-            {
-                var critSolution = new Solution();
-                critSolution.AddReagent("Epinephrine", MathF.Min(5 + 5 * psionic.Dampening, 15));
-                _bloodstreamSystem.TryAddToChemicals(uid, critSolution, stream);
-                component.SelfRevive = false;
-            }
-        }
-    }
-}
diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
deleted file mode 100644
index 77075dab20..0000000000
--- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Psionics.Abilities;
-using Content.Server.Atmos.Components;
-using Content.Server.Weapons.Ranged.Systems;
-using Robust.Server.GameObjects;
-using Content.Shared.Actions.Events;
-using Content.Server.Explosion.Components;
-using Content.Shared.Mobs.Components;
-using Robust.Shared.Map;
-
-namespace Content.Server.Psionics.Abilities
-{
-    public sealed class PyrokinesisPowerSystem : EntitySystem
-    {
-        [Dependency] private readonly TransformSystem _xform = default!;
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
-        [Dependency] private readonly GunSystem _gunSystem = default!;
-        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
-        [Dependency] private readonly PhysicsSystem _physics = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<PyrokinesisPowerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<PyrokinesisPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<PyrokinesisPowerActionEvent>(OnPowerUsed);
-        }
-
-        private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, ComponentInit args)
-        {
-            _actions.AddAction(uid, ref component.PyrokinesisActionEntity, component.PyrokinesisActionId);
-            _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData);
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.PyrokinesisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Add(component);
-                psionic.PsychicFeedback.Add(component.PyrokinesisFeedback);
-                psionic.Amplification += 1f;
-            }
-        }
-
-        private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, ComponentShutdown args)
-        {
-            _actions.RemoveAction(uid, component.PyrokinesisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-                psionic.PsychicFeedback.Remove(component.PyrokinesisFeedback);
-                psionic.Amplification -= 1f;
-            }
-        }
-
-        private void OnPowerUsed(PyrokinesisPowerActionEvent args)
-        {
-            if (!TryComp<PsionicComponent>(args.Performer, out var psionic))
-                return;
-
-            if (!HasComp<PsionicInsulationComponent>(args.Performer))
-            {
-                var xformQuery = GetEntityQuery<TransformComponent>();
-                var xform = xformQuery.GetComponent(args.Performer);
-
-                var mapPos = xform.Coordinates.ToMap(EntityManager, _xform);
-                var spawnCoords = _mapManager.TryFindGridAt(mapPos, out var gridUid, out _)
-                    ? xform.Coordinates.WithEntityId(gridUid, EntityManager)
-                    : new(_mapManager.GetMapEntityId(mapPos.MapId), mapPos.Position);
-
-                var ent = Spawn("ProjectileAnomalyFireball", spawnCoords);
-
-                if (TryComp<ExplosiveComponent>(ent, out var fireball))
-                {
-                    fireball.MaxIntensity = (int) MathF.Round(20 * psionic.Amplification - 10 * psionic.Dampening);
-
-                    if (psionic.Amplification > 5 && EnsureComp<IgniteOnCollideComponent>(ent, out var ignite))
-                    {
-                        ignite.FireStacks = 0.2f * psionic.Amplification - 0.1f * psionic.Dampening;
-                    }
-                }
-
-                var direction = args.Target.Position;
-
-                _gunSystem.ShootProjectile(ent, direction, new System.Numerics.Vector2(0, 0), args.Performer, args.Performer, 20f);
-
-                _psionics.LogPowerUsed(args.Performer, "pyrokinesis",
-                    (int) MathF.Round(6f * psionic.Amplification - psionic.Dampening),
-                    (int) MathF.Round(8f * psionic.Amplification - psionic.Dampening));
-                args.Handled = true;
-            }
-        }
-    }
-}
diff --git a/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs b/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs
deleted file mode 100644
index e184b19396..0000000000
--- a/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Server.Body.Components;
-using Content.Shared.Actions;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Bed.Sleep;
-using Content.Shared.Psionics.Abilities;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using Content.Shared.Mind;
-using Content.Shared.Actions.Events;
-using Content.Shared.FixedPoint;
-
-namespace Content.Server.Psionics.Abilities
-{
-    public sealed class MassSleepPowerSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
-        [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<RegenerativeStasisPowerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<RegenerativeStasisPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<RegenerativeStasisPowerComponent, RegenerativeStasisPowerActionEvent>(OnPowerUsed);
-        }
-
-        private void OnInit(EntityUid uid, RegenerativeStasisPowerComponent component, ComponentInit args)
-        {
-            _actions.AddAction(uid, ref component.RegenerativeStasisActionEntity, component.RegenerativeStasisActionId);
-            _actions.TryGetActionData(component.RegenerativeStasisActionEntity, out var actionData);
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.RegenerativeStasisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Add(component);
-                psionic.PsychicFeedback.Add(component.RegenerativeStasisFeedback);
-                psionic.Amplification += 0.5f;
-                psionic.Dampening += 0.5f;
-            }
-        }
-
-        private void OnShutdown(EntityUid uid, RegenerativeStasisPowerComponent component, ComponentShutdown args)
-        {
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-                psionic.PsychicFeedback.Remove(component.RegenerativeStasisFeedback);
-                psionic.Amplification -= 0.5f;
-                psionic.Dampening -= 0.5f;
-            }
-            _actions.RemoveAction(uid, component.RegenerativeStasisActionEntity);
-        }
-
-        private void OnPowerUsed(EntityUid uid, RegenerativeStasisPowerComponent component, RegenerativeStasisPowerActionEvent args)
-        {
-            if (TryComp<PsionicComponent>(uid, out var psionic)
-            && !HasComp<PsionicInsulationComponent>(uid)
-            && !HasComp<PsionicInsulationComponent>(args.Target)
-            && TryComp<BloodstreamComponent>(args.Target, out var stream))
-            {
-                var solution = new Solution();
-                solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(MathF.Min(2.5f * psionic.Amplification + psionic.Dampening, 15f)));
-                solution.AddReagent("Epinephrine", FixedPoint2.New(MathF.Min(2.5f * psionic.Dampening + psionic.Amplification, 15f)));
-                _bloodstreamSystem.TryAddToChemicals(args.Target, solution, stream);
-                EnsureComp<SleepingComponent>(args.Target);
-
-                _psionics.LogPowerUsed(uid, "regenerative stasis",
-                (int) Math.Round(4 * psionic.Amplification - psionic.Dampening),
-                (int) Math.Round(6 * psionic.Amplification - psionic.Dampening));
-                args.Handled = true;
-            }
-        }
-    }
-}
diff --git a/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
deleted file mode 100644
index f03b001fc7..0000000000
--- a/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Psionics.Abilities;
-using Content.Shared.Mind.Components;
-using Content.Shared.Actions.Events;
-using Content.Shared.Mobs;
-using Content.Shared.Storage.Components;
-
-namespace Content.Server.Psionics.Abilities
-{
-    public sealed class TelegnosisPowerSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly MindSwapPowerSystem _mindSwap = default!;
-        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<TelegnosisPowerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<TelegnosisPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<TelegnosisPowerComponent, TelegnosisPowerActionEvent>(OnPowerUsed);
-            SubscribeLocalEvent<TelegnosticProjectionComponent, MindRemovedMessage>(OnMindRemoved);
-            SubscribeLocalEvent<TelegnosisPowerComponent, DispelledEvent>(OnDispelled);
-            SubscribeLocalEvent<TelegnosisPowerComponent, MobStateChangedEvent>(OnMobstateChanged);
-            SubscribeLocalEvent<TelegnosisPowerComponent, InsertIntoEntityStorageAttemptEvent>(OnStorageInsertAttempt);
-        }
-
-        private void OnInit(EntityUid uid, TelegnosisPowerComponent component, ComponentInit args)
-        {
-            _actions.AddAction(uid, ref component.TelegnosisActionEntity, component.TelegnosisActionId );
-            _actions.TryGetActionData( component.TelegnosisActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.TelegnosisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Add(component);
-                psionic.PsychicFeedback.Add(component.TelegnosisFeedback);
-                psionic.Amplification += 0.3f;
-                psionic.Dampening += 0.3f;
-            }
-        }
-
-        private void OnShutdown(EntityUid uid, TelegnosisPowerComponent component, ComponentShutdown args)
-        {
-            _actions.RemoveAction(uid, component.TelegnosisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-                psionic.PsychicFeedback.Remove(component.TelegnosisFeedback);
-                psionic.Amplification -= 0.3f;
-                psionic.Dampening -= 0.3f;
-            }
-        }
-
-        private void OnPowerUsed(EntityUid uid, TelegnosisPowerComponent component, TelegnosisPowerActionEvent args)
-        {
-            if (!TryComp<PsionicComponent>(uid, out var psionic))
-                return;
-
-            if (HasComp<PsionicInsulationComponent>(uid))
-                return;
-
-            var projection = Spawn(component.Prototype, Transform(uid).Coordinates);
-            Transform(projection).AttachToGridOrMap();
-            component.OriginalEntity = uid;
-            component.IsProjecting = true;
-            component.ProjectionUid = projection;
-            _mindSwap.Swap(uid, projection);
-
-            if (EnsureComp<TelegnosticProjectionComponent>(projection, out var projectionComponent))
-                projectionComponent.OriginalEntity = uid;
-
-            _psionics.LogPowerUsed(uid, "telegnosis",
-            (int) Math.Round(8f * psionic.Amplification - psionic.Dampening),
-            (int) Math.Round(12f * psionic.Amplification - psionic.Dampening));
-
-            args.Handled = true;
-        }
-        private void OnMindRemoved(EntityUid uid, TelegnosticProjectionComponent component, MindRemovedMessage args)
-        {
-            if (TryComp<TelegnosisPowerComponent>(component.OriginalEntity, out var originalEntity))
-                originalEntity.IsProjecting = false;
-
-            QueueDel(uid);
-        }
-
-        private void OnDispelled(EntityUid uid, TelegnosisPowerComponent component, DispelledEvent args)
-        {
-            if (component.IsProjecting)
-                _mindSwap.Swap(uid, component.ProjectionUid);
-        }
-
-        private void OnMobstateChanged(EntityUid uid, TelegnosisPowerComponent component, MobStateChangedEvent args)
-        {
-            if (component.IsProjecting && args.NewMobState is MobState.Critical
-            || component.IsProjecting && args.NewMobState is MobState.Dead)
-                _mindSwap.Swap(uid, component.ProjectionUid);
-        }
-
-        private void OnStorageInsertAttempt(EntityUid uid, TelegnosisPowerComponent component, InsertIntoEntityStorageAttemptEvent args)
-        {
-            if (component.IsProjecting)
-                _mindSwap.Swap(uid, component.ProjectionUid);
-        }
-    }
-}
diff --git a/Content.Server/Psionics/PotentialPsionicComponent.cs b/Content.Server/Psionics/PotentialPsionicComponent.cs
deleted file mode 100644
index e874296a4c..0000000000
--- a/Content.Server/Psionics/PotentialPsionicComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace Content.Server.Psionics
-{
-    [RegisterComponent]
-    public sealed partial class PotentialPsionicComponent : Component
-    {
-        /// <summary>
-        /// The base chance of an entity rolling psychic powers, which is increased by other modifiers such as glimmer.
-        /// </summary>
-        /// <remarks>
-        /// I have increased this to 10% up from its original value of 2%, because I estimate that most people won't take the Latent Psychic trait
-        /// Simply because they might not even know it exists
-        /// </remarks>
-        [DataField("chance")]
-        public float Chance = 0.10f;
-
-        /// <summary>
-        /// YORO (you only reroll once)
-        /// </summary>
-        public bool Rerolled = false;
-    }
-}
diff --git a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
index d18b044205..53517da6cb 100644
--- a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
+++ b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
@@ -1,6 +1,9 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Emp;
+using Content.Server.Language;
 using Content.Server.Radio.Components;
+using Content.Server.Speech;
+using Content.Shared.Chat;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
@@ -14,6 +17,7 @@ public sealed class HeadsetSystem : SharedHeadsetSystem
 {
     [Dependency] private readonly INetManager _netMan = default!;
     [Dependency] private readonly RadioSystem _radio = default!;
+    [Dependency] private readonly LanguageSystem _language = default!;
 
     public override void Initialize()
     {
@@ -99,8 +103,16 @@ public void SetEnabled(EntityUid uid, bool value, HeadsetComponent? component =
 
     private void OnHeadsetReceive(EntityUid uid, HeadsetComponent component, ref RadioReceiveEvent args)
     {
-        if (TryComp(Transform(uid).ParentUid, out ActorComponent? actor))
-            _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.Channel);
+        var parent = Transform(uid).ParentUid;
+        if (TryComp(parent, out ActorComponent? actor))
+        {
+            var canUnderstand = _language.CanUnderstand(parent, args.Language);
+            var msg = new MsgChatMessage
+            {
+                Message = canUnderstand ? args.OriginalChatMsg : args.LanguageObfuscatedChatMsg
+            };
+            _netMan.ServerSendMessage(msg, actor.PlayerSession.Channel);
+        }
     }
 
     private void OnEmpPulse(EntityUid uid, HeadsetComponent component, ref EmpPulseEvent args)
diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs
index fdf02f94df..53e0409af0 100644
--- a/Content.Server/Radio/EntitySystems/JammerSystem.cs
+++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs
@@ -1,8 +1,13 @@
+using Content.Server.DeviceNetwork.Components;
+using Content.Server.DeviceNetwork.Systems;
+using Content.Server.Medical.CrewMonitoring;
 using Content.Server.Medical.SuitSensors;
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
 using Content.Server.PowerCell;
 using Content.Server.Radio.Components;
+using Content.Server.Station.Systems;
+using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.PowerCell.Components;
@@ -15,6 +20,8 @@ public sealed class JammerSystem : EntitySystem
     [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly StationSystem _stationSystem = default!;
+    [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!;
 
     public override void Initialize()
     {
@@ -36,6 +43,7 @@ public override void Update(float frameTime)
                 !_battery.TryUseCharge(batteryUid.Value, jam.Wattage * frameTime, battery))
             {
                 RemComp<ActiveRadioJammerComponent>(uid);
+                RemComp<DeviceNetworkJammerComponent>(uid);
             }
         }
     }
@@ -48,10 +56,19 @@ private void OnActivate(EntityUid uid, RadioJammerComponent comp, ActivateInWorl
         if (activated)
         {
             EnsureComp<ActiveRadioJammerComponent>(uid);
+            var stationId = _stationSystem.GetOwningStation(uid);
+            if (stationId != null && _singletonServerSystem.TryGetActiveServerAddress<CrewMonitoringServerComponent>(stationId.Value, out var netId))
+            {
+                EnsureComp<DeviceNetworkJammerComponent>(uid, out var jammingComp);
+                jammingComp.Range = comp.Range;
+                jammingComp.JammableNetworks.Add(netId);
+                Dirty(uid, jammingComp);
+            }
         }
         else
         {
             RemComp<ActiveRadioJammerComponent>(uid);
+            RemComp<DeviceNetworkJammerComponent>(uid);
         }
         var state = Loc.GetString(activated ? "radio-jammer-component-on-state" : "radio-jammer-component-off-state");
         var message = Loc.GetString("radio-jammer-component-on-use", ("state", state));
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index ace7d8ae31..fc3f69a3ba 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Interaction;
+using Content.Server.Language;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -29,6 +30,7 @@ public sealed class RadioDeviceSystem : EntitySystem
     [Dependency] private readonly InteractionSystem _interaction = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
+    [Dependency] private readonly LanguageSystem _language = default!;
 
     // Used to prevent a shitter from using a bunch of radios to spam chat.
     private HashSet<(string, EntityUid)> _recentlySent = new();
@@ -208,7 +210,8 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref
             ("originalName", nameEv.Name));
 
         // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios
-        _chat.TrySendInGameICMessage(uid, args.Message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false);
+        var message = args.OriginalChatMsg.Message; // The chat system will handle the rest and re-obfuscate if needed.
+        _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false, languageOverride: args.Language);
     }
 
     private void OnBeforeIntercomUiOpen(EntityUid uid, IntercomComponent component, BeforeActivatableUIOpenEvent args)
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index e2a61b5022..60aa7c2f4f 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -1,10 +1,13 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
+using Content.Server.Language;
 using Content.Server.Power.Components;
 using Content.Server.Radio.Components;
+using Content.Server.Speech;
 using Content.Server.VoiceMask;
 using Content.Shared.Chat;
 using Content.Shared.Database;
+using Content.Shared.Language;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
 using Content.Shared.Speech;
@@ -29,6 +32,7 @@ public sealed class RadioSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly LanguageSystem _language = default!;
 
     // set used to prevent radio feedback loops.
     private readonly HashSet<string> _messages = new();
@@ -44,7 +48,7 @@ private void OnIntrinsicSpeak(EntityUid uid, IntrinsicRadioTransmitterComponent
     {
         if (args.Channel != null && component.Channels.Contains(args.Channel.ID))
         {
-            SendRadioMessage(uid, args.Message, args.Channel, uid);
+            SendRadioMessage(uid, args.Message, args.Channel, uid, args.Language);
             args.Channel = null; // prevent duplicate messages from other listeners.
         }
     }
@@ -52,15 +56,23 @@ private void OnIntrinsicSpeak(EntityUid uid, IntrinsicRadioTransmitterComponent
     private void OnIntrinsicReceive(EntityUid uid, IntrinsicRadioReceiverComponent component, ref RadioReceiveEvent args)
     {
         if (TryComp(uid, out ActorComponent? actor))
-            _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.Channel);
+        {
+            // Einstein-Engines - languages mechanic
+            var listener = component.Owner;
+            var msg = args.OriginalChatMsg;
+            if (listener != null && !_language.CanUnderstand(listener, args.Language))
+                msg = args.LanguageObfuscatedChatMsg;
+
+            _netMan.ServerSendMessage(new MsgChatMessage { Message = msg}, actor.PlayerSession.Channel);
+        }
     }
 
     /// <summary>
     /// Send radio message to all active radio listeners
     /// </summary>
-    public void SendRadioMessage(EntityUid messageSource, string message, ProtoId<RadioChannelPrototype> channel, EntityUid radioSource, bool escapeMarkup = true)
+    public void SendRadioMessage(EntityUid messageSource, string message, ProtoId<RadioChannelPrototype> channel, EntityUid radioSource, LanguagePrototype? language = null, bool escapeMarkup = true)
     {
-        SendRadioMessage(messageSource, message, _prototype.Index(channel), radioSource, escapeMarkup: escapeMarkup);
+        SendRadioMessage(messageSource, message, _prototype.Index(channel), radioSource, escapeMarkup: escapeMarkup, language: language);
     }
 
     /// <summary>
@@ -68,8 +80,11 @@ public void SendRadioMessage(EntityUid messageSource, string message, ProtoId<Ra
     /// </summary>
     /// <param name="messageSource">Entity that spoke the message</param>
     /// <param name="radioSource">Entity that picked up the message and will send it, e.g. headset</param>
-    public void SendRadioMessage(EntityUid messageSource, string message, RadioChannelPrototype channel, EntityUid radioSource, bool escapeMarkup = true)
+    public void SendRadioMessage(EntityUid messageSource, string message, RadioChannelPrototype channel, EntityUid radioSource, LanguagePrototype? language = null, bool escapeMarkup = true)
     {
+        if (language == null)
+            language = _language.GetLanguage(messageSource);
+
         // TODO if radios ever garble / modify messages, feedback-prevention needs to be handled better than this.
         if (!_messages.Add(message))
             return;
@@ -84,6 +99,7 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
 
         name = FormattedMessage.EscapeText(name);
 
+        // most radios are relayed to chat, so lets parse the chat message beforehand
         SpeechVerbPrototype speech;
         if (mask != null
             && mask.Enabled
@@ -99,24 +115,15 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
             ? FormattedMessage.EscapeText(message)
             : message;
 
-        var wrappedMessage = Loc.GetString(speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap",
-            ("color", channel.Color),
-            ("fontType", speech.FontId),
-            ("fontSize", speech.FontSize),
-            ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
-            ("channel", $"\\[{channel.LocalizedName}\\]"),
-            ("name", name),
-            ("message", content));
+        var wrappedMessage = WrapRadioMessage(messageSource, channel, name, content);
+        var msg = new ChatMessage(ChatChannel.Radio, content, wrappedMessage, NetEntity.Invalid, null);
 
-        // most radios are relayed to chat, so lets parse the chat message beforehand
-        var chat = new ChatMessage(
-            ChatChannel.Radio,
-            message,
-            wrappedMessage,
-            NetEntity.Invalid,
-            null);
-        var chatMsg = new MsgChatMessage { Message = chat };
-        var ev = new RadioReceiveEvent(message, messageSource, channel, chatMsg);
+        // ... you guess it
+        var obfuscated = _language.ObfuscateSpeech(content, language);
+        var obfuscatedWrapped = WrapRadioMessage(messageSource, channel, name, obfuscated);
+        var notUdsMsg = new ChatMessage(ChatChannel.Radio, obfuscated, obfuscatedWrapped, NetEntity.Invalid, null);
+
+        var ev = new RadioReceiveEvent(messageSource, channel, msg, notUdsMsg, language);
 
         var sendAttemptEv = new RadioSendAttemptEvent(channel, radioSource);
         RaiseLocalEvent(ref sendAttemptEv);
@@ -162,10 +169,23 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
         else
             _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Radio message from {ToPrettyString(messageSource):user} on {channel.LocalizedName}: {message}");
 
-        _replay.RecordServerMessage(chat);
+        _replay.RecordServerMessage(msg);
         _messages.Remove(message);
     }
 
+    private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel, string name, string message)
+    {
+        var speech = _chat.GetSpeechVerb(source, message);
+        return Loc.GetString(speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap",
+            ("color", channel.Color),
+            ("fontType", speech.FontId),
+            ("fontSize", speech.FontSize),
+            ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
+            ("channel", $"\\[{channel.LocalizedName}\\]"),
+            ("name", name),
+            ("message", FormattedMessage.EscapeText(message)));
+    }
+
     /// <inheritdoc cref="TelecomServerComponent"/>
     private bool HasActiveServer(MapId mapId, string channelId)
     {
diff --git a/Content.Server/Radio/RadioEvent.cs b/Content.Server/Radio/RadioEvent.cs
index 69d764ffe6..35220d1d75 100644
--- a/Content.Server/Radio/RadioEvent.cs
+++ b/Content.Server/Radio/RadioEvent.cs
@@ -1,10 +1,22 @@
 using Content.Shared.Chat;
+using Content.Shared.Language;
 using Content.Shared.Radio;
 
 namespace Content.Server.Radio;
 
+/// <summary>
+/// <param name="OriginalChatMsg">The message to display when the speaker can understand "language"</param>
+/// <param name="LanguageObfuscatedChatMsg">The message to display when the speaker cannot understand "language"</param>
+/// </summary>
 [ByRefEvent]
-public readonly record struct RadioReceiveEvent(string Message, EntityUid MessageSource, RadioChannelPrototype Channel, MsgChatMessage ChatMsg);
+public readonly record struct RadioReceiveEvent(
+    // Einstein-Engines - languages mechanic
+    EntityUid MessageSource,
+    RadioChannelPrototype Channel,
+    ChatMessage OriginalChatMsg,
+    ChatMessage LanguageObfuscatedChatMsg,
+    LanguagePrototype Language
+);
 
 /// <summary>
 /// Use this event to cancel sending message per receiver
diff --git a/Content.Server/Remotes/DoorRemoteSystem.cs b/Content.Server/Remotes/DoorRemoteSystem.cs
index 6403c41add..d335911901 100644
--- a/Content.Server/Remotes/DoorRemoteSystem.cs
+++ b/Content.Server/Remotes/DoorRemoteSystem.cs
@@ -22,6 +22,7 @@ public sealed class DoorRemoteSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly DoorSystem _doorSystem = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
         // I'm so sorry [Dependency] private readonly SharedAirlockSystem _sharedAirlockSystem = default!;
 
         public override void Initialize()
@@ -67,7 +68,7 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo
                 || !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it
                 // Only able to control doors if they are within your vision and within your max range.
                 // Not affected by mobs or machines anymore.
-                || !ExamineSystemShared.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
+                || !_examine.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
             {
                 return;
             }
diff --git a/Content.Server/Respawn/SpecialRespawnSystem.cs b/Content.Server/Respawn/SpecialRespawnSystem.cs
index 51c092be18..2822c94093 100644
--- a/Content.Server/Respawn/SpecialRespawnSystem.cs
+++ b/Content.Server/Respawn/SpecialRespawnSystem.cs
@@ -20,6 +20,7 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
     [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
     [Dependency] private readonly IChatManager _chat = default!;
 
@@ -129,11 +130,11 @@ private void OnTermination(EntityUid uid, SpecialRespawnComponent component, ref
     private void Respawn(EntityUid oldEntity, string prototype, EntityCoordinates coords)
     {
         var entity = Spawn(prototype, coords);
-        _adminLog.Add(LogType.Respawn, LogImpact.High, $"{ToPrettyString(oldEntity)} was deleted and was respawned at {coords.ToMap(EntityManager)} as {ToPrettyString(entity)}");
+        _adminLog.Add(LogType.Respawn, LogImpact.High, $"{ToPrettyString(oldEntity)} was deleted and was respawned at {coords.ToMap(EntityManager, _transform)} as {ToPrettyString(entity)}");
         _chat.SendAdminAlert($"{MetaData(oldEntity).EntityName} was deleted and was respawned as {ToPrettyString(entity)}");
     }
 
-        /// <summary>
+    /// <summary>
     /// Try to find a random safe tile on the supplied grid
     /// </summary>
     /// <param name="targetGrid">The grid that you're looking for a safe tile on</param>
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index ba07375699..7784db015d 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -13,7 +13,7 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Timing;
-using Content.Shared.Psionics.Abilities; //EE - Summary: for the telegnostic projection.
+using Content.Shared.Abilities.Psionics; //Nyano - Summary: for the telegnostic projection.
 
 namespace Content.Server.Singularity.EntitySystems;
 
@@ -39,7 +39,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<MapGridComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume);
         SubscribeLocalEvent<GhostComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume);
-        SubscribeLocalEvent<TelegnosticProjectionComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume); ///EE - Summary: the telegnositic projection has the same trait as ghosts.
+        SubscribeLocalEvent<TelegnosticProjectionComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume); ///Nyano - Summary: the telegnositic projection has the same trait as ghosts. 
         SubscribeLocalEvent<StationDataComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume);
         SubscribeLocalEvent<EventHorizonComponent, MapInitEvent>(OnHorizonMapInit);
         SubscribeLocalEvent<EventHorizonComponent, StartCollideEvent>(OnStartCollide);
diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
index ce4334391d..f1d0af6f90 100644
--- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
@@ -18,13 +18,13 @@ namespace Content.Server.Singularity.EntitySystems;
 /// </summary>
 public sealed class GravityWellSystem : SharedGravityWellSystem
 {
-#region Dependencies
+    #region Dependencies
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IViewVariablesManager _vvManager = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-#endregion Dependencies
+    #endregion Dependencies
 
     /// <summary>
     /// The minimum range at which gravpulses will act.
@@ -155,7 +155,7 @@ public void GravPulse(EntityUid uid, float maxRange, float minRange, float baseR
     /// <param name="minRange">The minimum distance at which entities can be affected by the gravity pulse.</param>
     /// <param name="baseMatrixDeltaV">The base velocity added to any entities within affected by the gravity pulse scaled by the displacement of those entities from the epicenter.</param>
     public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, in Matrix3 baseMatrixDeltaV)
-        => GravPulse(entityPos.ToMap(EntityManager), maxRange, minRange, in baseMatrixDeltaV);
+        => GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, in baseMatrixDeltaV);
 
     /// <summary>
     /// Greates a gravitational pulse, shoving around all entities within some distance of an epicenter.
@@ -166,7 +166,7 @@ public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRang
     /// <param name="baseRadialDeltaV">The base radial velocity that will be added to entities within range towards the center of the gravitational pulse.</param>
     /// <param name="baseTangentialDeltaV">The base tangential velocity that will be added to entities within countrclockwise around the center of the gravitational pulse.</param>
     public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, float baseRadialDeltaV = 0.0f, float baseTangentialDeltaV = 0.0f)
-        => GravPulse(entityPos.ToMap(EntityManager), maxRange, minRange, baseRadialDeltaV, baseTangentialDeltaV);
+        => GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, baseRadialDeltaV, baseTangentialDeltaV);
 
     /// <summary>
     /// Causes a gravitational pulse, shoving around all entities within some distance of an epicenter.
diff --git a/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs
index 3c44a7fc7a..bc0de7c8c6 100644
--- a/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs
@@ -2,12 +2,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.Singularity.Components;
 using Content.Shared.Singularity.Components;
-using Content.Shared.Singularity.EntitySystems;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
 using Robust.Shared.Timing;
 using System.Numerics;
 
@@ -18,8 +13,8 @@ namespace Content.Server.Singularity.EntitySystems;
 /// </summary>
 public sealed class SingularityAttractorSystem : EntitySystem
 {
-    [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     /// <summary>
     /// The minimum range at which the attraction will act.
@@ -69,7 +64,7 @@ private void Update(EntityUid uid, SingularityAttractorComponent? attractor = nu
 
         attractor.LastPulseTime = _timing.CurTime;
 
-        var mapPos = xform.Coordinates.ToMap(EntityManager);
+        var mapPos = xform.Coordinates.ToMap(EntityManager, _transform);
 
         if (mapPos == MapCoordinates.Nullspace)
             return;
@@ -77,7 +72,7 @@ private void Update(EntityUid uid, SingularityAttractorComponent? attractor = nu
         var query = EntityQuery<SingularityComponent, RandomWalkComponent, TransformComponent>();
         foreach (var (singulo, walk, singuloXform) in query)
         {
-            var singuloMapPos = singuloXform.Coordinates.ToMap(EntityManager);
+            var singuloMapPos = singuloXform.Coordinates.ToMap(EntityManager, _transform);
 
             if (singuloMapPos.MapId != mapPos.MapId)
                 continue;
diff --git a/Content.Server/Speech/EntitySystems/ListeningSystem.cs b/Content.Server/Speech/EntitySystems/ListeningSystem.cs
index ea3569e055..f2a625600c 100644
--- a/Content.Server/Speech/EntitySystems/ListeningSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ListeningSystem.cs
@@ -8,6 +8,7 @@ namespace Content.Server.Speech.EntitySystems;
 /// </summary>
 public sealed class ListeningSystem : EntitySystem
 {
+    [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly SharedTransformSystem _xforms = default!;
 
     public override void Initialize()
@@ -18,10 +19,10 @@ public override void Initialize()
 
     private void OnSpeak(EntitySpokeEvent ev)
     {
-        PingListeners(ev.Source, ev.Message, ev.ObfuscatedMessage);
+        PingListeners(ev.Source, ev.Message, ev.IsWhisper);
     }
 
-    public void PingListeners(EntityUid source, string message, string? obfuscatedMessage)
+    public void PingListeners(EntityUid source, string message, bool isWhisper)
     {
         // TODO whispering / audio volume? Microphone sensitivity?
         // for now, whispering just arbitrarily reduces the listener's max range.
@@ -32,7 +33,7 @@ public void PingListeners(EntityUid source, string message, string? obfuscatedMe
 
         var attemptEv = new ListenAttemptEvent(source);
         var ev = new ListenEvent(message, source);
-        var obfuscatedEv = obfuscatedMessage == null ? null : new ListenEvent(obfuscatedMessage, source);
+        var obfuscatedEv = !isWhisper ? null : new ListenEvent(_chat.ObfuscateMessageReadability(message), source);
         var query = EntityQueryEnumerator<ActiveListenerComponent, TransformComponent>();
 
         while(query.MoveNext(out var listenerUid, out var listener, out var xform))
diff --git a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
index 9995ed40c1..356768769b 100644
--- a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
+++ b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
@@ -26,6 +26,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
     [Dependency] private readonly WeldableSystem _weldableSystem = default!;
     [Dependency] private readonly LockSystem _lockSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
 
     public override void Initialize()
@@ -386,7 +387,7 @@ private void DestroyAfterLimit(EntityUid uid, BluespaceLockerComponent component
         switch (component.BehaviorProperties.DestroyType)
         {
             case BluespaceLockerDestroyType.Explode:
-                _explosionSystem.QueueExplosion(uid.ToCoordinates().ToMap(EntityManager),
+                _explosionSystem.QueueExplosion(uid.ToCoordinates().ToMap(EntityManager, _transformSystem),
                     ExplosionSystem.DefaultExplosionPrototypeId, 4, 1, 2, maxTileBreak: 0);
                 goto case BluespaceLockerDestroyType.Delete;
             case BluespaceLockerDestroyType.Delete:
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index 281d8f5726..49db980451 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -5,6 +5,7 @@
 using Content.Server.Stack;
 using Content.Server.Store.Components;
 using Content.Shared.Actions;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands.EntitySystems;
@@ -248,10 +249,12 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
                 HandleRefundComp(uid, component, upgradeActionId.Value);
         }
 
-        //broadcast event
         if (listing.ProductEvent != null)
         {
-            RaiseLocalEvent(listing.ProductEvent);
+            if (!listing.RaiseProductEventOnUser)
+                RaiseLocalEvent(listing.ProductEvent);
+            else
+                RaiseLocalEvent(buyer, listing.ProductEvent);
         }
 
         //log dat shit.
@@ -321,6 +324,8 @@ private void OnRequestRefund(EntityUid uid, StoreComponent component, StoreReque
         if (!component.RefundAllowed || component.BoughtEntities.Count == 0)
             return;
 
+        _admin.Add(LogType.StoreRefund, LogImpact.Low, $"{ToPrettyString(buyer):player} has refunded their purchases from {ToPrettyString(uid):store}");
+
         for (var i = component.BoughtEntities.Count - 1; i >= 0; i--)
         {
             var purchase = component.BoughtEntities[i];
diff --git a/Content.Server/Tabletop/TabletopSystem.Session.cs b/Content.Server/Tabletop/TabletopSystem.Session.cs
index f16f3f01e9..c2bb8426fc 100644
--- a/Content.Server/Tabletop/TabletopSystem.Session.cs
+++ b/Content.Server/Tabletop/TabletopSystem.Session.cs
@@ -31,7 +31,7 @@ public TabletopSession EnsureSession(TabletopGameComponent tabletop)
             // Since this is the first time opening this session, set up the game
             tabletop.Setup.SetupTabletop(session, EntityManager);
 
-            Logger.Info($"Created tabletop session number {tabletop} at position {session.Position}.");
+            Log.Info($"Created tabletop session number {tabletop} at position {session.Position}.");
 
             return session;
         }
diff --git a/Content.Server/Tiles/LavaSystem.cs b/Content.Server/Tiles/LavaSystem.cs
index 51bd6f8475..7aee0b6501 100644
--- a/Content.Server/Tiles/LavaSystem.cs
+++ b/Content.Server/Tiles/LavaSystem.cs
@@ -11,7 +11,7 @@ public sealed class LavaSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<LavaComponent, StepTriggeredOffEvent>(OnLavaStepTriggered);
+        SubscribeLocalEvent<LavaComponent, StepTriggeredEvent>(OnLavaStepTriggered);
         SubscribeLocalEvent<LavaComponent, StepTriggerAttemptEvent>(OnLavaStepTriggerAttempt);
     }
 
@@ -23,7 +23,7 @@ private void OnLavaStepTriggerAttempt(EntityUid uid, LavaComponent component, re
         args.Continue = true;
     }
 
-    private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredOffEvent args)
+    private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredEvent args)
     {
         var otherUid = args.Tripper;
 
diff --git a/Content.Server/Wires/WireLayout.cs b/Content.Server/Wires/WireLayout.cs
index ecafba013e..621992c915 100644
--- a/Content.Server/Wires/WireLayout.cs
+++ b/Content.Server/Wires/WireLayout.cs
@@ -28,11 +28,13 @@ public sealed partial class WireLayoutPrototype : IPrototype, IInheritingPrototy
     ///     initialization)
     /// </summary>
     [DataField("dummyWires")]
+    [NeverPushInheritance]
     public int DummyWires { get; private set; } = default!;
 
     /// <summary>
     ///     All the valid IWireActions currently in this layout.
     /// </summary>
     [DataField("wires")]
+    [NeverPushInheritance]
     public List<IWireAction>? Wires { get; private set; }
 }
diff --git a/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs b/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs
index aed32bc89c..f2e051669a 100644
--- a/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs
+++ b/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs
@@ -9,6 +9,7 @@ namespace Content.Server.Worldgen.Systems.Carvers;
 public sealed class NoiseRangeCarverSystem : EntitySystem
 {
     [Dependency] private readonly NoiseIndexSystem _index = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     /// <inheritdoc />
     public override void Initialize()
@@ -19,7 +20,7 @@ public override void Initialize()
     private void OnPrePlaceDebris(EntityUid uid, NoiseRangeCarverComponent component,
         ref PrePlaceDebrisFeatureEvent args)
     {
-        var coords = WorldGen.WorldToChunkCoords(args.Coords.ToMapPos(EntityManager));
+        var coords = WorldGen.WorldToChunkCoords(args.Coords.ToMapPos(EntityManager, _transform));
         var val = _index.Evaluate(uid, component.NoiseChannel, coords);
 
         foreach (var (low, high) in component.Ranges)
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 53128aade3..daadd4b518 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -16,7 +16,7 @@
 using Content.Server.Roles;
 using Content.Server.Speech.Components;
 using Content.Server.Temperature.Components;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.CombatMode;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage;
@@ -59,7 +59,9 @@ public sealed partial class ZombieSystem
         [Dependency] private readonly IChatManager _chatMan = default!;
         [Dependency] private readonly MindSystem _mind = default!;
         [Dependency] private readonly SharedRoleSystem _roles = default!;
+        [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
+        [Dependency] private readonly ActionsSystem _actions = default!; // DeltaV - No psionic zombies
 
         /// <summary>
         /// Handles an entity turning into a zombie when they die or go into crit
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index 70a6119130..ba94b0f373 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -98,4 +98,5 @@ public enum LogType
     ChatRateLimited = 87,
     AtmosTemperatureChanged = 88,
     DeviceNetwork = 89,
+    StoreRefund = 90
 }
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index a3bb1e1467..c335cd7b85 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -129,7 +129,7 @@ public void StartSupercriticalEvent(EntityUid uid)
         if (HasComp<AnomalySupercriticalComponent>(uid))
             return;
 
-        AdminLog.Add(LogType.Anomaly, LogImpact.High, $"Anomaly {ToPrettyString(uid)} began to go supercritical.");
+        AdminLog.Add(LogType.Anomaly, LogImpact.Extreme, $"Anomaly {ToPrettyString(uid)} began to go supercritical.");
         if (_net.IsServer)
             Log.Info($"Anomaly is going supercritical. Entity: {ToPrettyString(uid)}");
 
diff --git a/Content.Shared/Audio/SharedAmbientSoundSystem.cs b/Content.Shared/Audio/SharedAmbientSoundSystem.cs
index 6318ba2557..5f17261825 100644
--- a/Content.Shared/Audio/SharedAmbientSoundSystem.cs
+++ b/Content.Shared/Audio/SharedAmbientSoundSystem.cs
@@ -5,16 +5,19 @@ namespace Content.Shared.Audio;
 
 public abstract class SharedAmbientSoundSystem : EntitySystem
 {
+    private EntityQuery<AmbientSoundComponent> _query;
+
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<AmbientSoundComponent, ComponentGetState>(GetCompState);
         SubscribeLocalEvent<AmbientSoundComponent, ComponentHandleState>(HandleCompState);
+        _query = GetEntityQuery<AmbientSoundComponent>();
     }
 
     public virtual void SetAmbience(EntityUid uid, bool value, AmbientSoundComponent? ambience = null)
     {
-        if (!Resolve(uid, ref ambience, false) || ambience.Enabled == value)
+        if (!_query.Resolve(uid, ref ambience, false) || ambience.Enabled == value)
             return;
 
         ambience.Enabled = value;
@@ -24,7 +27,7 @@ public virtual void SetAmbience(EntityUid uid, bool value, AmbientSoundComponent
 
     public virtual void SetRange(EntityUid uid, float value, AmbientSoundComponent? ambience = null)
     {
-        if (!Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Range, value))
+        if (!_query.Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Range, value))
             return;
 
         ambience.Range = value;
@@ -39,7 +42,7 @@ protected virtual void QueueUpdate(EntityUid uid, AmbientSoundComponent ambience
 
     public virtual void SetVolume(EntityUid uid, float value, AmbientSoundComponent? ambience = null)
     {
-        if (!Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Volume, value))
+        if (!_query.Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Volume, value))
             return;
 
         ambience.Volume = value;
@@ -48,7 +51,7 @@ public virtual void SetVolume(EntityUid uid, float value, AmbientSoundComponent?
 
     public virtual void SetSound(EntityUid uid, SoundSpecifier sound, AmbientSoundComponent? ambience = null)
     {
-        if (!Resolve(uid, ref ambience, false) || ambience.Sound == sound)
+        if (!_query.Resolve(uid, ref ambience, false) || ambience.Sound == sound)
             return;
 
         ambience.Sound = sound;
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 891c790d52..f8943a9bf9 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1596,10 +1596,10 @@ public static readonly CVarDef<int>
          */
 
         public static readonly CVarDef<string> UILayout =
-            CVarDef.Create("ui.layout", "Separated", CVar.CLIENTONLY | CVar.ARCHIVE);
+            CVarDef.Create("ui.layout", "Default", CVar.CLIENTONLY | CVar.ARCHIVE);
 
-        public static readonly CVarDef<string> OverlayScreenChatSize =
-            CVarDef.Create("ui.overlay_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE);
+        public static readonly CVarDef<string> DefaultScreenChatSize =
+            CVarDef.Create("ui.default_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE);
 
         public static readonly CVarDef<string> SeparatedScreenChatSize =
             CVarDef.Create("ui.separated_chat_size", "0.6,0", CVar.CLIENTONLY | CVar.ARCHIVE);
diff --git a/Content.Shared/Chasm/ChasmSystem.cs b/Content.Shared/Chasm/ChasmSystem.cs
index 86b8d4fc4d..51299557db 100644
--- a/Content.Shared/Chasm/ChasmSystem.cs
+++ b/Content.Shared/Chasm/ChasmSystem.cs
@@ -24,7 +24,7 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<ChasmComponent, StepTriggeredOffEvent>(OnStepTriggered);
+        SubscribeLocalEvent<ChasmComponent, StepTriggeredEvent>(OnStepTriggered);
         SubscribeLocalEvent<ChasmComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
         SubscribeLocalEvent<ChasmFallingComponent, UpdateCanMoveEvent>(OnUpdateCanMove);
     }
@@ -47,7 +47,7 @@ public override void Update(float frameTime)
         }
     }
 
-    private void OnStepTriggered(EntityUid uid, ChasmComponent component, ref StepTriggeredOffEvent args)
+    private void OnStepTriggered(EntityUid uid, ChasmComponent component, ref StepTriggeredEvent args)
     {
         // already doomed
         if (HasComp<ChasmFallingComponent>(args.Tripper))
diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs
index 188028c8f8..437c5e327d 100644
--- a/Content.Shared/Chemistry/Components/InjectorComponent.cs
+++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs
@@ -30,7 +30,7 @@ public sealed partial class InjectorComponent : Component
     /// Whether or not the injector is able to draw from containers or if it's a single use
     /// device that can only inject.
     /// </summary>
-    [DataField("injectOnly")]
+    [DataField]
     public bool InjectOnly;
 
     /// <summary>
@@ -39,28 +39,26 @@ public sealed partial class InjectorComponent : Component
     /// <remarks>
     ///     for example: droppers would ignore mobs
     /// </remarks>
-    [DataField("ignoreMobs")]
+    [DataField]
     public bool IgnoreMobs;
 
     /// <summary>
     ///     The minimum amount of solution that can be transferred at once from this solution.
     /// </summary>
     [DataField("minTransferAmount")]
-    [ViewVariables(VVAccess.ReadWrite)]
     public FixedPoint2 MinimumTransferAmount = FixedPoint2.New(5);
 
     /// <summary>
     ///     The maximum amount of solution that can be transferred at once from this solution.
     /// </summary>
     [DataField("maxTransferAmount")]
-    public FixedPoint2 MaximumTransferAmount = FixedPoint2.New(15);
+    public FixedPoint2 MaximumTransferAmount = FixedPoint2.New(50);
 
     /// <summary>
     /// Amount to inject or draw on each usage. If the injector is inject only, it will
     /// attempt to inject it's entire contents upon use.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("transferAmount")]
+    [DataField]
     [AutoNetworkedField]
     public FixedPoint2 TransferAmount = FixedPoint2.New(5);
 
@@ -71,8 +69,7 @@ public sealed partial class InjectorComponent : Component
     /// The base delay has a minimum of 1 second, but this will still be modified if the target is incapacitated or
     /// in combat mode.
     /// </remarks>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("delay")]
+    [DataField]
     public TimeSpan Delay = TimeSpan.FromSeconds(5);
 
     /// <summary>
@@ -80,7 +77,6 @@ public sealed partial class InjectorComponent : Component
     /// right SolutionCaps to support injection/drawing. For InjectOnly injectors this should
     /// only ever be set to Inject
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]
     [DataField]
     public InjectorToggleMode ToggleState = InjectorToggleMode.Draw;
diff --git a/Content.Shared/Construction/Conditions/WallmountCondition.cs b/Content.Shared/Construction/Conditions/WallmountCondition.cs
index bf3016d497..fe4336e6fc 100644
--- a/Content.Shared/Construction/Conditions/WallmountCondition.cs
+++ b/Content.Shared/Construction/Conditions/WallmountCondition.cs
@@ -19,8 +19,9 @@ public bool Condition(EntityUid user, EntityCoordinates location, Direction dire
             var entManager = IoCManager.Resolve<IEntityManager>();
 
             // get blueprint and user position
+            var transformSystem = entManager.System<SharedTransformSystem>();
             var userWorldPosition = entManager.GetComponent<TransformComponent>(user).WorldPosition;
-            var objWorldPosition = location.ToMap(entManager).Position;
+            var objWorldPosition = location.ToMap(entManager, transformSystem).Position;
 
             // find direction from user to blueprint
             var userToObject = (objWorldPosition - userWorldPosition);
diff --git a/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs b/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs
new file mode 100644
index 0000000000..75de0cb8a2
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.DeviceNetwork.Components;
+
+/// <summary>
+/// Allow entities to jam DeviceNetwork packets.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DeviceNetworkJammerComponent : Component
+{
+    /// <summary>
+    /// Range where packets will be jammed. This is checked both against the sender and receiver.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Range = 5.0f;
+
+    /// <summary>
+    /// Device networks that can be jammed. For a list of default NetworkIds see DeviceNetIdDefaults on Content.Server.
+    /// Network ids are not guaranteed to be limited to DeviceNetIdDefaults.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HashSet<string> JammableNetworks = [];
+
+}
diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs
index 5a3fb87229..f792862be1 100644
--- a/Content.Shared/Examine/ExamineSystemShared.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -144,7 +144,7 @@ public bool IsOccluded(EntityUid uid)
             return TryComp<EyeComponent>(uid, out var eye) && eye.DrawFov;
         }
 
-        public static bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
+        public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
         {
             // No, rider. This is better.
             // ReSharper disable once ConvertToLocalFunction
@@ -154,7 +154,7 @@ public static bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other
             return InRangeUnOccluded(origin, other, range, predicate, wrapped, ignoreInsideBlocker, entMan);
         }
 
-        public static bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates other, float range,
+        public bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates other, float range,
             TState state, Func<EntityUid, TState, bool> predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
         {
             if (other.MapId != origin.MapId ||
@@ -171,7 +171,7 @@ public static bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinat
 
             if (length > MaxRaycastRange)
             {
-                Logger.Warning("InRangeUnOccluded check performed over extreme range. Limiting CollisionRay size.");
+                Log.Warning("InRangeUnOccluded check performed over extreme range. Limiting CollisionRay size.");
                 length = MaxRaycastRange;
             }
 
@@ -207,7 +207,7 @@ public static bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinat
             return true;
         }
 
-        public static bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
+        public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
             var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
@@ -216,7 +216,7 @@ public static bool InRangeUnOccluded(EntityUid origin, EntityUid other, float ra
             return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
         }
 
-        public static bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
+        public bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
             var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
@@ -225,7 +225,7 @@ public static bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other,
             return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
         }
 
-        public static bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
+        public bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
             var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
index bbae03e45b..20e08b2767 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
@@ -114,7 +114,7 @@ public bool TryPickup(
                 && (itemPos.Position - xform.MapPosition.Position).Length() <= MaxAnimationRange
                 && MetaData(entity).VisibilityMask == MetaData(uid).VisibilityMask) // Don't animate aghost pickups.
             {
-                var initialPosition = EntityCoordinates.FromMap(coordinateEntity, itemPos, EntityManager);
+                var initialPosition = EntityCoordinates.FromMap(coordinateEntity, itemPos, TransformSystem, EntityManager);
                 _storage.PlayPickupAnimation(entity, initialPosition, xform.Coordinates, itemXform.LocalRotation, uid);
             }
         }
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index ee4a4e9023..0b72ac5ee7 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -25,6 +25,7 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction CycleChatChannelBackward = "CycleChatChannelBackward";
         public static readonly BoundKeyFunction EscapeContext = "EscapeContext";
         public static readonly BoundKeyFunction OpenCharacterMenu = "OpenCharacterMenu";
+        public static readonly BoundKeyFunction OpenLanguageMenu = "OpenLanguageMenu";
         public static readonly BoundKeyFunction OpenCraftingMenu = "OpenCraftingMenu";
         public static readonly BoundKeyFunction OpenGuidebook = "OpenGuidebook";
         public static readonly BoundKeyFunction OpenInventoryMenu = "OpenInventoryMenu";
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 7d5e390b6f..0e390ecea4 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -459,7 +459,7 @@ protected bool ValidateInteractAndFace(EntityUid user, EntityCoordinates coordin
                 return false;
 
             if (!HasComp<NoRotateOnInteractComponent>(user))
-                _rotateToFaceSystem.TryFaceCoordinates(user, coordinates.ToMapPos(EntityManager));
+                _rotateToFaceSystem.TryFaceCoordinates(user, coordinates.ToMapPos(EntityManager, _transform));
 
             return true;
         }
@@ -612,7 +612,7 @@ public bool InRangeUnobstructed(
             Ignored combinedPredicate = e => e == origin || (predicate?.Invoke(e) ?? false);
             var inRange = true;
             MapCoordinates originPos = default;
-            var targetPos = otherCoordinates.ToMap(EntityManager);
+            var targetPos = otherCoordinates.ToMap(EntityManager, _transform);
             Angle targetRot = default;
 
             // So essentially:
@@ -785,7 +785,7 @@ public bool InRangeUnobstructed(
             Ignored? predicate = null,
             bool popup = false)
         {
-            return InRangeUnobstructed(origin, other.ToMap(EntityManager), range, collisionMask, predicate, popup);
+            return InRangeUnobstructed(origin, other.ToMap(EntityManager, _transform), range, collisionMask, predicate, popup);
         }
 
         /// <summary>
diff --git a/Content.Shared/Language/Components/LanguageSpeakerComponent.cs b/Content.Shared/Language/Components/LanguageSpeakerComponent.cs
new file mode 100644
index 0000000000..95232ffe6f
--- /dev/null
+++ b/Content.Shared/Language/Components/LanguageSpeakerComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+
+namespace Content.Shared.Language;
+
+[RegisterComponent, AutoGenerateComponentState]
+public sealed partial class LanguageSpeakerComponent : Component
+{
+    /// <summary>
+    ///     The current language the entity may use to speak.
+    ///     Other listeners will hear the entity speak in this language.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [AutoNetworkedField]
+    public string CurrentLanguage = default!;
+
+    /// <summary>
+    ///     List of languages this entity can speak.
+    /// </summary>
+    [ViewVariables]
+    [DataField("speaks", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>), required: true)]
+    public List<string> SpokenLanguages = new();
+
+    /// <summary>
+    ///     List of languages this entity can understand.
+    /// </summary>
+    [ViewVariables]
+    [DataField("understands", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>), required: true)]
+    public List<string> UnderstoodLanguages = new();
+}
diff --git a/Content.Shared/Language/Components/TranslatorImplanterComponent.cs b/Content.Shared/Language/Components/TranslatorImplanterComponent.cs
new file mode 100644
index 0000000000..401e8a8b8a
--- /dev/null
+++ b/Content.Shared/Language/Components/TranslatorImplanterComponent.cs
@@ -0,0 +1,35 @@
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+
+namespace Content.Shared.Language.Components;
+
+/// <summary>
+///   An item that, when used on a mob, adds an intrinsic translator to it.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TranslatorImplanterComponent : Component
+{
+    [DataField("spoken", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
+    public List<string> SpokenLanguages = new();
+
+    [DataField("understood", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
+    public List<string> UnderstoodLanguages = new();
+
+    /// <summary>
+    ///   The list of languages the mob must understand in order for this translator to have effect.
+    ///   Knowing one language is enough.
+    /// </summary>
+    [DataField("requires", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
+    public List<string> RequiredLanguages = new();
+
+    /// <summary>
+    ///   If true, only allows to use this implanter on mobs.
+    /// </summary>
+    [DataField]
+    public bool MobsOnly = true;
+
+    /// <summary>
+    ///   Whether this implant has been used already.
+    /// </summary>
+    [DataField]
+    public bool Used = false;
+}
diff --git a/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs
new file mode 100644
index 0000000000..a66c9be082
--- /dev/null
+++ b/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs
@@ -0,0 +1,47 @@
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+
+namespace Content.Shared.Language.Components.Translators;
+
+public abstract partial class BaseTranslatorComponent : Component
+{
+    // TODO may need to be removed completely, it's a part of legacy code that never ended up being used.
+    /// <summary>
+    ///   The language this translator changes the speaker's language to when they don't specify one.
+    ///   If null, does not modify the default language.
+    /// </summary>
+    [DataField("defaultLanguage")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string? DefaultLanguageOverride = null;
+
+    /// <summary>
+    ///   The list of additional languages this translator allows the wielder to speak.
+    /// </summary>
+    [DataField("spoken", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
+    public List<string> SpokenLanguages = new();
+
+    /// <summary>
+    ///   The list of additional languages this translator allows the wielder to understand.
+    /// </summary>
+    [DataField("understood", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
+    public List<string> UnderstoodLanguages = new();
+
+    /// <summary>
+    ///   The languages the wielding MUST know in order for this translator to have effect.
+    ///   The field [RequiresAllLanguages] indicates whether all of them are required, or just one.
+    /// </summary>
+    [DataField("requires", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
+    public List<string> RequiredLanguages = new();
+
+    /// <summary>
+    ///   If true, the wielder must understand all languages in [RequiredLanguages] to speak [SpokenLanguages],
+    ///   and understand all languages in [RequiredLanguages] to understand [UnderstoodLanguages].
+    ///
+    ///   Otherwise, at least one language must be known (or the list must be empty).
+    /// </summary>
+    [DataField("requiresAll")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public bool RequiresAllLanguages = false;
+
+    [DataField("enabled"), ViewVariables(VVAccess.ReadWrite)]
+    public bool Enabled = true;
+}
diff --git a/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs
new file mode 100644
index 0000000000..f900603f01
--- /dev/null
+++ b/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs
@@ -0,0 +1,15 @@
+namespace Content.Shared.Language.Components.Translators;
+
+/// <summary>
+///   A translator that must be held in a hand or a pocket of an entity in order ot have effect.
+/// </summary>
+[RegisterComponent]
+public sealed partial class HandheldTranslatorComponent : Translators.BaseTranslatorComponent
+{
+    /// <summary>
+    ///   Whether or not interacting with this translator
+    ///   toggles it on or off.
+    /// </summary>
+    [DataField("toggleOnInteract")]
+    public bool ToggleOnInteract = true;
+}
diff --git a/Content.Shared/Language/Components/Translators/HoldsTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/HoldsTranslatorComponent.cs
new file mode 100644
index 0000000000..caea9b9a94
--- /dev/null
+++ b/Content.Shared/Language/Components/Translators/HoldsTranslatorComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared.Language.Components.Translators;
+
+/// <summary>
+///   Applied internally to the holder of [HandheldTranslatorComponent].
+///   Do not use directly. Use [HandheldTranslatorComponent] instead.
+/// </summary>
+[RegisterComponent]
+public sealed partial class HoldsTranslatorComponent : IntrinsicTranslatorComponent
+{
+    public Component? Issuer = null;
+}
diff --git a/Content.Shared/Language/Components/Translators/ImplantedTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/ImplantedTranslatorComponent.cs
new file mode 100644
index 0000000000..d1d72e83ed
--- /dev/null
+++ b/Content.Shared/Language/Components/Translators/ImplantedTranslatorComponent.cs
@@ -0,0 +1,9 @@
+namespace Content.Shared.Language.Components.Translators;
+
+/// <summary>
+///   Applied to entities who were injected with a translator implant.
+/// </summary>
+[RegisterComponent]
+public sealed partial class ImplantedTranslatorComponent : IntrinsicTranslatorComponent
+{
+}
diff --git a/Content.Shared/Language/Components/Translators/IntrinsicTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/IntrinsicTranslatorComponent.cs
new file mode 100644
index 0000000000..d8def4ac1d
--- /dev/null
+++ b/Content.Shared/Language/Components/Translators/IntrinsicTranslatorComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Language.Components.Translators;
+
+/// <summary>
+///   A translator attached to an entity that translates its speech.
+///   An example is a translator implant that allows the speaker to speak another language.
+/// </summary>
+[RegisterComponent, Virtual]
+public partial class IntrinsicTranslatorComponent : Translators.BaseTranslatorComponent
+{
+}
diff --git a/Content.Shared/Language/Components/UniversalLanguageSpeakerComponent.cs b/Content.Shared/Language/Components/UniversalLanguageSpeakerComponent.cs
new file mode 100644
index 0000000000..6f5ad1178b
--- /dev/null
+++ b/Content.Shared/Language/Components/UniversalLanguageSpeakerComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared.Language.Components;
+
+// <summary>
+//     Signifies that this entity can speak and understand any language.
+//     Applies to such entities as ghosts.
+// </summary>
+[RegisterComponent]
+public sealed partial class UniversalLanguageSpeakerComponent : Component
+{
+
+}
diff --git a/Content.Shared/Language/Events/LanguagesSetMessage.cs b/Content.Shared/Language/Events/LanguagesSetMessage.cs
new file mode 100644
index 0000000000..f7a78210aa
--- /dev/null
+++ b/Content.Shared/Language/Events/LanguagesSetMessage.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Language.Events;
+
+/// <summary>
+///     Sent from the client to the server when it needs to want to set his currentLangauge.
+///     Yeah im using this instead of ExecuteCommand... Better right?
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class LanguagesSetMessage(string currentLanguage) : EntityEventArgs
+{
+    public string CurrentLanguage = currentLanguage;
+}
diff --git a/Content.Shared/Language/Events/LanguagesUpdateEvent.cs b/Content.Shared/Language/Events/LanguagesUpdateEvent.cs
new file mode 100644
index 0000000000..90ce2f4446
--- /dev/null
+++ b/Content.Shared/Language/Events/LanguagesUpdateEvent.cs
@@ -0,0 +1,8 @@
+namespace Content.Shared.Language.Events;
+
+/// <summary>
+///     Raised on an entity when its list of languages changes.
+/// </summary>
+public sealed class LanguagesUpdateEvent : EntityEventArgs
+{
+}
diff --git a/Content.Shared/Language/Events/LanguagesUpdatedMessage.cs b/Content.Shared/Language/Events/LanguagesUpdatedMessage.cs
new file mode 100644
index 0000000000..563f036df6
--- /dev/null
+++ b/Content.Shared/Language/Events/LanguagesUpdatedMessage.cs
@@ -0,0 +1,15 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Language.Events;
+
+/// <summary>
+///     Sent to the client when its list of languages changes.
+///     The client should in turn update its HUD and relevant systems.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class LanguagesUpdatedMessage(string currentLanguage, List<string> spoken, List<string> understood) : EntityEventArgs
+{
+    public string CurrentLanguage = currentLanguage;
+    public List<string> Spoken = spoken;
+    public List<string> Understood = understood;
+}
diff --git a/Content.Shared/Language/Events/RequestLanguagesMessage.cs b/Content.Shared/Language/Events/RequestLanguagesMessage.cs
new file mode 100644
index 0000000000..aead1f4cd1
--- /dev/null
+++ b/Content.Shared/Language/Events/RequestLanguagesMessage.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Language.Events;
+
+/// <summary>
+///     Sent from the client to the server when it needs to learn the list of languages its entity knows.
+///     This event should always be followed by a <see cref="LanguagesUpdatedMessage"/>, unless the client doesn't have an entity.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class RequestLanguagesMessage : EntityEventArgs;
diff --git a/Content.Shared/Language/LanguagePrototype.cs b/Content.Shared/Language/LanguagePrototype.cs
new file mode 100644
index 0000000000..801ab8a393
--- /dev/null
+++ b/Content.Shared/Language/LanguagePrototype.cs
@@ -0,0 +1,37 @@
+using System.Runtime.CompilerServices;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Language;
+
+[Prototype("language")]
+public sealed class LanguagePrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set;  } = default!;
+
+    /// <summary>
+    ///     If true, obfuscated phrases of creatures speaking this language will have their syllables replaced with "replacement" syllables.
+    ///     Otherwise entire sentences will be replaced.
+    /// </summary>
+    [DataField(required: true)]
+    public bool ObfuscateSyllables;
+
+    /// <summary>
+    ///     Lists all syllables that are used to obfuscate a message a listener cannot understand if obfuscateSyllables is true.
+    ///     Otherwise uses all possible phrases the creature can make when trying to say anything.
+    /// </summary>
+    [DataField(required: true)]
+    public List<string> Replacement = [];
+
+    #region utility
+    /// <summary>
+    ///     The in-world name of this language, localized.
+    /// </summary>
+    public string Name => Loc.GetString($"language-{ID}-name");
+
+    /// <summary>
+    ///     The in-world description of this language, localized.
+    /// </summary>
+    public string Description => Loc.GetString($"language-{ID}-description");
+    #endregion utility
+}
diff --git a/Content.Shared/Language/Systems/SharedLanguageSystem.cs b/Content.Shared/Language/Systems/SharedLanguageSystem.cs
new file mode 100644
index 0000000000..e2eeb8bb49
--- /dev/null
+++ b/Content.Shared/Language/Systems/SharedLanguageSystem.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Actions;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Language.Systems;
+
+public abstract class SharedLanguageSystem : EntitySystem
+{
+    /// <summary>
+    ///     The language used as a fallback in cases where an entity suddenly becomes a language speaker (e.g. the usage of make-sentient)
+    /// </summary>
+    [ValidatePrototypeId<LanguagePrototype>]
+    public static readonly string FallbackLanguagePrototype = "GalacticCommon";
+
+    /// <summary>
+    ///     The language whose speakers are assumed to understand and speak every language. Should never be added directly.
+    /// </summary>
+    [ValidatePrototypeId<LanguagePrototype>]
+    public static readonly string UniversalPrototype = "Universal";
+
+    /// <summary>
+    ///     A cached instance of <see cref="UniversalPrototype"/>
+    /// </summary>
+    public static LanguagePrototype Universal { get; private set; } = default!;
+
+    [Dependency] protected readonly IPrototypeManager _prototype = default!;
+    [Dependency] protected readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        Universal = _prototype.Index<LanguagePrototype>("Universal");
+    }
+
+    public LanguagePrototype? GetLanguagePrototype(string id)
+    {
+        _prototype.TryIndex<LanguagePrototype>(id, out var proto);
+        return proto;
+    }
+}
diff --git a/Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs b/Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs
new file mode 100644
index 0000000000..a13225378c
--- /dev/null
+++ b/Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Examine;
+using Content.Shared.Implants.Components;
+using Content.Shared.Language.Components;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Language.Systems;
+
+public abstract class SharedTranslatorImplanterSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TranslatorImplanterComponent, ExaminedEvent>(OnExamined);
+    }
+
+    private void OnExamined(EntityUid uid, TranslatorImplanterComponent component, ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        var text = !component.Used
+            ? Loc.GetString("translator-implanter-ready")
+            : Loc.GetString("translator-implanter-used");
+
+        args.PushText(text);
+    }
+
+    protected void OnAppearanceChange(EntityUid implanter, TranslatorImplanterComponent component)
+    {
+        var used = component.Used;
+        _appearance.SetData(implanter, ImplanterVisuals.Full, !used);
+    }
+}
diff --git a/Content.Shared/Language/Systems/SharedTranslatorSystem.cs b/Content.Shared/Language/Systems/SharedTranslatorSystem.cs
new file mode 100644
index 0000000000..08a016efa9
--- /dev/null
+++ b/Content.Shared/Language/Systems/SharedTranslatorSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Examine;
+using Content.Shared.Toggleable;
+using Content.Shared.Language.Components.Translators;
+
+namespace Content.Shared.Language.Systems;
+
+public abstract class SharedTranslatorSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HandheldTranslatorComponent, ExaminedEvent>(OnExamined);
+    }
+
+    private void OnExamined(EntityUid uid, HandheldTranslatorComponent component, ExaminedEvent args)
+    {
+        var state = Loc.GetString(component.Enabled
+            ? "translator-enabled"
+            : "translator-disabled");
+
+        args.PushMarkup(state);
+    }
+
+    protected void OnAppearanceChange(EntityUid translator, HandheldTranslatorComponent? comp = null)
+    {
+        if (comp == null && !TryComp(translator, out comp))
+            return;
+
+        _appearance.SetData(translator, ToggleVisuals.Toggled, comp.Enabled);
+    }
+}
diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
index 813a18f974..a0feab7052 100644
--- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
+++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class MovementSpeedModifierComponent : Component
         // Weightless
         public const float DefaultMinimumFrictionSpeed = 0.005f;
         public const float DefaultWeightlessFriction = 1f;
-        public const float DefaultWeightlessFrictionNoInput = 0f;
+        public const float DefaultWeightlessFrictionNoInput = 0.2f;
         public const float DefaultWeightlessModifier = 0.7f;
         public const float DefaultWeightlessAcceleration = 1f;
 
diff --git a/Content.Shared/Psionics/Abilities/AcceptPsionicsEuiMessage.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
similarity index 100%
rename from Content.Shared/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
diff --git a/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
similarity index 77%
rename from Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
index c370288037..ce86111fc4 100644
--- a/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Damage;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     /// <summary>
     /// Takes damage when dispelled.
@@ -9,7 +9,7 @@ namespace Content.Shared.Psionics.Abilities
     public sealed partial class DamageOnDispelComponent : Component
     {
         [DataField("damage", required: true)]
-        public DamageSpecifier Damage = default!;
+        public DamageSpecifier  Damage = default!;
 
         [DataField("variance")]
         public float Variance = 0.5f;
diff --git a/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
similarity index 79%
rename from Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
index 518a28b096..cd88786636 100644
--- a/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
@@ -1,22 +1,20 @@
+using Content.Shared.Actions;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class DispelPowerComponent : Component
     {
         [DataField("range")]
         public float Range = 10f;
-
+        
         [DataField("dispelActionId",
         customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? DispelActionId = "ActionDispel";
 
         [DataField("dispelActionEntity")]
         public EntityUid? DispelActionEntity;
-
-        [DataField("dispelFeedback")]
-        public string DispelFeedback = "dispel-feedback";
     }
 }
diff --git a/Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs
similarity index 69%
rename from Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs
index 4bb5ee653d..4035200418 100644
--- a/Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class DispellableComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
new file mode 100644
index 0000000000..7d611c63da
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Actions;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.Abilities.Psionics
+{
+    [RegisterComponent]
+    public sealed partial class MassSleepPowerComponent : Component
+    {
+        public float Radius = 1.25f;
+        [DataField("massSleepActionId",
+        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string? MassSleepActionId = "ActionMassSleep";
+
+        [DataField("massSleepActionEntity")]
+        public EntityUid? MassSleepActionEntity;
+    }
+}
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
new file mode 100644
index 0000000000..e36a3c70e8
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
@@ -0,0 +1,59 @@
+using Content.Shared.Actions;
+using Content.Shared.Bed.Sleep;
+using Content.Shared.Magic.Events;
+using Content.Shared.Damage;
+using Content.Shared.Mobs.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Content.Shared.Mind;
+using Content.Shared.Actions.Events;
+
+namespace Content.Shared.Abilities.Psionics
+{
+    public sealed class MassSleepPowerSystem : EntitySystem
+    {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly SharedActionsSystem _actions = default!;
+        [Dependency] private readonly EntityLookupSystem _lookup = default!;
+        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<MassSleepPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<MassSleepPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<MassSleepPowerComponent, MassSleepPowerActionEvent>(OnPowerUsed);
+        }
+
+        private void OnInit(EntityUid uid, MassSleepPowerComponent component, ComponentInit args)
+        {
+            _actions.AddAction(uid, ref component.MassSleepActionEntity, component.MassSleepActionId );
+            _actions.TryGetActionData( component.MassSleepActionEntity, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.MassSleepActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+                psionic.PsionicAbility = component.MassSleepActionEntity;
+        }
+
+        private void OnShutdown(EntityUid uid, MassSleepPowerComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.MassSleepActionEntity);
+        }
+
+        private void OnPowerUsed(EntityUid uid, MassSleepPowerComponent component, MassSleepPowerActionEvent args)
+        {
+            foreach (var entity in _lookup.GetEntitiesInRange(args.Target, component.Radius))
+            {
+                if (HasComp<MobStateComponent>(entity) && entity != uid && !HasComp<PsionicInsulationComponent>(entity))
+                {
+                    if (TryComp<DamageableComponent>(entity, out var damageable) && damageable.DamageContainerID == "Biological")
+                        EnsureComp<SleepingComponent>(entity);
+                }
+            }
+            _psionics.LogPowerUsed(uid, "mass sleep");
+            args.Handled = true;
+        }
+    }
+}
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
new file mode 100644
index 0000000000..c9d0130221
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Actions;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.Abilities.Psionics
+{
+    [RegisterComponent]
+    public sealed partial class MetapsionicPowerComponent : Component
+    {
+        [DataField("range")]
+        public float Range = 5f;
+
+        public InstantActionComponent? MetapsionicPowerAction = null;
+        [DataField("metapsionicActionId",
+        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string? MetapsionicActionId = "ActionMetapsionic";
+
+        [DataField("metapsionicActionEntity")]
+        public EntityUid? MetapsionicActionEntity;
+    }
+}
diff --git a/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
similarity index 76%
rename from Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
index 94b73c41e3..6a3fc811c8 100644
--- a/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class MindSwapPowerComponent : Component
@@ -12,8 +12,5 @@ public sealed partial class MindSwapPowerComponent : Component
 
         [DataField("mindSwapActionEntity")]
         public EntityUid? MindSwapActionEntity;
-
-        [DataField("mindSwapFeedback")]
-        public string MindSwapFeedback = "mind-swap-feedback";
     }
 }
diff --git a/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
similarity index 77%
rename from Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
index 997db65e1b..0e91894b1d 100644
--- a/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class NoosphericZapPowerComponent : Component
@@ -13,8 +13,5 @@ public sealed partial class NoosphericZapPowerComponent : Component
 
         [DataField("noosphericZapActionEntity")]
         public EntityUid? NoosphericZapActionEntity;
-
-        [DataField("noosphericZapFeedback")]
-        public string NoosphericZapFeedback = "noospheric-zap-feedback";
     }
 }
diff --git a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
similarity index 71%
rename from Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
index d9c36f5b22..3e198aa930 100644
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class PsionicInvisibilityPowerComponent : Component
@@ -12,11 +12,5 @@ public sealed partial class PsionicInvisibilityPowerComponent : Component
 
         [DataField("psionicInvisibilityActionEntity")]
         public EntityUid? PsionicInvisibilityActionEntity;
-
-        [DataField("InvisibilityFeedback")]
-        public string InvisibilityFeedback = "invisibility-feedback";
-
-        [DataField("UseTimer")]
-        public float UseTimer = 30f;
     }
 }
diff --git a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
similarity index 94%
rename from Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
index 2a9dd7642b..9037b8bcdf 100644
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
@@ -1,7 +1,6 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class PsionicInvisibilityUsedComponent : Component
diff --git a/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
similarity index 76%
rename from Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
index 3184bf7de5..4a62e84d19 100644
--- a/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
@@ -3,7 +3,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class PsionicRegenerationPowerComponent : Component
@@ -12,7 +12,7 @@ public sealed partial class PsionicRegenerationPowerComponent : Component
         public DoAfterId? DoAfter;
 
         [DataField("essence")]
-        public float EssenceAmount = 10;
+        public float EssenceAmount = 20;
 
         [DataField("useDelay")]
         public float UseDelay = 8f;
@@ -26,12 +26,6 @@ public sealed partial class PsionicRegenerationPowerComponent : Component
 
         [DataField("psionicRegenerationActionEntity")]
         public EntityUid? PsionicRegenerationActionEntity;
-
-        [DataField("regenerationFeedback")]
-        public string RegenerationFeedback = "regeneration-feedback";
-
-        [DataField("selfRevive")]
-        public bool SelfRevive { get; set; } = false;
     }
 }
 
diff --git a/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
similarity index 79%
rename from Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
index 1f88741b9a..28425afdb4 100644
--- a/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class PyrokinesisPowerComponent : Component
@@ -14,8 +14,5 @@ public sealed partial class PyrokinesisPowerComponent : Component
 
         [DataField("pyrokinesisActionEntity")]
         public EntityUid? PyrokinesisActionEntity;
-
-        [DataField("pyrokinesisFeedback")]
-        public string PyrokinesisFeedback = "pyrokinesis-feedback";
     }
 }
diff --git a/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
similarity index 73%
rename from Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
index f1a71332b1..51958822a4 100644
--- a/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
@@ -3,7 +3,7 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class TelegnosisPowerComponent : Component
@@ -19,11 +19,5 @@ public sealed partial class TelegnosisPowerComponent : Component
 
         [DataField("telegnosisActionEntity")]
         public EntityUid? TelegnosisActionEntity;
-
-        [DataField("telegnosisFeedback")]
-        public string TelegnosisFeedback = "telegnosis-feedback";
-        public EntityUid OriginalEntity = default!;
-        public EntityUid ProjectionUid = default!;
-        public bool IsProjecting = false;
     }
-}
+}
\ No newline at end of file
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
new file mode 100644
index 0000000000..9d627cb42d
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.Abilities.Psionics
+{
+    [RegisterComponent]
+    public sealed partial class TelegnosticProjectionComponent : Component
+    {}
+}
\ No newline at end of file
diff --git a/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
similarity index 84%
rename from Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
index f09efc3064..4cbb05c839 100644
--- a/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class ClothingGrantPsionicPowerComponent : Component
diff --git a/Content.Shared/Psionics/Items/HeadCageComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs
similarity index 96%
rename from Content.Shared/Psionics/Items/HeadCageComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs
index c03241e47c..acaa832860 100644
--- a/Content.Shared/Psionics/Items/HeadCageComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using Robust.Shared.Audio;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class HeadCageComponent : Component
diff --git a/Content.Shared/Psionics/Items/HeadCagedComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs
similarity index 81%
rename from Content.Shared/Psionics/Items/HeadCagedComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs
index 0f826f7a05..f8af46b887 100644
--- a/Content.Shared/Psionics/Items/HeadCagedComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     /// <summary>
diff --git a/Content.Shared/Psionics/Items/PsionicItemsSystem.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs
similarity index 98%
rename from Content.Shared/Psionics/Items/PsionicItemsSystem.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs
index 950353c5df..f88acf61f3 100644
--- a/Content.Shared/Psionics/Items/PsionicItemsSystem.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.StatusEffect;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     public sealed class PsionicItemsSystem : EntitySystem
     {
diff --git a/Content.Shared/Psionics/Items/TinfoilHatComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs
similarity index 90%
rename from Content.Shared/Psionics/Items/TinfoilHatComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs
index 6ef7bdc823..5086b9f497 100644
--- a/Content.Shared/Psionics/Items/TinfoilHatComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class TinfoilHatComponent : Component
diff --git a/Content.Shared/Psionics/PsionicComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
similarity index 51%
rename from Content.Shared/Psionics/PsionicComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
index 9a06e54cb3..9091e03cfc 100644
--- a/Content.Shared/Psionics/PsionicComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
@@ -1,6 +1,7 @@
+using Content.Shared.Actions;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent, NetworkedComponent]
     public sealed partial class PsionicComponent : Component
@@ -14,17 +15,6 @@ public sealed partial class PsionicComponent : Component
         public bool Removable = true;
 
         [DataField("activePowers")]
-        public List<Component> ActivePowers = new();
-
-        [DataField("psychicFeedback")]
-        public List<string> PsychicFeedback = new();
-
-        [DataField("amplification")]
-        public float Amplification = 0.1f;
-
-        [DataField("dampening")]
-        public float Dampening = 0.1f;
-        public bool Telepath = false;
-        public bool InnatePsiChecked = false;
+        public HashSet<Component> ActivePowers = new();
     }
 }
diff --git a/Content.Shared/Psionics/PsionicInsulationComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs
similarity index 82%
rename from Content.Shared/Psionics/PsionicInsulationComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs
index 2ab054b1f8..12370da5ae 100644
--- a/Content.Shared/Psionics/PsionicInsulationComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class PsionicInsulationComponent : Component
diff --git a/Content.Shared/Psionics/PsionicsDisabledComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs
similarity index 84%
rename from Content.Shared/Psionics/PsionicsDisabledComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs
index 00cf550652..28e7157a9d 100644
--- a/Content.Shared/Psionics/PsionicsDisabledComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     /// <summary>
     /// Only use this for the status effect, please.
diff --git a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs
similarity index 97%
rename from Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs
index 603c5188a5..2739d5ba31 100644
--- a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs
@@ -7,7 +7,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     public sealed class SharedPsionicAbilitiesSystem : EntitySystem
     {
@@ -73,7 +73,7 @@ public void SetPsionicsThroughEligibility(EntityUid uid)
             if (actionData == null)
                 return;
 
-            _actions.SetEnabled(uid, IsEligibleForPsionics(uid));
+            _actions.SetEnabled(actionData.Owner, IsEligibleForPsionics(uid));
         }
 
         private bool IsEligibleForPsionics(EntityUid uid)
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs
new file mode 100644
index 0000000000..6666ee48d6
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs
@@ -0,0 +1,2 @@
+namespace Content.Shared.Actions.Events;
+public sealed partial class MassSleepPowerActionEvent : WorldTargetActionEvent {}
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
index b7c3c8ad2d..b28801efe7 100644
--- a/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
+++ b/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
@@ -1,3 +1,2 @@
 namespace Content.Shared.Actions.Events;
-public sealed partial class WideMetapsionicPowerActionEvent : InstantActionEvent { }
-public sealed partial class FocusedMetapsionicPowerActionEvent : EntityTargetActionEvent { }
+public sealed partial class MetapsionicPowerActionEvent : InstantActionEvent {}
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
index 4639aadd55..896ec0bb63 100644
--- a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
+++ b/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
@@ -1,4 +1,2 @@
 namespace Content.Shared.Actions.Events;
-public sealed partial class PyrokinesisPowerActionEvent : WorldTargetActionEvent {}
-
-
+public sealed partial class PyrokinesisPowerActionEvent : EntityTargetActionEvent {}
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs
deleted file mode 100644
index 4435f475a4..0000000000
--- a/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-namespace Content.Shared.Actions.Events;
-public sealed partial class RegenerativeStasisPowerActionEvent : EntityTargetActionEvent {}
diff --git a/Content.Shared/Nyanotrasen/Psionics/Events.cs b/Content.Shared/Nyanotrasen/Psionics/Events.cs
new file mode 100644
index 0000000000..cf9a50c6e1
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Psionics/Events.cs
@@ -0,0 +1,28 @@
+using Robust.Shared.Serialization;
+using Content.Shared.DoAfter;
+
+namespace Content.Shared.Psionics.Events
+{
+    [Serializable, NetSerializable]
+    public sealed partial class PsionicRegenerationDoAfterEvent : DoAfterEvent
+    {
+        [DataField("startedAt", required: true)]
+        public TimeSpan StartedAt;
+
+        private PsionicRegenerationDoAfterEvent()
+        {
+        }
+
+        public PsionicRegenerationDoAfterEvent(TimeSpan startedAt)
+        {
+            StartedAt = startedAt;
+        }
+
+        public override DoAfterEvent Clone() => this;
+    }
+
+    [Serializable, NetSerializable]
+    public sealed partial class GlimmerWispDrainDoAfterEvent : SimpleDoAfterEvent
+    {
+    }
+}
diff --git a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
similarity index 98%
rename from Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
rename to Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
index 8be02f936a..31af85bbb5 100644
--- a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
+++ b/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
@@ -40,7 +40,7 @@ public GlimmerTier GetGlimmerTier(int? glimmer = null)
             if (glimmer == null)
                 glimmer = Glimmer;
 
-            return glimmer switch
+            return (glimmer) switch
             {
                 <= 49 => GlimmerTier.Minimal,
                 >= 50 and <= 99 => GlimmerTier.Low,
diff --git a/Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs b/Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
similarity index 100%
rename from Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
rename to Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
diff --git a/Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs b/Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
similarity index 100%
rename from Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
rename to Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
diff --git a/Content.Shared/Physics/FrictionRemoverSystem.cs b/Content.Shared/Physics/FrictionRemoverSystem.cs
deleted file mode 100644
index 65bbe9e4d2..0000000000
--- a/Content.Shared/Physics/FrictionRemoverSystem.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
-
-namespace Content.Shared.Physics;
-
-public sealed class FrictionRemoverSystem : EntitySystem
-{
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PhysicsComponent, PhysicsSleepEvent>(RemoveDampening);
-    }
-
-
-    private void RemoveDampening(EntityUid uid, PhysicsComponent component, PhysicsSleepEvent args)
-    {
-        _physics.SetAngularDamping(uid, component, 0f, false);
-        _physics.SetLinearDamping(uid, component, 0f);
-    }
-}
diff --git a/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
deleted file mode 100644
index 2fbfe18327..0000000000
--- a/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Psionics.Abilities
-{
-    [RegisterComponent]
-    public sealed partial class MetapsionicPowerComponent : Component
-    {
-        [DataField("doAfter")]
-        public DoAfterId? DoAfter;
-
-        [DataField("useDelay")]
-        public float UseDelay = 8f;
-        [DataField("soundUse")]
-
-        public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Nyanotrasen/heartbeat_fast.ogg");
-
-        [DataField("range")]
-        public float Range = 5f;
-
-        [DataField("actionWideMetapsionic", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string ActionWideMetapsionic = "ActionWideMetapsionic";
-
-        [DataField("actionWideMetapsionicEntity")]
-        public EntityUid? ActionWideMetapsionicEntity;
-
-        [DataField("actionFocusedMetapsionic", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string ActionFocusedMetapsionic = "ActionFocusedMetapsionic";
-
-        [DataField("actionFocusedMetapsionicEntity")]
-        public EntityUid? ActionFocusedMetapsionicEntity;
-
-        [DataField("metapsionicFeedback")]
-        public string MetapsionicFeedback = "metapsionic-feedback";
-    }
-}
diff --git a/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs b/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs
deleted file mode 100644
index 27a0903e22..0000000000
--- a/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Actions;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Psionics.Abilities
-{
-    [RegisterComponent]
-    public sealed partial class RegenerativeStasisPowerComponent : Component
-    {
-        [DataField("regenerativeStasisActionId",
-        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? RegenerativeStasisActionId = "ActionRegenerativeStasis";
-
-        [DataField("regenerativeStasisActionEntity")]
-        public EntityUid? RegenerativeStasisActionEntity;
-
-        [DataField("regenerativeStasisFeedback")]
-        public string RegenerativeStasisFeedback = "regenerative-stasis-feedback";
-    }
-}
diff --git a/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
deleted file mode 100644
index bc18ff9f3c..0000000000
--- a/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Content.Shared.Psionics.Abilities
-{
-    [RegisterComponent]
-    public sealed partial class TelegnosticProjectionComponent : Component
-    {
-        public EntityUid OriginalEntity = default!;
-    }
-}
diff --git a/Content.Shared/Psionics/Events.cs b/Content.Shared/Psionics/Events.cs
deleted file mode 100644
index 45a00b5f04..0000000000
--- a/Content.Shared/Psionics/Events.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Robust.Shared.Serialization;
-using Content.Shared.DoAfter;
-
-namespace Content.Shared.Psionics.Events
-{
-    [Serializable, NetSerializable]
-    public sealed partial class PsionicRegenerationDoAfterEvent : DoAfterEvent
-    {
-        [DataField("startedAt", required: true)]
-        public TimeSpan StartedAt;
-
-        private PsionicRegenerationDoAfterEvent()
-        {
-        }
-
-        public PsionicRegenerationDoAfterEvent(TimeSpan startedAt)
-        {
-            StartedAt = startedAt;
-        }
-
-        public override DoAfterEvent Clone() => this;
-    }
-
-    [Serializable, NetSerializable]
-    public sealed partial class PsionicInvisibilityTimerEvent : DoAfterEvent
-    {
-        [DataField("startedAt", required: true)]
-        public TimeSpan StartedAt;
-
-        private PsionicInvisibilityTimerEvent()
-        {
-        }
-
-        public PsionicInvisibilityTimerEvent(TimeSpan startedAt)
-        {
-            StartedAt = startedAt;
-        }
-
-        public override DoAfterEvent Clone() => this;
-    }
-
-    [Serializable, NetSerializable]
-    public sealed partial class FocusedMetapsionicDoAfterEvent : DoAfterEvent
-    {
-        [DataField("startedAt", required: true)]
-        public TimeSpan StartedAt;
-
-        private FocusedMetapsionicDoAfterEvent()
-        {
-        }
-
-        public FocusedMetapsionicDoAfterEvent(TimeSpan startedAt)
-        {
-            StartedAt = startedAt;
-        }
-
-        public override DoAfterEvent Clone() => this;
-    }
-
-    [Serializable, NetSerializable]
-    public sealed partial class GlimmerWispDrainDoAfterEvent : SimpleDoAfterEvent
-    {
-    }
-}
diff --git a/Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs b/Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs
deleted file mode 100644
index 5c89f39354..0000000000
--- a/Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Shared.Psionics
-{
-    public readonly record struct PsionicInsulationEvent;
-}
diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs
index ff8b597a0d..d20495cfa6 100644
--- a/Content.Shared/Slippery/SlipperySystem.cs
+++ b/Content.Shared/Slippery/SlipperySystem.cs
@@ -31,14 +31,14 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<SlipperyComponent, StepTriggerAttemptEvent>(HandleAttemptCollide);
-        SubscribeLocalEvent<SlipperyComponent, StepTriggeredOffEvent>(HandleStepTrigger);
+        SubscribeLocalEvent<SlipperyComponent, StepTriggeredEvent>(HandleStepTrigger);
         SubscribeLocalEvent<NoSlipComponent, SlipAttemptEvent>(OnNoSlipAttempt);
         SubscribeLocalEvent<ThrownItemComponent, SlipCausingAttemptEvent>(OnThrownSlipAttempt);
         // as long as slip-resistant mice are never added, this should be fine (otherwise a mouse-hat will transfer it's power to the wearer).
         SubscribeLocalEvent<NoSlipComponent, InventoryRelayedEvent<SlipAttemptEvent>>((e, c, ev) => OnNoSlipAttempt(e, c, ev.Args));
     }
 
-    private void HandleStepTrigger(EntityUid uid, SlipperyComponent component, ref StepTriggeredOffEvent args)
+    private void HandleStepTrigger(EntityUid uid, SlipperyComponent component, ref StepTriggeredEvent args)
     {
         TrySlip(uid, component, args.Tripper);
     }
diff --git a/Content.Shared/Spawning/EntitySystemExtensions.cs b/Content.Shared/Spawning/EntitySystemExtensions.cs
index 14b171baeb..507a0f4aa2 100644
--- a/Content.Shared/Spawning/EntitySystemExtensions.cs
+++ b/Content.Shared/Spawning/EntitySystemExtensions.cs
@@ -16,7 +16,7 @@ public static class EntitySystemExtensions
             SharedPhysicsSystem? physicsManager = null)
         {
             physicsManager ??= entityManager.System<SharedPhysicsSystem>();
-            var mapCoordinates = coordinates.ToMap(entityManager);
+            var mapCoordinates = coordinates.ToMap(entityManager, entityManager.System<SharedTransformSystem>());
 
             return entityManager.SpawnIfUnobstructed(prototypeName, mapCoordinates, collisionLayer, box, physicsManager);
         }
diff --git a/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs b/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
index b8483d021a..f4731bf46a 100644
--- a/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
+++ b/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
@@ -49,14 +49,8 @@ public sealed partial class StepTriggerComponent : Component
     ///     If this is true, steptrigger will still occur on entities that are in air / weightless. They do not
     ///     by default.
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [DataField]
     public bool IgnoreWeightless;
-
-    /// <summary>
-    /// Does this have separate "StepOn" and "StepOff" triggers.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool StepOn = false;
 }
 
 [RegisterComponent]
diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
index b4ac2cde75..ede39b2aa9 100644
--- a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
+++ b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
@@ -11,7 +11,6 @@ public sealed class StepTriggerSystem : EntitySystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly SharedGravitySystem _gravity = default!;
-    [Dependency] private readonly SharedMapSystem _map = default!;
 
     public override void Initialize()
     {
@@ -41,9 +40,7 @@ public override void Update(float frameTime)
         while (enumerator.MoveNext(out var uid, out var active, out var trigger, out var transform))
         {
             if (!Update(uid, trigger, transform, query))
-            {
                 continue;
-            }
 
             RemCompDeferred(uid, active);
         }
@@ -59,8 +56,7 @@ private bool Update(EntityUid uid, StepTriggerComponent component, TransformComp
 
         if (component.Blacklist != null && TryComp<MapGridComponent>(transform.GridUid, out var grid))
         {
-            var positon = _map.LocalToTile(uid, grid, transform.Coordinates);
-            var anch = _map.GetAnchoredEntitiesEnumerator(uid, grid, positon);
+            var anch = grid.GetAnchoredEntitiesEnumerator(grid.LocalToTile(transform.Coordinates));
 
             while (anch.MoveNext(out var ent))
             {
@@ -113,16 +109,8 @@ private void UpdateColliding(EntityUid uid, StepTriggerComponent component, Tran
             return;
         }
 
-        if (component.StepOn)
-        {
-            var evStep = new StepTriggeredOnEvent(uid, otherUid);
-            RaiseLocalEvent(uid, ref evStep);
-        }
-        else
-        {
-            var evStep = new StepTriggeredOffEvent(uid, otherUid);
-            RaiseLocalEvent(uid, ref evStep);
-        }
+        var ev = new StepTriggeredEvent { Source = uid, Tripper = otherUid };
+        RaiseLocalEvent(uid, ref ev, true);
 
         component.CurrentlySteppedOn.Add(otherUid);
         Dirty(uid, component);
@@ -142,7 +130,7 @@ private bool CanTrigger(EntityUid uid, EntityUid otherUid, StepTriggerComponent
 
         var msg = new StepTriggerAttemptEvent { Source = uid, Tripper = otherUid };
 
-        RaiseLocalEvent(uid, ref msg);
+        RaiseLocalEvent(uid, ref msg, true);
 
         return msg.Continue && !msg.Cancelled;
     }
@@ -175,12 +163,6 @@ private void OnEndCollide(EntityUid uid, StepTriggerComponent component, ref End
         component.CurrentlySteppedOn.Remove(otherUid);
         Dirty(uid, component);
 
-        if (component.StepOn)
-        {
-            var evStepOff = new StepTriggeredOffEvent(uid, otherUid);
-            RaiseLocalEvent(uid, ref evStepOff);
-        }
-
         if (component.Colliding.Count == 0)
         {
             RemCompDeferred<StepTriggerActiveComponent>(uid);
@@ -248,14 +230,9 @@ public struct StepTriggerAttemptEvent
     public bool Cancelled;
 }
 
-/// <summary>
-/// Raised when an entity stands on a steptrigger initially (assuming it has both on and off states).
-/// </summary>
-[ByRefEvent]
-public readonly record struct StepTriggeredOnEvent(EntityUid Source, EntityUid Tripper);
-
-/// <summary>
-/// Raised when an entity leaves a steptrigger if it has on and off states OR when an entity intersects a steptrigger.
-/// </summary>
 [ByRefEvent]
-public readonly record struct StepTriggeredOffEvent(EntityUid Source, EntityUid Tripper);
+public struct StepTriggeredEvent
+{
+    public EntityUid Source;
+    public EntityUid Tripper;
+}
diff --git a/Content.Shared/Store/ListingPrototype.cs b/Content.Shared/Store/ListingPrototype.cs
index 2f067afbee..25245327ce 100644
--- a/Content.Shared/Store/ListingPrototype.cs
+++ b/Content.Shared/Store/ListingPrototype.cs
@@ -98,6 +98,9 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
     [DataField("productEvent")]
     public object? ProductEvent;
 
+    [DataField]
+    public bool RaiseProductEventOnUser;
+
     /// <summary>
     /// used internally for tracking how many times an item was purchased.
     /// </summary>
@@ -120,7 +123,7 @@ public bool Equals(ListingData? listing)
             Description != listing.Description ||
             ProductEntity != listing.ProductEntity ||
             ProductAction != listing.ProductAction ||
-            ProductEvent != listing.ProductEvent ||
+            ProductEvent?.GetType() != listing.ProductEvent?.GetType() ||
             RestockTime != listing.RestockTime)
             return false;
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index a8f7ee2395..91aad89582 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -261,7 +261,7 @@ private void OnBallisticAmmoCount(EntityUid uid, BallisticAmmoProviderComponent
         args.Capacity = component.Capacity;
     }
 
-    private void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component)
+    public void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component)
     {
         if (!Timing.IsFirstTimePredicted || !TryComp<AppearanceComponent>(uid, out var appearance))
             return;
diff --git a/LEGAL.md b/LEGAL.md
index 34cd4009d5..2df3c39add 100644
--- a/LEGAL.md
+++ b/LEGAL.md
@@ -6,9 +6,9 @@ The Authors retain all copyright to their respective work submitted here.
 
 ## Code license
 
-Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated. See [LICENSE-AGPLv3](./LICENSE-AGPLv3.txt).
+Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated. See [LICENSE-AGPLv3](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-AGPLv3.txt).
 
-Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license unless otherwise stated. See [LICENSE-MIT](./LICENSE-MIT.txt).
+Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license unless otherwise stated. See [LICENSE-MIT](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-MIT.txt).
 
 [87c70a89a67d0521a56388e6b1c3f2cb947943e4](https://github.com/Simple-Station/Einstein-Engines/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4) was pushed on February 17th 2024 at 21:48 UTC
 
diff --git a/README.md b/README.md
index f102318611..3dbe1910e2 100644
--- a/README.md
+++ b/README.md
@@ -41,24 +41,27 @@ We provide some scripts shown below to make the job easier.
 ### Build dependencies
 
 > - Git
-> - .NET SDK 8.0.100
+> - DOTNET SDK 7.0 or higher
+> - python 3.7 or higher
 
 
 ### Windows
 
 > 1. Clone this repository
-> 2. Run `git submodule update --init --recursive` in a terminal to download the engine
-> 3. Run `Scripts/bat/buildAllDebug.bat` after making any changes to the source
-> 4. Run `Scripts/bat/runQuickAll.bat` to launch the client and the server
-> 5. Connect to localhost in the client and play
+> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal
+> 3. Run the `Scripts/bat/run1buildDebug.bat`
+> 4. Run the `Scripts/bat/run2configDev.bat` if you need other configurations run other config scripts
+> 5. Run both the `Scripts/bat/run3server.bat` and `Scripts/bat/run4client.bat`
+> 6. Connect to localhost and play
 
 ### Linux
 
 > 1. Clone this repository
-> 2. Run `git submodule update --init --recursive` in a terminal to download the engine
-> 3. Run `Scripts/bat/buildAllDebug.sh` after making any changes to the source
-> 4. Run `Scripts/bat/runQuickAll.sh` to launch the client and the server
-> 5. Connect to localhost in the client and play
+> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal
+> 3. Run the `Scripts/sh/run1buildDebug.sh`
+> 4. Run the `Scripts/sh/run2configDev.sh` if you need other configurations run other config scripts
+> 5. Run both the `Scripts/sh/run3server.bat` and `scripts/sh/run4client.sh`
+> 6. Connect to localhost and play
 
 ### MacOS
 
@@ -67,12 +70,12 @@ We provide some scripts shown below to make the job easier.
 ## License
 
 Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 (`17 February 2024 23:00:00 UTC`) is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated.
-See [LICENSE-AGPLv3](./LICENSE-AGPLv3.txt).
+See [LICENSE-AGPLv3](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-AGPLv3.txt).
 
 Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 (`17 February 2024 23:00:00 UTC`) is licensed under the MIT license unless otherwise stated.
-See [LICENSE-MIT](./LICENSE-MIT.txt).
+See [LICENSE-MIT](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-MIT.txt).
 
 Most assets are licensed under [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) unless stated otherwise. Assets have their license and the copyright in the metadata file.
-[Example](./Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).
+[Example](https://github.com/Simple-Station/Einstein-Engines/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).
 
 Note that some assets are licensed under the non-commercial [CC-BY-NC-SA 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/) or similar non-commercial licenses and will need to be removed if you wish to use this project commercially.
diff --git a/RUN_THIS.py b/RUN_THIS.py
new file mode 100755
index 0000000000..6ea9f8e707
--- /dev/null
+++ b/RUN_THIS.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+
+# Import future so people on py2 still get the clear error that they need to upgrade.
+from __future__ import print_function
+import sys
+import subprocess
+
+version = sys.version_info
+if version.major < 3 or (version.major == 3 and version.minor < 5):
+    print("ERROR: You need at least Python 3.5 to build SS14.")
+    sys.exit(1)
+
+subprocess.run([sys.executable, "git_helper.py"], cwd="BuildChecker")
diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index 6f18510d17..90445a31d1 100644
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -226,8 +226,3 @@
   copyright: TGStation at 3df5d3b42bfb6b3b5adba1067ab41f83816255bb
   license: CC-BY-SA-3.0
   source: https://github.com/tgstation/tgstation/blob/3df5d3b42bfb6b3b5adba1067ab41f83816255bb/sound/misc/server-ready.ogg
-
-- files: [beep_landmine.ogg]
-  copyright: '"beep_landmine.ogg" by kaktuscsc of Discord for SS14'
-  license: "CC-BY-SA-3.0"
-  source: https://github.com/YuriyKiss/space-station-14/commit/971a135a9c83aed46e967aac9302ab5b35562b5f
diff --git a/Resources/Audio/Effects/beep_landmine.ogg b/Resources/Audio/Effects/beep_landmine.ogg
deleted file mode 100644
index 48bc5e21d962084a1db41c473f30892d914894ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6034
zcmahtdpy(Y|Iap;VQDc!($vN#9hQknF?Wk%Ojyf3B&C?tNhxzlI9fBMDau4q5u#3x
z%B^xuE`>wopmfpcoaUtRdp4cE-|t_)=k<I(pZDi|d*09cdB30M{rPMO5BCB{@Vz}9
zcwa09Ki1|}BlHmQd-erK#!3+ghjQryfFw(V>{*A{B9;8nq>@q!K4V{rs_p!LwWFv7
zHH#qCEhv76IqfHkDeR_F_7(67+a0neG;H4nNDPq@sZt_-S7h*l972BKxzf(w2LWsW
zAjE1JIf-L6c~~7g5ABz_cAZggwC&uM9MfIv#(qSM&CxF|v`c4`j&|p;fK(ujo`B<J
z(9!xl;s#%Svf%~@rPClTQi{Xc{d;qyML;SYy`1;b)Dn~Yhvlp;&ynVfg}5m^Z?Ron
zesVbtG84>QJdzb?Q@Xr+#-xm6O{R64JUMex=CN_pwkOFdcIo-auI95kyl{Gg=E4{R
zx=T*70=-R(=R}7VDA4L~yhrp>9i9;ly@H3QhH8Ku017XVGA@vmu{u@CpbY@5ttYN^
zukM4Bx(_OKRnUw4<l#C1G~{#1D0aynci|KK_(WNsIDXmqQI)K(m5I9m;NgjJ+>29`
z$%O)dF0{-L`(}tEGA7fr(Y(}hBuD~44h}=L_p){tICOcl25O^+{;RWvVcIfr=tJz|
z$Q@-0>82=c1=%`4Gm@5Mm^LN->*ORYhUx{S3fidXWuc#HKBJPhT;x)7fPXflo;E3p
z?R+pHqI5#&g2)e(5BVlVO@)5S3y@*uf$n@GDQ<7)t3c6`76=(s9LUMfs)3MvMPzpV
zrb-C8)E{7;-6X}uN>#~jubW@#iqxgArFZIuXS<srw58?M?;`9E78#$+$#A~5*wn0`
zVKVyhWCY%6NwCh^S9Hmgsgh2z$nJH|R7A1B3Qf%2%VZcXI2;LV(fTPkrpv##;B@^|
zt$h#4mkN(DjLJ$cWUhT=e4|}<vwBm0Lv=ld(uB2NUD3q!iZ<`}je19$%ulZN@sFyg
zVKT^K0aID#KRookoq~2~j;B;}a60*tXrHoC>4H1)(xm}l%b&VEOP2qqf6(n(LiALF
zeNFFL^Ik7U7B_4_$o0FK$R14LND@b2pXCPm3d8*Vr!Pz$COIAk`@%%XEn2bdv?+oB
z`|mX2f`S;Fvn<|Rs|cGO6FMFnZ}~{wqQ1cs=h#bS^=NQBEuuZwh4q?qyw-78KG9o+
z(d=68P+r)OByse=I!949MKu7d_^ZhLm1O=)%WQ(HZA6<9uvL&|WX20p_Df4X!Ie*p
z<cA*+mY&Ifb>^JWWf=>=N?D{Wqa-1tEFq&bA$uyFA8|%lT9&{1Vac0YSEv8Kt|AL?
z0swIY=Y0fcCc%*j0hxD`FjDX8-lq^8_ZdHWOkJ2`kNO7a(5-O`o5uGA008sgI_^=A
zuDcqskGY2BwWg2h*yqLi|C)O*)m<GrR!N$$-Ttxd6?xh8sq(xwQgPwHX4*vYKs)J}
zXc9{aIo-;n*kf9Rbe=#SI!z9E!n~riQJQr3b-KPLICj#EmWx|x&Se*$crq$W{MR$Y
zwcb%LMey|@N$kJr%5t%H)a6Pj1Qg+=Qq-NJfw08^a1_H-CZ`C3JIRwd%!jlI-QWz`
zB~eHxjZ`3bNHZ)rrA8LRSMsDt(CIoMI`!C<1mmL-0WUieHPjJc4Z&E9uKOvfJC5kC
z?zjcV8BllZ%cXWu%{{$Y?l|{8Z<e2?J4;A(H*<H#vAonBSsE-ap*yQ4tcx1`)SES;
z$?B^OV}DBAD&&rsxj&V@LMj)&a%!VT@_wjd4S2JL)<LSdXB@|q73K#u$8-D!SX=uO
zq2@j>_oo^xmXP(dFN`JR2E?&Od^k@BSbqJ9L;WcM{fYNVFW=hz@aokoRpoP4Kh52G
zJ1ubSb(0#@=ite5-&zyx#f@gGI}T{D`h<>NT&N{6fE)I7z@dlh$jS|q4w)Oq*&nv`
zCKQQg#V3x&aX5Kgj_(e(B&C<j<>ZEqZVmI3gmGH?xuX)d-dgv8K5j3IJKE3v<4p9>
zEEMCiged`#Zy@FQf!!lZ&v~-ABLYqU6kEDGz~WiMZtH8&AwwIhuC2m2H(WR746VD>
z;C`ArGPTV9xkW0qw>lc?8;Rot<Z(wLrf+$8vp8GBo=R9-KP5sVo_|Ul)nW}upvzPH
zgatv8MDaV7Tvlxgv|#ddG{^Vw%c(C7YvZ_VC|lXyaMk+u-ni6_Fy|F?0YJKuP${Y9
zXz)S~Xz@h$ZuE3qGTaKtyc}ke7O$N~){bS`k;_t;%oAG4IWz-e>}Ce3NbJGbRK)AI
zBUh#{{dZOL<@=v7=RNi(iEBI<C(6V+>?m`mOnRH>6rW}&7RU(gG^2uKxP`)v&fl2a
z>`OBwCTBAg^~HRK8&RxfZ&aBp2!@0~|6TRXr(;RtW<FyVQS8fhqt$A~W=jV*lnpMf
zVKSp~W0_D@m@2~vs$wuG&?=}()s6vGc`=|>!K=xAzKorfP}L?%zX$UKBy3_(psL-K
zfArHM))cFSkccgsAy+GEbnM9sgZF8MRNRpcPHf>bvZRA&)x+&@bLAiT{^j+}gHh4-
zf9J<`m(}=txz$Ups+aeReRn6h8_vAhgOOQL<Im2drF|bfqXw#qs{8~AP}L@ed97Ad
zw)v-g|0|FXwX<>}KlVLkV$dtf{H9hE9K#=~n&=OK#ScmqZVv{6qcHE0(!7_`XHXQ1
z=;@TnVk(+4ArfRzCh^5g%7iYDxpopS;4`HVQ(0WhXGRqXn9Q9OFz=DlykABoYAV9C
zC4wAf5E!HT=uc};D(h*y@q>>JJye)k%VijtebJ8=FkJ44jEBYLa3l_%<}iR^fNy|O
z5aahLvDaIMsZ9x>vbI8uFl^M9Bju^(vbB8rq?l;7MJjuMJ0eL5qFLSCJ$>u_+`SL$
zTLGAnQv`*`Wj@Z9WE~Y_nN_fGgKJB7(ND(0qg0G#GT`2*6$8r>(;^H`r%DZ^!&pV1
zghynSKzdF}A+bR1M{V|>D(!zDc`&=h63p5R7LqG1ZHx3*Ba)!fMlJE_eHbexvUw&=
zp-3Qro(jsOpvA>c{5R#sVi~SwHG{$BqGS&yqoP?S1jbaqe|cqp{(2a<no;GnL0v}V
znik*K&O4GEW)!90Klc5dy#C;F^U2|4?7eDS$kqB!V?Vzq*ZN0wY?#IKJSzMAV`rqr
z<OzyoIC%yZnA<XGlX|?FyNW>o>`z7khhtf0<%9x_Y=x!L*`k#I9vci7SOoJBP8)LT
z!o!(FWXf==c4%Vgzc{fVbAeAuEZ~3VgLTB($wDX#aZH9x7A=Kd{lJl>m930QCjNlL
zJS>AG<%7P(+QHj*FaL|<|G+Vs|Ki|MediM}U115TYY9VDi*BgR(hRz&v{Wxi7QeOt
z;F^5Aju+6|DdA=MXi90B9fO=ov44m!A$uw7r|8FK=p&1oeKs}2gB>de(9i{@wjQP^
zfKkP6RHPf)##F=V)-E*Fg=#F9rkD$sP&5F+fHaP@O=)&~)+`^VJ$CG;cUD+C>@jT9
z3!v=Mcvs27`a`PW@R(e|1*W3(dji1KUkpI2Ja$Qsu2X7@f^%A{q6@5sVQT}8il9*+
z>EJ+3J6TkDx99l>gc>YTzBf5JIT-}w5Xi~NzHa2sZC@Ztziy;>$%7+F1O#Hm#g+O5
z1A@sKV`F0zleV^|x`x^dc}3e?EeSXrLfU}xcHx)vH@=YMcL5A=#X?y;ypoXHr+h&m
zumbCZU$$f-DM>M-d0*4U3rALb3BIpqaxGxRgPXTk=qGR-adq-^;649K=zNdr9$L?e
zkt6fZ?|w}@%Y4|g%y4(B^})Xucj7hHpytcs-3;DkDH18;6BEDBz0O+I;SW=Ae(B(m
zJVaIcaKi`1OPPv;UKBK*g?tH2J$9zXn3uk{uDaph6RdsZ_rOM$-5s-o2SVjce^DH*
zJ$l>HBD3cBj+?s?zqX`YTx`12#6qW0ScyP`YGT^dHl=;Opv`@UrT(Gim*k!}<w;P>
zvL#&g<<vnv6)d>!*cHRJaYc-2%9odwY}XmKOZ$9O={^duLl-5%+2{04V63N;uU&L#
z`I1YI{5)MejKVoDZAYQEe$G#ozka6`Jp&p`Lv^a74ic8M9aoe4(*#lIp>`YKTC=PF
zynp!MD$T~uyaa#%OS$AVA=jd94-kd|!)%tltyLiqoFjw64h<|;i%=^#Z>Dw^1}fem
zwm18XQh3r&MYn9v-(56Pw6vG=^DlW@E29)~?g$d&D|ovt8R3okXanw}QeTA$_$Pj|
zsZig$=x?V(vF+87w|`a2piHenPy?JWo!_>diF4LAp7r@SJy&a;r9N;=&%kl`z%jn|
z<h^I4i&yV{_)W4F7*NB%sh;}$o4<u0&bY1hbA$QU!uU7!bCOSoFJ#8j+!}03vtPu&
zY8=NK=OG=!^?y3oAYtpb*P-$FGkeyX2@fshrOez}LjF2_Cb{=*L#OggkIAQd&zlvj
zLz-u8>*^F$(wSgZZ{Fn5?*re?#ot(WGxsL3e*RiV==k>Xk+*3SD_m`jHqdtSD>C69
z9KgA>mzT?_l)T$73BPw{|L8FCZcU}~BzV2ot6?`L&fI6|zJlz3jvx-6S>%eTFlbxO
z4oO%I8ZnF7>DsQJL``%wV^>2#kHUqgN`IAz1HQ>S{&MUe)gwWj=YP?idlKe&;gE0H
z$awNyj@-2l(R<+JSJ1b7BIZz)9@2MBPnp6?5!$Sq>SsScl$F!+xx>hKO4IPV&Ewfa
zmu~q#x&Ps8>yA!~dzw4G_`JMvKR^0@^U3;EXXOGu)lA<Nn$*5sRJHAvTGgwi>9@xv
zJlbR(+5YE*gy2jHjuaShE;v9@^yS+>rQ01hd`f(;D2cIluekxvy<XE?V_-I2x^g4^
z)>e>oK)g98;&}-&srx)KNp;%}23AnG6j<f0WxfvfN7nmo=WBQjZ}*IN2V(XFRa{Jb
z89%!7$+p93IcIQYt*d@Vjb#?{8cseNYKr3r6<2H-iF7vE{K?h9GNy5+g3mqTAyoQM
z@yCVClR>XG(DS{X^`zx|7)91Op9@vYyo@kjQ;qTtVXaOojCOj-bUM*$cJElD_oL1W
zdmO9ms%$i^5)|oaCg&9^<)3`i>C}0j_aaq~uztmhuPDU1g9VrJi&KNfVymtKVBFE3
zq&a7E1%cnS9sz7HbX1HP|2o#rw50=)^g0S_GpM#0MSS>%44O*E9oVSGnx&SOIyX4%
zWv5QP={oq!bO*7Izq$6!ud7ZUL7fh(vkIY9%PStadRg84bNFM`$E!?ZxHVUACl%-(
z{>rzP`x=t;PTA%D_UJnV1UX|b`yVrFy>q4cq_WWi`FB2cS2u68`AKz)+=cTaxi$e;
zHd5276tm{C5Vx<ZlJ<8Y$zSqMv`0VDr#842ToSlbeqXtfIyh-CDRG@j?Lv*&fSm~7
zYo-FeJllyt))_z4^p&$2x^w6S`Ofo0p}{*t-C4M~J;1?y5ia#}kh40lriUK=Cz$?E
zmiI+Jgkcrj>BltIPS8TK=7uMBSXkZ*<qrJu!3CIt;wZ~YP6|85G*#~0AO17qv*H%b
zzb@Jkj(%Qd4|m_d+V_s1SQXnapAD}Yq|Xz9;i^p4pBoy|woO$J26wvo&hz$#dk9}N
znrw8@n4~UhE-&zyoe3=1@wOvUIl2>SfOaR9E`|q8lJ-#)AmP`h1y1iui*)*V{+s<~
zbEO!>a2`M(-oTX?!yiwi{MN!kmR?kybJ2>sbskKrF`B%xT(Ht6;MH#>LOsL@vGnw5
z7;@A+bvhvVsy)f<+1-wV8b+(R?!xk2#s;fe3=~xxT*6h_E~;@w89k?_uPeOIR72F|
z6TbEO6l#uM+Pt}^Y0Vi8lPiPig>thTs}U?`rsXQovoxQ4jCt6kZ+Mvg=i=T)6URd%
zn_3lS)syT15CPvY4?|cZMQ0$ug!W}OeNxxruY3>B@o#6?w{JTICLC6sF(ZO^wg?|^
z8EbPfADIrnAiBlWMv&p-Y<K1CE=f2A)i`qVpeyu<3N^bRtTk^M84)OmejvyNmn>e7
zi)NOpHbg%}JESesK%xLj#EDO3cZi1H5fbWVRxbM(yV!=Zc@C>%blLiirt#bDr$*NP
ziqebtTf*+hQs;|!U&B{4g!=%%2E&L#_+ujH#SE;K$Movt-<@89`3a<po?8_ftXO0^
zj{$OJR5lkH0+O!Be-82cvRK{ltW|rAsRizdZBCw{udnRz&u0VMWk~$-QQ~;Ft#;Sb
zK|^-ROP|2MRtBn891p*DGrN0x$)4f_w{q&)hiCtKP<?jKldg3~OQ;7Y%dPr!X2Q$j
z?5`-Ca~8jUFCi7s2zPBFo7o}b=|>*Q?KlYjIs-`XZ<;%ZJ9a}~5gNL#TBNnat@_P|
zQxiJus<KOE=%hBc66A=qgs4#fzE)8_GLuDhYJscvefjfQ$Z>gqM>K|`0>5@2PE|n>
zONL%tvySl(4Da6Fp_UdYcyj}L8<$ujPQlGtYgKh;>xE<Y8m_uLW*vtE=Y$SjqqlhV
z)U?l}qHi}2x7<|a*X`CqO`Sy69nk<|a)aimkhK7GQdS|$JY2i_8s}--%I=$};w@}7
zrt&eT<O?m}5;snB{SBA(RSdXK-h4ETSov$VC07-3$8|r-SCm#Va6(!g;X8~>VkUNB
z<o#L5_n|#6Xm2I$*!H<|+pLbs5tKGPaG72tj6r6HdP_F%k6ou=s_Ay37vZv9xU0+L
zYrHy!viXSD&MsqzUwrIUz)`3#tkU*a$xKC!<e<VWi=n6U-aao`@gIuus!v}KZ#*$1
z#<V0Y8GH4c(|XW--=E4+@xuU*k}k)`;mfV?wg|OuK-exk#E~4ClegcyUgLy5zakI?
z)xw{j@bPA{!6wF$s*?T(WASBidCk3>{mX5I`X+yq^*k;2j-3oHp#uEHQ;>W1Ts#8S
zYkSzgQ4zY}t`f`CRHj7@T-u|7*WbOvW^)_H_wlNc{pJaw5&E|Guk3Je)iBmN)r164
zZnE~<6cQF2d^{F|kqKTs5@U(70%zxwKL8bFpeOtyDP3_3z##t74*y5)2ToPm{tuh|
Bu4e!M

diff --git a/Resources/Audio/Nyanotrasen/heartbeat_fast.ogg b/Resources/Audio/Nyanotrasen/heartbeat_fast.ogg
deleted file mode 100644
index 85a034d9bd0017dafea7df4128235c815babac0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 39983
zcmagF1y~(Rvo<;lcX!KzKw#mnK@!~EHNk^>aJS$Z+}(pquq3#<1WQP8f(9qtA$y;5
zzI*O{{(qjK>FMgJuI{etdAqunvZbXu00;bgMfokzKW2aa#FvCnLEIgjUt7C87C<Db
z9{+)t2juU+R*3TBoBw@1zWGQQH8L^6NqYEyT|@ByFyaR3I@XR>tjf-oP+RNQT7TI?
zWuctxob2p;?A%ZWHFGmJQ)_!msHDBSwX=i0ow>a$?2)fL_$RKcs3@tVp)M@$Y;I=l
z3Uzf5gj%_}I=Tq5u~|5qo4Yu;*_*LCI9swgnmah!nzLCtn|r#LJHK+YvbJOUOLbx6
z<ltr(V1pq3BNFVTxE2IJ0hx0sK>GqF<23;Q2LMcHVOU8PvasUhd<M_7WSPfYAA4k4
za%3NgX*5Uwe<e_EGeQ7B00J0LV+*%r-;4`blF-LG=LuLV@s~o8->Gg0pnm%O%+$W5
zvBbuH97czNsf!4J<1Hpb9ZI0~n7odl4kH1Ra0=%^>e4J{G{&;LAT-WFXs`n3Zc&nw
z;BHxAtl%C)<K#<pmd0s01&%o_)0$2sLm!uMf$gk+6V$)`fP%8TL?SiAd5QAKJ_1&f
z<_xm>r&~}U0PH3poj@S_fnekV#n=?B@+q?_KF<`Fq`HQpCV06SYP*{+xVtU5`|75J
z>bLspwub62h8kXmz9I?x_rCI7zkIy^b{z@<@}3H$Zo&#^$O^s-6u^gsRlxyfk3#}Q
zO{9S(7Rr`bys5FyY__Uwwi~Hu9;wIpTLplCRUWTA>x`2B&uyWbYW{z}#jFMy0Woka
z2b?GdoM<K0Xa}5`k^heHAOOy(m>P4RGq<!0_khcD@RoL!7)n+cJ6FK|uSs~Eb^s9L
zpy+d=7y?H_jb+A}N83es!9{Ta9E!&g`9EKQfAt0I2z9na>YD%*uJ~7fha~`HOOlTw
zj`2@RV1<bMAJB}+jI%KTtc;&|<ph~Cy^$K3^ljy7nSW={cARt*oJ-hndS71pWQNPQ
zEJjB0KRHjlOyuhFX|RlRI}59y^c7godO8ESd`Sm<S9daFtE`Ox%ta<=(l@nf{KM~G
zwJ0~r8t)bO2EGxwoN3dBY6#}8&9Z)tp+1)VZ}kxa=k3)ZNq=?_)HfFCH34-AbrO|p
z99B{u#~`eTDkfG+t~^*pjg-FFHRx~8p#Ttq^H+=iEBUL+|7dYh;ycD+hK5nj5$4CF
z>hrkZe%)sraSRSni<x;qEskm0%5kX?kg+Lln%840PF9nH75`&V;G{y$;$I+<{xy=Y
zH0NPhDQFe{IdR9d6S$O9|8Y;8P^jY3f%g<Ai#nIEriP}ryPfWPx34XshKp|N3%=_M
zF~-DU|68&C+j0QVXhQzlWb*51j)AOTrI)DxOz?kMjuXK^0>w}Qt$aPL;xzNvDYx<&
z_Y}UQDz~CKq2Uyv+YFJpI<MgjkNJ$I`JB7?QnR^!i?43;zXtP<*{m<P{fFf|nh1?R
z?50d2!v9!K9z*PR{@ACoiL|<j&pcBtBQwg=b9T!M(EgX@SiLJvdsiCqZaX5DAu`oE
zGNYocz;?K1zy1Gu|F`8xJJW(UXgQM3wEtl_JscF`pf%MqE1vz+N8u@OKwTw?|8oKW
zpeG(f{_i@Xs>U*>#xtkJqNySLf3_HqI>)Uz!wn8>3ILD-z*BINLvY?X$G@}})<NOe
zqD9OXK+69@5>kr8g&}}R;~M{hUbr<;;4{YAh8hE*ghFr(9bYUI^HYg|>`#6aaM?ou
zQ~@A>W02zuiSxMZP@cp%2Wocmpa6Yw(zGm$C6$B=MpuGox|vltEjv_{Od|g-y9m!T
zvKo8|KnDNN^C#m8Az}mo@ESu64HlZLHV)g0R~zQ|NueeuP@1JaE`UNAGR%RL9gG7j
zrcfV;4N!!PzWA9HJo$nF0H8e(@b4u9x0xh>Ll0~?(oQ6C%M;Ma<4aBum@nWfE~Ide
zar3BZXpZ1(&S_|VB~sLErc=aMR6N(v#Fx}0)SO9G)NHbw;5J{<&|D?boNG4!O5~@V
z>bB0Ms0%*MgH*SLRA1wHJHxbpSt%0yWyPzx(9EOis;R1JuB)M`>u#=lsi{5hD-TlD
z6_*G#HJde;e%ooL`hIiOG}Ja<y42Jq^3z`k{dVE|jpUK@!kimOeKl|Xs>N-c!8*hG
zO+i^j217+fc}25bMNPGS!A?a%#c;i4MNQRkeQjlp?LJ7YDXXYwuBc$HtgpJQVBT*o
zt7xwtuCL3isoZZqLjTOX-|kpZQ&U-g@JMa1-tTwXZ)f)@fsK?@?zNY<x7+WxJB>Em
zQ506}buo^7svE99+HYrTbfZ?)bX!d}+|&m9VQ1`-qkkD%Zzt4UeLD;?n7$I2aG+=d
zUu&=@2g~};m_%Rk#}->=fRa{JXI511*V{9FuG)X8s_AQ(V!qC2s7q|W&KIk{5K~aG
z*UmW71vbR7((gdg!A@cLl@}yr*H@$anhsu~PS||yce)kayl^Y5#Xud119b!Ps2ljh
zV)@ieZ~^=f0Ev2=Kpls%59*4ewg)ZJ;6S2wQIhMUNLG=1L!CU!*bmi+l^x7V!jrRt
zB~Pm%=NGHU+2kkBtJ!=gnSFf-Eh3V$W=WpbdsE&&s~3%Hio>~GWHv5~THN?Z09kG4
z6=A)UD=s3Cmt)Zy1r@n)`h`q+5uUnic@xO0xQIwzj-#1C-=1Th0(_$gPhS?+PoQqc
z(x36P9}2P>dTjh}8$Z*ML00L(iE?t)DT!*MSxJwqf@9@mVa<th3ZPVSavws~^lUli
zv(#*PK&e1hiE_3q{d)QeO>Q`P=zpcEZql-OQ{4|XPFGAKFZZE|$i|*yi%ibC`myoy
zJ|g{CuyJ)8o|5@Dj|6=?;rR>~x$5~@wHT0KYS%fJ;eGU9J%9a%rGNf)^<(3VA5s#*
z#<!OBq6LztUxTa?)uO>S^ljTpQs01t47I4Htz{Qmo{L$%s>e3u!7qeMT-$FgaMcNb
z2gCwU&GR0YkVmt95ur9NYmMVPD!_>Pa#Vo6+*#oz45m5y0)?(=TmS~^n-@T#D<+a>
zWa-ngfx*CDuz<MZuh}9gM)pC_Fm+J@3DAoBq2RiML|RM|JV{bSV2VRiOajhJF@Y&K
zwj?fCFBwTq$6qkOLR91!VWBv3vUJ5Da7Lp5@to~svJM3(&_C;l3C3#-jxeaJ1}7tK
zh=Lq_c_28V)o!3F6!(qly{T?o6ho;Fo#&LN169GI`b(M~696250v-HaN9cffWI&9h
z5Nub#66f`(zzzjBxH3|NU@`V*1!KKLAq2$$zg43GV1n}!B!GA?KNw7klcygEYI3_!
zunbo0`bbDtLjwRtM-UO!shYV2CFFr?CLG}TxMs=;Am=Ab!TO=eiE3bTV3*3BF~G6w
z(|RN%>m5Kr)v)Dp#{t!<Ur$`Fx=+WZhPrtEbrsJ7sKiZM88&ht!Dg%t09Fu@fjW3{
zNnUyqR7P&Iznutxg2Nci5k~O(9mjT-I0~#U4a7JlB#+Po{K!7yk7$qpKK6qIfo+P%
zB+DiCe}KvV<WT>AI#CYdEL<({Yu!&mj`9yGm%{t|XlnZ}NKgCc@jo#8|DgB(Q%>Ke
z8dSOeOaQTNG-TibnOsYnA4Z1G{MbhvED-2@P6H)Iq6`Ux?G%N8(~~bQC%`}lY6%Pm
zst;(<$$E0>E^2Cwbj7KUOUJC991F-BnXY(V?G4z9AWCuL>|;}lFJxfF^LkM%pvlRB
zkFTS7!qmVjeT%QFIEtp#K>H*ytpW{5&ju9Th6UC%|2nz}9Di_yn13C`Gp~mZY}h*j
z0Wx(?VJSropQbkc&NVd%wqO1o?Z=IQ8aNkukJ>^lAqQ&JqmEFAfYb0#SxEeUm*EI*
z|D#%<LT&$3FInZ~U)4g%2g_iTppr5C&C!85)PDfnUu6uz1EE|p$oZeLWIV8qzwj<u
z?NKAap?M_yRn@;aRO-j!`dgX$pLZXzAgH47kE`(09ooWS8e8sfpWs!j2IYVN3;=Li
ze6tUmAB6U0g`~=d#5?1>X2n%|Cm{X7T!yrdWG<Pbm_S|4W+&@)w5oEpsT{}Ws$?xW
zhJ>JL=c*?6QE*2IMFH4xsJQ~gAOs|XU_&7YFd(n4XOhDJ0pSN8CmIIYK#0q<H9UY5
zGKi57p@V^kUlCaFS`g4NFd0M+z=(-yj6&bx>_IeKaf60H5vU{jAO!IN!T9!Xzhf%5
z_M!?(7GwRhv4#Lt0Fa0YrJ>0Xh{cM-j>k#BO~gyWPX^T&05%{2*gya+VnjrQMQq{c
zO?X-fvyh@MKM?5tk{=Tklz+A=2!HecY`n!{{~<qaydRs{(x5A1hM3{w6GMqfDQM~F
zD5;GZOv;LK^LXf39P<m(QnT{XYSQAp^`1U`lN_BG58RmFZ8!S{Ldes!W<%gX7B6D$
z);{Yndfk_HT>ca|dc`bBoK<3K>q1!{Q#oYV`KPePGgc&_d-bdTXSmz46^w;`m|gzb
zheD6TH!YVA8B?m~`}{R_9i2_qFA3}hAYY|sfIp9I_`o0(VuF9g1ziAti|!cyvuMry
z?uhw`9DqDX^S4%bs4*Uxng6fi9f!E}B<#N=z>$!y#3m~L5?uJrD7!P2o?w`+Tq%Lu
zIPVM|qx0{Jjc~4%51AAs2<j_H0f3k%P>N01<Qp_mUkpD=>HlP2FW4k27aO2EFrcG@
z!KE**mEOE%Oao>qbJ_NWLLP=jT2E?idQ4RQglEL7Trnk=h+DhJ+tFSRYBP^gu3rd#
zH$XkZ>@lh13;0c;r%^rlZa%GA#M#!OsU-#jQTYnqjJG@Yr-7ztiqnp#HxR~No$0I-
z_U?jkG}*nFpr!i0wrzk37=80#sCX)mIP=jM9-*w95!O$C(&43jL`JyB0?Bgse*(>6
zP2&Y1$L0`J`eLTtiqs1K+wOabUsu185CFl7dw<UADmn%J9&A92P$lDW{`1<Ecll#C
z!8`4bP)60<-JMVKHx4CbwyK|b{Yj#^z88JO#&<{E4_zN?5r`h_afPoAiZ}ZDBsG}R
zzn?9|ykaEZHxJyeZ~?l!?jPa=i($|B#r*y5XJvr^7|1`M)tZyM_P$Z?C1^VkdS*Jn
z@A}T4HP?+d6OOmea-A;^9~zMWGY4g<$VF}WebJ$JoI(+0G>St{QpA-mJ2555!nTau
zXCCmbO-r@FN_<7Qs&i?sZ|O-<TEvZ0b=e6|z#<pxyKyOE09EA}ng;x_y7SNZDsmfg
z8iLA<%y+Cpr~N%z3kc9(=)U50Za^}o9FfsW91`!`D<}>2oOzO(<JdAGu?~|x|G4{F
zB=zGb=kKP{WaO$(HiIgY9da6AkxCxhU3bmHy>8iiFA91Z_2exzICc}=7F3H8J_d(H
z$SewqlIIn7`;G_&#@Fa_g_2w|9L@_5imS5bM7HjkGdX_7-T#<>q}gS-z`k4dfKnuu
zP{RcHfpY$;6)|Rjzd*PkHKL1#_~}Qos&N6(${`fA@2h{v2oK8`En3EC_VKCwu%kEa
zM+{UsM_$Y%qm1*vsQ06_F`S?yPw00sEy5qd=oqpS;@3QMeC4NrGg@ii70RV;>FhKy
zMi61fdv8RT`$w+~^NV3WF;1)faoaO`%OdI_)#z1b)2h;yev8<w>G2MWn0kYKyc|?z
zb4mF-J}!ZWHbO){%RB$|8=nG<v>uVy;pXyUDW&*JGZ=tlHgaGUv2Sdz>W9Uq%Sfwr
z`~9k2J0*)+l5DowW!?t@H07UH%tL#j4G~&qbCjrQXtv5B$scCP8=yhBaZO~02_~Ge
z9kTXXV_R>2qiO7`IV&XcJbj`|(!O#8{d9U|t<oy4M#{N*6Mv^OL!d<QY-w3CjK&Us
z!b%lL7Hjvcex+o%g$(%viWf_@d6&nX)>F@L`(;PS*qbT=0(`xQ^=n6R_v9)G;S4O9
z`11ZxO)O7+pt19-6xsZ14)b3)Ay@Bk5yG>!m`5#VEw<sUWfRo%4fEbw$GhxT3S;{G
zDztiD+~KU>@O`5{PJ#(`Blg78%Yala#B<*!_tGgmEvZoMDEvtqDU<EjngGp_LhXV;
z@!Q4AuxSW|w&k$?`K#q$2eoj1O!xk=_J>v_C>yguet#~$QsJ<3fkshB@zWyl^kn>y
z04-ps0f~Ch|6-m1^ObQR)&?^m5_SJzG&0Hyp~w@>ER_Jnz!v~uZpnWlE6di_WdnBs
zXA)v0ckhp7nO)2p0Dr!H>0yEdJn{`l`4mq0t#@GS%d@hq&o+oR@NHY=rtp4Ccm6eO
z#jBZ)8-Vu(u?c=&l<O!00s)Z6cCoPem5==Tj7w}8P86><GxK&=g4s_Vc;DExt{W>M
zSXjjzzxG@h%c*I)*kIp4psnI;S-!Zo?Leb_aB8^sooauBEhC|=)uJQhg*rsPYd+8p
z707wCzy)3*c4ey#-+M|cQ$Vbhkt64f0mvKlJ|s1Ga_7mz|8}pWw9wPZt3noKJqkNJ
z7v1ld7p1y7{tBHc&XTFpvUH4!4zc~JpUBC`yG4@`fu?(s1TqUJpyaob2cnV_W<49$
z3kN=IrEr(0In#Wc37HOcu^&r*&)gidFu1=zHj?g(oIEv^oMx|&w03A29XdXe6Uu>L
zZy0C+a7LDQ-Erkhh+ME`xTB78vpxVQt2ixu3IhUKdh)ZgGk3n(67YNBES{ThZQjiL
zy_s0}UUNChtWko56Q||9rix{t&;5xk{6R+Mcz=!Y3_jd^xR;A(@Y`}_>f2p^dr{N`
zOj2U~<QQ|GlV7rU8Tq*B*Nd_m=&=*1KD1l<2cMu%yfg<TKUgTR<&Q2Rh!<>=jFUV?
zLRM(wY^`og7J34JhWB9Xi-p0k(Ne?O^sS7MjpLIV(DN-&d|z&@<0~hXjo$!g;_3Su
zgsES6rw|Wg3(x1R8c$j;U!qelr|7)<SWkVF^+KzX7*}3%VtmWF2Njjse+8e}|IgZ`
zp#;uht{$=4SZ$t>lK(zppNB#9*FNiOM*k3XB!+X!Fwcpw>EZXkar5ZfW6r!UzXTp|
zyxIJ=|M@o^ux4@RZ@eE}6aYCmJPTlkq&$<dQdR}T^o10(KF0}sn4IsddS|u;J2Y~b
z7$kWsELD4Z)7P`$Q52z=aGT@o$-tXV-a_6R-e8I>;6;jt!9c^gx1mWEM0zc*oKUU>
z?E5l*pbsfN;k-}LC?T@_N;!MrmiZa>oEX)x-7n8>O7S~68%?F|rrJs%PgLwP!&9Q-
zOHQ~Pi@WWmX;m@!ixagT1Goxh{Cfr)IS6z$B73yin(PA_PBvWq?@h84b##oTKwA2R
zliv}CL?RM!($B&rWrGZp+&B@LriXh!6qhG-Z3)g)6Sr<{5pVW4`pv6P{GypTcZE}#
z<_>cB$c3-{C0eaCSjQ=<4cMoK<a)jsdw6HmJeoH2Z6p0Wr^q~`y)}5JA+L2VtD)p@
z1(6D%vbgJv)nzaNZfzxcNK|A~a^FfpfFJIS<rS%lTvS96Hu1V{OR0yX?@@-xJyr}Z
z5R8P)RaQ7L_ZKZ0*-$K$5{t4T5vs3z2Gx`O*PopeFl^1;p9tx}<=r6;hMy5wFk3PH
zxO8V5yncSHlofKkW2WmBdCy7!6?m6<p-=904YgO^?#wrdXzKJI^jY~G(uA@5^+9Dm
znbvO?PDuy?%IC7*3(7ZQ7!zXb$L)uT29P|6QYikEmK#P`z=adDMpx|Y=%aom<&Mjt
zM;_r&1^*L1W%d&#-(t@N&Thm`Xw+haMB~j^s^8>6Xi9O^PEfGOp2e)lA;KVP`RNm?
zEDQ|=rCzM{QlB}}TAQ)B!m_}3*1Lh}M4>lQ-o57-{YXS1@_7)<BpbFX`)%Ljprw7q
zb->7crN+AlAaBjNPQ6qF2;C%?qR;>n9|6(q^y{Cu$kQT?CtiQpL{`Wff1b^7H*8-n
z@N!uue&t?H^5|qDUCoeO(#_M>GpakRXWrA6rr4W_dMnL2J?4+pEbs;*4N*$eSEgxV
zPscFl%8;@aiXn-&q}`V+G@ltKN*Q@dY9}g7Q&0My>$9hx*u=~|Jt6H{KUI$E`SlGd
zZn}mg>x9ho=!*8L^ehQ!0)z$9W$t4ar#TMIlu}F8O2GD|D~{n+fB<&&*Xy-K_NRT{
z>_4(cf1Af#y~?13%9y8_>^HHbt>HhVlPNu|e-r%E&EML)&@$Q1!r1Hn!&AJ-?kLi}
z(}dbG%k|B`2AtHN%QqkIWt{C?-H^OoBseUzELgQfJBR3Df$1NUn?ELf#9Bb_aer%$
zM%hV4t(LBJm80>)%5xM7beZ3^{vsZRe(jkiBdKhh86^PN-Pp-3%&(2Yi+(>DNo&`8
z>tED-wyjRZ4~y|4cv8>tkU5T(nD{|jln2S40^yI%>6<BGRH7UIuAKB8QDlbgqej8A
z#!Y%#9K_nwUQ9n_=*M*AH`q^^w+PuVv$WO_(Gk2P@&oh_M_k4BiHCc}bO>UM7N2%t
zOe?bVB7i8qs|vA>+;(FY62SUqU=&1!w|A3ANq*a>HY{EfrC;iKENb|gGZDkFYbcOQ
zKRf*785I@^&HIw_GIWS%QQ1a&7`rJ%0$btYG};lH#Wpqqu2-hIG+QWxaa!ZTY^KX3
zZ_>F*;>Y!tegB>*`!=f5wrOGq9t9EbXBotu_J?73J&-MX6fHQveFAXzVsbT6iA|5?
zbF#M(j0gvy#jB6|Td6%|={;%bY$r%B=7x{kBujnWKyk5|($(PVF=By4O`B2B)Yi<0
z2KV;uwHUGmd{^atcdf5|tjvZ+@E=!#-bY*wo(CRP*C3H~-Nx~Q4}K%}#&J%G9cdfD
z{ScdHiPzsMKpqSK4@|CHq}0bMyLbNfmKldA_*lm`bU{ceKqRgLY8o7H+$l<&5xeGK
zI&7AhFME~EXMiW5i~ar;reZCnkXO;GS*~9x@m3OZ+qd7A@Ux=~Qb;GKu?wfjri+g^
z8{N8go3##bE7SvNcoIa~L&m+30TJs*guI1-i<+f({9_d!4%jHwRCOl+0(QRU!ui!O
z8j&^YzJ`VBK$WlQonR34PtBuRrr5bUYeC9I9bFBwwVXOmawbv70q8Lw3Xh!Y&;#AP
ztR`rAaX)coI@53{(&J0iAL7}~G0vQ*sXS9#k;AVm@xXU=bakQJon(;lIQYb*w&Q^z
z+Ze&Gn|`=<;LiIOGf;gMyj9_)*jPG~fCsKL`vt@yfR)Ag^03X8bcUZjD{8gz^H%fr
zmboKewq8PZj3;W>YDDeHiLSAM`-2>|<gwG~*aMs#=sS>^&>(H4S*zUSgRgk3UyABB
z#YkT~|KlN7iCRW{BQ-5u*;8GPe%zl5XI2XNDHXT&31Xe|VnyykU{gpP+;)TT;QiVP
z3i-3TxUw>`Mqql{uK*tn=#hJ9Bp^%h<ujuURA3fq=0QXsyPpi7KTKA9m9jzMc+wv)
zpvb0KkW2BYii^0-Y;syRYs!W4!*s*py^fNTfVhJvO#L3p7)<iJi`iCc<E8R+Nxjs1
zf%7g8$D5Rv(iN79=X$Wlc}P8RJ-XA)Jd0zK$ZZ~?H~@$|0u~V=P&Mk9;dO(o6|$=^
z5rMpB%3H7O4e>qA_tSov#9lPej|^VaxNS9GF<4Z~$&V;_=c8MLzXvoeaaI`(A4Yt{
z(<>WalC{kLXj|7&=z25zb&j#|i}?xW*d}WZKt=e`LH`udJl<eh1){{~!t*uCoFtdr
z^v|FDLSt1}mPJt`vg5R7&$1po@UJfc@1H~cM_<CDBVc}(0Y>df$5@(`k&~L9-7^^<
z94g5`qnRCFl#<T&j6FI%KPN5SuN~C$_ni84dfAJFbvn9q!cgtmsx%m2VwvmvCR*M2
zNiLosz)<Ne-DlrO?uM0kP8%zQWJ=w5&_WVdC%*2`HbC=sFKmehHH@j5q<87+=T;(G
z5@ALmQtcNtpT*hb6&L2k7%^k`@20_0B9sSmJx~G>j}0t<D)atfVtKL;fqZ9Tps@fv
z>HTYjOi2lm<tnClk|q!U4G^)p_iuhrs;=Nz@xnjsB$_mU6Fhkb>XsXO_&SCcvtGgh
z&_G4PMPA!SE2?owa?yF2Z$-37pKIj`C#S?TEC{-U^_5TLS!d=84+G*{I^6cRy2z1h
zGlQ^R_YO|k8~~+hgWsVAKej)Q%W08$EgI-AXtI?Rk#i*32v#Fk#;Fnc%4aCAH!dgj
z6U2AYsbj6?s|IqcWSSgb@HYMOIC0-*Oe|UO-eoP{Dzil;ox3@}Y%GzlAo%I*62F+h
z-$>=H@%-7&?T2py3>NEO(bm8{l9Ej(RS3PUi31DcWJ*8<8h<qpB9N7vJBHrh8CGT*
zgQ7RZbexnPx0%d=P=(>tq?otSFz+vyEztNvdAkYIq%b%x%i!`N-Q{K|B(Wt&%R|im
zm)z<tmbt#ggj<8Ue1XOrDIzs7!;~!tyZ4y>H%QkpLgFJdI_bG66iOxNnsw2}K8C-a
zMu|T8ruUM=2fchPyH8`LJU$1M&Hds!VKgjguw_D%Pl7JbXNgZq9}Q4Bl72Q(#V-_Y
z{iLr%R=C4}QBhq)(k2Gd+|IW=wX255=obM!J}KDo8W@sql#@dkidRYa5Jhx}l1w_R
z(vcLoBx>lyk)HfeloJpMdr_SQyQWg6tu1F-<2W>?y2TaSiph*xs#hfcl!nb4d4+E!
z)>p|5&w?K7UPkGI$_9BHwb)pZRd(cMvbCRkL5vAn`vVe^Xuytj^!k#-=`T%h8xQ52
zTPMOTlsJB72m4;n5`;Zgbefi1Rc<fKSJpK1IEb0IZ{s+#BVza^aaC&xQc9yd&}J9N
zMTsFEzI3k5@AC<H-<R#umkD8Pry8PBc<R0<40+C$R3r0IU8lEx(YT>F5hY1J&83dP
zGE_IhGU7{C5Q5A!OF9(d2TFHQ#i9m*Uu?)->;sOa*ZI2Y34o1??|Z@NTvW)^Tq_h3
z6y*V}PY}f__$Vu`$GuTWPoLblhLEhaR@Rs#?p+Gwr*cDS1dT^JGCT&%ENDV=r8=|%
zeKkCHy!Glvjs)@hjvg>=EOT9QiW)V0ts8wi5BXYS#bs9GtZwpMWp+*6WjWsaS#6;r
zX+W%>$YVYO{4DO)TLcHnFv;pHjc6eo+Il%Isc?Wj-;<;0^V0XfQ8#}wSUGi~8-1b|
zrOA^`-${L4vf}OPn~G<y_HnhtId!p_t19HH$q$wEu+f3URJd4^F7brV(e}!xAJTK<
zux#0`=l1WtsU~ys3I!^0lqlWDdN}NrPMC3bShCC^jmtIYP2|!;)RXLDe0#Tpr-^7U
zCvIZxa^S)3L9Pw96a-U;kHsmlk+EMw;1dL}t|7H#jKj{tBI|XLi?Km;(<OG`T@86&
zZ+z%ok<YwU;L^|5@yjpieALZCWu#_S_sxM}G;1-=S4Neu`rqhoF0xT(P{y8~l(Z51
z-@5+()CB)YR)bWysAqYYs&^uSmJOimbYPO^UW>MoA-gHGBxwrj{i;0o%1p^9Y#%oo
z6MK1@mVp$n%X}r)TMUAFcX6V_y`!Q!LfABq25@S#2yA*~mAb9J-<_~OK6?6d_34+B
z;!G+8&%LVUu9=$ocE7le8e_TjUf7p=1c#0nk*j%MYS#ASyjeOIZq^&j-PJ7U?^CKo
z&u?bDeZ7>E({~m(e%qqR9+bHBh9NkVe!nujsU}~BE66^1E3Yfc&vDyL|4=ER=OyB<
zyJE9TxodIJiTz;n9$VL#u5$ooCw{5WoapYTsQde=cH5m(t@2URo^+W5(8ZIrhlc|2
zXJJ};%u)7~6&iqN5<CIux6)7KeEj&Y_xF9+*v9UE|8BmowPbs+MZL7VMAtX-&$z_?
zcKNEtR6ne3;CfkWBqMe_^`l;i(eiAy;^9Qns_<ZxfSc=lBgt{MUWvWk-nX2CUqgSM
z=M%a3MnQayk%x`z>ExTup0Vt*65VQ(-%SKRq$qcumg{G>H<cS^K6k>d_m0nvx-+<A
z%V@XWn=f&{H1ohdp!%VmVBGfb?4eqb#jd_Fa238I>W=Xg^Fi^CWKywW9wf)y$9MsX
zXht6MQ#O+K_w&u@JRm@Ezt<fe2ifb%MQdsUbVwIDkjO%s>aDS6aLD`gH=%FXQ<`O!
zzr?03!F4oiGZnUl28nbFH(heGoV+7=a*!1t4jYah4(Ssx^Q~=j5Km7CAJiS0HV+xE
z{IF7$pF(ztM3$fKBgw5iD}B4Y99hF=(+0SDdqd8Pk$^RGpS9R<)&NXq%1CY%PW=+l
zfxU1&Z+?@{%_PWV9MkEQl~Y-5fGru^S}-XAKVC!Eg^R*0m{9yAZLu=t+JgXoH7|gB
zV8m`t&5iV#^G~PO8~084Xgy!A$rkRDJv<Wq%0mz8E8&S#R|PGZ9I%6N&s8*5#$cS?
z&h<?5Y#G(c;3fhb5_Uw#fLjDBXti?&AtC^s$zby+@_*a2N2pd`y%cV9!?Ez&`udtx
z7?)6npH8)&u`S|2=Lei9=dvA|wiUgk7kja`$&>5c%svOp6Ozt4&%~=|-DI0h=0!a}
zJU^aDvlX&2KZLpye0WCr&S@<b+J`2Xln2YeHOH?FHEh&T2B^sI{goC38`SCQDueu%
z|J=|=ggrW#Rs5d_p2Hk`@A?=3v0VW}91`I_r37%2zHHDVw}g}8qf1Uk1$7ont2GBM
z;7`W=Lyq~g3>g#c;6LZY+STL%0C*w*h&i6;+OBntNq93s#Nap~AY6a2orzXct_%F*
zleH!A7bpNgHTlx-hZ9(F9(Ww_=*4C=_iA4>f%iTqhTlUn!6$`+1Rp8>{--m}beKRT
z^X^&fys49uj-m}=hxMM2ck36J$mb;<L0t0p7A&!+BBvHZFI-YX8gf=Oo>7YRAUrzG
ze!che3Ei>h?_sI#dj^!97Rojj0s(e^e&3zYb6uX%@iK>F?|m-SZ#K%uzW1gV07^{9
z@!)!+eoc!%xP`xbnre3ng=Z=)acOHk5B4qBWQeTQU8`wmq4w;y!Rt{&^Jky@I4OgN
zQOdsVQB;#x-E<mSqfcV?l3ubyU`{S2XM4b+6)i{4^VU#`T{A&l1aPhQAR}SVvl0P?
zV{LK!BlD^UI9j8GGsf>xE-E;Bo(KobFGwvCt4U*2RC`aH`yBkdWUKKWoowX!soQL(
zf=aNDe=g}j<WRRd*F1OR4jFnvgT`t)WA0A7X6%XrA0AZmdo|}p#F@~o&CJp_FRPs9
zshrM)7sErs1{=36<!h6)iBZw%tnpPp2<tfC1k^$>{~*>)(HVgs!Sx%bPhOKf9dVcj
zqyc11Ck3x|0YLOFu}FK{KlFPe%9IOGaV@<bb6eHpjL?!#XiM_`ozB>IjL{7#PCA&7
zliGXdqabe1&gz@0A}@oD#P(dxa{t4h(mP>>#NEDAox;};)oh6o#Y+Dt?luVrsi8b)
zq$-maou}H0$^$O=H?pNDaoruGmcKRo^hjvNqQ<!ESUcNy@JF`!eg=+cK)^50(E*?O
z93oQPuO%WB?duF~&?|5hYkoAlmtRekK7}UyE~VllB~pJD?ns(Z&E=3c${m(sgFT#v
z9YO+AR<aLOa8A_h_?Q*OZ*_bd+V;^eZwV8sIlteI9aoj@1P#*rM5-q3z}_AYc5BzM
z`<B<$uFI2rw%L3CtxHeLv*S)dkBTH~!99ViUmI0)v#YO+v<1x%1g`e)f1xu(!{N71
zXxiGq<>_hXl(HZKMbF<J&iiM!h-P~%MOYLl&(&R|Vy}yrFmB<EG^gZfm2D}&ZDHJw
zH*Cgq6*X>cHfn44Wr`==s1Lmle=|s6TFIm5^w1>_DWHUWN~2lXQ%d71MR3%hVl>Av
zi;+i_SVJo7J7uB!f%JPG-Lp)p0uoHqnF%qfZmriEH2{FFH=t8nS|IBg8hC`1^TB5e
z2?{#40U-XG40+|;X;lMH1x+km$;y_TcXBZe@B{Ju+6<<mnWMItsJE{$4)9o+ol4+>
z^D}2Rhqn_VfZ2oaM-OCrnb?UA?!2#k9i9O_;0yo(YvL`>XONB(5hLK@$5MOwED2ed
zq84leu&C1S{Ha=;pEFV{_O!<ii<J%YjRwJhp2piYqt2F5Wjbf#`peBCMi<Svi=PHx
zwtAw{R|Id$UIvt_j*4zs%M_D9q=r>*xkb&seRf-nc_9Rc@;#F9Cli{sWZ5nw`zr+Q
zAc+cjiJw=34T7yh6TS6T_^;ir?}JnHV!HZgJd#IXGzHDUW3@<vVvi{Ffo;YqoP`|i
z>H_y$X?*WXwYj(b3E;7-0-34>Hk=a4$6r5Q&NC;L#MfZ(rDQ9iwxW9M7!#c;qve0t
z4<5{n6oX=Iy$>5C<dA#`JheCHa@NT~yHVdY?-AosSBh^sD3$$*eyG5aH({{K&Y9ZF
zwBseMz~sm8Q`v_yXXM#XSaISzj`+o_m+DV3@^r$`N4OBG=g!D~K-*)@J)DfuOTa{6
zc93;L8m|39$_9F<t6T4v9_)QSBygsG75}|>^&+~l54C;wbw|U6YLKm+tj>|2;{##6
zg~@g%*VbL`<*!=b?vIHg->e#1;a?(ig-->b1uFScrW8yy%{paY@1p#%@!9m|ztQh^
zvXG9_!WNTyUH4|{?d8RA_mLl_4f-s1M)<h3Dn9k)n9mSA!@$DS?vCxrqn}#zy@-uk
zHR#tgeoZ%daSd7WNPq)=DKK{n3#VUbW|A;54F#D7(G2pN)t|~h+(*2gtOgr-oGtIm
z*EFlMF2xg%B%{WWQljjQjo!X?dux*za{w#kd7nm`=4-)AH>)}<me6ZpHcfXvnuszl
z1&5nZgT`=FlbiWVntB*bfC~F5+9zX8Da}4N5{5Yai_DPbd2E*FP4AiBM3epDz3XOU
zp+qF$|HY#|gP3<W#iz<&0+>9v<~Z6cw)zo)Vmv#!5&vzkO%IbzC0(gzTomh2*_xLA
zgP_ss&~QfwduPTsg0LJE7m5;l^)Nx9HFCIM(~$hF^NJtOu@2!fWw=Ao?R9&xZ7;N$
z2a%&)a#jLK1634Ov+O+lKjT_?rS&8}%ul0YL<t>D<PGRG1@d%3tR^9TyemFmw<+NX
z_*osq&c&8Xax7&A0N|G1`0Muc>{JShQs{4;ON4>(<Ooapx*t7@1*!YQlV!RBI3DDU
zRxK3~Zi=al<O`P>7b-dK=}@^+v9YASHtNCr0wb9cfht^{LpLP0uy;p4u>7S3a*UXY
zzmH?-5!PkUP`th%>>7^$%%@iynQw_cR_YAV3Q;bbvMkPMtLi8D*Wb{S`9J=K$Cw6l
z->U?=ri`?>?5A{8uW3ZXG9ogwnHcC^m3W7}Pt8nAh=~qQ5PZt|#)-<pXVgXv0`DWg
z+5GCm$I7xMikSHj_@1?Do6p<>Ijh5&_q(@y7lq11jNR>&H1$-5u5H$BA{*+aqD9!w
zf4sDr*$W7W4h#i-n>~1)zvz3dx&O91$+?RC<$Ww;iqo`s#{PQZbHtMWwyzIuUrrQ}
z19n@Rq=xOJIGTPL7E^|ik3nq<dZ}nOw!qi?z5`K~w+F8jbVjl^1h$*;vBgw;n;Ck1
z1`iE&`iY+Q5vew8<#Pz3fWA`ST|}wpy}*&r5=xO~&I$ei5J0c3exzTT@Y$)nM^7sL
zJiEbAnM`z^uAXwm>l1!K0^Y^4*+skq>e{=U;9n&<YHE6&&_Y%Vf(C+&x|Eu(7?K}a
zpF>EU4sqdrd6AYTPi)DYJoor{9XqL7j!{X@*yOl;H)_`xh>;Lvpng<VYWXgza(2hP
z@bzv2={s%KZVVGO4M2g);?Apz9K|FIDbp>;QIjqQ7u<XHYw*7E+R)16UG9^^HdnbQ
zsVTjs+%jp=dZVu_J_DED+0%40i+Ulyk~CKpu!*s4-HdoB)JF5!Uo7Lu!vhV@GubW3
zy)s(JVJ=hO>Rz309X<YAO(JrhJe_;mc)oCxew9xAbWKkQUfR2zKkH>U{mwsn=LFZ2
z{vflGh*4(VJs^;S0U^t*@Ut&?6Y2%?C@XP4alivqt@qRuqb^OP(;)`5dYMy_668sP
zhT1DB^OLhoL<W4!%FV8c<5kreFUcFN?IyJk&WnCvKg$VPZjN3t?e4}`EpU+=u>XU>
z=P-R!;wLPt%zHSim!7M`y50EMk7E8;XGfmKe1Hi&fsv&(E%X~%E4Gx0pY{A1h8Tp`
z@-CO#yajEsN91r^*v%09bpUwVe2u>tVMGG%4Bbr8s|X}jY5i_IN<{}ZN4gE)H|vz?
zNf6uIu1(pN8(F5!Zkb#A^bei=KswbF=+Ui@_sjNe*=W@%dlqWu97NSI#^bLgv6B~`
zx+{O*9j=h92L#Bz_TH-OpR5Zi68}Y&dSm)5b+orP(+I%lAy^1rk$s3d$Lv9RmIqHj
zC90I?L98)$?E;4s{IP|C&1>qx7R&YZ-Hf|v@2;BTcf4ph|4yL$W!lyZ3VX=TLwiY@
z_2~1q9D|n3B~CN4>=$m8O>08QUJq4J(NL3R0OgoLY{avj!&fu*G3>+_^CAY~)qcNz
zM$nCjfqVr4bO04_2?l`U10~aHMB&)YtL@6A4_j=8?Ts)ds?t&i<54Zfq^@-L;F71t
zUMJW7e=1#O&KKqyJY`XNC_C9RMGN6dzI~@jdan@q+pC27mOuK9!dl0@|LRD7yUBOp
zzO6X$U#Lzi<;y18R=9dZ1^{aU;3+&Coi}k0(gjHcQ4A)44sN0VvEJ^D-%{$o&DBgb
zBMJD!wZBqBs7kUjKRAv7%Og^8Q>(RvI<N47uJXq?4M9;>5D={0ED_NFUn<H{py0v9
zDW1PS;l-cuSIyosKM2y+OQ!`6n9aiRR}aZfHKds+>f+9oVlS0!r9T54<`3S&3-pG|
z_$rAP&y$)Acha9`R5uVV1HCyy@ayh!bSwd{&J)YjXE*bZTx51k->rB5(ViGSkbU#w
zM1|{0kO~BCYYT$jCiXHL-oEDW&4I|>6~7CpB>+H6<m}Cq%T+}A)UVKZg)sTOQ1Q%M
ze_S_Zirvp%62~eJ3+Pk<{3?7;K3Kd8Yq@D!$g@U@kO`rreTyV^RL`41GwSluv1lRP
z%`_P*zAcC6V5KE+td13$mAw5e80Vl#M)vcIT{=tLD{6R!%MlXt(u7*R9wq$H_%;A(
z1oYfTfa4=-7mE&Vgu2UQWGOJOeoAVA2TjoE)nlow!lQws_vfwpL@g;@-UgzZgC@;!
z#PnMR#H}%|R>lY|o8jzG)qQIURKpTnpZmH9r<6r}*;iC$jd-|NQhW62NyiL&q%dRO
znIFd%Tff>zQL+VUo!h38Ix$PmV8gi+o(!p7WC2JfIFFcQJl9twG^k3)BzLz&l9fHx
zn7TS04&ZhP+8tQ#eLHKnue2cNMHa4-<)|m${Muniwge`U@v=estt^IcWQwczP2!&f
zoUCTlU=po@ikT0e@3TUlFm8!J*!o*d(MWC@sjqZ|o>3>VZM4BF5sjHoPK{VBGF;4+
zLh6ND=*Il=%+vESCT3nXXmE5RvaCuDh#Y^_KvaSM!w(M8rHJs$w)`{!R$}BRiEGW}
zP#H9!&U@$fS1m#BvxnJwp<F+wC&ID0&2voCta~IFf$=QkRWc|la-44x8aErS%F({z
z$(iL+_m;2QNYqnK=3Tw5@mHpehj4i|aIJ@MXwgWQ+QP@~bbg9FV%*`aYOf1n@SovN
zoh>6P)st7?;li-itR;^&Ow~U3_Q?2DNcn=9;lN!R$nm~^upcpN2T!jM?{}wozXI%!
z&ip)KzO!x1{So6p(EnXBin-eh4;WS6KdcNtcY~~m`G>WB;ssE^Uorpz!3*o~F0ZuD
z808q0LITF%0YA_t?d0*nP&%y1bwA~te}A=gY}?o!B^#wk1SKK}z*^e{G31kCVZ)`m
zKw)FQKqwNBIhdRdE)#ab{G3|jo#Y1i=%EvNzcrONl9E3)mtg<VSzg(n#I^iYgUO%w
zgDzv|74B|1boE=3<_jNa|3}1YWouwjKT)iZXB-gw4F9;BHu~!BqcRc(IZ(H+*-;cr
zG3ZY*1p+4TJ`QWWUf0^ZvNL?wN6%>RZN$@ztYpxv5i;#$mk+0OX0uK81O4eI_D-8`
zw2YmpN(Ua5#%NEUsMC-B<bg-OeVd6WzscLVoZi+x>F*yikNZwR=3>$=RDT?YelOnj
zZB~XyOD@_1YqyPDt+f0{<VluTQs=@RPB5$>S|y5qL1CZ;UHs4_Zb=YWYXx=V$!{?R
z(0qJ27FYf7OosUs(!r=wsGRpm<7Z9#hBG~;<tO)xKPJ_1?w9x4n3eNR&goryRpw`D
zern^!@R>2A#r%vfJ7J-ymG{a@M_NcUTy=Q{i!JM4bLyypwEu3nD961jbd%3+IMtgJ
zB5QQ&I9_r>0lLz_txlX^ZiNE)g~~0(keMwjN;bDZ119|@FJ98-$`=@(-deC%&eI)f
zr3q0=n2s${B661!lPVTYi+>R`@N%5A<3_1GV_&|Tbu2L44bNy!Q4cDisx%N3!2A3n
zP`SF5nZtt3Md14fw-Aj8RSkn<z3a~#JvY;cIK}7<-r+qm5EKC1<bXk3hjlnTkc)Km
zNf@unPwm$fh=2)uedpbd_3ii%p@B5>cLYna!j;bn<kp(t?e3my=F}O9#C*CELPWSo
zB?@mcaDwDcE3f-A^zvjN3RO*Ds-BI%K+c$!`6*g7J9TR(^=_dXKgkuvl#4o0N1I?v
zUa?YXnT)<BE_O{ZcHe*o{)ejg?)n|`;b>OASFXP{Isk6n*B1nlA+{zH+Ppgm8v3%|
zhrpeqbj#w$R}!YYObl=0;{$7M(XCMc-pl!KYrq_3<2Sf^XQE686GLO8+H`iYkyQuV
z=>wvQG|}xaKRS*Tg|{}_*OWxK@+LbUP*Rku9Y4@o8bw!M;moLCe!%@bk8CXmyH&il
z*p)XHcy(Pt9~kWv$p>{o>~(yPBds7`_L&ms0{1nSWYNI0I{QVw$ag<oB^4on=-R}?
zQg{FC;uOy7f-o2OXae(ib;hWu&=7&U>+DZQsy`m)M56?~v+AEVyRaE|p0lVQue=g&
z=g;;fjJEA=nDq|u7@98Gd{^`9%6ZqLpnmrON~rlJZ9tl&jwaPAdzB&WaHT}R0t!ZS
z*=OEU`u4bVFMVOX7<qD2H>R{9T$nIW=and8apy}pqtXMU^1xL6lC$NR5rOAIr_82G
z2`F1SuIYCleG`J=bRGzWm=Xe(2)l2PNn-Qq(hu}Dl?Xo(?n)%J5#o)F&BJ`HcCj?p
z@j~9HOJCf7a19Pu+~1|=QpsSdzJ&kts$nm!(ZJPC!IUQp(TjV}APOyS>8;?4gtZV(
z>!&=spZ2dB2N{bs4_+WE$s6_=DhL6Oavj3T15iN+Dr1{$bTa@vPxsw&NfFLGC7Iz4
zZq9P^c_B`9aL&svYX9B5Y4RJs#bktFrnUY|lWi?d2f8l&NvFI+?lBAN7PIb$pU<0C
zvFBTsk{lzBpR<4VeQ@-z?8P5<r$P6s&AKoe?z_230jw8um`pBjwRDw?#ieQKTf2Bq
zz8<x|x+zAkBLH&17>H<U4jiP`_nKm%ilpw-5a4*?;5sIH)=8m5!8UA_q)P4O9BN|x
z7qalS%>&nWr0u^9>Mcs0&Q#)kNQcy#O*oc9O+WnL8cvkZki~MVTKQV&+*%oPhOUiN
z-Y&esZ<l&>yIxQ0z1H%A)bEbuR?NlPjjURgk8+F5MqoY*^Z4>3GX5Y5OdcL|FW)WJ
z=*v3wAfz4!HlFxw<AP3A<HfOceTO$5>M`&Fn0BAlb7>j2m1cH3-^?eU^9w7X$9%tp
zp4?%6Rn2e1m*PiBnw@Jy@^WIE)=fLQ-nUFtJ5*4bJixcq&oG)&p^S3J3?n4l(z}_>
zyXp{}VU_W*nRvy%Z*Y{7a+u3UIlZJ=j875!y*UmZl;vZU1Go;PvIKm{n#p*SWak3j
zv&Dd?NLiLkT{iK$y6>bUUOu`h&dwhvgA`Jh%-1zWU98*LAXVa!-P^KH-d@|DBhg3}
zsZMNf-vMuGBqWg9?bZKvFZ1~waU5nPbDDw^ZF!+my6DgPm$C3Sh<i}=UIM;|cO3JF
zzWLRD6IN)CHg>j5{|@vs_nvA+Mt<m5d&v#}k)ryTnXPhTqjhb5XQO9q1hcYFPv`m?
zUybOt;h=`Gx_)Mnjm*tq{jQI(t{X+4!_5!J^a(2QWU1_`UopMC*<B{PKmiNO8nfw|
zi!m53d7{zpbl&k@w}`EGTCN^zyOq8Wo<EO^U=wETm7B`_B{IE~1j{Q9ARGd8fx(`!
zanl(!&lbh}KN{Zy0Qp}4d)>pE*t`xRQ9vVI8v98v;3%5&!(?Ods3C%Ub1?=+{^%m}
zcaL((xC(+lcX{#^E8r1+_rNy0b>GK5ucPJ%o!>@}PB(9uzIIC_<^ej;g8=?Y0_e#E
zf6V{!ncIRdKA9%22+bs<2fBkf8GvO3hLYOnT1%mTk)#TxsCaqi${Y|d^wfUIP}*{E
zaJmbA>hw;$d&zjckC~r)<CdZIB`gE8(A&~dGJ<*YGy6h4-+p-%y~2TdEXB1ToSXTW
z+2<@5jD~I-CJjPTb`E^2JRmbBYzPJL8wBCOy15i8=(oEW&yukOij3c-gJ>>ei;px$
zv%f9eGY3DSk<@7{6uZY@`gOqNxQ=^kgmc__t!dKr$ECsjm;!S`mguWvj2nwY5<#qU
zDc_QL$rp-Sgy}NmqOTfIVUygv>q*%?f<jr-g@FkF#xy+rCwk{Grs476KPo=elfgeJ
zzYs?IR5i1>prjx_uP!g%^W8K0XVkQ06v|I!Q{!?n^O)$K>LnV1GAmtjHi02VMgE{8
zI**Wx3lYG;?nw)%E&0$AR)34!5@KHbTs*Xv7$d~`9Rg2y?C&OH^UfM*p0ib`?@N^j
zN6I+^+lBW(yo?J2E!E`JpXsDtjb&3-H;%qM&Qpwv>^NE7?y^*mm#OA)RJHB0GM9T^
zuVJ#C#t}~a7m4RwW`wfiKEpb2si?>4G#TPP@(!Yf0UKBMUh>5BVH4(3XGyc~@2Nip
z<Z5#AMC|-pdqKdXvW^-fQqX`KtKz5{ico5VbwmxE+nW%^$!JZ~Wa~n$yi(pOwpNEO
zP6z!~ooBRCfEUcPz0e(cGJf8e_3MgMaV=%pYV*d<kS=tv-?6ojoi@)iSA_b-6dDzX
z!B{WXMASS#0T)YWfF!*2wI5!gGz54MZEKLInk(H;LegCBHu#+l`t$6L*lJS*YTCCe
z+EvtC-dmw6Ul4p8_q$IFD14T}c!v2DOMhiwNGzF*C#mtxH~!|A$iK)0ECcl)nA5eG
zi$l85x448baAMJnEzg*fWKVq7C`YI$pI+U0a(9gN09E``Ho-lK(&c2!&9C6f?A}q!
z3cz*gf*9!1>#Zs;H~(723tGy_XR--u8O87b#nt6EWM==fwbdJ*V-<%II)6R&8YR1C
z9S`~;^NvfNz#5{`w3*bdj-ySl8!cPekc91lr<~;_uZ!+gkJT)e2JTMxP`Vkb=Y9o|
zTpvs9cg*?Va(kc6QmQho*qEh^G|0i^08%Ywf@cd0G$}|^qk_*vK9-5ymSLdiIb{bA
z^g2C=XGt&y0$pH0xWS%+0&Y(^5(v<78<E7s9vxw=6m6y%LN|YIO(<!B2wN!R&&a+1
z`b^+!e2To>eL8ufzuvNdgIo|7v2}Iu?wjFc!c&3JoRW^GkJl0Y{&1bm_t9kzUV<ZE
zbCA?Bh$#^f0je8t&g|(t9{0<OqB$>6O-j>WfOQn2maur9<ZdDIPRaMzTk@@$I<CFA
z{w1J;Cc3F1`VIEoX9gbWAY~;orarB<k<<5CXgFKIfsiU-6ahxc#PN27I-4kMr06$8
z;p<Q|^p;V6G5{tbbRRNi7E(UB)JUHn-fcK~L-ifBcnfM)o*wMre^zCg+iF?R7^7S#
zl1$F~DQ`VVIUD;yS6q8{Cca$-nxo5)<83i#G2Kbe)@E!sP||XNAWu;1oRKnuohn);
z^1h+8H!XF7?9AjnYC0FvY)u++9(%71nWNb!0<zf&@p7U+e4xd?7ZF84Mx!vc#`%~W
z0Jp<9tT_&PvbFzgOQbkpvka5aY?k_CQ6=ZJ$eF6GjR&L87G5zWA%=dp(WOMSv*PLN
z68JPZmf0ZXD9olcExbNp8SJ{LrnX>H;Yn3Ka8v$k_b|~Q|L2AM%m_~WNtshVP9kk6
zQL&!CfDXGaL3LgOYEZcB%6DS29gmd)cV3<Mj`FLSaC`4+UXmG5jl_Z>#9;K-<r-D5
z0vJx8w1+H;cO1Y?!KB&`#$AhMZ=o)t#&u+Pm8%qgye23<Ys+~166)lt?HowNaK-CY
zEEkR=bCxwazWULW&!h5!w}fIaq2odZIjI?aLj3%$k>|!QtSLirZ&j&bey~jamSBzR
z)n@yz$o|Nr%D_N^)2Nanp<kPhRm|O$p;Az$(c-493JF`ShJ|+yxu3A*PF{6kV8G>o
z7+$o*nkE45fGfLK9&WlKQJ$UvFkz$`Xah!g!l_RrX5Wr8es`ZZB4W=|4w^^~+tFA<
zyj&|eol=~*ua*$9q!{pWVW2a6mYnX&vR6ueShSZ){r|LgUqMao>l(lVAxQ5{6jTTx
zy-HBJ^j;K{Dov_@bfkm;qJR|XO$dUZbQGi`C?FlAmrw<zhTiM`SZnRGF3#*d=i;1;
zGyA*BO(vO4CdvDMzUTc#c;QLFTge!^E0>%@j27@hoFrQ&9HCM4F3QhWA~P=AOy*{*
zgbwyUe1G>+R{sE@pFX$1p}#kr`f_etbf4l|#gYM04;FRNnV<5fwYgr5roiQtX-NVY
ziP`$_m^SXoM~lMOELS0=qmc%B&qc{c%a!}Trxcf6X~n7=pb9C5B-BqRAKs#8dh<jB
zXEBvNH?)tC_fS{bKOI?InmfIH#xC_5HZokX0Q+oq+bUj#UyJfcOZoxpLPype=LP%|
z!WW(%a35yH=BI@tlh?wWnvNLByfTeu9%3vnFXG!{kKKou%KYUHs;XvYkX+TPv~;*g
z>yv#cd^~|b$<9C-=r>x+1W_8uYbBw=R?G?}#&#_H4x{vz4(h3?tcLW=Wws9X?&q%e
zIO6!m2Tb^xOher3M>A?kC&+KUnQTZxBq4?>MbUSieWL9H7YM^BN1Fo=Xg;6y1Yl)6
zp<ATvF9H>Bip9BW6{aikBmD=kWXATHiqtGLr$w$4=~1R4y!w3IJv2>2X$QAu4Sq~b
z`dn+p1BPkeC0Q;r2<AGu-RA^(^P7;F_60c`qjA@k--U2*rxR0SyP?R);Tdz7hZ7Qs
z4D_MO%MOFdDa8^d$P3bCg!#PG!V))at)vkKADP^EXW_`#9n?!&rtZ*O=ESW!DsN)W
zS4N9m2x1^Pimp_7{p>Q^@#B4KlXfSgm!Y_$eYArj_Rt4!BRqz@YNJuM>p4W9$Hhjy
z<8mw2;&X>_&VUiJo5>tSII$P_1Y)VjmamKtkvP#Fj>U+br<g1R9HwGN==sl&x0XAT
zo|O!LFGxe6ou#A$(47b`rIn~TclXIJIk*B7th<8lN4f<Yzft}0NN(+!7qQ*XDH2^3
zKJe(Vs9vQ*yWX}7G7kInp_}`A&~HCs(jf;@kJ_j#;T%<QlMVOwrq;JVnJPtLA*uus
zVqe^dQ$9In%ZJG?=Bri)4HE|!T}#`^neRsc?HNDkRy~HyuP)cfhe@>aj9uYCyTYA$
zEVf!|H2ps5JtYnfjRs^LT|xcXSTEk`6CD}BuFsbyIrKu3k_|b@;|IU(6ERDeRdG^;
z|H9He%7gMfHTf=9i^n<<qt(d1@oO^&^;`?z{G@(U)(IooS%$jjHXpTZt-&cb5aR=@
zNjBWuFP9#?N%%OUwpsESG7&a8NuRigqc~Am;4(pp3ykDdtNTJEsiZvofr1}<p5wJc
zP%e_&x`{(&?&*(=B^;Et;t=cT-Pi+Ljyfe8$J{ruF&bC5RUTRj@Z9p0>@3>0BOLTa
z5_k9KZgARPo!q9x>>u?>)r@H`_j=ix28ko+4`)Y>YKmRFnA21evJ!q&zQxoZmmJva
zQQ2Us>)Z!;UPWtZG9~jv%)(Z1{x~9Bqo8<Vm3T?{+dDIBTq20TS-zuF<-0EZF4^Bs
zrBh<8vIp6WkF_{!Icnf59;2gHr_SPTKd9%T+yp8W243Y{(co2S=phMnhqro;m~q#z
zOgkB-6vno0w78zG=1PbLXS%GauN-{j)}awvTq!7m5kZI{o{#ICdw(#%F}PYL?tdov
zB5t^r7_JszUS>3%&r&uv2_FwyQ;4$OZfpsRtP|_FQzOVmxN~%#5o%@_EIS9Qfxhr$
z4`G{687{wX^-OR@jyXiZn1d^yY9-IqJ@0A02+3LoVPJcgbm827(SojxHJy-EkUASz
z_bk#lB=~*XH~r`KhTq8in4DjZ6mc~$e;k>Bkl;VY;qlM>kp1LXpvj8`Y1MsS&*j%A
zZ=5cs2D)kWo&%4FA$#Oil%|Z6reWOu+eX&zPMw&%BJp$fW6|}WICV^Dj%uRffOl{4
zmkuA0&Ip=0?5dmaU{$<(f`+Ysy`)61zqE(UGojao$j(Z`*XvnO)GypZc;*z=(`?(}
zrOsoIl7HDq!A1G`uUnlr39Ui!gC$WRnry?Zg>B2z4FTsJH2op@&}>OuKiBgT=%FLY
z958accQl*k|4Nn@8)h6CjMMBI;5XE+MXSEO0KG1grxCtsq2*6{=6Pw95;hKOmB!OO
z`t|}Uv70ne%>0)pg=ed9G2JA`e?Oe*<<_JSdysbL@aG48pnA5!U>U!8vif~+kR}5?
zdGp>GY>qD{SLs*AFZZ<=sjkz2M;#IDjADAS(#}_~7qbsAsGl93a&PxC*YyM4<|)q8
zfF36xm&Ca;TE;C-3F!i|YzXA-Rm14Qtxwdd7%8X6^PU3(+1aclyZ*_(a5bZ%^3%H5
zr|NKXL@l=6DAfvW%lLx|@1h`VI^uZ}fs0={!Hal%hvQfgI1a4#OBaz97Eh;$CKcW{
zZnO(uzOoj*#Ps^*tA3FrZ5h4upB3i^q&xCL(>p;Gnz{irm{$VkVF+6{uUMmL*e8YU
z2L9a+`Qt~|&z$FIxYO?h9&|v4O>P&fA8bS7=SdI}MuTxfS&x?YWL{)<O*B+9jU!rq
z?6kzmqsU9IWa3W&6ZurMYpofX$i`GnD;d>w8;-CWOi+kGLZ_2|PtMqgvyN`6tK+lb
zVJ`21GDRW*Eq&_%E`q2<n9^`=hhS>iW$ITWN^?)g5PH>O2p?55IWJZIHKpk7A19M;
z3h*)C5ogaO{w&Y;p@a7x%-&$@VANXrI*(L$ASc~`S2BmMr(@q_c_+S0CDO)mBK!hO
z4w@KIY2C3ODF3dH-c;IpVedWe;y|jqUrF@sO2>Xo{GcP@d&FzfUckAEZ%m5vTiG8v
zDIXGUCT8C|2n%K2jnleDN`>Ejh`d=&im1dsRbfzp|CVKWalfW=+ly?~iLZ{eIgpg=
zS?fkoSLPipU9Z4dONDTGQClX8>`2V|@w15axB8vdm)1WB$_Z00nFWgyGwJ@QGaK=`
zsI)FjEU0lozpFP(85C+rLv)Z4-x+|tgv#;OFPMe>g@hR1BJ`?{iGbYg1llS?))rr$
zP}UMJUc^SJsLhQuCt^+C7^AaAf^Ves9rs%49T!r1&9g(&4e#2(1!M}o#MMzyO^ms@
z6lF~0xu^Mu>(xcZ%RybreUu$*v2A)XD;{)F%DndZ1ERo1lb$gz8GfX4MSauY;*~QX
z2~?9_Eo}|NpL&cqD3H-}*YOR<g|tbFIj$j7$F@t@hb`51`^LZ8%x>m-X5F~H(b_zK
zojt^z!ukEwU$y?7%CUBv*k?6AGs`8F$d$KUL_1Q5F-5^I54OIoBo<aj_4gNbKDnKz
zR`0UPBIWdXr?-#CMDBfMwP(u9vg>?On!5^h@77;w+a;Z)x_xDSp~EMtkIv(^n_*$t
z>oJ5$`JJAlciA<7HCFVa=_+?tnZ}EcT2+AAUXn1hr2DK6of$lq>474HoB=6C%}}<1
z1q|_{m!H`A&y{_@gY91aV_xar=!pu-K^&>h)AQ9$nTt4}nmx0X@Z!NB*O_P6KB>?4
zSX$)=0-Zd<(~C}CO&Wx(ROwtc46BS%X;PPw0rHFwQ}h~pn6F5jDK2eF&3ZprlZB&@
zJ=-nE^rrEOo@6M`LK%D0=m6_!!_5=}#dWLYDsdh4J5`V$qYx$;9g#1<hbF_O;Z$b@
zh!Hs&N|jG5B8Gtqf}g+haZ%?b(e8|+AvxzNgXsAE*%r2SYy=MEy$OvczwHP9!g5$~
z$&^dP1e(R}D${e%rE!A6o$@bm)HPTX9XwS1kauS)>$WokTG2fBio=a$4f46}N#8Ek
zq>8ZdHG@P`F1OsV5|_lr&O{QqkowQ8-Pwpip@;w6z{vkQt++VJWg4xDa-^rHrX}Sh
zHK<ZkGYb4`(!msXO~uhjZ=FtR#?ol+IA$tsJ06o5U<bBfa?OY~S~!|8K{sDsec`>C
z_PsOGP~iLa>R>u;8^h|(fT%NucFyyiZs{`mx!?OsoXR#h^lC@#tyXs9D<)98YxWwJ
z_vnK~FZ;gH38M|(UuSsa<H*6ee}?6145gxxc2uVrwt{Y^uW<|ROc*)sxlg|?G><`a
z%uwQ>?ksyn!6AR-2K@eCSf7jvR~_%+px_gW&22#b9$ZN_6|i_WojfBsx~PY`04fc$
z8>**+piV4(nvbsG+iy9(*u(tpanjB2G>?hM?WqzJdaY5}g?l@zJs+L_8L!i*VPLw}
zRGK~POZhNArugj0o}iY+k@Lx9M&i5tSsS(bm^}|en|E1!xT#O=&x*N>zHV<yK6yC5
z%i4IIq&278fD{RwBTD?IC>cr2&{MCU;B0Vf_&s_?19_UICkZtUaAlycor)>%Yg%IT
zxw229fqJlVS^cp}0>ROP_H$jPqS9Ci9>$GRQ57ur4e86N4b<-LE8H0co3ffIs@E}}
zq>JQy>VJo*{xVppHB50Pl@q6szKe2!%Q<*Y5jtu$kRdmTP<@I|J}bfsD@x3h=Vb<7
zIUcNzK^o~VYERSqQgQ@lxUWbH4p97+ALsjNARFVq8!D~z>yH=i5^RQPjUdl0)G15z
z=kk@j`=3{}5~G^fR%~lgogD7g#YW}0y4rK{tm5@<Lt`)77*&38dZ0ag_saE4RWc6I
zodf!}AHK^jwe1k^T-ul#pS~ylT|BJxl{HCx3h!aM>^iZxdjC#oys-t9&-apL-Is^j
z1iDIUBc!-ez{%kXl!&2Gs)HgKC*eNT=RIH_{B!um%X6`{cFQi&T+#qns`Mev;8>4O
z2j-0H!|_(!1!rv^>8u(9Np<junjiR-$&)3x6X2TG30(4N7u8~L_PFH;=ZsE+)_7Cl
z*T6FFV`*OfjAN91J>AP2yPhj@+24{znRvOv)o7uauu*}~inhVeIAC$n8>*~4oDg}N
za-2%a+V4>!1^#H`r^-E~ioTx6_cjv9=-BwxRN*&LqvR4NYlrJ1=N|$*B$&BN7Ilkv
zJLr1Rn}c)VTRrM)Jf};OcXgfx+&^8N{T3JIK;ONVNUUb}DH~>O01F;d6y~_G5(?e&
z5EQ9Tp;s->ri}TTFtN(3HOqGTK0vrgT;{D{``(;_e1LS!!MAd`lB@TQUqgGyJWd*~
zlY5!@&;h$OWUaVnmw;2vn5Ke~<X1@IHW5Psl}Q*3GBe4sz0ZAI8)@7|q*I?@7FTLW
z=~IqhZ>N^n%l&vYvXX4oli1jkZQ1gS!(EG%C~Q4(8k?=QhWzMD?UTm5E5W3AboVDD
zhoXdrNH*Hb8NI|KTVKX!z#iZ~YdgFn-dAI)Cl^nT!7dMJD=oD}J3mg)q3h24G}WbJ
zTsTt_luQov!t1cD_(Woj>5HQ7OLz=wd?q=xkjAa8CF9fmxlDA$`82aP_FID1p=pE4
zwyV&J#d6@islY_9NG(>eXHUIf&&H?AM~Le#`m3bM?_Bv<y=LXv(g$V#xdY=hHbjgF
zV9qGBE3rBICPH!Qtz;$yXS$n<QSY9;l<-D4PnItRsCFCq^5~r(^kF!E-wIEqct2;d
z%U1L%dt{*dh{Lg&Xc=zf|21;pXgH?~d;Vs)a?icu)XfkPr>b`oOLB4PW1Z)bDg>cz
z=y364BEiABENq|ahdMSem+vO(JZ0q%=(PNq5nXq}8y)5=wWVsvoLzU=#%=dZz3wnH
zsazrmaZNDmF*y<N{`}9l8fPPBfU8-2Pj>Nq5VPAGEt?l#;DA`;Y;+g+Y4cqX-z6Bl
zs0saXhf){GCW&>5X;YF1uB$tpM&f!qQ@#j5%Vh#Z8c?JGMH*0~0Yw^6qya@5P^1Ax
z8c?M9{~^-+RkIMf=$Hca3ZQ0j3Ainnp&@4Z8=3r9h{P9=vjI69kh1|foBv(T1|(@f
zk_IGcK#~R|X+V+&BxyjB1|(@fk_IGcK#~UXPk5s8@3i8Nztk9qyoLW4X!&mh3Q)8G
zMH^7G0Y#htF4}-14JgupA`K|gfFcbj(tsijDAIr;4JgupBF%q>Nb^?(Li)n6{Idda
zvCSgBV-R%nZ?f{=n-f5r9z<<G)CNRtK-A{nqBfvN1Bx`DNCS#AphyFXG@wWWiZq}|
z1Bx`DNb{d6()<xT;8h3x9Xt>L!NazkJPqaFh~*!AM1eG@*MNErsMmmc&HssB1KKm7
zJp<Y^fIWi-{`!?#tVmH2_kO%biz^Z2^+ckpRq-_mVR(1`wXO*fo8K0DGFy48V%w*p
zXo>k{Y?bnK&-@hm=}E>+yywdIqrj52TlSO#tRoIu`o%F!hwv%>WRb7!Uzg^ljr5U-
zeVXo0K3*3}<~+2C?ERV0?P~U7S&Pdo^$td|t%K{6{l}6m3Z*33Y!)33s(MdpBT&!p
zV$fuo4=Tib9E@Q1%q%SWRE2SX#mj}5sp}|c^M}j8$bdS}UKu-iSY#RJJ1@9po1(O<
irqLh!xM*a4sf`s~*>!6y-Mihv74Yq^#`k4G@%{mZ+MgK!

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7fcb7aac22..1f876cf9a7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4051,7 +4051,7 @@ Entries:
     - type: Add
       message: >-
         Glass/Crystal shards and floor tiles now deal damage and embed in
-        victims when colliding with them.
+        victims when colliding with them. 
   id: 6107
   time: '2024-05-11T01:23:00.0000000+00:00'
 - author: FoxxoTrystan
@@ -4166,21 +4166,3 @@ Entries:
       message: Radiation Collector has now a new sprite!
   id: 6120
   time: '2024-06-11T00:34:02.0000000+00:00'
-- author: DEATHB4DEFEAT
-  changes:
-    - type: Tweak
-      message: >-
-        UI layout now defaults to separated, the old one is still available in
-        settings
-  id: 6121
-  time: '2024-06-16T22:38:10.0000000+00:00'
-- author: DEATHB4DEFEAT
-  changes:
-    - type: Tweak
-      message: Space has suddenly become less dense (objects don't slow down in space)
-    - type: Remove
-      message: Moths are unable to move in space
-    - type: Tweak
-      message: Moths have way better control in zero gravity environments
-  id: 6122
-  time: '2024-06-17T07:58:34.0000000+00:00'
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 03d5059e95..8c54ecb084 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Resources/Locale/en-US/language/commands.ftl b/Resources/Locale/en-US/language/commands.ftl
new file mode 100644
index 0000000000..32fa5415b8
--- /dev/null
+++ b/Resources/Locale/en-US/language/commands.ftl
@@ -0,0 +1,8 @@
+command-list-langs-desc = List languages your current entity can speak at the current moment.
+command-list-langs-help = Usage: {$command}
+
+command-saylang-desc = Send a message in a specific language.
+command-saylang-help = Usage: {$command} <language id> <message>. Example: {$command} GalacticCommon "Hello World!"
+
+command-language-select-desc = Select the currently spoken language of your entity.
+command-language-select-help = Usage: {$command} <language id>. Example: {$command} GalacticCommon
diff --git a/Resources/Locale/en-US/language/language-menu.ftl b/Resources/Locale/en-US/language/language-menu.ftl
new file mode 100644
index 0000000000..83687d0f1a
--- /dev/null
+++ b/Resources/Locale/en-US/language/language-menu.ftl
@@ -0,0 +1,4 @@
+language-menu-window-title = Language Menu
+language-menu-current-language = Current Language: {$language}
+language-menu-description-header = Description
+ui-options-function-open-language-menu = Open language Menu
diff --git a/Resources/Locale/en-US/language/languages.ftl b/Resources/Locale/en-US/language/languages.ftl
new file mode 100644
index 0000000000..69c5d0a4a7
--- /dev/null
+++ b/Resources/Locale/en-US/language/languages.ftl
@@ -0,0 +1,71 @@
+language-Universal-name = Universal
+language-Universal-description = What are you?
+
+language-GalacticCommon-name = Galactic common
+language-GalacticCommon-description = The standard Galatic language, most commonly used for inter-species communications and legal work.
+
+language-Bubblish-name = Bubblish
+language-Bubblish-description = The language of Slimes. Being a mixture of bubbling noises and pops it's very difficult to speak for humans without the use of mechanical aids.
+
+language-RootSpeak-name = Rootspeak
+language-RootSpeak-description = The strange whistling-style language spoken by the Diona.
+
+language-Nekomimetic-name = Nekomimetic
+language-Nekomimetic-description = To the casual observer, this language is an incomprehensible mess of broken Japanese. To the felinids, it's somehow comprehensible.
+
+language-Draconic-name = Draconic
+language-Draconic-description = The common language of lizard-people, composed of sibilant hisses and rattles.
+
+language-SolCommon-name = Sol common
+language-SolCommon-description = The language common to species from the Sol System.
+
+language-Canilunzt-name = Canilunzt
+language-Canilunzt-description = The guttural language spoken and utilized by the inhabitants of the Vazzend system, composed of growls, barks, yaps, and heavy utilization of ears and tail movements. Vulpkanin speak this language with ease.
+
+language-Moffic-name = Moffic
+language-Moffic-description = The language of the mothpeople borders on complete unintelligibility.
+
+language-RobotTalk-name = RobotTalk
+language-RobotTalk-description = A language consisting of harsh binary chirps, whistles, hisses, and whines. Organic tongues cannot speak it without aid from special translators.
+
+language-Cat-name = Cat
+language-Cat-description = Meow
+
+language-Dog-name = Dog
+language-Dog-description = Bark!
+
+language-Fox-name = Fox
+language-Fox-description = Yeeps!
+
+language-Xeno-name = Xeno
+language-Xeno-description = Sssss!
+
+language-Monkey-name = Monkey
+language-Monkey-description = oooook!
+
+language-Mouse-name = Mouse
+language-Mouse-description = Squeeek!
+
+language-Chicken-name = Chicken
+language-Chicken-description = Coot!
+
+language-Duck-name = Duck
+language-Duck-description = Quack!
+
+language-Cow-name = Cow
+language-Cow-description = Moooo!
+
+language-Sheep-name = Sheep
+language-Sheep-description = Baaah!
+
+language-Kangaroo-name = Kangaroo
+language-Kangaroo-description = Chuu!
+
+language-Pig-name = Pig
+language-Pig-description = Oink!
+
+language-Crab-name = Crab
+language-Crab-description = Click!
+
+language-Kobold-name = Kobold
+language-Kobold-description = Hiss!
diff --git a/Resources/Locale/en-US/language/technologies.ftl b/Resources/Locale/en-US/language/technologies.ftl
new file mode 100644
index 0000000000..901a48061c
--- /dev/null
+++ b/Resources/Locale/en-US/language/technologies.ftl
@@ -0,0 +1,2 @@
+research-technology-basic-translation = Basic Translation
+research-technology-advanced-translation = Advanced Translation
diff --git a/Resources/Locale/en-US/language/translator.ftl b/Resources/Locale/en-US/language/translator.ftl
new file mode 100644
index 0000000000..b2a1e9b2b8
--- /dev/null
+++ b/Resources/Locale/en-US/language/translator.ftl
@@ -0,0 +1,8 @@
+translator-component-shutoff = The {$translator} shuts off.
+translator-component-turnon = The {$translator} turns on.
+translator-enabled = It appears to be active.
+translator-disabled = It appears to be disabled.
+translator-implanter-refuse = The {$implanter} has no effect on {$target}.
+translator-implanter-success = The {$implanter} successfully injected {$target}.
+translator-implanter-ready = This implanter appears to be ready to use.
+translator-implanter-used = This implanter seems empty.
diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
index 5b368e822f..91ae21233a 100644
--- a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
@@ -3,11 +3,8 @@ cage-resist-third-person = {CAPITALIZE(THE($user))} starts removing {POSS-ADJ($u
 
 cage-uncage-verb = Uncage
 
-action-name-widemetapsionic = Wide Metapsionic Pulse
-action-description-widemetapsionic = Send a mental pulse through the area to see if there are any psychics nearby.
-
-action-name-focusedmetapsionic = Focused Metapsionic Pulse
-action-description-focusedmetapsionic = Probe an entity at close range to glean metaphorical information about any powers they may have
+action-name-metapsionic = Metapsionic Pulse
+action-description-metapsionic = Send a mental pulse through the area to see if there are any psychics nearby.
 
 metapsionic-pulse-success = You detect psychic presence nearby.
 metapsionic-pulse-failure = You don't detect any psychic presence nearby.
@@ -16,8 +13,8 @@ metapsionic-pulse-power = You detect that {$power} was used nearby.
 action-name-dispel = Dispel
 action-description-dispel = Dispel summoned entities such as familiars or forcewalls.
 
-action-name-regenerative-stasis = Regenerative Stasis
-action-description-regenerative-stasis = Puts the target into a brief stasis, during which time their wounds rapidly heal.
+action-name-mass-sleep = Mass Sleep
+action-description-mass-sleep = Put targets in a small area to sleep.
 
 accept-psionics-window-title = Psionic!
 accept-psionics-window-prompt-text-part = You rolled a psionic power!
@@ -66,14 +63,11 @@ action-name-noospheric-zap = Noospheric Zap
 action-description-noospheric-zap = Shocks the conciousness of the target and leaves them stunned and stuttering.
 
 action-name-pyrokinesis = Pyrokinesis
-action-description-pyrokinesis = Hurl a small gateway to the plane of Gehenna at your target.
+action-description-pyrokinesis = Light a flammable target on fire.
+pyrokinesis-power-used = A wisp of flame engulfs {THE($target)}, igniting {OBJECT($target)}!
 
 action-name-psychokinesis = Psychokinesis
 action-description-psychokinesis = Bend the fabric of space to instantly move across it.
 
 action-name-rf-sensitivity = Toggle RF Sensitivity
 action-desc-rf-sensitivity = Toggle your ability to interpret radio waves on and off.
-
-trait-latent-psychic-desc = Your mind and soul are open to the noosphere, allowing for a limited use of Telepathy.
-                            Thus, you are eligible for potentially receiving psychic powers.
-                            It is possible that you may be hunted by otherworldly forces, so consider keeping your powers a secret.
diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
deleted file mode 100644
index 26d2acb87c..0000000000
--- a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
+++ /dev/null
@@ -1,21 +0,0 @@
-# Feedback messages for Focused Metapsionic Pulse
-metapulse-self = I AM.
-no-powers = {CAPITALIZE($entity)} will never awaken from the dream in this life
-psychic-potential = {CAPITALIZE($entity)} has a slim chance of awakening from the dream
-dispel-feedback = {CAPITALIZE($entity)} is a mighty stone, standing against the currents of fate
-metapsionic-feedback = {CAPITALIZE($entity)} gazes back upon thee
-mind-swap-feedback = {CAPITALIZE($entity)}'s vessel seems fit for other souls
-mindswapped-feedback = Cursed flesh! {CAPITALIZE($entity)} dwells within the wrong vessel!
-noospheric-zap-feedback = {CAPITALIZE($entity)}'s soul writhes with thunder from beyond the veil
-pyrokinesis-feedback = The Secret of Fire dwells within {CAPITALIZE($entity)}
-invisibility-feedback = {CAPITALIZE($entity)}'s wyrd seeks to hide from thine gaze
-telegnosis-feedback = {CAPITALIZE($entity)}'s soul travels across bridges composed of dreamlight
-sophic-grammateus-feedback = SEEKER, YOU NEED ONLY ASK FOR MY WISDOM.
-oracle-feedback = WHY DO YOU BOTHER ME SEEKER? HAVE I NOT MADE MY DESIRES CLEAR?
-metempsychotic-machine-feedback = The sea of fate flows through this machine
-ifrit-feedback = A spirit of Gehenna, bound by the will of a powerful psychic
-
-# Power PVS Messages
-focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly
-psionic-regeneration-self-revive = {CAPITALIZE($entity)} begins to visibly regenerate
-mindbreaking-feedback = The light of life vanishes from {CAPITALIZE($entity)}'s eyes, leaving behind a husk pretending at sapience
diff --git a/Resources/Locale/en-US/paper/book-authorbooks.ftl b/Resources/Locale/en-US/paper/book-authorbooks.ftl
index b1981d9e15..ae886e835a 100644
--- a/Resources/Locale/en-US/paper/book-authorbooks.ftl
+++ b/Resources/Locale/en-US/paper/book-authorbooks.ftl
@@ -253,3 +253,11 @@ book-text-inspiration = As a freelance writer, Sarah was always in search of ins
       Without a moment's hesitation, Sarah took out her pen and notebook and began to write. She wrote about the beauty of the scene, the peacefulness she felt, and the surreal quality of the moment. She wanted to capture this feeling and share it with others through her words.
       As she finished writing, Sarah heard the snap of a twig and looked up to see a man approaching her with a camera. He introduced himself as a nature photographer and asked if she had seen the waterfall. They struck up a conversation, and soon they were both laughing and sharing stories of their adventures.
       As the sun began to set, the two of them packed up their gear and said their goodbyes. Sarah felt grateful for this unexpected encounter and the inspiration it brought her. She knew that this moment would stay with her forever, and she felt a sense of serenity knowing that there was still so much beauty in the world waiting to be discovered.
+
+book-text-janitor = [bold][color=black][head=3]The Tales of a Tired Janitor[/head][/bold]
+      Cleaning a space station as a janitor is like being trapped in a cosmic custodial nightmare. You'd think floating through the vastness of space would be glamorous, but no, I'm stuck scrubbing space grime and extraterrestrial goop off the walls. It's a thankless job in a zero-gravity abyss.
+      First off, let's talk about the mess. Space dust, alien gunk, and who knows what else accumulates faster than a rocket launch. It's not just about sweeping up the crumbs; it's about battling interstellar filth that seems to have a life of its own. You'd hope for a sleek, futuristic space station, but you get a swirling vortex of space garbage waiting for you around every corner.
+      And the tools they give us! You'd expect state-of-the-art cleaning gadgets, but nope. They raided a dollar store on Earth before launching us into the cosmos. Mops that barely work in microgravity, spray bottles that run out in one use, and don't even get me started on the space janitor jumpsuit. I feel like a reject from a sci-fi B-movie.
+      Speaking of jumpsuits, the lack of respect is astronomical. The scientists and astronauts zoom past in their sleek suits, utterly oblivious to the fact that I'm the unsung hero keeping this place from turning into a cosmic trash heap. I bet they don't even know my name. "Hey, Space Janitor!" That's what I get. No appreciation for the elbow grease I put into keeping their precious station spick and span.
+      And let's remember the hazards. Cleaning up alien slime? Yeah, that's a regular Tuesday for me. One wrong move and I'm dealing with an intergalactic biohazard. It's like playing Russian roulette with space critters that could burst out of some hidden nook and cranny. I signed up to mop floors, not play host to extraterrestrial invaders.
+      Being a janitor on this so-called Space Station 14 is a cosmic joke. Where did the other 13 stations go? It's not all spacewalks and futuristic gadgets; it's scrubbing toilets and battling alien goo. If anyone thinks space is glamorous, they clearly haven't seen the mess we space janitors deal with every single day. It's time they appreciate the unsung heroes of the space station – the custodians of the cosmos.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl
new file mode 100644
index 0000000000..f2451527b0
--- /dev/null
+++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl
@@ -0,0 +1,16 @@
+cargoproduct-category-name-armory = Armory
+cargoproduct-category-name-atmospherics = Atmospherics
+cargoproduct-category-name-cargo = Cargo
+cargoproduct-category-name-circuitboards = Circuitboards
+cargoproduct-category-name-emergency = Emergency
+cargoproduct-category-name-engineering = Engineering
+cargoproduct-category-name-food = Food
+cargoproduct-category-name-fun = Fun
+cargoproduct-category-name-hydroponics = Hydroponics
+cargoproduct-category-name-livestock = Livestock
+cargoproduct-category-name-materials = Materials
+cargoproduct-category-name-medical = Medical
+cargoproduct-category-name-science = Science
+cargoproduct-category-name-security = Security
+cargoproduct-category-name-service = Service
+cargoproduct-category-name-shuttle = Shuttle
diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl
index 4c8cf5db54..6ce575e648 100644
--- a/Resources/Locale/en-US/speech/speech-chatsan.ftl
+++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl
@@ -114,3 +114,6 @@ chatsan-replacement-41 = what are you doing
 
 chatsan-word-42 = ofc
 chatsan-replacement-42 = of course
+
+chatsan-word-43 = ig
+chatsan-replacement-43 = i guess
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index c097a689dd..7a3564edf6 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -29,3 +29,6 @@ trait-frontal-lisp-desc = You thpeak with a lithp
 
 trait-socialanxiety-name = Social Anxiety
 trait-socialanxiety-desc = You are anxious when you speak and stutter.
+
+trait-snoring-name = Snoring
+trait-snoring-desc = You will snore while sleeping.
diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml
index f040d58253..a10f070bd2 100644
--- a/Resources/Maps/Shuttles/trading_outpost.yml
+++ b/Resources/Maps/Shuttles/trading_outpost.yml
@@ -3,20 +3,20 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  31: FloorDark
-  36: FloorDarkMono
-  39: FloorDarkPavementVertical
-  51: FloorGrassJungle
-  66: FloorMetalDiamond
-  79: FloorReinforced
-  93: FloorSteel
-  104: FloorSteelMono
-  108: FloorTechMaint
-  109: FloorTechMaint2
-  122: FloorWood
-  124: FloorWoodTile
-  125: Lattice
-  126: Plating
+  29: FloorDark
+  34: FloorDarkMono
+  37: FloorDarkPavementVertical
+  49: FloorGrassJungle
+  64: FloorMetalDiamond
+  77: FloorReinforced
+  89: FloorSteel
+  100: FloorSteelMono
+  104: FloorTechMaint
+  105: FloorTechMaint2
+  118: FloorWood
+  119: FloorWoodTile
+  120: Lattice
+  121: Plating
 entities:
 - proto: ""
   entities:
@@ -31,27 +31,27 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: XQAAAAABXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAJAAAAAABJwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAAAJAAAAAABJAAAAAAAJAAAAAAAJAAAAAACJAAAAAABJAAAAAAAJAAAAAAAJAAAAAABJAAAAAACfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAfAAAAAABfAAAAAADfAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAfAAAAAADfAAAAAABfAAAAAABegAAAAACfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAegAAAAADfAAAAAABfAAAAAADfAAAAAADegAAAAADegAAAAACegAAAAADfAAAAAAAfAAAAAABfAAAAAAAegAAAAACJAAAAAADJwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAABegAAAAACegAAAAABegAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: WQAAAAABWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAADWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAIgAAAAABJQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAABIgAAAAAAIgAAAAAAIgAAAAACIgAAAAABIgAAAAAAIgAAAAAAIgAAAAABIgAAAAACeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdwAAAAABdwAAAAADdwAAAAACMQAAAAAAMQAAAAAAMQAAAAAAdwAAAAADdwAAAAABdwAAAAABdgAAAAACeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAADdwAAAAABdwAAAAADdwAAAAADdgAAAAADdgAAAAACdgAAAAADdwAAAAAAdwAAAAABdwAAAAAAdgAAAAACIgAAAAADJQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdgAAAAABdgAAAAACdgAAAAABdgAAAAAAdgAAAAACdgAAAAAAdgAAAAAAdgAAAAABdgAAAAADdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: fgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAAAJAAAAAAAJAAAAAABJAAAAAABJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAADXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAACaAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAXQAAAAABbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAAAaAAAAAACfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAXQAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAABaAAAAAACfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAADTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAACXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADaAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
+          tiles: eQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAIgAAAAABIgAAAAABHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAABIgAAAAACIgAAAAAAIgAAAAAAIgAAAAABIgAAAAABIgAAAAACIgAAAAAAIgAAAAACeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAAAWQAAAAACWQAAAAABWQAAAAABeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAADWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAACZAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAWQAAAAABaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAAAZAAAAAACeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAWQAAAAAAaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAABZAAAAAACeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAADTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAACTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAACWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADZAAAAAADeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJwAAAAACJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJwAAAAADJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJQAAAAACIgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJQAAAAADIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAA
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAJAAAAAABJAAAAAACHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAABJAAAAAADJAAAAAADHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAIgAAAAABIgAAAAACHQAAAAACHQAAAAADHQAAAAABHQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAHQAAAAABHQAAAAACHQAAAAABIgAAAAADIgAAAAADHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -1889,303 +1889,276 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-17.5
       parent: 2
-- proto: CargoPalletBuy
+- proto: CargoPallet
   entities:
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 2
   - uid: 21
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-9.5
+      pos: 8.5,0.5
       parent: 2
   - uid: 24
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-9.5
+      pos: 8.5,-0.5
       parent: 2
   - uid: 25
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-8.5
+      pos: 7.5,-0.5
       parent: 2
   - uid: 26
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-8.5
+      pos: 7.5,-1.5
       parent: 2
   - uid: 27
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-7.5
+      pos: 8.5,-1.5
       parent: 2
   - uid: 30
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-7.5
+      pos: 6.5,0.5
       parent: 2
   - uid: 32
+    components:
+    - type: Transform
+      pos: 2.5,-7.5
+      parent: 2
+  - uid: 34
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-9.5
+      pos: 7.5,-7.5
       parent: 2
   - uid: 35
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-7.5
       parent: 2
   - uid: 36
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-1.5
       parent: 2
   - uid: 37
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-7.5
+      pos: 8.5,-9.5
       parent: 2
   - uid: 39
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-8.5
       parent: 2
   - uid: 41
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-8.5
       parent: 2
   - uid: 42
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-8.5
       parent: 2
   - uid: 43
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-9.5
       parent: 2
   - uid: 44
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-0.5
       parent: 2
-  - uid: 47
+  - uid: 45
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-8.5
       parent: 2
-  - uid: 49
+  - uid: 46
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-6.5
       parent: 2
-  - uid: 50
+  - uid: 47
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-9.5
       parent: 2
-  - uid: 56
+  - uid: 48
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-6.5
+      pos: 6.5,-7.5
       parent: 2
-  - uid: 61
+  - uid: 49
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-8.5
+      pos: 7.5,-9.5
       parent: 2
-  - uid: 67
+  - uid: 50
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-6.5
+      pos: 3.5,-7.5
       parent: 2
-  - uid: 71
+  - uid: 51
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-6.5
+      pos: 3.5,-9.5
       parent: 2
-  - uid: 183
+  - uid: 52
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,0.5
+      pos: 3.5,-8.5
       parent: 2
-  - uid: 900
+  - uid: 54
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-7.5
       parent: 2
-- proto: CargoPalletSell
-  entities:
-  - uid: 34
+  - uid: 55
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-0.5
+      pos: 6.5,-2.5
       parent: 2
-  - uid: 45
+  - uid: 56
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-7.5
+      pos: 3.5,-1.5
       parent: 2
-  - uid: 46
+  - uid: 57
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-2.5
+      pos: 2.5,-8.5
       parent: 2
-  - uid: 48
+  - uid: 58
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-2.5
+      pos: 3.5,-0.5
       parent: 2
-  - uid: 51
+  - uid: 59
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-1.5
+      pos: 3.5,0.5
       parent: 2
-  - uid: 52
+  - uid: 60
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-2.5
+      pos: 6.5,-0.5
       parent: 2
-  - uid: 54
+  - uid: 61
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-9.5
+      pos: 2.5,-9.5
       parent: 2
-  - uid: 55
+  - uid: 66
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-1.5
-      parent: 2
-  - uid: 57
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-9.5
+      pos: 7.5,-2.5
       parent: 2
-  - uid: 58
+  - uid: 67
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,0.5
+      pos: 2.5,-2.5
       parent: 2
-  - uid: 59
+  - uid: 68
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-6.5
+      pos: 2.5,-1.5
       parent: 2
-  - uid: 60
+  - uid: 69
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
       parent: 2
-  - uid: 66
+  - uid: 70
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 3.5,0.5
+      pos: 8.5,-2.5
       parent: 2
-  - uid: 68
+  - uid: 71
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-8.5
+      pos: 2.5,-0.5
       parent: 2
-  - uid: 69
+  - uid: 72
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-8.5
+      pos: 2.5,0.5
       parent: 2
-  - uid: 70
+  - uid: 73
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-6.5
       parent: 2
-  - uid: 72
+  - uid: 183
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: -1.5707963267948966 rad
       pos: 7.5,-6.5
       parent: 2
-  - uid: 73
+  - uid: 900
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-6.5
       parent: 2
   - uid: 901
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
+      pos: 2.5,-6.5
       parent: 2
   - uid: 903
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 3.5,-0.5
+      pos: 4.5,0.5
       parent: 2
   - uid: 907
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-6.5
       parent: 2
   - uid: 908
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,-1.5
+      pos: 4.5,-2.5
       parent: 2
   - uid: 909
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-8.5
-      parent: 2
-  - uid: 960
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-7.5
-      parent: 2
-  - uid: 961
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,0.5
+      pos: 4.5,-1.5
       parent: 2
 - proto: CarpetBlack
   entities:
diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml
index 147aebb5c5..92b3d7de9b 100644
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -1,4 +1,4 @@
-# Accents that work off of word replacements.
+# Accents that work off of word replacements.
 
 # this is kind of dumb but localization demands it.
 # i guess you could just specify the prefix ('mobster') and count and let the system fill it
@@ -263,7 +263,7 @@
     accent-pirate-replaced-30: accent-pirate-replacement-30
     accent-pirate-replaced-31: accent-pirate-replacement-31
     accent-pirate-replaced-32: accent-pirate-replacement-32
-    
+
 - type: accent
   id: cowboy
   wordReplacements:
@@ -366,7 +366,7 @@
     accent-cowboy-words-97: accent-cowboy-replacement-97
     accent-cowboy-words-98: accent-cowboy-replacement-98
     accent-cowboy-words-99: accent-cowboy-replacement-99
-  
+
 
 # For the chat sanitization system
 - type: accent
@@ -409,8 +409,9 @@
     # chatsan-word-35: chatsan-replacement-35
     # chatsan-word-36: chatsan-replacement-36
     chatsan-word-37: chatsan-replacement-37
-    # chatsan-word-38: chatsan-replacement-38
-    # chatsan-word-39: chatsan-replacement-etcetera
-    # chatsan-word-40: chatsan-replacement-etcetera
-    # chatsan-word-41: chatsan-replacement-41
-    # chatsan-word-42: chatsan-replacement-42
+    chatsan-word-38: chatsan-replacement-38
+    chatsan-word-39: chatsan-replacement-etcetera
+    chatsan-word-40: chatsan-replacement-etcetera
+    chatsan-word-41: chatsan-replacement-41
+    chatsan-word-42: chatsan-replacement-42
+    chatsan-word-43: chatsan-replacement-43
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index b91b26e357..22f16bd956 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -120,7 +120,7 @@
     priority: -20
     icon:
       sprite: Objects/Devices/communication.rsi
-      state: old-radio
+      state: radio
     event: !type:OpenUplinkImplantEvent
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
index 399181b4fa..6341042bf8 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -5,7 +5,7 @@
     state: icon
   product: CrateArmorySMG
   cost: 9000
-  category: Armory
+  category: cargoproduct-category-name-armory
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: icon
   product: CrateArmoryShotgun
   cost: 7000
-  category: Armory
+  category: cargoproduct-category-name-armory
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: implanter0
   product: CrateTrackingImplants
   cost: 1000
-  category: Armory
+  category: cargoproduct-category-name-armory
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: training-bomb
   product: CrateTrainingBombs
   cost: 3000
-  category: Armory
+  category: cargoproduct-category-name-armory
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: icon
   product: CrateArmoryLaser
   cost: 4800
-  category: Armory
+  category: cargoproduct-category-name-armory
   group: market
 
 - type: cargoProduct
@@ -55,5 +55,5 @@
     state: icon
   product: CrateArmoryPistols
   cost: 5200
-  category: Armory
+  category: cargoproduct-category-name-armory
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
index 0aa4938399..c85210adf6 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
@@ -5,7 +5,7 @@
     state: grey
   product: AirCanister
   cost: 1100
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: blue
   product: OxygenCanister
   cost: 1100
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: blue
   product: LiquidOxygenCanister
   cost: 2500
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: red
   product: NitrogenCanister
   cost: 1100
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: red
   product: LiquidNitrogenCanister
   cost: 2500
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: black
   product: CarbonDioxideCanister
   cost: 2200 # Until someone fixes it co2 can be used to oneshot people so it's more expensive
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: black
   product: LiquidCarbonDioxideCanister
   cost: 4000
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: yellow
   product: StorageCanister
   cost: 1010 # No gases in it so it's cheaper
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 #- type: cargoProduct
@@ -87,7 +87,7 @@
 #    state: water_vapor
 #  product: WaterVaporCanister
 #  cost: 2600
-#  category: Atmospherics
+#  category: cargoproduct-category-name-atmospherics
 #  group: market
 
 - type: cargoProduct
@@ -97,7 +97,7 @@
     state: orange
   product: PlasmaCanister
   cost: 4000
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 #- type: cargoProduct
@@ -109,5 +109,5 @@
 #    state: green
 #  product: TritiumCanister
 #  cost: 15500
-#  category: Atmospherics
+#  category: cargoproduct-category-name-atmospherics
 #  group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
index 4a80b76a3f..a6671ff099 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
@@ -5,7 +5,7 @@
     state: seed
   product: CrateHydroponicsSeedsExotic
   cost: 1000
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: seed
   product: CrateHydroponicsSeedsMedicinal
   cost: 500
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: icon
   product: CrateHydroponicsTools
   cost: 500
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: seed
   product: CrateHydroponicsSeeds
   cost: 550
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
 
 - type: cargoProduct
@@ -45,5 +45,5 @@
     state: jug
   product: CratePlantBGone
   cost: 750
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
index 9dac47b6f1..fb3b2da41a 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
@@ -15,7 +15,7 @@
     state: orebox
   product: OreBox
   cost: 500
-  category: Logistics # DeltaV - Logistics Department replacing Cargo
+  category: cargoproduct-category-name-cargo
   group: market
 
 - type: cargoProduct
@@ -25,5 +25,5 @@
     state: icon
   product: CrateCargoLuxuryHardsuit
   cost: 15000
-  category: Logistics # DeltaV - Logistics Department replacing Cargo
+  category: cargoproduct-category-name-cargo
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
index 0af5b5db01..a96780fc3e 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
@@ -5,5 +5,5 @@
     state: cpuboard
   product: CrateCrewMonitoringBoards
   cost: 2000
-  category: Circuitboards
+  category: cargoproduct-category-name-circuitboards
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
index 2777f859a0..2715e0c350 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
@@ -5,7 +5,7 @@
     state: icon
   product: CrateEmergencyExplosive
   cost: 650
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: fire_extinguisher_closed
   product: CrateEmergencyFire
   cost: 1500
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: icon
   product: CrateEmergencyInternals
   cost: 500
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon
   product: CrateEmergencyInternalsLarge
   cost: 2000
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: radiation
   product: CrateEmergencyRadiation
   cost: 1000
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: item_wall
   product: CrateEmergencyInflatablewall
   cost: 500
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: icon
   product: CrateSlimepersonLifeSupport
   cost: 300
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -75,5 +75,5 @@
     state: icon
   product: CrateGenericBiosuit
   cost: 800
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
index b5468fd982..754e30f133 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
@@ -5,7 +5,7 @@
     state: coillv-30
   product: CrateEngineeringCableLV
   cost: 300
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: coilmv-30
   product: CrateEngineeringCableMV
   cost: 300
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: coilhv-30
   product: CrateEngineeringCableHV
   cost: 300
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: coilall-30
   product: CrateEngineeringCableBulk
   cost: 750
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: icon
   product: CrateEngineeringElectricalSupplies
   cost: 4500
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: icon
   product: CrateEngineeringStationBeaconBundle
   cost: 500
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: icon
   product: CrateEngineeringJetpack
   cost: 1000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: icon
   product: CrateEngineeringMiniJetpack
   cost: 750
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: icon
   product: CrateAirlockKit
   cost: 1100
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: icon
   product: CrateEvaKit
   cost: 5000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: ammo
   product: CrateRCDAmmo
   cost: 2500
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: icon
   product: CrateRCD
   cost: 800
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: base
   product: CrateParticleDecelerators
   cost: 15000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -135,5 +135,5 @@
     state: sheaterOff
   product: SpaceHeaterAnchored
   cost: 300
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
index ece817b746..bd00b0c2d4 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -5,7 +5,7 @@
     state: jar
   product: CrateEngineeringAMEJar
   cost: 2000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: icon
   product: CrateEngineeringSingularityGenerator
   cost: 4000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: icon
   product: CrateEngineeringSingularityContainment
   cost: 1000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 #- type: cargoProduct
@@ -37,7 +37,7 @@
 #    state: emitter2
 #  product: CrateEngineeringSingularityEmitter
 #  cost: 3000
-#  category: Engineering
+#  category: cargoproduct-category-name-engineering
 #  group: market
 
 - type: cargoProduct
@@ -47,7 +47,7 @@
     state: ca_on
   product: CrateEngineeringSingularityCollector
   cost: 1000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -57,7 +57,7 @@
     state: completed
   product: CrateEngineeringParticleAccelerator
   cost: 2000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -67,18 +67,18 @@
     state: solar-assembly-part
   product: CrateEngineeringSolar
   cost: 500
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
-#- type: cargoProduct
-#  id: EngineTeslaGenerator
-#  icon:
-#    sprite: Structures/Power/Generation/Tesla/generator.rsi
-#    state: icon
-#  product: CrateEngineeringTeslaGenerator
-#  cost: 4000
-#  category: Engineering
-#  group: market
+- type: cargoProduct
+  id: EngineTeslaGenerator
+  icon:
+    sprite: Structures/Power/Generation/Tesla/generator.rsi
+    state: icon
+  product: CrateEngineeringTeslaGenerator
+  cost: 4000
+  category: cargoproduct-category-name-engineering
+  group: market
 
 - type: cargoProduct
   id: EngineTeslaCoil
@@ -87,7 +87,7 @@
     state: coil
   product: CrateEngineeringTeslaCoil
   cost: 1200
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -97,5 +97,5 @@
     state: grounding_rod
   product: CrateEngineeringTeslaGroundingRod
   cost: 400
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
index e506995929..1a6f838096 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
@@ -5,7 +5,7 @@
     state: margherita-slice
   product: CrateFoodPizza
   cost: 450
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: margherita
   product: CrateFoodPizzaLarge
   cost: 1800
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: nutribrick
   product: CrateFoodMRE
   cost: 1000
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: flour-big
   product: CrateFoodCooking
   cost: 750
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: tin
   product: CrateFoodDinnerware
   cost: 750
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: icon
   product: CrateFoodBarSupply
   cost: 750
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: icon
   product: CrateFoodSoftdrinks
   cost: 1200
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -75,5 +75,5 @@
     state: icon
   product: CrateFoodSoftdrinksLarge
   cost: 2400
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index d84fedd543..c29458a1ee 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -5,7 +5,7 @@
     state: icon
   product: CrateFunInstrumentsVariety
   cost: 2000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: tuba
   product: CrateFunInstrumentsBrass
   cost: 2500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: icon
   product: CrateFunInstrumentsString
   cost: 2500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon
   product: CrateFunInstrumentsWoodwind
   cost: 2500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: icon
   product: CrateFunInstrumentsKeyedPercussion
   cost: 2500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: icon
   product: CrateFunInstrumentsSpecial
   cost: 10000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: box
   product: CrateFunArtSupplies
   cost: 500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: birthday
   product: CrateFunParty
   cost: 1000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: display
   product: CrateFunWaterGuns
   cost: 750
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: plushie_h
   product: CrateFunPlushie
   cost: 1000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: plushie_lizard
   product: CrateFunLizardPlushieBulk
   cost: 500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: d6_6
   product: CrateFunBoardGames
   cost: 1500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: implanter0
   product: CrateFunSadTromboneImplants
   cost: 1000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -145,7 +145,7 @@
     state: implanter0
   product: CrateFunLightImplants
   cost: 1000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -155,7 +155,7 @@
     state: icon
   product: CrateFunBoxing
   cost: 500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -165,7 +165,7 @@
     state: crate_icon
   product: CrateFunPirate
   cost: 400
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -175,7 +175,7 @@
     state: crate_icon
   product: CrateFunToyBox
   cost: 900
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -185,7 +185,7 @@
     state: implanter0
   product: CrateFunBikeHornImplants
   cost: 1000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -195,7 +195,7 @@
     state: fig_box
   product: CrateFunMysteryFigurines
   cost: 4000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -205,15 +205,15 @@
     state: icon
   product: CrateFunDartsSet
   cost: 900
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
-#- type: cargoProduct
-#  id: FunCrateGambling
-#  icon:
-#    sprite: Objects/Economy/cash.rsi
-#    state: cash_1000000
-#  product: CrateCargoGambling
-#  cost: 10000
-#  category: Fun
-#  group: market
+- type: cargoProduct
+  id: FunCrateGambling
+  icon:
+    sprite: Objects/Economy/cash.rsi
+    state: cash_1000000
+  product: CrateCargoGambling
+  cost: 10000
+  category: cargoproduct-category-name-fun
+  group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index 6ef0ab4e21..922e2951b6 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -5,7 +5,7 @@
     state: 0
   product: CrateNPCBee
   cost: 7000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: butterfly
   product: CrateNPCButterflies
   cost: 4400
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: cat
   product: CrateNPCCat
   cost: 1200
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon-1
   product: CrateNPCChicken
   cost: 4000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: crab
   product: CrateNPCCrab
   cost: 3000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: icon-0
   product: CrateNPCDuck
   cost: 6000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: corgi
   product: CrateNPCCorgi
   cost: 1200
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: puppy
   product: CrateNPCPuppyCorgi
   cost: 1200
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: cow
   product: CrateNPCCow
   cost: 3200
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: goat
   product: CrateNPCGoat
   cost: 1200
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: goose
   product: CrateNPCGoose
   cost: 2100
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: icon
   product: CrateNPCGorilla
   cost: 1100
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: box
   product: CrateNPCMonkeyCube
   cost: 2000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: box_kobold
   product: CrateNPCKoboldCube
   cost: 2000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -145,7 +145,7 @@
     state: icon-0
   product: CrateNPCMouse
   cost: 4400
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -155,7 +155,7 @@
     state: parrot
   product: CrateNPCParrot
   cost: 3000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -165,7 +165,7 @@
     state: penguin
   product: CrateNPCPenguin
   cost: 2100
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -175,7 +175,7 @@
     state: pig
   product: CrateNPCPig
   cost: 1100
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -185,7 +185,7 @@
     state: snake
   product: CrateNPCSnake
   cost: 3000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -195,7 +195,7 @@
     state: icon-0
   product: CrateNPCHamster
   cost: 2800
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -205,7 +205,7 @@
     state: lizard
   product: CrateNPCLizard
   cost: 1100
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -215,7 +215,7 @@
     state: kangaroo
   product: CrateNPCKangaroo
   cost: 2800
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -225,5 +225,5 @@
     state: mothroach
   product: CrateNPCMothroach
   cost: 5000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
index e3b07af13b..6f945001d9 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
@@ -5,7 +5,7 @@
     state: glass_3
   product: CrateMaterialGlass
   cost: 1000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: steel_3
   product: CrateMaterialSteel
   cost: 1000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: plastic_3
   product: CrateMaterialPlastic
   cost: 1500
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: brass_3
   product: CrateMaterialBrass
   cost: 2500
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: plasteel_3
   product: CrateMaterialPlasteel
   cost: 3000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: cloth_3
   product: CrateMaterialTextiles
   cost: 1000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: plasma_3
   product: CrateMaterialPlasma
   cost: 2000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: cardboard_3
   product: CrateMaterialCardboard
   cost: 750
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: paper_3
   product: CrateMaterialPaper
   cost: 1000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: fueltank
   product: WeldingFuelTankFull
   cost: 1500
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -105,5 +105,5 @@
     state: watertank
   product: WaterTankFull
   cost: 1000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
index 01a7192b35..1addf523e4 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
@@ -5,7 +5,7 @@
     state: firstaid
   product: CrateMedicalSupplies
   cost: 2400
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: beaker
   product: CrateChemistrySupplies
   cost: 750
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: vial
   product: CrateChemistryVials
   cost: 1000
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: burnkit
   product: CrateEmergencyBurnKit
   cost: 700
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: toxinkit
   product: CrateEmergencyToxinKit
   cost: 600
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: o2kit
   product: CrateEmergencyO2Kit
   cost: 600
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: brutekit
   product: CrateEmergencyBruteKit
   cost: 600
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: advkit
   product: CrateEmergencyAdvancedKit
   cost: 1200
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: radkit
   product: CrateEmergencyRadiationKit
   cost: 600
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: bag_folded
   product: CrateBodyBags
   cost: 700
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: icon
   product: CrateVirologyBiosuit
   cost: 800
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: implanter0
   product: CrateMindShieldImplants
   cost: 3000
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: icon
   product: CrateChemistryP
   cost: 850
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: icon
   product: CrateChemistryS
   cost: 750
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -145,5 +145,5 @@
     state: icon
   product: CrateChemistryD
   cost: 750
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
index f370155e07..756a223e74 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
@@ -5,7 +5,7 @@
     state: artifact_container_icon
   product: CrateArtifactContainer
   cost: 500
-  category: Epistemics # DeltaV - Epistemics Department replacing Science
+  category: cargoproduct-category-name-science
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: ano13
   product: RandomArtifactSpawner
   cost: 2000
-  category: Epistemics # DeltaV - Epistemics Department replacing Science
+  category: cargoproduct-category-name-science
   group: market
 
 - type: cargoProduct
@@ -25,5 +25,5 @@
     state: icon
   product: CrateScienceBiosuit
   cost: 800
-  category: Epistemics # DeltaV - Epistemics Department replacing Science
+  category: cargoproduct-category-name-science
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
index a616202bdb..2ad7628ddb 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
@@ -4,8 +4,8 @@
     sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi # DeltaV - resprite
     state: icon
   product: CrateSecurityArmor
-  cost: 1000 # DeltaV - raise price for buffed armour
-  category: Security
+  cost: 800
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: icon
   product: CrateSecurityHelmet
   cost: 550
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: base
   product: CrateSecurityNonlethal
   cost: 4000
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon
   product: CrateSecurityRiot
   cost: 5500
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: box_security
   product: CrateSecuritySupplies
   cost: 500
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: handcuff
   product: CrateRestraints
   cost: 1000
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: icon
   product: CrateSecurityBiosuit
   cost: 800
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -75,5 +75,5 @@
     state: idle
   product: DeployableBarrier
   cost: 1000
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index a2c0af9ce7..f27adb65a4 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -5,7 +5,7 @@
     state: cleaner
   product: CrateServiceJanitorialSupplies
   cost: 560
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: normal
   product: CrateServiceReplacementLights
   cost: 600
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: mousetrap
   product: CrateMousetrapBoxes
   cost: 500
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon
   product: CrateServiceTheatre
   cost: 1800
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: closed
   product: CrateServiceSmokeables
   cost: 1500
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: closed
   product: CrateServiceCustomSmokable
   cost: 1000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: pen
   product: CrateServiceBureaucracy
   cost: 1000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: default
   product: CrateServicePersonnel
   cost: 1000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: book0
   product: CrateServiceBooks
   cost: 1000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: book_engineering2
   product: CrateServiceGuidebooks
   cost: 1300
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: icon
   product: CrateServiceSodaDispenser
   cost: 850
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: icon
   product: CrateServiceBoozeDispenser
   cost: 750
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: box
   product: CrateServiceBox
   cost: 400
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: icon
   product: CrateJanitorBiosuit
   cost: 800
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -145,7 +145,7 @@
     state: icon-hot
   product: FoodCartHot
   cost: 2000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -155,7 +155,7 @@
     state: icon-cold
   product: FoodCartCold
   cost: 2000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -165,7 +165,7 @@
     state: icon
   product: PetCarrier
   cost: 500
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -175,7 +175,7 @@
     state: icon
   product: CrateJanitorExplosive
   cost: 1000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -185,6 +185,6 @@
     state: icon-cart
   product: JanitorialTrolley
   cost: 300
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
index 96a193881e..278104caed 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
@@ -5,7 +5,7 @@
     state: base
   product: CrateEngineeringThruster
   cost: 1500
-  category: Shuttle
+  category: cargoproduct-category-name-shuttle
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: base
   product: CrateEngineeringGyroscope
   cost: 4000
-  category: Shuttle
+  category: cargoproduct-category-name-shuttle
   group: market
 
 # - type: cargoProduct
@@ -25,6 +25,6 @@
     # state: avionics-systems
   # product: CrateEngineeringShuttle
   # cost: 3000
-  # category: Shuttle
+  # category: cargoproduct-category-name-shuttle
   # group: market
 #  locked: true   # only the QM has permission to order by default
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index d0ae444bf7..3e303c3212 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -13,7 +13,7 @@
     state: base
   product: CrateVendingMachineRestockBoozeFilled
   cost: 3500
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -24,7 +24,7 @@
     state: base
   product: CrateVendingMachineRestockChefvendFilled
   cost: 680
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -44,7 +44,7 @@
     state: base
   product: CrateVendingMachineRestockDinnerwareFilled
   cost: 2000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: base
   product: CrateVendingMachineRestockCondimentStationFilled
   cost: 300
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: base
   product: CrateVendingMachineRestockEngineeringFilled
   cost: 3200
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: base
   product: CrateVendingMachineRestockGamesFilled
   cost: 750
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: base
   product: CrateVendingMachineRestockHotDrinksFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: base
   product: CrateVendingMachineRestockMedicalFilled
   cost: 1750
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -104,8 +104,8 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockChemVendFilled
-  cost: 6300 #Delta V - was 3820, see rebase PR #53
-  category: Medical
+  cost: 3820
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: base
   product: CrateVendingMachineRestockNutriMaxFilled
   cost: 2400
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: base
   product: CrateVendingMachineRestockPTechFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: base
   product: CrateVendingMachineRestockRobustSoftdrinksFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -145,7 +145,7 @@
     state: base
   product: CrateVendingMachineRestockSalvageEquipmentFilled
   cost: 1000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -155,7 +155,7 @@
     state: base
   product: CrateVendingMachineRestockSecTechFilled
   cost: 2200
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -165,7 +165,7 @@
     state: base
   product: CrateVendingMachineRestockSeedsFilled
   cost: 3375
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
 
 - type: cargoProduct
@@ -175,7 +175,7 @@
     state: base
   product: CrateVendingMachineRestockSmokesFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -185,7 +185,7 @@
     state: base
   product: CrateVendingMachineRestockVendomatFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -195,7 +195,7 @@
     state: base
   product: CrateVendingMachineRestockRoboticsFilled
   cost: 1600
-  category: Epistemics # DeltaV - Epistemics Department replacing Science
+  category: cargoproduct-category-name-science
   group: market
 
 - type: cargoProduct
@@ -205,7 +205,7 @@
     state: base
   product: CrateVendingMachineRestockTankDispenserFilled
   cost: 1000
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -215,7 +215,7 @@
     state: base
   product: CrateVendingMachineRestockHappyHonkFilled
   cost: 2100
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -225,7 +225,7 @@
     state: base
   product: CrateVendingMachineRestockGetmoreChocolateCorpFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -235,7 +235,7 @@
     state: base
   product: CrateVendingMachineRestockChangFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -245,7 +245,7 @@
     state: base
   product: CrateVendingMachineRestockDiscountDansFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -255,5 +255,5 @@
     state: base
   product: CrateVendingMachineRestockDonutFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 92e4032b0c..bb21bc36d4 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -87,6 +87,7 @@
     ClothingShoesBootsCowboyBrown: 1
     ClothingShoesBootsCowboyBlack: 1
     ClothingShoesBootsCowboyWhite: 1
+    ClothingMaskNeckGaiterRed: 2
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingShoesBootsCowboyFancy: 1
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 7f64ebbd23..1e81cdf2dd 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -428,7 +428,7 @@
   name: uplink-reinforcement-radio-name
   description: uplink-reinforcement-radio-desc
   productEntity: ReinforcementRadioSyndicate
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
   cost:
     Telecrystal: 16
   categories:
@@ -444,7 +444,7 @@
   name: uplink-reinforcement-radio-name
   description: uplink-reinforcement-radio-desc
   productEntity: ReinforcementRadioSyndicateNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
   cost:
     Telecrystal: 16
   categories:
@@ -476,7 +476,7 @@
   name: uplink-reinforcement-radio-monkey-name
   description: uplink-reinforcement-radio-monkey-desc
   productEntity: ReinforcementRadioSyndicateMonkey
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
   cost:
     Telecrystal: 8
   categories:
@@ -492,9 +492,9 @@
   name: uplink-reinforcement-radio-monkey-name
   description: uplink-reinforcement-radio-monkey-desc
   productEntity: ReinforcementRadioSyndicateMonkeyNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
   cost:
-    Telecrystal: 8
+    Telecrystal: 6
   categories:
   - UplinkUtility
   conditions:
@@ -724,7 +724,7 @@
   id: UplinkUplinkImplanter # uplink uplink real
   name: uplink-uplink-implanter-name
   description: uplink-uplink-implanter-desc
-  icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: radio }
   productEntity: UplinkImplanter
   cost:
     Telecrystal: 2
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
index 92615131f0..e932974a0f 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
@@ -66,6 +66,11 @@
   - type: Tag
     tags:
     - VimPilot
+  - type: LanguageSpeaker
+    speaks:
+    - Fox
+    understands:
+    - Fox
 
 - type: entity
   name: security dog
@@ -154,8 +159,6 @@
     spawned:
     - id: FoodMeat
       amount: 2
-  - type: ReplacementAccent
-    accent: dog
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-dog
@@ -176,3 +179,9 @@
     tags:
     - DoorBumpOpener
     - VimPilot
+  - type: LanguageSpeaker
+    speaks:
+    - Dog
+    understands:
+    - Dog
+    - GalacticCommon
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
index 4f255cad21..fa51b99325 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -84,10 +84,7 @@
   - type: PotentialPsionic
   - type: Psionic
     removable: false
-    amplification: 4
-    psychicFeedback:
-    - "ifrit-feedback"
-  - type: PyrokinesisPower
+  # - type: PyrokinesisPower # Pending psionic rework
   - type: Grammar
     attributes:
       proper: true
@@ -98,6 +95,11 @@
     factions:
     - PsionicInterloper
     - NanoTrasen
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    understands:
+    - GalacticCommon
   - type: GhostTakeoverAvailable
   - type: GhostRole
     makeSentient: true
@@ -106,7 +108,7 @@
     requirements:
     - !type:DepartmentTimeRequirement
       department: Epistemics
-      time: 14400
+      time: 14400 # DeltaV - 4 hours
 
 - type: entity
   parent: WelderExperimental
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
index 96950317c1..c2ae33ec0b 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
@@ -96,8 +96,12 @@
     spawned:
     - id: FoodMeat
       amount: 1
-  - type: ReplacementAccent
-    accent: mouse
+  - type: LanguageSpeaker
+    speaks:
+    - Mouse
+    understands:
+    - Mouse
+    - GalacticCommon
   - type: Tag
     tags:
     - VimPilot
@@ -163,4 +167,4 @@
     interactFailureString: petting-failure-nukie-mouse
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
-      path: /Audio/Animals/mouse_squeak.ogg
\ No newline at end of file
+      path: /Audio/Animals/mouse_squeak.ogg
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
index e2541def03..1f4eb696c6 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
@@ -26,3 +26,4 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
+  - type: PotentialPsionic
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
index ea2357a5c0..06abe8c45f 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
@@ -24,6 +24,7 @@
     - type: NpcFactionMember
       factions:
         - NanoTrasen
+    - type: PotentialPsionic
     - type: Respirator
       damage:
        types:
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index a4498299c9..18437e074d 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -122,12 +122,19 @@
   - type: MovementSpeedModifier
     baseWalkSpeed: 2.5
     baseSprintSpeed: 5.0
-  - type: Inventory 
+  - type: Inventory
     speciesId: harpy
     templateId: digitigrade
   - type: HarpyVisuals
   - type: UltraVision
-    
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - SolCommon
+    understands:
+    - GalacticCommon
+    - SolCommon
+
 - type: entity
   save: false
   name: Urist McHands
@@ -138,7 +145,7 @@
   components:
   - type: HumanoidAppearance
     species: Harpy
-  - type: Inventory 
+  - type: Inventory
     speciesId: harpy
   - type: Sprite
     scale: 0.9, 0.9
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
index 4a187d51b3..52853d696a 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
@@ -97,6 +97,13 @@
       Female: FemaleVulpkanin
       Unsexed: MaleVulpkanin
   - type: DogVision
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - Canilunzt
+    understands:
+    - GalacticCommon
+    - Canilunzt
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 43d6c7c9b7..c845d7cc4a 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -809,8 +809,8 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatMagician
-  name: magician's top hat.
-  description: "A magician's top hat."
+  name: magician's tophat
+  description: "A magician's tophat."
   components:
   - type: Icon
     sprite: Clothing/Head/Hats/magician.rsi
@@ -827,6 +827,7 @@
   - type: Item
     size: Small
     sprite: Clothing/Head/Hats/magician.rsi
+    storedRotation: 0
   - type: Storage
     grid:
     - 0,0,0,0
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 1f70211caa..ad738792a7 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -514,6 +514,16 @@
     tags:
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingMaskNeckGaiter
+  id: ClothingMaskNeckGaiterRed
+  name: red neck gaiter
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/neckgaiterred.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/neckgaiterred.rsi
+
 - type: entity
   parent: ClothingMaskClownBase
   id: ClothingMaskSexyClown
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index aa4a7b50e6..f3610178b9 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -549,9 +549,9 @@
   description: A cozy jacket with the Cybersun logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -560,9 +560,9 @@
   description: A cozy jacket with the Einstein Engines logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -571,9 +571,9 @@
   description: A cozy jacket with the Hephaestus Industries logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -582,9 +582,9 @@
   description: A cozy jacket with the Hawkmoon Acquisitions logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -593,9 +593,9 @@
   description: A cozy jacket with the Interdyne logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -604,9 +604,9 @@
   description: A cozy jacket with the Bishop Cybernetics logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -615,9 +615,9 @@
   description: A cozy jacket with the Discount Dan's logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -626,9 +626,9 @@
   description: A cozy jacket with the Five Points Armory logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -637,9 +637,9 @@
   description: A cozy jacket with the Gilthari Exports logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -648,6 +648,6 @@
   description: A cozy jacket with the Zeng-Hu Pharmaceuticals logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
index ee1708caef..d1f6e083f4 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -47,6 +47,9 @@
       collection: FootstepDuck
       params:
         variation: 0.07
+  - type: Construction
+    graph: ClothingShoeSlippersDuck
+    node: shoes
 
 - type: entity
   parent: ClothingShoesBaseButcherable
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index dec46df0b5..0645e451af 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -213,6 +213,13 @@
     visMask:
       - PsionicInvisibility
       - Normal
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - RobotTalk
+    understands:
+    - GalacticCommon
+    - RobotTalk
 
 - type: entity
   id: BaseBorgChassisNT
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 378b3f8a9d..369544fdc1 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -48,8 +48,11 @@
     flavorKind: station-event-random-sentience-flavor-organic
   - type: Bloodstream
     bloodMaxVolume: 50
-  - type: ReplacementAccent
-    accent: mouse
+  - type: LanguageSpeaker
+    speaks:
+    - Mouse
+    understands:
+    - Mouse
   - type: MeleeWeapon
     soundHit:
         path: /Audio/Effects/bite.ogg
@@ -229,8 +232,11 @@
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
-  - type: ReplacementAccent
-    accent: chicken
+  - type: LanguageSpeaker
+    speaks:
+    - Chicken
+    understands:
+    - Chicken
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
   - type: NpcFactionMember
@@ -504,8 +510,11 @@
       prob: 0.5
   - type: Extractable
     grindableSolutionName: food
-  - type: ReplacementAccent
-    accent: mothroach
+  - type: LanguageSpeaker
+    speaks:
+    - Moffic
+    understands:
+    - Moffic
   - type: ZombieAccentOverride
     accent: zombieMoth
   - type: Vocal
@@ -601,8 +610,11 @@
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
-  - type: ReplacementAccent
-    accent: duck
+  - type: LanguageSpeaker
+    speaks:
+    - Duck
+    understands:
+    - Duck
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
   - type: NpcFactionMember
@@ -839,8 +851,11 @@
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Voice/Arachnid/arachnid_chitter.ogg
-  - type: ReplacementAccent
-    accent: crab
+  - type: LanguageSpeaker
+    speaks:
+    - Crab
+    understands:
+    - Crab
   - type: Bloodstream
     bloodMaxVolume: 50
     bloodReagent: CopperBlood
@@ -1076,8 +1091,11 @@
   - type: Inventory
     speciesId: kangaroo
     templateId: kangaroo
-  - type: ReplacementAccent
-    accent: kangaroo
+  - type: LanguageSpeaker
+    speaks:
+    - Kangaroo
+    understands:
+    - Kangaroo
   - type: InventorySlots
   - type: Strippable
   - type: Butcherable
@@ -1266,7 +1284,12 @@
   - type: Speech
     speechSounds: Monkey
     speechVerb: Monkey
-  - type: MonkeyAccent
+  - type: LanguageSpeaker
+    speaks:
+    - Monkey
+    understands:
+    - Monkey
+    - Kobold
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-primate
   - type: AlwaysRevolutionaryConvertible
@@ -1300,7 +1323,13 @@
   - type: Speech
     speechSounds: Monkey
     speechVerb: Monkey
-  - type: MonkeyAccent
+  - type: LanguageSpeaker
+    speaks:
+    - Monkey
+    understands:
+    - Monkey
+    - Kobold
+    - GalacticCommon
   - type: NpcFactionMember
     factions:
     - Syndicate
@@ -1339,8 +1368,12 @@
   - type: NameIdentifier
     group: Kobold
   - type: LizardAccent
-  - type: ReplacementAccent
-    accent: kobold
+  - type: LanguageSpeaker
+    speaks:
+    - Kobold
+    understands:
+    - Kobold
+    - Monkey
   - type: Speech
     speechSounds: Lizard
     speechVerb: Reptilian
@@ -1568,8 +1601,11 @@
     spawned:
     - id: FoodMeatRat
       amount: 1
-  - type: ReplacementAccent
-    accent: mouse
+  - type: LanguageSpeaker
+    speaks:
+    - Mouse
+    understands:
+    - Mouse
   - type: Tag
     tags:
     - Trash
@@ -1894,6 +1930,11 @@
       path: /Audio/Animals/parrot_raught.ogg
   - type: Bloodstream
     bloodMaxVolume: 50
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    understands:
+    - GalacticCommon
 
 - type: entity
   name: penguin
@@ -2140,8 +2181,11 @@
   - type: MeleeChemicalInjector
     transferAmount: 0.75
     solution: melee
-  - type: ReplacementAccent
-    accent: xeno
+  - type: LanguageSpeaker
+    speaks:
+    - Xeno
+    understands:
+    - Xeno
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-tarantula
@@ -2472,6 +2516,11 @@
   - type: Tag
     tags:
     - VimPilot
+  - type: LanguageSpeaker
+    speaks:
+    - Fox
+    understands:
+    - Fox
 
 - type: entity
   name: corgi
@@ -2518,8 +2567,11 @@
     spawned:
     - id: FoodMeat
       amount: 2
-  - type: ReplacementAccent
-    accent: dog
+  - type: LanguageSpeaker
+    speaks:
+    - Dog
+    understands:
+    - Dog
   - type: InteractionPopup
     interactSuccessString: petting-success-dog
     interactFailureString: petting-failure-generic
@@ -2671,8 +2723,11 @@
     spawned:
     - id: FoodMeat
       amount: 3
-  - type: ReplacementAccent
-    accent: cat
+  - type: LanguageSpeaker
+    speaks:
+    - Cat
+    understands:
+    - Cat
   - type: InteractionPopup
     successChance: 0.7
     interactSuccessString: petting-success-cat
@@ -2739,6 +2794,12 @@
   - type: NpcFactionMember
     factions:
     - Syndicate
+  - type: LanguageSpeaker
+    speaks:
+    - Xeno
+    understands:
+    - Xeno
+    - GalacticCommon
 
 - type: entity
   name: space cat
@@ -3034,8 +3095,11 @@
     spawned:
     - id: FoodMeat
       amount: 1
-  - type: ReplacementAccent
-    accent: mouse
+  - type: LanguageSpeaker
+    speaks:
+    - Mouse
+    understands:
+    - Mouse
   - type: Tag
     tags:
     - VimPilot
@@ -3141,8 +3205,11 @@
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Animals/pig_oink.ogg
-  - type: ReplacementAccent
-    accent: pig
+  - type: LanguageSpeaker
+    speaks:
+    - Pig
+    understands:
+    - Pig
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
   - type: NpcFactionMember
@@ -3228,6 +3295,12 @@
     reformTime: 10
     popupText: diona-reform-attempt
     reformPrototype: MobDionaReformed
+  - type: LanguageSpeaker
+    speaks:
+    - RootSpeak
+    understands:
+    - GalacticCommon
+    - RootSpeak
 
 - type: entity
   parent: MobDionaNymph
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
index 39e68b63a7..3bcf8e7a16 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
@@ -15,8 +15,11 @@
   - type: Sprite
     sprite: Mobs/Aliens/Argocyte/argocyte_common.rsi
   - type: SolutionContainerManager
-  - type: ReplacementAccent
-    accent: xeno
+  - type: LanguageSpeaker
+    speaks:
+    - Xeno
+    understands:
+    - Xeno
   - type: Bloodstream
     bloodReagent: FerrochromicAcid
     bloodMaxVolume: 75 #we don't want the map to become pools of blood
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 9981bb8bd9..8ca1b2d2f0 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -36,6 +36,12 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalIan
+  - type: LanguageSpeaker
+    speaks:
+    - Dog
+    understands:
+    - GalacticCommon
+    - Dog
 
 - type: entity
   name: Old Ian
@@ -121,6 +127,12 @@
     tags:
     - CannotSuicide
     - VimPilot
+  - type: LanguageSpeaker
+    speaks:
+    - Cat
+    understands:
+    - GalacticCommon
+    - Cat
 
 - type: entity
   name: Exception
@@ -139,6 +151,12 @@
     tags:
     - CannotSuicide
     - VimPilot
+  - type: LanguageSpeaker
+    speaks:
+    - Cat
+    understands:
+    - GalacticCommon
+    - Cat
 
 - type: entity
   name: Floppa
@@ -288,8 +306,12 @@
     spawned:
     - id: FoodMeat
       amount: 2
-  - type: ReplacementAccent
-    accent: dog
+  - type: LanguageSpeaker
+    speaks:
+    - Dog
+    understands:
+    - GalacticCommon
+    - Dog
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-dog
@@ -387,8 +409,12 @@
     spawned:
     - id: FoodMeat
       amount: 3
-  - type: ReplacementAccent
-    accent: dog
+  - type: LanguageSpeaker
+    speaks:
+    - Dog
+    understands:
+    - GalacticCommon
+    - Dog
   - type: InteractionPopup
     successChance: 0.7
     interactSuccessString: petting-success-dog
@@ -546,6 +572,12 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalRenault
+  - type: LanguageSpeaker
+    speaks:
+    - Fox
+    understands:
+    - GalacticCommon
+    - Fox
 
 - type: entity
   name: Hamlet
@@ -593,6 +625,12 @@
     - CannotSuicide
     - Hamster
     - VimPilot
+  - type: LanguageSpeaker
+    speaks:
+    - Mouse
+    understands:
+    - GalacticCommon
+    - Mouse
 
 - type: entity
   name: Shiva
@@ -765,6 +803,12 @@
     attributes:
       proper: true
       gender: female
+  - type: LanguageSpeaker
+    speaks:
+    - Bubblish
+    understands:
+    - GalacticCommon
+    - Bubblish
 
 - type: entity
   name: Pun Pun
@@ -799,6 +843,13 @@
     attributes:
       proper: true
       gender: male
+  - type: LanguageSpeaker
+    speaks:
+    - Monkey
+    understands:
+    - GalacticCommon
+    - Monkey
+    - Kobold
 
 - type: entity
   name: Tropico
@@ -826,3 +877,9 @@
 #  - type: AlwaysRevolutionaryConvertible
   - type: StealTarget
     stealGroup: AnimalTropico
+  - type: LanguageSpeaker
+    speaks:
+    - Crab
+    understands:
+    - GalacticCommon
+    - Crab
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 89a6f16e52..50fe3b6765 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -119,6 +119,13 @@
     attributes:
       gender: male
   - type: PotentialPsionic # Nyano
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - Mouse
+    understands:
+    - GalacticCommon
+    - Mouse
 
 - type: entity
   id: MobRatKingBuff
@@ -289,6 +296,12 @@
   - type: Food
   - type: Item
     size: Tiny # Delta V - Make them eatable and pickable.
+  - type: LanguageSpeaker
+    speaks:
+    - Mouse
+    understands:
+    - GalacticCommon
+    - Mouse
 
 - type: weightedRandomEntity
   id: RatKingLoot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index ec1ed3a58f..1316aefc50 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -97,6 +97,7 @@
     - RevenantTheme
   - type: Speech
     speechVerb: Ghost
+  - type: UniversalLanguageSpeaker
   - type: Tag
     tags:
       - NoPaint
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
index f08fe36544..9559ae3a0c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
@@ -36,7 +36,7 @@
     speedModifierThresholds:
       60: 0.7
       80: 0.5
-      
+
 - type: entity
   name: shadow cat
   parent: BaseShadowMob
@@ -50,8 +50,11 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: cat
   - type: Physics
-  - type: ReplacementAccent
-    accent: cat
+  - type: LanguageSpeaker
+    speaks:
+    - Cat
+    understands:
+    - Cat
   - type: InteractionPopup
     successChance: 0.01 # you cant pet shadow cat... almost
     interactSuccessString: petting-success-cat
@@ -64,4 +67,4 @@
       gender: epicene
   - type: Tag
     tags:
-    - VimPilot
\ No newline at end of file
+    - VimPilot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 42b7ff9e21..e3166c15f6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -107,6 +107,13 @@
   - type: TypingIndicator
     proto: robot
   - type: ZombieImmune
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - RobotTalk
+    understands:
+    - GalacticCommon
+    - RobotTalk
 
 - type: entity
   parent: MobSiliconBase
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index c64479369a..901bf149cb 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -111,8 +111,11 @@
     successChance: 0.5
     interactSuccessString: petting-success-slimes
     interactFailureString: petting-failure-generic
-  - type: ReplacementAccent
-    accent: slimes
+  - type: LanguageSpeaker
+    speaks:
+    - Bubblish
+    understands:
+    - Bubblish
   - type: GhostTakeoverAvailable
   - type: GhostRole
     makeSentient: true
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 0a294805cf..9ea2d784db 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -165,8 +165,11 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepBounce
-  - type: ReplacementAccent
-    accent: kangaroo
+  - type: LanguageSpeaker
+    speaks:
+    - Kangaroo
+    understands:
+    - Kangaroo
   - type: InventorySlots
   - type: Strippable
   - type: UserInterface
@@ -248,8 +251,11 @@
   - type: MeleeChemicalInjector
     solution: melee
     transferAmount: 4
-  - type: ReplacementAccent
-    accent: xeno
+  - type: LanguageSpeaker
+    speaks:
+    - Xeno
+    understands:
+    - Xeno
   - type: InteractionPopup
     successChance: 0.20
     interactSuccessString: petting-success-tarantula
@@ -351,8 +357,11 @@
     - type: MeleeChemicalInjector
       solution: melee
       transferAmount: 6
-    - type: ReplacementAccent
-      accent: xeno
+    - type: LanguageSpeaker
+      speaks:
+      - Xeno
+      understands:
+      - Xeno
     - type: InteractionPopup
       successChance: 0.2
       interactSuccessString: petting-success-snake
@@ -373,4 +382,4 @@
   parent: MobCobraSpace
   suffix: "Salvage Ruleset"
   components:
-    - type: SalvageMobRestrictions
\ No newline at end of file
+    - type: SalvageMobRestrictions
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index d0ac6fc026..26553a2f1f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -125,6 +125,11 @@
     chance: -2
   - type: Psionic #Nyano - Summary: makes psionic by default.
     removable: false
+  - type: LanguageSpeaker
+    speaks:
+    - Xeno
+    understands:
+    - Xeno
 
 - type: entity
   name: Praetorian
@@ -234,6 +239,13 @@
   - type: Tag
     tags:
     - CannotSuicide
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - Xeno
+    understands:
+    - GalacticCommon
+    - Xeno
 
 - type: entity
   name: Ravager
diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
index d9dea3c18d..5ebd43ddf4 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
@@ -11,3 +11,4 @@
     damageRecovery:
       types:
         Asphyxiation: -0.5
+  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
index dfd5e9a1be..28687c68bf 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
@@ -11,6 +11,7 @@
       damageRecovery:
         types:
           Asphyxiation: -1.0
+    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
 
 # Reformed Diona
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
index d1de65df01..fb84ad3650 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
@@ -3,3 +3,5 @@
   name: Urist McHands The Dwarf
   parent: BaseMobDwarf
   id: MobDwarf
+  components:
+    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
index 9a7c2ee65e..6197c82c02 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -3,6 +3,8 @@
   name: Urist McHands
   parent: BaseMobHuman
   id: MobHuman
+  components:
+  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 #Syndie
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/Player/moth.yml b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
index 72feba958a..ffdb36d86b 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
@@ -3,3 +3,5 @@
   name: Urist McFluff
   parent: BaseMobMoth  
   id: MobMoth
+  components:
+  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
index 8f3e6c1346..0086be81d9 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -53,6 +53,7 @@
   - type: Tag
     tags:
     - BypassInteractionRangeChecks
+  - type: UniversalLanguageSpeaker # Ghosts should understand any language.
 
 - type: entity
   id: ActionGhostBoo
diff --git a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
index ad9b37f63e..07deef857c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
@@ -7,3 +7,4 @@
   - type: MovementSpeedModifier
     baseSprintSpeed: 24
     baseWalkSpeed: 16
+  - type: UniversalLanguageSpeaker
diff --git a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
index b9f265e0bc..71d7422297 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
@@ -3,5 +3,7 @@
   name: Urisst' Mzhand
   parent: BaseMobReptilian
   id: MobReptilian
+  components:
+    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 #Weh
diff --git a/Resources/Prototypes/Entities/Mobs/Player/slime.yml b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
index 4e5974b308..79669a8fe2 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
@@ -2,3 +2,5 @@
   save: false
   parent: BaseMobSlimePerson
   id: MobSlimePerson
+  components:
+    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index a610e04d6d..67212d416f 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -141,7 +141,7 @@
     - Pacified
     - StaminaModifier
     - PsionicsDisabled #Nyano - Summary: PCs can have psionics disabled.
-    - PsionicallyInsulated #Nyano - Summary: PCs can be made insulated from psionic powers. 
+    - PsionicallyInsulated #Nyano - Summary: PCs can be made insulated from psionic powers.
   - type: Reflect
     enabled: false
     reflectProb: 0
@@ -218,7 +218,12 @@
   - type: MobPrice
     price: 1500 # Kidnapping a living person and selling them for cred is a good move.
     deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less.
-  - type: CanEscapeInventory # Carrying system from nyanotrasen.  
+  - type: CanEscapeInventory # Carrying system from nyanotrasen.
+  - type: LanguageSpeaker # This is here so all with no LanguageSpeaker at least spawn with the default languages.
+    speaks:
+    - GalacticCommon
+    understands:
+    - GalacticCommon
   - type: Tag
     tags:
     - CanPilot
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index 3d405c4dd9..5cb3de6f16 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -102,6 +102,13 @@
     actionPrototype: DionaGibAction
     allowedStates:
     - Dead
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - RootSpeak
+    understands:
+    - GalacticCommon
+    - RootSpeak
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
index fe36754b9b..7afc5cddd7 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -52,6 +52,13 @@
     accent: dwarf
   - type: Speech
     speechSounds: Bass
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - SolCommon
+    understands:
+    - GalacticCommon
+    - SolCommon
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index 900de77712..7c3f857c00 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -16,6 +16,14 @@
     spawned:
     - id: FoodMeatHuman
       amount: 5
+  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - SolCommon
+    understands:
+    - GalacticCommon
+    - SolCommon
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index df7fad06dd..39aa0ab8de 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -23,6 +23,13 @@
     accent: zombieMoth
   - type: Speech
     speechVerb: Moth
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - Moffic
+    understands:
+    - GalacticCommon
+    - Moffic
   - type: TypingIndicator
     proto: moth
   - type: Butcherable
@@ -44,7 +51,9 @@
       Female: UnisexMoth
       Unsexed: UnisexMoth
   - type: MovementSpeedModifier
-    weightlessAcceleration: 2.5 # Move around more easily in space.
+    weightlessAcceleration: 1.5 # Move around more easily in space.
+    weightlessFriction: 1
+    weightlessModifier: 1
   - type: Flammable
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index 09e86b1996..bdea4499ed 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -59,6 +59,13 @@
       types:
         Heat : 1.5 #per second, scales with temperature & other constants
   - type: Wagging
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - Draconic
+    understands:
+    - GalacticCommon
+    - Draconic
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index 481afd06a3..a601010ef9 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -74,6 +74,13 @@
       types:
         Asphyxiation: -1.0
     maxSaturation: 15
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - Bubblish
+    understands:
+    - GalacticCommon
+    - Bubblish
 
 - type: entity
   parent: MobHumanDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index 5e40254e3a..a271e9d084 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -14,6 +14,8 @@
   - type:  HumanoidAppearance
     species: Vox
     #- type: VoxAccent # Not yet coded
+  - type: Inventory
+    speciesId: vox
   - type: Speech
     speechVerb: Vox
     speechSounds: Vox
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
index f6d57f53a5..a8489866fc 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -7,7 +7,7 @@
   - type: Sprite
     sprite: Objects/Devices/communication.rsi
     layers:
-    - state: old-radio
+    - state: radio
   - type: GhostRole
     name: ghost-role-information-syndicate-reinforcement-name
     description: ghost-role-information-syndicate-reinforcement-description
diff --git a/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml b/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml
new file mode 100644
index 0000000000..fc947efe9a
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml
@@ -0,0 +1,132 @@
+- type: entity
+  abstract: true
+  id: BaseTranslatorImplanter
+  parent: [ BaseItem ]
+  name: basic translator implant
+  description: Translates speech.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/implanter.rsi
+    state: implanter0
+    layers:
+    - state: implanter1
+      map: [ "implantFull" ]
+      visible: true
+    - state: implanter0
+      map: [ "implantBroken" ]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ImplanterVisuals.Full:
+        implantFull:
+          True: {visible: true}
+          False: {visible: false}
+        implantBroken:
+          True: {visible: false}
+          False: {visible: true}
+
+- type: entity
+  id: BasicGalaticCommonTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: basic Galactic Common translator implant
+  description: An implant giving the ability to understand Galactic Common.
+  components:
+  - type: TranslatorImplanter
+    understood:
+    - GalacticCommon
+
+- type: entity
+  id: AdvancedGalaticCommonTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: advanced Galactic Common translator implant
+  description: An implant giving the ability to understand and speak Galactic Common.
+  components:
+  - type: TranslatorImplanter
+    spoken:
+    - GalacticCommon
+    understood:
+    - GalacticCommon
+
+- type: entity
+  id: BubblishTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: Bubblish translator implant
+  description: An implant giving the ability to understand and speak Bubblish.
+  components:
+  - type: TranslatorImplanter
+    spoken:
+    - Bubblish
+    understood:
+    - Bubblish
+
+- type: entity
+  id: NekomimeticTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: Nekomimetic translator implant
+  description: An implant giving the ability to understand and speak Nekomimetic. Nya~!
+  components:
+  - type: TranslatorImplanter
+    spoken:
+    - Nekomimetic
+    understood:
+    - Nekomimetic
+
+- type: entity
+  id: DraconicTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: Draconic translator implant
+  description: An implant giving the ability to understand and speak Draconic.
+  components:
+  - type: TranslatorImplanter
+    spoken:
+    - Draconic
+    understood:
+    - Draconic
+
+- type: entity
+  id: CanilunztTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: Canilunzt translator implant
+  description: An implant giving the ability to understand and speak Canilunzt. Yeeps!
+  components:
+  - type: TranslatorImplanter
+    spoken:
+    - Canilunzt
+    understood:
+    - Canilunzt
+
+- type: entity
+  id: SolCommonTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: SolCommon translator implant
+  description: An implant giving the ability to understand and speak SolCommon. Raaagh!
+  components:
+  - type: TranslatorImplanter
+    spoken:
+    - SolCommon
+    understood:
+    - SolCommon
+
+- type: entity
+  id: RootSpeakTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: RootSpeak translator implant
+  description: An implant giving the ability to understand and speak RootSpeak.
+  components:
+  - type: TranslatorImplanter
+    spoken:
+    - RootSpeak
+    understood:
+    - RootSpeak
+
+- type: entity
+  id: MofficTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: Moffic translator implant
+  description: An implant giving the ability to understand and speak Moffic.
+  components:
+  - type: TranslatorImplanter
+    spoken:
+    - Moffic
+    understood:
+    - Moffic
diff --git a/Resources/Prototypes/Entities/Objects/Devices/translators.yml b/Resources/Prototypes/Entities/Objects/Devices/translators.yml
new file mode 100644
index 0000000000..e5ad824c5d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/translators.yml
@@ -0,0 +1,205 @@
+- type: entity
+  abstract: true
+  id: TranslatorUnpowered
+  parent: [ BaseItem ]
+  name: translator
+  description: Translates speech.
+  components:
+  - type: Sprite
+    sprite: Objects/Devices/translator.rsi
+    state: icon
+    layers:
+      - state: icon
+      - state: translator
+        shader: unshaded
+        visible: false
+        map: [ "enum.ToggleVisuals.Layer", "enum.PowerDeviceVisualLayers.Powered" ]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+  - type: HandheldTranslator
+    enabled: false
+
+- type: entity
+  abstract: true
+  id: Translator
+  parent: [ TranslatorUnpowered, PowerCellSlotMediumItem ]
+  suffix: Powered
+  components:
+  - type: PowerCellDraw
+    drawRate: 1
+
+- type: entity
+  abstract: true
+  id: TranslatorEmpty
+  parent: [ Translator ]
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+
+
+- type: entity
+  id: CanilunztTranslator
+  parent: [ TranslatorEmpty ]
+  name: Canilunzt translator
+  description: Translates speech between Canilunzt and Galactic Common.
+  components:
+  - type: HandheldTranslator
+    spoken:
+    - GalacticCommon
+    - Canilunzt
+    understood:
+    - GalacticCommon
+    - Canilunzt
+    requires:
+    - GalacticCommon
+    - Canilunzt
+
+- type: entity
+  id: BubblishTranslator
+  parent: [ TranslatorEmpty ]
+  name: Bubblish translator
+  description: Translates speech between Bubblish and Galactic Common.
+  components:
+  - type: HandheldTranslator
+    spoken:
+    - GalacticCommon
+    - Bubblish
+    understood:
+    - GalacticCommon
+    - Bubblish
+    requires:
+    - GalacticCommon
+    - Bubblish
+
+- type: entity
+  id: NekomimeticTranslator
+  parent: [ TranslatorEmpty ]
+  name: Nekomimetic translator
+  description: Translates speech between Nekomimetic and Galactic Common. Why would you want that?
+  components:
+  - type: HandheldTranslator
+    spoken:
+    - GalacticCommon
+    - Nekomimetic
+    understood:
+    - GalacticCommon
+    - Nekomimetic
+    requires:
+    - GalacticCommon
+    - Nekomimetic
+
+- type: entity
+  id: DraconicTranslator
+  parent: [ TranslatorEmpty ]
+  name: Draconic translator
+  description: Translates speech between Draconic and Galactic Common.
+  components:
+  - type: HandheldTranslator
+    spoken:
+    - GalacticCommon
+    - Draconic
+    understood:
+    - GalacticCommon
+    - Draconic
+    requires:
+    - GalacticCommon
+    - Draconic
+
+- type: entity
+  id: SolCommonTranslator
+  parent: [ TranslatorEmpty ]
+  name: Sol Common translator
+  description: Translates speech between Sol Common and Galactic Common. Like a true Earthman!
+  components:
+  - type: HandheldTranslator
+    spoken:
+    - GalacticCommon
+    - SolCommon
+    understood:
+    - GalacticCommon
+    - SolCommon
+    requires:
+    - GalacticCommon
+    - SolCommon
+
+- type: entity
+  id: RootSpeakTranslator
+  parent: [ TranslatorEmpty ]
+  name: RootSpeak translator
+  description: Translates speech between RootSpeak and Galactic Common. Like a true plant?
+  components:
+  - type: HandheldTranslator
+    spoken:
+    - GalacticCommon
+    - RootSpeak
+    understood:
+    - GalacticCommon
+    - RootSpeak
+    requires:
+    - GalacticCommon
+    - RootSpeak
+
+- type: entity
+  id: MofficTranslator
+  parent: [ TranslatorEmpty ]
+  name: Moffic translator
+  description: Translates speech between Moffic and Galactic Common. Like a true moth... or bug?
+  components:
+  - type: HandheldTranslator
+    spoken:
+    - GalacticCommon
+    - Moffic
+    understood:
+    - GalacticCommon
+    - Moffic
+    requires:
+    - GalacticCommon
+    - Moffic
+
+- type: entity
+  id: XenoTranslator
+  parent: [ TranslatorEmpty ]
+  name: Xeno translator
+  description: Translates speech between Xeno and Galactic Common. Not sure if that will help.
+  components:
+  - type: HandheldTranslator
+    spoken:
+    - GalacticCommon
+    - Xeno
+    understood:
+    - GalacticCommon
+    - Xeno
+    requires:
+    - GalacticCommon
+
+- type: entity
+  id: AnimalTranslator
+  parent: [ TranslatorEmpty ]
+  name: Animal translator
+  description: Translates all the cutes noises that animals make into a more understandable form!
+  components:
+  - type: HandheldTranslator
+    understood:
+    - Cat
+    - Dog
+    - Fox
+    - Monkey
+    - Mouse
+    - Chicken
+    - Duck
+    - Cow
+    - Sheep
+    - Kangaroo
+    - Pig
+    - Crab
+    - Kobold
+    requires:
+    - GalacticCommon
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
index 8c3aed0d06..edad2b4063 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -89,6 +89,7 @@
     program: 125
   - type: Item
     size: Small
+    storedRotation: -90
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -118,6 +119,7 @@
   - type: Item
     size: Small
     sprite: Objects/Fun/Instruments/gunpet.rsi
+    storedRotation: -90
   - type: Tag
     tags:
     - Sidearm
@@ -141,6 +143,7 @@
   - type: Item
     sprite: Objects/Fun/Instruments/bike_horn.rsi
     size: Small
+    storedRotation: -90
   - type: Clothing
     sprite: Objects/Fun/Instruments/bike_horn.rsi
     slots: [Belt]
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
index a255ab4a32..b09ea96f7b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -98,6 +98,8 @@
   - type: Tag
     tags:
     - KeyedInstrument
+  - type: Item
+    size: Small
 
 - type: entity
   parent: BaseHandheldInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
index 3b89d1075b..e99f825d48 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
@@ -141,7 +141,7 @@
     sprite: Objects/Fun/Instruments/panflute.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: Small
     sprite: Objects/Fun/Instruments/panflute.rsi
   - type: Tag
     tags:
@@ -160,8 +160,9 @@
     sprite: Objects/Fun/Instruments/ocarina.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: Small
     sprite: Objects/Fun/Instruments/ocarina.rsi
+    storedRotation: -90
   - type: Tag
     tags:
     - WoodwindInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 6697aa711e..67c6e1194b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -643,6 +643,9 @@
     requiresSpecialDigestion: true
     useSound:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: Tag
+    tags:
+    - ToyRubberDuck
 
 - type: entity
   parent: BasePlushie
diff --git a/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml b/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
index c3f5170001..70d984240e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
@@ -387,3 +387,17 @@
         - state: book6
     - type: Paper
       content: book-text-inspiration
+
+- type: entity
+  parent: BookBase
+  id: BookJanitorTale
+  name: the tales of a tired janitor
+  description: A clean looking book, smelling vaguely of soap and bleach. 
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: book0 
+  - type: Paper
+    content: book-text-janitor
+
diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
index a3e3485bc6..9088edc815 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -35,13 +35,9 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: LandMine
-    sound:
-        path: /Audio/Effects/beep_landmine.ogg
-        params:
-            maxDistance: 10
+  - type: TriggerOnStepTrigger
   - type: StepTrigger
     requiredTriggeredSpeed: 0
-    stepOn: true
 
 - type: entity
   name: kick mine
@@ -61,6 +57,7 @@
   - type: Construction
     graph: ModularMineGraph
     node: emptyCase
+  - type: LandMine
 
 - type: entity
   name: explosive mine
@@ -74,3 +71,4 @@
     intensitySlope: 3
     totalIntensity: 120 # about a ~4 tile radius
     canCreateVacuum: false
+  - type: DeleteOnTrigger
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
index c628d199a9..925e036e09 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
@@ -21,7 +21,6 @@
         mask:
           - MachineMask
   - type: CargoPallet
-    palletType: All
   - type: StaticPrice
     price: 100
   - type: Sprite
@@ -54,33 +53,3 @@
   - type: GuideHelp
     guides:
     - Cargo
-
-- type: entity
-  id: CargoPalletSell
-  name: cargo selling pallet
-  description: Designates valid items to sell with a selling computer, or to CentCom when a shuttle is recalled.
-  parent: CargoPallet
-  components:
-  - type: CargoPallet
-    palletType: sell
-  - type: Sprite
-    drawdepth: FloorTiles
-    layers:
-    - sprite: Structures/cargo_pallets.rsi
-      state: cargo_pallet_sell
-
-
-- type: entity
-  id: CargoPalletBuy
-  name: cargo buying pallet
-  description: Designates where orders will appear when purchased.
-  parent: CargoPallet
-  components:
-  - type: CargoPallet
-    palletType: buy
-  - type: Sprite
-    drawdepth: FloorTiles
-    layers:
-    - sprite: Structures/cargo_pallets.rsi
-      state: cargo_pallet_buy
-
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 2ddb21b9e6..8d3c83e3e1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -230,7 +230,6 @@
   - type: StepTrigger
     intersectRatio: 0.2
     requiredTriggeredSpeed: 0
-    stepOn: true
   - type: CollisionWake
     enabled: false
   - type: Physics
@@ -252,10 +251,6 @@
         mask:
         - ItemMask
   - type: LandMine
-    sound:
-      path: /Audio/Effects/beep_landmine.ogg
-      params:
-        maxDistance: 10
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: HardBomb  # normally Default and max 5 total 60
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index bd789214f9..9fde67afb4 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -786,7 +786,7 @@
 # Syringes
 - type: entity
   name: ephedrine syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeEphedrine
   components:
   - type: SolutionContainerManager
@@ -799,7 +799,7 @@
 
 - type: entity
   name: inaprovaline syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeInaprovaline
   components:
   - type: SolutionContainerManager
@@ -812,7 +812,7 @@
 
 - type: entity
   name: tranexamic acid syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeTranexamicAcid
   components:
   - type: SolutionContainerManager
@@ -825,7 +825,7 @@
 
 - type: entity
   name: bicaridine syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeBicaridine
   components:
   - type: SolutionContainerManager
@@ -838,7 +838,7 @@
 
 - type: entity
   name: dermaline syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeDermaline
   components:
   - type: SolutionContainerManager
@@ -851,7 +851,7 @@
 
 - type: entity
   name: hyronalin syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeHyronalin
   components:
   - type: SolutionContainerManager
@@ -864,7 +864,7 @@
 
 - type: entity
   name: ipecac syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeIpecac
   components:
   - type: SolutionContainerManager
@@ -877,7 +877,7 @@
 
 - type: entity
   name: ambuzol syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeAmbuzol
   components:
     - type: SolutionContainerManager
@@ -890,7 +890,7 @@
 
 - type: entity
   name: sigynate syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeSigynate
   components:
     - type: SolutionContainerManager
@@ -903,7 +903,7 @@
 
 - type: entity
   name: ethylredoxrazine syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeEthylredoxrazine
   components:
     - type: SolutionContainerManager
@@ -916,7 +916,7 @@
 
 - type: entity
   name: phalanximine syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringePhalanximine
   components:
     - type: SolutionContainerManager
@@ -929,7 +929,7 @@
 
 - type: entity
   name: saline syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeSaline
   components:
     - type: SolutionContainerManager
@@ -943,7 +943,7 @@
 #this is where all the syringes are so i didn't know where to put it
 - type: entity
   name: romerol syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeRomerol
   components:
   - type: SolutionContainerManager
@@ -956,7 +956,7 @@
 
 - type: entity
   name: stimulants syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeStimulants
   components:
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index ab65940fab..ae4aaed7d2 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -364,6 +364,13 @@
     - Syringe
     - Trash
 
+- type: entity
+  parent: BaseSyringe
+  id: PrefilledSyringe
+  components:
+  - type: Injector
+    toggleState: Inject
+
 - type: entity
   id: SyringeBluespace
   parent: BaseSyringe
diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
index 2b5762aaef..883f66816d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
@@ -57,10 +57,10 @@
   - type: Sprite
     sprite: Objects/Devices/communication.rsi
     layers:
-    - state: old-radio
+    - state: radio
   - type: Item
     sprite: Objects/Devices/communication.rsi
-    heldPrefix: old-radio
+    heldPrefix: radio
   - type: UserInterface
     interfaces:
     - key: enum.StoreUiKey.Key
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 51f121c64f..d07a73b022 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -6,6 +6,8 @@
   components:
   - type: AccessReader
     access: [["Service"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -14,6 +16,8 @@
   components:
   - type: AccessReader
     access: [["Lawyer"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -22,6 +26,8 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockScience # DeltaV - Chapel is in Epistemics
@@ -30,6 +36,8 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -38,6 +46,8 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -46,6 +56,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -54,6 +66,8 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -62,6 +76,8 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -70,6 +86,8 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockExternal
@@ -86,6 +104,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockExternal
@@ -94,6 +114,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockExternal
@@ -102,6 +124,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockExternal
@@ -126,6 +150,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockFreezer
@@ -134,6 +160,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"], ["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockFreezer
@@ -142,6 +170,8 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockEngineering
@@ -150,6 +180,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockAtmospherics
@@ -158,6 +190,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockCargo
@@ -166,6 +200,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockCargo
@@ -174,6 +210,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMining
@@ -182,6 +220,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMedical
@@ -190,6 +230,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMedical
@@ -206,6 +248,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockChemistry
@@ -214,6 +258,8 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockScience
@@ -222,6 +268,8 @@
   components:
   - type: AccessReader
     access: [["Research"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockScience
@@ -230,6 +278,8 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockCentralCommand
@@ -258,6 +308,8 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -266,6 +318,8 @@
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -274,6 +328,8 @@
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -282,6 +338,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -290,6 +348,8 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -298,6 +358,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -306,6 +368,8 @@
   components:
   - type: AccessReader
     access: [["Quartermaster"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurity
@@ -365,6 +429,8 @@
   components:
   - type: AccessReader
     access: [["Security", "Command"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockCommand
@@ -373,6 +439,8 @@
   components:
   - type: AccessReader
     access: [["External"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 # Glass Airlocks
 - type: entity
@@ -382,6 +450,8 @@
   components:
   - type: AccessReader
     access: [["Service"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -390,6 +460,8 @@
   components:
   - type: AccessReader
     access: [["Lawyer"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -398,6 +470,8 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -406,6 +480,8 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockExternalGlass
@@ -422,6 +498,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockExternalGlass
@@ -446,6 +524,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockExternalGlass
@@ -454,6 +534,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockGlass
@@ -462,6 +544,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -470,6 +554,8 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -478,6 +564,8 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockScienceGlass  # DeltaV - Chapel is in Epistemics
@@ -486,6 +574,8 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockEngineeringGlass
@@ -494,6 +584,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockAtmosphericsGlass
@@ -502,6 +594,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockCargoGlass
@@ -510,6 +604,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockCargoGlass
@@ -518,6 +614,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMiningGlass
@@ -526,6 +624,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockChemistryGlass
@@ -534,6 +634,8 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMedicalGlass
@@ -542,6 +644,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMedicalGlass
@@ -558,6 +662,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockScienceGlass
@@ -566,6 +672,8 @@
   components:
   - type: AccessReader
     access: [["Research"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockScienceGlass
@@ -574,6 +682,8 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockCentralCommandGlass
@@ -592,6 +702,8 @@
   components:
   - type: AccessReader
     access: [["Command"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -600,6 +712,8 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -608,6 +722,8 @@
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -616,6 +732,8 @@
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -624,6 +742,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -632,6 +752,8 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -640,6 +762,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -648,6 +772,8 @@
   components:
   - type: AccessReader
     access: [["Quartermaster"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -656,6 +782,8 @@
   components:
   - type: AccessReader
     access: [["Security"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -664,8 +792,9 @@
   components:
   - type: AccessReader
     access: [["Detective"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
-#Delta V: Removed Brig Access
 #- type: entity
 #  parent: AirlockSecurityGlass
 #  id: AirlockBrigGlassLocked
@@ -673,6 +802,8 @@
 #  components:
 #  - type: AccessReader
 #    access: [["Brig"]]
+#  - type: Wires
+#    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -681,6 +812,8 @@
   components:
   - type: AccessReader
     access: [["Security"], ["Lawyer"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -689,6 +822,8 @@
   components:
   - type: AccessReader
     access: [["Armory"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockCommandGlassLocked
@@ -738,6 +873,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMaint
@@ -746,6 +883,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMaint
@@ -754,6 +893,8 @@
   components:
   - type: AccessReader
     access: [["Command"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -770,6 +911,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockMaint
@@ -778,6 +921,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockMaint
@@ -786,6 +931,8 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -794,6 +941,8 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -802,6 +951,8 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -810,6 +961,8 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -818,6 +971,8 @@
   components:
   - type: AccessReader
     access: [["Lawyer"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -826,6 +981,8 @@
   components:
   - type: AccessReader
     access: [["Service"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -834,6 +991,8 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -842,6 +1001,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -858,6 +1019,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMaint
@@ -866,6 +1029,8 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMaint
@@ -874,6 +1039,8 @@
   components:
   - type: AccessReader
     access: [["Research"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockMaint
@@ -882,6 +1049,8 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockMaint
@@ -890,6 +1059,8 @@
   components:
   - type: AccessReader
     access: [["Security"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockMaint
@@ -898,6 +1069,8 @@
   components:
   - type: AccessReader
     access: [["Detective"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockMaint
@@ -906,6 +1079,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -914,6 +1089,8 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -922,6 +1099,8 @@
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -930,6 +1109,8 @@
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -938,6 +1119,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -946,6 +1129,8 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -954,6 +1139,8 @@
   components:
   - type: AccessReader
     access: [["Armory"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockSyndicate
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index 5fca081998..476e715175 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -104,7 +104,6 @@
     - key: enum.WiresUiKey.Key
       type: WiresBoundUserInterface
   - type: Airtight
-    fixVacuum: true
     noAirWhenFullyAirBlocked: false
   - type: RadiationBlocker
     resistance: 3
@@ -131,9 +130,6 @@
     - board
   - type: PlacementReplacement
     key: walls
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
   - type: PaintableAirlock
     group: Standard
     department: Civilian
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 21d485be0c..9771f63388 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -57,7 +57,6 @@
     denySound:
       path: /Audio/Machines/airlock_deny.ogg
   - type: Airtight
-    fixVacuum: true
     noAirWhenFullyAirBlocked: false
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index dccc76e96c..e677ef185b 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -93,7 +93,6 @@
     - type: Physics
       canCollide: false
     - type: Airtight
-      fixVacuum: true
       airBlocked: false
       noAirWhenFullyAirBlocked: true
     - type: RadiationBlocker
@@ -158,7 +157,6 @@
       sprite: Structures/Doors/edge_door_hazard.rsi
       snapCardinals: false
     - type: Airtight
-      fixVacuum: true
       airBlocked: false
       noAirWhenFullyAirBlocked: false
       airBlockedDirection:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index 4b6f72de93..3709b739a3 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -40,7 +40,6 @@
       path: /Audio/Effects/stonedoor_openclose.ogg
   - type: Appearance
   - type: Airtight
-    fixVacuum: true
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -52,9 +51,6 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
   - type: Occluder
   - type: BlockWeather
 
diff --git a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
index 2c54d3cd41..d6c087af0a 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
@@ -38,7 +38,6 @@
   - type: Weldable
     time: 2
   - type: Airtight
-    fixVacuum: true
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
index e38ba1fd66..55010eea51 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -59,7 +59,6 @@
     - key: enum.WiresUiKey.Key
       type: WiresBoundUserInterface
   - type: Airtight
-    fixVacuum: true
   - type: RadiationBlocker
     resistance: 2
   - type: Damageable
@@ -73,9 +72,6 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
   - type: DoorSignalControl
   - type: DeviceNetwork
     deviceNetId: Wireless
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index 56167c178e..d03765d4fc 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -130,7 +130,6 @@
   - type: Appearance
   - type: WiresVisuals
   - type: Airtight
-    fixVacuum: true
     noAirWhenFullyAirBlocked: false
     airBlockedDirection:
       - South
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 518ff2f066..0b3c291af2 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -4,7 +4,7 @@
   abstract: true
   description: You sit in this. Either by will or force.
   placement:
-    mode: SnapgridCenter
+    mode: PlaceFree
   components:
   - type: Clickable
   - type: InteractionOutline
@@ -65,6 +65,8 @@
   id: ChairBase
   abstract: true
   parent: UnanchoredChairBase
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Physics
     bodyType: Static
@@ -87,6 +89,8 @@
   id: StoolBase
   parent: OfficeChairBase
   abstract: true
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Physics
     bodyType: Static
@@ -116,7 +120,7 @@
 - type: entity
   name: stool
   id: Stool
-  parent: ChairBase
+  parent: UnanchoredChairBase
   description: Apply butt.
   components:
   - type: Sprite
@@ -241,7 +245,7 @@
 
 - type: entity
   id: ChairMeat
-  parent: ChairBase
+  parent: UnanchoredChairBase
   name: meat chair
   description: Uncomfortably sweaty.
   components:
@@ -285,7 +289,7 @@
   name: web chair
   id: ChairWeb
   description: For true web developers.
-  parent: ChairBase
+  parent: UnanchoredChairBase
   components:
   - type: Sprite
     sprite: Structures/Web/chair.rsi
@@ -349,8 +353,6 @@
   parent: ChairFolding
   id: ChairFoldingSpawnFolded
   suffix: folded
-  placement:
-    mode: PlaceFree
   components:
   - type: Foldable
     folded: true
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 011f2a3b64..7300c0b9ec 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -341,6 +341,24 @@
       - FauxTileAstroSnow
       - OreBagOfHolding
       - DeviceQuantumSpinInverter
+      - CanilunztTranslator
+      - BubblishTranslator
+      - NekomimeticTranslator
+      - DraconicTranslator
+      - SolCommonTranslator
+      - RootSpeakTranslator
+      - XenoTranslator
+      - BasicGalaticCommonTranslatorImplanter
+      - AdvancedGalaticCommonTranslatorImplanter
+      - BubblishTranslatorImplanter
+      - NekomimeticTranslatorImplanter
+      - DraconicTranslatorImplanter
+      - CanilunztTranslatorImplanter
+      - SolCommonTranslatorImplanter
+      - RootSpeakTranslatorImplanter
+      - AnimalTranslator
+      - MofficTranslatorImplanter
+      - MofficTranslator
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - ExplosivePayload
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 64b6b068c7..6efa5a6371 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -101,6 +101,13 @@
     price: 100
   - type: Appearance
   - type: WiresVisuals
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - RobotTalk
+    understands:
+    - GalacticCommon
+    - RobotTalk
 
 - type: entity
   parent: VendingMachine
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index fca0b975e9..ee2ad6bc28 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -69,7 +69,7 @@
         acts: [ "Destruction" ]
   - type: Airtight
   - type: IconSmooth
-    key: windows
+    key: walls
     base: window
   - type: InteractionPopup
     interactSuccessString: comp-window-knock
@@ -242,4 +242,4 @@
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: windowDiagonal
\ No newline at end of file
+    node: windowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
index 8c53daf3b6..bf49eb1be3 100644
--- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -83,7 +83,6 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Airtight
-    fixVacuum: true
 
 - type: entity
   id: PlasticFlapsAirtightOpaque
@@ -101,4 +100,3 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Airtight
-    fixVacuum: true
diff --git a/Resources/Prototypes/Language/languages.yml b/Resources/Prototypes/Language/languages.yml
new file mode 100644
index 0000000000..90bce1baed
--- /dev/null
+++ b/Resources/Prototypes/Language/languages.yml
@@ -0,0 +1,493 @@
+# The universal language, assumed if the entity has a UniversalLanguageSpeakerComponent.
+# Do not use otherwise. Try to use the respective component instead of this language.
+- type: language
+  id: Universal
+  obfuscateSyllables: false
+  replacement:
+  - "*incomprehensible*"
+
+# The common galactic tongue.
+- type: language
+  id: GalacticCommon
+  obfuscateSyllables: true
+  replacement:
+  - Blah
+  - Blah
+  - Blah
+  - dingle-doingle
+  - dingle
+  - dangle
+  - jibber-jabber
+  - jubber
+  - bleh
+  - zippity
+  - zoop
+  - wibble
+  - wobble
+  - wiggle
+  - yada
+  - meh
+  - neh
+  - nah
+  - wah
+
+# Spoken by slimes.
+- type: language
+  id: Bubblish
+  obfuscateSyllables: true
+  replacement:
+  - blob
+  - plop
+  - pop
+  - bop
+  - boop
+
+# Spoken by moths.
+- type: language
+  id: Moffic
+  obfuscateSyllables: true
+  replacement:
+  - år
+  - i
+  - går
+  - sek
+  - mo
+  - ff
+  - ok
+  - gj
+  - ø
+  - gå
+  - la
+  - le
+  - lit
+  - ygg
+  - van
+  - dår
+  - næ
+  - møt
+  - idd
+  - hvo
+  - ja
+  - på
+  - han
+  - så
+  - ån
+  - det
+  - att
+  - nå
+  - gö
+  - bra
+  - int
+  - tyc
+  - om
+  - när
+  - två
+  - må
+  - dag
+  - sjä
+  - vii
+  - vuo
+  - eil
+  - tun
+  - käyt
+  - teh
+  - vä
+  - hei
+  - huo
+  - suo
+  - ää
+  - ten
+  - ja
+  - heu
+  - stu
+  - uhr
+  - kön
+  - we
+  - hön
+
+  # Spoken by dionas.
+- type: language
+  id: RootSpeak
+  obfuscateSyllables: true
+  replacement:
+  - hs
+  - zt
+  - kr
+  - st
+  - sh
+
+# A mess of broken Japanese, spoken by Felinds and Oni
+- type: language
+  id: Nekomimetic
+  obfuscateSyllables: true
+  replacement:
+  - neko
+  - nyan
+  - mimi
+  - moe
+  - mofu
+  - fuwa
+  - kyaa
+  - kawaii
+  - poka
+  - munya
+  - puni
+  - munyu
+  - ufufu
+  - icha
+  - doki
+  - kyun
+  - kusu
+  - nya
+  - nyaa
+  - desu
+  - kis
+  - ama
+  - chuu
+  - baka
+  - hewo
+  - boop
+  - gato
+  - kit
+  - sune
+  - yori
+  - sou
+  - baka
+  - chan
+  - san
+  - kun
+  - mahou
+  - yatta
+  - suki
+  - usagi
+  - domo
+  - ori
+  - uwa
+  - zaazaa
+  - shiku
+  - puru
+  - ira
+  - heto
+  - etto
+
+# Spoken by the Lizard race.
+- type: language
+  id: Draconic
+  obfuscateSyllables: true
+  replacement:
+  - za
+  - az
+  - ze
+  - ez
+  - zi
+  - iz
+  - zo
+  - oz
+  - zu
+  - uz
+  - zs
+  - sz
+  - ha
+  - ah
+  - he
+  - eh
+  - hi
+  - ih
+  - ho
+  - oh
+  - hu
+  - uh
+  - hs
+  - sh
+  - la
+  - al
+  - le
+  - el
+  - li
+  - il
+  - lo
+  - ol
+  - lu
+  - ul
+  - ls
+  - sl
+  - ka
+  - ak
+  - ke
+  - ek
+  - ki
+  - ik
+  - ko
+  - ok
+  - ku
+  - uk
+  - ks
+  - sk
+  - sa
+  - as
+  - se
+  - es
+  - si
+  - is
+  - so
+  - os
+  - su
+  - us
+  - ss
+  - ss
+  - ra
+  - ar
+  - re
+  - er
+  - ri
+  - ir
+  - ro
+  - or
+  - ru
+  - ur
+  - rs
+  - sr
+  - a
+  - a
+  - e
+  - e
+  - i
+  - i
+  - o
+  - o
+  - u
+  - u
+  - s
+  - s
+
+# Spoken by the Vulpkanin race.
+- type: language
+  id: Canilunzt
+  obfuscateSyllables: true
+  replacement:
+  - rur
+  - ya
+  - cen
+  - rawr
+  - bar
+  - kuk
+  - tek
+  - qat
+  - uk
+  - wu
+  - vuh
+  - tah
+  - tch
+  - schz
+  - auch
+  - ist
+  - ein
+  - entch
+  - zwichs
+  - tut
+  - mir
+  - wo
+  - bis
+  - es
+  - vor
+  - nic
+  - gro
+  - lll
+  - enem
+  - zandt
+  - tzch
+  - noch
+  - hel
+  - ischt
+  - far
+  - wa
+  - baram
+  - iereng
+  - tech
+  - lach
+  - sam
+  - mak
+  - lich
+  - gen
+  - or
+  - ag
+  - eck
+  - gec
+  - stag
+  - onn
+  - bin
+  - ket
+  - jarl
+  - vulf
+  - einech
+  - cresthz
+  - azunein
+  - ghzth
+
+# The common language of the Sol system.
+- type: language
+  id: SolCommon
+  obfuscateSyllables: true
+  replacement:
+  - tao
+  - shi
+  - tzu
+  - yi
+  - com
+  - be
+  - is
+  - i
+  - op
+  - vi
+  - ed
+  - lec
+  - mo
+  - cle
+  - te
+  - dis
+  - e
+
+- type: language
+  id: RobotTalk
+  obfuscateSyllables: true
+  replacement:
+  - 0
+  - 1
+  - 01
+  - 10
+  - 001
+  - 100
+  - 011
+  - 110
+  - 101
+  - 010
+
+# Languages spoken by various critters.
+- type: language
+  id: Cat
+  obfuscateSyllables: true
+  replacement:
+  - murr
+  - meow
+  - purr
+  - mrow
+
+- type: language
+  id: Dog
+  obfuscateSyllables: true
+  replacement:
+  - woof
+  - bark
+  - ruff
+  - bork
+  - raff
+  - garr
+
+- type: language
+  id: Fox
+  obfuscateSyllables: true
+  replacement:
+  - bark
+  - gecker
+  - ruff
+  - raff
+  - garr
+
+- type: language
+  id: Xeno
+  obfuscateSyllables: true
+  replacement:
+  - sss
+  - sSs
+  - SSS
+
+- type: language
+  id: Monkey
+  obfuscateSyllables: true
+  replacement:
+  - ok
+  - ook
+  - oook
+  - ooook
+  - oooook
+
+- type: language
+  id: Mouse
+  obfuscateSyllables: true
+  replacement:
+  - Squeak
+  - Piep
+  - Chuu
+  - Eeee
+  - Pip
+  - Fwiep
+  - Heep
+
+- type: language
+  id: Chicken
+  obfuscateSyllables: true
+  replacement:
+  - Coo
+  - Coot
+  - Cooot
+
+- type: language
+  id: Duck
+  obfuscateSyllables: true
+  replacement:
+  - Quack
+  - Quack quack
+
+- type: language
+  id: Cow
+  obfuscateSyllables: true
+  replacement:
+  - Moo
+  - Mooo
+
+- type: language
+  id: Sheep
+  obfuscateSyllables: true
+  replacement:
+  - Ba
+  - Baa
+  - Baaa
+
+- type: language
+  id: Kangaroo
+  obfuscateSyllables: true
+  replacement:
+  - Shreak
+  - Chuu
+
+- type: language
+  id: Pig
+  obfuscateSyllables: true
+  replacement:
+  - Oink
+  - Oink oink
+
+- type: language
+  id: Crab
+  obfuscateSyllables: true
+  replacement:
+  - Click
+  - Click-clack
+  - Clack
+  - Tipi-tap
+  - Clik-tap
+  - Cliliick
+
+- type: language
+  id: Kobold
+  obfuscateSyllables: true
+  replacement:
+  - Yip
+  - Grrar.
+  - Yap
+  - Bip
+  - Screet
+  - Gronk
+  - Hiss
+  - Eeee
+  - Yip
diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
index 55dd48e547..e6e4bdc5a7 100644
--- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml
+++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
@@ -36,18 +36,18 @@
     event: !type:DispelPowerActionEvent
 
 - type: entity
-  id: ActionRegenerativeStasis
-  name: action-name-regenerative-stasis
-  description: action-description-regenerative-stasis
+  id: ActionMassSleep
+  name: action-name-mass-sleep
+  description: action-description-mass-sleep
   noSpawn: true
   components:
-  - type: EntityTargetAction
+  - type: WorldTargetAction
     icon: Nyanotrasen/Interface/VerbIcons/mass_sleep.png
     useDelay: 60
     checkCanAccess: false
     range: 8
     itemIconStyle: BigAction
-    event: !type:RegenerativeStasisPowerActionEvent
+    event: !type:MassSleepPowerActionEvent
 
 - type: entity
   id: ActionMindSwap
@@ -94,7 +94,7 @@
   description: action-description-pyrokinesis
   noSpawn: true
   components:
-  - type: WorldTargetAction
+  - type: EntityTargetAction
     icon: Nyanotrasen/Interface/VerbIcons/pyrokinesis.png
     useDelay: 50
     range: 6
@@ -103,29 +103,15 @@
     event: !type:PyrokinesisPowerActionEvent
 
 - type: entity
-  id: ActionWideMetapsionic
-  name: action-name-widemetapsionic
-  description: action-description-widemetapsionic
+  id: ActionMetapsionic
+  name: action-name-metapsionic
+  description: action-description-metapsionic
   noSpawn: true
   components:
   - type: InstantAction
     icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png
     useDelay: 45
-    event: !type:WideMetapsionicPowerActionEvent
-
-- type: entity
-  id: ActionFocusedMetapsionic
-  name: action-name-focusedmetapsionic
-  description: action-description-focusedmetapsionic
-  noSpawn: true
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png
-    useDelay: 45
-    range: 3
-    checkCanAccess: false
-    itemIconStyle: BigAction
-    event: !type:FocusedMetapsionicPowerActionEvent
+    event: !type:MetapsionicPowerActionEvent
 
 - type: entity
   id: ActionPsionicRegeneration
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
index 28340ead40..59e3690b6b 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
@@ -45,6 +45,7 @@
       - BookMap
       - BookJourney
       - BookInspiration
+      - BookJanitorTale
       # Guidebook Books
       - BookSpaceEncyclopedia
       - BookTheBookOfControl
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
index a75f31cf0f..181bacca45 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
@@ -36,6 +36,7 @@
       - BoxCandle
       - BoxCandleSmall
       - BoxDarts
+      - BoxCartridgeBB
     chance: 0.7
     rarePrototypes:
       - BoxHugHealing
@@ -49,6 +50,7 @@
       - PresentRandom
       - BoxHolyWater
       - MysteryFigureBox
+      - BoxCleanerGrenades
     rareChance: 0.05
 
 
@@ -100,6 +102,8 @@
       - BoxMagazineCaselessRifleRubber
       - BoxMagazineUniversalMagnumPractice
       - BoxMagazineUniversalMagnumRubber
+      - MagazineBoxSpecialRubber
+      - MagazineBoxSpecialPractice
     chance: 0.15
     rarePrototypes:
       - BoxMagazinePistolCaselessRifle
@@ -121,4 +125,8 @@
       - BoxShellSoulbreaker
       - BoxMagazineUniversalMagnum
       - BoxSpeedLoaderLightRifle
+      - MagazineBoxSpecial
+      - MagazineBoxSpecialIncendiary
+      - MagazineBoxSpecialUranium
+      - MagazineBoxSpecialMindbreaker
     rareChance: 0.015
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
index c8efdbdc8c..abd4d86a1e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: MarkerBase
   id: RandomBoards
-  name: random machine board spawner
+  name: random device & board spawner
   components:
   - type: Sprite
     layers:
@@ -71,6 +71,16 @@
       - HotplateMachineCircuitboard
       - ElectricGrillMachineCircuitboard
       - FatExtractorMachineCircuitboard
+      - SpaceHeaterMachineCircuitBoard
+      - StationMapCircuitboard
+      - Igniter
+      - IntercomElectronics
+      - DoorRemoteFirefight
+      - RadiationCollectorFlatpack
+      - ContainmentFieldGeneratorFlatpack
+      - SolarAssemblyFlatpack
+      - StationBeaconPart
+      - HandheldStationMap
     chance: 0.8
     rarePrototypes:
       - TraversalDistorterMachineCircuitboard
@@ -107,4 +117,26 @@
       - ShockCollar
       - GlimmerMonitorCartridge
       - PotatoAIChip
+      - CargoTelepadMachineCircuitboard
+      - FlatpackerMachineCircuitboard
+      - OreProcessorIndustrialMachineCircuitboard
+      - TurboItemRechargerCircuitboard
+      - PowerCageRechargerCircuitboard
+      - HellfireHeaterMachineCircuitBoard
+      - HellfireFreezerMachineCircuitBoard
+      - BiofabricatorMachineCircuitboard
+      - SalvageExpeditionsComputerCircuitboard
+      - RadarConsoleCircuitboard
+      - RipleyCentralElectronics
+      - RipleyPeripheralsElectronics
+      - HamtrCentralElectronics
+      - HamtrPeripheralsElectronics
+      - HonkerCentralElectronics
+      - HonkerPeripheralsElectronics
+      - HonkerTargetingElectronics
+      - RemoteSignallerAdvanced
+      - SignalTimerElectronics
+      - LogProbeCartridge
+      - HoloprojectorField
+      - DeviceQuantumSpinInverter
     rareChance: 0.25
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
index b9def15132..f0dd470903 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
@@ -42,6 +42,18 @@
         - ClothingHeadCage
         - ClothingHeadHelmetKendoMen
         - ClothingHeadBandMerc
+        - ClothingHeadHatCowboyWhite
+        - ClothingHeadHatCowboyGrey
+        - ClothingHeadHatCowboyBrown
+        - ClothingHeadHatBrownFlatcap
+        - ClothingHeadHatGreyFlatcap
+        - ClothingHeadHatPartyRed
+        - ClothingHeadHatPartyYellow
+        - ClothingHeadHatPartyGreen
+        - ClothingHeadHatPartyBlue
+        - ClothingHeadHatWatermelon
+        - WaterDropletHat
+        - ClothingHeadHatRedRacoon
       rareChance: 0.03
       prototypes:
         - ClothingHeadHatAnimalCat
@@ -98,5 +110,13 @@
         - ClothingHeadHatFlatBrown
         - ClothingHeadTinfoil
         - ClothingHeadHatStrawHat
+        - ClothingHeadHatCowboyBountyHunter
+        - ClothingHeadHatCowboyRed
+        - ClothingHeadHatCowboyBlack
+        - ClothingHeadHatGladiator
+        - ClothingHeadHatMagician
+        - ClothingHeadHatHetmanHat
+        - ClothingHeadHatTacticalMaidHeadband
+        - ClothingHeadHatPirateTricord
       chance: 0.5
       offset: 0.2
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
index 7785e5aaa8..61a99faa2f 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
@@ -36,5 +36,5 @@
         - MatterBinStockPart
         - CrateMaterialSteel
         - CrateMaterialGlass
-      chance: 0.45
+      chance: 0.50
       offset: 0.0
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
index 9f183dcefb..0c3370890c 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
@@ -48,6 +48,7 @@
         - PeaSeeds
         - PumpkinSeeds
         - CottonSeeds
+        - LilySeeds
       chance: 0.95
       offset: 0.0
       rarePrototypes:
@@ -64,4 +65,6 @@
         - LemoonSeeds
         - SteelcapSeeds
         - KoibeanSeeds
+        - SpacemansTrumpetSeeds
+        - LaughinPeaSeeds
       rareChance: 0.05
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
index 1166d8a29f..562b9c564e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
@@ -32,3 +32,4 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
+  - type: PotentialPsionic
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
index 94ac8403ad..db7936cc5b 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
@@ -49,3 +49,5 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
+  - type: PotentialPsionic
+
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
index e11f1c4165..8a0e750abd 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
@@ -35,6 +35,13 @@
         - MobLayer
   - type: Stamina
     critThreshold: 115
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - Nekomimetic
+    understands:
+    - GalacticCommon
+    - Nekomimetic
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
index d9b25c5dd1..2184926b95 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -64,6 +64,15 @@
       Unsexed: MaleFelinid
   - type: Felinid
   - type: NoShoesSilentFootsteps
+  - type: LanguageSpeaker
+    speaks:
+    - GalacticCommon
+    - SolCommon
+    - Nekomimetic
+    understands:
+    - GalacticCommon
+    - SolCommon
+    - Nekomimetic
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
index d773cf87c7..d8e791af1e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
@@ -22,7 +22,4 @@
             NoMind: { state: pod_1 }
             Gore: { state: pod_1 }
             Idle: { state: pod_0 }
-    - type: PotentialPsionic
     - type: Psionic
-      psychicFeedback:
-      - "metempsychotic-machine-feedback"
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
index 58189e49ce..f7481abf1e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
@@ -16,10 +16,7 @@
   - type: Oracle
   - type: Speech
     speechSounds: Tenor
-  - type: PotentialPsionic
   - type: Psionic
-    psychicFeedback:
-    - "oracle-feedback"
   - type: SolutionContainerManager
     solutions:
       fountain:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
index 8e34a07ea5..ae85cd25e0 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
@@ -29,8 +29,6 @@
     - Science
   - type: PotentialPsionic #this makes her easier to access for glimmer events, dw about it
   - type: Psionic
-    psychicFeedback:
-    - "sophic-grammateus-feedback"
   - type: Grammar
     attributes:
       gender: female
diff --git a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
index e6e497003d..53910a54a9 100644
--- a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
+++ b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
@@ -9,6 +9,29 @@
     stealGroup: AntiPsychicKnife
     owner: job-name-mantis
 
+- type: entity
+  id: BecomePsionicObjective
+  parent: BaseTraitorObjective
+  name: Become psionic
+  description: We need you to acquire psionics and keep them until your mission is complete.
+  noSpawn: true
+  components:
+  - type: NotJobsRequirement
+    jobs:
+      - Mime
+      - ForensicMantis
+  - type: Objective
+    difficulty: 2.5
+    #unique: false
+    icon:
+      sprite: Nyanotrasen/Icons/psi.rsi
+      state: psi
+  - type: ObjectiveBlacklistRequirement
+    blacklist:
+      components:
+      - BecomeGolemCondition
+  - type: BecomePsionicCondition
+
 #- type: entity
 #  id: BecomeGolemObjective
 #  parent: BaseTraitorObjective
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
index 15b2cdd4fa..c3e682e02a 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -7,24 +7,22 @@
     - !type:OverallPlaytimeRequirement
       time: 18000
     - !type:DepartmentTimeRequirement
-      department: Epistemics
+      department: Epistemics # DeltaV - Epistemics Department replacing Science
       time: 3600
   startingGear: ForensicMantisGear
   icon: "JobIconForensicMantis"
   supervisors: job-supervisors-rd
-  antagAdvantage: 5
-  canBeAntag: true
+  antagAdvantage: 5 # DeltaV - From 4 to 5
+  canBeAntag: true # DeltaV - Mantis is no longer a Detective
+  # whitelistRequired: true
   access:
   - Research
   - Maintenance
-  - Mantis
+  - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
   special:
   - !type:AddComponentSpecial
     components:
-    - type: PotentialPsionic
     - type: Psionic
-      amplification: 0.3
-      dampening: 0.3
     - type: MetapsionicPower
 
 - type: startingGear
@@ -36,10 +34,11 @@
     head: ClothingHeadHatFezMantis
     id: ForensicMantisPDA
     eyes: ClothingEyesGlassesSunglasses
-    ears: ClothingHeadsetScience
+    ears: ClothingHeadsetScience # DeltaV - Mantis is part of Epistemics
     gloves: ClothingHandsGlovesColorWhite
     outerClothing: ClothingOuterCoatMantis
     belt: ClothingBeltMantis
+    # pocket2: ForensicScanner # DeltaV - Mantis is no longer a Detective
   innerClothingSkirt: ClothingUniformSkirtMantis
   satchel: ClothingBackpackSatchelMantisFilled
   duffelbag: ClothingBackpackDuffelMantisFilled
diff --git a/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml b/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml
deleted file mode 100644
index 5fef342770..0000000000
--- a/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: trait
-  id: LatentPsychic
-  name: Latent Psychic
-  description: trait-latent-psychic-desc
-  components:
-    - type: PotentialPsionic
diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
index ca1764e204..f40b688fd1 100644
--- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
+++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
@@ -5,8 +5,6 @@
     DispelPower: 1
     TelegnosisPower: 1
     PsionicRegenerationPower: 1
-    RegenerativeStasisPower: 0.3
-    PsionicInvisibilityPower: 0.15
+    MassSleepPower: 0.3
+#    PsionicInvisibilityPower: 0.15
     MindSwapPower: 0.15
-    NoosphericZapPower: 0.15
-    PyrokinesisPower: 0.15
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index d711e9a1b1..fba2c4cc17 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -39,6 +39,7 @@
     EscapeShuttleObjective: 1
     # DieObjective: 0.05 # DeltaV - Disable the lrp objective aka murderbone justification
     #HijackShuttleObjective: 0.02
+    BecomePsionicObjective: 1 # Nyanotrasen - Become Psionic objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
     #BecomeGolemObjective: 0.5 # Nyanotrasen - Become a golem objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
 
 - type: weightedRandom
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml
new file mode 100644
index 0000000000..e017096fa9
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml
@@ -0,0 +1,22 @@
+- type: constructionGraph
+  id: ClothingShoeSlippersDuck
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: shoes
+          steps:
+            - tag: ToyRubberDuck
+              name: a rubber ducky
+              icon:
+                sprite: Objects/Fun/ducky.rsi
+                state: icon
+              doAfter: 1
+            - tag: ToyRubberDuck
+              name: a rubber ducky
+              icon:
+                sprite: Objects/Fun/ducky.rsi
+                state: icon
+              doAfter: 1
+    - node: shoes
+      entity: ClothingShoeSlippersDuck
diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml
index 4fe2c474bb..f1eb270af7 100644
--- a/Resources/Prototypes/Recipes/Construction/clothing.yml
+++ b/Resources/Prototypes/Recipes/Construction/clothing.yml
@@ -85,3 +85,14 @@
   description: Two huds joined by arms
   icon: { sprite: Clothing/Eyes/Hud/medsec.rsi, state: icon }
   objectType: Item
+
+- type: construction
+  name: ducky slippers
+  id: ClothingShoeSlippersDuck
+  graph: ClothingShoeSlippersDuck
+  startNode: start
+  targetNode: shoes
+  category: construction-category-clothing
+  description: Comfy, yet haunted by the ghosts of ducks you fed bread to as a child.
+  icon: { sprite: Clothing/Shoes/Misc/duck-slippers.rsi, state: icon }
+  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Lathes/language.yml b/Resources/Prototypes/Recipes/Lathes/language.yml
new file mode 100644
index 0000000000..6871ed5228
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Lathes/language.yml
@@ -0,0 +1,190 @@
+- type: latheRecipe
+  id: CanilunztTranslator
+  result: CanilunztTranslator
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 100
+    Plastic: 50
+    Gold: 50
+
+- type: latheRecipe
+  id: BubblishTranslator
+  result: BubblishTranslator
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 100
+    Plastic: 50
+    Gold: 50
+
+- type: latheRecipe
+  id: NekomimeticTranslator
+  result: NekomimeticTranslator
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 100
+    Plastic: 50
+    Gold: 50
+
+- type: latheRecipe
+  id: DraconicTranslator
+  result: DraconicTranslator
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 100
+    Plastic: 50
+    Gold: 50
+
+- type: latheRecipe
+  id: SolCommonTranslator
+  result: SolCommonTranslator
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 100
+    Plastic: 50
+    Gold: 50
+
+- type: latheRecipe
+  id: RootSpeakTranslator
+  result: RootSpeakTranslator
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 100
+    Plastic: 50
+    Gold: 50
+
+- type: latheRecipe
+  id: MofficTranslator
+  result: MofficTranslator
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 100
+    Plastic: 50
+    Gold: 50
+
+- type: latheRecipe
+  id: BasicGalaticCommonTranslatorImplanter
+  result: BasicGalaticCommonTranslatorImplanter
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 100
+    Gold: 50
+    Silver: 50
+
+- type: latheRecipe
+  id: XenoTranslator
+  result: XenoTranslator
+  completetime: 2
+  materials:
+    Steel: 200
+    Plastic: 50
+    Gold: 50
+    Plasma: 50
+    Silver: 50
+
+- type: latheRecipe
+  id: AdvancedGalaticCommonTranslatorImplanter
+  result: AdvancedGalaticCommonTranslatorImplanter
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 100
+    Gold: 50
+    Silver: 50
+
+- type: latheRecipe
+  id: BubblishTranslatorImplanter
+  result: BubblishTranslatorImplanter
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 100
+    Gold: 50
+    Silver: 50
+
+- type: latheRecipe
+  id: NekomimeticTranslatorImplanter
+  result: NekomimeticTranslatorImplanter
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 100
+    Gold: 50
+    Silver: 50
+
+- type: latheRecipe
+  id: DraconicTranslatorImplanter
+  result: DraconicTranslatorImplanter
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 100
+    Gold: 50
+    Silver: 50
+
+- type: latheRecipe
+  id: CanilunztTranslatorImplanter
+  result: CanilunztTranslatorImplanter
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 100
+    Gold: 50
+    Silver: 50
+
+- type: latheRecipe
+  id: SolCommonTranslatorImplanter
+  result: SolCommonTranslatorImplanter
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 100
+    Gold: 50
+    Silver: 50
+
+- type: latheRecipe
+  id: RootSpeakTranslatorImplanter
+  result: RootSpeakTranslatorImplanter
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 100
+    Gold: 50
+    Silver: 50
+
+- type: latheRecipe
+  id: MofficTranslatorImplanter
+  result: MofficTranslatorImplanter
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 100
+    Gold: 50
+    Silver: 50
+
+- type: latheRecipe
+  id: AnimalTranslator
+  result: AnimalTranslator
+  completetime: 2
+  materials:
+    Steel: 200
+    Plastic: 50
+    Gold: 50
+    Plasma: 50
+    Silver: 5
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index e5afdbd6de..7608369b2c 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -454,11 +454,11 @@
   id: IrishCoffee
   reactants:
     Coffee:
-      amount: 2
+      amount: 1
     IrishCream:
-      amount: 2
+      amount: 1
   products:
-    IrishCoffee: 4
+    IrishCoffee: 2
 
 - type: reaction
   id: IrishCream
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 61f95894ee..acb6a2498d 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -227,3 +227,43 @@
   recipeUnlocks:
   - BluespaceBeaker
   - SyringeBluespace
+
+- type: technology
+  id: BasicTranslation
+  name: research-technology-basic-translation
+  icon:
+    sprite: Objects/Devices/translator.rsi
+    state: icon
+  discipline: CivilianServices
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - CanilunztTranslator
+  - BubblishTranslator
+  - NekomimeticTranslator
+  - DraconicTranslator
+  - SolCommonTranslator
+  - RootSpeakTranslator
+  - BasicGalaticCommonTranslatorImplanter
+  - MofficTranslator
+
+- type: technology
+  id: AdvancedTranslation
+  name: research-technology-advanced-translation
+  icon:
+    sprite: Objects/Devices/translator.rsi
+    state: icon
+  discipline: CivilianServices
+  tier: 3
+  cost: 15000
+  recipeUnlocks:
+  - XenoTranslator
+  - AdvancedGalaticCommonTranslatorImplanter
+  - BubblishTranslatorImplanter
+  - NekomimeticTranslatorImplanter
+  - DraconicTranslatorImplanter
+  - CanilunztTranslatorImplanter
+  - SolCommonTranslatorImplanter
+  - RootSpeakTranslatorImplanter
+  - AnimalTranslator
+  - MofficTranslatorImplanter
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index ddb779669e..19cf141911 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -3,13 +3,13 @@
   name: job-name-rd
   description: job-description-rd
   playTimeTracker: JobResearchDirector
-  antagAdvantage: 6
+  antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
   requirements:
     - !type:DepartmentTimeRequirement
-      department: Epistemics
-      time: 54000
+      department: Epistemics # DeltaV - Epistemics Department replacing Science
+      time: 54000 # DeltaV - 15 hours
     - !type:OverallPlaytimeRequirement
-      time: 72000
+      time: 72000 # DeltaV - 20 hours
   weight: 10
   startingGear: ResearchDirectorGear
   icon: "JobIconResearchDirector"
@@ -21,20 +21,20 @@
   - Command
   - Maintenance
   - ResearchDirector
-  - Mantis
-  - Chapel
+  - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
+  - Chapel # DeltaV - Chaplain is in Epistemics
   - Cryogenics
-  special:
+  special: # Nyanotrasen - Mystagogue can use the Bible
   - !type:AddComponentSpecial
     components:
-    - type: BibleUser
-    - type: PotentialPsionic
-    - type: Psionic
-      dampening: 1 #Mystagogue gets a significant buff to his antimage abilities, making him better at dispelling than other people
-    - type: DispelPower
-    - type: CommandStaff
+    - type: BibleUser # Nyano - Lets them heal with bibles
+    - type: Psionic # Nyano - They start with telepathic chat
+    - type: DispelPower # Nyano - They get the Dispel psionic power on spawn
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
+  - !type:AddComponentSpecial
+    components:
+      - type: CommandStaff
 
 - type: startingGear
   id: ResearchDirectorGear
@@ -44,7 +44,7 @@
     shoes: ClothingShoesColorBrown
     id: RnDPDA
     ears: ClothingHeadsetRD
-    belt: BibleMystagogue
+    belt: BibleMystagogue # Nyanotrasen - Mystagogue book for their Ifrit
   innerClothingSkirt: ClothingUniformJumpskirtResearchDirector
   satchel: ClothingBackpackSatchelResearchDirectorFilled
   duffelbag: ClothingBackpackDuffelResearchDirectorFilled
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index 064b34adba..2f1a7f92d2 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -60,3 +60,10 @@
   description: trait-frontal-lisp-desc
   components:
     - type: FrontalLisp
+
+- type: trait
+  id: Snoring
+  name: trait-snoring-name
+  description: trait-snoring-desc
+  components:
+    - type: Snoring
diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index 338bf188ba..b30e68545d 100644
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -15,6 +15,26 @@
 
 - type: wireLayout
   parent: Airlock
+  id: AirlockService
+
+- type: wireLayout
+  parent: Airlock
+  id: AirlockCargo
+
+- type: wireLayout
+  parent: Airlock
+  id: AirlockEngineering
+
+- type: wireLayout
+  parent: Airlock
+  id: AirlockMedical
+
+- type: wireLayout
+  parent: Airlock
+  id: AirlockScience
+
+- type: wireLayout
+  parent: HighSec
   id: AirlockCommand
 
 - type: wireLayout
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 2694cbeaf3..c6a0ab3f8f 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1190,6 +1190,9 @@
 - type: Tag
   id: Torch
 
+- type: Tag
+  id: ToyRubberDuck
+
 - type: Tag
   id: ToySidearm
 
diff --git a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml
index a2a04e03ef..9e8697a9e1 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml
@@ -1,18 +1,18 @@
-<Document>
+<Document>
   # Thermo-electric Engine (TEG)
 
-  The TEG generates power by exchanging heat between hot and cold gases. On station, hot gas is usually created by burning plasma, and an array of heat-exchanging pipes in space radiates away heat to make a cold side.
+  The TEG generates power by exchanging heat between hot and cold gases. On the station, hot gas is usually created by burning plasma, and an array of heat-exchanging pipes in space radiates away heat to cool down circulated gases.
 
-  The TEG relies heavily on atmospherics piping. The only truly special component about it is the generator core, the rest is all off-the-shelf atmospherics equipment. Note that while the exact layout may vary significantly depending on station, the general components and setup are usually the same.
+  The TEG relies heavily on atmospherics piping. The only truly special component about it is the generator core and circulators; the rest is all off-the-shelf atmospherics equipment. Note that while the exact layout may vary significantly depending on station, the general components and setup are usually the same.
 
   ## Generator
 
-  The main generator itself is a machine made up of multiple parts: the core generator and two "circulators", in this arrangement:
+  The main generator itself is a machine made up of 3 major parts: the central generator and two "circulators", in this arrangement:
 
   <Box>
-    <GuideEntityEmbed Entity="TegCirculator" Rotation="180" Caption="" Margin="0" />
-    <GuideEntityEmbed Entity="TegCenter" Rotation="90" Caption="" Margin="0" />
-    <GuideEntityEmbed Entity="TegCirculator" Caption="" Margin="0" />
+    <GuideEntityEmbed Entity="TegCirculator" Rotation="180" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="TegCenter" Rotation="90" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="TegCirculator" Caption="" Margin="0"/>
   </Box>
 
   The circulators take in either a hot or cold gas, and pass it through the machine to exchange heat. The gas then gets output on the other end of the circulator. The generator produces the actual power and outputs it over an HV wire.
@@ -21,19 +21,172 @@
 
   There is no preference for which side must be hot or cold, there need only be a difference in temperature between them. The gases in the two "loops" are never mixed, only energy is exchanged between them. The hot side will cool down, the cold side will heat up.
 
-  ## Burn Chamber
+  ## The Pipes
+
+  There are 2 major pipenets to worry about here: The Hot Loop (where gas will be burnt for heat), and The Cold Loop (where circulated, heated waste gas will either be removed into space or cooled back down). Make sure that [bold]both pipenets do NOT mix[/bold], as only heat should be transferred between the two through the TEG.
+
+  # The Hot Loop
+
+  As I'm sure a wise person once said: the best way to make something hot is to light it on fire. Well, depending on context, that may not be very wise, but luckily your engineering department has just what's needed to do it wisely after all.
+
+  As stated above, there are many different layouts one can follow to heat up (or cool down) gases; this part of the guide will cover 2 common methods one will often see for the hot loop when the TEG is setup: The Pipe Burn, and the Burn chamber.
+
+  Side note: Plasma fires burn relatively cool compared to, for example, Tritium fires. It may be viable to extract Tritium from an extraction setup (using a 97/3 ratio of O2/Plasma) and react it with Oxygen to get truly hellish temperatures for power. Although, this is just a recommendation; I'm not ya mum.
+
+  ## The Pipe Burn
+
+  Also known as the naive method, this is generally discouraged when working for efficiency. However, if all you need is a smidge of power to run the station, and you don't feel like setting up the burn chamber, this method will do.
+
+  TODO: Remove this section when atmos pipes are updated to have pressure/temperature limits in a future atmos refactor.
+
+  Most (if not all) pipe burns follow this general layout:
+  <Box>
+    Gas input -> High-pressure pump -> Pipe segment (with heater) -> Low-pressure pump -> Circulator
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="GasMixer" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPressurePump" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPressurePump" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="TegCirculator" Rotation="90" Caption="" Margin="-3"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="GasThermoMachineHeaterEnabled" Caption="" Rotation="180" Margin="0"/>
+  </Box>
+  - The Gas input is pretty self-explanatory; this is where you will input the O2-Plasma mix to be burnt. A 2:1 (67/33) ratio of Oxygen to Plasma is recommended for the hottest burn.
+  - The High-pressure pump serves 2 purposes; first, it prevents the burn from backwashing into the supply pipe, which would be.. bad, for many reasons. Second, it maintains a positive pressure in the following pipe segment, which is important to allow the burn to continue, especially since hot gases expand.
+  - The Pipe segment is where the burn actually occurs; to start it off, one can use a heater to increase the temperature up to the ignition temperature of Plasma. Afterwards, the reaction should be self-sustaining, so long as the Pressure and Moles supplied remains high enough. Be warned; if you wish to remove the heater, it will carry some of this superheated gas with it, transferring it to the next pipenet you connect it to. Best to space the gas through a space vent, if you must.
+  - The Low-pressure pump (whose pressure should be [italics]slightly lower[/italics] than the input pump) prevents [italics]all[/italics] the gas from passing through the circulator, which could result in the loss of the Moles required to sustain a burn.
+  - The Circulator is where this generated heat will flow to the cold loop; afterwards, feel free to space the waste gases.
+
+  Note: Pressure pumps are used here as, while they pump on pressure (not flow-rate, which is comparatively faster), they are a bit easier to control when it comes to the limited Plasma supply on-station. However, the steps shown can be followed with volumetric pumps too.
+
+  ## The Burn Chamber
+
+  The burn chamber is the preferred method for heating up gases, and it is commonly used for other purposes too. (see: Tritium production)
+
+  Most (if not all) stations have the burn chamber separated from the main atmospherics block by a 1-wide spaced grid, presumably to prevent conduction. The chambers consist of 3(+1) important parts:
+  - The Air Injector/Passive Vent
+  - The Space Vent
+  - The Radiator Loop
+
+  Most normal burn chambers don't come with Heat-Exchangers; instead, they have air scrubbers (and optionally, an air alarm) to help filter for Tritium, which is a highly reactive, hot-burning gas that can also be used to heat the TEG efficiently.
+  However, this is a slightly more advanced setup than just burning plasma, as it needs 2 burn chambers instead of 1 (one for tritium production, one for burning said tritium), so remove the scrubbers and retrofit the burn chamber with a parallel array of heat-exchangers instead.
+  
+  The air injector (or Passive Vent) injects air (or allows air to flow) into the burn chamber. Either should be supplemented with a pump before it, to keep pressures high.
+  There is a notable difference between the passive vent and the air injector; the air injector can only keep injecting air up to 9MPa, which can be reached very easily with a good burn. Ideally, switch out the air injector for a passive vent connected to a volume pump.
+
+  The space vent (designated as a blast door to space on one side of the burn chamber) allows waste gases to be expelled and destroyed. Open this to keep the pressure under control.
+
+  The radiator loop collects heat from the burnt gases and brings it to the TEG. To maximize efficiency, hook up the heat-exchangers [italics]in parallel to each other[/italics], with a pressure pump at max pressure after the array and a volumetric pump before the array.
+  The pressure of the volumetric pump should be set to ( 200 / number of heat-exchangers ) L/s. For example, having 2 heat-exchangers would mean you should set the pressure to 100 L/s. 
+  Finally, fill the whole loop with (ideally) a high heat capacity gas, like Frezon or Plasma. (Yes, Frezon =/= Cold. Frezon has one of the highest heat capacities in the game; so long as it isn't reacting with Nitrogen, it can actually be heated and can store heat really well!)
+
+  # The Cold Loop
+
+  As with the Hot Loop, the Cold Loop must also be setup in order to operate the TEG. However, the Cold Loop is usually a lot more low-tech than the Hot Loop; in reality, the Cold Loop only has to be "relatively" cooler -- hey, room temperature is technically cooler than the surface of the sun, right?
+
+  There are 3 main methods you will see used for the Cold Loop: The Water Cooler (see: Liltenhead's video on the TEG), the Coolant Array and the Freezer Loop.
+
+  ## The Water Cooler
 
-  As I'm sure a wise person once said: the best way to make something hot is to light it on fire. Well, depending on context that may not be very wise, but luckily your engineering department has just what's needed to do it wisely after all.
+  An equally naive method as the Pipe Burn, this simply involves taking some useless gas (in this case, Water Vapour) and flowing it through the TEG and into space. It's dirt-cheap and simple, at the cost of efficiency and permanant loss of gas.
 
-  TODO: somebody fill this out once we settle on a general mapped layout for burn chambers.
+  Setting this up is so simple, even Hamlet could manage it. Just take an output of a gas (here, Water Vapour), send it through the Cold side of the TEG, and then vent it into space.
+
+  <Box>
+    <GuideEntityEmbed Entity="GasPressurePump" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="TegCirculator" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="WallReinforced" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="GasPassiveVent" Rotation="270" Caption="" Margin="-1"/>
+  </Box>
+
+  TODO: Remove this section when gas miners are removed in a future atmos refactor.
 
   ## Coolant Array
 
-  A whole bunch of heat-exchanger piping in space. There's not much to say here: gas goes through and cools down.
+  This is the default method for the Cold Loop you will see on a variety of stations. Being of moderate complexity and having no losses of any resource, this [italics]should[/italics] be the main method of cooling down the TEG. However, every station at the moment somehow has their heat exchangers hooked up wrong, reducing efficiency greatly. (Thanks a bunch, NT!)
 
-  ## The Pipes
+  To use heat-exchangers properly, they must be setup in [italics]parallel[/italics], not in series (like what you see on most stations). A gas pump at max pressure should be placed after, and a volumetric pump before the heat-exchangers.
+  The flow-rate of the volumetric pump should be set to ( 200 / number of heat-exchangers ) L/s.
 
-  TODO: somebody fill this out once we settle on a general mapped layout for burn chambers.
+  Simply speaking, the Coolant Array consists of 3 major parts: An input connector port, a few pumps and the heat-exchanger array out in space. It can be setup like so:
 
+  <Box>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="0" Caption="" Margin="-1"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="0" Caption="" Margin="-1"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="270" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="0" Caption="" Margin="-1"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="WallReinforced" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="ReinforcedWindow" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="ReinforcedWindow" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="ReinforcedWindow" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="ReinforcedWindow" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="WallReinforced" Rotation="0" Caption="" Margin="0"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPressurePump" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="TegCirculator" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasVolumePump" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="270" Caption="" Margin="-1"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="TegCenter" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPort" Rotation="180" Caption="" Margin="-1"/>
+  </Box>
+
+  - Connector Port: Use this to input a gas with high heat capacity; most of the time, Plasma or Frezon is used to do so, as they both have very high specific heat capacities (although most any gas will do). (Yes, Plasma =/= Hot. You can cool it down, and it acts as a really good heat exchange medium.)
+  - Input/Output Pumps: Used to make sure gas keeps flowing through both the Circulator and the Heat-Exchanger array. As the gas cools down and heats up (and as it flows through the Exchanger), pressure must be applied for it to keep flowing.
+  - Heat-Exchanger: Basically, just a bunch of heat-exchanger pipes in space. Not much to say, besides the fact that it cools down the gas inside it. Make sure the heat-exchangers are placed on lattice, not plating! Otherwise, the heat-exchange efficiency will be greatly reduced, as the heat-exchangers aren't directly exposed to space below them.
+
+  ## The Freezer Loop
+
+  Most of the time, you will see this method being used in efficient TEG setups. It's basically just the Coolant array, but replacing the Heat-Exchangers with a freezer. Even though the freezer does use power, it is only a small fraction of what the TEG can generate, and it's better than the default Coolant array at the moment, so go fish.
+
+  Just follow the steps for the Coolant array, but use a freezer in place of the Heat-Exchangers. As so:
+  <Box>
+    <GuideEntityEmbed Entity="GasPort" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasThermoMachineFreezerEnabled" Caption="" Rotation="0" Margin="0"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasVolumePump" Rotation="270" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="0" Caption="" Margin="-1"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="TegCirculator" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="270" Caption="" Margin="-1"/>
+  </Box>
 
+  Once again, use Plasma or Frezon in the loop for max efficiency (although most any gas will do).
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
index b7ba3d4c8b..a377c980e5 100644
--- a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
+++ b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
@@ -14,7 +14,7 @@ A large portion of Xenoarchaeology gameplay revolves around the interpretation o
 
 - [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.
+- [color=#a4885c]Current value:[/color] the amount of research points an artifact is currently worth. Extracting will set this to zero and traversing new nodes will increase 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>
diff --git a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png
index 44e093f26ad03f1554ba2c82804912058ee2d74b..76cf88f02e7da24dc4e0c870d0f97c23a378dec1 100644
GIT binary patch
delta 360
zcmV-u0hj)@0)qpPB!3BTNLh0L01m_e01m_fl`9S#0003sNkl<Zc${Nl7+^5!fKdmG
zI$+cRBs;*%JK{f#efIPrhL^9NG1AQeAj{?D6j8*0j`&ZBBZzhY%yMHh19S&4Py$Gf
zf<1ef!L*CZU$~fvsMP;AugMDqq8;$?!8L|g&p$E5t*>KP6n_}ZAjqfBaOluhu$-iX
zB#0u*5md<q++5sXM*tl_vR;xLASTHN_B}edbMFoVxqxT~ym|cwNM2*Gv-8FxM~7Sh
z&1(N)@lGv3QWU@(fkg}q<Q3HZfBpJ}ft#C$0YnoMG9)L$zd-9%lvEg=zkC7A8Mja@
zmlT&^NXf_s^I<E>3W+k0tX%N*+gApVWeiB60pf$iVHOjcE=YC&)ZqW1YzK7&+)>Y8
zJSRCpk`)3lN8k`A36Nb7QIhqj;s9!aQ3s4VVAKHv?f?L_T728mW+AZv0000<MNUMn
GLSTYn@R*PQ

delta 282
zcmV+#0p<RK1GNH>B!B!#L_t(|ob8l7io-AvM!#%2gIozT7f4vL2^iGn7Os32pTHN$
zjRs88smL~)PL<uppjN3iBt@1e{(&WWoj}998O;cYL?Z9bEaWl~`BVs;yADm$1jY6i
zAR=EB1ppw+GL&UGh{Q)|a%P4x231voi2Ni1zc4d)`vaJ{Z-3s`1e|l&&gO8=!5A~W
zz!>~50j)JYH!EnZ0RX8G(+OB>A*Do;B#=_VT8nen^%i(~kC%&u|5~rF=kMbYKc~}O
zyi)4AmTlV(@=@JEL_W`R|7ib}QvO!r8G>dY6#{i#|M~W#RDR2&3PUR&RH9Gvm)kY^
gz(pdF$W&Yae-q<UC?|Ml`v3p{07*qoM6N<$f_K}0rvLx|

diff --git a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json
index df6ee47d08..50d4add03c 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/base.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png
index 608b9ef7a0a787b53eddbfd9d8f25b67c1187e72..805de4537d102c42f4d287b8f28954374e3b733e 100644
GIT binary patch
delta 276
zcmZ3$bcShyW4&>JPl&6RcZ9f@RAy%7ocSy3GfOt5R29e05fPQr*4AtF3A>w_tgCBm
zVQ!Zc5b0y-E3cr&z`)R{tneO436=!;1^-6_4618qCIKZm3p^r=85sDEfH31!Z9ZwB
zV5_H#V~B<S+w*~ZhZK0~8y*H-X$m?0*FSrrTlC2fOuyyLX4NvX{q<L$!OFmJa@u?w
z2A7x?<_633JB_EmE^ElyBBSv&ZsQWMqg*>~+I)TxIG^i9L3_v-{Zr2-X>E~x;dy!b
zgqnWNhKMhkb3O}Z=qTO!W6Lbj^mVuId!-j9o4&qbUo$u1%5Uzu|7_&yI^B5dflgxZ
MboFyt=akR{06h$KCjbBd

delta 231
zcmX@Zw18=XW4%g%Pl&68goK)^YJPtH{Q2{ZjEwFsn5&_oaW^wLIyyQqFi>1voPmKM
zQAYJLkm4x`@(cct01QI+&z%E`a~60+7BevL9R^{><M}I6fP%T6E{-7<{%`vog&Gt%
zTpQ20ysN+8Gl!`(=jy6|=l;v_G$q(PX=ZxhU@j`4ySLE1wY@R1bwk@uf$bjp+?r~K
ze(g$P(cAyvB%5Q}HCD@XU6V4VS9_lN9jJ***eR@4c!&FxO+HKg{AGf_{u~mVD7&;r
W^Y-kT+24RRGkCiCxvX<aXaWG!gI(7E

diff --git a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json
index 774e33fbe7..687531cde5 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Edited by Flareguy for Space Station 14. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Edited by Flareguy for Space Station 14. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png
index 671111e4bc651c86eee58143c75981fba5a05cea..fa790f7e9908db0be117835f39c7dcf37e749983 100644
GIT binary patch
delta 376
zcmV-;0f+v^0+IueBYyx1a7bBm000ie000ie0hKEb8vp<SL`g(JRCt_YVHjXA>VQ!P
zj5=V{0VF#>UeMq_GXLTG3ygGg0Lb#b0%17+)TuWND~=ibr^FFNI{;?6yom{t=oz2`
z-ZD@ENREP@Wu{=dB<eI=Ohi=b|C`s($O;9L9I*OUCWBR*H-E#Tz+i@lXMTdCfPsOL
zK~h2zBu$nhsFDk~xwyfO06KtVy(BpxRBbv#d*D0<70o0dZ#rE3&b>Pf<N}f$01EO-
ze-RYRL4e%&C&>YztOm+*K<gN&2}lY7gd<SJU~G8>wf|qgeqrF|=3xNQ#DomViSR4S
zD+U!M6^7?8UvV%zd~gfJa!GLshLntKFu$U#kSO!W$^~D)ePsYy1_bcX0P#WMFpG&z
z7bH6XYVdzhwu3qX?x^Q4o|Bv)$qE6OBXEe51jsIkD9L(MaR9Zzr~^hFFzSE-cK`sL
Wa(=4DC}uVQ0000<MNUMnLSTZgJ(|)0

delta 300
zcmV+{0n`4H1I7Z7BYy!6Nkl<Zc${Nk7zLwX6pVDhNQz<!35oxFyu1vbK7VF-@!|zZ
zdMS2*goMQZEtBHme4o69RB;3osg|d8>}HVG^<>yGDV{+>LgGJN8~_7p9lIII%E}nL
zql+lDmpli2`}U1t&6+g~-@bht7zfY-3@r!bx(YH}xpIXe*MC)zfq{X6fsdD$Vh6Ag
ztMKIELktokTnt=XKN%!MxEM|zKE&|p^Jj`3Ky*G<Q&s&RX~6^G{Qb?a{Pa(TTeokc
z=oc3khiA)|FJDrnph5u>5)%LGqjdh`%Kzfx;{TByK@1=%4e;^uGR)Zf8gJaw#OKHW
ymk&wxIaM7&i6!M^2N%r~+$b0YqhJ)!3jhFIX;GoKhVf|t0000<MNUMnLSTYv1BY+`

diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon_alt.png
index 439a4b6e52966af9972f6e49cd53d7c4798f2afe..d943c6341894bbb5e80d5364580876e348130608 100644
GIT binary patch
delta 336
zcmZo+dB-$CvYwfNfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=$Dz$e62
zSJzlxLCwP4&dW1UL{v&%(BRCf^0kf5p1!&Dv4$ZbAuCp_C@O21Gk+ye$IjaiL5A~}
z1o;L3M*$31?#x&Sl;SM#n5ZsT&#>Op#WBRf|Ln!re1{b{SQ7#+Y`t6a|M=aDH$~sP
zeO@+6&9r8t$cj5p_!$MiZ#R_-;7AnUyYj1|mEBN?{}5B3pm+>(l3?K>hSZV;U2bb`
zG^jE7RSLu}c*#7=f-Q1}>ilLMewR-rjL()beqYX~^O^U>d<(|lV?6=x{LA(=s=2MW
zc3!<Ra8;K5T0@4@FHUchE_PVK$#wp^VMf!38D=&sn6#(Xt&(&&Xm{gUdBXJj%|Z97
X@9L|+oOnGR=m!Q*S3j3^P6<r_Ic$lX

delta 501
zcmV<R0Sf-^0)zyR8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00Fj1L_t(o
zh3%EGPr^VH#y^Znv9UEENpF`jHBH={9Eh;^7Z{^1CMF~-4vhLgIGB*IyD*sGgoHsC
zT}dZO!YB|zVk-ws=hUVMO<PKE>9;h!d-uLy-@Cg4ks?L<XMe?lF389-1AsWk*<&qD
z3!G;q098?#^L;v-A<l93a}^NZ3o^3IEVH(*$J~IdxwQgVMs5bGqA+JQf<Sl%=CfHw
zCld^Y!@0f#^S!qq00aWq@(QRon=yW8XTe+)1mv?>y9I;c5Qb^OFim@-`q9d}S5*`y
z3IYJ2)9s>BDSy~=C)bY<1;JM(JS*TPtNc#$%e!an9~`4mDZnsIUwKvru*_c`u59yC
zsf5$>TL3_#QUD>uvlXELtQJh^7?e^}t5r}+1LX(>005uwZwq5nI^G-rN%5f|LIboq
zBajr2VlDwq(@@MM0<GT;W8T*FSlJ}(27sDQg6C%-DQ+IMS{>!rFZ6mn&tvErAW4$F
zll%St()f%lv$LaJsOcnHoe`cseggj!JRzJQ%R~ra_ZNrE&(U+rH>D&=Y)=%IewlUk
rejA2sl|lpjHFIjM<&G37(x&wb&nUgko0fn-00000NkvXXu0mjfMLO2r

diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json
index 1e84b43d94..84f0203236 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/cargo.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon.png
index 4ee60687d09860657556e171f9ae70c31a1d19a7..070bbfd16a652c755399db14a4928134b3ee8f80 100644
GIT binary patch
delta 291
zcmdnZw3%swWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hcfKQ04
zh^UnDOa=>cJBBmHUY>y_MqUj6jpYRmbajoD;+W(W)aJ}z2~;aRyJ9Pl;w=gC3;vG;
z7;IlCwE-nK3p^r=85sDEFfi2f9bufR%_j{Mt?_hm46*Qkdm&n=L4kucU`LwN&i`NA
z`lU9kG`sLO;Ns&G9#56+UlcZ&Bv&5I6EHU54i;_~m=-RuxXCj@;QEmTZ;r|;^zS-u
zJ8@CdOI~iXG_m?O4PCx*2Y&`SwN)})4BYVEU%}aBLhgLN5Jp@1&~Em%-7jU%&5-}x
cJS&K=d96<B+9w}FfDU2sboFyt=akR{0761+Qvd(}

delta 299
zcmV+`0o4Ap0=oi`8Gi-<0047(dh`GQ0Rl-xK~#90?Ub>K0x=MVf0wHk3|Jf)u#;oa
z)`$qci>2@3W9)lea}OX~VO}8k0NF}dF@=a@rD&mS-0Z?}`MN+R^Gz}tAQFlEcRD_s
ziHJqFi*mn*wbm=PHblfK2df;6jbb9=5a%XUllNB^0KoYeOMeB}?><6ER1&zt`50Pj
zY*diq{RNzJ=wJfp9F*4W3pBys5;#r`hNA<HQv(1HLbNBaTPNtv&q&i0z4;ltb%L@i
zYYS8!CRvv8X|}zsKYqVpjCqKcQr^BtQ54|^6%p}ZkvttjQcAv;sDf7y2qAFz`F#2I
xjZ}WmvkHAH4<ss4C;8jg)p)~2B9Ta2TmaedQ%NfWa1H<f002ovPDHLkV1n?ifv^Ao

diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon_alt.png
index 0927232ed58b88f8950812184a9ca5006c90873d..c1dbd8ca3ce636aba48266c7f5597faba7223078 100644
GIT binary patch
delta 355
zcmcc0{F!NjWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g&fKQ04
zuCB4Xf|`Z7otI~zh^UmBsw%@7W8;|&N^wk{zPTc1jQ{`tXZUYiRMs$O{z{;x^vQpY
z04afzAirRs6f$6Vpd2g7z);V?S>O>_%)r10RLFOPajG_-G*HI|PZ!4!3;(khU-LB^
zaIhw1I9iv!{=NUL-)^gg_v-T04L3gYc3n_2*`CGa&b@0D4vH;)76GsRipm}FxWmb9
z;TBWC+u?eIlX=R;MlGq0Nz7IZ9}LPKahLpP(CRy=amHv~vkJe<r4q(xF-w`gFXz+w
z%$qUaf-(3|Pk=lBvVDzOE3TYZ?+jd(Wxdvr;dI97ZPLXKE4aAMUpHLQ^kIgXjRuqU
p)H1D?4#(_nTq{qQe!qFnegAx;vb$cp{sA4&;OXk;vd$@?2>_FWj7tCj

delta 454
zcmV;%0XhEj0@VYM8Gi-<0047(dh`GQ0h~!hK~#90?Uk`g!$26v|8YqxB%%~^P;fFu
zAyjCz50Igg&(ZhrF?^3s9lE*o7U>{up_7o5U@^g~Ey6jJ3u$f0C8@gPw}eaXzVDas
zyGwwQl9GQ$$-1Cnnj8Qssv6yU9*r``$tBRVEFK?!u2!h1YJYUiBO<+^VVYbd8&4)m
zl8|_IPyvxBDM8b+c)S`}BvL1K9EY>z5_8|*>N~LAdm#ZJlfY5hg#KWl99OG9lIxm=
zj^jivnEO70FhmfB(MFXa_wH?47S}Zm05F}+P=9biZ5seU?q8v6np7oHE0BaJzeo-M
ztu9B`2Haj9L4O!Z#mOzOo18zkKq<x0-c;Z1)j<eJZABpgUDL35+Js<?LBTB;W3VZO
zO{r9jLIMIIk%z(p!He{U{~ZA#v2KrXb^U>Ldz@))?qet*gz&Em4**bG-C=z*1OTx9
zIb7FGjh{NfFpQ|ip6BhI-!M)7b~=s5XN$|s|AbVDxIf4~2qC=IR=CX3iz97m7zRJl
w^}TN<KE3ZjkXWU{0=voL9JJgeB_)5&HzFOiY6t0a&;S4c07*qoM6N<$f^)~uMF0Q*

diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json
index 1e84b43d94..84f0203236 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/centcom.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png
index 30e1697c3ce082b64e96a81d29505423503e98e7..9023333660826fa40f4c0b68a142dc4e12b17aa6 100644
GIT binary patch
delta 370
zcmV-&0ge8}0*nKYBYyx1a7bBm000ie000ie0hKEb8vp<SK1oDDRCt_YVHjXA>VQ!P
zj5=V{0VF#>UeMq_GXLTG3ygGg0LXHWoLo5n_St(3496M%Q{o7s9RRaj#zGNA{O)lE
ziU7$`VAh`xrcV`4go}xYO8tNH`WacFK#~K3j!$4PsZeF8kAJ_-@cYDlNE85pq=Y1h
zBFhm}$pze8++arl9YC^Pk{qzkvVdW8`~(JHO&}Xd{LZ~Q4CDfm8~_S()uaLx%RzwL
z_$SE$;H(DBatsXK4AcZ9g#f}4Xkt(xub}q->(?&~+}u12AexwvAvqC#WqHM*qNKv`
z{N)RVhYxO{SZgjRF2RtJkqzcolob+X9$C5I>$k5AAj^ON9vUD%NE~J{vFU<j2S5$}
z56X5>N5CER{Ka#U6C_z70CNNmagqSp1ra4#k17tJ78rHFr~^hFFyIaV01k3`k;tpE
Qi~s-t07*qoM6N<$f>a=vmjD0&

delta 299
zcmV+`0o4AC1H}T6BYy!5Nkl<Zc${Nk7zLwX6pVDhNQz<!35oxFyu1vbK7VF-@!|zZ
zdMS2*goMO@|Eg971_lO(nW|C@5{Zdaa|BVAr%#&uKYh~N|3*ee{~7-O|Ie^}`+o@u
ziT{+E%|wdg(+j3DoIQJ%!N}N{QhUjBz_)MT7#Mf#VEFd!8-GLk?Pv6N04>1Ka)7S2
zH-koDA%m{9Hv<C$0|Or)AN?Hg@X%2RgPjk~|Mck-#SS1kAFHXU{a4bnf%ETOI>K=4
z)-4qM;^N})Z29u#OX`;q5)u;sJwlRj=6`W<@&Cw<AO?_>2Ke~+7|tKwiZ||Q;&Wtx
x%ZH@;oT`qX#3XXEgNx<~ZWN4yQ7{VV1pxH%RrLglhgbjr002ovPDHLkV1gqYlHC9R

diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png
index a01e0c6c13e9e939597ff9f756a3fcaa3073a6d2..51a87cef7994958a1e61f7f23301d9c5201d84ef 100644
GIT binary patch
delta 552
zcmV+@0@wZc1Hc53BYyx1a7bBm000ie000ie0hKEb8vp<S@<~KNRCt{2md{H9K@`Wo
zl9yb6kR4L6tc#=|1QAI0pok#wUyzVO=+w<ac<)jNi698C9fOYD>=JZ}D6A|=ODoFO
zj<#=bY$d~)RrBH(mf4*-d_QmA+j(O~kJSh00~iJf2B)huet(q9$lhI<{uO}C6^p{&
zYh%?YgfxKOoTOG%v?D`1;B*eN@gaB5Qed~);2rlF+65^9G8y%ZvG>>47j!~~i;%XS
zqF2>V_HaPiT@VKF4ozuQUulf|-2w#`*gXT#)rAy<5CEA+Qd`(ti`M5T`ba8?-03Zj
zceVkK${^e$E`KSAmH^!RFL^=}m`AJuLPo+Vphzj#`KJQ=rgxenfOaGVKt_kjIA%iO
zhIyI`BZ2F)o9+VWwf=R2!1g3oHeA2fs4lt=K;{>*OJLB2PDmPnMcyHEVF1c;IGSKN
z*Nf)#`KKdUwmY^2$iAJMkcM^$E!H92E;nYESL^1P^nVdl^D|JkqAMpMhsdP0_Uo{+
zf1UmJ`gKjEBBUi;1Kh;x@Ue>s9ly=Co7y$+kRs`jE<)CPDnBQlz5(&O!ra0V0)9Ud
zn{l*~G(f5NNM=>40}jEjXY@^Q2m8BF6tQ|R)Q+1$kjOk=$g_3PdN6z+;1CpP9Y9M@
qZC+SyT_MY5BJB!5C)5Y%Ilwm%yYQoVR*XFW0000<MNUMnLSTXwN&sm9

delta 479
zcmV<50U-Xs1o#7xBYy$ENkl<Zc%1E&u}i~16o-EiAy!D7<Zcuponn<biMn(sqJxXz
zTo=dU>f+?$q%IC31;IZ-S{%A`?ocTXZLyB6ElLweD-O@0T&UWbOQX2tTaLTj-TQLy
z-2ovXA^(ixcR|!J2mq#3)g8MpmwoRumO#ujX|UgWd&88fx_|9BBGL<@hCw1&rCL=+
z35jpNDj))l3J^0*8axd@5}p&2i3B;_E}q-%Pk9GE=Uzwv@Fg(eHQ_FwSEeJ8Z^3m<
zLo$(YQ}Enw!?JByw(S<G3}aVs%rr^YGyp)YUdQgy3C`wb0RTLeg05-4>%li`D=Wk~
zr~UIQN?%-4JbxZ15D~Ij;+#vJf@cbTqE@eC`|ub5P`Erru~<ZWc^LrE$YdZR5lBGS
zG`y4^0055TK*{CcI1bWJEu^1XQhNjv5C{oD@BLkRZD0Yr^Ez}~R$?-!fRI>N-2x5{
z`mGNF2~?_8#j<T$THEZOgsKDRr=)OugGQs_c?~@$Fj&UiN^UlrL+3{ggXS04-Tq^#
z@VjpSV~hqxhQT?fjh#K|`!A5TWQ@^_t`Ge)@$_~qYvd^f7Wf)$kUxKNLqbCSk`Huc
V#8~n?4VC}^002ovPDHLkV1k2E)|dbQ

diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json
index 1e84b43d94..4a16d0c71f 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/command.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon.png
index d39d3680dfa4434eae717731963bea3d5bfaf679..536a9911993df71b654fa48324f807d44d5bad3d 100644
GIT binary patch
delta 378
zcmV-=0fqjW0+j=hB!3BTNLh0L01m_e01m_fl`9S#0003;Nkl<Zc${Nl7+^5!fKdmG
zI$+cRBs)M}(BMBZ|Ka-!jC6AV$nqnr#NhlZ+n+OJ%s2Q?i6e-10L*eO6)Cuwjwg_q
z|B8VUKynmh*Z6?xsV!UJVj`ka|KGfRMph`0<bcuzX$)3v-hT{>0)rX8-T4EK0tN<V
z21yA?kThA2ph_;_=HdoB0_Xse^^)X(?u1zkfr0ZFR5X)-yjgJZJNND|kPAq104T`U
zcS@pI4g%!HKS>S%Wi?Qio5Ap$ftrA%5P&%XT@1#SS5W)^_3IY~Zf+h15KT<Tkemp=
zvb<tYQBq-e{&VsL!@~!+P%M`emtaWA$OiK($_j}xkE~qq_1jklkYzvs4-F6>Bo4Ef
z*mOa%1E2=~2W2~`BjApD{^B{w36iW3fH?w(I7xu)f{2o=M->N93yeBo)B&Ro7;pyw
Y09Yn{%O~)p!vFvP07*qoM6N<$f~V4+{Qv*}

delta 254
zcmV<a00IA%1DXPmB!A&aL_t(|ob8l73WGopM!%#~w4J%YdH}Z<av6IGc#9k$p20ih
z0+v?s0@^BUJ1G(*DJ1bXgzST5S=ixw#moQ}i{;<hjrq*X;(H$2u0vhdqiScv%p!$;
z90)VZSHi<E6p?r_iT#+*Iu@j93ayK|xzhxUG05{A#uxy4dv}2~_$`4Xa#5BglE?)B
z_@1|&K$hKa$8q|1+jX-AK3*n)QgS@_{rhxjajmMCdLrt_vT2&-7Zo$hIo5;oPek%8
zu{eQJLPQcMH7KxJ_`8rz!iU1<gimgi)f>)Yu~@d^1_r`e2H1rglmGw#07*qoM6N<$
Ef-{zO?EnA(

diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png
index f1559927e0c2fbfda565987acf5bcf246f14b74e..98259eb0700d261983bb1064ac563b845e8e7af4 100644
GIT binary patch
delta 336
zcmaFG{ElgYWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hQfKQ04
zuCB4Xf|`Z7otI~zh^UmjpuyYw36FQXdHUvVFVda#@cW7tD~ie*=FDFS)M01)Zx@i_
zFA4Gs{*M9}uH2ci5Gci2;4x8Mu%2PPr;B5Vh5y-$ulWuuaIhu>T-bWI=Kt}#7jKHb
zdHcL<lA3AFMv)bFp71jYe&22?7r>Dyz<1?WMJv0Z5dR^jK0)yq<|M(wLky`U3%cCa
z+-Oi^@T(MvU+|K7mIYhn4AuF~I{Yr5N*JFlW&FOJPv<l5i}@Ce!N+<6-1(R7YgBVv
zaqYZ%XW*(V`?ZD)r(c}jCSB~Xf|Kj~b;FFN4>QbcRxoK#ty?AOaM13?wep1N_nU+6
YRo~TDe>w4bJkSpep00i_>zopr0Oin(B>(^b

delta 475
zcmV<10VMwJ0_p>h8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00EpyL_t(o
zh3%9vPr^VH$N$JsC}~Yd%pD(~Obr7}h;it^#J4aZeijEE^&>Da>f*rQ%w#%&k;w?y
zMH-47$aBD6K*9DX=+ghv^zPmLfA`+I0}>@l^v_DkE+`rX0e?V7QN-AzZA<U76+p=}
zY5D)d_mNQ)@!bX_@`9paP+->U_fwmIg1Man1V)<-N~TH6*^q$<4Xj%hd9xYDj<ZsC
zV72xE1OO?3gRp@6PA8>ivp>vrO+($XL<z=@gNf^6;<}<yqiE~yEtw|ing#%P8VvAy
zI}~$;28XU`(trIRt&?h%IOjxN5OqQ2a+!#lL|qW)JaQJc*226Z%v-J20^$oO3PflR
z{HCA;Kn0%Xq1|r7^E|0NVgUfa)wQx_wDNZVxwIb(A~wKut{|88(X8cR+cuiDywv(w
z0KI-cb#eDBAXHTq87VYgFdPm;uVH8aV@!1NXf#?IUsN;<IzK%^F70DFS8((2w%a#=
zF-FTE>%=*y%d=zY`yZK-F-C{FzV>9n)B8S|Y|K(@fbV9@+WV86C{dz)>JuxN!21^-
R>ka?_002ovPDHLkV1ks9*^~eP

diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json
index 1e84b43d94..84f0203236 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/engineering.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png
index 0ff3f2c989362d67e30f45835f939895d8ce6e62..fa790f7e9908db0be117835f39c7dcf37e749983 100644
GIT binary patch
delta 376
zcmV-;0f+vd29g7iBYyx1a7bBm000ie000ie0hKEb8vp<SL`g(JRCt_YVHjXA>VQ!P
zj5=V{0VF#>UeMq_GXLTG3ygGg0Lb#b0%17+)TuWND~=ibr^FFNI{;?6yom{t=oz2`
z-ZD@ENREP@Wu{=dB<eI=Ohi=b|C`s($O;9L9I*OUCWBR*H-E#Tz+i@lXMTdCfPsOL
zK~h2zBu$nhsFDk~xwyfO06KtVy(BpxRBbv#d*D0<70o0dZ#rE3&b>Pf<N}f$01EO-
ze-RYRL4e%&C&>YztOm+*K<gN&2}lY7gd<SJU~G8>wf|qgeqrF|=3xNQ#DomViSR4S
zD+U!M6^7?8UvV%zd~gfJa!GLshLntKFu$U#kSO!W$^~D)ePsYy1_bcX0P#WMFpG&z
z7bH6XYVdzhwu3qX?x^Q4o|Bv)$qE6OBXEe51jsIkD9L(MaR9Zzr~^hFFzSE-cK`sL
Wa(=4DC}uVQ0000<MNUMnLSTY>(VDLS

delta 777
zcmV+k1NQuq1D^(vBYy#IX+uL$X=7sm04R}lk-JO7P!z_0ZG99UDCi*K&_TsPK@`MM
zD(F%j+6q=(l9;qYTSJl};wrc}2o9o)ufhL7SHV?55EMbg&E3}`63=Z4710}R&X4cj
z?{M-3!il_5aBIe(Q1qPSWIQ&TnTypw(?BD2v=Y?}*PcpEq<{H$ecTdK^=3fz`v2aa
zt8vkE4G2YrM-1EXgk>5ME1s=*Q@Gv8X^X-K!u^g6D151OJ>VzB*?`{^JL%*&gjLU2
z_6O@f*vL5r;XdK+LcU~F=22hLWEN*qQafdL;gV#MI5BieERn}!Kx$Dk``b5I_D!=a
z9z)(Xt2pAwl7AC#zo;eYYD%?4H|5E*s&fCGr)v!l1>KwCQ2XfnuRTz|4PRTn|9R;9
zUq=vmfb(M2zbrY8zKgz9)w=hgWgSj0s+zt7XB*IQZ)=WLmLjslmIW^-(42v`YiO7c
zvZ|bOd<W?@`9)W-y9d2;zh&VYz4T}6S-7oN00009aDPZya{vGf5&!@T5&_cPe*6Fc
z0ar;xK~z`?V_+BsqaiRF0wX;H7)c2L2?>e+{CvC&A3uF&c=6%|NqR}K2di3jMd|+s
zI?Vr{Y`6OV^Zb<mAje=;NTMJUG3r5<ElQPV;Qq(Lkh%H?!{3i@7@lpfXP|~7h;jhP
zk&M6qPk&$Yo#E`+vkW#xn;8BBAvFN;4*1W=@a@|-hEInY!1U?uOQ>N#1Mv=kTF1o5
z3T81gP$vx%?Esi}S^j<pGa2dafG<pc7;?0qG8kp81=Aq^^YQV)+(kA`bO>BIeT~7$
zM2CT!i;Kb3M33Rv*^3OHK7AtFVwgsvBT`LG?SFr^?sIU!|6=^lF!!<~!}XiDQS^(8
zi^H?V%a<=v<X{$3M1%7E<X~Q$g%HRA$c`Y!GNPjZWEd#UTaIwyjeDB-9N8zhe27aN
zSufSt=$4`LNwJ9Rgo11-&4Zm3AC0OV4S~@R7!3hZLjV9v>|>}zz}$2I0000<MNUMn
HLIPldooR94

diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png
index d3be4bc4972bb24a3d83d698ce2839f951ffa86d..d943c6341894bbb5e80d5364580876e348130608 100644
GIT binary patch
delta 350
zcmcc5{*GyaWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hQfKQ04
zuCB4Xf|`Z7otI~zh^Umjpuw3{<!c+AJ$-ZQV+}(>LRPF;QB>A2XZ}i{j-9t3f(+*`
z3Gxg6j{+F3+?lZuD8*UeQ6E{%z`%C|gc+x5^GO3m*L%7+hFJKYz4)5%umT5bLcoQs
zcWeG1zkBhf=$p6C%O<Ir)@&46apws?qu}@Lrg8xsi2{6AepR%x8w&9sV(JqVk6}&{
zEIh=JTC$+aZOx4aH3q**f%pY4nP*wBMb1#2->k#$@~MRJ*;2;u%lX1}KJ&hqZ^0OR
ztS7*of7!l9wH4RSt9J&j%CcW;$Z-0_>21=*4l6jh&R;joX!<b2%w`3X_SCvnk`4#$
iZd@x*n0~)G=w9_*ef5_Uug3%3&fw|l=d#Wzp$Pz@I*gnE

delta 980
zcmV;_11tRQ0^bLa8Gi-<0047(dh`GQ0d8qSLr`gBV*mgsk#&(hOT$nUh97ISVigA+
zL>xL)aZnKjag++Ws6$)9uO*31E2J?bEmB+s7YD&Xbn$EOALuH$DhPrih`71?wTQ%X
zn?gnOhMV*7-uoU--au&5GV)${6!Lb#O->|Yvvc#Y$TN*ZsedO-zh-#ORBAlUzw6_c
z8dY!lRImT<{kft`8P9;42H|1DaSOsS4U?+{NAad`n~~F&gb##!T^UgLQt5iYPl~ev
zzbSUp$uS72p0Vr?)_<^(bMwMI!tuOSG%E9`FKNoyGbyPZvODoeGC_hEIz^VTD9|U>
zmdyV44U~P;tbd5dkhen#R~%V#;_Vf+C|xsBP0=&*Sd>)mzw`9Wp~0YgQv&K9egCx!
zBHQq_<@=w9zW;RuwGVJ^SN$uJ)5yE%TU9N-4=w9(dQsK%9XQ*7_IpQjwX#$zJ7k*h
zasthB(0UDx3qe+ubB^yIy(Yit3U>FPTkf|kegpOfXnzHIGe))m000SaNLh0L01FZT
z01FZU(%pXi0006PNkl<ZSPAV^Jxe1&7=Fe?Vgw^riHL%NRw4&tbti&?om`{;z*0#e
zYGGr0g^2zA0Xadv>kcjm+6F}|#GItin2kon2<r#x-oB%67;ks86I0w3JFxrC%=_^?
z^UMbjw0}T>K!Ja(fT$L~r@PytoQ6oGoVtH-P<0(nt}3yww^xF5^4<NtB*OMRM6?Oe
z%4yXEc9hA;JU2q@W0HPWivR<u;A&y=vkG1@YP{O_B``WXY?-&WI4>68>^l`vC1(;e
zUyTZNlu)VtOr=C)H0l74H8p|AaV`-o-Q38J4}U8ADp_9zypn0fM1tDyY!=^>T^RWE
zS&myLmO(xpC43c-6<vNTKY?%B;9;u{{mE6_Jr;5FZCWbflIECtHvy_d;2X(K8(d&=
z%|tq##>bgosE5Ge+7uFrM0txG$gdM&FNe-N$(%ni(9zxo(=>6lH7D)v&JRSakWLBI
zq<;V*M1(;8G$+AY9>b^)2{hQ?x`(S~0>*jK277_C#EarIdV1|kW)*%l6ClXEO=4-}
z0fV#aSR67dz&Twt5uj_fu-ypDW|1{6aQWPfs0iUKcZRW*V;F|vyA!?v@p!y^k_&}`
zYdk$X^B)SJKnnP>7uR|NoO*c75DArtTTK{Uxv%3fOXupT`K~Kc1GrBFnqx87mGRSi
zT`Iv#C9d<g)h57+48~)!I!~?|AM^tS0tNmn1^xg$7Rv%XvT=q00000<MNUMnLSTZJ
CCB;?%

diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
index 5567eaaf37..8e58bce368 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon.png
index e18fee6225ea209546006648af9636058b1427b2..5ba1c7269d76e8a0e994be0249510c7819d0accd 100644
GIT binary patch
delta 365
zcmV-z0h0co0*C{UB!3BTNLh0L01m_e01m_fl`9S#0003xNkl<Zc${Nl7+^5!fKdmG
zI$+cRBs)M}(BMBZ|Ka-!jC6AV$ntsXroj34A3SAfE^7Zzi6e-10L*eNEe!^00+OSk
zu;>7o?(cJei;0U#{eSuD8Cjt~k^^SXdBI@S=FPAuFqq-mHGc_k6o7!SsU5@F(}&1%
z1XXf@yqqGK-nMlG$$Ck0Kx&EvLpjj*Dw;_s;_KEfWFQxi<N#2RclK6ch?5)tBsl<-
z)j(OUwy%<bnt-GbfH?wP493>h*8BhF^&18eQ4t0ZO-#s;oCtrgzG4Upj%PS@Xe-0j
ztCvtLx3lwRFlIJ00Q0NM3yCt1tX%N$(R~JxWk3KA4G<qB4oi^4rVElC05TYq=V6v2
zI|?XHa)Kl)1YnK;S%@x9s##<gM3iJbsyKjJVAKJl4j6U7fI9#Hp2~#|**sZe00000
LNkvXXu0mjf^39o5

delta 259
zcmV+e0sQ`m1D^trB!A{fL_t(|ob8k?j>A9<M!#Jcsi8I=-~)u_4B?}I9%0XrJCt>J
zuCX|1d3dCRrqTp@S=554P4iP#ohJ<#$=3IPZ6FW`d^%rqikVsC!vX!}g0^jE^)7~)
zwP~91F|)oTJV_EAhG8{{?>WU;mf?8*MVh8dbDtCN-lM82czo|)Bd`VUC19<^-{}X|
zS^z*C$NLF5=U|LM6h$z`z&VG$?-vU^d`v_{^E@B_Wm%%G>zjTe8rQPxy7dngGiy;4
zllxCZdM&X!BBDg3A~GqkS@^w>UBairmV`e&D4P#lAP@-b#Xm6GU!qP=N>~5@002ov
JPDHLkV1m(#b}|3}

diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon_alt.png
index 1087400c3caa26d484116ed669440cb2ba91cbaf..e68f78e061f33d0ee8d933defe0b6cba6aeb102b 100644
GIT binary patch
delta 428
zcmV;d0aO0f1H}W7BYyx1a7bBm000ie000ie0hKEb8vp<ScS%G+RCt_YVHjXA>VTo;
z0C_=!{~-F|`wNT%;s8-aDF#t#Wrl~FFHp;V(j4&m{xb$@gQ1lM2HXL#G{A6f02~0y
z0iZMh!m!)`0+i+mq8wmi<n@0M=Sv39YkwK$t(yWDzyIJVLw|Eo`+rItL39YfEZ5S~
zV4x--$^mE2ZDWK5dtuQ5uvmYe16*EQOzQv3SI@`_1(Fis>^UzOtlGR876k?~T)QR#
zjsg%cHnn3od-@Prj-X05l$TQk)7!SLAXzU-4oFRrU?>OrUPUtrMSR`bg$(2Zk{kdE
z^3L8W3~_SfpMN9=fU+7W%hmQ(GEftc6ap|upo_uS+S+>m-@JaqAR;Ql0HTQr8Ilv>
z57t)<LBa71hYoFJxO(*xisg28-VDZO24H@5c_C5ek(CP`KDy5UvJ42|p#kE9#9;}N
z*mOa%13(6Y@;uB^WJdwTNluVtg#gSEAPdpONi~b?f+dKOtVb0GPz#JYVAKJl4gdgp
Ww4Y*9&3khI0000<MNUMnLSTYo?yvU%

delta 444
zcmV;t0Ym=91JwhNBYy#$Nkl<Zc%1E&J8r^25Qcx!@R013yY)(@vM5Z26j4xc1}oel
zXW$5t(r^JdL<)MOphyvwiA=Q;AR0inLp7<qf&j4>L(=$bEbnVR&x{wy$;tU=3c4Gr
zmPG(iDi+n)$7G^?&P4(>+ot{ZuiXx%Vo^OW5lOwFYFQKq^M9t(!a1RM?y3TDpmPCg
zwoUul(2+=7*lx8bj3O*otAn}&hqaF-0B8x^B`tUz4hxlX`6#$)7-+Xzsszi`3Y+Z~
zo9$LLY8o!?-kNQbX&3;2&)E#)@mS5(>vfohq1_MKJTw}_IVUM4Nh!&39Ezfdq?E)t
zPo0H};hdA_d4DSS^V^yn$5BFQBocezH{ucmL4Ys}F&d2!hN0FOnFIh}Fc=(-1wrt4
z0z!yP5}5^j--i$auIu9c<q59qYVFS?;7zB6UazMlDwT@LNVD0*d_GV74HFkI##ARS
z7K@YXtCmHNoeqQ$@O>YHe*e060Aq~yMNYvvr*5~a{Wbrmwq%Uay=k8OviRy<Z#HMM
mlv&_suzhZR<>ut%+>&qQ6VQ*LWGm7D0000<MNUMnLSTZi%Fx^Z

diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json
index 1e84b43d94..4a16d0c71f 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/medical.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/icon.png
index 5e773624bcfe8b92e53f0bd29d5b992f93aad3d6..4b38069004aab227a1685514df1e8861642eb00d 100644
GIT binary patch
delta 393
zcmV;40e1ep0-^(uBYyx1a7bBm000ie000ie0hKEb8vp<SR7pfZRCt{2ls!wsP!xt=
zrHhS=XfbiAlu!{DUHc0JC-D!6L=c=*`~)XKanRo&?*4{u9j$XIH61jqpNrS^niG0M
zRfL?IV3+$YH|K@i^W=OahXKm~7ytuc0N4P<v3c1ax8LuE{(lXClJ6|u#PMyng=&3Q
zrh!NdppushBYkcORiqQU1y`@N=v*DI#NI?<O1?ZlYE^*+P#dnJa=L`;<rOq$7NQoA
z9NVEo3nG&(u<}*}5dyH^WdW>vHul4>cW2iy=LN|7Z{ZLE%~lh-VgcOy4>-R#`sM5P
zp9MgxcCvjYkAE)@k)>D_P!K;o^<11TOCdgBS)-scNoCkWC~{A5OD=+L2W`LcEx9vk
z!`s-5;)A`dME7ZJf%p`lWTE0}P)xo`oOCYO0KJPPtz8cyh6*|XdmyzcpdkM6S<?Oy
nrCGg90J4$+FaQQ%-~eAe&VS&jnBxZk0000<MNUMnLIPldZH%f2

delta 290
zcmV+-0p0$h1H1x|BYyz{Nkl<Zc%1E&p-#j=5QcvUstId%$hj5s0>^3I0kx?hJi%FP
z?a2#{^?eNtrf2ZgByA01#o9q!xNxEey|!!E&;7|x{!h#-kVqu{I~PM96OkyT;JruN
zwu5H-xEfNvSv31_4LspSrjWQCTE3Mf?pA`$q5%;}6oGHHvVX+G%Pa18w_|(H69^%o
zsw#vK;tPCy%E>&tz~ftUGS4mm0M=T(Kd)h}1pp|e;t4qCV2nYQWiZCTIS23kXn{Z9
zF*8e^=Z9RDCF;69n%7z%7NhIBNj|D0h)9Z}kiPrZTFXy~$zf*ES_?Dx3d~miTS=7i
ozOpgpXD`a^3mcb6BoeXs0x@t}GjErB1ONa407*qoM6N<$f{v_)_W%F@

diff --git a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json
index 3d37ed5434..37ee397b98 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/icon.png
index cdb552f140ec9f1a86c9333d6d16dc47859f7d61..498a0af6885eaf70bafea8842a6431adcecd420b 100644
GIT binary patch
delta 444
zcmV;t0Ym<b1JwhNBYyx1a7bBm000ie000ie0hKEb8vp<She<?1RCt_YVHjXA>VTo;
z0C_=!{~-F|`wNT%;s8-aDF#t#Wrl~FFHp;V(j4&m{xb$@gQ1lM2HXL#G{A6f02~0y
z0iZMh!m!)`0+i+mq8wmi<n@0M=SzmT@8S$IDs<uEYgX)ISbx6X;6EjfAUXs*ul;3M
zJ5!fIKuQuW782nEbihsqN&ry~ICE|rBP`f!rptiES~8!&<wZoL{=a$sjI2-~DG~N;
zG-a@A^JZ8S7|ihDnJzdAKtNIg94cfvf-2dNn~NLl2%rN<)=QEDO8ieVWCYG*P|-{R
z@=n9W@7%k?Kz}YE$pN4spHbn2VmSzq8~-FZ0F>20S&o5W9|JW3Ng;r61gaQ}Ew7;V
z|LfN;4BXs23?Q1AkRdq{er0*ZprWM0@ciWqhKCPsp;#^{F2RtJkqzcolob+X9$C5I
z>$k5AAj^ON9vUD%NE~J{vFU<j2S5$}56X5>N5CER{58dMk`p9ZApmm(4sntI*#!|L
mS&u3XpcWW)z^DU89RL7+LYE1kW>c;J0000<MNUMnLSTa98njIS

delta 370
zcmV-&0ge9E1B?TZBYy!?Nkl<Zc%1E(uTR536vw|1RCCv4$&z~s3b83rGZ=6a1Y{9_
zn422{QH!0P!lE#h6HUett6H#C>>ucb1jw2+SqM1{G#knKWBq~Y$6a%G@AK}xy8;z4
zD72J9OBJ>McHD&HBMs-qUQzMm1%wb_jQyWL(NqFEX(khq(tkO}-1p&m-c~6BQc5t!
zKtyUd=!D<TuJ2VI5|Je^3_}5cZQJ+_-tCXDdvJo`paUYx{60hqJdGb$#@+r1rfK5z
z>LzR4WCDK)f&i9fAqawU1m501a%r@U1<D{+z;T@L6ngC%T-QafT>}8<oM#qD{0>Z=
z38=0?(-xq*hHI%a!QA&V3nZ>_v(Zo&hd)21uTMNYFYq#(t*jS9gx69^nScKfk-ELy
zSL^P-5JD|WBq3E3>YU?l{2E#NLNZ@wU505h&s8Ez@QshF@P@0XsHiB5ZxOg<)UVlL
Qz5oCK07*qoM6N<$g7S;1RR910

diff --git a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json
index df6ee47d08..9c2f13fda0 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/mining.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/icon.png
index 3d247f05be59b6337a3999eb81040920379ee608..4a67c2aa6e97c830fe27dea40f863cbba9df8282 100644
GIT binary patch
delta 308
zcmZ3%bcAVwWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hQfKQ04
zyr4lxM~A1U=l?Sd5z%WzM5P$c{5LW3THENXt7~jwZddNDFR!3BXZ}i{4imQBtAG@L
zNswRge-yxQ<<5+SKq<}wkNU`B1_r((Aj~*bn@<`j+Un`z7-Hf7c0#n!VFeD?kB-eA
zcm5Z7E9ENATq1qqXTgpNHkrgf4+Yg68IGRP-^ZxAw8kW+EyT-nyVF`#<|var0rA|a
z85b?M@96mNaqtdhT(4fD^lIJ4$Hpa3{eIL;S@7o?3uELLk+|#H3peU^6nuW)qkT1D
q@AfUit&P%Q{(OgKy5Ep^%zN{wNyVqb8!dq@V(@hJb6Mw<&;$Tw(Rl*^

delta 280
zcmV+z0q6e20;mFz8Gi-<0047(dh`GQ0PjgeK~#90?UcU`f-n$=e;OwUtapne#Fdnp
z$H5h!#2Md)U3~)F%L)nWIjF?M5cyMC?3Xm{aP99Kt_N5wmVak8rkI(<_dL{11FiL_
zyR%_tk+XU(2s4X`ch^J1qbLFZs8n!KIkGH+35h`hFH|bHo_{V#RX#U&nn2sO-Ch*M
z@&W*W_+%t_x`1Iu2^<m^yWJ6o#03EOp0}(30631*o$IEVEwC9<q_tk%%2KfPv5z0~
z=T?><!-$BwZ&_89`9a0ZlBcS72oaIIOBg2%0wE#^gP>R7XW`#M776bQn-e~{QGVWV
e7K_EQ6nDZmQxR<te=@iL0000<MNUMnLSTa4zj})R

diff --git a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json
index df6ee47d08..8182d05a8c 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/robotics.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon.png
index e292512c97db7090c86d9f4ef5772fdabc50903a..d55fc0798e5e84e8695ba6b88c8253bc78b37907 100644
GIT binary patch
delta 369
zcmV-%0gnE+0*nKYB!3BTNLh0L01m_e01m_fl`9S#0003#Nkl<Zc${Nl7+^5!fKdmG
zI$+cRBs)M}(BMBZ|Ka-!jC6AV$ns*3wQ&Bqm-iU<pD+DSi6e-10L*eVQBEXLC5HVB
zlmU{XV8PpCU^+qA3N9uhD)s-(>t|$z0!a=y#&n*+s?D2WQGZ}C!!30~a1?-mq=Y1h
zBFhm}$pze8++arl9YC^Pk{n?5&k*c;70o0DhJOh0JNND|kPAq104T`g)F-1@4g%!H
zKS>S%Wi?QiV=(Mype7(G1mKQ96N9nk71aKJ{rZK0o12FLL=zJ-BqzeJEUy?;lvEg=
zzkI>)@WCw<%W5UXB^XjNvcdd{vO=QFBP$nt{q~gsWEl{^Lj%MIiNh==HeHbH0I0$L
zLD>%K2)Lu3zj#h^f+Q;hV2;2cP7)xyAfhDeQN;n&0;3KXb-<_t2HXJvQigqU&FZ8y
P00000NkvXXu0mjfY~7m2

delta 284
zcmV+%0ptFR1GfT@B!B)%L_t(|ob8mMZo@DThW|}Pk!I?f$_(xWy5YUUkQKDI7!7S$
zu~|T#WGIgiTqy||FfhG>Y1InSElpxFf9#ih`af`IAdyJ?ckZS<CL&Qv!F!Ls?<dWU
zv6)i7-*#W&0eHuwEFp0}wfrDEygUo`+YUq|Q3Sp@$PQIi;eWMxn%jGuKnMX%(;$Qp
zU*PyDSM%xuZy(*&yt)7YSZh(1C9Jgo0Hsts0p}cyG03tE#uzx~;Ju$M@aH>bX36vX
zoa?$q+qM_;TI=&-48yR<M|A-aNl_FscK=#y`6;nD%q&`KVdhbR)yjV>iBdjRHmCgN
iMOl5}5{X1278NIywOTV4Lxu|g0000<MNUMnLSTZDvw=GR

diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png
index c86c128c245c261460adbc2a919580c5a1a36759..c935e5a13b7f8be499b366732f8364b81b156f69 100644
GIT binary patch
delta 335
zcmeyw{E}&cWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$h2fKQ04
zuCB4Xf|`Z7otI~zh^Umjpuvv3XOklDdiv%jIPISF@Ox2N!<_jmfy#X!?EL_w_)3EO
zg8w4}2G;|3P5@;%3p^r=85kyN^VT!0^K@|xvG6~8@ikww0S9YBhU2p6`~OSJZ(Zg5
z`mNZyvy(Soi)rfYKZ**E{%uoZ^3vp0YKW3w-=UEH$g$#p<>RJo2OT9xiv>M=As0Ku
zr7v(cs7oIafANLUSB6<QZDVo5Cx;`?xD&jYANn&#ykYy|Kd0fQf%27$&8zblaISLw
z`q?vS%Boxb*)j)=er@`Dj7cD?>C)#?o>>Yu>v}m>9q?K@KZ`A31OK<LvNxW7Uoge|
Y-g@nC;{J121HHlE>FVdQ&MBb@0KzAXEdT%j

delta 464
zcmV;>0WbdP0`dcp83+ad0047(di0Tw7k>eyNkl<ZScUDCJx_x`9L679Xi2~kwA&?g
zB3;zkgrOh6iP*tU(Al+dYd7Q4xk>#H4*dX(rc*I=srDtLiI7kmhjY3MwI#eYy6`N7
zyZ_zu<M|%|lqyx~pCx2nP}g+|02NW>W3S_J=6!MjGz^1A@4vQNR78<q^MIsYP=D8T
z%FHH?Bg6r*xuXIwqd0?xVbEwASs)S%o2E&_%?2ya+vz*7+j|B9AQQkzQo+k;BuLfj
zp1C5+XqqN(!OHXC2Lb#b;0HC0a-ZIYVNgYu0RV5)DY~^epSyoQgCfhRl1NM-PAvYY
z`6Io+^%X_8HisVssrJbYz|7m#4}Wex7z}V@UjhKSwK+6ROKe3U0M>%pnj#EC*tU%@
z3^VOf2mk=S?;iHXX6w{vus8rAq!2`50M~Uv2!Ul;==FNAEGyIcLI4xT5&Hc;hma(R
zC-Ss8$6~Qad<_!|R8{3!E|<%L^>tmRx2+ZkA#hz6&%<Hne?lTe6y%UJO+BNXPKTy>
z^`c5msj4bHRg{BI#y-8Dz8{-XVSwLeQ5`kzQl(1$wSE9vn7)JLv0%CY0000<MNUMn
GLSTXi71QJZ

diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json
index 1e84b43d94..50f9fe3394 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/science.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png
index cced512164758d3551c213d943a0c03ba3395d0f..195117997db22a6b1c73cab9c4749c2bb21e1da8 100644
GIT binary patch
delta 381
zcmV-@0fPRU0+<7kB!3BTNLh0L01m_e01m_fl`9S#0003>Nkl<Zc%1E(%}N6?6orq_
zg)~AJI&G)mFI8Ol1f>t+19Tw>f(u2T!H3X=g6P7X52Ho=0jEXBl^HA)VsF|^?LwHF
z4DBXoleu?D&NnwVnF3}k58wejfCpd$ECn_7H~##1pPL#0nSb9d?&#;!(vL|i7l_ON
z#(a5u7++!@2R#8iwc#T67VN$br(Cb}C*W+Wzydfb7I1eZ&}=;7Eh*!x6zhCg4Qa4~
z$mJA>qR<cn0QOuKz**AQUmvX3fMmP{ZHGQ!0o=zuTvW=bdDQLbaVn>POwI!+#G5+4
z5fSnbs{$zmNp_BN=Kbp0mXh)tLM(vBES0fp!um#Cm;dGYVZuDDRMFbo*YU~mVWzdL
z0AwOTW&@?yGR2fP###G<4KP|*(Xksrq)<^OVmG8!1q{SLd6uj%BG<p5GeBPQ03N^t
b%pBksO~-$4x4hT700000NkvXXu0mjf+;*so

delta 255
zcmV<b0094(1DgVnB!A*bL_t(|ob8l73WG2hhF?1ham}{|V`)b>ui$OO8+rgeK()JB
zmAa-wQFO2v|DZI_k^~ao=gS{pu~_~c$7C`QX^$~9ZHv0Djn>X_F$oXD5WbX1k_1Gg
zPZQ|F0YE8*D2jHISiA#$c%C~*({yX@I)Se10O!+YS$4j_5qSKTfDi)r+Y3Sn0D#BX
zxdH&-y6(_#+IF+R;?Lw71lpH!7(c5DkFuPs=bR7EQYp2|M>T<nbR5Te?)`Jl^;lvF
zMn~W=hN39Gp8X+}kD05`wDMggwuG<VuEQ^!#bU9X#T%CuM;gwHH`o9G002ovPDHLk
FV1jYQcqjk>

diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png
index 219918544cc972b58236a8a32cea039364ec37df..b47392ea071f0362afaf541887ac19cad27d8b0a 100644
GIT binary patch
delta 546
zcmV+-0^R+`1G)r|BYyx1a7bBm000ie000ie0hKEb8vp<S>`6pHRCt{2mcL5^VHn3B
zNie!p^1u|%bV)K4gvN%3XeelCXt$}qp`jrf+S_U=8g*}TY<F-FY0#AXd4|~uQegMI
z`d%j)zVDrvi(ioU?tQ`M^ZdBydF?P`%>m{Bh5=%+tv;^roqrA#3whhW0-$kWNg&U|
zwQm%H8$fRyrF0cABSR7Jcto<6$}c1ZE~gWMp|GJSZ~>r^fV4)QTP+!;A;U$8p-1l(
z<%9evAa4|y0fH-Wwd%WLJ@@<kpsNcm2qpkDp5F1oZl<8^q4(){2ueACM7a(iDFnj5
z>f?f#2tbYhrGLN%z&&_JAb7-_0`wGfU8z;cJ3iwc0+<mK02(@$vv30Is%3x!(E+eH
z*h}T2@F@4J1<>ns+X0R%H#{G;f1P1nSPp>dowZGQZ3^J#X*!0v0MOf%7$rH^3-|Pq
zz?RHA9VY@5-!ir&HX+%qL15##{uDLi$*(pjcJ(vtEPsO~osdE#Yiie%23;?auaBJL
z+H3%~m}`I<3A)2%9J{22vEjyXO(!HvI=G9F44>{#$I}lWdRN%nKZMOl1THVmC;lHd
zK(q0R#`^jJM6YM~j&Kimw;%{?^<bzEjDtX-@k+Hq&ROfh@O^+npr;yunx5f4vrJvf
kc|5fQU>h2m1I!%Y8)Jd<C)i(issI2007*qoM6N<$f@e?p;Q#;t

delta 430
zcmV;f0a5<C1jhrABYy#oNkl<Zc%1E(J!|VQ6hMzdA#FhJD7|hOoKP?!Q&vHS{^&Op
z@&ihsWU32UTu4fmS`arGq7JQ$^In3#O1t<h!q%1U@x8JQEiEm-j8}ERAP6kLWw)E%
zdt59k?^8=)6oxi`{l43A+3jXy9g)%t20>t5vZpBW&I!4>Z+{hViOwY$g`v$?ql!df
z;N5g;w`t1jW^>ecIPSfZ04fP|iUR)L-+R5QtN)VwLU1>oW-WN#Y)FhDF(x~xWvG36
zM`37vApm$@F40<NbF<kDUx-qbD6GIaT=}1uOD2;EX_^v65dd0i5@Sm3Q(M3#ACJcX
z#Bt2SgLfpMlz%F0MI!;%g8hEacDn_S&#?lH1ORqlCqGY`ravdpRN|s(^26Z(fRvJ3
z*7W=RO6zOCh7P5a9S(;87-JAZ(ChV>&*!XGtHS*Y1EiGMNnWqlC*ub}VE^3Q0MO}l
zc!}f6|Aaz`yvQk(QdVni%e;DdN?S@P?X~Zpd@}dxeJ4wjvsG#=@Ncp_-&*dLmX@F9
Y1IM<tAE64B!2kdN07*qoM6N<$f~_~qbN~PV

diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
index 1e84b43d94..4a16d0c71f 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/security.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/icon.png
index c1010a58da6611943dffdcafba5e19db63a50992..87d994febb8eb12e10c6ab112d6dde73e9de1b1b 100644
GIT binary patch
delta 392
zcmV;30eAkl0-^(uB!3BTNLh0L01m_e01m_fl`9S#00040Nkl<Zc%1E&y-EW?5Xb)k
zExaqV$;FQYKM;h7c?Mf0_!5GoNuk(?51^e2BBEenE9x7FkT*CXol)^nbJr+xXSv=S
z*~JLL&E_!8{+rpEV&=zu>;U>K17H9QfB|3wxOQ3m^!=z=_<uJ5Dt>x(r2PBVGj=z3
zL@yAT0c7!oN*Q^IJ%aVM+tluzEUMV>NKt&ehgw}=0h}EMnAl&zO?4S}o|BG%RB}pW
zv>>#vV5x8kcs|_ZZ4X%~L;}Fh!veUdH&Ce_V{Wzv4-FM>Jv~5IybfIZ@DAp?ij#Eb
z&jO%RbI&1s<bNwx2PDMrn0$|oPl-5=U|BZEX6X!j2|ouz%uG(>Ee!Db^4L{;wCG^9
zR!{xyt&L3iw5}lfib2H^scw)@aalO)Ua$c=i3Ocq2SP!$gEo61wK^an{)n@r{SozY
mdbt4PB?Djp3_#xjz5#i+fJ79`{QCd^002ovPDHLkU;%>a!mXeH

delta 284
zcmV+%0ptFn1GfT@B!B)%L_t(|ob8l5j>0eyhJPp{Ih7?(l@7!Ts<_MrD3c>_0F(=G
z6U23L0=8MYsgf;;a7t4kMNoh+d2F%%BugG?tog<-z~k}!cP1{$L}WuDaIR~VW$CoG
zGel&WxgA7g|D<>v$F^yj-Xx|j$!VHmvp*n7lCE_>6EMbL`+r-)7&E>=p64&)!3Cly
zx=nWL$9OCO0MJ@varuJQ8UPRqF`fW3LrRGt2q2{dGvi#>odw?hOy;whU9MJb{Czy)
z=X82luas(^WmQ%Ee^f+dvn+f1{*_YpUg8~`?m#F6ilTUV_JeeO&$A9)JMUGZOYx7l
iYw!!_@pwFAaTNvIA7Z2|dw$jc0000<MNUMnLSTXcsezXO

diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json
index df6ee47d08..9c2f13fda0 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/service.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png
index 0b1f751416654df08f1a601633bc0a7b0a355984..87d994febb8eb12e10c6ab112d6dde73e9de1b1b 100644
GIT binary patch
delta 392
zcmV;30eAkU0-^(uB!3BTNLh0L01m_e01m_fl`9S#00040Nkl<Zc%1E&y-EW?5Xb)k
zExaqV$;FQYKM;h7c?Mf0_!5GoNuk(?51^e2BBEenE9x7FkT*CXol)^nbJr+xXSv=S
z*~JLL&E_!8{+rpEV&=zu>;U>K17H9QfB|3wxOQ3m^!=z=_<uJ5Dt>x(r2PBVGj=z3
zL@yAT0c7!oN*Q^IJ%aVM+tluzEUMV>NKt&ehgw}=0h}EMnAl&zO?4S}o|BG%RB}pW
zv>>#vV5x8kcs|_ZZ4X%~L;}Fh!veUdH&Ce_V{Wzv4-FM>Jv~5IybfIZ@DAp?ij#Eb
z&jO%RbI&1s<bNwx2PDMrn0$|oPl-5=U|BZEX6X!j2|ouz%uG(>Ee!Db^4L{;wCG^9
zR!{xyt&L3iw5}lfib2H^scw)@aalO)Ua$c=i3Ocq2SP!$gEo61wK^an{)n@r{SozY
mdbt4PB?Djp3_#xjz5#i+fJ79`{QCd^002ovPDHLkU;%>Ax~-1@

delta 267
zcmV+m0rdW&1EvCyB!BHmL_t(|ob8l74}vfdhF=^>%G9Jcv1v3q(UCs^zl49u=BA5o
zH^B-K#=01y1BA+lgME^wx#XIAu3vz|;rMqvn`9y~fe@(b8bwi9t(^=J8D{PV5t*M9
zkD|!5Z9AL9#wIyQ5}eN-;y9jK_d9{6X#npvuPu;e*<if5Kz|s9gYn`50HC$TVgG>E
z8UPRov7P`kLrMwX_aUVOGoz~O$pWK4lihY}j;B)>UoRKj?)Q)NN~!KymSs8rM@2*?
zP1D}@uaq+H5@WEs1A!38^L+5^7wP<+z7B0WpH*T?@vpaQ@eAj0I2>#71p4-0q*qZX
RE&u=k07*qoL<FuvV1iZ8eFXpj

diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json
index dd2fdcc360..62fac00b4e 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png
index f7cddb85c006bad87732439467c85c78cf62e1b3..892f6d12f0e391ba8a708a1639f624d60de62ad1 100644
GIT binary patch
delta 490
zcmV<G0Tuq`1A_#RBYyx1a7bBm000ie000ie0hKEb8vp<SwMj%lRCt{2mdi@RKoo|L
z;6jXbQ5BowrAQEJ=}OTjaN)wG`@V<^@h#jaK9fa|BJqN$XuGgR+{OHdo-j&EXQqkW
z<cBbm3FLg|GIM5@rmO;>0I&vVHg_Y8AA<os_;)k^3IOBIynn;<;TYLM7z3!rq3|oD
zNn{m)a(Rizr{_mb!D6XIo3(ALC>R02$okp_&-?uzWg+V#MCjpt7=H32fTmH<23TIH
za@D7K?p9n<>cR*@3joIV_YSCi+fLTteWTuBpw4|KfpAwVMi65G#P}$oAia20Axxy5
z0(gpC2d`az$A27avLkGz1t4K|oCUg?tMOWkd|re10+k!UU$wsd)OFNF?f@{3D2#&0
z9Y9i$m9zkmV{gmjoS%d@$vW25{NqSA?T%vs-rrv0pH(9jLbjW_BOsgBtQ7%)P>o~$
z`#VN5mUaz@k$5X|I|fLa$7t8mA$1~RT!h?w;zlGVo@3g8<gRddbWA(-I-Q@Lj{To8
zz%UY#dhE*e4DW!uzP#W=OQ#;J4x%&&2*!hMz~6Q2!TLTR5b!hsh|?prqN|Cn<tCoy
g0+59YfT;ug04Xi=uL@&7wg3PC07*qoM6N<$f&g0QVE_OC

delta 460
zcmV;-0W<!C1my#eBYy#`Nkl<Zc%1E(K}*9h6vzJ^LRCmTChorNQg+-mu)`Q^2!h{o
zgF#Uk9)x{^Av-yt7lm%@Vhh&xka$@_ryET>MGyU5N}J@pAMYh8P*G9w$5=%dG#d>G
z0H?OCzdbG%h2xYGXuGb=zJDYMPHkI1%ZL~+Xf_&BC3{*ft$#y8YV1b^RH8!(+O8|J
z)hHs7JF(a8%J(?Ndb8Q-JFwe(B>|w2KrL^={lkNGes=aPxkCtg-L7uIdb2?oMF^uv
zZ&VXX@7}iSN{0{tz_agzbFRl`vl$#hj4F{^fkUYBKl?s9oettS)?=J=gi&M^r?fye
zxgw5Z3`Qd@!G9RbZN*Un4k1X>6lt0Q0B&w?F&+*J#W+d;0Fv#_A9x<d!yyKqx6_Va
z7f=$DejfwR!`;;t02oUgEg*z|5CYfJDJK2CZigwQkD-DwCR?o*0H9W@!QS2%^Z6V>
z5ah-`$(uka)jN5$T73%`1cBucA}{N82qBOp30_}bj75?gLn)P6k$o`6B<Eb39K9^Y
zmXuO?;W&G5H+A*Ch2h>R{fNNVWLb*-f-5R2{uQ5fOvV4I5VPU{0000<MNUMnLSTX(
CyU0-h

diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json
index a36cd58203..9a2c8fdc0e 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/syndicate.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png
new file mode 100644
index 0000000000000000000000000000000000000000..88542905cfcfe65b7cebca3fe31c4d573ba03577
GIT binary patch
literal 442
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|R4@
zr;B4q#hkadHu^OOh_F3~f6U<Qd??826~o1a!PYx}vgz@zKL6lY@DHh2Uhnt=<`Yix
zvUfHfZ7FGZYi07hO;7DkoLA3(^MjrbWb*hfTQUd=Uff@r_$ffj?N#E&1M753-~4=i
z_(g26bWF)3_E#^TiOv7Lx9_QM^P=pJpJIFKI6CE5+$h}m$wvEUFPGmRhumiePoDHu
zty}P<%9ww`)v1Mbi}^Za#a*wznsI0TZst$RE`Hox?y$c@(<<TA9~Wd$KjCWSt+JhA
z2NIKVs^b-Sl~t8L9{+Bh{eGX+uZEsupO;-U{`LAM55op+Z;{yU8-=-7%T-ouAL;A9
zzPp;$;k|~3u3B=@V_w0TXHF@em||9T=i)ZkO9nxc7S9jQGCWzG8RT(stNZ4kYu0V}
zv?tJB&SK5O6UWm_mp(4~q2{Nz&3^UvpZWjNcE@N(S2McFUQlQKVx5#TsoPr+?#AZ7
Z47b#eG|Rk;$^u3PgQu&X%Q~loCIH^*!%hGI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..e34c9a995e155a3d0534937d13ed9f26168a208b
GIT binary patch
literal 409
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|TSC
zr;B4q#hkadHu^OOh#dR4zBDsiN{Rc(6~`d<<yOCW^p>nX|KM5h52<y$-tsPL+pRpN
z==tVJUAEHTdnQ!!ILYwX|9mBtJH-#=mc934V0f_q)s@<WSM5iy{&4xMbNR?;70;E1
zQ90(b)_%J6dgqn?s=u4cF8}i5_5Zt}qj^JNVR*2;&YM!17O!bLi))v2c2w2w-Lv0w
z(y`{odE3|TH)33A__X%=ue-bW&xBQ`Z@inafA{jw%=@oSUw_TNSF^r(o4NqdV-RrQ
z{^Kcp#~pvD&asi=Q}z6;b2~F2bMnLPiyo7{?1=LYy4mgR^X|%vuMZ0oAHUqj?^$E7
zkXY@}d-3e$!|xs!zBKMzm-hLj(e)#rMZW&hJAE}N-Y)XlQ`_GkV@>X@ebpCp@BY?F
y7w^xTCu(n6=qDVID!sz*$hw<RGF?#XvwkyNvfj#awBMKsB;x7n=d#Wzp$Pz(u(wM9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/icon.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1c0aecc28b60399549af6bab33d52822ec5aeed
GIT binary patch
literal 307
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQRV
z#W5tJ_3ac}z9t8O*7?U+)_CNwI5CTVP%=5Txq$0@QpTPR@dHkaypx?Y4sdbDa{V(}
ztQd7B+$jG$ukmJPjwS^T`?O=W0z2#O{+kw}%J85d{LSwZ>}A@!`Oc`yTz+vR@9N{n
zE*^&rKbI-pQF$g3n4qU=WU<WgTGolBm-fo9Zd%8%oRxc(0E5%{!-l@>kEKs%MLD#Z
zZk_o0`oia5kLkHKS_HqDeqhys2_MZT2w$kTPmxIHy1kW`;j4=Agpkx^x%5@WZ}UID
zjAQ(8i~ZJ${@{7Z^|qVerL6bcJLT7dS=>zue^~vm@kOwi|M*%B^e}^`tDnm{r-UW|
DT{(Is

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a37ace23e68bc693b636d6409220d71466ae9ba
GIT binary patch
literal 332
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1G9p
zi(^Q|oVT|Oxehr9v_1^f*}}mcrWA2RFSJNJdi})iincBHT(!B6T7@c1Ez91j;K6ct
zX2yg6zxH^hi3gqO02%=T9UEur|Cvy9{8r=Zmp;~)Ov3jv?ko<{3)UB^&wBW?Xy&gw
zmc7@j4L5R}ojduIXkE2cPg2o0U)xoi4n29r{>nUIs)~|QQBL&KJrjhBwyrc+*l{nv
ze(Gh{y^On0M*@wz-ttZV^eb@=h-C~60!!a3y5;OW_=Y{=YH)7DQ<?qVZ|s_~n1B8I
z@qAZk*pJ%a`aS&%t~C^Jg%$tN+xVL!i+97k$I(~i&(s~*f2I0$cyY})c7_Mu{EVEg
UU+f!Rf<lSG)78&qol`;+0C3!g;s5{u

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..47cfa5ae34c9f561744ba1cfc8a0ccd1dbb792e6
GIT binary patch
literal 349
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|O(!
zr;B4q#hkad4EdT2M2>xIFTBvW=g7$k77w1alox)LiaTPwqe^_Pj7i_IlP#X+b7olx
zXaq!g{@X9=w13Z*)CzwVpvgesF!O9qT+6wH#hK?OzU@AJa!chbhFQ<n=rpW+rsvu1
zv(;Ir-YE2@YNle+cIjiG{Qc|GOCr{?Z~R)Hx~k|x>BhZt7VRp}?mu98-qj^V@HpS1
zujikb?0kJi?7_dva&M82+`QM`1@*hP@jVXKw`~8!ZPGSP9AYs815d+yHW&HVk=u`*
z`Y})PMe^QbtQ?lcA8!9HUs`0hz~{xxMxW3p58qX<?Q>W$lX3IB)3Fy;F)U1Hi&=O7
qrO+2!;}7A+Tnno{eEG+CV4?o;F1P-kci&%v4EJ>Pb6Mw<&;$TKbd<9I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json
new file mode 100644
index 0000000000..9094fa918f
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Originally sprited by belay5 (Discord) then recolored by Nairod (Github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png
index 81512185135281cfe088087f850d732431838ab5..78f7cd2453efbbe1b9cd75a835227c0d872a0a16 100644
GIT binary patch
delta 589
zcmV-T0<!&^1MUQn7*YrW0001;w}I>c0004VQb$4nuFf3k00004XF*Lt006O%3;baP
z0000FP)t-sAs`|d7#c4wF+xE^00014tKnM!000GaQchF<|Ns90`?d~KkuDd10oO@H
zK~z{r?N-~C#2^S$+yDROO^}%af}OLoPkWk&Rt$~tQnj65;t_ZR2rJNLpsy8u$ZK?Y
zDNJ%}gAty&LhE3F(Jg<K+rdwnfRff(w4=9!Xx;MfVmqJ=mI)(KAm62d?)Xb!41788
z>MUyQg-O7`Ow(E;0Ch-<0E=3Gdx4cN0n1-fy)%gxSzJMW5T18l)qzGUL_f@tjpz+<
zvt+?Opb5`=fr(lm;cWm)TB!Qar-C10uf{%<2H1i?qY0la0$NVM`HKmmxu_qo8VF-R
zverm>E5HGS%`yMl6>!f*<QIYsuuAd7dY$0{>cc^E4TLVRg<Tg`-U`fr0S*=oQa(6%
zKQp9!)!N5+1Req6zX|Mj#0mV2{u_N0ICYO334D&z(WV#yZ1}hw@Q$Dr3qX-~CxaE>
zb|{yKLP02=pLR!Z4vv9a2oEQ%2@t9ysd9krRBji00VI_I*sVCo)gTBZIfZ~cc!}6J
znBCtA$N?+y0=7RJF9f7;EFL9ZAnsWxy7215)<HDj1Oym^+Cg%GS_L+XIpbD=s(m6M
zi|&4oKX<^Tti=Re%36HE3xLKir$GY#sNojpBUrraLgW_*m?{kta2jtM+z;Z`!7uQo
bz<K@vf$uoKMFslg00000NkvXXu0mjft55n<

delta 397
zcmV;80doHC1e*hp7=Hu<00013M{Ml?0004VQb$4o*~u(_00009a7bBm000XU000XU
z0RWnu7ytkO6;Mo6MF0Q*C?_jTOiwm7IAda7E-f(|8XS3l=hFZH00(qZPE!E?|NsC0
z|D}JX`v3p|3`s;mRCt{2l)-L<AP|O!m~a*_dzU49E{@rIS%1<8Xwti`hWCGjvbXs)
zv1xj&|82%^KE!}TXZ{lFeJg9_s4=p(Imw#3o?{Rr-McYaDy;qbw4z}L?*|E}F@$)u
zgqn?+WgW`e0}w)x4ds}@psS(C+UIlwpc-UDn=)Sx4fQ1v=yH|~{q$ZA)Q#r^pLXUr
z0pR=<09{Z(ihm;=r%XQpXU_a4?rqy?@C+K$;&Wy2@{T!zqgnDpj$DWzFi}P(dEKXa
z?yUrRZb>5$f&^090n8HMo#DAP+%`a2&~PsR)T_U43<SHVutP(9X#rT11i}Xbs-*>i
r`>O}hgRHI-ZKL3qQraEx&+`q(U?z<<az8`>0000<MFvhpu0mjf{Y9ny

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png
index 2c2e17abe253a74a2214ce5188b2396369cb889a..b1405b8b062bf244f9cd2dfa3154eb5b6e0616e4 100644
GIT binary patch
delta 208
zcmV;>05AXa0qg;gB!3T3OjJd{z`!9OA}=m685kNuK}1D=0x<vp00DGTPE!Ct=GbNc
z004_gL_t(2k<F0N5yLPDLvft}D(nGDx_~JipuT4RnQH&U&<Vny-U%Io=-QKjdjM=E
zUW1DYmfl2;gZXoUDgrR~mGG^-_V-Fryo8@9C&)TMY2*mtHA&HQghQvppPFop2U+($
zW)wg}IRh+!41|qg`7;b@-g1+c`QgAein@2qm6pRw8qGCax<Y?Z$qwP+W>BL50000<
KMNUMnLSTZ)D_7_M

delta 216
zcmaFE_=RzTN<Cw7kh>G(&67Iy3=9mM1s;*b3=G`DAk4@xYmNj^P&&XT#1%*@E2){8
zT7(1#I61ob`uOYV8tUsAN{CB7y?XB)NN-7yUogXeC@^Q5eFZ2O>*?YcQZXkvK_aRl
zu%ppaAkyJRpy$O%22TeU6Wvgj$iRk;H*W3}INIapc+gFRF+DxqJ%y2PK^LD0;{q=J
zKUyuly{Z9ow32d^8k7{?J?hgs5YhKYPvJ#If<z1h1Itccu0@mc4g+ms@O1TaS?83{
F1OSw4NBaN(

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
index 3f816376c7..9ae7fc3f93 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified by Taral from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894",
+    "copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
index fdbed82bd34d13c306f3465bcdd2e638a190db1b..45ba5b9a32f108cb8abc0924565b771e5374220b 100644
GIT binary patch
delta 634
zcmV-=0)_pW42T7g8Gi!+005o0f$RVP00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000kAOjJc7AR-wU8ZRy}LP10T003F5;adOz00neXPE-H?|Nj8{whmJO000SaNLh0L
z01m?d01m?e$8V@)0005;Nkl<ZSV!%a;c|o^41@uF|7Y%QvVRIeqMiEZrgLAl2W(gZ
z9C~Gc$=BfD85FPR<4Uci@T#gCLvX2$wbJU^ft_1xG*Jub<+4>=wQdEM+D0I@wryK$
zK|hPNp?5(5Qrud|(x6V60i!+`AVDNhE2gkCK<bzQ<`DF5z`1Dz6xG`C1vG+w7@!q1
z&<H3GvououD1RVz+XnnWWG&*l5*YQv0KN!t5Kx-h4^llE*goGFEc8AF-kzcr)qWt|
zmtfS-#UP$zXbP<KP{Vfs-?Mq}j-@#1QwF}s8Qe<TsyR~z*AYe_^HR+j4Jsp`-^~H2
zEJg$Ng`UoVeR&0oU|?s&p9(8*%$Q|7Y0-c=;J@lK-hcIt0T+1QhG1Y47SgL1d;zCr
z%z}T-*WhbFKFa`4lk^;%%t5n3dK3i$QiEbIcYD36Wx_SyV=sLI{W`z^;k<TC@*uT<
z(aYakHjJ7AuK3$YP2g%U1$0cfGvFheZ-xg0LrowU*c=hJ-b`04C^JBS53pQCNwB#y
zz^@cOn{$^~U*?e+aCq)j(w`B~n8ez^--*<%w!lUJ;|Ny+WN5Vohn5*o;40?^(9j|1
z(E$3RL0Eywz;^1vK+A9v4Zs`_ScuUeAG~w-E6t~%@{*@1AcH4^PtV{FyfoPN9}aXj
U)vm(W;Q#;t07*qoM6N<$f~3+EW&i*H

delta 1556
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
GLSTYy#r;J9

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
index bb2e517bde2189b79082556ac73bb37be78733d3..fde6c90e2ca57d106b00eb220ca18de671a779c3 100644
GIT binary patch
delta 215
zcmV;|04V>Z0_Opc7=Hu<0001iRA<Kk000kAOjJd{z`!pqF(Du#85kNuK}5OVk1+rM
z00DGTPE!Ct=GbNc004$bL_t(2k<HH04Z<)C1kgYhAT9$WJ_bm9od9+JnFvT2S3>;s
zhy2}>?OaO#^-8(y@(FA)p9eWCz-`QlwR+B1+qV0<d_brQ3s9i18*l)gD}*1RSt(-d
zZxDsZqUznGgJd-aR<wc&Uzs$&4RLlSWAiT)vs11ST2EsS$n7_1Pqu?Y?*URH5xMal
R%-sM0002ovPDHLkV1g#FR5btq

delta 278
zcmV+x0qOqd0i^<v7=H)@0000)q>9D>001^nOjJbx001^NHcCoL78VvNDk?xgKsY!!
zA|fJ1MMW|)G9e)$8X6iVCMFjb7cDI<LqkJ5J3CHJPDK|;VgLXD0d!JMQvg8b*k%9#
z0G&xhK~y-6-H_1^!ypJn6%cHhw)_8|-8E@nD$SDZt(eF~PJgaSN)L;iuj0}tVnG%r
ziiliF7Bx1NA!mSdW;3m7He>)SE4#n2oYy4)5;v}@i)w`mU&-PE2kdblz~OKU_~GCY
zU_@qzgN<SW3g&eFf~W*Q!H@)V5acog$;Of63w{=1xO;D@^=-c+_V*W{qn|+ZpB?_c
c;-T>YXqX08ZVw|N-T(jq07*qoM6N<$f`<rYSpWb4

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
index 30607d47ea..afdd4120b5 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
index 427c203b198f8124ab283106ea28c080a1f0a726..0063e8cda0675fb529c930e37cd2a780fc8cd565 100644
GIT binary patch
delta 399
zcmcc4G?#gTL_G&H0|Ud{?Tv4M6k~CayA#8@b22Z19F}xPUq=Rpjs4tz5?O(K{s5m4
zS5XlWMFk~&Jwqo)7ogZjyDzta6l+P4U+{k*VEDa_FBmAmS>O>_%)r2R7=#&*=dVZs
z8qVhF;usR){&w0~K4wLZ7RPUY=kMgHzrnldpGjs_#-Z{E)dv<|0+zh?_FBMlK*6Eo
zjd43?LI0e9v%N0j3(cnOQ50i4^s#G4{xrorIXi_+2exkK11d@<lUin#U1(E&Y3?w&
z`Jmt?F*BwdvFUtUEK6VX-aB&O(~1{`Zme&bdK)5RxW9-^W4bKO<jxKzGy;Fs9jjN_
zul>J6NP{teNtMA%f%Ap@|Ef)8TT*N;hbL@)zu-Wn#WCA+%U;gEsNPifSaso@?YlqL
zsmm|txqkKM_BW5twRY(={M^2!VUB7!lRCRQW3BQVnIGIQ-TC(Hy_}zrZF4pJ!SA!&
o59e0N{b~YQ^5Hwv^{-3|(`{D8KYFbO3@8Q;Pgg&ebxsLQ019rRi~s-t

delta 328
zcmV-O0k{601J?qO7=Hu<00013M{Ml?001gbOjJbx000;l86zSlDJdyBIX*l(KS4l1
zLqbMHMMYCmR#jD1S5{hCSy^swZg}atJpcdz0d!JMQvg8b*k%9#0NY7KK~zY`?bAI9
z!axuO;D;lm_XK)_g;9$I!B$%l4-iO^Dv&}XWsb7l66+MXL4Q~)TfK{=Gw}xmv5>s(
z4If(!J3yarW@v!vn~rr1N|*P(%9#(MgB-}oUNlWEU!Wr|6xcVl2G#YVz^<t`8iep6
zDE1oo&?>OynFgu%u^ceSs7=k2L=K3{k`*B4{y+8kv*_CeV9)BC6UeGVA!i^5W1tIw
zK?j^ASUiBpo<StIxU2)n1_^>Q3Ycer6o_mkLF+OFCcxZF;A3E<_5e;KNEk5PWxgzZ
aev=zDtvcEW$;fR00000<MNUMnLSTX&ZGfu)

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
index e70741f1ff9e9d7153845eb7c8e05692c367083c..a92566d30878578d94b05820d81a8d90151f425d 100644
GIT binary patch
delta 165
zcmV;W09yb20l@)~B!3T3OjJd{z`!pqF(Du#6%-UgK}72^)p!5^00DGTPE!Ct=GbNc
z003Y~L_t(2k=2jE5r7~N0}(0+HozSgfOj^4(tl0*Gk$z)o;#b&B!n+#$`+!5K;O!;
z_8Uah{g6x@shFh@h~{RzngGlUWQ@_dVwaH{8>%X=h6_*`Bpy@s#~XKV;b%Dk5f};t
TA?!hr00000NkvXXu0mjfnGHSE

delta 224
zcmX@e_=j<VO1(;ePlzi681VD+i;0QJ$;ml7IJmmH1_lO(hK5E)M&{+^)zsA7NR{~r
zRK{2m<QL4~@a#q!kkjVr;uxZFJ~=_cVM8@DGxPU6mif_JS{e`97BI&&EKTNQZVqo}
zc2d}K;;5^wh~j~Wi%XYmS>()+*x_<~Rj6z)&xuGThXyT!;%7W6jK_LrI$Y>7XqHrJ
zNYUNJpzWf-;K_X=Ktxv|dm^ioBa??;dO<gXmWN}Jgm+d(#th~nj-3n#9gYbwGfaAJ
V@N%)$o^2p+c)I$ztaD0e0supQN-qEa

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
index e482264df5..afdd4120b5 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/security.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",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png
index fb4087b662b9e233ad0108c8419361b5871021a9..59d6ea3b487304fc77f4cf2eafd6190208d4dec4 100644
GIT binary patch
delta 429
zcmV;e0aE^~1LOmcL4OrcOjJcLE-^wuK_en2LP11SQ&1Qe82|tP@FPV200007bW%=J
z|NsC0|Nj6QO9Ms#000SaNLh0L01m<c01m<d6(~x80003+Nkl<ZSV!%a+YZ7o2!<Jy
zz5gT2DG_>7<AsUow>Zm6f1oo`xWD8G908>YsI`;45b=s}P=DNk@J3oITnGT2Lh(kV
zMu=gJ080j30~CuT004(I!j?guuO&3epsh<lAR?$4W^d8}5`x0+na*bc(D-t#Qh+G2
zW*y&(l{ggngkulNd=}7mpx5d($WpdX*hWcbw#yl-VfPwUz6($R`5n~tRX|MW9=zmJ
z|A8ZL1e7Ci1b>u&6OhgqqYa%?7Ld*^-E)@|$a48>&kEUF$H3f{X;5R<=G-p|n%%8|
z+Gs#$yzRKFk$f#M+Zn;^0d1Uq{74Q-z_h(RnmzFBoXKGjkS*9{;Jtk=U{mj9U^k~1
zz*l?Vd75qH5?oxuq=y-uai4h!UYVW*&6=RcME%YsP9}n_j|j7wrSrQSfg_;&THwAP
Xj1pUE|AAcn00000NkvXXu0mjf14_G%

delta 372
zcmaFDyoPy#W4&~MPl&6&o}rVYi=u*3NN_+}YNCX=q_UElxtRq61A~^0$ORz9SrX(I
z{2vM!g8eImK!ODxk;M!Qe1}1p@p%4<6b1%HR!<klkO=p;)9&&eR^V{EShn{4|0BO0
zvJ)1)tjn8LaLH8YLr6Ju$UYSo#e_QT`V|N7%)IjZP>6cp39*bI#YIya5+2;=Su{mR
zL`pbyN$@FMDMz^*d&E-SJWEe=kPELkDSdF8^M-tG#?1mB)F;g6+BE0Dv-^7v{bE_6
zP#0y=q*AeEMG}jJN=7!ndOoYXK$C!hA_t>zQ#^NH^SNzviY^syS-OCAQ(Q@TKzn;)
zaBA-4?^$*)PDW|1cx6@jp+|w6{mZdi)2~ce)b%v$Qi5v9i@D){xtkl(SvX~XeR#mV
z<n^f@g@w-Yav{xfEZf&T;MO}_<FKPBYrkNKm~hkdS#sa?fYyEf-V`+N;=?Ki21Sp(
Qz;I&lboFyt=akR{05HLs6951J

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png
index f2b15dd82f3963c97d0c61ca6c2b1c257f997f75..23bb26f648e97e4678527d50e7f2b4320711dab2 100644
GIT binary patch
delta 179
zcmbQrbeM61L_G^L0|P^2NcwRgB^2Nj;(Fk~0c9mMeLcgF-~cB_7YT96%$=R)Kv~9;
zAirP+hi5m^fSh<w7sn8diOC5PPaFaQ7+Tk_Sh8eA!;y3&!5|?+C$Rz^5uOq!F#%IU
zLs2K81RfC)5gr$z1W`jnLqSzfSA_^y1}6v6HBO8={ap$htS7KU_%cg4`A)PI=Mv#b
cknmw(D3s-W=;u@R3TPLDr>mdKI;Vst09n8=KmY&$

delta 261
zcmX@iIF)IFL_G&H0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rP=HT}
ztAx0uzMi3zqf1(9Vn}cRP}tyDaWIf#D+%%o{tp5SoA)o-4;0}n@Q5sCVBk9p!i>lB
zSEK+1t2|vCLoEE?P6*^Xs=&cg&RF-p{^@ou`AasJxJwop&gSblTJ=zPQagi<c9hx~
zo;6eMFv*%6nthQaG&nY`kx|KlYnFn*tVN$5a!DO{^Cm2G`2~hm*S-gGl$RFtd*0Cf
z!nSRGDfjQLz00(>9o(!fU*(~tYWo*xpm^e1`L*wa96$4YzXx;%gQu&X%Q~loCIF))
BUr7J}

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
index e0d437b8ec..afdd4120b5 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.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/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eadcdc1c1ab3fbd2bf67c5055286b407e2e4a60
GIT binary patch
literal 9460
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 35003686d555624fcac17b387f726605cd147bd7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index fe470b0074272a504eac30798883e5e2c6c5e027..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 06932fff6fa7370f5410813dea7991e4cf15cae8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 553d9e2f64723d236c10d8feeb56c23836529b00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9782
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
LZBvHT-ot+bfr+RI

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 19b5dc75afffdae7d345415572ef0d33fb92b869..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10959
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
Ut|q6&?+>jkZ8l`B|7rjK0J;kVAOHXW

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index dfbe6e460dd870ae473d5042fa72e2cfeeed123c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 03b6d3cf8602c5439dd03c8d5bad3a157deca91f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10546
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
K>l=SM@IL^A4Qvnq

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index c818593ba46bff87d23d00c5112b215da5e0e884..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9675
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
Bn@j)z

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 5ce9bf097d39502939b7184dc3dd07095fc242f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10494
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
G>%RazGBOqb

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 3503762d73365fe88c1a01d3aa4297e916fe3b23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..631fcc2c946a0131aff878e41b8da273a212dd19
GIT binary patch
literal 8727
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..6377db6f2e65dae97ff2fe448a29c96196e57c01
GIT binary patch
literal 9455
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
a2hi|>*QIHm6bl{BIt>*a<)@0*ZvG!trPjOv

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..1055ce095cd7522fd695dc0ccd92a645ca009c12
GIT binary patch
literal 8689
zcmeHMcTkgC(+^TrK#CwzBSmT;A+%5hLRC6SFR2hD1d>2PN9BTmh=7VBAT~t0f^<|s
zX#xULr7Kbeq=P7Y0dMin_s)ECXTJBpo5}O!IeT`0XZN?eXL6DlOLHT(L;QyT005hb
zG2EK=d1~)sVWQo0aDF2I0K06Etv%TqK>_*_30Ryr21pL{#Q-r>92Nkeewa^nND{AL
zgYO0&5;{?y+&J!)B{01i)P6ZHKi6qEwJ`C?eOWPC-Xwq^JF`dYw?3V+EoPk)kx0E(
ziJt57VR~#m$}g_Z?L3)!?>Zimarf)c$3=_2wn4T=iFX5|;gjo{yOlnpOyw5wgr)jZ
zh0XZgkO!Ko&RdEd(8Ru2LAOb$W#}+vgKb;xX~Fi;@XD#c-QoK5KIBWn3}IzSuZfB?
zY*=Xr5q`XRys?ncG^e`R09&4^?jZ@r=cbGw4J{X{>ig8Du(LV)wTvJl=%YQn`O)`S
z#@tTa-LAo{`N}P7eZ!(qaP<blprFR=i*|m~{D$)GSija=Z55Qk;e!fUjoB#@Q+LL7
zorS&!g8a~7VxucC8Ka61%9kgr8+u?-`MsPm_)F=f1NfBmD200VUcMpX?PAiUh-t^A
zfwQWYlO*H?1FF8{-hIK5>nF-zU6q2oDCqDG((e7+?Z=<3JdU?!0CpP?VH>rJS8Jl3
z(U6hUMu)t&2dQ%UiSH#7I613C9yfd%>swljz7QdK;!0y1BmH2{;)$S=#r|c<j*KbM
zDUEpV3}(JVw%}GFhbwE5W2U`EcfQ<6f7|=9NiTx`w4|!D<N*~!RfmU%M<kIpX<3su
zyuSqY8c^J#6E4G7n>~;=p<?zY;9ryV>GVP0_>fnmC+(5(psl0UXPO_T!M#D-g2Yzo
zDQ99^{w9~H+>;4wQ&4{8?0Aj6P22NsM<-N!LsNW;6C_@C*nd<%L2GU3bYTtK7_{!P
zSiELS_5(B3ACdgn)WDk#9!>#tk9f{G<1oc7Il1_v(jV*^3neS^RSWC9&n0to1j9L$
zx8ZH+#xoV)d6f$$zl$sRLiphjF{He`XvV<{j2-5Xs#vyKX=3caSs@2bp|~rtZ6&dM
zoUCv8kClCH(+F5h-2PO4`+69^>V{+@^w6-|<sqk`))tGQ7cn1f@dA=a3a<>ag2lRD
z_>D<Zn;LbGm2b;-@51LUIG$t;+_=UoZ+iY}S_4C{R@QA+^Qi`Lmxkpkv;fJzuf^vL
z2h%-&d_2>d_{%M3Sy8apXdp(*h3S})R~tY!J6m><H*uZh59V<>V|Po#^>wv%vnsh{
zTe!Mlne3AL&hpON;G&k$?#t#+FWjlHaVVZDN$IPU@tkdEqSlpZAAT#Bzn#W?^NmB9
z+xhlNEDoP)KVHVMB`L9-OnU9>UO|=p{5;eYH4#rAA{3m$rw=W@fH97Yp<ZNo8caRu
zbKS_TSd6YXj(XL(J|}05+1{i073!@_aC}jl&sM+Yv(ZdgmetqBA#L#XLf~4HC$7Tm
zYM@gwrREXeyTNLT>lB8x)8A@1xj5snw0uT`G`Dm-#?tp?<8V>!jSj~wRwJV%>w+4|
zT4yM#ePB6{PdT9ReT8Hru)oJt(-rw+G%Y4!F=MHZH;6BrJ4c<@KBA&&qH|u5r*aIT
zSY6m9@Rd#>k9@XDQB8F6jijy1@Bk_dl6*kfLj=O(-mS~e`$5})uJOxpKmItL{FRR%
z{E$GXT|d4R>rvPdv*b(4tsUSxQIfbm#MhAYW%W3PjkN|S6`~r*T<`=)8IO>2lku@P
zfthL|2ED{Ybzgh(JbRYA^<wxr*8)4t>^5@T@|?~ywhlXcC^a(vmNb_tH+q)g+$E*v
z_m_Cikw1^U!q;0LV>V<#e+@Uqc=0TR$Q%1)T}7Iv^B#bs0Tq%TO>Vt5ImRvd{b|$L
z&+Ata6s8f9lx#%iCm|xUx3R|n&zVX3yz$Qi#wLe{qYSw=lkQ{@4Pso~ziR3)SBFgL
zECEnJs>U<03aKCK9LME<Yw8;r3j>~i9Cl^~)tli5gIG?>)n1a-Y=GIUsdcoxpKLr+
znBp4cMb~H<F5u;){z3uI)oK!TplP!Bp1pldxo(aNXNZ-%Fj6$9vu{S~+;irWD}Iq^
zKY^H!g{7r$Hqsg9hp$~0*T`J1FIGGp@SyyHGUp&$xCFCiM-e>sY17N{$tQ(uUloX%
z`R;L6fv#gmrK5!K%d9G!15%F}GS?q<OhHsIZmgub3OcIGL%Y%mhT2mif!XpBe%)!O
zGTj#14rZ@RyPI0GM037BEXaG)(8&N7m0a*F_Q>YbRI>Y3R?!v1&!28&u50OTCue>(
zx6Jlcg*4pEMYtL?*}LkwPxN0mn|M5>YBMDno@Bu|c^>lqE$5LG6N$LOqQ;=*rrDlh
zquWfSqmVL}akT0Y6OraMdd6`y`BLwNm$olXm1D2s?K9m!vL3Cfwvaz|=WZ(3L!x}h
z5cDBFCGvcZpOmB1x)s**lIpqkNlHPM4Oda!RsX0;M<=*9V%@s#%lqHb)tOLMU}LH1
z&OrA7oer~uw@#FFXx&S?sm(fJQCzCmCUmm4@$eP78NrE6meA2i_6A>GW0U&Adr$jR
ziu!nWjvh@rGCh-Jt&>>)y;Zh9>Dar=Kpwr!7w`ey$^`LfdJ5!`c#A-VJ-nbhy8Oow
zf;Xo@&hlJ2Y4Q5g^4B-TZ*yHKVNXJR!1oVkzqW!FIUam#ClC;Iwo5o$Wt#VCP#f9R
zR~zFD_tF2X_tp@NgfM#YS-xAbmg(m+xxs#0IFGI8kQ%Zgz?i`==C1sWdOL>*^0s~N
zI)~ZWSDsYvZjT!t+`EZ2zDzM65juWVtGGm^)T)v0v;-v?;UgUkE^U|J%r1Uf;QsP8
zErR0ivBN=eLr`iWJVp|yUTcp&SZEkhIN{;b%1NKPT9ME-@<9rgXR@W9EqtbX*`XG2
z(g^v5QW7|+MCp*;a;@9R7U7E}re~`?Mq0jOR^0he9>qU+ghM!p$?h6Bfvj)b33Z~Z
z$3OXDa|S<T=c02yU|ISRX-&XtQph@-(F&g5?(AnFQ}pB!^19fqTkF9Cueoq7miZmG
zlCL~Db4IL(EnfJL)N?0l<y@mWtnWou$pukj`dK%<_q`FXZqm`+kv^Z&ASd1V)!%C{
z5+Nja2yY?NG~FGacYQHB<=a63<2avx@Hr~fXoF*j?95Ul@=){>XLPr4v{xp~poy5Y
zZA<6KE~M<-sf)gt43L}j+}gQv-XXT@0INtqQnuvEib?%=(ZjQKq1?gzB5UPau9+JZ
zau42L%kbAzlkBtHii?%sD9n5q)#VN-%jB%QDtIto^fy7BfR6}=pf9%4QlqIy=*sk1
zrU{98C!<=E2CW12%nBVJl}tgJ!z;)!;~k;q>0C0JAGkk+)rw7OoLwDF+tumVT|b2s
zA2;Iv`sBcDi&e{MO}t~Aj%6JplA*o}oN=X0*uKD~a-JIGy<GuOE^IHscivh~*{N33
zB0vwNI6q1^Oyc!|J02{Uk$#e_;5B4qxAfqV;#mV36Opc+64Qi8P7d$BuIw``3x$gz
zRD)gR`(2OP5ONYIhr%JYrle$zk@(Tk=~vvXidNnfoN$irU774{gWMy`#+a=$Kj!Z*
z;9JhDJ)ap9G`r~deR{#?J4tp|UpDNzfN-&q@Fy!*&J*=uuO>SKvG+GR=4{eD9^NRz
zi;dXMWe06bEEiC2AG?(JwcGGGn_tvgwkGvhSd6syL~$tDbgLreRyg&w6u`0SZj@NF
zjWbV!<_{(|mAtsAY14o*HMm)MX-HI1(?hJwQ~3|t-8+p<1D`7I$+mUg>rgCllIS|s
z0~7to><PScO1H|&w-l$ur@9o|VpWsd<P>kZdRp~qPThSCo~J9Xqj`k_<X<t~KGWEB
z?*6)s_7WFgX+c6Ni)UKvtmoD46BiPuB`%#ZvBT5Pw#!V^bi}Pa!P6gHf7bC@!ZR*e
zaV!L+Dx=%X`tr{A7sq!8gBiwV@W~O2i-Qcd*WKG5ns-)rbrSBcm7Xmk5=`zNeLETd
z-2=+hYQEguezbU^e>j{1eYf6x*<*XbUD^7r!)R~p!o^Lm42uNz`LyAPsEhMAqrA$e
zgTRO5pJdR{dk~&VzIjvWz@ki@aqe~AqEGS%nHVoxTbS6r^N^}1$<MQ<4Lnx`Tw+@*
z9qvi|D3N(#qtlSZY};XH6|^&w>}l-i9}^|+uQZ`Eyg2u~Gwc3FO35AU%m*U?0mj^k
z)=xiQmL<Y==QEsmqI6p3+2ue*VsasX3YX%G?z@`TEN;s5M*O;pgMpl9dB1pqTXQC;
z)@ZP+mj~B$-%ziL+ex69LX6>=YUy0E%oCCX5^8D%<he<?@k8^MJHOgEo#P57hMe9)
zWSE+}c*znn!e!~LOb81ywX@o*@x1GY&EW^S=xjQ|B*zAILq4#t+C_|N1BSlyZ?V=y
zRjJC)4U|`JfW#crg(JBrDmJeo2Rsx$%R%TSE*(yUwZ)6?ILPtglQYh4*U3(V)kdB0
z$HQz{PGCjPOKG`$2@5!Bo}7ohcj@(&3YTEFp~oKsFXWFnAbH%S3b)_K+{I5n`uxen
zgNI2V_whYG6AeCBP{jke_h!}sM(N~h00WSHZ*TV(#nZ#4xlvhD)KN%jCE@5?t}{Dj
zr}L2kOKH%LT>x&C9BTKY)lM`z+T3?|xctd6Ic>$Q1R-<ACq;H0@+Y<H-Wm6t9&~jW
zBwBoW;1!@64h<>)K7ye1wOBQ(wJ2X>;}^?o^)`yJmF5iMK%O+>?WuzTTh#n30e(h>
z`fThY7=DZ6Pi+$=vTTy9gTJli#!nsbaJ*~W^Kyk9MY8S&$6rLz8S*4}#m&E$XY>0}
zQted!&g5)Xf@rb3t;e(Yo8rvNquL8Ep`Gm<dG3s-e@kxgIlgpT2W;ofB>Y(TQE&x^
zYHkgGkz=*d;e%CLLic|>o5B=~`o9fV+ZAHg<7zdv-VvaFC$g@%_}>Nq=zMVc`j$8p
zigrj$^G|G(g<J78ghTbAd=8o7pXH<Eq^zEGOR3Z&vDa&{3(6G3Hs`Wnk1lksx7_vL
z`ZpankMzqpnMzwHrPmb3lWQ8YZ@;cc-`)vo4;*O^WZy&uJ{ap|)2o$HUuw=)xs&?-
zqD7=<X1dQsT>bOMT-+u*LW`=Kwl%_*H9MmlQ=X2k<xHD;bz)KTM}KRKM9CUBEk*g>
zNj$A^Xz}od2JzJR;YV{kVYX@cUvrU?$3>W5&OX7Mw=YD9O&yKgjuiVXq<IsTP-&uu
zY7>7L(DJ2DqFvldiEJvD__!&;_O#;mpz7xQ9jt?9)OUP~+Q+6OZo<oKiJ8<yuh@)4
z1q+AII~o>!g2FlEBS!ajYFAu?faQ#L?__NFjRoF~<|vPb=FYm^OfwvXkLGzLYI!<b
zN?ysyBGk{QlZOUyl0QI<=x=7+8434bjQMsQYHrQ59_bI9j0;-0UFzE9S6g;&{-)4D
z@3Hy@l1@iEu%E@z4(#@3XVg&yygUL;Kw{*ncwgFq9stnPq52|F=P_g;661mM(Gp#(
zdMOITp|wQql+D0qzWNwXoN*8lV-sX<iwZiAf}urqv=3=g)oB2D3>g8W;=O%H>QpV!
zeOz_g^PX5i6u7TKKCdNeZ)OS9ClE0}C3z)zFvx(43s4l*J_OVxqOt1MaKqmrXd^9A
zPcqq8T|t3Dp~zF9@&uxX0t5zwDS#Cf6cs@<4G<~Nhm4?td`Mz@5I-^C7!rzz^Cja5
zKEORp1d`xS))Ez^%>)1N5ASPc_9wg#>30@rd?-*6z6ua|umT>h@T&!hY!E;L`Q4%a
zXhE{2{qCV)jUf^Ii71Rg0LF(b_A3M$^{2hBKhb+X95hM+<Bh@7R7tc|A%9!a$i&R@
zPm4VYJaBm5eJdK-f72x6uz!*DH{bSV_QUzr5t{j*xPR0BBldk|nwFWFI-G#=-*e9d
zt|hv+zB-zK!lBjoACX8X7z;x|K`<0b1*D{^1O*{sNHq`|s-^^1f~i2%6tTZRnfQ>%
z2p<$?4~hmZkE7uzDJdaUP+(P%8U#XvP*YU~!Jtqq2nJJA!=k`ov<h0~7YGX?j#iZj
z?_a&zgF@4wFe(rz7_5o`sX#FpkdmSj7z9&RQUoC&U^G+}0;Tzi*oQ)+)C~zlJc5=^
z93J6;QSkNg*q_)VTwT}FL`zgr9{iWY(i=g>(hO)lfb&5UD5SrpY;kyu4H>b=CqxyZ
z0##C0QC5N|t0}=$|57@KA(CjdxQ7Y>%R?3SXZ8}KP78-dEn=@yX#o3jS~TkVL=1vV
zAlecL-ddu2P678U|C~0XH53{_M!*qd3=I^lsH6^7R#$}BDk`cgfz_3jKwz5W7kvU6
zhYkF{wD;NvsQEML#yApf{lI<E&z`cu`28IH9D3vSn+XWqZwqw<>SqWfL;wc8?<WoG
z=M>5l;p2g!?H|7v>>qO6e<%j93QQS`L8C!PFh&iegiu3))KoA^Aea&o3`QtHAZW#(
z#qcLOiGU?j5JZfw2aQJ>SF{4%=L#tGd#a@W?hVBgvzG@NWi*aJQ1BjQU=?*`RZ)fi
zet1wNMKu%>jRL{c5Kxd38ifGCz=|p$TC-qPRFNo{8tP|({=bB$4Em)a{s>P~VQ)kH
zBbk~C|0~@;6@J-4X|(*5(ROCqMz8SaPX9Y!G++Oluiwk;zqteu`0pbBh~Izd`j@VM
z#K1pN{<pgRrRyIt@Q;-Lt*-w!x(@wyR>b(wzTi=4Cqc@=Ej8LHk_ma*2o87wxCJnH
zaKOriCOPP9>_7ql<i++bI_e{x0Gg1QY+`1>Jk7{^KuU#Q(dh&LK<{k=*R|dI)40~+
zy`^B|OR`X|oV;!%@XZyqV-+06XUh3u9P%eK%KiFlWivG6b|Ye3wS2#dfP+p5f=8~z
z#MIGEUA&ig(82dwONkI_t>}5M_xzXO^N;HmljTnLxo!Wb84V77S@uHY6bFMY2ZNva
z%sAwnQ3D7gbs_)AqGQ2nGczYcU89}B#~DRwX0$>0GryI5p=a4*dDlc5FTRqRR(|~H
z=}pp&Bx$n6D4lVZB*?6S@p;i9jMVt7bC^4CGqtsgC_*p7SgH-k9<_67pJK+I4@mo#
zB=X>ScQwXHO9y=TL8eB{0_%@TdZK33^X`yLv5P%rq1RA$=?VFu`wCl}1oBGQX^#Ge
z!6~PLxuT`EZ_N+P@?IN0m0LqesKicmW);0C<jlO`-*=)>W#?^NG<9p@#p6)P@?pY8
zIYWLPYNLGOt*bZtE&CEIATv)NG=1tJi&Tn>S>bRfgJ4)x(0wuP3WilSdhR%0m5kVT
z%=pzp_@{WnN~ZRKSg>ixw<I^W?^$I<U6~{|lt`-PWf+P1_AK3GtB~ii`=_Oe?v%l{
zO5z0GYz1y4{7Nxm;+<9_mhKflDUYrRU};f$4<7q`^?Jt9mO~ledQ5BPz6ms}jlx&8
z=z*zrcM6ZySd^_|GVXof3_4l^!E!!h*ECkW`WAb1lfM-;cKYQ(&d`HXg5v<e1&l@L
zZlUjwV^UaByJEj<iU6ZfbW_GRkX-D5;EzxVmW#kY-|CTb^Z9)$YKs{mmJH)Z`ZRP4
zDPe7E2Zp^uI2M7y@CUBax7|19YGjP+ysK@v-K+g#Pf|n26wR|F^FPnB0bbR_4Tejw
zxW<RCqgVmg5}&bDpQ>x{(F7P3RbYYML$jQMZmA)xngBUR2f_daC97O_ze4z)wW3Cj
z(O4>j$G0c}W{i*wfNw;Z9`UhTEVERMwYSXYN<{I+Mb6BtSDZ{kUkU?cVq+vwtj!|~
zuew=UBfo&15+X(zN|yO<UUz9)3jzSZh7F*X8n1`u02;%#rYAYJRD%-J<EV3o%B_1}
z&uiS2>p1{4P$>UU?G`BP#a|688>{@5E4-V-nCXT5v?iN#garh+krOEMQEuC5?w-b%
ztlIUkY+TW;wu;`FSncrp?}DpNQR<oZdAkg)C2Z66k7yKc)A|wsFflNP7wEZP{2#Gs
Bf;9jD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa468b2390b544d69d79019d254584a10abd39fb
GIT binary patch
literal 9750
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..87fd745850387bc5509c30d040b8fe3bf1cc706c
GIT binary patch
literal 8865
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
K|B>#Qi2ndTT)86v

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1f137dca37aea0a072e0ee239e01b3a91f13b5a
GIT binary patch
literal 8433
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
HOF{ny>l_pd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d103cfa66729e5d5cc4a0383788456b758095c6
GIT binary patch
literal 9422
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
QD-58jsHIROXBqIn0Isk)A^-pY

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..ceb704581888a434c0169d51a01ee2fc823a4a09
GIT binary patch
literal 9418
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..b138d1416b77e292cf051eef49a9c7946a8b51e0
GIT binary patch
literal 9578
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png
index 354b1eee71dbb1607d5667604e7fc502e768f105..b6f68da96e1cc4016112b717a63d53ca7f79e94b 100644
GIT binary patch
delta 272
zcmZo;-pe#Wl7pFnfx%@-*RhF;3iVn6J|V7N-Vx$rQb&9l{?{`^M6VGMmD1MMGcodF
z*uGs?*Vw|`PF_K6&is`?Z4DaH4nT^pB*-uLKQdr&J#gm)P=>R>BeEE%;0OpaPSxg<
z1`0NLx;Tbd_`f|L$ah$QqapFgBH>ei*ITbinOr+_7x$O?4AsAj#J>3RORzF9oSZ&C
zjiF;l2Pea`IfdMPhZ%mp@Lg~v{OF`85$y-hK4-8+STDFO8?<r1#%%9d8_FCer|K*I
zloMvycq90S&3lJr!G~t|jT`iC?E76J+8A{H`eOMF-x}t<k`5O#I5TnH6lb7w7(8A5
KT-G@yGywoT_-(@g

delta 346
zcmV-g0j2)E0)_*S83+ad0047(di0SYAb$yPNLh0L01m?d01m?e$8V@)00032Nkl<Z
zSV!%Yp$@_@5QY!b%&;r2djJfU7r>yfcoYiDiy%p`gqHw=!0-ZfbR-yN=0>h`qgyi4
zuAQQv`Fl;e`>(evcs!oJrzcelLP#D20c2SQoO7eIO=y1vli!zIMgYStablt`^?xU7
z@_0vuVvPGDut3W|0VZD`j-?3~7#ToTk8c}Xpl#rMl?zEdZi}{o$yhEnQz2z+iBSvo
zBL?&t3q=NDDAWd{78F&ZV*E<e&xQrsb4)4Ci^`G3jRIq=az2Wpax9Z1aq>`Az_~xo
zAa9y~G@zQ$!RQ~rXLx>zgf`Jh<wq(_6`EFVMLn5K^48a-Chh#%JsyvzI{@C>hf8f8
sQ-PZR000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f~e4lZU6uP

diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json
index 33e08c9522..d2bd34f483 100644
--- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Resprited by DangerRevolution from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Resprited by DangerRevolution from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/icon.png
index 0e1840978dafa6f2c7f52dcaebcc6cc4f1e4b7c4..195117997db22a6b1c73cab9c4749c2bb21e1da8 100644
GIT binary patch
delta 381
zcmV-@0fPSX0+<7kB!3BTNLh0L01m_e01m_fl`9S#0003>Nkl<Zc%1E(%}N6?6orq_
zg)~AJI&G)mFI8Ol1f>t+19Tw>f(u2T!H3X=g6P7X52Ho=0jEXBl^HA)VsF|^?LwHF
z4DBXoleu?D&NnwVnF3}k58wejfCpd$ECn_7H~##1pPL#0nSb9d?&#;!(vL|i7l_ON
z#(a5u7++!@2R#8iwc#T67VN$br(Cb}C*W+Wzydfb7I1eZ&}=;7Eh*!x6zhCg4Qa4~
z$mJA>qR<cn0QOuKz**AQUmvX3fMmP{ZHGQ!0o=zuTvW=bdDQLbaVn>POwI!+#G5+4
z5fSnbs{$zmNp_BN=Kbp0mXh)tLM(vBES0fp!um#Cm;dGYVZuDDRMFbo*YU~mVWzdL
z0AwOTW&@?yGR2fP###G<4KP|*(Xksrq)<^OVmG8!1q{SLd6uj%BG<p5GeBPQ03N^t
b%pBksO~-$4x4hT700000NkvXXu0mjfUwx?K

delta 344
zcmV-e0jK_$1M>oqB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0003M
zNkl<Zc-riiJqm+B5QS$#D#5gBDbe(HUcpP`3}Ta<C09tFl&NhzKz^{*lo4z<%z}~x
zqq88|?7*_C=+5WcnTIHZfH`9UGlvGy02*M)c?c2ZY}>Y2nSUm{stSstz`l35{=!y(
zk_SNmYtMr?j^*`aN6;jvD9aMUFdPj+sRk(d_HcnDNv1Et)A<Q?T|=6ta^CHax(!DO
z<g|<9IBgN;c@D1Y%Jt)ZhwJTzleA$IhGDd8@`FhfAS2rNz90{1qU-A|%W5|pGO91B
zhQ_BKL{TLE^-(_oG!UG9X($~5*>IL+a_;d8R5}9{1%74jyU$fX8K5g!7ZewOU4(rQ
qU9xlA5cO}l2G9T+U~Yi700RI8zZHRui_7r<0000<MNUMnLSTX{XP6@Z

diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json
index 529b60f838..1a52b67cf0 100644
--- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by PuroSlavKing (github) for SS14",
+  "copyright": "Sprited by PuroSlavKing (github) for SS14 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/icon_alt.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/icon_alt.png
index 5052bcd78e42f142a57d831046d0ab0e04b22bd5..51a87cef7994958a1e61f7f23301d9c5201d84ef 100644
GIT binary patch
delta 552
zcmV+@0@wYM2fzf7BYyx1a7bBm000ie000ie0hKEb8vp<S@<~KNRCt{2md{H9K@`Wo
zl9yb6kR4L6tc#=|1QAI0pok#wUyzVO=+w<ac<)jNi698C9fOYD>=JZ}D6A|=ODoFO
zj<#=bY$d~)RrBH(mf4*-d_QmA+j(O~kJSh00~iJf2B)huet(q9$lhI<{uO}C6^p{&
zYh%?YgfxKOoTOG%v?D`1;B*eN@gaB5Qed~);2rlF+65^9G8y%ZvG>>47j!~~i;%XS
zqF2>V_HaPiT@VKF4ozuQUulf|-2w#`*gXT#)rAy<5CEA+Qd`(ti`M5T`ba8?-03Zj
zceVkK${^e$E`KSAmH^!RFL^=}m`AJuLPo+Vphzj#`KJQ=rgxenfOaGVKt_kjIA%iO
zhIyI`BZ2F)o9+VWwf=R2!1g3oHeA2fs4lt=K;{>*OJLB2PDmPnMcyHEVF1c;IGSKN
z*Nf)#`KKdUwmY^2$iAJMkcM^$E!H92E;nYESL^1P^nVdl^D|JkqAMpMhsdP0_Uo{+
zf1UmJ`gKjEBBUi;1Kh;x@Ue>s9ly=Co7y$+kRs`jE<)CPDnBQlz5(&O!ra0V0)9Ud
zn{l*~G(f5NNM=>40}jEjXY@^Q2m8BF6tQ|R)Q+1$kjOk=$g_3PdN6z+;1CpP9Y9M@
qZC+SyT_MY5BJB!5C)5Y%Ilwm%yYQoVR*XFW0000<MNUMnLSTYK4*&=N

delta 893
zcmV-@1A_d(1d|7lBYy#JX+uL$X=7sm04R}lk-ba9Kp4iKwo0W|I_MzMAww+=EffWD
zlnQpK4s8XiF3B}%g(MA^6e+HPi$lRdbn$EOKhRZhRS*P45OH(&YmpM)YYHvW-f?+<
zJh|uP?m57p)tO-rqyWQocrKHcR*P#=@EswVK|~RknQblQ7k>-rJANMF6ZIh}diCGe
za}1YMn*qKd;#p>Khj^YiyX9Dd_lU<>MJ^Ga5GObtkoZ>UipOt)%N~CT=7rn>;1@lm
zau+LI%qrX<o+6GJdX2TuBW@B_&6PaW30hIu$RUF?Bq*q16FM9ushX5oZ(pkATSk>U
zjJ_7?;N&QyLVw-_sWs}VQq@RTY3itp-2dlkYctbc_i!2*e0AN=Ng%inG#jq_d+NH)
zGa&E+T$>$#m2#T<CcV+oV#h#a2e`cHXvzU_wF`_tTQZkhQh=6U(}0f)V5A6)-UFd^
zFRS){oIe4DZF-_R;P42D)BecDAM})H1;A3KKmY&$34d@%S#tmY3labT3lag+-G2N4
z00FQ`L_t(o3GGxpOT$1IzPi*3jbk%qt0)GC4uyhK2jkiwBK-sX7ycWEu7!dK5*I5J
zG9{&pDJFJ`J_qmhtogW0DlRz)@0;BF-1FRXd5^Jr)DF}R{IdfMUH-FfHv#6j*%Z)c
z*VSH!z<*l6E8FJe1peG^xe$tFgeVKZ&arEdy)G6UmnMkjNMun|5<o;Uxx6su$%U*M
zxn9l-1>6jWNfgIywO;=?cPt`XP9pGK$Au#R^2Wn-+Bj*oevupPHiJ0ALSVSr@P~d>
zn#+rY4rGC`V~D_bTQ1prJ{P6^exG4Z#|Z(}Nq?>fgTyq=#PdA<^m@G{j$@wVyUtpr
zYC$p@jRg7q<5L0=BuGU>;Xjb43^rSq#m3_?i=v3#t$ZHyF#B_r1khp-QFc@o@NM^w
zdvd$W6|>3$zylGE<FNCO3m$PKs-uzswApMn<6PW{ronR@30l$j{lYdcEa-GPqMd>u
zNOrBq#dB%fV$(0Kd)PYwB4i<gNlK_CRa#GivD6*O1(ZX;sbQq<jIQ4IFl1RS(K`E4
zSpWfvjNTFd{K}Qd>b!QKcHqzsd;!33!ID2?rX&CW01jnXNoGw=04e|g00;m800000
T0Mb*F00000NkvXXu0mjfu5^_h

diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/meta.json
index 5dd6839da5..b62adfa1f3 100644
--- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428. Modified by TJohnson.",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428. Modified by TJohnson. // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/icon_alt.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/icon_alt.png
index 0354a3ad03e1d08370756b4ce6cdc5a866d57846..892f6d12f0e391ba8a708a1639f624d60de62ad1 100644
GIT binary patch
delta 489
zcmV<F0T%v~1cL;SB!3BTNLh0L01m_e01m_fl`9S#0005CNkl<Zc%1E)%SyvQ6o!xB
zLX34$6`SIvNDyl2O3^29;lic+zK9F)E!-$RlSPms@q(#nyRb&w#r%h!FiJ{iritC;
zhcJ@~<b3Bcb7q#NtOB3_um)&0cO#4+g8@DGcQgMA0OQWQ!+-PP7}-J?1E|KK@GGQA
zWEFvOd5OoT=SNP#VyQ%%wQZ{?7y-b@`q~E1`~4neA?qSU=;3`Be)1!LrcuxaSYD}e
z)u(yxR$Nl*!U#eO0LJ(C4yb+GPS)UkquyYk&V46=a91lv5Mu$v_$Z+uy?9h1Or)Ix
zc#2#HuU&q}9Di%FBW$GwAYpc#1-hE6@mh;~UW4}nl^eicwZ8q-b<{=f05FayjDpA=
zKvIyEv;dG}Z_DGHpM*EbI@Z+u<488`j$;Ad-(KRMRU;Kbwwt;mAe+{#6#;=zjbr}%
zJ4P~=b`6M;cq?){21uI6XxGvqbs}P1gxq}MMkFVm+G2p@u5fsCOgr^Dou8eK{hu+w
zFcOh^?8@~F?|{3$yx>Diryi^hqBIBy#)EFa-*xN3`aU2K@H7F4(<8N_tBJ1VCZ6U3
fkcA3>sRR4~DJ}D_3S&RE00000NkvXXu0mjfWXR_b

delta 505
zcmV<V0S5kq1d{}iB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id
z000id0mpBsWB>pGs7XXYR9Hvtl`(6=Kp2M4TdW1sG1lF>NXM*#LlG3A&|lcqLP0D@
z2f=?J#i<rtESTa_h1xh6eLwP*6BF-Z+D>^O+{GMupZm_ch<}unl)vI$N<ZixB@?v9
zT$M`n;<Id)?!n7wbnqUGdmWFp@0USq#C4_OBbdX#J&#(1;The;#8`l5j!?`P7mIMq
zW8z>Wz%xg<T2>Z8AI~r*u7q}tZfZ6EYqb&|^ZDMo19j~o$xE_WE`^oP@5x4?t-y1?
zpE=Lv4#E)txqsl61QE>Ppin4itD!ZF0yE~Ix5-3Qt5xcQ!C*iVkeSV9M>AsW0u?Sl
z!X3vEtKBj&kU_W!Ckp@$XCTpNx2dmI<QRzrQ0Db|O&7T9cEv-pNqtii2>>tn=QlbX
z3P-ChhmOPo01}V&I)y*ATJ)Q#L}G!>W<%F)uSXKR9CD_dybT%b^>VpPeJQ2L2Is|a
zIMi-IpdDb__RnGBx^C!r9KV;vBK0BhKAjq!g2q5X6$t~C*lj)E<n&W9wuHciWrfa+
vKR}<0MP!wth+U?zuidYfJ0&IMe-UB}_IttEL&%HQ00000NkvXXu0mjfxw_|m

diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json
index 9879138a5c..c5495e43df 100644
--- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Resprited by DangerRevolution (github) from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Resprited by DangerRevolution (github) from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Interface/language.png b/Resources/Textures/Interface/language.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b39424d12d3d75421a5f48ab87ec0c4f852129f
GIT binary patch
literal 739
zcmV<90v!E`P)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0004mX+uL$Nkc;*
zP;zf(X>4Tx04UFukv&MmP!xqvQ>9WWf_4yb$WWc^q9TqZ6^me@v=v%)FnQ@8G-*gu
zTpR`0f`dPcRR<SmT^(EnLGTB})x}BCMM}IcDYOU`d~kUm=e={d?><0iR+(n?#Q;sW
z&2&N%bNN*<@QM(ERKpNuW*N!MVirBu*FAiEzl-uL{BI4a1&aYbkvPT-(<a^^p4+qy
z&ilk+R+d%bbK)tJ8YF(?y5jL0=aS0;&kUQ{beuR$ES9=h>0(wkHR4&~h^pz7FXTK{
zId5^+s&&@xlfN)j&{r~Cry55BOGqLG5en+4pb8sN+I3Par0HDh;U9DTDRL>~s(_JW
z0X1llT|f9A{GP2<oSF8LLK4vb;y51@KwuYWH5}*r*l}7Xfd3h|(mVcI6PW)bz0uJk
zN5IfFaB<zyls({b2N-=aWK(t}Kb24{0`F(^O?hDC76`6+b8DaD^a04ytd?(pgF|4l
zMA_>--aXJgw?FT=^MmvQjVW@mx*a<o0000LP)t-s`T6<b;o(?VSWHYzK0ZFd!NC9k
z0MrA|Y5)KL2Xs<SQ~&?}|Ns908cPF400009a7bBm001r`001r`0jlENk^lez(Md!>
zR9HvtliLo2APhtW#Q*<fGYsXjE9oY-`@~5g6=qI+(Bpc^7Hk370uRBVP-6{S0Rlnc
zQ(`I5%fhIz6Z~EWU123)J;ridi31^|0?)CF!b%_)<6<1hbe^2~%%-KFzhp{`Vn>Z7
zxueKOz!l>drAkVi37b}eoEaHck8<KUc91ihRst$!5EklDL+X}-C&h|hw-rF4OOUDY
zf~^1`(5bBgPim}TFPQ0y?<(;Y@Hbo6|0P)0{RLXxU-0zl%y<iQwqOgu7Q7Z**A23)
VO4+l@GsFM@002ovPDHLkV1h80LdXCB

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/beacon.png b/Resources/Textures/Objects/Devices/communication.rsi/beacon.png
index fa3d280d0b74a373b33d68983e1d8ea66e8da22a..cd94b9738a05ffbf12b4527479336fabaf91a047 100644
GIT binary patch
literal 447
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZnt_3_
z(9^{+q+-t78}{CZ69m{kXmivtI38RXG^gp2f}WH5NB+Ad#Vck%P<gSa+gUtT*5%bR
zb`LZ5h289axsF;hU1D4UE=R^l6>s(Ea{at7j^j|V_vPv8cl7foDVn=TiUVzBXyAHK
zl&BT6>h3cm<|)y+uZ#ab*DaXy(%_$c1@ErxefN#_@g8Hy4AGhP>zd8?IaS%mIFt{#
zB&zNDbZ-0Ct6O{bojLs1H_0XG!1Jl=1wOMr{oL9pnYQSu>&X(K_bpeA3yzvz(t5o;
z;rHF;H}{@=SNQlvUtjy&FN~YM&XacWw+)UIyY~3KeSPYTV1^T`)uQ)rj{a$=E_rel
z^O9MmVJ9OP=f%$}+RK(WX^z!_ZH-nAyFo67fDneauMeM{`19{(ABIbF?!CJDVtS51
zJ)6hnQ`cg?KDcr^jeUvV9rxG8hVlkXJ-vPWe>6JJv#TV3dYfP&ukqJPUchI{!5Rfw
mhG)z(_-~j5uxEfn;{bbL<^G@f$87F_Z1HsUb6Mw<&;$VXyS-!p

literal 317
zcmV-D0mA-?P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00035Nkl<Zc%1Fl
zu}i~17zOZGv0$dIAw!|udegV&@2QhZXThR->F)n?n`R1vLw1LN;PQ>vMY>q!((6a8
zzTbLxdC9vw2tY(cM0BQNyk6$4zsP-oo7+juea5jqKmIYdge+B6jaC2vJU?wl%^$sh
z-2Ch-aPIzn0h6H%y!YQ8xwdTwKX2^(%c0>S0sy$0ejJ(-ElaS-A5?&<0sxw(!D2qc
z{oQImwtm>|$E{f8C%5IjkE)8gt^ok=efMR~%j+A8qA<A%R{2RMz&RI11R(^35PqC1
zB2d-Xb=}EIu*^@s0)5}3EX$;M7Oe7<cgZ=I{KIj|-Ty85L_|bHM1RZ<SIvhiwyx6M
P00000NkvXXu0mjfy+M^M

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png b/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png
index 64e7a30d49f2bb604e4d85d41e7eb2748b1fec65..7e25d7455d6d2c667c15b2b5ab706ef64d00e9f2 100644
GIT binary patch
delta 257
zcmey%IEiV3WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hWfKP~P
zLqmhOn3T4*US?*cqOw6}=NvEZ2m=EHp!}m0+e#qCSrX(I{2vM!g8eImK!ODxk;M!Q
zd`Cc-ajG_-G*B?x)5S5wqRRj61w+0A3LFlBjE?W?A1yL)*lK$Bw|MKGgAu<L%13DL
z$PHtttCDBTYOssoRLFGjbO}&bIP|JJkip}G@!lU^rybJr7fii0kFoi9HA9kr!n6<K
rf(^EgEZ-6YP9KkC+Fh3*>+oKjKTG!89e+_{puG&9u6{1-oD!M<{Fqr2

delta 236
zcmV<I02BX`0{sDy8Gi-<0047(dh`GQ0K`c|K~#90?UX$W0x=AR-xCFIay@Pkq-&?F
z_m^Cp1x5dWzpCp^hv3lNp>W`mv2M5cL85{RdDgsbpCnMgFbw10S+0xxRe`#$-x3&o
zO2h<SrO+Pm-ap)V*LCXq#@fe;2mmmhT<%4(RzfAf%m9G4ZDp~T&#>F9hT3+280s3t
zw%+^9%xIbh0MMs+lR2KwD9ci{3eg0dbD4+`LO=-NX_kn<%sIv=k`S*TrG%=gL^%!O
mQ90+tKc2LE!!QivC%6JIdp+WT|L-;c0000<MNUMnLSTXro^d<?

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
index bfd0e069f3..e9350caad8 100644
--- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6",
+  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6 // Radio, Beacon, Signaler Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
@@ -31,7 +31,28 @@
       "directions": 4
     },
     {
-      "name": "radio"
+      "name": "radio",
+      "delays": [
+        [
+          1.8,
+          0.1,
+          0.1,
+          0.1,
+          1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.8,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
       "name": "radio-inhand-right",
@@ -68,17 +89,6 @@
     {
       "name": "off-walkietalkie-inhand-left",
       "directions": 4
-    },
-	{
-      "name": "old-radio"
-    },
-    {
-      "name": "old-radio-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "old-radio-inhand-right",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-left.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-left.png
deleted file mode 100644
index e1cb184a79c41bc605c32bdce52bfbcf245ce02a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=^E_P~Ln`LHy|t0|kbwYeKyyS3
zZ-jz#OJUFk3D(x*iq;OUlZEcPTE5)NxKHPI`M<S{Kuv+~KL4>yx^~S{`^VmO?PqT7
za$)zoJmpi={yX=6YZ{p^W!(OJt4mtf8n%?w<t7g{>O5pWdm=~oB~#qq=_go#`WYA&
z%$oSu;g(&3zw+<K548v8Db;nKHeYZiPobG@%g4J8Ke;zZGcY``k8cgs;Xn2&HVvf5
M)78&qol`;+05O49IRF3v

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-right.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-right.png
deleted file mode 100644
index ac3ef8ab79fb3fb4c6b95711cfdc62173f490985..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=yF6VSLn`LHy|t0|kbyw!L-tcj
zIR}{JlqA(zy8{C%WHvc#1W2V^xH+xR@8^E2u6gs<?Vb$O1~lcANniGRo}FuEo}bn~
z?{v`gWz5;n4*ohUa7fG3@K|u-vi&!TqGqZ&Oj`HdyKa`>tkko)+uPHG3uZsRYhO2c
z^3|9F%EvaD$X1*JIS&jr)XU|w1)W*F(H}&2aZk86JAz;Oar`Q-4<*JI&MZ_vaQW;3
i^HA0e?d%K;4e|PtD|HXgzpeHHq}kKe&t;ucLK6U7i(c{o

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio.png
deleted file mode 100644
index 23315c58a2c7b98d3587c7696fd24ef507461066..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmV;C0dD?@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800044Nkl<Zc%1E&
zze~eV5P&~_BiN=!0u?Lh(8WO~7oFS${{ck@r{d@=f;g0blXE8rL7}tI&B;P>vTFwg
z6_IF42&F1$9ZG}9%gZB0>hQklcz5sa<Awu`M$;vgN~P6nhyNi_EEcsyEQvnV!pZ4b
zY2&B++n`sWP-x|HIpyA64;R(s^LeFBL|Up0kK*Tcelr*~+%PRx);3}fzq~jDXoX2g
z1v<PuKM3Dl|C*190by?V^%FC(7};A%!1wAr-qkQn3(s|!n#r~W-aU5r4~2h@cMcf(
zsspgSwT^Au@dbcjxM5ns+lVvD(dM48KJk`>Ogla~JrC`xEYKP5xejB=6acBr94Upr
zvJLdB3WzpPEtja4OVSwra0By8t3f_2jzUSG+3+!~GytZRrrGcTsNGxvkX={~jiZnr
vqRt&K#w}Ty6tC{!xlZUY>iH$qXf&E{dy$VBeQ!MQ00000NkvXXu0mjfVjZ)E

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png b/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png
index ddd9d320f9dea2333626c80bd1963fb726f77038..e1cb184a79c41bc605c32bdce52bfbcf245ce02a 100644
GIT binary patch
delta 187
zcmV;s07U<{0@neMB!8YsL_t(|obB4N4Z<)G1yF-ngbi3ALxgcsuowk}$00jFMUxWW
zMLFrc0lqBzcmAyb0000{?(_UPV%F9<EBL*xhs@f#L<dgOl=51?+}`^sGB>3Gx97D)
zW{Ru^WM!u`;IS;>2hGTAE$ISYy_d)Y000000HB(Y{Xp72U^Gu7`+@L%z@8$0i_15l
p%x)lq2DI_rK=})>8vp>{KVOAWEDy%&U1k6P002ovPDHLkV1oSMQ)B=D

delta 284
zcmV+%0ptGH0k;B>B!B)%L_t(|obB2%3IZ_@K+(zS5$tU&1-IJL188AwYbEgjf(P*=
zdJ79rB7(4$FtVOtC1c32|G~CdGMOYW836zQ001COj8UyZsH(lbRF&nLw{2@VTo%Fd
zC-Y<VU6Sdxl571=8oTf6hLAP|(+ub)zI^TFQZFor^`kkDRDblO>-#u)bGkeOI`QyK
zPXC-t1Ms-1Y*wq{C;d0GU8R#Im|TUqwm`9|>hc!wXz&3500000000KYv?}~dnL4$a
zYi007QP%;m=tpoJ0E>PE*Jpr5KZ5HFD6Su&?}Mhrqox@3Be=f>Qu`5H2cWoqgxp)e
ivL68e004s`A{8IGP~iJo-Tf*60000<MNUMnLSTaMIDuLK

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png b/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png
index fc5fdee22a317165e292d6dafffaf9aa41bf236d..ac3ef8ab79fb3fb4c6b95711cfdc62173f490985 100644
GIT binary patch
delta 215
zcmZo?`ph^%rGA&Ei(^Q|oVT|&@*Xk}Xnn|jN-5_6lbn*II%{`eK!waEXN>@<lnXbf
z75e?$Z`Cz#{<__h89>0{lu2Lqd!C(ZW}ctcKkszV^kvN1&kp`NEO1E6)9_eu;<EiW
zilSz!IZRsj-Mem<->lTLx!c>*gbQXrziVGNdGghm1IouXnFPpIoZ<qT2P8Js%jL5L
zomsunA4GR?Pq;Tbf?xV^{3@;wCB_%dEL1;m`RoDnP}U9Y><kPI@%oZ0bq~+Kt@Z+>
N-_zC4Wt~$(69Cc*TqOVi

delta 235
zcmey&*v>RTrT(0!i(^Q|oVT|OxeghK9Q%0vmhz6>J8rLB%)X*|^Xkb<%wIU#G<1t!
zh%WiS73a|6q-OX?Z_>6YlcxXA=Tq5JlX6m>0R;Y}_Y~f8n^G2;vsU)Kitx#rZFlb&
zmD}%MI&tzY#tPL3lh&u)l}p+9T13KjAE!Y0?nf5gpLusYTc2_y<ori}W5)MB`KN>A
zdUrAWm@VEJ{qAxH#8{Bgi^Qwa6F!vZznIIozV3j2loj({VTW`F&-4Y~zh=JV;W?#0
im(hwDsE}iFM-9Wl-L~6zy0`U%bb7k_xvX<aXaWF7LuPCM

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio.png b/Resources/Textures/Objects/Devices/communication.rsi/radio.png
index eb57264b858e705554298b886911a667fa507548..bbc73c505e5646dcea0c096c3b08b25513dcee3d 100644
GIT binary patch
literal 1365
zcmeAS@N?(olHy`uVBq!ia0vp^4M4nrgAGU?nUwMuNO2Z;L>4nJ@ErkR#;MwT(hLl&
z?4B-;Ar*7p&fS}LIY6SV_sFfK_6n&BSdTDFW#GKAXv2mnOw2ktdwKO5t6v;B#^lW^
z%pGd(z_er=GgDNX*M<4gD*{e<S{^HWbENR``yG4EZ?-7BY<K+a?8hpfDyyxSGC3M7
zSR7=S6!;hg+8H{W8IBlo9{BU;>bCuR_x<}BlEU+^X8%nd1MBjm{0dx*|8n+6GHly!
z*0e<af5QI@3_o5Tt}p&o7Z}5IdWn4f)_->x?!?yIDO;JjRqXG&br!YtGroLX{d{Rq
z|NUe0B^jn~y1mx=;<cThFW$LxbbodKk(a-l3;O?l$lGciP;TIQF#oxH71xbhzpOs&
zd;GLJ{o-MF@7micsmmSyT>bT%X+q8E01<uf{L>BhuiY1BP%rl^ynOWbRr86n+xnV+
zOU_dYR;a74zt3ZE+wy(MIqA8Yi@&qWwC}yU_fY@Q{MYX}8>%0C>wo|8FSq>l#lNRp
zH}5hNeSiDk7WuU~ZWp(|{`}F-{DFyi-quIAFB@O}m-hSl`nh+)m;QMBx7CiL=#tHz
zJDztKf2_Uzp8cVH>#f_dy{8H+F7}mO<7@hvE~d8lyZ?Tc&*7DSY#9q)e#n=$F`pmv
z>i4p#OYg<IMZMcTZ&7~Zr$5%&zdvrfILGMwZu`2T-}bUVw?1Gi{N|%9=Mwj+{iN{a
za~@BA-Zfru@lCy2)X&L^91qvO`q4g*>CVqI0r$(N-E1WGf4$syczNN4pX(>oZ?2cx
z@@4t_%4`3$`sx!H>g;z+|9|vI_tYgi-A3$v;P9^3J5^O`sg=qnw|}mEIh)4pTZN7H
zkDXUdd?dh7h!O9K4Cumj42AZ886MUBVm$Kq3v<Wsm+S)HFY_zBTQ2W#$KSqT$9!Z3
z>WkzV>P!FK`p%rvs~BSMps`=sl5J&OLt^rVH|!iQ&r3Il*)#mxh++thobrWv4#WS4
zF1vr<KfL-w{}uiR*H^Sh$j_H?mh#@OeB`6~tp90^3;r@Z{`ddu;$N3Fen_7^c}KFL
zj)C?6Gskz=U$P(Y2fFkV*xNBeYVeGK89?Ct0ug?JFKo~QFaAaIf|;!+E2d^it^WG4
zuCk<R?Y>a^2J13&w(q+=^v-X4qh65gp?}`|HM_^UVE&u@0=wobbWeVx5A+M$#O;1}
zvugLuXLR~1ta4o7(0p^Y$#o4sB&TomyPH${r|6qh<>tDEIfgU738(Zl)-n9~!u&x0
zJt)qI4sLf~Tz;DPlD#1(<rkyEY+#%^Y`wBgo*`#Nsy)Mvz~6NYE2iE0%G{v4^%Xlq
zb=Gx$hHY0?$uqps{Nfl;<Xg90Sz)8cm84pm5ch|54RX`Ebp^i{{9CWz`ipVWl4z%6
zd+p?MG_UYqIQ*>Q`f}%pth@XSSA$R2F>F}8?Jq+D^YoTZU@?Rm+UMj0^L`eYx;{Ms
QEGHQ}UHx3vIVCg!04W4|3jhEB

literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$(n&-?R9J=WR=rOGF&uqYhzcwOS#DyGgaL5i%Y@zK28oM_D}$qn6N`(6zraD`
zVjPW&VPSDq5(z;J#KZ_L4wZmNBoZZrI^gl)SFQyyQQp#P@7MQxef{0Fz!+ov1vs5f
zCOVf4LxA7!7oIy50Y;;7^a6Tquh;9s0`wx2ToJ;2ML&wBOJ;USKnt)2Bvwu`iI<Dp
zfxxzoEkwNlfR$4pmUg?()_}xaj9iLc5yEWC1Xo+FzVT{~!R(UYSZ%+{@3l1Za&3Xp
zCUp|p$sA-^hAhiSlQi<VGXOxV$-_865vs{4rSNz>qBML0Dyi-ktI5??6gsVe3|^+c
z*CSzj#6yOmd|gMQ(Ez0slu|rRlrT9h;rR}zoU;wByqX=z&Q$yQ7K;T2g8{W#O)JHx
z5c&@Qz~XTf2h9vj0H!V~D6VY+;4ebW0%i*Z$sQ)m5hS?TZ;vHS#r8uGu)f6+&Lwe$
zTYTNm`)Gb0)|ZnHF+b+Odnk$m_pQ6rKTPci@eFhth7_f*t)v+D76=RQxZQ}w;|M7V
zV)3{rjkthxHrq+AIxtcJUpY|C@g0cV0!oQ?f?so>_dHNnK1dC4-(c)v!oIUv<W@As
a|HdoZyQceyyn-zN0000<MNUMnLSTYg9O-%h

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/signaller.png b/Resources/Textures/Objects/Devices/communication.rsi/signaller.png
index 1b14a3a13605242c53b964bc4f02b43a768acc79..d6b68cba775e1dabde93e46de284f49f0b30a35e 100644
GIT binary patch
delta 431
zcmV;g0Z{(&0>}f9BYyx1a7bBm000ie000ie0hKEb8vp<SdPzh<RCt_YVHjXA>VQ!P
zkmUd`?}-1~wyt0tFb6z*aE*alU}#3cpmTs_jNN|_eSFCwlG6pr4p5CZ`Ok3X7u-@1
zaBxwFG5?e52$CECvedy*onhYgtqguH=5TReV_h(PV9!kkQhxziQIOQ-jl$o2_A&#x
zfFuXlc(XG2>geK>|HFO{m=0*@fFoOfGd#Su9jE-``@b1T1w=dGu$}Jz*mGYQWEHs?
zo;`G8Fi-G+%bi@XgF#AuAH#E?Jk1<%@;(y-122UA^3G+Tr3g6?UrL^VEI_maN*-Ti
zRM0X8XT6X#c7Gsw3nA&m&T#iGjU502l1AKM`tIE)IOR#LCWcN?tgWs0ADj63N3R(S
z<wR-kfH$w-Fz_)5fZ1jXo-v$CkOEu&Y5OyV^PUW3JA!BjynOYHQHenX918lfzZp(3
zKrE%ia*`Z?3}!nc@*E|Wlk5OO1r1FLA`p0R?JTgWH7Nd%U!H~zAlDMAI)K_>)B&Ro
Z001=ZcCSkjr3wH5002ovPDHLkV1lbQyT$+j

delta 343
zcmV-d0jU1S1MvcoBYy!nNkl<Zc%1E(F-yZh7>1t&6U1T%w^Az9NvM+rp@NfxE)K5J
zC5w}P!AblFE{+BNKnI85;G_=XAR=xRTExvEjcG`{I|rvq1@8!oa_{&Z-+K@5-F*jE
zR#tyeK@g~-yxgLUepJ<Z<^LpL0UVR2ukOIp<FmG(c0;vZQGXkIs}tA4qf2cFBY>fo
zp=#c^(I96w_q740bO8WV&Es`HAFGuPJm|rR>#DYt--a*(a0dCuhM#KS^Pu!bgb_e{
zXKP};+X*>TO6v%Wo?#NFbUPt&ln_S=XXn=>aZ0qHKOl_~kW#X~y#~P5%{@u~g$wQ|
z_Z^0sUPcLwrcfhpk52(;H5<&#&(Uf&j1n*c@JA(<b~h19Ae3Nbc@d!m<(~drGdhAi
pdoyV(4j@aj!T^5#FR-$*dIzTiYGn(Z1gro6002ovPDHLkV1j{bn4kav

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png
index 70e2b3a2a56ff9d446ed8f379c3fad5ab524ab40..50f3927824f1ac568ddb6af0bad43f9201e8623c 100644
GIT binary patch
delta 332
zcmZ3)bcbnzWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$h2fKQ04
zwzi(Qn3R`yL~VrmhIX5$l9Fe4#Ce#RI5;>oG&CqGDt30x(Kj#yDld#U_76z$l?3?(
z|3?N4t_SX%0LpL{ctjR6Fx2xM0jfH}I8~cZ8YsHZ)5S5w!hi3CgF=TCcwC%?S{MEK
z|9;oP>W07<2QQX4=G@l_$Q1wMG~vkEle-rbfBD`vql{NAZCR3x_2LA*ck3Q4Hst1P
zTGHzvcIfQ;BQseRPbfU<mnPKXo}$gJA-zy6pqy9qjnt2hsS{K<4;)gEV08^NYK>`h
z@<`CMad|8t@w)AYp7+C(Y!yCDne}FGSbEd-^ecb*{LwtL(U^1okFboltSjehm$L5+
RT@Q3EgQu&X%Q~loCII{0gVO*2

delta 274
zcmV+t0qy?W0-^$t8Gi-<0047(dh`GQ0O?6YK~#90?UXT&!axi~|E#!xPccm*QTiC0
zBWxPZFx854P;dnbE`daW6qFNew}mAd%D)973LWu86zn`{3Xk;duNm7wp-`BC7$d#f
zk2#GL1OLZBjFCBwH)fF|R#gIkna$zl`Jz06whzPM5xkq3N`IIt=(d4XO{`C!!`=6C
zhjSNDe{pg?_ZM93>Xqi9s_eFbs>;6aIgUN~++&zhLff`TDS1=)P*vLg@dfU&C!eba
zetvJG*EG!#d&$~_B9bHb8Q822sA@t)U}g{zR5h_#9kR_l#oUX?ZDKrrFD+gu6yA<M
Y&)0L*UrKh#01E&B07*qoM6N<$f{$)}bpQYW

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png
index 0bf04a782db0e0813899de8605f0cd665fea2f42..da72f40e03f66d37d06b52899e1eb9f189c64367 100644
GIT binary patch
delta 178
zcmXRp&p1J)p0PN{-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!Qe1}1p@p%4<
z6rf;=r;B4qgnP0C>*55Fo~A$pF1LdY%x)UKLMQD0zuMo;CO(Cou{y6Nc}A9o+onpN
zfLSUZwmlcP;grH7q|81+l<C{D!vCsQ|17ZKsHoG)7CwCNa`y?Ne3(%h5+@rP85x%O
W%PgKQXLl25A%mx@pUXO@geCxBKRw6*

delta 86
zcmV-c0IC1a0d$ZgP&-LPK~z|U?a(0#03Z~D;faDr_6*+jWx*ht1oNu@msYkg0RZs5
s<Q_0v-Z$62?49BkW4KKK0Dy<213rZX=qdlo{{R3007*qoM6N<$f^(oHi~s-t

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png
index 0799b3f9c8bb605924e5f0bd7fb4164075fa1f03..e5ebc2a36cfa7d8d2ec68c985f8118cca2cd05fb 100644
GIT binary patch
delta 483
zcmV<90UZ9T0{sJ!B!3BTNLh0L01m_e01m_fl`9S#00056Nkl<Zc${Nl7+^5!0IE1Z
zTU+n{o7Zm`UcP$9I3Ny?SI`2I*FX*+Sua%_@bJMk22co)14cuDEC+xR-PNm?;0cbd
zAy6A({(s%&?_e4xcJ?zuu6e~tl5zq`4ggtTtk22-asY^iJAdE^ga(P#GLYs7vZ4SI
z-+XXBA`S2{kP66hz|2A=6n<+AA6b@@<bbD=lK)QwgILy3iGa#`3=Au1-~bSqvHk~x
z>BXCP)ttWfmlPw3cYyTs=Zqe*(%_W;u6#3tiv|~p{GJ=%7=$`~8At_WrGd9ShZy#h
z*kOnXkzp2D4u5!lYZC)Q52l!^GMyYy7z9jc3=>cVb%5o;MH)Nc{DWr<kH3mA%-Z*u
zK}1vpMGjOBfW%0x6G(CZ$O2HgFRy?phY%yJP9WL=UfvP^K_wmxoIQOAMc&xdj)5FN
zv;*wzTo@KX9RRW%7ThozBu0)Sh<3oiLwn$Cbj!(!dt8zo@bu|DI2)Vg=!uf*4!C&X
z6eFl10%B9ka*`Z?3}7uFm}3xPbaDVC7E<H@P&*J9<p1%hA+>WtatM&q`=P1>s0{|(
Z0RZRCzZ#?z%#r{A002ovPDHLkV1gl*$^ZZW

delta 272
zcmV+r0q_3(1FHg%B!BWrL_t(|ob8k`4#F@DMSp<{_yEjV=<c0~u}7c_11HEqm>7DA
zt~~$}8>klmF~E?G1%w$;t9EOhiUIPZ3_p^cpTss02m}Ve7$e%)(U3-hf&VdJj1iy0
zYclZ(W@Z5Z=iCrpx*sZgh|8mT$sSUf=}Xi%;E+Xfnols_ynpJwVm-pNcp_d(?|iB+
zSX>{t+{Z0_?0**>%q)j25@wdNETyS6`P6M_twoxqu-0l*=wN1XdHV$_t;wgVf%EOt
zdP$PhT8q~tBqE=1oq_FYhgmEjA~@$jM3}{b?P}+3rV~RCBDINT`+fEBKp^mQyaC~7
Wcnq&YI#>Vz00{s|MNUMnLSTX_8hg+H

diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png b/Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..987e571b263f8b1a1c863755865ddbb5f496cfbb
GIT binary patch
literal 537
zcmV+!0_OdRP)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk00009a7bBm000ie
z000ie0hKEb8vp<S%Sl8*RCt{2m@!MkKorMcVrjskt)%VHE>5+Iv#X1vlY<|@&)`S!
zGYHPzoE%+>n}Z;fT1C;N2el0}Q3@%fXY$I0APU|k*E4W`NZ;KBdcT*;y(IqvD3%7$
z09*j=_8uLNr{FkGh7tf7(g67axH=ue-OUh=FBAd%B(^h{cy~x@fKquqZYM#c034n*
z!`~*@_LQ=*muC{67pV_i0Lg5>E6RS~-bS#l^YCYo)Jw2y)}gm}$9BUqfcO-6lp26d
zE~-rHK!^0@-UBj}Ux4JEuhlAe0JNyoLUiOf81H8Rbi#?)wrhBwI8I;<y1=LWE`bt&
zOWVfi6=q=jE!u+s`=e3?qx5G%Qp=kzy|@58cZN|U(@X#cgWJsBhJ^rRNCRj94WI$E
zKcE5f1@LeE0dL~QeKL7e=MN-7qyR8~piy<HWtuoPejUZ<d9&vRVA&Q80}l(M33Ivt
z5*Da~>JEOWTu=I|@du*GPpnNi_usHzD~4BO&i5aw0HVyJ$)hMLVSqVZIw3v{;<1(c
z0}KK|7GhT+UzLz4$~^gX)U0nnsag(OTU2Tx`qdwBKX9B-6A17rpG%+&K>GvQACMsp
bpd8=}cvi=k6xZ2A00000NkvXXu0mjfjHTr1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/jammer.png b/Resources/Textures/Objects/Devices/jammer.rsi/jammer.png
index 6de27ba924f109e4b6bcf08e517a0ec822575e90..99e0246bfb1acdddf9df6c748233bfd2b808c0bf 100644
GIT binary patch
delta 282
zcmV+#0p<Sh1IYrAIDY{9Nkl<Zc${Nl7+^5!fKdmGI$+cRqYj|h0U8=+|6jlU0O!Ab
zdyA1~4!E;G`v1AZPr>ZEqh?^5kDm)JkL(bdIKZbv8c0e*E&70ADXG3E*#XGDMF-^g
zo@57L13FA%3|IcWB3nPj4xq$xsyF}{*b8g^2hj)LUMD&&P=D0{QtXTj&wl<VNzc$N
zh>%mgsHgxK?*fX^v>*z4`xZ=J{Pve&InW|loJ)QB0v3P9z|3%vfiy65qhLTBuufPQ
zOn+ke#vuGt?f(^qzhM4LJ^?UI^SS^TfD#=w07(w`^zj>*Cb!(D*a0_goFcilqpAaF
g0Y)7#;0^!)$P*M&!Hni>ga7~l07*qoM6N<$g7i9kt^fc4

delta 449
zcmV;y0Y3i80`CKmIDY}5Nkl<Zc%1E)Pfo%>6vkf-K{idOL<L<zFqAf7>jAg~(YO|O
zcmb~<8!d*Vn=aY8GU*vum9SPC5@~{93W-+UglPr?GBs@oreD&`zjnUgn|U*7%rFet
zq++mPMF0^%1hBmT2i<e`>~0_G^}6tLtX8YJSS}k21OUx%o_|gup98q6R$Z;p@QkQA
zt*?Xd4S<tQ91&Cnz_#rLBi8&l9*39dbS(ro06Y0^B0<bwdp**gI1X6}?5E}^(=<Vr
z<zMIJ0zmV8E=THU{5FsLD3bw6l3+L*k#@h|_r7^<x48o20<bI#5P&XuYG#TMSkk_~
ziVHy3b)izJxPNM~xB!I@t8_XY4gd=wC6lC$<;Tt;e0>h#@!^&v8Jj2NQi*FDe4PR`
z-AkoN-5v~9zK7Y5iMTESeF0#WtBOMQ{G?ETR;x8z6-~Ify!N7Ik0L_QzCZv_G~v3P
zj@L(*e;GtzHzAGweLRM2Ham}AUpYCCu`d7=8$C_LAUebaAPC$6g#&P}Y2*lsqDb1!
rW-~A%U-tlnpzZx3i2x#ie*^Fhk4m<pJ#1L-00000NkvXXu0mjfO_js~

diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/meta.json b/Resources/Textures/Objects/Devices/jammer.rsi/meta.json
index 2923d9ac63..c5cc9f56d2 100644
--- a/Resources/Textures/Objects/Devices/jammer.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/jammer.rsi/meta.json
@@ -1,15 +1,23 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/c65da5a49477413310c81c460ea4b243a9f864dd",
+    "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/93d9c70530c7299ef0af96fe2178096b2a62e036/icons/obj/device.dmi",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "jammer",
-            "directions": 1
+            "name": "jammer"
+        },
+        {
+            "name": "jammer-on",
+            "delays": [
+              [
+                0.8,
+                0.2
+              ]
+            ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
index cefaeebebf..0f259d9b45 100644
--- a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
@@ -2,7 +2,7 @@
     "version": 1,
 
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/354d9635460c296dc7dce23ab39481dc4de6dc00, signaller2 created by TheShuEd",
+    "copyright": "Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi, signaller2 created by TheShuEd",
 
     "size": {
         "x": 32,
@@ -18,4 +18,4 @@
             "directions": 1
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png b/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png
index 37a47342a6a0fadd153c1abb049caefe51b50e43..d6b68cba775e1dabde93e46de284f49f0b30a35e 100644
GIT binary patch
delta 441
zcmV;q0Y?6q0>}f98Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00DYQL_t(|
zoMT}aU@+={Q3sIa059)||J$~%U>q<9JbZACfm&c_M!}$SfMtx`e-M3q$sv-{1<4Lj
zjW_wvaOM}>QV?)(QHL@Alj;bP900P^!BL%I-uA5welF&4aerT9T`+xM&rJqW0a;Oy
z)a8xB-+cBm1G#`C2iSPCGWhD~;*|fxeh-)qXy||=TYob=ytW;u{Nww-8At_0JK(UL
z?*G_xUm0W-xfz~4bYd`1@PNymT(E;dN`4>1bD%uU9B}eJ69WS;g#Gf)WuT=9IS^k;
zo`Ebtv;#^WUw>p&&@u*Ry^u6^AbATR>BP=(_b!bc00NRm++h0d-6uHZNv$S^PEo9_
zt@j_B`1wb#84Tq_Y43nHuir56F$jR!W(%G%oJx=aTmEVLGluh?3}ickXa~G}^^8%8
zK?NKN`m(<nPBB0%rNnZQ9DodFJ0tQOC6<%y073-~O)?825O{FyEU>CI{*Path7KUt
j5~@0Y+F;ZHqYeN7H12k<OA)0C00000NkvXXu0mjf8!o-h

delta 264
zcmX@XJcDV1WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04
zd8nt5s(4_oPs_BbAQqAH!or5PT!E6d+7mN@6h}#rU+{kjV7S-3HxekuS>O>_%)r2R
z7=#&*=dVZs3YL1hIEGmGU!CAx&)1;9<Ffq6!++-6)^08kQOxtHP|R$zS-@I)pvB4g
zzlOx?*8i+5JnEAYH2U6cRNJQVX#!W_K9T5|%%YpvH}_fwFz#;dbGSD@fxqXZ?+3$+
zqA`YF@;l@tCLibBcTE21jE)1Al71l>28{u)8H0aHR=D5Vkpy%BgQu&X%Q~k7#wGyW
CcVF!Q

diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png b/Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png
index 53fabd17147d2c566dd0d0980241aeb7f1d65d4e..cd94b9738a05ffbf12b4527479336fabaf91a047 100644
GIT binary patch
literal 447
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZnt_3_
z(9^{+q+-t78}{CZ69m{kXmivtI38RXG^gp2f}WH5NB+Ad#Vck%P<gSa+gUtT*5%bR
zb`LZ5h289axsF;hU1D4UE=R^l6>s(Ea{at7j^j|V_vPv8cl7foDVn=TiUVzBXyAHK
zl&BT6>h3cm<|)y+uZ#ab*DaXy(%_$c1@ErxefN#_@g8Hy4AGhP>zd8?IaS%mIFt{#
zB&zNDbZ-0Ct6O{bojLs1H_0XG!1Jl=1wOMr{oL9pnYQSu>&X(K_bpeA3yzvz(t5o;
z;rHF;H}{@=SNQlvUtjy&FN~YM&XacWw+)UIyY~3KeSPYTV1^T`)uQ)rj{a$=E_rel
z^O9MmVJ9OP=f%$}+RK(WX^z!_ZH-nAyFo67fDneauMeM{`19{(ABIbF?!CJDVtS51
zJ)6hnQ`cg?KDcr^jeUvV9rxG8hVlkXJ-vPWe>6JJv#TV3dYfP&ukqJPUchI{!5Rfw
mhG)z(_-~j5uxEfn;{bbL<^G@f$87F_Z1HsUb6Mw<&;$VXyS-!p

literal 373
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4vh_V(978f1
z-%eSWci2Fn?Z4k_lQf|O))t8tiJ!LH)FswhZ7`RZVG`H-zV^_z1rr!9vs~$VBIL~P
zvodUgPT1ShRqvcTOLx7mDd%($U~vSYBdQPnrpXG`i|%e%{(Nfx++xl9)4#u8=-c5n
z?|FJQ14B(+PV=AZ3z;;ZE?JN{D>P%@jeom;=LYOsz~-U3H|W)iH{a6!f4<6pSRmxU
z&cBZT8J^29ELfMFv6hjccK_kWzZh%xHy888URS-{B=XNy+F;$?2!>>yYqxIRm@(hk
z>;HOQ0jG+kB0Yu~x65p-yDBSdt!>0z8+A@UnDaU6_2k(TZtc%t?lIhOt*N+g)he~e
z7SAV7wrrj9&sA8+se(b{bWzv=32PtCV_*Isk`H+jaYDvW|KI&TFrR&7-DtCOrf8kX
RKVUdAc)I$ztaD0e0st59p{oD@

diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png b/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png
index 67f3f53eb5010a9b612cd02ec21f1d09fb71a651..15c1e94221d6ad947744547dfc7b4a8634b81917 100644
GIT binary patch
delta 257
zcmZ3-G>K_~WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hWfKQ0)
zP8VHqF)3|rz0Ax?MP-A|&N*J*5pVYd0p(5Z<QD)b&XOR%;Qvs-5bR$e1QIOph%9Dc
z;5!1sj8nDwq=ACjo-U3d7FGUlFBtM2P~dO~WORIA|7ekc!&cL~zr|bk9E|w2P(DI?
zM{XEHU6njzR)bvxr$VNKr%Qmk!l75)feaoejQ9TVI_;2_zhFz)JjUkZ)eK4g3DZ7^
s3pUs~vV2PrIDI^lX?I<MtiyY8{w&#V$0J^-0_|n+boFyt=akR{09)@`DF6Tf

delta 286
zcmV+(0pb3V0<Hp(8Gi-<0047(dh`GQ00DDSM?wIu&K&6g008JoL_t(oh3%1{4#F@L
zMK1&rT+Ku?F;g*9)$hTQAov3W2|vJB%}&is)NX=iNik0rwFO8v+Jpr2j%u5mzSCQP
zVHk#Ce$45-3V#*I^E^pllR7|aJv*RjnpNt3Ndj8yV2pV?+kb5zuiG#TLz2KcB}_yB
zfV!?>tpxz|{T;`{9({iY5uxk4q!ywY7;7H|gb?uFFJ@!E<EwyDDi~wnoI~5T<Jnv0
za=lIKq9~AM8HgxYYrjfFHQ=0s_a0J8R8=*blTyw$Ge=ZSN~r(<Wmzr`5JF5X#k@XR
k;8SFY*uf0LFc-|o6Qej+P*_VL=Kufz07*qoM6N<$g0pXRc>n+a

diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json b/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json
index 771ce4c261..96aaf12a24 100644
--- a/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for SS14, based on beacon design from /tg/",
+    "copyright": "Created by EmoGarbage404 (github) for SS14, based on beacon design from /tg/ // Icon/Blink Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Devices/translator.rsi/icon.png b/Resources/Textures/Objects/Devices/translator.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6871c808ccdd49673996f8b8f4404ef118734c85
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij?1AIbU_4M@Q<>hT`Y<zrt3=9lHLPCHt$zG>711a{BAiv=MV89^d&Flsg
z;w<opEM{QfI}E~%$MaXD00qlET^vI!{LfCh$k(92;i|9j@4vdbr}VTla#^Kub1L>6
zQhU|Z-a6Cv%8BbI{<kpSmkv~z#>bv4!1BA+Lo2}0W538WU#pihLZ&zz@(>PT+|s@$
z;f&CupQ;C=PPAHcUOTL%$X6+}V=}kyeUH}1?myQVa~Q{oXWeD^{6ysAU#rzwKqoMG
My85}Sb4q9e0CGNE+5i9m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/translator.rsi/meta.json b/Resources/Textures/Objects/Devices/translator.rsi/meta.json
new file mode 100644
index 0000000000..0202c0c39c
--- /dev/null
+++ b/Resources/Textures/Objects/Devices/translator.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 2,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "baystation12",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "translator"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Devices/translator.rsi/translator.png b/Resources/Textures/Objects/Devices/translator.rsi/translator.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c54a0b86366cef370ee7e2575979bc054a826dd
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V7#Y`V@QPi+bb724=C`kT-dCARMX0%{FPtn
zM7@b>Ggy`WPQ1h1>1a^Uq@bh}Rp#`xG0tlB_rgh+7A^Z3Ffrqd#I~w``;=d`)m1S?
uB}Iz&N5B8Xx#z0zhx6*&T(($0U_Q1^;pBD8!#jaiF?hQAxvX<aXaWE!Cr2&-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png
index 7c99615ffec1d6df58698e5dcf25e1fe7e9e4ad1..b84389a06bd18e2ef60cf5e4bc94fde649b421bf 100644
GIT binary patch
delta 287
zcmV+)0pR|v1Fr&*8Gi!+002a!ipBr{06b7kR7L9a{d;?R<>lqJwzgSWSvEI1QB+ko
zH#Z?6CQktzj0Ga;bac7}1*HH0**G}nO-+f1hlPohyTQri=jy`bCkFrk00DGTPE!Ct
z=GbNc005y$L_t(IjkVIz4#OY_1yHCWV%4qs|NlDL?QLR{Hh<;yo?J*2;Gsc0iI*AB
zcyazDp5&95h`>9$ok9qV4iU$K0>#Ma{o;7IgF*ygX75mY2IK%DNsXxZzhnop=3Gjt
zqKZd1NM6@kYZ2p01ut#L*8#;T*eh-WdK!fH2>{rBU^78GKr?}~)_ZTwTp{@Y_6_s5
l_=^2M*tv?7(ikkiG9QYM3CE9d_ALMa002ovPDHLkV1i3Yeu@A9

delta 414
zcmV;P0b%~H0<8m(8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00Cb~L_t(|
zob8suYJ)Hs$G>QIDfH;*!6JzFb@Y%HpJOKr(s$T16b5^Vflsj)C?1O23kZU+GH)x4
z!Khij&_JOZG&U+_{voJ|`1_d{lOAIX+DxxidMD5c=n&X$2!9(48Nu_SD8!VqEQ>TI
zfN+%fGT$LhQ=pWd4A&wM$1xii0He`0hchMkSpvTAi|)?z9G1%nwxtJ<#iCB77b*!L
z9Kl(Z3D7+uEaAsT)<6#&!V!#hL(_yC!vJ}$BBCsSa16pEcwCmyrxeDk6+G?RPL)s+
zkmD}j9^o>d9Dm-Q%^>8*2Zd*zJqz&dWv(U@04|`C%l{MpF9A6NS`)BsTf0Q1A#far
z-ThMky<RsXpfi{C4b+j!0=H2Fuvq-vR<}Shp9|3Q{@U|Aa9vmIijwIRf*`0@0P_}x
zAQz+$US4>4Jy;vG3&;(K46cZq-R|hVTK5B0LA40zNEavY1L(hp8>j(KiU0rr07*qo
IM6N<$f@^xR4*&oF

diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png
index 7909d14f269cea522d6e0b9033e83d81451f94ca..0cf52827fca440fc3ec9a0d956ea5e53e86f2176 100644
GIT binary patch
delta 299
zcmV+`0o4Aa1G@r{8Gi!+002a!ipBr{06b7kR7L9a{d;?R<>lqJwzgSWSvEI1H#av?
zR8=7%CQktzj0Ga;bac7}1*HH0**G}nO-+f1hlPohyTQri=jt*%SjGSV00DGTPE!Ct
z=GbNc006B?L_t(IjkVI<4#OY_1z@Ry#lNlg{oi$Hcd=xm$$y%0d%oZa(U?CCz#`se
zK;q51MLfypv2k{?9T5pE04M^z_XN&umWFSj$9*RvXF>K12>RU^<{*Yed^c%;V@f&a
z!lGyhQjDdP%;Sy?JY+)}g4S^XTE`opzn}mwC%$q8Jmth!t^m2PjM2fzEWz;xhYD&3
xRRvt@d7iaSIwW*(qoj!TAM{*A2w|50GA|%_3Obz{x$^)3002ovPDHLkV1j(`fVThu

delta 405
zcmV;G0c!rc0;B_w8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00CA>L_t(|
zob8rDYQjJihF{cf+y`8T>}zo`N{$jCc!!=LQ0OHJo+1~JEF^k?Kp<ctyDr>_PUj6i
z5!>24lZgoVVF;6feBV4~GSib%!adWwE4>wH1?m<kib8KG+kdvL#sv_brYQ&^O2car
zh~ro~jssB?f$#e)cqIYP^K`lMJclq0!F63NgYP(1xJdxv2+p!hgI+C5ChGYvWiu5Z
zID)Z1=yu_`(*f#pMA!mUdV~>pcsM{`2pBFF@Npa~D^Y0?BAl{S@cv{1fqK3%zQGo_
zEI-bk@-!L&D1QM?SOQf3I`cTcV%mC*3!MLOFtqoL3tWOt<s?uB_}}bz%jN9?Rlrqp
zbq$yV{}5;bc2$6zm-!rEHv4<bv_LYQYEX3S<9z@xCU`4K#$&vkm=(Zmg5Y!@eW|um
zZGCn&7!|<d77wJ){r=Z6;{sfe5rI0=3VZ{D`k3da?+z1*00000NkvXXu0mjfE@!D^

diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json
index 990bbf9356..2e60d4f404 100644
--- a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise // Hand Sprites taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
index 039817e37b9cb3f6c43fa5d8481ab2d2a50025d2..2be12b48a6455bc64608c891277fed2825f3e603 100644
GIT binary patch
delta 297
zcmV+^0oMMc1K9$QIe!aDL_t(|oMT}aU@+={Q3s4VVAKJl4j6R+Q4a9*4ET>ve*5+f
zj5KqAp1#Tdz=%i&c{xdjgM0VkQubf{_Y($tPbr4yw|+86s<AWFFM7ss>EaoJ4#VpJ
zkmWwUK4A94N6#7Tot?0%Q&81pSifR9!@7wV7z6}G7#L14Fn@e_|Av7WKyn%YIRqC7
zQWF7(0th_6B@7G+z5j$lf+z<(xP2Y$OMLQApFLr?3iS29*9h?s+X;sP(IEh`1ewML
zU?G4=2Mh$$0bU0{HG|UuC<Jg>zGd?kaGbAu&wvPl6AY9mLS#n(ts$fa3?4mtz(5Kh
vDhi143Atcslp=(q4j6U7r~^hFKuZ7sUu$URzcXAb00000NkvXXu0mjf%t3Z?

delta 372
zcmV-)0gL|G0;B_wIe%73L_t(|oMT}aU@+={Q3s4VVAKI*J7CK6)&D{CojZ3JR8&;J
zVmX<ijC64T$Z|siO*kLM28omE2$CIuZaFdliIeIGk{tjFa%2l(jyZqfI)*$=8~_5|
zp0*6np1*-x40DK-qzJ>r$uxGr_3Kv{wr)QRb_B!$3}A~v0DmM-Dj+)-z$^m=`PS{I
z4y36ADoU&wI(jxR`1%H5$Zg)d0W80B+fv#&00g#gZDa8Cu7dMnzV7diXL$LN#%bW#
zu`3Mrj^1F)?u4f?sH~g?r(yCmbwG8^G*BM@9~g)k1?$&ufXUO&0U+@Dy)4+W<JUej
zSR&CNaZ&+U4s8I(xuy<-$J7~MzQ<HYaBd(q2axRmU@8X&bM$|73nAikZ~zFzs;p*+
zne+>8;gUSI|2xSrhinJfcuO)cOnQiuPjd$-xIbjX$EUdis0BtHFzSE-cK`s<gpdWZ
SA;~%b0000<MNUMnLSTX`Q=&Hj

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png
index 1871b477b638f959833e77345b5d89dbd339b170..0ee37e653daa6931fa8331226de24fee077d6607 100644
GIT binary patch
literal 725
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F5M?jcysy3fA0|QgL
zr;B4q#hkZu?X!goW!m>QWjik93kwuy7iazGD-ygRx;rRlt_(|fp{@l-)9NW=R$Obp
zxN5Yfy?hYVl@?g=g1cj9(w4R_pLW~tZGSc|Jwqer*Ux*lmQ|K@^PePfbTK7}Ff3+}
zU_GG0;Kpdc)ey+g0}+~$!ua`f|F4y|-@U2XBVcO0_NOP)rVmG#KGks8f3Df!?9ZJ{
z@9tG!*l$*DyYKrxQBM1NcG6bWZ{F2v)+*eZFkkz@*HbZnX2kY2um4^6`PkJbj8@!p
zca;A2i}|@zuv>qTN$!dBq93x>n*T`ty>ahWS=STW-s`yRx&6vj^wtFXk32vAyuSbb
zb+&v`+OvNvZ_CTRJvMpj^8dE`UuhSZ)W3W>`^T3$=F{iD{eQUmcyhYNWT1UNZ@+tx
zZmt(QuXj<(;dSn&U`KrT@Zg91iG+sz(-USs6=^%a_Rx+$XRmIV{w4Bh`tSWat$s=@
zc_v<^T=waU(u`w&R2b{^mQK3g5wi13c68k*$$;;EqN!1z_lmP%4I(U|1{3<m{GjGH
zW5K?^3>Nq680O^LGn~`E%P+CrZQshTKb_suGpy=M*nTrUH`rfdpKwX)=jNFC_A2>p
zYM(x*ZICbU`}CImz)z4F?^zF`M-0pgq_{#6`pY2ko6+DKbHW?;12^~^RzCgB+?M^M
z^XpIb^b>ZGd(Zt*+aS*neEK_kPqgy=E5H6+PFtb8pA({Zqdddoy$UGCK~uy1wAg+R
U#Ul5ez;w#s>FVdQ&MBb@0PF}o;Q#;t

delta 918
zcmV;H18Mx#1)m3y7k@wq1^@s6<uq~*000AKNkl<Zc%1E=Pe@cz6vn@CUbUE9<tSdH
zMI^K_5JU)CiHuliOBZf*%3RbU0;8aTq(!9$5*W1bPYb~otz79sXj?%rL~X)c#FP_S
zIx~0FMsEw}*=)P#`OduY{6J>)-goag_de%+_nZL)K@bE%5Pt+AcqnBe++zqbRg{a1
z!9T;9grF|~>jb#L2T%{DB$UGfpkkE(rA#DUH<-nK@D~8or|Sl@eg>js3`xJW4`_`U
zrHnyq%-G%{WP70-fN<tGcB^+#yZYi}DizAv-p__mOP2|!f!$ibyq~w83yId4!P`Y1
zZKX`aX})eaAAbR%mM-hn=Lv+>4-j_1%*>1dfd0pm7`=7{`FtLUM8da~;Oh51nZVf9
z9yWdI{H+H3^y3c$0O|Z60KnJGHUMCCtAIC`&K-IXDoNjNu&psOcRP-r`TLl-a0^;%
z<Z?L-Kc57CemneCSk%{AAN+CXdoh3Ouc19lqrmJJ+<#blXnPAX{qZ=Pwpa7FPQa_S
zA)xmxCfX9D0Z^EpngRga*=YA&+pGE8B_Q()TI+-DH$FZDtu>I(kOuR=`dVw;+~|aw
zZpQHDMc?(km_Nyia2XhQ;KgmM7&-PDss0Zbau(UfK$*W|b=Bv0p_P?RqqWB7W&t}p
zzmd!3fPd_UKVJh&^tIOL)6cNNq|Y*c7o|+ZIo-wkA{K4reG!W`kn~ArT-xc*hPSGb
zcDh--m{7FQgtu$>li)WcD?g@`F-n=3-#bAm6LF&LMk!;8pZ@Q{Xv4l4N7w}<GY<dk
z=<fiQ{WjxD#^AelS)i1OC}o=DK!%Yc9{@oR1b;yg1VIo4K@bE%I4T6)3?v`Qmw^?1
z^vcs+I0H}){Rv(`ZqP_IbR^+(09@_0ntMqA3&qdCCczq|Or+SPz_J6BGEFDW-!<H)
zaui69Aom=W<2<&gxx5=*2LgO1OzschuFsD@n#IUKhwu7cA^ic&kop5Ep+27*(*J-;
zsDIDrhLnIxsL$ty)E`g@_4(Y8t%#u4=W|2u4;XtnhrY|7*y{7w*Q>C%m*%O@FAIqE
z@f1obqyzaD40vP4u{ffx9~2JN0s;1cy!f>gfXj?4^d?U^vsf$i2G)!tJu^A$^UI+>
sp)BA&kO{IAS`kR_1wjx5L9pU4$ev$+sSgitw*UYD07*qoM6N<$f)NM21poj5

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
index 819275417bab0d14b6904c6877cf9435fb74a812..7533331b835f14da64cc2356e30d496d6f8282ab 100644
GIT binary patch
delta 382
zcmV-^0fGLi1Fi#*Ie%bDL_t(|oMT}aU@+={Q3s4VU}!qP(=*^dy4d#Z8yIQs0GP#r
z5s}!W|C8eoq8$LT9A@#9zHSC-DH#-bBuD)x#Sug~0AzVVSrJ2Od>n&-pa@nq>sKsi
zxO(*hLrrrhNsb^p5k7tP1SJ$ed~yKE4*2l?4LlT(Ed_~#z<<xrpGa~HQ4RnZcyRAN
zhS>`jf%%}QKnKvE2S)|WF;sH^3_N`F98AL;f-L^v_H~ByXD=|23MeXwU=9LVjt)Qx
zmzab|^^y>l6aE~V$FQ9U^)xApK_Rl`#9N}&(yT7Xun=a*x=3XQfKoUJfJ!}iIZ3Q)
zw6zTwmMmI8w0D^#hd`RkKZaRAhk!~(eBjZe2h=MGFI_yt2+Z66LB4x_>nBiz6Q^2G
zA|%#wq8$JNP(%M;y$T6tbN~x>QY<IQ0ceK*N3NJaB_F94ljQ((hX82?O2N=<l8riG
c)B)540AALdmMbzdCIA2c07*qoM6N<$g0jV%_5c6?

delta 378
zcmV-=0fqjq1F8d%Ie%P9L_t(|oMT}aU@+={Q3s4VVAKJ_!vRyKul|oqE+;dTk){p+
zS?=v=%P?{Bd<;1i6%~T|Npiscebc}`J?zr}<_q;sWiT|*1hcPSze0NlfPlET3WI?X
z7nuEsfpS350Y{Ht`G5Yxb%r~4?%-87V_GkU*w*cbDR%(Oa(_?|`+Hk6XlSW3{8dv1
z%Yi~bN>T)D5l9Vkkb|OzkfVum0CFm}v*HJ*fzP+@g86q8?*J`l09zCq;>)ml&1SG8
zK$e5p*wO{b4gi4%JLUf$+4`K}A;|K)F0dHyq%vR_e}t<6g%k)NTfTGKQoLD^Xa^{`
zKLi`(!?g0hu5%VI*mAH#+|$AGAYUVg0<o48?EqK^teC=pupAALV>!_dfQ3M7OZfj@
zms+rxWm7oA^<!7y@w|ES1~5&E<wQFG2C8eO!42P1GmU{7V0ctUqYfB#z^DU89Y6^H
Y0JU(EUB$UW0RR9107*qoM6N<$g82-o@&Et;

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
index ba244f3f29787b76c4d627848f663efbcc0c7d90..56d1aa2a36ae95eac498200e3a046a6f19d06197 100644
GIT binary patch
literal 1283
zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!3HG1+{xJmq&N#aB8wRq_>O=u<5X=vX$A(C
zt)4E9Ar*7p&fT9a;wW>}T|`jO)RDV>LHcYDrL4@t8>)_;s<&cgCz*tm9kf6Ah--Di
z)I&}px~gv8+@h1NNrbo@oxC6;(c*J#zFzU`zqfAQtlYl&J#*sbn~(3k+4tt$y|>@b
zz6oUE;$?7VK5&7-z=VMZ#_Z&kklr8he#_glucz-0Io7i5{&vQwA8&p{Y>E5*Y3<$9
zueR}OuBwY?>)0VyxAD)G$FJSo&%2&}zjgiB-rmx5cEyyxF4GkR<>y6q)Wz%n7uMF@
zpOqKCR?kFwBJ0~P+RDopJuUjW(ERU?Z;x)dZHd`yHaEh)P+sBDuLbVBH~wAZwTK9f
z>%4W*g5#22{I5mYRY_Hq&$3Eno=Cj0uT89e9k%GZSIU8<pHjcNNUE8X#hH8D`TybL
z-cwu`<AbgL|NW)#qBQ=O)WxaH`oH6E#o3o7Xm70ZXI4{N_WIMZOD}n3Wy2<4wLY6W
zKRtZW(~b`N>I+JG*L}t3CdSmK<f{HMoLGAEop*fptQ)V&O&#t%dAHU+D{I}?_ix`Z
zJUVxO->2ZS*S%I+9aehr-G+JDGds`q>-=QwS57jhe?Ps*@x`xL-U-1gZnO8tE!iuo
z(^PlfSm9mGpQ!7dhn?M*Fly;8e69YD`QE=9Yqie5U%m8I(dq1Z`?@9H^7dt~OE2XW
z`&(<CcJ=GbB5&!M*W78+IbYZQVh|KPn3qz?EB1EjF`=dUCE3lJ?Hr~(EB)|irnA>c
z-5EN(i-L=b)9)S)XO#Wg8X>*s_3>K?tMk8>me_Akj1-y#j3$$R!i)G-etEAfJF!x0
z#~&q~lE3@TGdvEyTfaRu@@<9S7vcD(8k;W~lkDU@n-(%AWH3lbF|@HY;AGC=XLxNa
z&u}f>j$uvyRQ?I89#rJ+3E}v?=KOkz)Q`Jj<R<!i%<kXts--k@*Oa#DQoSD|=dWLB
zaw{QCY}2t)JEcN9hwH~@TfeiG7vN9JsClvboV&_7_8FxgpS`#H%-D2J&BrY6xwiZR
zEBS*p3=#8xGHd_}C)7S;KJY8-Cqt~f{tKx}m)d<d+m5cBE%0~C@BFLmGfY3u&3aOM
z<@xMfhnLIm*6*%q@LcRB7c@VA%R)8D*p|9ee?hK2k8GaZBo>UMkCY2wOarJ-L3-`K
z{$Z??-+w>seyE*NsJczY<L|!@rP>|Rk~i4!_<Qx0@~QnBPO-O`)a_qew}<x(`;!n9
z*RTA<sCVrA_N(sa<R29MYYF+uApZFI?N`dr`3o%Top#kUG=KcO_UpvY>=twE8<D+z
zhP~nIPY)q@4u!c5HQ$0oC-1It$atbAFQB#a1bd6ms-Mg?{rBaSR$3(<`SEvQ;#7Wz
zULg0{XZ9ab`|V5EtmFe&*zDv5teEHWYcMg-=jV`JUDI&-*N;WXSJ`*0>DRX^`^nJ$
z^`oo$^q&nAPPp1Bq!dl&=a_ouDYH{^zsf;W7t}L`MA$ABW!wNN)fhZo{an^LB{Ts5
D=1N37

delta 617
zcmZqX`plx(8Q|y6%O%Cdz`(%k>ERLtq#Zz*gAGWo$}GG$QBk~}N!8QEF{EP7+gaA$
zhXW+q;ul&}92V1e)#~cFwocNeu<&D(LeSl#t{?3!eks41U!WZtT_|XM<(1GXKP}OG
z=K~983lt}9ZOpp-<w?ZD-*PXWKAH2(cix;Ox<8o|__!GgBN#dkGdakJF+AG9U>~+=
zhlF|kYwxAsq8CWatf^!?S-)gus{RB&`S8+KCq)hQi3VFAWgq@IkLApo+?&h3Gjs0V
z`%lbWON?2EacR)Xg}f8a^}8^5J1qV=FWn)1gLv-6jpyCi>ih2hT*qW)w(acm=i(A=
zfyH-DohrJzspg;1rWNPPML&q@EsNNG^<96@g4&`#n~j4xg_7q4>&d(;zx$%9K49*9
ztpk;!y=AO#i#J>;Oy16$yx>okg4k?_g$1ekEga(S>#g+nF0$IcF8jdUhZ8Di)f{?f
zSzu6_q#u3aT-15<`^iTp3RxU3wS9g%e8H(dyI6S6-@mPWEA#A(2wC0saDi)c-4C9h
z8$S1aCR@z=z2U9(3$vbwKChm|c=4sBaR2uDsr=o=YXTfLMr@I1+FyRp^#4Ogt^1eX
zH@x1w_|;T>UB~11KP3MP^V6FDpQq76hv7&fBSx?aw6ivVq#piac=_e5Z}4mBoVePC
zlzla|4a+?5&Yylx|9fGrLvulG!)=Cj{6F4*Wo)*Mkyn^}{ww2Gd!9$X8lt{G|NQgW
vHTDRT?RF05O@YMoUksYaF(=Tzr-47Z!D(qS-{MSQ>S6G7^>bP0l+XkKQFIuz

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
index 305087c37b634d1fe0fa8962937605c45200cb89..242f217e4afd493c1d23275a445a3abcab026f92 100644
GIT binary patch
delta 364
zcmV-y0h9jz0fz&SB!3BTNLh0L01m_e01m_fl`9S#0003wNkl<Zc${Nl7+^5!fKdmG
zI$+cRqYfB#0MQOePfq#|qMto~0p?%4a*aViPy{Z2>EaninmGVuxxStbgRqz+!@fPc
z!D3R95)9jS?_<!`HURTKynpk*!c!g0zIFF4gPO81L)Ofl1b-bx&;c;ZLE!DH=L}9R
zt_;^MT?F$JqazsBZ`;G5qpt^cNXPaI3_)rl3@2{AVjvb!Ee!~Y3Nh&GXfaIKwhip-
z6OSHI#{r-?mk<+U5SI``5r6Rt;!9xAGrWKO4$QuK^%?`IfS?0FiOmQY#31nU#VZuc
zv4Lsn?*CzIVr9|-K?gi~^nh{x(iQ(f@eK-vi<hpz<&YEM)vJ*B2U!XO#H0nH(g4g6
z*yKPK!_-W8^Z-MiP+A~55rQmWpaB><CE=(8MjbHffKdm~3IG6YBX^HGd{D#y0000<
KMNUMnLSTZ^Y?zDy

delta 226
zcmV<803H8_1O5S!B!2;OQb$4nuFf3k0002ENkl<ZScPL?7zLwX6pVsVFbW13Fp{g$
z(WCf30|NuY{vExHFg7l*e@8D)dsy&k)YH?$Yp|HO0)wMR@qaOK1)OSLy?lVr2>cGX
zbm<aKmn;3z|Nr(A9|HpeAH&;E?{J#&<-;qy4q(D7OC)G0(OV@+92sB@0YX8~z`(%p
z<qwqpaEF0`K^MishMvm=ErtQI6QPn;?0*IZ28Mgr7Bj-wxWK(@i^;ZU6pVsVFbYP&
cD4;n20LNu6<0Yi$kpKVy07*qoM6N<$g1>)ZeE<Le

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
index f7e231248e590aef16b7911e08248ceaa8661fe1..04057ffa8225c83b5542b7ef2ce9266d0a5a3d9b 100644
GIT binary patch
delta 403
zcmV;E0c`%w1fT;UiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPLe^N<A
zK~#90V__IzFzSF&2aGyk)B!`o0ebo-|6%M)7tb)#%>l?3J00EyVc5F;r=}wah5%D!
z4#SVFn;8yF+r;3I<p<{LF--X{EhPh%fBNhR12UUb#}O3;9NxYVM*!I%S`lcWpr{aB
z9>xaIK*#(i#UXed05SyR+h2V0e_%c+1Q>w$W_S`#JxC5CDyj&Ez=!v57`UJgfB}#X
z(b+JI-@kqbrlHY7&=GhYASb8rUnr{q%!Z`{5Y2{W`PHiz7z6}GkS!(}5S0c%mV(j&
zC<+b$`R}Gd9EIjPc#eTN0u*`_IRNA<m}MSWv%xfo|LD;JMj*zjo~j`LY4ahdJXoh=
z1Qr8Xj;;<ARW=Sza6Tv<fT9JPT9O=q?htGM<TzwslVUm14j=}=Qa>q{Q^f(G&;cek
xcmgEFa;i9h980P007}5914bP%>VN@v004BWo|uaA($W9`002ovPDHLkV1hvxnTr4b

literal 589
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VoK
zPZ!6KiaBp*ZS-aelsUfNDcd<nBU6P}@mX2{3$N+S>=1!1+qbaw>i%WCD6(Zs*tXWK
zA<ZH}?aoTMVjhxhyk;(f;qOn*O=p`o=e<<je*P2hE8p*Uznj1Ra&x?V$6+Q188L=O
z8yE!ISsN^L7>*R`C`_GYUMGJ#rLXn_N9fPkw+#sf3BB4=(|z>UY}3`M-m==KtLx7?
zmW}}Hzs$}SJ#rEEpRY?_C?xtb_C3Q!j?G+R@25Rca$#NdX~vCpN!7DNZJk`}!kL^F
zCjJ!cU}ZU!T(sxgwvWbauhxf3>WO8n-#cl6(*2DMQES;^&u_0;fB#w3xynkNho4^`
zp0z!E`-)TVH6HxSxpHEjO``hu???TX>#g~iV$~G$?$Yv1<F>trSXX_v=IT(9f5K|Q
z+jjr`^lpRI4mK4>l%)6<OtML9+qJh+|C8+dhN(}i1iDStyIftiZ+jXr!~Ae{?^OGZ
zJS~UMb{0uq{JZ6K&2ejmx_vjl&5qW%qw!xk<>~S7Q=VAYaa0v<{y*{jdnN@wZid1L
z2Fw6UWQ0gHTo&GG&u~Znz+Xlval!2TU&fSQ%=eBrx-7C>__{+(s&U>I_Kuo^Cl-WO
yPkg_}USXbj!PNYjpSRg70F`R3JB?va4Rf!${Fei_UkC%!2ZN`ppUXO@geCx_?EK&W

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png
index 2bd8d3837da037939796bf6e9c74730fdc936985..c23c941e150eda9e282659576a6b1707a9b721bc 100644
GIT binary patch
delta 306
zcmbQnbe3s?N<C+RM`SSr1K$x4W}K?cC(XdX@ZZzLF{ENna-u|n!K;Qq_8zN*D~yZz
zBzEy#xNQFOzJ&VGfc-BdnS1t?eB@E~m3i<|@`HTrn^#x49lRwa?Do_%FQ0fd_x`>{
zjpG6(3@0ue=<r~xwDfFi@1J-0D6^!}!#C{P*BfiB$Xb+L|JT1q`GXZh+Rr2FrY6+g
zpTZ>Ket_XbQHguQ7s1CId-y7Tz2ThmcCO@E2W|%gE(bg2#<iEH8(A<rGaPege||ph
zfPnKihDg4KWv~AKYqaC}cFvE7{rkJatMX1i)8(<-XD5+#<Ox@kB119D35OhpDZf}*
zTqQ0%?L0flCDqxf%~reWOG9IfL5cSvgfGqb7#K`lvP5bX*GK^agTd3)&t;ucLK6V*
CDSe6n

delta 250
zcmV<W00sZe0+s@hB!AsWL_t(|ob8ptszFf{hClAm#K6#%fe~-O+yi(8W64bNDkd_K
z*~vinmJGNrpu3fvx?NHRqBw`yGCRd^(Gl&h_FxazxBu3vwZUSsSe{HoQ&g!mWV2ZZ
z_p|Te^m{6oitX+oQ{##QGBvKWJ6+MbqK^!w;prn#6&*bz|8svU0QUPO0Qo{$<x-Cz
zl}-W>kAG?v_XW7^K&SyeO0}yFj0@#(0{{$TSpXKfqWW<)N6&}@!TFiA!rud#-!A|X
zla^Kiyy_kR7<`Y!_fMGFoMycm-alZmSS)YH1sm*JseF8qNdN!<07*qoM6N<$g7!Le
A`v3p{

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
index c4603632dff5c79f7610e6bf724f687f2b1303e1..494582986fd3e448c7b114a3a92ee75d0d323d74 100644
GIT binary patch
delta 431
zcmV;g0Z{(V1IYuBB!3BTNLh0L01m_e01m_fl`9S#0004dNkl<Zc${Nl7+^5!fKdmG
zI$&rzKu=BiKf2hZTXz|0?f{s@mbUiTr2muS5TYFbvK(gd@iUhgq@`p~<dGcppA<(B
z<p7xF+js9{5D*l>s^-zNcMMmrUSRNabt1_TLoX42c>e|*3V%<ZJwb^Eknd^gfM?HN
zFeFAtFnm0{hhg2VH*m+m05s^q>S*Es5P0$G6@$LAFoQmu7=w|%9+;2pKym;{4mf`J
zAcMZ63d6%YH^B~&5EDaj1TygT^7_Ad+cts;k?M&M<ha1#PzLdL=NUE=p`L69tY5nt
zg)gt74rhZxWq<wQJ4Bg7mIE5owc+gNw|;`@8T)UdI3fcWRav+0Qr7{X!f3|+gAA5`
z5JfR4@p;Prh4Vp<0Hu}VM4Cx*2!I>`N_-%ID*=K4RZBvsVgIEhB{1YbiH<>51%*%b
zx&YY`AT}tKg8(e=-@5yjEXzr90FomZ7}l;vX%Fms^eCP_?EwsjPyr0R+HlkXqYj`p
Z004NKpP(c3k*oj!002ovPDHLkV1h25y*B^=

delta 436
zcmV;l0ZabL1I`1GB!2;OQb$4nuFf3k0004qNkl<ZScUDDO-lk%6owxqlBlqPpmrjD
z{egai3$aZE1w}*<ZgmlaxT?0bQwc&s!9avG3i=J!!cCb;gkJ?gRuo|ir-h9KjdDkn
zHuEg!yyu*k`(B0%8X6k^jINs|kJl$DeGl*Ls-CB+L0)`+TYpfjo2(YqMudeve?Yp*
zW&s#97!);M^?J*Qs0ksF$Lo{sZu02$dH_B@-W7F2!y^DR8V$^Ln~;eC5d$)>wPye(
zr=}I_Pmd1(j2g#;X9^jp7E74zwzk>J7{@1oW(3t@Nyva+NCh}uZcJ87>!K+k*PSl6
z=vZ|TtgU+hIDgm=cdVBymEIdTKRszJ@NR4>YTjOIEv+c3B8bPL#ADI68oA!L2o{%?
z0XRC0bky`Eg5NBxtOCs=KT92RnaKcPaX3`Z5{{q~sbqq{_D)y5Ju#q@V8&tVpMi8T
zp^JoqLfMup6(XS^>10CaH!pk#eg;awpW~KvaB-byD=p`zkjn`#hc4d(vvc!`?*TQ7
eH8eCdWWE94#e$z+?t)eT0000<MNUMnLSTZca=gm`

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
index fac7308401..50a7fd96d5 100644
--- a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, micro_mani by EmoGarbage404 (github)",
+  "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0 // Taken from https://github.com/ParadiseSS13/Paradise/",
   "states": [
     {
       "name": "adv_capacitor"
@@ -27,6 +27,7 @@
           0.1,
           0.1,
           0.1,
+          0.1,
           0.1
         ]
       ]
@@ -53,7 +54,13 @@
       "name": "bluespace_matter_bin",
       "delays": [
         [
-          0.3,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
           0.1,
           0.1,
           0.1
@@ -146,15 +153,7 @@
       ]
     },
     {
-      "name": "femto_mani",
-      "delays": [
-        [
-          0.3,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+      "name": "femto_mani"
     },
     {
       "name": "hdd1"
@@ -184,24 +183,10 @@
       "name": "pico_mani"
     },
     {
-      "name": "quadratic_capacitor",
-      "delays": [
-        [
-          0.3,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+      "name": "quadratic_capacitor"
     },
     {
-      "name": "quadultra_micro_laser",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
+      "name": "quadultra_micro_laser"
     },
     {
       "name": "rom1"
@@ -222,7 +207,6 @@
           0.1,
           0.1,
           0.1,
-          0.1,
           0.1
         ]
       ]
@@ -260,7 +244,15 @@
       "name": "super_matter_bin"
     },
     {
-      "name": "super_scan_module"
+      "name": "super_scan_module",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
       "name": "treatment_disk"
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png
index c23eea56f8556568887e45b1c071aa5493434681..0bf4296e9b398dcd7e5f3ccc352397b37c675e64 100644
GIT binary patch
delta 330
zcmV-Q0k!^z0_6gbB!3BTNLh0L01m_e01m_fl`9S#0003ONkl<Zc${Nl7+^5!fKdmG
zI$+cRqYfa;0ebo-|FMZ*x_E|><_?gPQ}~}@A<Qu2#9Ib*8YK7V(F2kkL6ie*%@96*
z_~H%NvJdY;Gy@7PFChZLV6}%&5f>T+9RRXiOIMFULQIU|#eb_;3|hLFYMwoR!C+~k
zhc5h|7)RiB0L=2^hYy1Jfx)3*N1y{KNeQqcKr{@1^bz9-ybk#I;XRz4%OJw=1j>e4
zhHfc2fM67WECGSZ3~v|$k@)EJhc}oZgX{sa9B}E@T~P4-mse3|Fw)m!ICt?9R&@{W
z+++Z$K^KGSCqv%>$c_LRhz)%B@s~k>gP8$co*2uCasV-gJz^jq49%i=)B&Ro7<Is?
c1BR6Y0B@RsK<T2Ey8r+H07*qoM6N<$f_0RMs{jB1

delta 235
zcmaFL)Xp?PrT(0!i(^Q|oa6)v*2M`TJxz>kJx?-Don8Cu|EH(M7XOcLU(Yjp+Zwgg
zI-3qmUw{2y{m-hm|F^E*{jc4~;E#P-$-DZZvq?(fj~BE1OMn1Z|2fs`9H(RymMa`S
z00asO3f2aE4Xp>-`TN<AF)CZL?3kXhu;swFZ7IL38X6l@8WZbhiZKJh;k%i6Dbar0
znD-rvao%`mbJw3W9%URF>2H$~fIy&c(Ha?v4~u5J`BZ)U9rOSFwZG35y#1xyHmj@V
h*Hvb)(*q6OFfg>{crW&Cn3l@`1fH&bF6*2UngFhSZ=L`E

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
index 8dca252f688e5ea18df98922c7dc02cf353ee676..c63b141f11d8ad63b1579c59afcc6447d82c91f9 100644
GIT binary patch
delta 363
zcmV-x0hIpk0)_*SB!3BTNLh0L01m_e01m_fl`9S#0003vNkl<Zc${Nl7+^5!fKdmG
zI$+cRqYfCH4)FEz`j1c3=55;;Y3cwFkdl-@;Xix+0xkw}AhjGpFbX8Z#IUkKju2z~
z#-ODw3FcqB`W!Adck2P79f#Ec5AWOrV{{N09E!pRS+1fX2Y=@yvHuh62&@jcbn7l7
zdOARN5SXuH#&GAxBMkk1!R8FtpZxfL?BWT6j=<^wJvHV3u=s`rJB<J0)hoEVwL9-K
zXv%Pa*+2^!f*BB@5bUl9qW*vR{+dBvMIC3tC71?a7J?EX3>-gv5FAPj40johT|`m-
zKNyJva-57_C}e|{o<3L(n<H>K0AvX|fJFnua!ddX^8ZlZgTc9rml*H?oN0i8OaOBP
z$oHUV`SSfS*x|U$q)AB#as*n`-~@xSC?0jdr~^hFFzNt$0ssbqdC#va9D4u&002ov
JPDHLkV1i%anSlTR

delta 339
zcmV-Z0j&Op1MUKlB!2;OQb$4nuFf3k0003fNkl<ZScUDAF>1pw6o$XF^^(Oy2za&+
zU<et!WO--E<O5{)4cbfO2wt4Uw+O}riZ??-#w_s_UWZ~s>VoAG5(@ezNl5Si^?nH~
z7K_F5WF~((6vwdwq-i>7$L)M<tvAz+BBB7E=doI?n9XJY+JBC(*DHXIHSuaH?s*<T
z5O6#mX_|)ld`?jmIF7?~I;E~_7K;V0>%Lc2^<ipYumd8ZVHlF<IRH@<ak*T`vW)Zj
ze6u&pGE-f1eBW2!_q&`$M3W@xt%-=1ps>;3E8PhZ(KwE84799aw27Co;$axF-|sn{
zPQAyr>weW?OiWpGe#X&fqiq+yJMmC93d>G(ZD?Xt1jCeFEIXJu+xu1@VA;E^mQRS`
lbNg`7K2Ny0#bWu#d;u5pZ+MgdwjBTf002ovPDHLkV1lQ?p4I>W

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
index 93b2d06f098388d6a153ab87f3bfb3836c5db4e1..0c3defdefa4fdf1061e71e468e243ede1394a20c 100644
GIT binary patch
delta 380
zcmV-?0fYXE1FQp(Ie%VBL_t(|oMT}aU@+={Q3s4VVAKJl4jB9n@bnD$kIdh`eFGyt
z^;I<uVD;zEULZ<6P6vQ2e){YQLtsQCTx|V{<qUfICjT#8JcHFxkmdHyPGGizswPbM
zKR!obbpXing0dopgM0Te$jeEB#U4I-4yJv4eHf&rWd0|M-hTu0=e|~AFf=v*`xs<-
zX+aT49xMm)Ku%F9UPs^zfeBrGU;{t~BN+s?1mrtw{Z(N8yNh99N5X=fRDjh1APc)E
z^npVFDJa1J6cP_^UuSso=@pp&;N^7`IhcMJ0I4O}0U!Xf92Ts|4#Ndtav+DJI~Jcl
zg1G?X5M%&Kh;<+XnK{3L`CGnk0meCM@WVoakneFi0Gi6d*$I@ukO9bYko+Z7^<a8R
zU-y6H5CA)H^A-kNxdx{LkQ~7Pa|jl3ta^aCfN1r29YCxBl&T;6Me(QuMjbHffKdm~
a8UO%Ewy&4@&cM3>0000<MNUMnLSTZ|KBEBu

delta 346
zcmV-g0j2(|1BwHXIe$D!L_t(|oMT}aU@+={Q3s4VVAKJl4j|eAQ>L%}k1m#z8OlgE
z2Y`T~fhL@N{=#*J{rjf<KkU;07qi{cz~JbVMUtaPasbFuWFRiC!Vq$L3B#T6GzOKG
zvlw2!yu&~$AUOm;j)2iH0J0nzfT9Z&JusST4v>-*0b*M)`+xie1_li+b%v|KNeBfw
z!C=cl4n(H$If7^h+_`gyVe58O{=xmP!Ipl`>tf)YRK{@Z*cFD??`7fg$TZmwc(7Cc
z|B<cF8P4D_3}iVBOz5p-EGTaOk4#hK00sAlU;_$@8UCxNsDK>-qd@@VdpL;jf;$44
zrpN)vApim(%Tr+h6yzXFkJqhauxtuvAO{c~0`6W{{$Ia-1x0Scwxw_%ZmF3@8wbF^
sP9)2y35HHxFzSF&2aGyk)B&^t0LO8NgsdPP_W%F@07*qoM6N<$f-iuXKL7v#

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
index f3d1ff54dc93bff2eaf5ba08ed42bc1f64a49508..2da4e416464424d15410f82c64ecc33403fa2200 100644
GIT binary patch
delta 356
zcmV-q0h|8y0+a)gIe$h;L_t(|ob8pn4go<FhL1$z4Ny?26|$m0DGCu$s6~YrP^y%k
zK<6Pu6iP%SqEKj7gTf`AVa=H}>uj)Q6PHNlPbQhm&ivn;IWy~pA4>r!00p1`6o3>!
zG?q3*eYqHUz6yZmsak^9lOaE}n_#>XLMj4iEW}|t?}K;=fPY4~YZ?W(LWsU`XLffq
zG;)u|r2sO8l5yDXtwnIb$?nJ@^l<PN8P;Fyo((NyHs?ctQzc;=U)D$NB7o-QYMj^6
z6albs7*+xdfC|mEY~<Qn!vN&;6aaUQ#wfkNdH4+-pC3(Q6h=VzvpG3%obL$0&y1Zj
z?Q691R=wTq0bTTOu;4R|=>}}$ZUHO^FcXTJi=ESjThrBD5;_@60f>cY@`-$Sbq!^&
zsq3d$#@vmh-T{#dWB9>SY(acT|M53e017|>d{P%az@Cv??+F3`0000<MNUMnLSTXd
C;hj7H

delta 325
zcmV-L0lNN_1N8!sIe#ZfL_t(|oMT}aU@+={Q3s4VVAKJl4j|eAF}3Oc(Z!ZD&t#;V
z13*AgPZiF-f9W=gqmmu<!L*}O7D<jG$pIisu{j7NE-tRZ@bcvy22ugZApo)rM#C(B
z_TVv!I#9@fq6bD(&jAXGU<|Vu#^1MT7lVeDIyeMCmOA;lfq#_1X?%_#+5sS6f-J(u
z2eA+C-^y_8*cG@qGK~)qbijk1^8b%)ea<lNJp)$5Kw_Vsy@&JnE#AiH6zlaLnWo4A
z3hocV1~|ns{FhRY1zQNCmo&`;t8t3+LeT@Wl#t~_IRH5XU>3&IrGse`7fUexiQzps
z_{jl8hk%Lm`#%3L3vV!70@G*q9*6r7$fk`0kSw6M)T77&v;w0J7<Is?14bP%;0^!)
X?;V+{P93(D00000NkvXXu0mjf+;5R9

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
index 11633f753de16366181a89d31aa9bfb16306b2c0..0cb5de4a3fdb66a708efdc83f63e3ef5dd9d0988 100644
GIT binary patch
delta 355
zcmV-p0i6EX1@8hOiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPKe*qy$
zL_t(|oMT}aU@+={Q3s4VVAKIa(*bgF3jYNJMTk;+>EanisyaYV-{gOj?^ht}E0}-a
z1UJLFTW=VSF44hIdv@1dhP?L*{~tYifYT9VM?v1A?@-ovxR`a!6_U*%$^jr>BlGJv
zb2A7Ca-*p6&V9iEixxt`PLcyafAK9XB?IRRiVA`0_pjgK)ApZOM-UYPPoF(OVe9DY
zf!SBDUcgYRt!=<S3c%|CknfQV1o{5T#Y-q^gt8jIv_qC3!#W)!22ugV<p9WH5I8Vx
z6IuGHRuF+hU|Iup9RSV0@InVUEr0+hdTxd%q425d02n~d1t3R&asawxIgr7J_iw1@
z09YuHVgbIAk7NgsY9Og#Xx4_K4j6U7r~`(T0|1q5U;y?OeiHxy002ovPDHLkV1h+S
BkZAw_

delta 720
zcmV;>0x$jV0@(#2iBL{Q4GJ0x0000DNk~Le0000$0000$2nGNE0IF$m-jN{}e*%k1
zL_t(|ob8%DNE|^JhTj9Ru~4q@k3a+of-AxJ6BH{&L_`PyC4x;PO^T!ou@Xs@V0RWa
zq6mUPAx#QF5v&eYQ4ua+5jZRqL&Bv9*9hS<-^eazmlJ20S;6_9M)w=!nR(CC)qN}A
zI2-^RhXa7)Z~$-|4gij$9l-GLfAbQ3EEEbzr_*w_x%nl9gfQjT3V`Hwb+zGj@Hx$s
z2*IRZIe@7AIyAQ(f@!~U0Q4<)T^MZU;^Iea-3F%pT5o}lj&_`#ormIJBaMv>*xufO
zZA|)=1Mp|w0UzctI5-e)fW!pJ<@(4jY~fE$084A-{j~1i-me^h_kI@sf7f;3#mjIO
zr0#!ShBrEn9PHuEFT(#cD_?||UxZKlQ}HVYP}A~69#V!7-JF=yI&%B4h4j;lKp{l^
zVy^1f`WetU_8Jg}jq;#p2!DS6gl(i>9M*(iIe=g1c{H~@l`>+ZWgTND<NvMO#I#>I
zfRpSN{f;d)wRXqW^56D?e|2k^_G`Tbs{dX}8S!!DJMx`-;XDaU`n3Wm7K^B^g1iSm
z7<h&zT-|`sJPAztwF1cH_EVnMRf-B}js!62*Zym8y8jrHnafbP`nIw(Y4Zlal3zQ3
zzL9z$b6WP=Hm3aA0X!T!P2F^D8&iJ%j}RP(1Ayaj0B{@*0FJ`}f534#05}c@0LS3~
zbia`M0o)IW!~FnoKfr;0z~e`Nkd%EsPwNWL=kMCD-Vewg!GH5gmJ|ZQ=krq&^7*~h
zegOG<+hqtbzc@Ut+wTWZNr6I$ZcfY-=?7#FuR@6W#o?3d2h1<T=85(LHq7|BAE3Gc
z?gxPT0o)JZegL>1Ccymw?g!ixH~=^f2LQ)$K7fD5mlkUvD3}lc0000<MNUMnLSTaa
C+D)1O

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png
index cc907fa5e260d73a4fd22eb9ccd6a658a81d4ec2..b3bbe275e154c1c11cb03da9a882b4a3b11d9dc4 100644
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SS4l)cRCt_YVHjXA>VQ!Pj5=V{0izC}xdZg{P5y)EOBc^D(%k_d
z%ePLJV6cw4f>RAa2f%!Q4KPLKF#KCS1%nL(O}<~jmOpy*0ITl_Isjz(hxc#5Y;A1=
z20>9FhWD@EAru_kz;Jx#90tqA22?f_<Sn{@*K)iLfLSh-)xhv$>t=?lSI;uoI5>eF
zfeaF~<QQH-#gN%BM+*pwke3EvmOEtmF&qH$zfC&}7DovIAlP>85rZXE44DlAPoF&j
zM*|4ty;t~;Ei~{(!MkY<V9P-vKrYBz^c}A}P6vQoD<`M$ALIxS00t%4_aI*(1BC+@
z;9|&Z5CDZD*=YdT5irAG2@(dl<c)z*(}2N-fk|<k40W4L{^N>&f)0Q=0=MJ?>})8=
zTcq&+=n`dMR>U6vL^*&G0J79NhT%UxH8d}ZDM|zM0HY2Vb-<_tMjZeErzoaF>8JT<
P00000NkvXXu0mjfrRSkd

literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0003xNkl<Zc%1Fl
zy-EW?6o%nfv9JpZf#?+oxq_%&Qc1+Z#vcTm+=P8f%WXvj(M}PZHl2~&K)NNBXqdo|
z&Tj1Du6AdKiHqlH4zsZH4YM<c1*Mcys&e|HNiSdHGsYKcME%jEhcUiTV_OHGud%fb
zj(omKt%$-~EpM$|jNh`1PvKn4&R>(flqAWoXIYj>rV<I6FZ*i7c$&@c@puf~ZnP5+
zGJiGHnyN~41@_Vu=iFj!ttH+C2%9h30OuS(n@~(4^F{aO_#*Z5*#`jg**gHk$E#>P
zAY{I%2i)vDQ>$+PP^)ipzkMf}Ml58$xCvfwT>|j1dn*nvBUHX<1I~y0h47Qt(^89A
zX1@3Y9KM_Z(0S^J!^;Sj|L=c=<%@2&J&guTr!W}A`wRRl`AR9Jlv1kVz5vGZr4}K?
R+4led002ovPDHLkV1n%7sx<%r

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png
index b95b803d8f7eb81581855ac7bfb9cd74b846b3f2..a05d626eea0e41ee7c45b01db0b5756d1ce45885 100644
GIT binary patch
literal 478
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vm(
zPZ!6KiaBp*8G0XfU}&BH;(}pPho7s4g-GsnrKTV0bN+Di`N{s__WLI(=n@m<5+Jgr
zSwUlM@M{Ib=~11RTD<q9RK9O^s^0tBdtcmTo_x+H9t<ZYGE7irRB&f<=woS+;bgG9
z#`JBQ^}@GzHlJS2YO!ohjW(m&o}E{n_?)H-ojP+~Bw+pe=xG0FYY7`Mu|U_lRSjXg
zh2`F?dGO>B?>zYgU5+(}=P&;GUj9JIUioj;Kg*p%f6lZ%(9++w{y;^Cjm_QrNhUvg
zu04(qnK)lFAxprX{le~jKfl&hZ<g$zEBEf$`tSYc9~(Arf0O);S1dK|Utq3j-MzVc
zEKY8}#Tb`s_}SU#L;M-5aBGE``F?j&fwn(+f9!U~5%DQA@2Y%0#`Elvux-GURiD=W
zWBXms|14q6`V;p*&kao5_qBJz>&d6QBY*A^WwR7wC{kg-=5>g~3i$--b#)GYSNH?$
u9sV+WWd<=0@V;Vq_}g%40#azr(Z6Mz^JC}EQ;xt0WAJqKb6Mw<&;$TFE6KkA

literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*00059Nkl<Zc%1Fq
zF-t;G7{>9(urJYCU!XB+l9oP!gNp^V)X-v6LgH2q61b{MU_(PR8RXO&eSrq27HcT*
zINk<BA|mRX+kN%+|AC0YJ<oeQ9FD_#Bme*a008g<J5u!B=Ok;e$exCL72bmjMg>^s
zTW3#20kfW;@qMt}Zby=ISuAR`R?}!SQn_6A9`C>AdlejYyW>?K48~tPKaby^o|LIp
z|NKWtQ@&TRJ5rSEbd<k3RAXgd&N&T-L)}y=x((P>zs+~fO<orHam;_tw}^c2L^^xW
zZm;S)M6k`REwk*n=I^}#=ed$pSW+Wb4k{o-tJ#z!9lWe3o*mcxy%u07$vHRKe)W1u
z&N+>OO8I@hb546N8(L^BtMa;*czzu7_uc^?ZEqjNF^rev`3pU6-m8?oHmf0I{#l=g
z&ZNv@zaM=*1n&|!0KdvFx>NNH^OK%G00000000000000;f?038rl3E68q9ioxV2as
zv*3^W0mir=U@Yi<KpOh<tp%L{Y3R?l7PJ6q=+CznbUz>s{rT2{|Ax+bf4;R??g!AH
h4*&oF001x(-T?GNg|&x+);0hD002ovPDHLkV1l)(+F$?x

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
index d6d1f9d555a0a98a519049b70c227aaeb774217c..054299f6d7ab343ed10b88b8a50f00e59be60e7f 100644
GIT binary patch
delta 243
zcmZ3?yqIZ%MLok+PZ!6KiaE)N5(x&c8UopStP-v;F6NUcWr$<n@uT&R`!i#$PY*(N
zS3hEMTV=(Nva@Tt%$$5xWwvGgww0}+f4QA!|L0*j@bt60flQ}4%e%Px_CtN8R~xKZ
zWMx<%<qESJ96A4P*Xe{e%g#KQ`k!&N-K5J5+XNacMRuzm;^E1OwomwK8_DOuCn^wd
zP2|vOx#>q!EE%3v$4oo4s3Bm(<hKkG4*aYV4iOxjWl0Qv>~C&vX%n=Sma{EkU+&n_
rG%JPufXqRMWP=^vhv05sz|O!B{Mb$VZP9#A1|aZs^>bP0l+XkKONC)E

delta 372
zcmV-)0gL{l0;2<vIDY|ENkl<Zc%1Fju}i~17zOYzApQ>uLNYiBPDLoVs6_|C*&)u|
z#Koy9s5rT05IVSM2DcVRF^(ySE}=ukAt^#v!O<n=1@8#a3g6+S%e^JN?;!8jgv%67
zI0j$<24Dcn0Qaz&;yOy+Xx5&~XZ~s1ssw;?XK`Mx#c#~H2!A%9TwV<3Tm&0{M_w!x
zm^ga<v9ASytZuDSoW!zNKpfj4-@DWc_!zy@!|h#;kbtZh!JHfAQy|Ll$cx1QRs!%(
z+T<QJ$F8*j&RaXQe|9a`_{ZWqFbJc3e<kSY1B79p9`A2xsj*E1iez!EQKu{Km^z&<
z>wauN>)--sJZ(i;IVk_$*9Sm?mn3WJ{yt|$34r$=WLNR-5u66@2~Y++1wE^_R!_@?
zm{$To_7<MW^*&{xzdN0}0slVAfaT2@B5yc$tsP)*46VP`+5!I+12BMz1HJ(2WQo4C
S0S77o0000<MNUMnLSTZW>Z)!4

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
index 54678e59150cbdd9b369d147265e3617e8a065e7..b56c920f7be3acb4ab4fe2dea88296c6e2575934 100644
GIT binary patch
delta 476
zcmV<20VDp61B(QZIe)!LL_t(|oMT}aU@+={Q3s4VU}!nOH9z4$jQ#)q7p!XbY+A!e
z69<4SSJo7Q^Y7wN=i(RgpA<(B<p5;Mx3#Tf5D*l>s!rTNhk;R%ha^Xk6a~nZOH0Y1
z$US}bgyH7;0}Sec4x|`Kej)@}i0%k-0Lc#c@cs>$289I35r1@ZfR&6G14C61I2w>0
zf($^x4@xU{aO4n*8~_7eKt~V)FCV|4z5|Xuc?Agt0$}m(8w{iXf)3C%wE2(B2RQ^8
z+`aw|t3Ek7h5wHpJs_AB2|B<!-3-N&qccxosQLI7k{FS*pqhaR1JD74j3+M}2C%<H
z6_Da&SorKaIe$hGcEFu&kHDoH42a80FfhD&%V6w+P;+(<0|UP>YMDT6LL}$_kU<iP
zDh#9oShP^=09pfr4!C^&2q+~3a{?q3RJ`OEUNgusOhr!p<_ruHQ09w6cfh_UCI=AZ
z02lxn{QtfLoR2Gxi4A&^8~_RhSb316ca>qvC2fXg?^U-9wOfTTXb>RQ_e47Y=7^7P
z75*ES=rG(`bcO*$e_V8h!PpIzCdG1+8~_3!!)5IrfZ4ccQo-QQ1)~n2H2?rhjjn4?
SvY`n80000<MNUMnLSTX#2E(}k

delta 349
zcmV-j0iynk1dRibIe$M%L_t(|oMT}aU@+={Q3s4VVAKJ_!vQh1>Hl%bEoq*~NOcFm
zEPVFhF@uzXEQ6Du8^e-Gb1~F`<Ol(h9I$`iG_b{U_g`dC)KdkE!RSxV-qYRzARsQT
z0wgb@SWXEb=z!YQJ^$}tx(yC)bN~{EIU=j01Vet`rd^af0DopVEQmF<)WNi(f+EAw
zP5Z#{53&fB9$*0EFl>${*#XF@_?V+1Jn?}N-M&TJ7#QLpav-)-oEO*;Aj?6H!<H^c
zb^r)G*eU=2$kyi!521XJ!F*DJSk)q1erE4+yjhTF2Pn8d1RK=a!T=6|?&?^E($>Xr
zAA<mhZSChol2+wJI{-ZdV2)^>zXi@G$8w?_fE)tHj$MI^gDiu^^NnMdz%(hA6YT&P
vsIHktlHpW$04>0%14bP%>VQ!P47dXTHfNF$WMu~G00000NkvXXu0mjfx<Q*K

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png
index 240ab514d764d165b0e09a42669a7f9b7b3eb28b..7fa4ceedfbd1277d9d2debbafbffbcb3a611159a 100644
GIT binary patch
literal 564
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnT
zPZ!6KiaBp**?T($N*t44xY1GI)Iye*>sTL#T@vAC^Q~)KHf_Ptt1JC4sApv4a!u)2
zmeJeRA*OobXxpKM3*SE5S@k$6>UrGxYTkR#&F>r*{Ay|U{ZHl9biPvy83Xuu8;UX*
zrZ_V%m~(?I=Y44H<+%7c>5KkO_)w@B^IClt<MOTkZx+95PioKZ*Lb^TLD3awsU27P
za}Q)Mzr8=L{q2JIRlG;!-{rf$-`7&NNV1^(>bv-2;op~bT-k1>u<P0@-Uk)mc}u7K
zJ^J)d|Gp!33QO}-8w9^=wZ7li&ZPJI?X!bF?37+#W}Wmaj4h?>^Non84RQs$fACHB
zcoi*qVQ=O`o^Lar?{*2Yzoz!WzFxsf)IHNQzG=5=YfIgm;01r5lvSONvcG7Uu`J@V
zinUGMnRRoV>rOjINz`tBJ^Rt|o<ym?NA9z-g@#w9|JQityx8!s#2Oxnu!w_}bM&i(
z@A9qM%r_^zWzw%}#s~Jid{uSxe|Gy+t@fo~l64zRvi@%Q`m-7wG%`{QPcJZNw6i%_
znlQja&Ebx?fjq-A<^wehpBc}v8_0i<29XNPpBaC+|76(wTIvv!ORSy3kNSHTJeL2G
wUVXmiz?WZV*pJAvq;Y&^WI~u2n14V#!DWL<YPaGvU@~CvboFyt=akR{05wPeGynhq

literal 1182
zcmV;P1Y!G$P)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*000DKNkl<Zc%1E=
zPiP!f9LGN!6py<{BjU1M55XlXHk(5rHA!JTENCHm=*<XXp=B>7^$@U!7J}FW1hI&h
z)?<;15KL(!R3#G7L2z{;mrZD_Mogg_noMddeI90JXVYw)$;|A&4E=pz88$ofzQ6bT
zy?-<FdjUZZ1VIo4L5Lv+N!=#InXXV*Th4z@YY<}I0D=d=aXxgTD+mXn0cgP>IXH^K
z;1vw(Xn*gVBU~F)$F*%r1D1Yi0M%*jh6B>a^f{n7g31n|iX%E4V4=tP4sI*dHU#K&
zK7<cIBIt!<V`B>7qf=jVV)`hiX)-%I8@Rln`WH`K<@oe)Z1n>fY<xAU0M`Hh9e~?+
z9ssa@=K=42P;I*teCrz|DX^hU-v_==E{>q)Z&>G-22h3K8Q!>hmQVXnVwxt~+uQv1
z<7KKVZkatf)KWEgFWU=8-!#p}XP3UaN?VO22u;ECTYo<dz~3^|AUS`YeDiqw-nVDz
z{Rv+F?n28;dUB|x&&fwMKa>V`uQtw4Pw#1OcAR?p92KHirWzy%r>HlV<5hph1}|;z
z0Jtrwvi#7U^gbLu!>|4D{m{uBr>|T=_2f{utdgT~05JD4-27|jq<4B^0)R_*Uuc~7
z%a^F^IQ6vz+<YGhd!J(0e_;{^r>Og_e|DUDZ3euwy#ru%p;aJ%s0-$AkTCxN(=;31
z@A~zNRyVv4nb%1yRY^Si5P&=p4FRPxq@RYlMOWW6O)hM{#50ShxxAKS`#!ulN}@JH
zs#`(&8~|&fY_RJ;I0Xxnr2N*uHbW{q4qn<%_%)(9LdBT_9_7f9<Cx~ozb#cs^t>6}
z95A=ox}34DAGnlX=G7<Hs5aSKGe{BD98h3m!63C)Ij!p7u)#w+uyYE1eQL{|e4N&}
zxw+Y~WuPzpHm!o1^|umR+`E0R<MnTl%jmrk>d9%;H%MlO!rh35dK#L`pl+?}3xYG*
zYYBoqIscmibUYAjINh+09S?%r`c&9f7(^R`-t;j`-#+#Rv7z&0R+L12vlUFco3Jab
zSfl%8P{5WiM1?qC5ClOG1VIo4K@bE%cx;II!?1As13>@d;FzbU$9IFqLD-)V0iic&
zl*-X1U+q`B{}U>}HTxLbAOy!CX>U@{(*q28``-%wKK39GZU}PTf$De{YG<rHWhuw@
zeQfCc0lM?^b?r}x3jYQ-Wtqihe?ScIXY3>CAHMSQqoz&y`MTLpdit*A-k$mSQPal!
zeBJzi0Gga%Ds!z=rcx?XcYbb_pTBYimCLxF&=$5iKVLWA!$pe>u;F*87miN2`T5_x
z&7aSo;85)|mj7tO5M=j&g-I*jd-yQQ(RcFm`}$s^`tz)-Z}))OjCYE-PQ3RA6xhIE
z)&6EJ_YS*1x6IFvnl|R=>n6}D2x787;Bi3r{s7(jVTs~lT<jkS>m-W*mI9hq8o3Or
w`bE5ZLAWtfXMVn5Bg2m%2!bF8g0OG?17)@3(3V13H2?qr07*qoM6N<$g1$RElmGw#

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png
index d3e7d72b57de409a078622ed638518a3d732bf7c..e2fd4e6fbff41f2e89a8c64668a35d7cabe4aaf9 100644
GIT binary patch
literal 770
zcmeAS@N?(olHy`uVBq!ia0vp^4nUm1!3HGP9xZtRq&N#aB8wRq_>O=u<5X=vX$A(S
zEuJopAr*7p&auxB4wN~*-%IeNLf96uqcd(!+vY63(5s+8vn$)Yy-Q*14$GhGXU}f-
zKIqAE_o!)!pt>U8&Ex>j#W$2zTsT;<zoI-&?|a6*r}w@ddjDH;*6GJzYvb+SU$U;)
ze@|kHGh+ZBtAnKo!_xo;2#4oVW?9}sVVU=Gmfg<wcHh2sZhN0o@4We@#e}OWvCrOX
zIvh%WmbUx&?fCtV?>1Lk{C|-czrW?1pO{e0b7|HoUQf?m?0nqOc3Ua=M7ES*<x^?a
zJ++3-yU(i~{w}QER~o;5zV^bm^6s76PiO9k*x7PiJ9o~`8yn`;#Qk(*^xhtAQJba1
zGfnizpQplQ)ALm7*@bUCEl-(a@?>hh$cDP7>Sp);*XuugtNY&Mj?tX1y5CPu-n%-n
za9wSKspn7j>ERncr`TSuS=_Mo`To80O?~{&x35lUuBm_hRqEO+57(f&r`JOF7;$>c
z%oh>(dHCW)PmZMUu!rYQFR%Uk`0e31uF0QPi|Zx7I``M-^Y=YGznWXFKm2IE{^MzB
z8^1latA8_G|H*up<15d#90@DQTgC@c?ebd}%5XIlX)v5x$e_{Av;Z3?vG#z%!!`U2
zubCs{5By@NuiqCslmGUq*``~X-oBdiika{Cd+CXlE}C~^HlEtPihn|Y<yEIW$(QT)
zcK>Qf;Bz`}qZFe1dF?CaBk$63<n1Cp+Pq>;`D66&X-M+lNT7iYB|rCww&8aI&~fQ1
zub5+ke*9v%F0#!|L7yvHeu8-GTK*H=3+Kx#{6DK}$`pKh_1(4ExBve9oA%;4dx`xX
zb;T938}81(pKnxI=dd9^zIV;P6){}g@$wI5O<ciWz=`hpIr|OTrf;v6bXy5b)C``k
KelF{r5}E*!B4JAa

literal 631
zcmV--0*L*IP)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*0006$Nkl<Zc%1Fq
zu}Z^090u?&A|+$jZh?-L4lbo26dZ*L<_W~X#jOw0%~gDY2o@X*nTm^rQWv2R#D@ri
z)WyWaCh@Mh__yu%gACehzPsL~7vmj3L_|bHL_|aiY+zaR^Iz6MBHL8{Ug=r{fk@*4
zAOtKMScZTlRR_uT!v>boAz25hY!mrwjU3l?<Io4s!-?z0uX&zV`DomxeC^71yT`db
zUaNh;_x(ygfNjfHngfzwGt<c!jYb`pM{j5}>hUq1j5Eud7UlmulKE9qX}=Do4hR7&
zn(zRi-<;#@;2r(ue5GtODVm%ZvpVzU^hx_YW%85fD{6mM`6B9fL5bOZv}ob(xrWiA
zl`8V+`zvKlh&n&nsEhkU0KmN6Oyx)AOb&n$u)-jSJGH3&Hn0qX0IK=w9pE^r6Gq|Q
za2Wrt)9YoHEi3P;nzx&HIlqcKq0{TFT&<?^ZO2J{sCn%V0n2tA<tuPswF1ERNKC%w
z4hE^R$ug!!VcvOKvjuQ_jn-^|SH<_3%m-H6ubXZ3E@(0tSAGk)>-j1CLrgF~4*r^O
zrJu)$We0)G0OZ3s`FtWGA|fIpA|fIpA|j$4ApSpD;X0I6et&>8$@TgFf%NE;&M%Am
z1B7vZfH3VjVB6N`OIv#q{%w7}NmZ`Tm!`EtMrVD#$q%5)_4(4YcF5?g&o{k8rmFS%
z(v<cG<SAO8Z&H=(^QCcrz^0SF)TQ&w+UQ3S(S*C{olpuN#t{(_5fKsT`2<bXTUQkR
RG2H+F002ovPDHLkV1nFtGbsQ7

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png
index 3e65d639a5e4b54ffae58b1dc80a0bca025b18b1..6aec80e9dd58bdec478db05bff5c93629a2f4bad 100644
GIT binary patch
delta 362
zcmV-w0hRu+0)+#RB!3BTNLh0L01m_e01m_fl`9S#0003uNkl<Zc${Nl7+^5!fKdmG
zI$+cRqYfC{4sh`c`A?3adp50Mq}Tx<%T>JOP{gcc#2Ah}c}0Y=A^(YW1i>gcI`b5m
z7MGP^uu2mHI|2q4@4kVdKGs!(fx!#n2$&c?#}JhUwoMdZIDfnAD#IrR6O0f5TZjZe
zj{1N93qy|HRR&`>WuU&h4ERC>rvqL-e!-x^0Eq&x{13no&}N9Uz*L7TN@}+XGcauZ
z0AvXRJ@A7e5r-r2hQQtH?-(TPR8TAfiM=><2h0aWOLg!YhQuBYhWRBwz%<C=AaMEo
z5wK;thBp5pp<|$p)ef8vfEs|33tk+8&>%;Ff*EAl*<Ejev@o1Twj4P$E}thc3a}Xj
z^ARirV1^^p=z6f3L9_#ibrdCFaF>Lm4j6U7r~^hFFd`fP0PP-v2@MvA8~^|S07*qo
IM6N<$f+@X@dH?_b

delta 277
zcmV+w0qXvR1F!;+B!BlwL_t(|ob8l9OG0rJh9AYD;o_u4g7^oV#3}p+4M7q#DAd%f
zI0n|IXt9rwgPUB}Mh7qS1%gt73m3P#_tJLV#2R119L}@+IKz40mvat3Fbu=^XHrVj
zMXQ~J;pe6fqc7&(Ow!6IO{GeWAn-S}6K53}o$3oor*o5RzkjM$`Y(eiNPFw|@00Bn
ze8&+Jcf7kBSiZmV`v_H}0E4?T7K;D?-(LYR_hwQ6=>{G>mvZ?CfI=b9)5laYmjeLY
zK0g33d>hH;a)55L^~3zSc)r^J0KMuJ0G9`+vN`O*S1e6n;*L}G#tFH@V;m<dn;V8<
b7yxVAOi=C984f}600000NkvXXu0mjfMbLkt

diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png
index a8c6cb3f8da55d48bca152d2e4851161987be7e3..436a75975b342462fdf8cad0071754919d2338ac 100644
GIT binary patch
delta 356
zcmV-q0h|7=0rLWo7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0003cNkl<Z
zc%1E)-3kFg7=}l=0b02LZ0!X|IU=Q;I&qzfl-f8_asg_ilyD+004?7z+x%he&PQqA
zlWE@Co@ch1olTP;ClN>l{#&5lX!-nn<PK6_699O@wn^5?(0}=1e<bVm%3pYMK>|g9
zhv#!v(AOGG7z7F90u1grCDQBmX~$%sdnAxBDj>seublQUwmTi#m8%uu8Dj$cYiDq_
z%A)P~um^N8BA{EjyxAbz-G;~_u?1eOoX^-D(*ANj2}d)Q01ux{rcdE~XY3e;g}+NA
z0aNfu0w&=f3tgCoe<Xkb4=sQN4<&#JR|Mqy8-fW}1Q?KgQnBG$fu-lsk=<IDa76%q
znc(KSi`+X*xFP^~z<g<r7VRm(hQ1Z}W)gv)3tRy}3+95w7EB!g0000<MNUMnLSTZ)
C372R9

delta 158
zcmey&w2pCtL_G^L0|P^2NcwRg#UJ1k;(Fk~0X;pvg8clnw6xHWkXOy7Z-G*bB|(0{
z3=Yq3qyag;o-U3d8WWQf7I1KIE&3!mbqY%WON-AO(LfOm>n;h-1sVbgC1MVN2M)YY
zX;{?Y=pq=($gDhz$wWIq)|5kpW0AH%prdhPpg`zBaRo+(5;2aK5<I`OfhIF}y85}S
Ib4q9e08CFWUjP6A

diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
index d4cab89f8e..6cfbd90fac 100644
--- a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/eea0599511b088fdab9d43e562210cdbd51c6a98, storage and red-storage by Flareguy",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/eea0599511b088fdab9d43e562210cdbd51c6a98, storage and red-storage by Flareguy // Icon Tkan from https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
index ac25643123eae1511c713087fb498e3faf6db763..5b2364d32f8950cdf0fd4a0dc584ed3db36009bb 100644
GIT binary patch
delta 432
zcmV;h0Z;zO0lou}7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0004SNkl<Z
zc%1E)&r1S96vtoS$+~D-=iFS_TbBqr6++O}i~ove?_T>iBuElru`WV*><}y)L~30k
z4<#P@G3^_7WcEk7>KldF?`4<=%jYw@GxIh9D^4sB3;b_^<A1^_ljkk-a&2h>2-kES
z(wP*WzrGBh+kIfRb?1>#A|S)JvzbZ#sBnUVM}l0SlH6jC4%{&EaB*JeH6epFHxmg`
z0fg`6lCbW=ombB5I2KDKUfVxB@H|5%AmFLZGz`lX_#TbGW^a6zySl+}4}^t8K)`o&
z4Qh>BFdg`{3xAjM^xOx($if2h%Kw62nN7g&{`L9cIhqRz$naLD_bXi9^<>8|Dtubz
z5}<<5B|r(ES%4ZolYk0%WC2z1NCGP10Reyi#$aQ4cN)n?^^6=I5Wr|sClg())4t(%
zJ2gC1;NG(MD7qHHv76Zn-~j>rWx~!i78%z#+;@E{6Dh#BFy@;pOXw+34V@~m%)|mK
a7x)1^VdyatfcNqM0000<MNUMnLSTa1TEVXX

delta 184
zcmdnTe1dU;L_G^L0|P^2NcwRgB@y5g;`+bgzn-36L4JN(T3TpG$SzjanG6is3=C(d
z?kNMRVJr#q3ubV5b|VeQiSu-E4AGdFoUnj{gKN<z$*EIV0$5sn=7<K0XjpeiC~6Cu
z3MQ1e2_^7orzDg(2?_X$CkO<(gdRB1v5es;*94{%LkD(Nr)L>lQ)B~wG&!lQ;BpBG
j5H&F1TBIeR!oaZTJ&*r8>HKp*s~9|8{an^LB{Ts5G#oeh

diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png
index 6fb3b4ab8e659efb01b14ea9eeced1fc55ef8f2c..d7e908fa9c611ea973be719440c86db90fe95254 100644
GIT binary patch
delta 678
zcmV;X0$Kg`2EGN5B!3BTNLh0L01m_e01m_fl`9S#0007TNkl<Zc%1E4O=uHA6#inD
zw!~J7CB+|D7O|}qBsFL#1-)6kDR}VQo9CW#@Yq97IeYWmLkh)9SV2%x4@ylDq^%}w
z3mQpm$w65N=sGi-*-pmoW@k211V7lF-+kY=Z+_l0aLo8GKz~`l?6n1N<#t1x@YaJ$
zN?8CU<@LFI4pX_8TI45&PNBREPZVK@#w%~^E_Hm2kzTa0^T|O{<nG-?8HXYaPSAlT
zPUgfEm-E@6e`NBcwt(Fik6}M+2W_KuP!C8bwsxv;YFn@_Tw?XFjc=@<{yneH{CJCg
zfqCHhD?NjS^?wP_4Jno~dTm%Hz;X6igL;F5dm##zWs-LzD0NPUArd>)_bF+d?TN9|
zXCVqj7NK~!dG(LJ``Kvk8X=?s_?Sh6RES6}L^dv$QJ@>J_~gUkF+>cALVP1Xp$m~b
zwg6d3vFf)?)AZ8mG=@h_w*K^tfB$G>>CrS>F1oZ)9)DIAAj5TCRt}Hq+ejp!*=(jV
znT+?@c}I@m6|A7dyii>1cme*hMR_4{G^8SEdEV;2MdPAx;h4se0!XA(^uoWF4}_t-
zJj>i)SnoYYD<6n5NHLZ3kAbym68B%nufaTtn81zs4C{B;95*~4NJ=WAxVTO3fo)Q=
zS^Lhk|9?<W^0YYzye@Tp6H5Rk9zQpT@iRlA<0F#`v3@|#1!4(Ux;Ya{E|PAnmY@rz
zCFmEavVi?BZT4WJKcq?m)@lQI+M4Jj9m&80l#&1$N5y=)xoTtcJ;~)8F}47n4cV=B
z=y<ihkKNWDRMAraRcs0A`r5(35i?0b>edm3upfA!lo9<69D6YO4JR`bL|w@Yp#T5?
M07*qoM6N<$f`msr{Qv*}

delta 863
zcmV-l1EBoA1@;DzB!2;OQb$4nuFf3k0009pNkl<ZScUDD%WD%+6vls(MBDnH(#4=;
zg0GEqBcftMu~29f-%wkNFI@UBsOUl}=%3(oAyTA)Oe?rCwp|p8f{2JDL>InD(2OxQ
zts!k}GcG1G$z&$U#4L2-x4Gw@Iro0woO|vA{^LLXGK5Bg`+xiU)zdp3HB55+%5qg6
zj}ube_WS)D9r9X(@>4bE2oY1OiSU#Y0LZc|loR{?ek4gE9*+a?>-(L0nk_hTR3L=g
zR)hy&aB#5Pr|Q0NI7~DerK_upa5xM=!LR8Zy57g=#R*eeiP1|Fph8}7b2zYUE5ZXH
zNs{3R1Oj9-8Gj^6LQxa|W@cs#yYRD=Fx@Wqm7_3U@-O1zVAnFCVY3KNDwSe#a?&&~
zm&-9eHin`oh@!~1A~`@|4vSrwgOPJjtpdtoQ*)5Xx=FoRHpO@VlF6juh(scQw)W|C
z8i3y3USe<G*37`!&_0WR2gk!CXEpoBJiLh%I3F}Gfq&4`(__lt^z^g<p!*Yv1Oo#D
zOigK(K7R65u}Vs4S*f*O(k0)9j$&WX{{G!()j|#q&Vh0v05|u4w8U)RqP6$c8w7(v
z0MhBS5&J%cEjc(i2P!l2KBY}Mw_77S)Bb|!J1sWqiyGu!uh)pJM(#*JrI6`jzklhO
z3b1ucDSsxMP)uWL5$kX{6;KU(53R(v4Sd_Qz9@=xbaaqNB&e(}J2=ijC1hC^Lc?wq
z+-%xftis9KW9-mW21Z^Tqwm`GW~OL<34o?VG$lZmWx?n30dVSe0D#bi2%;zgII4p`
zu7OJ28+yXJ%@V9n61o7hAL4Xh-B@>=qX&srY=8FX-YBqcvxKX?g{8$$#;mT~dS*Yw
zdGuHtT5U_#6%ZPBs|Wga*?w~^CCTT$*iNce*bnb6HGUM|I^kA#?s3t+23EJisuozt
z*WKDC6jXui0%WrA^11ags#^nDMWuBCR<uICA!;2eiwlsQxBpsGz{uBb)@IilRo&Uy
z`B+C1g5%l+)z;QV=`eR703a5Np(qLymtULw`nGcl{er55<85d?Y!utLM&al^puYv0
pf!FIbZq$YZ=pvdGU`PH>;5WT~U1=C8HLw5x002ovPDHLkV1kCMo$vqv

diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png
index c51ae6332b212cb66cd2b9d58ffe841152d0d747..0951ee8d9b7a5d07f776e4d62489a86da62cd2a9 100644
GIT binary patch
delta 667
zcmV;M0%ZO72D1f_B!3BTNLh0L01m_e01m_fl`9S#0007INkl<Zc%1E4O-LI-6#i0+
zN~$7Cq(86>TD1rg8#IW}-YVV{Jb3ojv!@(9dhnEUZ=O9wkY1J*3Z;}D6dNfNwM|$B
z8%b1huq*`H?aZvZZno=YXEsF&ez2Lp&3xayH*ep&k6Xr_0DoZtV-wTn>TFq>aAr9l
z6BfWo?fzssg`w0(De`-5T~JqGx<v#Eu!%Y8Q-Z_qI-(-AFb@^iBI*RVPwFOS7)>Xg
z`HsN{(gKb?yoL6@=8PQyWMI@}g!_jD=*4}I{%5>@T0Z0J?DTej<mV2Wg-B75+3W+m
zknYxtMi<r*pnn&>#8efI3v4R{fe?lMmYr56I_fOIM0nP@pzfYW*1CRd%_iZCH+$oM
z&Am<ryDQKIwje@<<S$B&5bx&RHVEtjX1BhE3qwC4)+WCo3paUa0bU{5f;CnY#f-<}
zXzx_G|5=P*e$%kDHq6~srB?HCYaJp*fngZDZSR!dBY%>BN~ID@BogL{{+Wj0bF3oA
zt&m;3vH~o(1z90-He@1L`-H%R1e%tP^V?c11DYuXt?>WV1Ab6f#<=-2n~mR*st1BL
zWEe_WVL<j2YW^4a-I}Hu6L>k5;PX0v#}Kav!jQU=T|A)Qfdksp_;_yEdKegaT$uzu
z<?8+uN`C+&?tR>f-iK|z>m7sBp$_1!1wsi}dNtxp?k3$`&p{SKE@&31uz>R)HU40?
zIix}YHi|8HSM9qhI-<c&P(lK{xGCqe%T?^2YDn(=B8C=VS3_F0=DS`fo#Uu_3{f-`
zz!Vc)Cz_3mmK)xr1*uU&5d89iP(}1FaO=tF4-}MK1|H50q3r+w002ovPDHLkV1n-S
BG=l&D

delta 864
zcmV-m1E2h}1@{J!B!2;OQb$4nuFf3k0009qNkl<ZScUDDOKTHR7>1uos%^ax>0(fl
z;B6z_h^Vzgu~6D7-l4V@Z@6^bT@_tO1^o$L7a~O(NUY$-Si2~c3L;`9A-eEJg7z3=
zZ5!IgHsfMC(`06nOw2+TzMFH-%zM7?nKS1G|Mg#gSyDOXj(?60_4JNMWhXg)d9h%g
zDkn+xx}qo??e<ztnc<=_g2dE95CsAB#EPQe^ZAI!;{g2ne!CR2MMsWG1aaF!7y!9n
z3eeTnMK~NL8jaG}*hn}W1|X|ww(e_f3|tt>E6p0XI0PzWBsYiK7i}S2dh(v09$H&l
z@pwEmG&JDz`F{{XAcSCabkwM4XH>E?8icttD?6=uv(qZ`lP(T6La@)BXRZQBCX<Yh
zj}wVR5JDi!GJ_8v8uf2NEC-#!QqN97|GB4DfE;gf3Vx>DB;PFNd8z<LMn)vSAR8MS
zLs1k`sT2S$EiJ^}zO{U9?g*R>?y~^gKOSacQmg-%hJQDaEawCHzo6jqXl`y+0TPJ>
zot>Qw4{I}h@Z_r;R87?@wem}9`PqiLrM9Gf{kzYqC3#T*I}m^y`#)Md+qY=tJ@q<)
zKmdSLDrI=zC$UWq4)%ei-(!HhPijG@c5BJbcwP{Fr+K6PsFB?3^%~wn$sGZhK}MF^
z9SdVBz<<^)%bsvT<n<|*SeMHwKq2itv=aX|@Nd)FvMf_qS4Sd|Fh;GI9FKrmp-@QD
z*0h^VTbE|xv-0CqGy?svj?s2?dnF+%{{=ur5ETK0LLtfT_XBY1RyzQ}-UzZR12~!o
ze>?}wy4(GPb(?*#eu7{xOn!*dbY)}7evU3A=6?euS4|rw)@}CT@>H`h|H+8znqAN2
zhd7TOYh4R1$&vuUKDT<HZI|sk*TMvu*)O(1Ra5=JorUtZ;+rSj>drkbJZoTe4Xmn$
zxlGBWou{lSk)DH}X?XeEdKi_Q18JdBGY2bbAX8RqT`Kc)ke;@GTNI%GYZGhJYmHf5
zUs+%OM+kvI?SQJStz~&LcK`qoi^UK^Fm&m4-gAA~IhB4undNvHS~nYE>nm4|?gRQ=
qpb~k#UgJb93qXgc6u>U|KcU}Fxn=bu4hl8^0000<MNUMnLSTYLXpYqY

diff --git a/Resources/Textures/Objects/Tools/drill.rsi/meta.json b/Resources/Textures/Objects/Tools/drill.rsi/meta.json
index 90af7840e1..0a315f41fa 100644
--- a/Resources/Textures/Objects/Tools/drill.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/drill.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "modified from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189 by KingFroozy (Github)",
+  "copyright": "modified from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189 by KingFroozy (Github) // Icon taken from https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_base.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_base.png
index ccb97cbe60d76b8c95769599ef727275ef2a74ae..61a4a9b787776d54cb6827a50dd434d78ac30d37 100644
GIT binary patch
delta 420
zcmV;V0bBm71JeVLIe&#oL_t(|oMT}aU@+={Q3s4VfMf^gX&e8?C3orSSw@;V0A#tW
zj0`>{|4DTONe+1a>N!JK<X;9gBVGm`RX4c!m)pA-Zk_wg5IgY|1F3){2Q1DP16yt$
ze;3G`jv{w*p)ydOfx)BZ8SNYZ0wBxHj7+hJp9VXSR6tfPcz^ul2?MnN$qtYdlVrf1
z5dYHF0lN<V0wzK>hO*_DAplC8AbFZPVBI}thKgyy3>%CfsU8Mkxgul!D%v_gKuD6o
z%wrY9zR3b$OOXLc93;<h_cHAq@ZsHah$Rf)G0FjuI7psUKynCl_=5@?UIv$d4dBEG
z$`Kp7x#03N4SxYAfhWMA7Y4IomP2yHJFpndL%_|R4bFyH4k;735Ya=+5I_cyV1Ea;
z90X=0G6Qn~jY9yG&((|=P!b>vs4?tfV3_}bwhp-P@F&BR{<lEZavUm{Y3l%FhZxAS
zWAK%jzcD<Zr33cex(jS<DF269itZ?gJPjRya0K<h&>d@(jyho2IRF5fzm3J^`Cjn=
O0000<MNUMnLSTYp6trys

delta 379
zcmV->0fhe31FHj&Ie%SAL_t(|oMT}aU@+={Q3s4VVCXu)+(`F7jD7OlWk$L>0A#tc
zf((PQqAbJR`;S3F|H*X($qv|9!}s4SR*AtT@*czi51ud_S+2yeZSlkZ{w<$Kb_7Wd
zfLQJbwj2a@?LQ8tLHr}j9T_$<>?hd~B!>Xl=fL2{CSK*mKz}kAdbwb6?G1+5X6)kE
z&vMe%0igH=rGrB=o-i=++rh>EeLTdlV-qI>%@ZLEfGlsCB@WJlpqx;b26D`Pa*QHB
z4Ztjilml$!8biJVV3vbu28NgPb-;opTN$oh_{Y$m!^}`Q<u8!W#307NMSBOp3ZjUt
z%?$Dqkn{$kcXS;4$FO1=oeCll0QnpQW~}+gkP*VfKnWn(0iY~*@Z5i}uR#D51s+yR
z4D!;4Xzu`UIl#d8UsQ;JA=Vq!=Q}q2rB68kD~zy-GmrtuN(1CtMl}ae6O1}w)BywT
Z004b{h2GGkm~#LC002ovPDHLkV1nMst+xOG

diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_ext.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_ext.png
index fc41e60ff8781a238d3b387ad9fc4e203f91c916..c4112f6525a9afaba6a8f5b5054c186b2fbcac7b 100644
GIT binary patch
delta 243
zcmaFD*upeHvYwfNfx#!Bbq<hXEDmyaVpw-h<|UBBlJ4m1$iT3%pZiZDE08Z5;1lAS
z#wK@$Rp5VcusfsB1|iKewzfc-TW3=q0V(#9Aiv=MV89^d&Flsg;w<opEM{QfI|9Ot
zQ?>b|fr6=?E{-7{-fw#y`4|*Aa+tdp{jdMj^@T}ox8Y6Y;*Gw?ntnQRo?FV$JhO!>
zbFJsE!{y8!9<z2tM;wbvP+K`~$^#Jmqg&EElV#y+3FpOvtShwQSl+Z&n3_gI6(pSb
a$?!QypXGh_`g=ed89ZJ6T-G@yGywp{@>vT2

delta 211
zcmZo+dcrtCvYw5BfuXvubRCdlOY(MiVfYV%3-&Ib3>4uk@Q5sCVBk9f!i-b3`J{n@
z>?NMQuI$e^S%i!%Lb7dM0EG%YT^vI)?!CS4%hjMD(DqQUN$-Iqlk)p|fyF0`cknB2
zsI}*A*XZ~jS!W>6yh~D$;lOd9w+=5;cIf(a8(sTmdg|z5*Jq}#t5~01n`bnA@}6xC
zr%!&aW(1ndus_kndGhwBGrlUW+!gZt=cYUxSq6p!$z`2|0#Z`ZHy?u3c)I$ztaD0e
F0szMUPVoQ$

diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png
index 15edc91e52938302e7edd8e02013a69dd0304f09..7b160b48d7b2c8cc6397a18f7b7ac306120d6d78 100644
GIT binary patch
delta 201
zcmdnMc#Cm@WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKQ04
zJEPDBA<Z+kwrOl~KrucGwF^LswIs+d_&*RZ{NBbF3>4rj@Q5r1N*@7X#;MwT(m+9H
zPZ!4!3;(xg9Jv@2I9vkV_x_*hJlCmL(6#!$TI>8r{K8YtJ20hZt#%0A`1j%LBMdiG
rH|$Bc<8}TsQ~Ile2U${^9_(Y#pTWP@hJh;<XdZ*7tDnm{r-UW|uNOj+

delta 159
zcmcb`xPftkWIY=L14D6D)fXVemgMd3!tfsi7wla=87RV8;1OBOz`%C|gc+x5^GO2*
z*-JcqUD=;;vIyx)UX4)F01DZ9x;TbJ98OM<U|pOb($f@ZaEVdba@N1qhJTJ5yb!BQ
x+c;tIORL=+Vi(O9U$o?MJE#FuDB&Q+z+fWB@}wki0x!@c22WQ%mvv4FO#m+?G4cQa

diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png
index 6c83622e3499372750fe4422db2b3c96b105af87..704d654a6f1c17229caf4503f640e5c9ab228cfd 100644
GIT binary patch
delta 201
zcmZ3>c#Cm@WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKQ04
zRHRA5{=|hZW=q$a0L2y_<+%r>SWANZg8u^n!|!c;!9W4d0*}aI1_r((Aj~*bn@<`j
z=<Mm@7-Hf7_KYJJg93+3p!?qcGo9x;^$NOH-&bp$|A=3B%6SK-^sLnmp&S1`oPC7h
thU$hr33t5Ce`ZR5b?_idYSV*#4Ei(p*V-^}#RAP^@O1TaS?83{1OQs`MWp}$

delta 156
zcmcb`xR!B(WIY=L14D6D)fXVemgMd3!tfsi7wla=87RV8;1OBOz`%C|gc+x5^GO2*
z*-JcqUD=;;vIr@g@UaA61`1hux;TbJ9DaMzke5M0fZ4&rpdprJfq=Zun|_9E@jInw
zZ}IkKd{AzBwM+2*C7;}_J}cLMPPsjkfx%N${DdOwxhAy}n}NnKc)I$ztaD0e0svRr
BGF1Qo

diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png
index 015059c73086a48fdeb54267325ebdd96b2e5d4b..e2694136cb808b4353f1b68c2e511bb7101e27e8 100644
GIT binary patch
delta 201
zcmdnMc#Cm@WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKQ0)
zp%8%&C&T`K?|Ig!1QaVfu;?F<Vl4^s3;quT48OPW1p@^*3p^r=85sDEfH31!Z9ZwB
zptGloV~B<S+cS<_3<?}Bf$n?%&vc&a)GO#(eP6A0{v&?jDd!!S(z8}Ogl_!%aP|>~
t8>$=jB;4^j|CuTM)xm=-sZ9^|G3d|WUu(m_6$><v!PC{xWt~$(69C!QNLK&=

delta 159
zcmcb`xPftkWIY=L14D6D)fXVemgMd3!tfsi7wla=87RV8;1OBOz`%C|gc+x5^GO2*
z*-JcqUD=;;vIwc@?NPVM0}9!Cx;TbJ9DaLoBQJx3fK#AeA)|Z2|K6N4z7IIk^Vekj
zU9Zx}#>wzucY)XHkaDv_x3l~-)9aVawq}%IV9;TYP-H!5vESq{&?E*=S3j3^P6<r_
DPHr;s

diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png
index c88de643eb4ea1034032af998a560bd16f27aad9..1fd176e822e10e4c9169a090fd5a4fb025fb3484 100644
GIT binary patch
delta 201
zcmdnMc#Cm@WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKP~P
zmn6@#0?Yrid^bDE0>#WLC0c<LYe|q_@P8m+_`QuU7%0G5;1OBOz`%C|gc+x5^GO2*
zojqL~LoEE?o^j-2P~dP0bl>}brt@5<UP0ID`)aN8AMp!MIq$%fp0(N`bmQNLvyU*`
sP~EU6;f~k&&rIpB4jyDlZF;beL4OASS{nwgSfF_fp00i_>zopr0P09Y!~g&Q

delta 159
zcmcb`xPftkWIY=L14D6D)fXVemgMd3!tfsi7wla=87RV8;1OBOz`%C|gc+x5^GO2*
z*-JcqUD=;;vIwaPbp;o$01DZ9x;TbJ98OM<U|pOb($f@ZaEVdba@N26v>*M66Z9+7
zHcnXl@|bs`&Z2zx#l>I+Ty6(7fT|@LbQl<V{;?i!ii}DIn#ADg>gTe~DWM4fY=JY)

diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/meta.json b/Resources/Textures/Objects/Tools/geiger.rsi/meta.json
index 10968b4776..11fbd43681 100644
--- a/Resources/Textures/Objects/Tools/geiger.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/geiger.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/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",
+  "copyright": "Taken from Paradise https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png b/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png
index 9938103840821ec610fa3ff217b4c8a3965985b5..77fbcef30da736b4008b8a3c372a3bc43424dda2 100644
GIT binary patch
delta 465
zcmV;?0WSWL0^b9W7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0004zNkl<Z
zc%1E)KTE?<6vc1BjuNGUV5LHbHW=^^3a*_T1?TR52BCAoFVb0X5~m_K2#Q*WL<iAg
zJBUTaMG%ahXK(xBD@k4gitx^IUvFM>emU<3GDd$a17H9QfPVo<4NzIH`SS1PK|S+p
z05HGt8cI(GA~67)JI+#|@4AgZDp4?r0bo8cIi>W`!?p58o!+l6BNItI1Fn0n0I;&9
zc>xh71%Tt*sqE5rb8}E%I;UjiSHvEyd#@fnKRt>km36gO(|UlB34nZV?TE77VYT{w
z2<x8b4Pxd&EPvWn(bIuY0K}7i)w|;dadWQR=RFXcbL?0bsjA#BYz`EFGj~6;Oysu?
zKg6H8B68|{@4-4ZZi__9rQs1w_bd0J&VM8TLu|QNd4yUhy!mV_D~>@T0M^3ds*gcK
z#QB+7>U8hL;OUBwObY<!FomMb`3?D5<0v!%*|c?W5=t1NoMZd4Ip%@i6iezuI8to@
z*|6QdRj%`}G6ZqVQrzf=nTG<zQPj=j=>LBY7ytuc0MhCc1U29O3BXS800000NkvXX
Hu0mjfc3aR=

delta 257
zcmV+c0sj8q1Caud7=Hu<0001iRA<Kk001OVOjJd{z`#{iRsaA0+1c5zudhEpKNTP=
zUXH9pb*435p8!d9B_$>0W=jG90004WQchC<K<3zH0001+Nkl<ZD3N1epeGO%K;<(k
zDWVDp85^M}VN`Z?Mp43OoR(~eBH&iu=9ZR#B$7U}Eo;>>1bUyXb7osrRTWf8T3TAh
z%$aRnU0rPu+4l1C&c#Y*vu4ej1`z<NSh-lqYSpTh)8J-g&04i`=FFKef!({efw(hg
zLapHr4GqnjIdj#jRS9qvyR%lUT9yVEfS8=XkcJ*6gBt(<2uCy#`*zn|00000NkvXX
Hu0mjfXDMl>

diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json b/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json
index 216140cec3..3c793a9732 100644
--- a/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 44636483b7b2868b3e42c92205539f11f6d7968f. Inhand sprites by Macoron.",
+    "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/. Inhand sprites by Macoron.",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png
index fccc17e9193e7371d0b0630e1eb19d25699ad886..d0bac8b61eb217c36e109147a9aef63d1eee1b10 100644
GIT binary patch
delta 147
zcmb>4z&Jsrp0PN{-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!Qe1}1p@p%4<
z6riB1r;B4qgnP0C>*55Fo~A&9M~uo-)Fe;LH~OJp_1SXD@dF>CVkbRZc$0O~+2p26
r%xr9T7@;b;+zx6;url*VNHBa4V`uyJH<mX6Xd;8BtDnm{r-UW|xvwzp

delta 93
zcmdnMSUo`{+{x3$F(jfjS%P(Of=EwOpaB<~ltEC+|NpE07nmhWN2VF_mT+tcSQPo;
rl(@xjThkb0F1LdkP}LLJB_t#mk}_B?1f4VtV*mnAS3j3^P6<r_0x2JX

diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/icon.png b/Resources/Textures/Objects/Tools/multitool.rsi/icon.png
index 6e16a3f7ebb6fe8983d760368b6e256a4fa94da1..1dcb102e80b0defe93c2588312af3fed16bb7231 100644
GIT binary patch
delta 515
zcmV+e0{s2w0-OYpBYyx1a7bBm000ie000ie0hKEb8vp<S&PhZ;RCt_YVHjXA>VQ!P
zknI2k6Nmr)-u?^|8w(lp>-+z2+`5tB!I=Y$baMa*IM|poYy>(4OamQ24j|b9AfLn7
zGv+Knp+R!L?!04o_TduIAwiM@Ko<13w=o<zauP14p`nRF-+#Dqoq=H|!+&BOL6QSN
zz61I8=G|Ki)B+?qAj0$yLr(m41|C&6oNB(@-o-Gb{|`goZW=fM1VEN|WG!d7@bD*w
zoPj($L&da6AZt0%=8^0GkPktY-(AAXAbRsTT>Q1VBm+atXRtgeU}zRZprF2sL!2%S
zaI<G)V5t5DWPb@GiT;9!)58I3M!XD0;g~sr)c7aa0ieV;rT;C&r{~sURkQ2hFRVF)
zDh>dFoI+uEIRNu9ENg<~)QlJyQVO2Y#sQ#22C@ufvA`rThFdnDfl(0*wj2a(qCPSl
zS;kL_k>r&FAaLg7KA?^AU_K~Hl6wAuEx&c{GwmGEw|x5=u!7P04+?6Pr8;nNP@+7t
zi~($U*P_o1`)=K(O>GDQ>)wkoTwSP!QXzpVDFomq$vm>MVMa;<N|g))psM)t&J(nC
z0I1njSXuQS)z=6>N@Ij92f!S`KqW9VE2B{dj5>gt002SGvy^e9L(~8O002ovPDHLk
FV1oM6-}(Rm

delta 333
zcmV-T0kZy_1m^;fBYy!dNkl<ZScPL41*2dTjCjCEY5*KKZ~)GJ_%QwduKf-SdYU&G
z%*`9%W;r-G5N#e4xiJ8;+}~di%uY}L!Eo|q!+&zjA<F?U%O^}Y!Jw)z6HJrq2o`c2
z00RXD7AXAh-w)tZP8|ope1G9W2gCe1bKv5MDJcvd9_b7_c7HhhCnar>9ReWB7cQ1V
z2*l1|m^ej{VaE>A%pp4wQVUR&1_ZBsq1YK@Ibh?)_Y4!K++kqIQGttr_#knbJ3wB3
zCL<^z-napE1QdYy_wV0iaBw)l$iP5{f{0pxYzJs)K(b<Xfj*c9@yP)cg~03u%NbG=
zBEdAdfFcLLEJg>><N~s@At=#taHKQjW`KAH7;fAk&zzxI5P`Dd&70{cH6J1ij)GAz
f3WgG3U|;|MXTonI4e0RB00000NkvXXu0mjf-}s5Y

diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json
index bf4315734b..c5c4ed87cb 100644
--- a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/multitool.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/94f27c7b25bbde39c1412e24fb32bf6470fcc394",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/94f27c7b25bbde39c1412e24fb32bf6470fcc394 // Icon Taken from https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png
index a141fec4bf9b5deaf39c994e771dbe07e8da5698..71a6ee8f67b5927c7f206be27be23abaa61c00b5 100644
GIT binary patch
delta 146
zcmXS2&p1J)p0PN{-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!Qd`Cc-ajG_-
zG*HmR)5S3)!aZ4nb#a17Pg9`5BSz&ZYLa^<ivO<v%07je<(3Q&j}m|U#2h){DRKq|
n5BT6Jx!ewFNF*FMz`&r#&&FmOZfL;+G?2m5)z4*}Q$iB})jcSv

delta 87
zcmV-d0I2`30d<fhQ9MaRK~z|U?a;9e03ZlN(XVj^_utIkCA4w@F`@9k>Kfnzk|bp-
tk^2+Y$^CLy&Hg}(43Bp`BuUb*fDJgg0_WdhT?zmI002ovPDHLkV1lX&C6oXF

diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png
index f890dbd413ae102ef91ec7bd277c61418e501d93..911fad308880b654934332ff45ebbcf8b58f6059 100644
GIT binary patch
delta 145
zcmb<i$2dWyp0PN{-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!Qd`Cc-ajG_-
zG*Hml)5S3)!u{<zLtX|20q2WO2N>BlG!?8#U|^qcponco-h=&1UtS7fXn4<hIz4^c
u=40E`p3V~Ss=wDgE$<FL&;X0cdXkLnZ03{CykX!5@;zPsT-G@yGywn;1u(e)

delta 91
zcmV-h0Hpt}0eO%lRX|BZK~z|U?a;9e03ZlN(Zjfr`;Xu@lqOiYfS6GDUv&*|K>z?$
xv&{X75ht6?t6i=713feBzTPzf004iIv;nEo2J8>CYB~S_002ovPDHLkV1gJ+CH4RS

diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/icon.png b/Resources/Textures/Objects/Tools/rcd.rsi/icon.png
index cb62979010f4ddc12341edfdbc08a6cd69426857..3913af251881e2963334cf77daeb8f931c9ab74e 100644
GIT binary patch
delta 835
zcmV-J1HAnH1lb0VBYyx1a7bBm000ie000ie0hKEb8vp<U3rR#lRCt{2mR(2`Q547j
zi+y3ONRgzOic1>^i_2mJfr(;6A1|>z^dX3m50yQvLg7P@y-9%zefhAF1R)VdzC?^5
zSRh!stPCt@D4R(_pc$J{!ZO`+W@mIAcXza~9`?X;@7%q2&VTRz&$;K$Cj4Vd1Ec}c
z00{w_j+UrW#TM>&j+SwIsdN~}ZUk)`0zl3^XHIj!p|YCW(wsuP2GqX^ku(I~KgirF
zW4pO^9FQ5RX<*S%CzYjwH37H}N~+fTl5i0@cY5sDv0q9FkV>&t6(}kyKyxopH89Q3
zli9<ue`;_FPk&j3z_T7WAt!WvuYDF*8+Y;CWDq8R=+7Ah12f!zF_!_i=MX1fM&(1?
z?|5WD$ODU_ABkH_s*sHbB4~ba&VWn?VFFMT#pZIkRQ=h#-7lP#K*D7-_%w*=SF;Fy
z{DuDB{J6EPB5VXfKXx7iBGZ5^C_t96Ef@21nhITSU4QTvM>V*2qXOb09N)%R;>qj+
z9Iy6cWJF}l*Ln`yatK`wxxE{eCqiiJvj9LzNI4LWJ?kKbLINVXph+JL3?UqrV)KSj
zSFT{PBMa~q8}plcbNC%?jj)yjG&#7!sct0;o!pX~9D=)f;v|&g?8z=fGc(cB1zTX>
zX4U&xQ-3UbXD*D*Oem|q(*$78G*8Of8{$0BjhvH_yp&|_!mUDHg?AYKGz+^c50M|*
zX2>}~h{LM}-^<pL&^$(=$>-2e4&;k4ycrx8@=kHgDdTaaTW#wL*}M=^iv>lFr9@6<
zmM<f6e&lc&uK8}_PRA`{To$#$=`q&>QqqbFmVW_WKKIi?wf4N1A*dyzaOg!xWC^Q4
z<D}$r6~f^uQ$nu^U?l{Fpm=@|Qmq}gpF}tx$mkYbS`m%4(+t{rfsUp-t{|=Xdq9UE
z=d^3O5Bwqo^}f%zUTcplJ}ZspQh{1->-r!eh$^Q;CFy}~9;1^$O1KkLJTj@G$8<Zc
z`#g)Ne|*B$KOR5UQip_@zbB8bW~4rbe_~XK*1G2Z{U%HUqyaX{eglQIOIO6?S@-||
N002ovPDHLkV1kHhd#?Zh

delta 614
zcmV-s0-62U2L1$)BYy%#Nkl<Zc%1E)F>ljQ6oo${78KPehM{Q?n4v8l3~IZQVyS|O
zOe`f+7Pk5iutfX@vmhjtF$*lsT5uay7lDV!K>`m{S-_DTMU`00@Ng2>aS~7<OO6y>
z=RPOz%elvnCCjpyr!LHO_XWTLU;zMJOj`&}^e{R;Q>p-5@_)<7TbA@+08T!^<6T(W
zfNt(S084E+IM%~iLZku!w7!YjJNp7a#)IOHfRLs{SlS#9n*cBjBLsM~J^qW=t_pW1
zsov1TaS$UN&@>JEhYIci0C`pPduoGLv+&!6fkTm2uZep6QPiC~@USo*B5@U%rYSj&
zgXej?wl!=QPJiDQ`s+Ql(Lc7``0Mi!(33p@;x+|D_roC66CE&3Ge&Dw^$-f=?~2X4
zxl<s|yRY}oee$UP%U{++ourWfQ4S(SdB}K$m;(T%(h;@|?RF6mP5|Vt2uExew!f!`
zF);$eFhWh!P*oL0QBV{mwx00{vG?_Qk#@U?=XvO5OMkjtjgO`Ev&7R^+MhY#I8MBA
zQ<Q$_-sS=DeIMWVfx*~r02Ny!o6RE2GP0byHvrPKPedXIN$u@I?GW^G++xEp!U2Sg
z<2Z?I!Gs&pu+DD~saDm)%04`Mu7_#ojMGg1jNE3jXPTze>2wH!fFKCaG%XSCnE>cz
zOR610WnVviOaMU;jO<T6f=P;87={?WoiDEdxBn4<UbduKRS!2;Vg35(bJjQD#hYY*
z>Z@QHjT^!83fy{-4Czb({zh|uBwGM10Ok(x3+A2KBmwPTod5s;07*qoM6N<$f>`(+
A5dZ)H

diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json
index 17ec25991a..47fc7c177e 100644
--- a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png
index 2bede8bc3b0708beedbacbd88aa4a50e20c463aa..86ac05b87ed63916f9001d1d8653a3dd60ab51ee 100644
GIT binary patch
delta 283
zcmZo;+Qu|NrJl3EBeIx*f$s<iGfvg!lV)IGc;V^d7*a7OIZ-0P;8jB)dyiGZ6~@JU
z5~T+o6f^V}o~;+i)hZBk{`ivrSi-N<H^tmiwi?(S<ztXMp|yl7ZFW=w+qqWZE{#5x
zm4E-fGi&ae^{jq|RAeOU9<g`#cgr5#7_qp))n%?@%opSOu)>mm{q4U4bWFDzvA+^c
ztoZqhcg8WMf6CTOM;Ytw?b$9X#OGGFO0wR!-{TN?oF{~xsbAi{VRhx6PmIiV1<$XQ
z-ckJU_nMQN-`0wP0=s`bnHS>O40l)w@CJA1X=pMib0xIhKe+0TRoK=k4F{+5y2~Pb
d^o5N<WIbPi<7KmtX+U2yc)I$ztaD0e0s!Z(b5sBT

delta 234
zcmV<G02TkX0)_&RB!A6GL_t(og<}{6qhJ(_f>AIEMm%7|7681arT;-RBP%yt?Emkt
zC~BCwL>WFDEMr7g|M_$`R`c)y7HpR1xIl!>jCA1Qr_P;)v*$exMR6#XW+cPU#|OxY
zObi$ESvCA;lQ4luvT(u0|Nr@h(-3AJDTcpao-zD-afZQ?_hUF*Tv%8bMV*+K7=xsw
zBtv<5Iow{15C8>rs`^nd+sw!qE{-h(zFl7qra>X_=lv~)PsbV<cM{`mBrxD<U=)mk
kQ7{Td!6+D5z`(!&0H^Fh^vkdMfdBvi07*qoM6N<$f>su2pa1{>

diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png
index 565ebc24f66a0a622c01e1fca2073a35928b7c33..f018f39ffdf86e95555561dc5ac713ac8238a8b5 100644
GIT binary patch
delta 208
zcmbQi_>ggeWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKQ04
zqqApOZG(!MX78jaK(R#+|Ed5f){-E<;Qv6t@Ov9yFi?QAz$3Dlfr0M`2s2LA=92~r
zdU?7yhFJK&?eXMdP~c&H`{}=V_AD(=r4Dz&Il;61qW>HaKjH1f*u#C3D<S0S1!;+3
zg9A6jl7v{NY4$Y#xNy*7dk?qfo1aWO^>>6HtKd&A^y^Ls8q476>gTe~DWM4fk7GtS

delta 134
zcmaFJID>J5WIY=L14D6D)fXTY@9E+g649D0!MZp>q^Bv+fXnTm1G8JsxA3sAf9x02
z+>RA&41Rv@(9O4R-$s0$$h;y=fM>_<-T&J+wzjqgJ~?vah=hu&s^qEDryqXftKfi|
jpdrDkEMs6`z`(HczYt4S{^YMfs~9|8{an^LB{Ts5L&Y`}

diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png
index 9d0d820ddaa8a7610582061de5121e0fe779d51c..9e1369973418dd4a0e681f2cb730f43b07e17418 100644
GIT binary patch
delta 206
zcmaFNc%N~CWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|bfKQ0)
z%$YNLdV0Qp{|*$W<mwIvsVfQc3;zHAKZAqT$}d1ZXMsm#F#`kN5fEmas?8@26!h_Q
zaSXBWf7|QGb-;jwrTpvv`gOY)7xI3QaA!Jql+#D#-(i+V^B7JQ>EwRm-86?~2mhKo
zJtkXy***r!t=_<$R9@M)^z82^?VLw`9{9`1SIWKo>C=$^K!X`PUHx3vIVCg!0Na^N
AF8}}l

delta 210
zcmV;@04@LD0pkIX8Gi-<0047(dh`GQ0IEquK~z|UV;BXaU=)mkQ7{TdJYd8Y06jfD
z|3Ne_FE3o|^XJbfY9u8k8KR@38IjeOl$2mKk0byy3?KOZ{ri6q2B`&M5PQ|CRRr~6
z0~juzIdkTJJ3Bitn}>%7F8<}q7o3JDC@3&Ic<_MX(4j*N=}YP9B!vPCx&SDsH8nNy
z8Upe$h@LuiDwv<0oy~Ch@@0}O2Z6zt21das7zLwX6pRA80tN;K0N&L{g44@Iu>b%7
M07*qoM6N<$f+sjqKL7v#

diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/meta.json b/Resources/Textures/Objects/Tools/seclite.rsi/meta.json
index 86f25b0b7a..d466ad62d5 100644
--- a/Resources/Textures/Objects/Tools/seclite.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/seclite.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/52cbeaf94322209d4c6596818dda9fb3654729d3 and modified by Swept",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/lighting.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png
index 317e638c18c679b0a0ee848973c731e7a901d786..e02d6ee077424adc4cbf9fc449925864a056d150 100644
GIT binary patch
delta 243
zcmbQw)WS4DvYwfNfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=#@z$e62
zT3Xu5%F4^jD<~-F>(}Rzk&!<CfpQEVp3m3>q&P}~{DS{O0K>iJy^%mM&H|6fVg?4j
zBOuH;Rhv&5D46K!;uvD#|F+*Thwp#_2TS?ZY5)K4P*4qYezj4&eTQOV6W7fGmgnw_
zUFNpo44ZZ&CVuPb(_SZV;eZgUwbeD5)?*qUmU&JNI4CuhtM+~LP0`!#YC8ANY_Pre
h<<A3-b8Z5a3=ECpzXJaIOa<D;;OXk;vd$@?2>`ECTATm?

delta 271
zcmV+q0r38W0-pkq8Gi-<0047(dh`GQ0Om<VK~z|U?UbPogFp<1y9IF)NrJ#(F-u4g
zyvUw!FM>eLU~vc%BofpuCFuov+nQ`66ZA9f9mn<W&mEvBilQ8z6E`4^W4j*reebRL
zCBd`eS(d>#jx=re6cX@>w!K4|ULenNn5Jp{$nv$Hz#H)d5Pw)4U5KK{3F*4dxf6yV
zG)=P^zl->8S(Z>$m0gQCOHGgv+z7$EzSZs%VN8-ljIR&{NT5U5ofMIIp1s{f0mc|-
zBZ7HxEu166Ff6$g$xY7YK;SLlhmZ<W7vI7Up(g;?HKf9OUBkcsh!jOp4h{f307S*3
Vyp$%2rT_o{00>D%PDHLkV1mdxcBlXV

diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png
index a5e9f773ed55bfbc12fbbdce978c3733689ff043..7ea22fa4c673b9069203b7c9aea6b79030624493 100644
GIT binary patch
delta 250
zcmV<W00sYfmjaL^e*tq+M?wIu&K&6g000DMK}|sb0I`n?{9y$E000SaNLh0L01m_e
z01m_fl`9S#00022Nkl<ZSVv<R1*2dTjDk@x3g`to+H?Lxne+uYIr0DJ&u{tv?d$&k
z$d35+^B#R1w0Lm`*m4j6(LkI5l>!4MC`~i)=g%J~3jsh5bb&Id;{c!k3?v077q=rL
zhz5lU%|iemU<3lHIA9AS1K3BT09YcVc?htuus~U;fQ?-V>}Z-h;PmO63@cY1W%&N>
z0K=q7YeDfpgKk+684OrKGzvz+C>RBU9565d0A?&i+Z#0Exc~qF07*qoM6N<$f>26Z
A(f|Me

delta 91
zcmbQvR5?K<)WOrmF(jh(?L|W_1_d6LgWdn@m(11os7=aN_HbyC^{CHbVPGhmd3amt
vF0Hp;+1IhT^lxIR7mE;#<7Z%4(6)rL*jZtbwErhd1|aZs^>bP0l+XkK{`Vjk

diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png
index d8ace36de984710ee0aa9095539bc689fc209fa8..1064101c28a568b4dc9acf68e1ff423b8e473014 100644
GIT binary patch
delta 294
zcmV+>0oneZ0>J{1B!3BTNLh0L01m_e01m_fl`9S#0002<Nkl<Zc%1E(FAsw-5XHL$
zfkZYz;INo!K71X?3>JqVK_WqId6ylbqZBq4mXUkrwWQbkUH{NP{a6AZ00JNY0&s4C
zIF9ere$zCULjX8&k|flRqDYlxN#9=~0$1Q(O%sP<sEVRcReyC;X?mTF9RZL$&vRvr
zp$QP&b)DByRhDH|pJS1@ZCh&l<lF*GQrGpWLrBhTu9|_i$O0IKfgBTRtvC5zSpa?C
zk5%yU`JBhH1Bk1~7Q6-UJe_n1v6m26xa7XE47CPgt$^#EekkiU;h?&1zzpD9niN7H
syefzNh#Vk`Iv@92AOHd&0Dl4S00+38Zcp(ok^lez07*qoM6N<$f+G-oX#fBK

delta 258
zcmV+d0sa2L0-gepB!A^eL_t(oh3%BF3WG2ZhOfoJQ78q$!AEd(^UXT-&3pqN!9fs8
z!BMA_zi=VFv^{7m9lUS3ON_byeiO+s48zzwJ83{s6fPVO!w{|cCCRhmRaMb6O+4+^
z6q3k^vMj0VI;!iM=6MbuIl1-|WFwIP2F2k*p66aj-}l~~EPKoDLc{U9h<BT&p|)*Z
zC}OWQ!9uVRKz_bn{3k+$Yg&ATDnJ7cp*t;tWm%%#Q~_z4dK&@q)8XhH8OQOSYmwcQ
zJRAtz0@ww`d<eNPckwOq5Jmz>TthCr);0Y5kH|0#W8)Cf4X&f3j7@3uSO5S307*qo
IM6N<$f@ZpRga7~l

diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
index 056ba0a856..a7ed668444 100644
--- a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
@@ -1,5 +1,5 @@
 {
-   "copyright" : "Taken from https://github.com/tgstation/tgstation at commit a21274e56ae84b2c96e8b6beeca805df3d5402e8.",
+   "copyright" : "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/8e92e96d56f231f79dc16f95918d59b2803085aa/icons/obj/painting.dmi",
    "license" : "CC-BY-SA-3.0",
    "size" : {
       "x" : 32,
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png
index 462e22932c2b9401cd950e8630eb80caf0ea1a80..0c7ebdadccef551b183bb87c0e117d9c80d9e4e0 100644
GIT binary patch
delta 749
zcmV<J0uud(1cU~VBYyx1a7bBm000ie000ie0hKEb8vp<Twn;=mRCt`#mO)5VK^Vus
zwbBj|TFYW4tzz~_0yQ<L4&fo{R0c~BMc0s^OD9i3(5+Jt-lJ0lbqb_N$WqYV+U>A5
zY33`l*SfKbr#7o;zIo2<+im8(=lWLZ55xDq@j2gbzWL^RyMGlnS^p2f;NUenJbWj#
zDF7IJDzymJkSBl$e(8Ka^mR4`o&{F`XYhj^hMWr$LJQywj+#!Bsz4|KL~xdJAcTNn
z7*&H%0u&dH(P~4u)<AsxVMqrNlss>N4r0RqR1iWz^akIZP(TPjZ_UEZTSG9m&fc)5
zZ-EVAtM^!pW`DkA*PR6|z?F9ca<>x+3y$_Qa$9@1na^Pc2x;OLVGs^29uo?|oWN@W
zz~C3dy~T;1IB=iY8WzAVM7u%ZGuB1k>f*smi!?@mUR~hOIv6FuliQzRqTiB!ZghqF
zXs;hSDf>XVFu3>|TEif4_*4#FFEwbtBT9g}=f9yg-G2%qov@9Km$tqCV3f7z()Td~
zs#?Hzr%(Ta8nRD&eU$+9jr-x>bQX6hf;xSbaE(9kNy7LB@T2m;Sd1VtwhH)k<OLK~
zwy=!O!|Ytre+}SbQ_SK5m<{JV`ocQJ1B`(D;ezk*xjFZZC;{w$Ou~`9E%a<S2T3!}
z=gmSMCVyEq-)L{AZJ`fv`PG|}U5TSZ;RbLGFL@q8$AO*l+01^I&*i~I4-iK)aPAB|
ze&pRHE2@FE$PR#+(z!hgA0e`of?aRNxF0=XK;&7%b1f|Zrhn){H>BS$b03dk^2@w-
zH(#4uA;U7zu$lpr^?^(-!a!%hO%-JT(|_-HH)btAhDucNH4GxSD?ow%km>g$adpKt
z?CT`HzLZ*k)S?xtOKhjn@NVde*7IRzTd1xM#MKpwkNX4nJOaFWI1mH}1Arjq3gFyr
f(1CpcY=r&-6d`W^T<GB!00000NkvXXu0mjfd;?y_

delta 493
zcmV<J0TTX%28INXBYy$SNkl<Zc%1E)ze^)Q6vsb%T1X^Jh!;ImY`Pq0AqOcA0$NyG
zS>In^;r%VKxW6EsV3o%90*43z$rVDlCJPdOAY==Jjf};z>twU@!=w@14}_h}yf^PV
z@4eXsa&mG$I^MjFzVA!jS`Y-z`#KqB1q+5taBu^sUuK?u?SI)>lu<ydi3Dh0!>#lY
zLL_Tp7;61gyDVE(%(5x?(f4TFzK))yQpuz@LA4u?#{kspbpQr~!IW)g2IAn}?`S<P
z!PDdGNxp7vYXzh;H5?ALCD3L-B?tm<eND)XH9@Ufp;rCO$=Nw8tHSP#xhb6l7&Zna
zi#rYEW+fVr?th`%vp2bufUMKsJ%k>R+>SW-=sx=Xa~}X{6Y(iMk*>dmL`1h2O*FP(
z??*K5T@|bwSTkTay($8L&YuE82+HL$#bOcYTLsKyU|x0_vvZAa6RV#!197cyA3`qv
z{ZF5Miv8UQ)yf1>98s-6yJL;-)`X^@i?Yx)RO$AhP-d9!f&Nt=u$N(mRud@?(f-;Q
zkg1OqV-wCH!jp&4YDQxhhs+ZE`ulpnRS~*(gKBepnfN=Q?Ez(zWOH3cjxRI)oOqLQ
j{Qn@$TZ880yenP+m)WPJs1y#N00000NkvXXu0mjfMi}PH

diff --git a/Resources/Textures/Objects/Tools/welder.rsi/icon.png b/Resources/Textures/Objects/Tools/welder.rsi/icon.png
index a023a035ad47559b1b80b4d2ea46c2531d76eb54..c6917c8ba514fb1471fd732080cdb413c7d5ac6d 100644
GIT binary patch
delta 554
zcmV+_0@eMZ0=NW_8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00HVrL_t(|
zob8p%O9D|8#=oFIf}qkxp*=|37@~_7NiL-RfFPj=H}xM_%c4!vI>ANKCO0(%*`|F+
zCAnx}2||#NIHg1?B!s)$Tx+IreB@)ajK0;mkKy~BJLlfhiGLr~Kfpi0?*`}|G!Z_2
zON2UF3P8<I%^}RJP9PS3f!=8%#<AX_eOCd0LtrHVc=O>N;N*D=^RqTYxOvN=6{h}J
z!Cv#Ul}Nu|H28(s;Xy^fvL}!Y0=I4-mbTqsHhg%^+Vk_NR0c|ApRi9H^Xt~Bukmtd
zAP?vbCQE{p1%J4B0_JQsFg_m^*4EKw&p{<J;T4bF7k%sU3<z;K<B9;Z;C5*NCPIiY
z3}=1^)wu(BI7XaX9~#jWn6oTfVB%#_waT6Vg*dV}2$Fy*=>U7_%A0638Y0eGYF?`<
zUPEent<{prXjCwl?xAyyKz#cUQF96r&gHPljh%#GZ+~=LST9urvI6iBG*jN3uY7Sa
zHWh%19`hy#VdBh<20hOFfqeE9YNZtbRDAV|Wl$)vuU3<l$H%(rpsr?g6OIV+K{|~_
zR2P8w-|u8H&AW!JQ2PMTt|x6gEdvmn%W?N>1}G)^1~l3SY6g%y`>Fvx-g{laSdQ$g
s2KY21k|VJ!s;L*C32L8r;LifQ1C@uwSxGc<%>V!Z07*qoM6N<$f+Q9AIRF3v

delta 274
zcmV+t0qy>{1fl|v8Gi!+002a!ipBr{06$PnR7C&)02vt>AS*y7CMGH=DJv=}F)=Yc
zJv~H1LPtkONHzdSNJvyvR8><`X=!O{Pyu&$cYIz1jQ{|db`H;<52tCijsO4v0d!JM
zQvg8b*k%9#0Fg;VK~y-)-IGZYLLm%9L7PYm%^$-3&*}lbhJS?%tIW1vCFu+){Zjx7
zy?4a=^bRw#Pk@`bk)n~j&FPm6?wyoG@{!&Bxm|lOqgYBQ`8bZZE{rNA^io@_r=0U*
zSP18ZI;s>D!PtjzE;8Ue1E30#4X`S-2{z#y03aK}lVJ-14z;iX_i>MbQL$Rpk3Q-J
YRQd(HNLK_J01E&B07*qoM6N<$g5soRH2?qr

diff --git a/Resources/Textures/Objects/Tools/welder.rsi/meta.json b/Resources/Textures/Objects/Tools/welder.rsi/meta.json
index 5f876da9ae..407f85d4cf 100644
--- a/Resources/Textures/Objects/Tools/welder.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder.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/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8 // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png
index 20aa48abf68c85cebc135633200b994f8efd9c66..6c8ef525ccd7a64c212523ae35c1a3adda12ddf2 100644
GIT binary patch
literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YsBY
z)5S5QV$RzedwH1*dD;@AlX$jqcsm>wIqCCJB;>fr%_iHPUY4VsR^d-dC(4^wiYz@@
zKB<`-s56_fs$5?=TuoK%md|p=RmUG1PES<otjKw^_m@e-%B-Jv9eBRqz9W4i%XjPB
zs%%>)pcW)hV4?82an}9MKV(<W^kc30+~{v+(Dmc%n_o3AztlLmot+!==))WT^X%XD
hZk1Dn>uae0%BFqJXu-b)bDx3)Jzf1=);T3K0RU-PTd)8C

literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!N$PAcy*Sa5Rk)J;1OBOz`zY;a|<zEx?A@L
zD46c);uw-~@9p)2ybTIG3=VRA55@c*D&6%=J2Z2H&0nWQ^LH=#YpUunYl{ej*w%UL
zw3UB(?VZgsLnygto6O<o_x`V7XGk~|u_U@@#{CuHzrSC!zPER~K7ZkqSwH{16?`W&
gbM<`=28SvJx3ku#=M+uP16s-8>FVdQ&MBb@089@=M*si-

diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png
index 446d4b21bf7742ce04c265fb06bf89a17c91643c..d33656a0be4000ed43d259b1404726e98595ca41 100644
GIT binary patch
delta 895
zcmV-_1AzRr1d9id8Gi-<0063Kaozv`010qNS#tmY4#WTe4#WYKD-Ig~00TWqL_t(|
zob6goXcIvgeSxKxCP+geQoB~DJ&87ADX0}GQoRU81rPP4;6X%0#go*V2M_*$s3*aj
z76dE3T1pUGd(n_8o+MCB6)PcPf2dMf^G!1AcJsTN{Q>uT5Pz~WJ2P+g&Fp+L$x{$;
zumA`+SO5eZEP%XFRaK+!EnB-q`t?*IWVcb-Rwk3FyA8ki6<I+Nx3xvZ_ul>i4GrM)
z+{e1h`pK_I@?WV!MrW)S$@U4oBNDI1r_dGIjy<tK?28Ye=g2mkx;VTpeRcetp@w)M
zZK&z2p7S6*QhzccR`_2&OqFmN)1!ZGS>_irfXIIyy@{1?Nj&*Ji{Y<>NMb@1Fn7c%
zsACc{3x!dAyR?3K`^hf^*boOcKEHy)c_o2OVg&4vXS2DIyxT8E^lS5jOZdsJ(DWms
zY&@r{F3G7udY5+X?h|?Gr4QosIDHowgPteT5w&Su<A1aWWss@bX)F8(&csVNjcGgl
z3az%Z;F#4mlkXquuh@tzYh~4!@S9&TcEWgr8k8$@xvAwO{N&g70Ttq|MysinkY*Qt
z@mJjm7N?XRqY2cR8-1ggP9;QGF~)EzYiAnz$zO9TtS?f<_bm3KTaeEzOo$jxgeR7l
zwVsw1oPVC556L_@1h@HZodt-TLW<g|YL}u>LB6xO8IL+Tv}<r5PV!q8z#L0cYisC%
zcW|1&;nQGT@%KR4D1XDf_j(36&0kf3avK!mJzA99oB>|&*H!z=WN{<X`tS56W3wEA
zcdM(IU0DIbVK@yp`Rfwk@}cXvzmPvv%oWmd+kZ)&nOs~9<wrs6;_l>fAvGLs=p64g
ze@y{8-}hn~381}@Hpf`%#8Y{lCwFoW;01qG0mSySAL3mj_05et{jh%U*PH>3{5IzV
z+~((Bg%NPD00=l(00bN?00Isc009RJATQV-!2W<jMz#Ov?;U$q))yetpLV=4)NtM(
zaCoxoLPc)^r8gfm)?t4@UHt41u=4->`LW|=eE~8Z`R%ShfcPqT69|zx_6M*(z$(}u
zQ0*rB1Hk@(vS5FJ0qhT8e*pUf;1<{)-~m7T18Nmue*pUf*dOp;g9Sjq!2%%Q_zV29
V_Xtar;P3zd002ovPDHLkV1nJ;q!a)E

delta 550
zcmV+>0@?kG2ebr`8Gi!+005o0f$RVP08UU$R7JqRz$hpvXlQ6qP*5;1FhD>+I5;?F
z0A@1)W@Z4)nE=e0GtA60%v4lVASghY0A>I){{R60005a77#IKmW=Kd#W&i-0007JY
z03aYB+w%7O00001bW%=J06^y0W&i*HczRS=bVOxyV{&P5bbo1YZU6vyoKseCa&`Cg
zQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AX6!|qC7Px
zCACP2i!&v&s2C_@$i<mfl$e_eVw(U(Q*#n4LBcv<$fc~{>gNKs3ILmWA5}ybnxFsx
z0T4+<K~z}7?SGcpZiO%qLv04buyvzA`~N@M7xpSQ1*y_~h#zxC9xEWlK+;o)WcKUm
z3O6(6d#NajE4*|!lgX>PX{)+vJ9T=g>(?`H=YazU{q6mulxZ_iS9E<@mi~F<i@||!
z8*EF!j=j6%#McCS4w{*na+xn8cb6370L{c)8o20m<9`tjkYt{785nqx&+0eb;-F-N
zgA(s>Fw5w0VjRI69F*t|PSe-O8yu7o0LP%gW4;bd5rc4oVR)P%#?1x-3T=pSQ0}A{
z+7RQQ{F@{~pDD&ccXIx3?{FY={#Txql=MvfpqZcFP(PR-?<&|27K2bfSPX*wU`-I{
o2Wx`V4<AxLNc|x7gQS1b55lz~33PYNvH$=807*qoM6N<$g4S*8*8l(j

diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json
index 75650c1928..1e4258956e 100644
--- a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder_experimental.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/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8 // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png
index 1efc7aaa60d236c09804dc0a9323648015d16b1c..c4cac4606ac872e32a0a3b4df7fdb4540bc5087e 100644
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YsBZ
z)5S5QV$RzeYXzAV1==3=&*V7en8!I$lhM;tUGt%eszUIwsSUdwj`*svHtZ;8-H<i^
zq5B4YT|S`RJNz4R-}02M+0=A(XTy!Ek9O=!?PhJ6zO&)Y-p%j%zC3z$`$N?^`=%*-
zyr+BYVFGGE0vndu3uIsWA^UsI-AVr%j(srOx_FNFFXmN+DVvIRsQzud|EF%c09^fn
a`Wl7>`?N3ItWQ<|33|HvxvX<aXaWGd(OI<s

literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQYryHA+84w9GEfV$B6_Wn(<>s
z!Ve&skdW}>$B7?5egGvrBz~NjaoNPu7pR`GB*-tA!Qt7BG$5zCDkP%BCAB!YD6^m>
zGe3`kp<+&OSV2+g_b<T(AHP1)^48TlcjkQXhERix#t$CpocGZ@$xzhOyTigb$oR6c
zm%^M!la5RZQ3%%Dy2!><U3II6xxIg9x3TKx6%ra*Cyvexn=)fIR}!=7vL(+{!kSu2
zd3H__jrkjMz>JZhXNCOYs3r?@pfj{QT^vI!PA4ZwutqdY;M9sYVVrvYo)P!d`?lO?
mSuTp02=lr*mx}OMGBDhmz<lESx*xJYT@0SCelF{r5}E)tb8|ZY

diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png
index 5c6c99c5d93c3a85c31d016752459a504da2b50d..c697fae1fab665ad0d2b3f893cb1d4612c54b801 100644
GIT binary patch
delta 448
zcmV;x0YCoP0?q@F7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0004iNkl<Z
zc%1E)u};G<5QYzlA#2pJu3#t&D1d~7gu3)0*ijeu?hKW9fDUXdr~_kP0cDAp0l@+T
z2v=fh^9aW0=uAlB))7wVkbm)A73cqa$z8e$|Eva}0a#xE#($W=wX@ZQ`zYL~6#&iA
z7}aX|aMJ55n6oH^L%E(Z1{a*?;$g3^_LKq60g(Cm`>V=>FAqk0`zoGDgNa-_7|Uz2
zF~Xt{nD(OvvzZa7umZUGdV5FbSI>_Mf(%TW&ttWIe!M~8dHVOE@2d)q<2VOW2!Q6g
z0$x%9y1A`x7k>*K7a1D?IOlk=m>wOgd<x0Q@Kh*#JQSOR_ZVA(7FGanAdLj&^iol0
zq(J{HV;h>@<W;A429OoCA^~7ETvWjd0L_0oAej%YDp6__9|XH_7e>nbQV1B-4UiVL
z=S{mUmJJ!_01r<uI!^a_Z2;+Ev~0Lk22h0>fRz9=13AimjGO^ft@Q^;MsD|4?&?cu
q1wj7~GPyHZJp$LJr2(o`1Mm&4YnlqU^tWXI0000<MNUMnLSTX)%)hSy

delta 330
zcmV-Q0k!_l1K9$Q7=Hu<0001iRA<Kk000<JOjJd{z`z_F9638cOiods8yn0cBXJQC
zdwY9Ng`N-q0004WQchC<K<3zH0001OdQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6
z@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoPXky#FA7XQz<hqr93q!
zCACP2i!&v&s2C__$i<mfl$e_eVJj=R`niCO1^~T58_9k*3)KJs0Cq`4K~yM_V_={c
z5L7_rGb$M=Ffs@*!G(off{m1vl$4EJ93TQBN~*>{V5ArtmH<<s1Okd_2~abPjRX}1
z1qB7*rYb2gDnp`K%qWN^poF9z1elDK&;-mC9nb|r(6lI~p$ZtGSxbh1vJ%MxLTE0>
c^elw{0LzCCj!+{7kpKVy07*qoM6N<$g4gVLr2qf`

diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json
index ab4744aaa6..1a92064078 100644
--- a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder_industrial.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/782006a07ef7f16f70128489b3e78b210ee4bbbe",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png
index 7814b7485199170ae34cacd3a4ecfe43995e1367..c4cac4606ac872e32a0a3b4df7fdb4540bc5087e 100644
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YsBZ
z)5S5QV$RzeYXzAV1==3=&*V7en8!I$lhM;tUGt%eszUIwsSUdwj`*svHtZ;8-H<i^
zq5B4YT|S`RJNz4R-}02M+0=A(XTy!Ek9O=!?PhJ6zO&)Y-p%j%zC3z$`$N?^`=%*-
zyr+BYVFGGE0vndu3uIsWA^UsI-AVr%j(srOx_FNFFXmN+DVvIRsQzud|EF%c09^fn
a`Wl7>`?N3ItWQ<|33|HvxvX<aXaWGd(OI<s

literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQYryHA+84w9GEfV$B6_Wn(<>s
z!Ve&skdW}>$B7?5egGvrBz~NjaoNPu7pR`GB*-tA!Qt7BG$5y@DkP%BCAB!YD6^m>
zGe3`kp<+&OSV2+g_b<T(AHP1)^48TlcjkQXhERix#t$CpocGZ@$xzhOyTigb$oR6c
zm%^M!la5RZQ3%#F)?aF4s;;`#!`$A#v)fp8^9l)#oD)Z9hE16<n=6UAblH+;Dq&46
zr93;Qh{pVlIS|Iku&F_T(PE2}J<uImo-U3d7N?UFBv>OFCU9!Sn=np2f6s_}>U~@8
nvn&@yOoVyeoJ&P`EEyQ?O<+FpeccaPpe_baS3j3^P6<r_R3>uG

diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png
index c187486f2bc9e34736019ee3a74cd4ef72380787..425cf3c4b3f8fb37bcda7ada9e600899acf3caf8 100644
GIT binary patch
delta 535
zcmV+y0_gpW1Ed6y7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0005jNkl<Z
zc%1E)ze~eF6vtnoQwu@~QjnG|5mXRce+<Q?4({%{c64)ha&qkG<lw*H(#1s`6lraB
z5~MVWAf@0C+ER@7PVcx}FHKXtNTpv0_qbf{ee&MRyF}rSHGc)*0I5{UVRkxW(((H8
zA`%J!I%iH%hLNCSezV{-8&6;*n*eKM-FbR6+p<OmkIK$PeS?^ghAn^xVrKkpV|4=~
z=!_aYR}C~`yL5b?$-%<Mkt-TOgwJ5~*nX(ja#0Dy0dVn4xd?S)Uy<v0?-pjC50snx
zsnu!&rY=^<@qf8QcAwT*yHaw2aDa?`2J^%z6LXFmxus5*5~P00ZP_sg!2IJ|A+`L*
ztOl46W)Mg%T8LK3cU=^V1@ol}Ekdz*v{6}7WW$8(f_%O-1q?#I=>??{i(=5;!D~Q#
zP>hJ|u=Li1TBif|whh&OAFN&vjP*QJ?rvZlDO<4^5q~-7JKZiogs{fre9rz^6QltR
z1rQ;`CMCj*<17#Wle-Sg0TAr~sFmd<sMa32^UuXY5`toQ0J37q9L#N>I9}~lJAl~X
zLIGgmXYy*R+5mKF3g8JKA5dOrfHr`zG+6-j5BZnQ0AB$4A3=xnp#Tg5G;6YI;9mlK
Z0T=1hN)URuay9?}002ovPDHLkV1hy&?hpU~

delta 381
zcmV-@0fPRd1dIca7=Hu<0001iRA<Kk001XYOjJd{z`z_F9638cOioc6MVlmC%n>kc
z%p)V88yj&E5kd_OCI<(5dwZxf7Hj|j00DGTPE!Ct=GbNc003`#R9JLGWpiV4X>fFD
zZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDSycTa*U0*I5Sc+(=$pS
zoZ^zil2jm5sk9(7FQq&+CndE=iHkEOv#1y-YRJWzR+N~V3SlcNxca$(4F>=PKOC-y
ziw-XU005XtL_t(2k)@Ea5yCJGMHNqA<w$D$9Tu=#iWIN_cj>8^fms-X36Yd=KD&eb
zbE9`(Uy_Ob5O(*+s_qbz??~SYdc+J<+Q4+po2H9_nQnmAX;>Z#P79c=XVjV^5D{3l
zW;pTYpe^6&;>e*4F%QD?_2#l0EWsDxB(&Pz<rHdgPKOo@a|6bEli_J6kT3fk)SJt3
bwPCkDcbymPsr%wL00000NkvXXu0mjfLE)X7

diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json
index ab4744aaa6..87568bcddb 100644
--- a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder_industrialadv.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/782006a07ef7f16f70128489b3e78b210ee4bbbe",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe // Icon Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png
index d8ba3f28bdc7cc71fd50d8352f699f748e44cd3f..809abc51eeb836157923b69ffbb551e0bd64a5b3 100644
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YsBZ
z)5S5QV$RzeYXzAV1==3=&*V7en8!I$lhM;tUGt%eszUIwsSUdwj`*svHtZ;8-H<i^
zq5B4YT|NeeckDN|m9<%gMIL+=<B+qrVt#Xwyzi~kF%IAE-7IIXD*T#TVf$R((d*t)
zZ<RPkpj}8H;<9{)Y4)GK+H-lH^$y7uvu_2SQ~k?$)xs#!^3J4x2lDIodvhSvAE>Wk
XIQ~%k!X785D3GY9tDnm{r-UW|X0lPz

literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQYryHA+84w9GEfV$B6_Wn(<>s
z!Ve&skdW}>$B7?5egGvrBz~NjaoNPu7pR`GB*-tA!Qt7BG$5z0DkP%BCAB!YD6^m>
zGe3`kp<+&OSV2+g_b<T(AHP1)^48TlcjkQXhERix#t$CpocGZ@$xzhOyTigb$oR6c
zm%^M!la5RZQ3zhSMZs8qsg0?+>Q)bPd;iXEW7W+oBs3CF9Gw|9WyWl-B<8QnmON7l
zYicRw**Qft=5Ne_X^adU=M<hj{`krp=n_p&7sn8b)5!@EZ4M_`rs~gXIF+71v-Q;b
pd97(p8C<hE*?1Nwi1gSnFkFAjd?I>#*h`=$22WQ%mvv4FO#pr8dXWGC

diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png
index f331df4390e4cd2193af7bf878126a071b8badc7..09cfe9a497ae2b589ee05b3495f7618f3e1e0ec4 100644
GIT binary patch
delta 222
zcmcb~_?~fsWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKQ04
zikhaQvuA8<O7Em8K(WIn-myT6wIs+d_&*RZ{NBbF3>4rj@Q5sCVBk9f!i-b3`J{n@
z5uPrNAr}5``w#Lp7;rc*eEffZWYm>#m+h(Q!u-|d$FyJSh~+H&u{7aOYues83qL8w
z-u4F*SNbrWGoIrnyQXmM+2|GA2J_=~Sg&xo-)Jz)r_L~e`{;A0BaA;D@_pa9B$p9r
O34^DrpUXO@geCwJRZhYH

delta 200
zcmV;(05|{d0oehN8Gi-<0047(dh`GQ0H8@kK~z|U?UOMM!ypVrosKNbNZi0P_df+U
z-~ueHRF2ZfaS|k&sp@|c!XVine}Di00Dxbo>yc9GcF&9x%d7!0#>+y2_kNh0b0(|#
zniVgl>;-fz;?B8|_`=LYH%>f)nOFNm2<t5Ck5dxs+IBs41woR$b<$N=dqHuawMMnp
zQ?9tRIe5^Wegn1x%ayn~#8;Xl9{&OW004gu5xoIIXHfmgbD`A$0000<MNUMnLSTYS
CrC1&S

diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png
index a68f4c12577f44b8d8cce23be32ec1556b0f85ca..4ad153c1068e8f52696f5ef2a280a419dde4aba9 100644
GIT binary patch
delta 385
zcmV-{0e=3=0-FPnBYyx1a7bBm000ie000ie0hKEb8vp<SO-V#SRCt_YVHjXA>VQ!P
zj5=V{0izBWd=5z9=l)NO#=F1&FdY8&laZ<p09h{1%tX9aE{6ZlWt6bW%E~HW72m&i
zJBp)G902l_I5Qi=%fJ8dTK&+(jzLCBngL{m0uD6>rUn>d7k^G)U~qKy{EzGi6bC?q
z6mJx;SUQ1y0Wt{0M`nWn$YCI`W#d+c$B!SN=)H66I#?~TBQVkc!Fb)fodISsObEnQ
zQPcdNnUjrSG00Mo9Eir|V4@NsC~63W0LbUlr%VOMy`{M|!;@!E!43gg4pIkm1hVBA
z4#1rVk(8Y|#Cia;5CmdlQ{V=IEQSG)ypO*(iYdS}@E_zboN0jAL?{n*1WY}yTmS+f
z%g_PdTmXuHrtfS(9}&)q|2Tg^(#x&uIMv+2BZt)iAaL;iXW|N%ZwyocgRdwab-<_t
fMjbHf0D1!eas!}p`@|`?00000NkvXXu0mjflbE8u

delta 305
zcmV-10nYxL1Iq%CBYy!BNkl<ZScUDBF>Zq}6o!9jvcSL;DQ<lOPYgaokI|vZIilPk
zd+*UpuvKEt5K9>{AyrhZ6db(>kO|<5cF2(TEzbu0-v54VgJBqkxqAZFfH%Mz0207&
zadox!ue3?lfPIbUSc*p+PZbsqp*Ozo_9UW%)*4xs`K0tjw|@_)`{#I$Llr=Tb})W?
z{a_>IX!ayYyguZ4-V@Q8kPANhskkvFkWyOu-W^l%D2h;)<yi4RDP@O5{2NNFwYEZt
zOQd-tjK*&M>-i)Hwo0{~xLq~t8wZM_==IdNWsK?6oxBG~gpZ-(j)-2<v-V{j(<gD+
z<!Qa!-6&5LUMjvny{Dl5$77720^H~xU>JsBZVP}jRTHAe>k$yi00000NkvXXu0mjf
DU3ih>

diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png
index 3f79cb157cacf02c6412154c488d2af8c68a7928..68c8a3ed715738ad6d3cff7bf54aece317ffea32 100644
GIT binary patch
delta 214
zcmaFD_?&TqWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|bfKQ0)
zk|j&(>+4URJP8yqdpyAaq^=~$FZloe{|pXVE588woCO|{#S9F5M?jcysy3fAP%y;P
z#WBRf|82h^AA<r1v*W-2>B)v%UIhk){-2IL>zexHfcTVfCSHk!OF2W>c3))C+bh4f
zy~o-^Y|$iUrgQ4zB`KQ{`*{9!PV!^n(7hOXTzpEj;}RyP``k`{6Lo@t7BG0a`njxg
HN@xNA?kPvt

delta 211
zcmV;^04)FK0ptOY8Gi-<0047(dh`GQ0INwvK~z|U?UcO@10f8BeNjp}W}v5Y#|+HC
z0Ia|cHwkMn12aHHPvl4^CDP?ja&(d6uX(P(etrOgAPB<Wv)mf6uIp^Afz}#cX^e4U
zH7}(!ODS`V@s?7v9QU5Lf~F#J&R~q$)!sWGBJ1RLhmi}<>`b@Tf^&}7`lI>Cfe->H
zrM|NQ3Kb$kt@XO|J*5nAr~kASG$rA^f2h<T_bd3Fe?SlfK{x~exB#OJo$OTI?l%Ac
N002ovPDHLkV1o4-ULgPg

diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json
index cd29490826..826b1c44ca 100644
--- a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/icon.png b/Resources/Textures/Objects/Tools/wrench.rsi/icon.png
index 4d24ac7fae1286a77c92964bdfbec03ca4e806ae..1b8a2697e25e78a3b62154d3f105b4882a5027f5 100644
GIT binary patch
delta 470
zcmV;{0V)3G0ptUa7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0004&Nkl<Z
zc%1E*!AiqG5QeAV3n;x71T~NcC<RYSK@bZCFFkqcN$TS$K0_};p&|%HPleJ42t);;
zr($U@^}Nl$bjmg+t!5{+&@O~zHzD)w%w*=z4*m1k0<1T{X@Buth1XtMPnneg^m?Ck
zeN&_U*T7s>k`N04-hD4~e|x7+if6O6{Bc1P;s*e`oecm21{q>F7>PnedZ1Lkm@^Os
zAvGcaJnxMT9A^e`=(sAE+o#voGcg46BNYI=cxqgqgSj@2Yq<WQUMDjr!~slqfB3#O
zwwK-2Ztu1`bbnc?Xo%@^@&F7G>{{`T;Q<WH0f9O0r<R2H5?~Cwh6fOP>>S2<m^mU2
zfR`fnxCQ`@uyNNt(xI`1h%H1$jOWTR=R~vdsOPpdVQDjpNH&FV@RtJ5*g*Wb8v-au
zObvk?0f-GmqIN6^kysB%L0AbA2?%RNWD6l8$!s9RG*4kt2vJcQhTw{NRjtNCh^t}~
z0y+X~-{Wzten>@@GX$4yvyZF<fFa1}BXRm6)gP1Jh?e#KGujA%35n=IM!v(6wg3PC
M07*qoM6N<$f^GrB<NyEw

delta 214
zcmaFD{ETseL_G^L0|P^2NcwRgr4`^4;`+bgznYp_NJz-cnKR|&<m~P3moHzQmX;<d
zDXFKYSCF6Y<Kt6bUmp|{H1Wm9LZB|jk|4ie28U-i(tw;SPZ!4!jfu$#3j`BHT*L#!
z3LQi_i+mlQaT#^&YE|IwVBh9f=qe_#N@MO8p`&NM`5*8+J;C>>hUko)TsK3$9r$#!
zIADr_LBTnz)+9sb=F3thsyb23%TsjqX9=;2g)p+kPv>62q_dC5go)ury8OIUQ5Ghk
OwG5uFelF{r5}E+v*+~`v

diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json
index a2c8f06819..ecd76812cd 100644
--- a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, storage by EmoGarbage404 (github)",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, storage by EmoGarbage404 (github) // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json
index fc15bfadef..d75e46fbf4 100644
--- a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ // Hands sprites taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_nocell.png b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_nocell.png
index 8c4fbac7fdb19358dfe2c67931a69999e091f0e7..bf08ef9cc769fe4ed6929318ae74f8414ff64212 100644
GIT binary patch
delta 237
zcmV<J022SN1N{Mz7=Hu<0001iRA<Kk001peOjJd{z`#aGSYKv#|A{m3wLujV8>>+;
zCnq=|BrB<C88SCL6crmpN>%QG0U;P02gG2M00001bW%=J06^y0W&i*Hen~_@R49>S
zV4w^zDxe7nE21edatuIKpduE4rXUqn2bux~MsZXH3__)73TD*N93fP|fK!10x`ILs
z69mvrV8^hcq7}`GS*y|9u%;W8&vjx0eg(JC6mXy`=mIL>dxs>z4OH*|2;qPasDJ^4
n;NTrY0ID8_cct$hFc1v@<!&7Li@sJ{00000NkvXXu0mjfC>&DR

delta 417
zcmV;S0bc(70j~p)7=H)`0001UdV2H#00DMML_t(|ob8t}PQx$&MPE?|RH;iCI^dyM
zkh++m7jUHxC?jWJ=L(#mf|-j{A`2@LUb=KBl9vp4V5r#4Kod2hEhTnRB=}oo$?y5w
zi52+IUx<{_B}w8ojU6=sf4+<`#;{4ER)HKoN+FkMOkf@UpnqVL!erQPMqm^CCVoTR
zKeZYWh@yyVE5C&UeC@<DQc5SKL~G5twM>TXt#E*?16AQlDYVvDYtdSNJAbe(r~-#T
z4XnenEMqpC?LDt|13qwX0be+HY{5EwKA&TZsWexm213E1LIZ=rz{PRQa=G+|!>WPR
zikwnv<CU4`@qg~Z0m0yffY!QYt)<`ZvrFRY_Juf(eVL_{Rv?6M<MEiqVnLdwrLoY}
z=P4aRV@zv0ozm%akWxDMti3KcY&nENh~h%&cDvLC-x(o<16-0MPATP9&j*PULb%@9
z>A?hw)FJVsFJbTaq&S?7CkKZXsQtenxIp&)T8GDe`5F~(Lg;(|Zg%0$JhrhL00000
LNkvXXu0mjfr*p&W

diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png
index 59940f44ca4373ace1a3068261c7b823721077c6..8704ab6bcfc9d1cc1a0e0a9959d1eef636a6de3b 100644
GIT binary patch
delta 208
zcmaFG^nh`KL_G^L0|P^2NcwRgr5@lD;(Fk~0XL6`__VVBoyH%wI*JNQuMRX&SGQ19
z(Ka%-6%mzo@d{Oxkp5D`d>5#Nu_VYZn8D%MjWi%9-P6S}L}Oxd!U7%xtp%JM+KV&|
zig+AC7buA}EK?8-WuL{w=2jTO%Hy;&gX_vg8O4wTo({>ZGHWxqtkM^1&bZsUEa5nl
zmc|3iW|af1Aq5N^4;$E5G%&V2c);V#uu87YcxgJHfdDUqo1Ij^3JEVwpq&h!u6{1-
HoD!M<T;@Qs

delta 347
zcmV-h0i^!m0qO#f7=H)`0001UdV2H#00A*cL_t(|ob8uAPQx%5h96J|#2AJScwu4u
z7<z$p&B#T#0%zz2I0`)h5?&%9kM58G4;`XP3}&(viB$Qq9R_$;OW*VOwG$=qpT7_h
z@l{p%zO~CG;O~zG)>`@`vI+$Fb`L>fF@Y}pwS?^+cAM2Q0)Kt*=er~2%iF~w0!2~q
z<YW*I@UxT1h=>;vwAMU0$8NJa3kNv6Fc)5yC0c8ob7-vx=O;UYIdDkSKo{OL4Ru|Q
zo*Ugj3_MyO77h_d(1jagu-49+HLHPCaG246h<K$GZQDk}VPXSe=c(Y61OnU`6U&?~
z(1oYm{V0K)@Kiy8-0(pGAS)b3Jcdds5Ab#EX+93g1tw*Ef7|<I8<R=zf%Vl5B9dHU
tR024)K=%KF<O0p<Gl$2x<hX>to^PxI(^;hXInDq8002ovPDHLkV1m=$n416q

diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_on.png b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_on.png
index 2132190ad45aa02a2165f4372bacbfd0be16514e..2adbe76e9e16819f2e91a89abba140f95eebb6db 100644
GIT binary patch
delta 1738
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

delta 1071
zcmV+~1kn504Z{eKBYy-6Nkl<Zc%1E>F>BjE7=~Y$7)nOh5JQcjOY7+h@oK2DIN%J0
z{)5t?WB)?vPsrH+(IHuyKafB@nc}H&i36^O45pyrx=7|MTbAV9-KYC>F9eG~{M@VW
zPSU~mMt~QoYBnG;L?=3&*Xmf>V7kITFbF-24x6(XngGyh0e>>Ia}r9z?*kYo_}y9^
zSH|JdPv`y)$3h4>91i9E9gby)j&gEL^9L$lh8S4pXZn9;0v;VUXEQWU&&18o4-HJG
zQ+)b7yoqK*Q#Ut-KUeu@?}wKWzi)#Npqu4idjVp&dh$=Mfp`#>l*Jz#WcOqK+n%^g
z;dkQ$69w2X|9>L@POgEAp0Qib8XwBcBjAs7_+L!`?FC4KpTBy<o3FRMRts|gbKP8(
zug*LQei8p#3lKkUH5v_kS%_4)si%-#{CD4OPbvA4|7Mb}eIFo%kU<b&G#X*CSm2^}
zuu*xFkAbf7wO$mH@XPO`9sro0c{%t^0AoUas()=OAb$xTjYc&YqEoBmw=RaOd>LYp
zw)xUhfNgLc-&+O#lW)Q<n=b?ZNd<7-d>QzA4_JjyCKF7jQ!?`|^Y>Z-T+Ek&U-%D&
z5VGBFW4T<CndihWv;yMFQ<~?-&s~5RKAB9O%G^s_`MC<9!YO7SXMSb@IGZm6e`f)>
zn=b=DbAJU;nXd{z^9$SUwgiCiP~zd&AL}Qe>ijhwy?!Y@U#|-71CE}*fDnT0BvhIo
zgQ*6<m2avo#Ve-@7vSOFUlZf-{5;}#6Lg91<>ggKGQ=SI?AYi^&cly?XL%f{{*CSI
zQu_1P`eSyrYuMl$;tpzcT<zeK=K}^NS3>;#d4KxzO|6Ese1esHL=0BV%kw}c2Vsc4
z_2h5i8@mkU<gff|+lVDhZM10H$OkA(yA=6=JpQ#6V3+wV{qfyx-=Rs=`Gh?A0CWD;
zWfug&>ht>Jv9W8Qy80;i>KKahZRZ0v`r|G0S5HB@?*q}3PvLxo&j%3mwH6?wKi>HB
zZ+}*QK7hW-G3?{NQuzRr8^3-1`+R_9esU62A|GIK<5kpuas~Q)05RX^1Bm&R%LnMV
z92Mp7V)}dlG2iC{i1|JrK+N~~0Ajw+2N3gpK7g3-^8v(spARTGe@)b_c^vsZAK(g~
zYkxj9-{%8}<?{h9@j2cEUE+Ir@spK}1%LJb?=Q31zCWPSqJDpXOJeu_0N2Fz{Q=I1
z<NE`g61(>YxF%Nb4{%ZJ@&T^NW<J2r{4HXW4{%j1@&PW(`Fw!uaylQtLC)p_xX8(T
z04F(@58x)J@&O#>Og@0CoX7`oR_XHr+*Rs)KowN_d;oWqJ|Ezv$hYR{ms9zGN+^rE
pKcB07K7d%x<pU}$e-rj%r~hn$rX;_H%7p*`002ovPDHLkV1h;{82$hN

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner.png
index 8daa67ae23ed6f061805be4e6ade14c8dc289260..8db1e80fdd1f32d08fe2e49909db021bc9aa7acd 100644
GIT binary patch
delta 381
zcmV-@0fPRi42=Vj8Gi!+002a!ipBr{06b7kR7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqKJC6&@Y;fJG#%QRLQQLvB{X3<P<k6EQswIH*W2L1do*V-D~kXC00DGTPE!Ct
z=GbNc0093<L_t(IjeS!A5`!QND@E4f5DNbPuWLaaPBfe)kbe+85C8yUU<V=|{5Nf^
zF_STf6Iy4bVjbI`!8!Y~Tj}UwAWJk6ZRMbr4ui0_lDB$yTBmpT`7`_3fBaEp3?0G(
zON_O|ord1vlS*-k%p4m{=Y$k1n6o%4(qBT;GZ%T9VU!@Uwz~xGFihZ_HGb<x38fT~
zq~q~7s6iaNVRo3n>Uc`f<@qt8y=R=jP2qBvaNdTSoy@g8oJGIYH>X){PBW$kRW^1?
z03R+5{;&eM73HVJ)sc)Y2x16`gc!sSt_BZ;-pbXp9tkcls0p%G5pb9QdQ(u*Uzn?f
bp5!6EN-!F3!qZui00000NkvXXu0mjf%S5GH

delta 1571
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
Vkp%GIK=l9s002ovPDHLkV1f<v`M>}G

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_cargo.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_cargo.png
index ff808bbc8bbca4efe6e3184df645be9251be9340..899c8d6e4cb0aa6d7e4b18368d411d3c34846a18 100644
GIT binary patch
delta 400
zcmV;B0dM|?1fK(t8Gi!+002a!ipBr{08vm(R7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqKD&xi<-vMyG#z3(DDlKnT1GI?re^WHNAj~h9uW{+VP&wly42j=IXpmrg^Ldq
zCreLLBq%f72x8#?0004WQchC<K<3zH0002|Nkl<ZIE|H);eU36APhz!$S56xpzW;h
z|Da1KAR=z3_eW0PyDFeE#u(=;0|2Gpr@7#K;2dB8Aq7^5W3dZTiZ78$)fPbsr3R%^
zDXmaN!0txPjojSE>5RUA-;r2yt67B^nbq1cr&G0TGzVcCeZWi;Sc4y@M)01DM8Hu;
zC<f)NfHQN=Nq?|@UTS7<kAe%05L_eZ<x#Wflkohhd3J=grYF#aFMRx~e~0iEwrzV0
z?INvT4{KQ4ZBBkY(mm>Q*72l2ei#3}O)~bJj3%djxJq!g&CxI}E6$m7zAINTe&#?5
u#-OeQkj5AZR|5ViK&Y!cD(bJe%P*r#9jPSko{s<k00{s|MNUMnLSTZ~ov~Q}

delta 504
zcmV<U0SEq{1BV2V8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00Fs4L_t(|
zoYj{*PQ)+}hP_L8h$uorh=M2*#cF$wz!|8a<Oo}EfGs!%)SLlvg6&rnNUKm#AX!l)
zp2_Ywvf>y&W}GzqMVyB{|CjODk|Tytnx-`iP@d-_U!Ok!Hh;58{7N!^E>DcHbg0PG
z0S4-ZNBfLj%<kC3?Ui`Wjt@HDS8rUjZJ+LV05WC7I0evgG9A@tr(F{W3<mOELV&sc
zK2ydmUbuBSP&FV0fn^5NY`8Mx6A3^yuw{cPGJpya`qyZH^P6wcKF+tT5Sa0c>p%cK
zkPF7t7b7P?zJK}>ZJO-_8OZU$0H#1HOsFXuV0j;lc6wO`8OZUBaXP@$vfgYQTx>>d
zpe~Htv=MAVO)Me+)}XJ@07X%d0w+l_ECA>*9<$HiG27j$oNf8>gN_-z6AmR3z<XJ3
zt`%#_(B2LPpsob$oT~Dz055<pY#~x$$u$t~Mb08@rf~_c|5bz_SYqxX92lTaA^Hjs
z1)$4Uh*U@vfSv^#gfz!2KN5fm0wh7yzowXz08|LL*J}cd+dg=aYoImYwfQ|w!TSIh
u%CjHl5ZVjCcRIFx4>}!VO)*kq*kIQ2W&p3;QQD0F0000<MNUMnLSTY$|J9KI

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_engineering.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_engineering.png
index da76b044c1e1b33761127befeda670a74cd0ad44..e45b9e35303b848b27e9c8ce7294dde077c503bb 100644
GIT binary patch
delta 365
zcmV-z0h0dI1^oh$8Gi!+002a!ipBr{083CzR7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqKI_3w^WA%IG##O7D(}x_?Z{a%GBu&5sf`{m&{#vpG&F8;byZnhA54E@(%@FO
z)5kLBLjV8(0d!JMQvg8b*k%9#0N_bPK~y-6#gl;!f-nq3w||aVreXo-@c+NmwlF|p
zBqk<a*yXl+Nizb*7-Ox;0)RO$$JSX}Sqo5s^Nt;K?-sy&cXE@h;tZfetPm%gqr(~C
zR7<FZ%~6lD!ufJ$spS~VO4r6TA*h8MuW!Ijs-QM{bNc|a3Pkd#b^&Th*B0pdJB!*#
zcZw~^rtiK2#%2)|xol&k;)uuuui^+Lrha#X40*((YyK5T!&9Ze7>D#*AQSSYXs;JS
z5hCq}P0z%HjP<r(kW$T`IS9fvU<m-9Qu0s&_)h^5mU>0-sNU5JW`7<TVc=G>00000
LNkvXXu0mjfoiw9?

delta 711
zcmV;&0yzEs0@MYN8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00M?dL_t(|
zob8uQXcIvghM!H7)<_#g@w9kcFJ1&orKk`O>M=qEd(uPOc(bR1XbWvAA}YlSimeqd
zf-QQf2l3}%1VNPggV5809wY}Vilj<OlV+WXu8EsXGCL_f`G3x3*q!;_C-Z&TnF*sH
z(=;74luoCOdSfa8s+rB4Ne43TK4<#I@<N6E2FQtX!)caRO3(Kl3Izg~p#&UlhQzSx
zyCS|R_%qO{WxT<Ph{<7EL~A0#qW$Hc_wKysj|=57E2LBdUPUZ}Yn*2<dsr0hfoPkp
zS-#s#fn(JK@PGUDtyYvCj_{cby<DPAgt)~p7nr2Y+Q^cft%&hDRnP<QlR<&&+-8iM
zykRFHW_d4gE{m2WA2gg^3f}PylPx0mDOS19HqH{GLln*Q`T)%Fke__x4qa^G7!wS!
zgM?0~-~ckmQEOaSC&c1k<pUqtPbVWJ$=T}wAhm4gF@LPPA_YyN213lUpk=NNAm!Nd
zA0j^$t2Cmj0PTGk69)>;slyG$=gK4Ke@fLoL3;((O8)`s0;FC+yhAUzoZB#fE`*AC
zT>x3V^EYsI$4i^iizfwYsq^6PvGFd7n^1orHBUu>Yrr*FF<Qt(wif%b+*g{NEILvG
zkcSHI)_*+yc97W7)?z<%?+2%M4OPsMC!sX~@YAQ4X|{_!QR;Zls90~kINAXDOrGpQ
zuGk;xJ|T`H!M9>10QpIlh3J<CS7TFCFi?8uo&($K6rd7-iUyO(iWN}FzcPT|DohSc
zbMj*E-@Yri_*8zqGJqFCN`iQerGl6T0w{+lH$ZgdE_o31zyRe2E{OMeP-z#TG<5HN
tDwoiP0P5Y2tG(B{9jltEs60kBm|x!y->E7aPVE2y002ovPDHLkV1i6$NB#f+

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_medical.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_medical.png
index 5bbd100773c4f80fca7401fc06b73090a0460cd8..c2dc11d21bf969063699ae9e24e9e1991b61e312 100644
GIT binary patch
delta 405
zcmV;G0c!rN1Ed3x8Gi!+002a!ipBr{06$PnR7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqKCc!q+d)BZG#%*V+#MPk#Vk1C-P76C%0$INQAb2Ht51%|mEXuPV*mgE0d!JM
zQvg8b*k%9#0TW3?K~y-6g_D7{gCGco6>E;oDc5}eXC0umnSZwX*CF!%^q`b6##n21
z0l<-ehOM)9u@+zfw>plX@9qPvtGl@tzS0Bm&ilpt7LL^U1K{i~$z9kz)!|+Ecm|e+
z8lMj|UwTE8h?0aFlZme$h$x<}AQZ+kfXGDn69x7Wdmsyd6gE*1A7k!-BxBeB&C>~>
z6F>t%9Y6!1^?x%Ucil@5)cQ-=_$qZTCtxc&uY~s827pyPaix+8zzDBUYB~otEp!I_
zyNmrC1e%}2ev;wpBwH_vY;e+x)^DC(S~vS{D-r2vH^sqcBBw-JKPAeeFNFxg<)@ry
zHh<<I2;1PV09bR*D_jBmr+~;``HJ{o_Ec{N?;C1kTn?V&00000NkvXXu0mjf{q(fV

delta 413
zcmV;O0b>571FQp(8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00CY}L_t(|
zob8uAi^4z<hDWeSDZvFHW$>R^S=w4yUU7w3>JPZ<w6e6Yu(h=EpByOzLL^wGi;Q=>
z#LdUftcf7!+vIDq@3T8I3)=>QJkLwPLSY!TOffltGPB-j4u3)jl5rG8aN2(tj-^Aj
zivsXR$8n%DoGDY+b%8336(36lb2+RaNs_`9DNF$d`o5o{ImcLskh(y5I!HCpq}~A5
z0K3n@-Sc>Td@ev;dIMAf;3gvbS<kty?Dum5Fx?#07*+s55VZWmDviY#do$`fzt=d9
zZ@VCl#Rhnm8h-)66x0r&_xb<X2eO^Om8k=a0FQJ6r2~urRkF=_Z2)!YH2`c1ky3yp
z0GmRj79a_rX^{YKGubZE{=~crIQyUNf;4+FfDVDuLC_e*F=qi}A@E*;NTIQcVTfG=
z%HR(q_ns;1B1A)Z_M;p^9|AC)j?2DVosOxd6lKRKgBH00JsY%*t?cr600000NkvXX
Hu0mjf>e8|`

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_science.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_science.png
index 8ae607cdcd4d5e1df01dccb78885b23735ae9246..1da59b8a315e63fb905d1f87ac802147b584434e 100644
GIT binary patch
delta 402
zcmV;D0d4-71fc_v8Gi!+002a!ipBr{06$PnR7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqKI41Z_qyY6G#!B_kM*42qFK7|iQ?JS%I)mt?CRz0w@vuuoeA00ZvX%Q0d!JM
zQvg8b*k%9#0T4+<K~y-6g_D7HgCGn=A;@T2OaS-)-`XS-?SB-ucusuqE&&0ZbIyC$
z0{{+vcKhJ{;yu6uAqL4{?QjAyhOe-v4|xD7q_m{8r$dHx0HPi$9?EuU-97O6dP-R8
z65U7S)vbt<h^Wi_3*Z&iqf!egg)3hGq}CcymB$ob0cyl-hH~1v1BhH2wxVJJXnC1t
z2%r*GQWJm&Ykx4HG<}ybu<2;VDunpk4cNXn9b0RaIwY-81+8og7*){9I#&E*>lp(5
zD@K6&=ROQ~QUJ1@<O!fBVEfRR2f#n4X@uMYyAP%=z7jGunkT_GUx*#~vG4wg%xt;l
wporLzW&p&TbA%Zne+p=%nQut?%O1uXuf7@TnonB`01E&B07*qoM6N<$f)v8GNB{r;

delta 523
zcmV+m0`&c%1DOPn8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00GNML_t(|
zoVAxRP6IIzMQ5elAX0?b6Ks<z^gs(e5(N!cKpX<N0u4w=>7j-6q@u|QLJ=uvSTrj}
z`tjQ9KfB3DQ5<{h|2#9c;*k(mmSrtHY`tC=IiD6lO6>gi+J7bfdHfb#D})-w9CTt#
z@c!qf`QC1~QdQN?*lM+s@p#;{AEqxYU<HarB$|T8v5@-e{Zvk7Gudo5&7%4-5bZ-#
zaT_<E$z&qm%caaO7s+&V)_{rQ?rn$I7ydTWxw^(&7D)}N2z4j8XqRy4n==X^Tu4O_
z1p63K8sP5esejcM%RfS59SjBtbIJ&K=TIrg2@Ej`z|K8}-f|wc?Kj>Fg8@Qu1T#T2
z^-ay80bc9JLZ(s=4Y}sOS<4H6mI{4%9pe~#99>1IA-8a=0JhPG$$c+?TwXo7cLU(=
z8DBOEGyuCZZxlKKhMt7n3CIHALWeR6;P&ex8rIk;uz!BN37^kC_5<KKR^B;u5$Z0n
zy75Hd1!UJVYgqs+#Bf&{W;MJK@sDY)04ab&8wHR$j;TDeyQcwS5Lo%x_K3Rx5JKBw
zH0-YMh`RxH1pYx<{Z8v$gequnKjslS2q5=5PL20^9kZg0;TkEJKi6U_F|33vvH$=8
N07*qoL<FuvV1i@(;-mlo

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_security.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_security.png
index 42114c515b2dc35dabb5fb643166d85680fb8525..cfd18620e04750d95eddeb752af4a9f88894fb29 100644
GIT binary patch
delta 386
zcmV-|0e$}F1(E}h8Gi!+002a!ipBr{06$PnR7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqJ})sfOixm8G#%SPK^htzJwQXnEI6+gFzLWy>#|C42O@CA>c&h>cmMzZ0d!JM
zQvg8b*k%9#0Rc%wK~y-6os)rbgCGz@;gAv%)}u-P|66-^1b>o>v@_iq&y{^5c<P*U
z-n%X$8vZrxgZG>FL>q+|q>^2S7Z79k2+#6n2arNaTT0I|Y)AtTcTsauwp$zS%GX;F
zS!wll&F)Ru9dl*JwOVC%JAMFp2V}ge<P7Zj005t8xe($p0rx>@exCp~!WL;cPk<75
zsG#`_*vgbZTYK*e)S{Ukr7i$Xb(S^oXixe741cX*?BX2YmK$-lP0fn|I@A23GQQ-#
zVq0MGc?PUi(h6(W5m17Aw*}y1ZbU~ko^l}?!Y!Wjj^t%5pE(%<P+9>L0Yq8>@~4n0
gt#U)sZ}F+V0m*+FJ_`6b!~g&Q07*qoM6N<$f*>!WQUCw|

delta 729
zcmV;~0w(>E1Lg&g8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00NjvL_t(|
zob8v-YZE~f$6u0NgDVI{yT*<5;LSh6lh9I38$s%!hoUq#DU{lJ@ZYcv#l#{Af*!O*
zYXaiIlYfM_fYQ{s3cUr%uXW!pvz^`S&aa9mAA}5VcK7?)w|{Tuz0p9x^7*_23f6A7
zQ@m@&0C-}CZ9{c`64r13gsy1@zO6SVY%JJ;FX>rPC@t=SxErq?AAA2D_vZ{^e7#}F
z*P56ZgO7_y>?a@)<Y7@u>u1M&PAU@%Okk2ehfod>>-76jZ(M}R+&9SSdf><L!$li*
zKTW~Pjqn`Lgns}~7_HVcp;EA81<;4$Td%Ib#^Pb%I~4#Ct~V^uQW}&BCvUgZ?ZOMg
z@W!97J%;OFHoZ9%f7Z;wP}iV5bEpomTg|}l(PcPijNFhPh299oqeerN3LVe4ePBYm
zmvM7u1k*Pq0an(B-twY_lf>g7&>j^1`{|`A3?L&Mg?~V!L0XLKxk)H0%mQH<7XTAY
z6@n+u1n@Qv#%3gHtWAgs@UQGYfDnL6B8nuS5CCq+xSnMoh&b8Gl>sn&-@cr39^L&e
zRpE$ub>D*7`LE2bh#P^dkq*WpQ3!=TJ>or{4{(324^Lm4uzAN8j)LDeOv2LgUjRTe
zvS)%ZD}M^~+YcR#9KV+p0w@>V8vnt9((F-ULeh!%{G$c;X513asDi=(q(4OQdc*CA
z=Ij6>PJDaM^u)0QE4AfGhN385e|HHgw|)dZB8*mhe*sqKeLz+TmIj~;6N>K~<UsEY
zpuF(Qn}4!rLH4`@%hUdH<rN@lfGEUT(QmnG%~Cw127MRmq-B#4mja+6aEu_Ug?31|
z1t29Z4G=(}QKu&rVPyasgdE{i#f1TQ2iBzdQ!PW)BYDy@l3@M-<?2FU17J7?00000
LNkvXXu0mjfF~(4<

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_syndicate.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_syndicate.png
index c8424057d020c4eb817f2fce1561f02e4ec84538..6b39694e7a7070144b2e2d2c2ed902a1b6bf1ab0 100644
GIT binary patch
delta 378
zcmV-=0fqj#1d0QY8Gi!+002a!ipBr{069=hR7I4Olsz^yO-f2<V`9CpjDLA})XlRl
zCL@VqK6Dcn#9%~kG#yO|9IH1s8U+!MB_?1F8Sdlbx~{Bc_Zt@g0004WQchC<K<3zH
z00030Nkl<ZIE{UiTNZ;L3`BWoX{<zG|BLMe0j<W)M;w_eLVq|IV~n+?%Q-jvF>JlH
zleNxG&d(mz)pvgY^Xy-~m6IJn@F7egv@)y@1Au#rc?;WZ9qyv#vp}_UOXj3Cnn)yt
zsoV7j*kVeFBSQ%}rMO)H$q{lZlvIE!RS_K+gaWh(f8TSu0_Tq*;u}zjoJ+|pxdMRT
zj7MR~HGm1>{&Rc)@O8;K?^d5dlpkln8p^*l$S&}UQsA^*P)ef{r1SwfiCRPNovh6{
zPD43O8q+7`u!P_r;*txo$uYHdY_}W)khTxR_k19aG46pA1hES`fSUpY@l#%r@Gn;N
Y1)&HU!*I$j%K!iX07*qoM6N<$f)*2>QUCw|

delta 555
zcmV+`0@VGA1Gxl{8Gi-<0047(dh`GQ00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z00GHKL_t(oN4=LzP69y?h6fA}AHfwnj5l%TF}#8Y@EBgfW4QAsMt1CoQ6ABeZ|EXT
z+mEUN{gTcU(3$_|uj(Om>bkB<OeT}^rU=vNwByPozYL_r=700Kt8|P;BUkMcnu;cX
ziP>z{)PupGx!!cT)pf7m)FocmtLmlxZtCT7*<8otaWs)+3pT>_?eKIbdez$+(ek$5
z3S;JZ@rjXWJCX)A5!QG8;hymO*V<KiE>3!`+8TLUEok9k1`vN-d^B~5`{CKnM9Dzc
zU9(ukfxX(aRDTKh2KaV4{C%WwlmxhuFU;%M5+2Sk_g?2v831nR_cn&?v0yp{kei2?
z!PYI{0m2#fDGg(6__&8WjAA4cfYMQn#qB3h`u3on0SJ36W_Vwg6_WvonFwRIU^W29
zG||cc9Lq%3K<XsOf}Dxc34rV=fYc*71%^mRa{}O?Q-2U5;ug#aAmGRBBcJ_A0usLn
z#FoEDOVNM~qThQ2VoPAJW&oks0-z19G*OBl)Gc5Rv{?445`fgtbBK2M1hoMW6A&6f
z7%bvoG5|6UVay1FMI6iqgm5se!h-2Z=!4+K1V&nmgDQc4{dX+16-^O0Q&m49Yl_}P
tbvIG~03-koWmrjOO-%qQ00008000000002eQ<DGy002ovPDHLkV1iGk_=x}j

diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/meta.json b/Resources/Textures/Structures/Decoration/banner.rsi/meta.json
index 2de33ea029..2df45b016c 100644
--- a/Resources/Textures/Structures/Decoration/banner.rsi/meta.json
+++ b/Resources/Textures/Structures/Decoration/banner.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/commit/fa9e44d937026d5a2ba72615afccf2f18a87c485 | banner_syndicate sprited by mureixlol (Discord)",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise // banner_revolution, banner-red, banner-blue, banner-yellow, banner-green Taken from https://github.com/tgstation/tgstation/commit/fa9e44d937026d5a2ba72615afccf2f18a87c485",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png b/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png
index 6518b7245c721677990edb252828d4ce34c776f5..1a84e526a4a780111960391cd8356bf513b5f17f 100644
GIT binary patch
delta 162
zcmdnUw25(oL_G^L0|P^2NcwRg#UJ1k;(Fk~0RsaAXJ=;%3kzRgUmiKR%Rni{k|4ie
z28U-i(tw;mPZ!4!jfu$uEsSg$0Zk04&NCQ7;yCmYco@67Rxr7>WiXw}U~)Ug!6>d!
z5acGraC2po-hwAKlUM@w^b0yjICj`hFkH;2xyWFVv`~1;;mOPl@A`Git&-N=1e(s^
M>FVdQ&MBb@0K5S)Jpcdz

delta 290
zcmV+-0p0$x0kHy*7=H)`0001UdV2H#0004VQb$4nuFf3k0002%Nkl<ZScUDEF$#n*
z5Ji79onT=vcnZPZVos1ldIE1C<QmgkSPR)=VM#_;SV)A$d`J_<yvLA$qx!yg@M5i1
zNEpe}UDpK#*4mVONS<cqq(B+TE6TEjzl<^N%ePS?d4*C6{(oX-5K%G-$<tL;1qJgw
zD*!OYxM`ZAUr5Q*`@WwRrho&0<P|9(zvNj0!!R5!_iX}1<l449?CU$={)-yNG3dfA
z9k_Z?&$@(JAPZ!HERY4Vz<&wE98j*#Qt}U_X&P+X_L&c2g@{~T*I3sz*gtfDnWMvj
o_rP;DhaLo$WgAI0o}Zol0zPa_Oj}ekF#rGn07*qoM6N<$f?(@?ivR!s

diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png b/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png
index b68b06f10df2173eed99cb28d5f2e1b887e0b5f8..0f60f5243cc68934e4abaaa02445eb6b1b36b864 100644
GIT binary patch
delta 99
zcmZ3@SUN!>mWi2xfq_qCQaX_03GfMVH83!6c6PR~u<-Tu)m`y&Ay8b!)5S4FVrp_i
zLt}tO1GmANCZ?L6{{amb>^vk2+65nT-)UrEI59QLQE#eD4NyIUr>mdKI;Vst07cCm
A)&Kwi

delta 154
zcmXS2%{W1#o`a2nfuXpn>I;x!EDmyaVpw-h<|UAm>gnPb64Cnh`bJ&`MFHl6yN^qn
zDg?6ro!;cao1(C<$M+3eS<rKd$E+4#@13m6SbLPoOH)U|IMQM5RMt7g0SDTz@fsXp
zVCDf69UPuXjMe#KALOcdoxjJ4U5H9%EcO%mz$~)OR`}<eZk{(l8yP%Z{an^LB{Ts5
DHflDO

diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png b/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png
index 0bb895b050f0d11e75d4ceed4e62cdac855c6d56..9dd42badabf989bf60e5806b1583651ff77a9a75 100644
GIT binary patch
delta 549
zcmV+=0^0qA1hWK?8Gi!+007eJf;<2K00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000kAOjJcMFfc<yLpV4%O-)Sz003}GjTZm_00neXPE-H?|Nj8{whmJO000SaNLh0L
z01m?d01m?e$8V@)0004;Nkl<ZSV!%a$#TRX3`D`?|GzmcXn#B`T3ksvm+&rAqi(Cc
z$cA+Dr9(B=4M)nA>#`a=(`^UCv)SO8ZadN?<dm%jk95aT1CZ`Eh;+{(0doJm29fSM
z5CGL}5b3@HQzRC<L8O=BJ5q@ngeTxTQZ7M*NJoO_H~}Z%1e^eH0)GFwjvM%TxZu3L
zWH#Mx5b3VtPk**8(4#Yq0-TMPzwzsaNO!i5m}7u@$im7q-F7e^u&_e)=iB!kDul%a
zihu<hUSVguQr1T%kGx1GaIS36iuIAnlQ2LgaJDhM*{6-d!0f>voT!dC=Kv&z0gDHJ
zP*SPRDM0R76tH?EKu>7SF+gllz~-p|S^}M^bmW;U0e@5*il+r&l4v2f^E0N#!a%j5
zczOU@j@-`SJ<yjnie&dNVCnyHo`4f@0!{$<PXTXzuDL+Gx8TSxk=ho}q?^st0&2S%
zI>!L1MFE?q1}Ocza|%E$3|Ku9p!TP84tQhZwSZI}Nmw75JmJ=nW7WZZ<B^2*k;x-Z
nzywYO9v(?pT%ZV8Fi7bejMP07*0+Lm00000NkvXXu0mjf&!Oyp

literal 516
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTN?DaPU;cPEB*=VV?2+50?Q978JR
zyq#^h%E?f`wf6qYnC1ssck0!5a2+(gp&7O3o4U%(lQK--w=|_cXlT8YbN%(#YK?;Z
z_qSh4x4j~x+jH;X*S>ofA8$SVG)Q<`o&VHXi(4;R@40u;x@yn28awv$nd*l(uDafL
z{PB_CG9#JQRk^pF>YlAmu?YKm>t)HTic@}V$)W4_-hbb@{0&I(pYI-LlLZV0Tnvke
zB$CsnDb9QsaW#AW_3THQ){=dpd%yi{JE#6%6=bp9{PR$Y-`3cP+wZxXC-_|^t53}B
z{f8>|_b)!)di+tsX8By6<E!rFrZ~snI_duYV|Ct%68E55`G7@RCimZa{Qb^^mwhT<
zY8kd3Uw&84={|cvb<M4}iZ}(n<ZJXW9nfGPmhgG;n<1;;f46PRKK=#Yer&nzj3Mx~
x)}ix~pIue|{bJ{3){`!LXS^aezpVNPWBJ~-1%;u`6M@mn;OXk;vd$@?2>>uX>B0a2

diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json b/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
index 7e8135f216..c1f0d5e09e 100644
--- a/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
@@ -24,12 +24,12 @@
             "directions": 1,
             "delays": [
                 [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
                 ]
             ]
         },
@@ -47,12 +47,12 @@
             "directions": 1,
             "delays": [
                 [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
                 ]
             ]
         }
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/open.png b/Resources/Textures/Structures/Doors/secret_door.rsi/open.png
index 81862e1eade5b452853842c8baaa21f5413914aa..5f78166d8cf2fe85d2e0d67e1e230415c0af7893 100644
GIT binary patch
delta 154
zcmcc3xQcOtL_G^L0|P^2NcwRg#UJ1k;(Fk~0RsaAXJ=;%3kzRgUmiKR%Rni{k|4ie
z28U-i(tsRKPZ!4!jfu$uEKH1SDhrk@N$F8y2wBjhl#r97(xSGYM=c?x2ShCZQV&}6
z78q?}H8{kq%wfnZsVsFtnM+w~qpO)$5d%Y^aIwf*Y4I3yps5U=u6{1-oD!M<e{d|U

delta 203
zcmZ3*c$;y8L_G%^0|P^GRn-?D#aJBV?!>U}oXkrgXR4=*V@O2n+lz)=&58mofxVY2
z+vIIpzrSy>ZG9m5M&$A_&!Bf<)^nBi@b_%JCTypsWT??+J0)lxyV9bU?B5KI1+Z4W
zQCylLbwDmD<nO2T8{6k>&Sa>L$eziz;k(h*`ZLTn2bgVKfEbJz4oK}eU+j08;akDE
zpPxh0-z2`z1!|r5e5YPi_A16V3%{@9`gEh3S>&(Ynl|UXZ9o??c)I$ztaD0e0sx<!
BR;2&{

diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png b/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png
index 9d14324686769b131f947fdce1c02423f2cd3823..127a10b53db82bb11412258d04c105339669665d 100644
GIT binary patch
delta 568
zcmV-80>}N51jYoA8Gi!+007eJf;<2K00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000kAOjJcMFfcecI7352O-)Sz005htS1JGi00neXPE-H?|Nj8{whmJO000SaNLh0L
z01m<c01m<d6(~x800056Nkl<ZSV!%a!FGc%3<M$J|G&8_dw<Ns*pex<IkcWrvLmr1
zrGe!h+YZ421T4$CzFgLI;nfkPYzwkN<qQ?PXzuV@c~PO1Z9!J3oS{gegOont8B5s~
zgit%f3Rb5<XVWQ2DcgcHb8<#1=r`E+*%suKZ9$wkJ0lnL8Z2rHNZA%SPBhM-Kv&Yc
z!mfuj&il-svVScwU1#hC8aVPU<Gj!8Dcb_mbw(*T9bfZ|^A<|Vwm^v18M9y(%z{}U
z5aO>F{QA$e1}c8~hLdECMYJCvWn1Jp(KsU)bdI0Gwt$pvL7X@{BNcRyZ}XjkoU$!Q
zGtOg+b9~MB3cmf|rO-uZ)IllRf~-(E;{y-Bw_sZk9DhInVS=az=hzFLkJf%Ri0#-@
z-}&o6Y%h5C`hwVwJq0?0puo3dp9}0e^a}zz_NhP<K|y54UO&fn4frFm9eZ7-&Yc2c
zJNEW}(7)F~Y{z~U%z{}k3&g)Dc=mHWEO>gu8Qu>}+l)8z_?Bq}HscpWcI-d&*rJ)J
z;L(FuK{01RR1@0^UjGLPeUC&nu^sz-0vVzj+|9@LZTkYbqCGG~gOK_F0000<MNUMn
GLSTYbN%zqJ

literal 530
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTN?DaPU;cPEB*=VV?2*=Iam978JR
zyq#^>b=ZN&^=a>}IR_^M|M)jI(J%3X<Rwd$w`pa}l9eX$P5-UJKObopahx?RwbIMU
zOY`#k_Y;e+<j*g>aQkgp6o;ec)3?=6WWL@`mnpgbeX^Bdhe7*MNB!yD&8I4q&LkFI
z$o%#FxsI&hvkew6zE+h6Ncy)}>hM*`v_s{86n;?PHDHinV>rx^Ai==H+>pp%z{AkS
zcmTKH;#FN`FPy;U?7uG?a!fdpue;f9zGk@de*rL4j-P$%N0%9gA1(N7W4+?X=5?=c
ze?MXQYWsPM7u#~xOOrsV4qw@H`Cq2~zGdIn{oDTj+qVt-Za=zMBL4wR=wXq(Kw@~j
zN_+e1T8Ea{+KDo9dfyoZ%f7l6RqVLK?sDU*_{oQGMeP51S&8=tSY;0}=DJ_5J+OT5
qk6HJ2|GK~L_U*&J^12c3(Vtkmw&2XHnTvsu%;4$j=d#Wzp$P!4QQz+X

diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json b/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json
index 1f7049dfbe..5afc1b2b0f 100644
--- a/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/furniture.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/d5cb4288ec5f7cb9fb5b6f6e798f4c64cd82cd09, Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/9d7ff729b6b89eee0b3d750327f9fbaff4aeb045",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d5cb4288ec5f7cb9fb5b6f6e798f4c64cd82cd09, Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/9d7ff729b6b89eee0b3d750327f9fbaff4aeb045, Taken from https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
@@ -29,4 +29,4 @@
       "name": "dresser"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png b/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png
index b299cc49e140de7eae0de01b3e0b2c6d04584a05..cb146b54125b44ae7c57278775f21a49b40f9045 100644
GIT binary patch
delta 299
zcmV+`0o4Bb0lNZ_8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~008YtL_t(|
zob8q|3&JoEg-`G|SgV7(U{Me^2cbXN)yYkiii?YjL#-(e{)5PYf}xl8VvH@Aw-gTg
z-Us(W(uSJl0X%>QXdb|PHkB>|*PCri3xMInQ3OHIaS|>>j(;Ed4xs>K=M)xk49Wfg
zy|7y_xMWvWknZ2fID*wORpw*|?zbFlM1kr&wI#HL;Hm(Cd%`ui(6a;O09Zhm9jF9A
z`40FF{C5XXt~$U5pvv+MQI{Nf3S5bG3Vtmk0GngT2H=L2$;6|1D>&{F2nT&-hA*X0
x#PLx8P9l4~)g+{5ZmLQjas?KF#y+)o-~s27g>AAvL-hav002ovPDHLkV1flUeD?qV

delta 233
zcmV<F02cqd0{Q`v8Gi!+002a!ipBr{05DKYR7I4Ol%}SpjEsz2TwJQEs>H;^h=_=p
znVD{GZb(Q-P*6}nKtMAyGgVbpi;IgbEiLbAP}=|i00DGTPE!Ct=GbNc004MNL_t(I
zjn$Gt4uBvG1i?bFfcXF4iX}=l0ym@6(`Gl!1*JZO9%kLmYGTUQ$p9vwgmdk!v1n1k
z8EWtLlW?Bl=!x=^B;kx@0me5J0V5B5QxW1w5r3wjn}Ti%hwh@_EESJb#dGgYMRR~}
j4VIMV7Hj#j9n=eK@vIN;nsJPK00000NkvXXu0mjf5`1IE

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o0.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o0.png
index 5eefb01db6a9d02c26a92a0504afb413f4dd4dc9..2cf968a8c32f2cfbd9b8e88a4e2e1ecb31796958 100644
GIT binary patch
delta 124
zcmX@gJ%e$Aaw!92age(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sDEfH31!
zZ9ZwBpsuHjV@QVc+vAR03<^BV8y@}t|3;+jyN-8;CNEGL2==_4e0yJf)LsT=RaUKB
V=KpIx?sNl*d%F6$taD0e0szPtCOrTE

delta 1460
zcmV;l1xxyv0mTcDBYy*bdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U-_<lHN85
z{a>f(5ex`{j-#J5y+MxOhwX3o+s!7~r0GnjQ)_HwgaE&XvD5nU=T3j%AXQFT%}Xui
zz>#aN+%WOuI_i0)BcIpv$oCTN-{=!R78ojll<U^oZQr2R*MAL<7}VeDliw@sx1)RE
z;ZP!SM4Qh^LeH0;?i5p9*Q8Xp=T!Th>Ucbhzn+B-yPaKoai5+Q*?`hi1QO;YB*%I6
z%SPf9X`w%_9CnZm_mm(+9?uFu-aOtz9>+64Z$N&`(tGs%8{l)hE#w`R<;Dn;4;M&3
z2LFWkDX_d`#D8xWW_vA__aN^*eeZQWUCRZCmb;>k^gt)}z_0^yIky!I!>O3tIVy%9
z?HHhZ9^>d3gDNr5--$9!YP4yca?n7EnHL)*^8hWOb1|+wf*;8-XtPO`DGufauLRDr
z@JlXq#;s?(L5|3iV9Eq%ApF}SeQ)t+M%sG>L=<59g?|<D;wVw15zNIER-l0P&6}P8
zKgLb}@l;qSRdA*!%#H_aN55QjrPtb$lV^dQLS7tGvUxiIM2M|Oh6D`Y1rnuri<pfF
zI64Sw$ebl}2LsWCCX(bVQaBkqM{MjdI&E3GaH!FnK!i#W12<I~$jVt!Kb9Re)KoO9
zYEe^9T7R__DY<AV#Y!}}W@6dYikZ1pYc8H$y|}r1^;WqGdZ5-)t$MAsHBJqI8hka_
zH)uL{>A7n!-MaVM+d%n@Jam*{!$%!$@|1}-G0U{+v(C0CEp&>Nm#(sG`KqgJ)Y_Jv
zx9+lS`>wmauy(Wh)%Xe4=w^*irozr%Sc5j1J%3zKv=a@^z!+x&;}#4=2Mf*)r<^&M
z3(k%jT}~NEYH*V#1!JHvFJj&F!rd!#pW-d4e~LH$5pyZ1`yI?BQ1>-&AFwv#J2y_o
zuD38SJp^wb)|a=$-r}Ry{;vEFI$E`(9q*0GW}vmt&R?5vGTWoq=yyBRMcdNd#$Is;
zet-J1&Al#&!l4@|zg?1>Y>>I<S~^c-nZ8OnW3DFX_w7vJ_`Xa(GWe|g-_gI#5sGdv
zB8uW@h8h{JXH``-G`A@zy~H~A&P!sUlI`6I6*%(lhCbnYpasmlO;C1g^c@yiqVmY<
zg#TU9HAL{AP59MT{ET?a;wSZ&Wct;O|9_+-V2JlM{RN*|*XW@>Srz~Q0fuQqLr_UW
zLm+T+Z)Rz1WdHzpoPCi!NW)MRg-=sODJ>3m5OK&*#lfPeh@(`o2o_3Pp;ZTym;OPM
zh9t$sQE)9d__J7baB<ev!Br3he?VMaoD^N8#QTy$ix@9F-p6_O9NxPR5E>Pxntxpr
zfT~$WDjpNFxmB^}6#<0c!#GAIX6lLbVg{b|bx)mCcTt|@-S=mOl)T9RpGZ8%bi*Rv
zAfDN@bk6(4VOEk9;&b9LgDyz?$aUG}H_k<e1)do;GO2muFtJ$dV7Y@?$xw->i6e@t
zQNECMS>e3JS*_Gq>z@3D!MwJT=6^b^A;htS1d<RTqlPjnun?tPBgI6D&SM__LC2pY
zmrSlQ7&#VDg$l{>ga5(r*_wr^NjE7N1G-;q`(qgB*#(+)+x|Yb?dA#Ke+I6!w!hi{
zW<N=<x3$O-(6<d-T(>oO54hX`2A*`ukQ~WRODGh8_cQvY9MFFY1lHWSwSUfW`T%5T
zR?9cQ!67hGr0jK%clUPA?cbi({C)tY_;S3yUE(hQ000JJOGiWi{{a60|De66lK=n!
z32;bRa{vGi!T<mc!T}X1N`L?W00(qQO+^Ri3Jn4QBw5oy7ytkOHAzH4RA}Dq*Rc%%
zAPfV+i2ZkV8U{e3g4{`-z%A8R0RX_U?EPT56952!t3*y7tYkS1Fj)h;$OZp2He><-
O0000<MNUMnLSTYq2)$7N

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o1.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o1.png
index 1902bbd8b96f0cc2ef2b28c27b2314a8cb4c3697..3d461d6029650ba8334fd73fb19b4c4059a7aaa5 100644
GIT binary patch
delta 121
zcmZqYp2|2uxrl+WILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DinK$vl=
zHlH+5P|MTBF(ktM?eT-03<^BV2Oj*hj&Ai^&|mk?gM$+&Z~yIN?tS&u;%zFd3Okwq
Ua|%yy1d1|vy85}Sb4q9e06&Z*mH+?%

delta 1397
zcmV-*1&aEW0f!5aBYy)=dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U=KHlH@21
zMgLjFECERf!E$&;^bUIYbHQX*W>xj0y60;mP1wQ$B%y<`?Z)?S)BS^kJ+TXFDdreG
zj*vs<f=cq&k@uB+*w=mVX~O-J-rXBu)(fOuw^mO70=>QsxPSSe`mA^9v~W6xPQ%Th
zEYHhZe+&|OzVsB1p**fi%*h@@ttZrWI_^-;8Ohr*c8$fodsGBNmb$``Fb^T|`<kvk
zvQCk*^!v)IA7oiA4uZv>NRW`H>D{FFj|qB8@~!6HXa8P%mwYZqFYj_0PmWOew1M>V
z<nI(eIF@@v{D0g~^k(W~lIQGc&T-AIgoupBv!cAaWoL~+$BLB89u`pyr=o7VWR&EK
zZ$RFC^A)90CPwzBqd=VsO&VJ^Y6vm#V1s0Cz_N5nj59azAqlI{WRomi5@0nR4nTwO
zJr>%2^Y+&$!E+~cWr8sP|8a3YYy3)abGDTt^68!{#DB$Wi6V?eZe7s}KxiIrx)XdW
z2fu$<KUk_Ds5{LG6D+=7CaTig+LFy#&`%++M~IyDV*n|FZ$&U9Ab<x*l-5(kY(&Uo
z0-%D(SpruOAXV-Nl7mQOXPkKX#u%gBmz5(gHTEWeP>Et-lcfMw2#WP%Az=*_6%DEy
z)igQHT7RO%5H-eVacy$N#Db|sGfS4OBuOD@ipf$+IhD*=um@_6*>cJ`m%^^VQGu<3
z{so%KRcfeOW3`%UuBBo5w9vH0W-YbcO6M*e+eDAudg{5CL2h8D7-8s$!$ul;l!>)A
zWrnFUPMc}wS?<&h)eq$h)aX#-O=|VCJ2hyX*?-Lht?fh?GZ5oIAa0Am+QAkxpC|-g
z<Q6lZ*Dj}wAa${Eofa`541-uF-Pyg7`z>xx({FL(Uy*YQ-G4#O0o_M#pHS=TJ=Zp|
z>nU70^@67l?IRV(sjQb;`CIui^fL4^^fL4^^fL4&XK00MYjfaZYK%E#?hn6N@u{sM
zbARNyG$YjYC5x|-Xh8|Te<fOzw5sdR>C4jn*+3dO!+Fk~@M5(Y&Dpd%{R%R%^=7jS
zTX$j2g(LnLdbnnc$xi&!m3`;mOZTIOugd?CA!KlN{3*MC0l68sNgs__8~^|ThG|1X
zP)S2WAaHVTW@&6?004NLeUUv#!%!53Pk&QIDJ>3m5OK&*#lfPeh@(`o2o_3Pp;ZTy
zm;OPMh9t$sQE)9d__J7baB<ev!Br3he?VMaoD^N8#QTy$ix@9F-p6_O9NxPR5E>Px
znq3oss#!)V9uu><Rk7z40fgYgI7TIA>WTDX2A=hGPn}eEQJ&@9_h*HayvYEcNPj%X
zbi*RvAfDN@bk6(4VOEk9;&b9LgDyz?$aUG}H_k<e1)do;GO2muFtJ$dV7Y@?$xw->
zi6e@tQNECMS>e3JS*_Gq>z@3D!MwJT<~pq*#Ib|~k`N)IhB7L!5T#us#YBqEV;=rN
z$DbsZOs+B*ITlcb3d!+<|H1Fsntz3<NjE7N1G-;q`(qgB*#(+)+x|Yb?dA#Ke+I6!
zw!hi{W<N=<x3$O-(6<d-T(>oO54hX`2A*`ukQ~WRODGh8_cQvY9MFFY1lHWSwa#(+
z0Ay%Z%QwKmAuv*;>~)WK_jb<h-=5a|egLNUa=gA>;x7OI00v@9M??Vs0B-*P|De66
zlK=n!32;bRa{vGi!T<mc!T}X1N`L?W00(qQO+^Ri3Jn4R7P=`yTL1t6CrLy>R9M69
z&@mCfFaX3bU-@(XVCb4iyB8M#0KhF)TkUW6S;zAZ^Y#P(4RC_P00000NkvXXu0mjf
Dquig`

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o2.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o2.png
index 57a1eaa3abf69de8e86ed2770586422210073bd3..ef543a5e09e2dbc409b7e40bace45555c2417234 100644
GIT binary patch
delta 123
zcmaFPHJx#SatQ-tage(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sDEfH31!
zZ9ZwBppK`DV@QPi+v6KK84P%s9Vh;M?)zHc1B>6pXMA!CfeQBAn7Zq$Y~<bp>L(eq
XSFpZjyZL?#P?*8f)z4*}Q$iB}`=uz<

delta 1365
zcmV-b1*-a&0p|*kBYy)edQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U=H2lH@21
zh4-9dj({YD#BunI=o`%O=V3duGOMa*s=I43i!@<_g)HRv0d|;w|5)KK92{c|NzHS~
z8SR)#DqPX<cpl}rQcTD7IQZ(q{gXZ1I~XQGE$6M(%fG^|Z+{Qm#-R3W4}SHqUxBWU
zTR_<(@6pC%lCbk>r*s7>^K9he_LyqBQtg-Hk;-*uigpD%pT&K6G$eycLotvrPa%oN
z)lVPUr%2uQ<H~$mtEhNDC6cd9Ajs3}-Rc-01$q+s)(Y>{zqj6r&-Jp)J1z625gMO%
zkbW-yA@Re&a(~Z=pF2vuh59J+TEo|x=iAkkp=iElR17zD_A_v7kX(+(GK%3;wCyMb
z#bb>f$Vcq4p>!(5P=5tVG^o;|dDNXcQcOJAP&0Ry!{%aKxPuW%+JzRI6dB?m*Lemo
zOTzbD=oq&g<8^Y3JP58#2nOIkFX7)hf2D-A`j&{I-+#42Uc9F$(%9to6<z>B>*A(|
zz_)VYj}P+)QxydDklFEqHMTQEQ+k_Qa&Q*-De7|xQLu3ZfJ7Kukqik4U;&BJUPa7C
z1RWiKDl%tD+(3X-c_2wnSQ;FRo%h&y#^~^6<;>fRy$K*xvKZJDseqM|V*Xfi%%Q5H
zNma9&dVkQOHA_xebIz9cCRa@?nOZh8w_?@BldESpcQ0NG7r`E=B^N7RN~x7Y#XuFY
zD*P)fjhnR8wB=^aTWPgp`t;Pb=WgA5>2>gsfo)>sVZ%ombyAqvDQ22F^R(%+%(^hw
zmaMdN<z>rPS@llsqWYoy0yVm*@j+_)*_|4!!GG))g7$Wzn;D34A`rJtVDDg?S#(N?
zH@VF$mc7d<BT3zC!k|qI2-76iMR#^@<i5l$sDFtY{};Ki(R~NG0CXR@eL`*Q?_58K
zovUzb8U?El{nKk;ulu7`|FnJudIfp~dIfp~`u_x44PS=3+}6^LU)$1c%{2B`p|sT~
zEPs*7ar<+d6W@v7%qsl$>)cXwJ`%-0WQ;0;Tz3oEwq1`#$TzRA=Ni68>Q|ue3bZim
zO85s+y0=6m^+8Jj00D++LqkwWLqi~Na&Km7Y-Iodc$|HaJxIe)6opSyMJX)~b`WvM
zP{qNbsEDIfu?QAQTcK44lb8NMlZGV4#eY$7EjakISaoo5*44pP5CnffTwR<LU8KbO
zl0u6ZFFfAIdG{RNyAKc=6{eb96M(8&Mk*c?v$<8V=M@2j;KMjZC1&c0^kN2{^>t63
zRCiIH<=yvZg_OL>0G~)a$8^IY-XNaYv~<q<#9>yF6ykH@F@r8h{K$3L<u}enhkpg0
z88$MhdEzj!SnOcAgIUQ?iKmGpimFk*kabz%yv13q)L84D{Dr~1wvy&Lts%s*ganch
zA)|&eDzFfxT_eRriq2ym{z1o|B$rICG8j1)P=yM~@q_=t@7bD#sYy2}7z4UrZ2Myv
z=-CCDb=&?vw(aH#;C}|Lw6?$60DopbNw2rH$Pv)D4P0EeHF*!X+yMrjbjgq$$xllt
z6oB_L`lcMve+vZG+_|;RaryvcXjaQNz`-FfQl#v4k9YTW&h6ix*8F||rucHazFp!k
z00006VoOIv0RI600RN!9r;`8x010qNS#tmY4#EHc4#EKyC`y0;000McNlr~g2j>b6
z0XiiRAR+Gn001dTL_t(o!|l+a5dbg@12JFspEuN<p|p|slTQEufL~10Y5Lk7>tMYL
XAKwM*NnS>*00000NkvXXu0mjfl>e4G

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o3.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o3.png
index 3522af81e5c10f2a19cf15e3bd4f3d47b42b13e1..4e1dc10c29ad7d0b38db1cb30eddbb1734ca537e 100644
GIT binary patch
delta 120
zcmeC>p29dmxsZXeILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DinK$vl=
zHlH+5P}9@JF(ktM?a_^#3<f+b8`WLE-M`T`fj4Hy#0NWo@;z79UO(`YeVPhykUI-^
TT(fx<P>{jX)z4*}Q$iB}ND3u;

delta 1403
zcmV->1%&#P0gVfgBYy)^dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U-_tlH4c^
z{m&_K1SBCOj)VEA+8gBfd0=->_sr~WCdr>vwJ9SkK$71BK^Wivnc*8Aj+8@E^IUR{
zcv4A)D;gfpr|g<y+Vy_;>caPvKHNKCHVUMipH{E&6?%P}aDVeb$Fn~8)x&-nx;kzK
zWqDrS`eTsL^QotF87kv!<l^=i>T!kIu7Nw0>&+DHGIq|zcX(7J14>=tNSKF^#9jM2
zM%F7*mwwmGr?!fU1qeJ>Bmm^;_ii%AM}VF{zO}-8^zW^A;B&q7@(#;<VT8t~9i*Rw
zzaf5bEcb}`xqqY9o2ic=&)I#>asFLR8Hna<Ma6JKXU)OD1CYy}mQf6^qHVhr6puAF
zP~KyU2TG$t4D@H9M4c*48e2AM2r=<sgJf<jTjye2xPc>*v<gi&DbmHkT;mZySrWd-
zLfdcI{u((vcfwF67z5$|Uc!HMex-yt+k%Lq-?2hmynmJ`!dT3$8lyl6&5JkP0N=_*
ze|%U!SgK%9H_VP7tnoNa97=C%OE%AfaSC~EAqv(n1Aqv=6~T~z0c;>qTDyqZh=8Mm
zpo+*@5+7iIRJkKaP9m9uvGekcIYxUdD`#G6<R%cIlEuJHkqWX>Qmh|Kjx|(OG^uJ<
zQx96SW`D^kYtGs7N^;f2lBs1gb1PO|Jh^&ybNAx4a1rD{ExB0nQcA5HDjZeVsu*9P
zIrxwx9eU)$4nN9K8<tN?O<Qi(yp>ivcj-tIJ$LKgORs~%K&BXJ=*Yu{k231STAMP{
z)S0JEpJmoNYZt2@$`@Fpi#6U%t#Ni|4ccIKGk-xVo#^5WjBz3`Zi|7H!4_xHDJ5Ra
zEzV+DSxy;2>f$DJT8x3hG>CQ5ox3;Yeu}rC{!_g1|1lR9b$^1n0O~&S_6ci!opWt7
zcJ9K3X%y@}^bfCry{<#8{;qr(dKr2ddKr2dy2*(okGkOCQ@1%n>2t_jsTcQ52(7Cg
zrGMepnfhw?TBf8<Nl9mNq<Y+0@PU)@L5BB=UzML4qKUHz?pGYB5qQOM(xuHNxE&YV
z4p!8)F6CJ5R)WoW<hXvFk5S^popgWr7iI8YocJ>IcN@aKn7G#b0L{s}8Y_rtAOHXX
zhG|1XP)S2WAaHVTW@&6?004NLeUUv#!+%f|g-=sODJ>3m5OK&*#lfPeh@(`o2o_3P
zp;ZTym;OPMh9t$sQE)9d__J7baB<ev!Br3he?VMaoD^N8#QTy$ix@9F-p6_O9NxPR
z5E>Pxnq3oss#!)V9uu><Rk7z40fgYgI7TIA>WTDX2A=hGPn}eEQJ&@9_h*Hayno36
zpGZ8%bi*RvAfDN@bk6(4VOEk9;&b9LgDyz?$aUG}H_k<e1)do;GO2muFtJ$dV7Y@?
z$xw->i6e@tQNECMS>e3JS*_Gq>z@3D!MwJT<~pq*#Ib|~k`N)IhB7L!5T#us#YBqE
zV;=rN$DbsZOs+B*ITlcb3d!+<|9`>n*_wr^NjE7N1G-;q`(qgB*#(+)+x|Yb?dA#K
ze+I6!w!hi{W<N=<x3$O-(6<d-T(>oO54hX`2A*`ukQ~WRODGh8_cQvY9MFFY1lHWS
zwa#(+0Ay%Z%QwKmAuv*;>~)WK_jb<h-=5a|egLNUa=gA>;x7OI00v@9M|4C0{{a60
z|De66lK=n!32;bRa{vGi!T<mc!T}X1N`L?W00(qQO+^Ri3Jn1{BBg2Pj{pDwDM>^@
zR9M69(4i3kFbo4RUqSZY*qx!Yk@%BO007_{ou<>*>^KLkcL6<L1PkH9+miqQ002ov
JPDHLkV1j+5orM4Z

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-tank.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-tank.png
index 4d5049f7b4ee366690c43580e5345c5caa549154..a48466d3b462354bb8d7f28dae9603ddf3c18d08 100644
GIT binary patch
delta 171
zcmbO(aEx(+ay<iQfk$L90|Va?5N4dJ%_q&kz)<1o;uumf=k2A9oDBv7tq;{X#5Q_A
z7x;GWiOMbO$$On|EcIURCcyO4rT6InS*IsH+Sj5z)e@)=4m=o&*Xv%%3ljWZxNdhi
z!?7zt$y<5!B-fnsT5ZkuZ{^QlANg9Yr!mh_x&Oyk$ie#8aj`dI4_-6eV7#6wFp2X6
Q<7SXap00i_>zopr0Do3PQ~&?~

delta 2059
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

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
index 134c51bccb01fbcd4dcbb68fd1b7df8a6fafc0e5..184b880112456783ade0ac30e388a765b3be6d39 100644
GIT binary patch
literal 3159
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

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

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
index e40e276e04035dd21310865827ea52c80f704fde..420179558caf0cee76290b04e72a8cd0185b7e96 100644
GIT binary patch
literal 3131
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
VU&TB4t!V%N002ovPDHLkV1h7j^?CpR

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

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
index a3cac04acb3b5f649436c9c04811396ee7ab9eb9..9da9ba51a1082d003b680705880d16d83503ef75 100644
GIT binary patch
delta 969
zcmV;)12+7_72XGsBYyx1a7bBm000ie000ie0hKEb8vp<UkV!;ARCt{2S6gcnK@|RG
zvq_q^Thn@NixqE(T0v2tq=*;r3X0&1BKV{zh=`B=48cpEMD2@$Pa^uD;uS@_VKtOm
z5EWaYme^dompPu<xZ5P%*otlR!7mBBv-8dQzL`C<XQN|^V1IRW3*i8y0RqH7K57Em
zzIH0+O}YW+Vz;1>(&KMPLMS;Q)PaZu?5?-a_b>NNR5V~-dLu-LBM~7rFeIe3;h2P3
zr#4ED^L$UIFdA!6+dM<Wj3^pg=a7Wo&9MbLfHtZ_BP3~JD-b!bqL@fQoYmJ3QH6fh
zHjC#|NoUG(V1J_cZ@@Re*{N}MN>mxXfxjW{8{pZC;=NgQ18T3^UEMYM{`P#;4Oo{G
zf;7i{T0Yu);bk>M*Ihlh$~T}%3F1d3KRd$eLi@70J>>%kR4X8|lOf*y?$eUuw(f)p
zS|R<kN`od#JP5jQ2uB~Bu~p;5;>~E-yksS&5KUGRhkp(qaTC7t{8^#%`nw(T+FJ4a
z(IB2&KZjgy1Y9&!5kqY(iiW0oG__2}VE-V@yoGcs2ita-BUPnCEE++b5rffWAfL%2
zpEr?Vj%C@9j#^$qlsO?T$9iiU+B#bB@#B}m3WN`|6FYJnTrc5B2R8qN`yog!q_*RL
z$8s=&Wq;bPxK!di56vy~0?tp4;@ZqnZN*VB)kGAnab_H;@>}4YaH7HamPaIQB20xV
zYG5d9agonrAo;;<M>x1<6#^>*Dt&cfLzoV}r@p!zoo8OpGncZ!AuiIeMlhTn0L_jB
z8&LSXOZkhBa~GrdGnB4@Z(zsvov0>`9X~m0;D24B2WQW9;&0&JDaUFRCIj*KH1uw`
zgIqcbJI6a=gs`S}H<HQkl?^<+e@84_yn>c4U4#esp23J4NF`J5(Sz4k$By-D1A}=Y
znc*~Kp0}{gd&?OuvdWx7BJm!5y>EnXz(Z}UW=zlppL$Va7<h`hF}zo6Zh$fZs}kEv
z41d^Z-lpn5ff6r!%P80QWe%v>zBc9r_BChHc*){2P40PrUA^Bo|MB`#^7P6Yfd<N#
zzxcX>VVbD3EZjaVFeE~_vf6U5dDyXiQ^~j|Phb3=fnu>=VMu5gh>V74X`YQQ{a<nO
z*4;5&@BWW#V9VByafOw&dduXQ7m_g(4niXpiTEb6x!@P8pd2ePP-$Qg`ZOI4S|P)S
r`5Y4%8x+69fZ86_hHt>zm(|7(gc6iExtP}~00000NkvXXu0mjfICsr-

delta 2748
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
Co;o=I

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
index b9a49e1ec9892b4a4beb9175fc56754b5d90d413..eb8cbc1f8183f22467a88c49d340e8f864961ac9 100644
GIT binary patch
delta 1504
zcmV<61t0p18Sx8{BYyx1a7bBm000ie000ie0hKEb8vp<Wqe(<TRCt`lR$Gf4RS>Ro
z>Dyd(H#ZU!lHesuBmo8Af{GW6B!c=Nf*|-HivARTfQfk$F;6~-zGzS)F&Yg)MNC}6
z8pK34#=T^Brl<RK_vv%2Iz2Pl+3ksn$y&=y_c^Cd)mK$t)qkvn+a$&D^Nf`MmIE-b
z_`xS<z+c*DSL%%b`1*x+f4CLS8Dntnqwny|4tE9%^Z^Gxc;&%b03`eF-+8gl=8AWF
zlk=fRhoV~3n>)AGn)4T~+`IDPxDwC>PG;P7>vCwpShM0B^T{|`HEUoETv{s_=aQ^g
zV|5+)5dau{cYor^`(A|GD9C`*V*#A_{I_=a-l@<0h95RIHly~osVG^9Q`JfHbU95i
z3d;p&GL%7UQ!AR<y=9^^yV&h5#7b4?E*ls%^CB5GHZ-Hj9UGg;QmoSJsfy>iak6#i
z=CJ@sgeSP)3Vj(!!I)*HG`7@bWf%p|Mc58~Oh2<_X@7LC%f4fmUM4t4kX#0ybT+sv
z9+ZVfEi=9Z`uGL@;nA~*+>fG(FlcOS1?h5<>8#LYri%(38J0fk$mZsD6wh^%BFQy=
za$A`uj6ga;EAS#`BhB(&mgjM%9GAucAee}q1+6fYzVy%zH`;(LEyl_P?g-qMbdC{v
z469*^l7AsFIT1|=FcdvyFlYu?B+o~4!j`C&(?9^q4XXu!(K7^x3XBo*aI)cJ^r}b;
ztyNJVn_X%J0>kKJI1zc2okHO`WrxDY(CL1aAyjLJUe;APWhhVb%#whu&j6z%1{fg~
zkGru^=Gx$=L=G5gDT+*np2TU!$WB=pV+up{cYl^SG6wTNAn{AMP>DMP5;JK@4{Agf
z?@u$!OE)cr<gB@=9VCl!nkPkp8OVuV2#Rx0cpj39qF3ECCvKqe!eM6>^M&tpq~8i8
zMoss1Wn(}-wzdQu1GH{xS&u^D0!xw?B@z!Qj_k*)6rC4J=|&UHBW+AsP<!+vqx4rL
z5`S1KH@PTtXhYKzc~o^#T?R@IomR7qmzb*MtKD7}BWsf^Bjc{ED0*Z*bw+Qos|XxM
zpF8K|pL4+IeJ>EM_BkeK5WP!(MG+(jThsQEl@{JS{WgtBIKcLUH62hQ1J%l1XA3Ey
z-I7rF3JRq9vPeKlJa6P+LPrk}xF1Fgf`5QP1NBp(Ae9PKGY9Q!`VDY8_`?Wkn80hV
zzu`)9?42Ws$X1Ejy=w=ED*~3T_8?7j1mZFaQ6#`d92)Hjn4evQJS(8rRiL$YI+R#!
zOz^REvKhegLIRn}p%<s1i;_y=+CTIewK@13JlM5sJ6ygzTV=p|d7ni@ZsF)`Y=7T*
zMVUUEfm#@O4@F*}b2LoODYd-P!}0-9zbs31tes=hx3;oHUsGEqVY#jiopbyv7ZjAZ
zg@o&K7M&t$RWP`GY0jZB;Nhg>{pkC=Mt;()xppmfYi$I!Z3s+OAPEFQg8BIrxgzTU
zko^8^mnvGr)ne6}!6>KAs%M?fz<+MH9>C#4&%k=hk)y|M0Qh<O;&5ZVgnSMG{GT!e
zFhKNQWol{?W*$2UX`Fygv0E|=56wIWOH0eO`VPQXU!G)l@7Ztn?!5<2pE?KasWx<%
zy6!oU!J3{24nBZGNQ0hGm61*eTuJEsk+^lQ6N6DSvMv3bkANeYp8f?c&42vFMlwLs
zh{81p@47MrVY>}yp*h@(P%qoufnN`u0l3a#&o_@iFdsq(DgZjB|0AGsZbt2`_Hk1V
zP_#d`w~bdo=Voc`Pt2WX9v$7-G~PrlfYs?=xjzuE8^K$z2C(Q!`1tu~MDOsSCq~xa
zp8fvc0a)#9wFu?8CprHUQ(4M0&+To$V=K&Fy#}A2_+rhSLH++0z`>^<hJPaD@RP@%
z>c8LEClE=hYVXu>Yy`l#i?>SZ?2iDT_E>Kj0vPn=ddpw576@^5;qw~+0000<MNUMn
GLSTaHzQbVv

delta 3209
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

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png
index 896c844149da2caa6c341f8dd26f8c590481338a..9da9ba51a1082d003b680705880d16d83503ef75 100644
GIT binary patch
delta 969
zcmV;)12+7w1l|XbBYyx1a7bBm000ie000ie0hKEb8vp<UkV!;ARCt{2S6gcnK@|RG
zvq_q^Thn@NixqE(T0v2tq=*;r3X0&1BKV{zh=`B=48cpEMD2@$Pa^uD;uS@_VKtOm
z5EWaYme^dompPu<xZ5P%*otlR!7mBBv-8dQzL`C<XQN|^V1IRW3*i8y0RqH7K57Em
zzIH0+O}YW+Vz;1>(&KMPLMS;Q)PaZu?5?-a_b>NNR5V~-dLu-LBM~7rFeIe3;h2P3
zr#4ED^L$UIFdA!6+dM<Wj3^pg=a7Wo&9MbLfHtZ_BP3~JD-b!bqL@fQoYmJ3QH6fh
zHjC#|NoUG(V1J_cZ@@Re*{N}MN>mxXfxjW{8{pZC;=NgQ18T3^UEMYM{`P#;4Oo{G
zf;7i{T0Yu);bk>M*Ihlh$~T}%3F1d3KRd$eLi@70J>>%kR4X8|lOf*y?$eUuw(f)p
zS|R<kN`od#JP5jQ2uB~Bu~p;5;>~E-yksS&5KUGRhkp(qaTC7t{8^#%`nw(T+FJ4a
z(IB2&KZjgy1Y9&!5kqY(iiW0oG__2}VE-V@yoGcs2ita-BUPnCEE++b5rffWAfL%2
zpEr?Vj%C@9j#^$qlsO?T$9iiU+B#bB@#B}m3WN`|6FYJnTrc5B2R8qN`yog!q_*RL
z$8s=&Wq;bPxK!di56vy~0?tp4;@ZqnZN*VB)kGAnab_H;@>}4YaH7HamPaIQB20xV
zYG5d9agonrAo;;<M>x1<6#^>*Dt&cfLzoV}r@p!zoo8OpGncZ!AuiIeMlhTn0L_jB
z8&LSXOZkhBa~GrdGnB4@Z(zsvov0>`9X~m0;D24B2WQW9;&0&JDaUFRCIj*KH1uw`
zgIqcbJI6a=gs`S}H<HQkl?^<+e@84_yn>c4U4#esp23J4NF`J5(Sz4k$By-D1A}=Y
znc*~Kp0}{gd&?OuvdWx7BJm!5y>EnXz(Z}UW=zlppL$Va7<h`hF}zo6Zh$fZs}kEv
z41d^Z-lpn5ff6r!%P80QWe%v>zBc9r_BChHc*){2P40PrUA^Bo|MB`#^7P6Yfd<N#
zzxcX>VVbD3EZjaVFeE~_vf6U5dDyXiQ^~j|Phb3=fnu>=VMu5gh>V74X`YQQ{a<nO
z*4;5&@BWW#V9VByafOw&dduXQ7m_g(4niXpiTEb6x!@P8pd2ePP-$Qg`ZOI4S|P)S
r`5Y4%8x+69fZ86_hHt>zm(|7(gc6iExtP}~00000NkvXXu0mjfsH4qJ

delta 534
zcmV+x0_pwU2d)H=BYy$)Nkl<Zc%02vziYxk6#gs)vlPb!gRcD(q#1;QATBMXn`2QB
z=~U_7u~6(%D}v(aB$Qex7CLpf|DjNWKPs4RA*I+s+Cg(o;w4cuu^)tcckkW3FYn&n
zy#OpYFP!~Y$JU9f;&s5--)0$Qb2$w9!?ik&L`769mAUaPr+-PBrmpPRZ4E~PJ3FD3
z3AnA{NWc$loB&NiR`zR}y7D$y*U<gwr@<6~Y%XV->_rY(eK3#Vpg%+;Dz5C@x+V)u
z0`13#wK{jgToTIN9)z%n)})EnqzNG`LI{gM`w3`2K?sY~hV>bB#yPsq3T6ZVK>PTd
z3Xy4}sM8BYn1AUNMREMIQN2#*pk9Y?a>BH;CEy00=b7W3PG?F`Rq-7E0stgl{)jI`
zfDnQ`>{A&45Q~}mZV^}%OahW5;ZiPO{0eZpFtrz{A_yU_5fIX8BpMAWFGXMxxJ7{H
zd0^()jx3XaEWZH&;y4CE07fvigb-@O0!ybyg{7m#fq&P9h!y%(Od}w7dypi_7w0sw
z!Po*tQIN@IJaJsB*5>lT_AT%Wa|FJ}W3=w?Hb)@Hah`60D*?dYE%-krnHMk?HA@vF
z>%#3#iOL6uNB$ECa-6G;Z4Q*nCHm=oFJK#ieE!t2zX+1a)ba#2dJ!2P39s-zG@piF
YF`2?d0uREQRsaA107*qoM6N<$g5fswmH+?%

diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
index 1da3a0a733..1c8714a8db 100644
--- a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/commit/cbe076402ed43b1cd861295bbcb95608c453de7a. Edited by chromiumboy",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/. Edited by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/static.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/static.png
index 6097982ee260134d4413f66b77a391f69a499f97..7d8c7a8c49c0d50a333def578ddb231367e3d74e 100644
GIT binary patch
delta 1592
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

delta 640
zcmV-`0)PF;444IwBYy&4Nkl<ZSi|jCL1@!Z82$p8(nHtFu;ADnV<6UotEUmg!yFVZ
z6-7J<-d3o?gE$J#i+UdOqO!tv+F*wr6enyJO2<S?Pi}*{QYfWq%~(ocwgtN}FdigX
zyX57)wM|d{m%RVw|MP$Ed*Az$a5!P%$)_r8wCS1GT)oem1%CxYAzO;iMIwedo;A=e
zGXTitMZ|jpa9tYF=gR4%rOy&mPA4%ct*|jrQ+9!LlG$g@v0^|IUoI~~tthC~1<`z#
z7`37RXOHV>V&qSXZ|d0;xb7Y}dd?rC2P}P-m>K{a<`E2q8Z>6Q1$HvPqyak_U;^-;
z0kxvwcSUKKqks8KF)R!W4qSjI9<!zE4UXPq>x5$_f$gwdUZew<n0Sm%S_6P$K|)`D
zudM}(1&Ivc^Xeyb+W7kY5d@(lMH7hxSp%{xV>~$CT7j?MAY8v@n4h1UhuiI@_ko=s
zJ8(K(O%<<J%cjrJ=9wCi)9J$U(jv9k{Ra<CbARpc8-Er+T97G#_p`4M8Ob1(<%q?-
zLn>az&f&(GpUTFm0SxuI0WaW1hP-_5MPS34A<tzG@%UK+u(H{%@V`L@08020ixOFQ
z_vWoW4&1)e9su%QNgwZ(N|v!dCF%5E#Q=~k%0S9o1NX3?Yap=g!;{Hydq2xHOJzCi
z{^=rTW_ge7`7Z!~yN_Pr`OGvmnYMbC7aLDHK4%;b2!ep&;j4!GTU+1tb{dVY!SBDN
zU$vuGt(Kc>M280lSdYh<=v(>t!Sven7Sz8a0H7d>D2QT9DyQWTTb<8$h5DPmxw*}?
aD#E`ZG)<d<8L#^Q0000<MNUMnLSTXjoHrr>

diff --git a/Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json
index a4c3148aa8..25f0d7f198 100644
--- a/Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "From vgstation: https://github.com/vgstation-coders/vgstation13/commit/a7290010020e541ed6b57817a07023ca6bef26fe#diff-20395160138bed693d15eee6f16d671531b5fa533ec52c50e8df6d52370dbecd",
+    "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/",
     "size": {
       "x": 32,
       "y": 32
diff --git a/Resources/Textures/Structures/Wallmounts/screen.rsi/screen.png b/Resources/Textures/Structures/Wallmounts/screen.rsi/screen.png
index a3e7a3fe55a7e1903126e5a270dbf1a58c74b4e3..6b6329e83d0189509e614d991e696343ef5dcc20 100644
GIT binary patch
delta 351
zcmV-l0igbh0*(WaIDY{^Nkl<Zc%1E)zpBD86o*e~X*+b$Ne~CYMNo>9yQ7P*;NS~5
zNGB(!%Y6yo;(~*_lN1FP!9fHkUAh!nswbM*^r|?Rv_rq4e@+6wkET711}T#ZFoA|`
zM>2!guB$Ks4Da^(P$`$Bgzpc>>v0;Pghs<319G@!P9yFeuz#C%az35T<XkKk*gam;
zIwe_)&wmBZaaS95PXy?rcZLIyfiwQ)1!l89ST5$I;QPMNaKkX*XEK6TyYmpB&~Qx?
z^K}M6Kr&E*lAS(~3$Vg<{o`x&ZSXyKD<GR(fD;JAP*@N6NB}WS6Leh{5~e5$c%JuO
zKsMPDP*pWu0aygr$g(UUVafIXCx9Ig|5nc?ev4$6Wditr#yx?^HXP4l0{7i%RIS<E
xfM|AGm+Xwm6QB|x5pG)^FUTfaeIOS|gA1DYXhs25w_yMP002ovPDHLkV1h^mnvDPe

delta 218
zcmV<0044v91BwEWIDY`VNkl<Zc%1E)u?@r^3`L1VNy9b_!*~or$u>0f7kwm0CU?3j
zb}0O%6p2vYLy56{t<}95?_Q1x>?4qK{%C?rDaR!McuGl=Kbes59Nt<}frEz&?CTQ{
zJcJ+$A7e}wZF>0$2_9n<f%o1g0}_<4Dv*NHyCK1|PZ^qk2~(JW377x{XSHNA`YV7g
zg>Ln0;ZxzAa1lU%MxVYfkO-f?JjNoLiZsVEY<7-hxFHFrm}MyC545vi8Jd80P7N<k
U3N-;1UjP6A07*qoM6N<$g6(lwZvX%Q

diff --git a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/meta.json b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/meta.json
index 351d5688e4..8bbfa474bf 100644
--- a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Sprited by SonicHDC (Github) for Space Station 14",
+    "copyright": "Sprited by erhardsteinhauer (discord) for Space Station 14 New Frontier server",
     "states": [
         {
             "name": "state0"
diff --git a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state0.png b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state0.png
index 10fb9cd49d667800c7d9bc347b4b72a6978307dc..d437ad8b738db68616d680dd195f849583138cf5 100644
GIT binary patch
literal 5943
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
HMVbEwwkFzU

delta 642
zcmV-|0)73rE}8|9BYy&6Nkl<ZSP8|Jy-xx$7{=cNH3*RfVSt6Okmw+WMgIRm2L__i
zgfIyBF_3@>1|$&BdkPQM-t|B}jt=b|J^FjzueKrwY~^zK+c^{;@Is*=2N6JcyWI|7
zfDVsDBH;=!;n8R`JOO@i<X<Q`V1tJuzy?pAov8xcs|SMM<A2FS35ckE4;|qT_xFNq
zN5Y}Oa>DVx7Xdo_`szwPdOff_aQwFO5D<<{29^VUo=*G1cP_w$+uRN?+s-_&2^=DJ
zk^_Ll-D<&rgi{|F-PQsK&*$?}uh*^FZg7{cTM01XxolQ?-L5s^-rwGqU_NXtzz^PP
zwdCURQku;s*MDD*fR{=oF-2@7APD~S_~-!<UaQqSbN?0qIBqhGIowXm2?yw=Qc>0d
zj%UI-(i8tGL&CYqpw1C<xZQ-`-QLP+JT9ZrNWNz?B?7-83>1NJZ2^981Q>feV$OwO
zEkKT2j+snG<v^#?@fDHH<<=7r1n0p*SL<+HfGGlSw11TzSO>0Fayy8C+mp$pvVJfa
zsHsFEArL?jgkv%=2?<|yq$<jyL(FY07K?eNtO9iSsv{MvG6YCCS_{i{>%WG>Wpz-=
z{FcDC#Yi}^J?^^n*-f&bBNcEYVYOOSfY+B78M-hugn_PSg5ujoqamqON<0E|IBzm>
z*Anw4vwP60EN2DyiI`5OG8vCOWr))4x_5;?N$3X$$OgBGKz-9%e8Xo7<-T!reEch5
zQ+SXFW;;U!VLH56EY1aN3-=R2xISmXv4J@@IR3cG^;}#ZVXX<r{E6%C{^zIk`+b4s
c3hp@a0{{;8c<c3M+5i9m07*qoM6N<$g6SnG!~g&Q

diff --git a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png
index 814483e1a6e32d29bd6c9a5648a3496337be5677..a0ce5d516e8da1f72bed5c044fcf8019a2aac9c8 100644
GIT binary patch
literal 5829
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

delta 615
zcmV-t0+{{9E&l|NBYy%$Nkl<ZSP8|JJ8!};6opM#D2Pmj0T#qq2B=ud{~zeUfT*a1
z7|Nq`K!Qq0P*fynj?0OR<2(ouJlIKY;_uv75+Uw5n$6}RbuT{P)oNATMF8QG$s~CJ
zD%`THWCiH(bUK}!023Vbmq-ox!4nbS2e<Qi*?>2VKoI<Qw||oYEIHp`BK)n_6R36+
z90oim9OpL?pu(T)b@9Dig5`nZ+SOA)I9@XF9Pr0N!3e*)03GfZc7Qpq7J)c$h`34(
z0FH3W4Fd{J-k?nv3n08wsffW~;9Kn)*FC*RfDSL0N@BTK_!ivPZ03S_5L<u=J|2(7
zQ>`XOqY?LaSAW18jfT)g#1aq$fA9A_Ai}%duE%z^0KoAl!<-}R^qg>jURo{bE#NpN
zoGT-7RvQw|mkjzGIY-!a_-nf@9<o`n-EPHUzn3C#4QZeVtdRwn;7Bmu?Z`PdhPMEv
zoOUc0i?Rmh^SMz(sa%dGAPCM63q!5KRROvPz%fE25Pt<OcXB3(K-g{Dmfo+|YiY{m
zasmP<f^ZlEi;(cJPpYIGC*<63WHK3#$yb015BsEISEc|3M{nV|>iy4V<8}v?{Qo8J
z?6?w+YR@_${cwsb=#vUKim=n^NWkZGDmD%b18HFBS)jOgI2?++lPXUHR5<@+qQKc&
zC_;c3iD1=gW$Xa7E`*;Hp$QHz^xr64QwJkJ5m@Oh?&C3AmG6y{HjE3W5R(X2yJ}P6
zcveQ>Qn*P3;i^rCO96gx7{fx(&D9m&>Tudkwm*9L?c6Kb8H@k`002ovPDHLkV1m-p
B8B+iN

diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/meta.json b/Resources/Textures/Structures/Walls/shuttle.rsi/meta.json
index 97ca2aa3b0..9aff20a66c 100644
--- a/Resources/Textures/Structures/Walls/shuttle.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/shuttle.rsi/meta.json
@@ -41,6 +41,24 @@
         {
             "name": "state7",
             "directions": 4
+        },
+        {
+            "name": "shuttle_construct-0"
+        },
+        {
+            "name": "shuttle_construct-1"
+        },
+        {
+            "name": "shuttle_construct-2"
+        },
+        {
+            "name": "shuttle_construct-3"
+        },
+        {
+            "name": "shuttle_construct-4"
+        },
+        {
+            "name": "shuttle_construct-5"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-0.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..dde7f67085c33178ecb82b20793d7e242ce38b19
GIT binary patch
literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006%Nkl<ZSVv=&
zm)H2ufCR)OC6T#QXTN&>9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb
z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{<
zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E<ykrD3=%@zREd@s@4hljn=%t_wtr9n!-U=m
z3?NUVIN;8mdtje~EQbL~9Rac&24Id*QBlHlKzDCD*p<kZ!!(8jg){sI<`rdNNd0F7
zih?+dKn6<wK?D}aXCSa<{Ys1wgxOJAT!|V2Fb6c%6)_;YIwUZh!O7W)tf<(xcOQx)
zK%rUJ)Ccw?RtFqBbethPzy)j>$PtuS4s$Wg5wNISxnU23y`3dt2iVyAknMBy-~u_~
z$iXdO;i2Pz*hFA~p{M}&j3ls#77`U@c=!4>LHapbaeM#%1BS)(Aq5=KA%N}xPyqt6
zoDcvx61|Wj$^oE)2viQh5+Sw_09g*Q00clG0s}A~!yHH`1hAF^u#ymz4M6}`2*9EN
z*%I{V!50FcY>2ZY1Qo@&902n%C@S{s+{xhL?hX$D7$0Uaz7QbW0kAYc$N_}X0ND<p
zO9<dggs>2xG!1~VA<oJOxhSS(E+DEXrh7R6stu7t0KG1tq$C`gb-{pC$Dr2AfHp{Q
zHpzgkA`pNzrwLU^WHrfPmC=ATN(Zc24(k~WSjS{gbj?7CYCt=u$f=s%-E#nNwA`Pq
Sw(#Zv0000<MNUMnLSTY!uLubM

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-1.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c68cfbac68a535de1b7e26ec5c203f4d78b00153
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800070Nkl<ZSVv=&
zm)H2ufCR)OC6T#QXTN&>9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb
z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{<
zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E<ykrD3=%@zREd@s@4hljn=%t_wtr9n!-U=m
z3?NUVIN;8mdtje~EQbL~9Rac&24Id*QBlHlKzDCD*p<kZ!!(8jg){sI<`rdNNd0F7
zih?+dKn6<wK?D}aXCSa<{Ys1wgxOJAT!|V2Fb6c%6)_;YIwUZh!O7W)tf<(xcOQx)
zK%rUJ)Ccw?RtFqBbethPzy)j>$PtuS4s$Wg5wNISxnU23y`3dt2iVyAknMBy-~u_~
z$iXdO;i2Pz*hFA~p{M}&%+iIk7@j<N%pfBp%Mcx(hLI-l$=|>KfMM}`NC8K52%tNl
zv$d9?yt<hIL<7qX3<sP(u^%oEQilwPasa3x0+j=>M2Ig0+Ipuj?Af^!ZikDzJ401*
z4$crlcL3IM09F!$vLOhdI{+jGN=%^Q`rYf-49}5jHA!F%DkLfjE@H7|S!4%*vLVir
z5L6Tsa)73mCIiSqbO(U=*RNe4bpT}{fG-hJD-D3MA<oJOxhSS(E+DEXrh7R6stu7t
z0KG1tq$C`gb-{pC$Dr2AfHp{QHpzgkA`pNzrwKKW$ZC?oDx(2wlnz+49M&@$u#U-~
m=$e5N)qr+RkyACjyXOFhw%?z(x&(s&0000<MNUMnLSTYmArnUc

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-2.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2f5bc0c3bc867d40b2ddeb3ab1a0f35e84adacf
GIT binary patch
literal 689
zcmV;i0#5yjP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007bNkl<ZSVv=&
zm)H2ufCR)OC6T#QXTN&>9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb
z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{<
zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E<ykrD3=%@zREd@s@4hljn=%t_wtr9n!-U=m
z3?NUVIN;8mdtje~EQbL~9Rac&24Id*QBlHlKzDCD*p<kZ!!(8jg){sI<`rdNNd0F7
zih?+dKn6<wK?D}aXCSa<{Ys1wgxOJAT!|V2Fb6c%6)_;YIwUZh!O7W)tf<(xcOQx)
zK%rUJ)Ccw?RtFqBbethPzy)j>$PtuS4s$Wg5wNISxnU23y`3dt2iVyAknMBy-~u_~
z$iXdO;i2Pz*hFA~p{M}&%+iIk7@j<N%pfBp%Mcx(hLI-l$=|>KfMM}`NC8K52%tNl
zv$d9?yt<hIL<7qX3<sP(u^%oEQilwPasa3x0+j=>M2IT{Kn5>bxe;Dcg7~1)EiT+2
zY$vu5LU#bxasXBmg0dk9pgRC021-nz;u>VxmD`UQ&Ye5QU}R*(pra}ab`+?H#g=7}
z9RSLPI7>oMQB24IAPZs>62O*rPME<^UXTHH%;E(Lzz(E~13*Fk99XY|EC)G464-_S
z72$Mq0L?-GUm~Pd8USTOoRtxBQB2ERKvYpo_i_MK8zP4QdR;(CNjNm?f&r<HL9LYm
zZIIw>k^x&qAOLGlW7I@w0%SGGV3pB;HA)ApSq|$N4OquyP;|{eX=p$@r^tzz-raKm
X_sHm<;lFx500000NkvXXu0mjf_TU|m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-3.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..7098ec309a42368ab631fc9bca706b12cd0010e4
GIT binary patch
literal 690
zcmV;j0!{siP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007cNkl<ZSVv=&
zm)H2ufCR)OC6T#QXTN&>9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb
z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{<
zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E<ykrD3=%@zREd@s@4hljn=%t_wtr9n!-U=m
z3?NUVIN;8mdtje~EQbL~9Rac&24Id*QBlHlKzDCD*p<kZ!!(8jg){sI<`rdNNd0F7
zih?+dKn6<wK?D}aXCSa<{Ys1wgxOJAT!|V2Fb6c%6)_;YIwUZh!O7W)tf<(xcOQx)
zK%rUJ)Ccw?RtFqBbethPzy)j>$PtuS4s$Wg5wNISxnU23y`3dt2iVyA5cGLxYb`^0
zbu+=x0XgEx!7X5QRC55#a$+1omIGoFfdz)50^D~?7tUgM^5ij`kL+`hBVa&AMwTHu
zJ`E*Q?%#jFuy{VCfFn8t&>ev6V_?~V5$vZ=><32&wh$r80ic2iR1UxrAvOoVYz0{a
z3RYO|0I@+1K$b^#A-V&wmIJVo5R?r;0Gk6qK1a3`oegscdcs6@04N*cED1qHF*XOl
zf)!)|GC+0!OdKSJ9t{*Z0NF6)V8@pCkmZr}QRD!SMaUt5uT+FNfb0+;lnBvNKei}<
z<pz=yA*e1uE{bWH3y3O;>0S<?hX8tAKuJkRR#8l-GNO51KumQ^Y()fWm=IMRgIX&C
z+91K%Bm=gJKmgX9##RWSWIJ-2WU$I;z#63k)+~qhj0UV@GAO!cpae9aom1o#Oz-YF
Y0Nak`pS+rxdH?_b07*qoM6N<$g7*Cv-2eap

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-4.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..120b1638c4ea17b9dac3452f216bc6886c897e76
GIT binary patch
literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007NNkl<ZSVv=&
zm)H2ufCR)OC6T#QXTN&>9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb
z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{<
zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E<ykrD3=%@zREd@s@4hljn=%t_wtr9n!-U=m
z3?NUVIN;8mdtje~EQbL~9Rac&24Id*QBlHlKzDCD*p<kZ!!(8jg){sI<`rdNNd0F7
zih?+dKn6<wK?D}aXCSa<{Ys1wgxOJAT!|V2Fb6c%6)_;YIwUZh!O7W)tf<(xcOQx)
zK%rUJ)Ccw?RtFqBbethPzy)j>$PtuS4s$Wg5wNISxnU23y`3dt2iVyA5cGLxYb`^0
zbu+=x0XgEx!7X5QRC55#a$+1omIGoFfdz)50^D~?7tUgM^5ij`kL+`hBVa&AMwTHu
zJ`E*Q?%#jFuy{VCfFn8t&>ev6Q;?6)0W6_n3lX9m04j(;<p3-Z;&TAVa*!inmLju>
zaRAnG09F!$vLOgya{#c^#A+$b0U-MHiTxM}6FCGx*$`(*2r7!PIRNG>^q@x$0a%oP
z#Lz>5A_t(yJ-$K-S5#2s0Fcj+Lx30ukR1Yq5+NuJAOmbsKqw7>vLVjO2)QVxWiBA9
zD5iTk0ICg<Ljb)lprj-ut0*Q^8PU8hAf`Gdwju&GOo*zEL9LYmZIIw>k^x&qAOLGl
z6KVjE)g*&eMg!I;9k6COtY<V}9g{)PH3KE80qvY3r)qk4&jB*b-=6~gJgWcz002ov
JPDHLkV1kZ`4&ML(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-5.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..c29bdb3197c7b96c5c06af664eeb3b7bde5163e3
GIT binary patch
literal 671
zcmV;Q0$}}#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007JNkl<ZSVv=&
zm)H2ufCR)OC6T#QXTN&>9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb
z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{<
zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E<ykrD3=%@zREd@s@4hljn=%t_wtr9n!-U=m
z3?NUVIN;8mdtje~EQbL~9Rac&24Id*QBlHlKzDCD*p<kZ!!(8jg){sI<`rdNNd0F7
zih?+dKn6<wK?D}aXCSa<{Ys1wgxOJAT!|V2Fb6c%6)_;YIwUZh!O7W)tf<(xcOQx)
zK%rUJ)Ccw?RtFqBbethPzy)j>$PtuS4s$Wg5wNISxnU23y`3dt2iVyA5cGLxYb`^0
zbu+=x0XgEx!7X5QRC55#a$+1omIGoFfdz)50^D~?7tUgM^5ij`kL+`hBVa&AMwTHu
zJ`E*Q?%#jFuy{VCfFn8t&>ev6Q;?6)0W6_n3lX9m04j(;<p3-Z;&TAVa*!inmLju>
zaRAnG09F!$vLOgya{#c^#A+$b0U-MHiTxM}6FCGx*$`(*2r7!PIRNG>Y(bALD$qlL
zA_t(yJ+@#+4gqXwfg%The25$Z#5jQL5FnHYL1};xAe06`*$`)Cgj^KUG8Yh46w|#N
z0M&-bA%I>NP*M_-RTLAdjA&jL5K|o!TM>a8CPY=opw`NOHb`(b$$+gQ5P&tO31vmH
znq;ubXuuk!1J*2u^^69rV=^eZW}rkhpq*3XR88;hIRKrH<)7+<Hwgd$002ovPDHLk
FV1gw452^qF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/full.png b/Resources/Textures/Structures/Walls/solid.rsi/full.png
index 02ae3ff3cc8a5b265dd5a6f9e60f1008175fca1e..b4e991e34578da75a213d963719a3d1b784772d4 100644
GIT binary patch
delta 152
zcmZ3?vVw7fL_HHT0|Nt}$fR^2#S`EY;%Z=EU}0h5?Ck98>nnU|+kc>VxTlL_h{V+7
zga*cqp$P`9j!cKb69c$doB7y|u2ir()9h#{dZdHJNXfA$L_s;{KM*Wyl2{+MHi|c?
zrMYLPRRGTp;|F}r)}rq!W|TjWYpIr$<1k=gIJh}S&|aRg<t5M#22WQ%mvv4FO#t>?
BGI{_2

delta 534
zcmV+x0_pvz0iy(v7=H)`0001UdV2H#00HVrL_t(|ob8uOj;cTuhQ9(->hcJTn6dzS
z>i+l8E}#+@009((JnrC13AYvKj_K}!e^P;PUVl!(Uk9<<?K*xCR(})6@s|=PrM?ua
zl)4d!<Cw$YK%QlIzP~t$=XppeNz;@(&lkn?HR3o%DTOgKynk)C<XMJknv2#DOZ<m5
zdgv|ie4qFIo*)eIT$kc_T-*r&A;hHJbsPZR_xn+ot)Wv8h5($(64!B<dpoPDLP|+h
zRXEoIcgbCI_BEQOxlaJVF#hdI2h?>vNx(1+>blm~N3bkQ`?qa7&N0RMS(wW8kid80
zMc_r?_Ye?5=zj&wiqL1!b=|1OYPHffEkv&C-dGt1m&;{VUYDY}T#!<J5Fr53&jV7*
z+e0C+ZF^P;mtwtMb2^=LCjiQ;H0$FyO;c@rb_dSqGq!DyIuJz>N~zlxWLbt~Sr~?a
z5CSRX^E$9vQI;iL*U`2uP16tr0q|XC!9*v2&u91|@P8ukKb|VZ6SfaCVcWKtritJ-
z%RNF>Rjk)*eSL)fBfKZYqY7z~5QHIrq+B$XODQSKlFeqramL?u9P*+dO_I@AuD77b
zbKbUF(j*}-3c9YFT|><I_Qhv^Og!Ho&FxFEBxYD+MBuAGn0;&%MOxcG69<Fi_^0p}
Ye!>Hwv=0lZN&o-=07*qoM6N<$f)tJY#sB~S

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/meta.json b/Resources/Textures/Structures/Walls/solid.rsi/meta.json
index 85b809570d..246ebe31b9 100644
--- a/Resources/Textures/Structures/Walls/solid.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/solid.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
index 828730d9f3d82e3f4e25ee4b0e4f0dd50970d037..1e2da3352b75d4ada2d78b93cfa36e15d6fefaf6 100644
GIT binary patch
delta 209
zcmV;?051Rg2H^pa7=Hu<0001iRA<Kk000kAOjJcMFfcecI7352CnqOOO-+Cm5o-Vd
z0F6mRK~yM_y^+BQ1tAPXHERKmSb+IhfF-Ede@&|{!jkOy&m0U7)Ffk!lnuX^*c+QB
zE!Xla$QvR6l$K|ak|E1L;N^Mx1p*M;GQb;v5v!}NA>aWak4ml12lVI9d_X*1v<=D|
zToX_p2aKM+K!H1;?kfuX>kZMm8t!9!wII1dwPYEC3`#|*!j`%L;+izORVftD00000
LNkvXXu0mjf(}+<q

delta 880
zcmV-$1CRXS0s97!7=H)`0001UdV2H#00TlvL_t(|oXuC=PunmM|0Sd}EQv`Lfk3Ke
zMRa+9zE=GIkGvNiI#A>h4XG$<n<lLb$k_wL%_m>mU_Z$^w`bp7&Ua^@G8_&wd?K`b
zLMeT5F=Gsr(iiD#z!=*YKq*BShFHWgEJ9j0QA#l$kKy}%D}N2c@L9#Vj@)3i$QTR;
zSi~_@Rc#y>=jU)7r<Gn^UbgO4Rkfrehdcs{5R676?AkVV2|>JAlq^>i1>b!ick49(
z;LFZVjoP-2D2k9}^{^tA1ppY0MkOz6#YMZe{pgJ(0kJGp#jKx{f1?yx16{AzFio?j
zTzQh2>kvXT8-D-*s`_{;8Gwg}hnleWK+`lSyQmz%CI+fd{)+0CWwjdcQTRU%I5;?{
z{io|XZf<T~MPDmZ8o(Gsuh+wBxrFPwNS`9Mh#&}XdU}c=2;}c7E%K{KlLW5oVzpeN
z*Xzkjs0@e0EU$2m<KWBA4h+*onk2X{WPz^h2!a5*u786xRLeMy!8wQLdElIvcpXiX
zGMB3rrqd~W-v?vtF%21G@O>W_=jQ-`Zns-=S^i~&5EzC5!!R~qm!<#!&N+f0z~SLx
z&A_Y6OIb&bPfnx<RA5u%_xATeDaBF0Un@eM=gGNY7)aApj-oNebvd#u!%@EvN-6gC
z_c0!i<$tBs>VdDW3q{#vaNF5d(d2=<`}?<hpwsEJdf+)Ut<!b=?|Pu>_B;mKJis}}
z&97gL9%#*iBuPql!JlM-wzUP*vKq5M)&bx5aXXn{yW2&YB(?gT=Q-yblgXquIOnZ(
zKv5K=NrLTe7q^p%R1Oqk;QIO+w&Ng*A{Y%<s(<HsI6FI&XWT@K{3;C7L=;7^9S30;
z${3JG5Qd?Axd4D=nx#VYC+KLJd=CgAAcT<BP~HViub7X(r{9LP7g33+J<I<01|$u)
z;(K5<1a+$cLI~^<B7^2F!rJ!4iv@^fVP1HS=P1R%d^VHwEXzs*09@Avu<2^5H0L+%
zZE4a`G9XzjFc=IlpUp6j<C+j51b&RiSguw8&`5tW1|dXkZ<b}4$1&!!S*<aV2IP&2
zMTpGR>Nq|*!E`!prAPgK>s}#5Nk<MP?~XsKIaNNpJ^u~-;(9QzVua@a0000<MNUMn
GLSTY*0-5Xp

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
index 93e381adf25c561f5c87ce920668fd04e974a44d..501e4b2ab408b63fd4b79deca623d61be4af3198 100644
GIT binary patch
delta 250
zcmV<W00sZw28sfZ7=Hu<0001iRA<Kk000tDOjJcMFfcecI7352CnqOOO-)o(R9vI6
zc>n+avq?ljR49>ckxdGOFbsubboRdD0n(y-!3(H(fT1w=zsjW54yBowMZ*XAX&zCl
z&V@>Tq)wEseF{x@BxV3CDKrrw?mXap3Vp`}955Xz0G|OorgMGRhXW2baPyUQ`U1{-
z=3Ky3wm33aYtSp;`3fQJ9Kv<V17u^_;saI;3YMr~&m|cU3l)${me)JRx<?I6iD_!a
z=EXj$@axg6Za(+t`{qFH3C)pP8(O1`mB#E=U$dJw)fo2f6#xJL07*qoM6N<$f`;;E
A!2kdN

delta 852
zcmV-a1FQUs0^bIZ7=H)`0001UdV2H#00SmTL_t(|oXwZfZ<<gP#(z*c+aahk7#^D4
zhdLgnNuNym|3CRkV)x+e1FP8xq^TmTwQVkYSV0lgb?erB2|1YKIp4?OaPGazU@%B|
zMQGWL5MuA2J<mf3vDf|zJkMJR5JE7WPFX||hG}jM5<)N@kAHC-XRDn~r#p!=j!dw+
z?&$aXETRZiRV%Mg7Z<czt*!QQGT9ods%n8FL;ea3(_}On(P%blm?qI;QBbZZ3LhMY
z`{fdVx5vjN+iW(uzP=_+%WY*E1^}bcs8D5X{ZEZ%^Jg{U7}GG=OtX9<e=h`Sg<UR}
z)a&&Ux$=}V<A0D+Rto@7)t_%A1s)$COUZr*nx^Hs*U5oZ4{Snt5$gT9whH)Hcy$4#
z9ssayo8+l!GPtfw7=~Du#o5_eDQ2JFwrzahuNII^u*=DW_d=A&0m3lk{QR8ZaER-=
zJN;Ei;+S^3%@@z(wA(FD!tr=atJUIuxkRtmOCl`GVt+Us((Co;bUG!1AP5)^hgg<X
zDIm*fHX8ZV^gItGTa1Jde7d**pjNA4+cpmypP}oz^!t5uT}RjT)zc*jNs=%cjVjB3
zsA>4VpU;txy<T+%tWJlw$H(aPI&sBo$e%{nNs?si?@gp>%4xSt632YMy)9HA?*Yeg
z3Ke+QZhxaFFEb79A0D`zOrBqXmzsn}M@KJPfh0*vJ+KRRcXxdI`t{E$kbUPt5YXv#
zN~A#$5QZVH>y{ev&Ees%SKx!=ki>Cmey@M$K@gOla@QPC6on*?c~h(5d0wFc%3v@^
zg%Dg_U2$-5fU2tbBz&l-!0$}LLrp`k*YSNHDSstWN={BrRu#xpX7GI<V`E*fB7Kg(
zY7E2LVpO$@`4{*<SHs+??R5Wr0lUWWbFkS@I|WE7X_#idiF{77Z86befoT}b*S6ys
z3Oz8N&GP#+O$!%5yWIv>r<zTh`Kw~9I0^#d#e#mn&wMsx9z~@jQc6CL$9%uN1*o)N
zJWUTNWhpjIQ|3{`d^Rf`OmYF)!Nf4ld{}H=AA3D+Zf>^P({6Wbtdz3Ak)g05*@wSz
eI8|Qzc>V*Yqj)Xq?1mr!0000<MNUMnLSTYu>X&{1

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
index cf8936fdcee3e3571a19b1105186d7052b6edef5..23367ae824af90f4e119191de1f31c1aa39b52d7 100644
GIT binary patch
delta 248
zcmV<U00;lP2Z#cY7=Hu<0001iRA<Kk000tDOjJcMFfcecI7352CnqOOO-)o(R9vI6
zc>n+au}MThR49>ckxdGOFbsubboRc|1Ej^-3tm8_2N;C8|5YZfR-~Et77ZVy`6Fu8
zx%f~RsS~AhpRECp#0-EXTLTf|E&wiM>pN!P0Ka7ep#TK<b#YjS4Gt%8Q!3g+1^ZcZ
zs=(JSwgToS=oRpkV$40qn0C2<EG)}$ff<8>_n}}dDFqM<RdA-fK6i=%CdGVe%9h5y
ys(Am=v~Gs`Grn0+yF#<%_6+Tz%qh*WTm1l#0yeXRdlC@<0000<MNUMnLSTaaMr5D>

delta 946
zcmV;j15Nyh0=x&17=H)`0001UdV2H#00V<bL_t(|oXwZdZ`xQ8$3J$+5^8K<kr9We
z?*R3oLE?nuD|h}}?p(PdksiEocn#_ztcYKB2}xw{p|JzlPP$RI*{@`crSY5Z*W;Oa
zeoCj)33*54q8lN^s}D;l5kkCbe+E*@X8}S8X0sXF%?8~tGJh8dA#fZA%d#@<Y&Lt5
zIO2!|tA~zOtHpM+K~>e%>&x{ul}aVkPA8MhwW_KfaYTqefo>R#$74$6G9|-cv)vvk
zR}_U$mc{*k55R{)Az{nqGPk$4gkiF*3|$9cJRToqId}L_sa*b%4bQ{Sbxy<VpU6K7
zL6~Cq`#r^CF@Hg>JjIMSf*?p20HCTrzDfu@K0YRby#={kE{=Uj4m{VuDU@GA{d%lS
z0ly3HE+A0@0QGtu|EXvqj7B3|*TpnV+U<5?&1?R8z0Q0-PZtnPu<2yNM<EjA0Ius|
z+cv}DkkM%LqCXA3=TWUz`6?xiW-~bn9mk<ksc^sFqkk2P2@$4g#=#qn28E~o2iWa)
zxUS1^IK(u~Q~^;;qg0BgW;_X{lvtL9yI3HlWICB70<_z0Ow)|tQqweQwHlhHF&qxD
zZ96ml0Mp3?DJAY=5tGAH5k?s>Yc+%rG@8xC5Q<PJ6zKJO^!t4liv|6DpI)zbl#x?}
zVMwFdM1Kf@S*zhVPP}QwHDFm5U#_nK$mjF?S*@Zd=^d<T8r^P}!C*kQ+eOnfeBaL$
zaR2bYbTWx2>F2Af*E4W_ex4c7_x+fBFc`c@4sdaC@#`|M+wB+(2K0J8G);>?hi%)L
z0`Bha`1{+p)C?${PA5F<f)9lPTCs@dc}IIe)PLsywrwZ6AnK5`Ld>0=QPg#O&*S@U
z$8x!h3o(&_PnL!6d5QUb*yq#fH1$oh=76Fo_@2if`8-m}^bFkG+;DbwhN`OZBz#E8
zz*{Eac`k=mEHa<Z34(wi2)Mkwe9l0mGQxa5M?cxuv-<mI{b^$u4mP8-znI^F|L1NP
zJAZR8y8n9tUdpcc7M#}8ivofmpkx^FPvpM|mbGTH-D2oE>x19%2uC%rUajK$Fbt0_
zfNHf0JfCV#ZRAf|o5pb@z}s$VwOXuKE7qG$B1jMf{N*@&-|YZW?N=!Yf*`Rr3`5qN
z4eQk^aWIJmL<bYyFydixdVRjSV!2#q+ABu0nYlIyf+LOyN_0AYufwVG-pBKQ05a%x
U@uE-jkpKVy07*qoM6N<$f&dB0dH?_b

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
index ee44f0d40055ab2a033294a3def8d84ed4a8fa1c..2b48ffb696b72a8846a07c9bbd5e2d124112e184 100644
GIT binary patch
delta 246
zcmV<S015xR2ZjQW7=Hu<0001iRA<Kk000tDOjJcMFfcecI7352CnqOOO-)o(R9vI6
zc>n+auSrBfR49>ckzEdiAPj_S@c<6-0EM{kBwhfGCotLjUu6r5F?44hXuhQMkEqw+
z<4a+pL6jy}tN~BN41lFr0}<jO06rA!I~Cx8c`F7&1qhh)m~Y1o9vAS-QMHE#_N(U7
zz}&jnDoAhO6!3DySbC1}*yRSYvaII~5=I4|Q$emN6_88Rz?I_ClVX5LF`t^UwXv@%
wK7Vwro8kV9Zx+<A&@8z>Lw_i9N^|U9KWp(ek<A=?tN;K207*qoM6N<$g6B16p8x;=

delta 946
zcmV;j15Nyf0=x&17=H)`0001UdV2H#00V<bL_t(|oW+;FZ{kQ4$3J$wi}nJB2sxra
zHwB!F4N^pb#2<iC(epRbQ(CFhMUluB92CA#Sh1pjA&JOF_7#Z-|Abt!r~OLSgBj2J
zKEHYMof)Om=>+^nXyFeb#NL-}+eQen*S-g~ZEph*LNK4tS$}yRC0)-QB!plxnP8e`
zuAR^4JBdS%Fkm&>(Q36=c^;~&W<EczuQ@t8%C)oUG<U43sxgibatcbi&UiegT&Ymj
zb-dLo7P+D*{AHRvZ#Dq@@$Fm6Rw@<l?(PVJbXn=85&+}zIF@BC`ck=4dCkUpjb18|
zbhCLQ|5FHp41c@XY$z6sDRSk_XUO6Ees%x=s`@%B0r2wjl5+MDXqqN{N6CS04J4ub
z66*cFaszk|EX(@L@XrNcSr+|%|I<OFY5<^CtMTwwG$F38u5evf{vQkm(hi41*=`sH
zr>CcxJ{`wNwX5)|O7(i3r^iRC)oO|yz;#`^-L51#KYu@$k6{=9bi3VHkWoCW*Ho)j
zo*o~m*XvRVRoE(=UM};z*>IS#lmIR+E&!<4>i{$w4H}I`sy_>d#Ujs}4SKoEWHOPG
zEi+)6ChqMmwrw+;PBWbthC#dCmR}sj+1XiUdx+U|if!Atx3`$4nVkXS_!uDsjb<}8
z*s?4+=YRA0oXgA06hYWF7z{ECv(aoKgupmHj%7fLX5h#5H2{S|fm*F5$@~5O)=?zo
z$+p>S20*{xXEYko>-Az82$l5v$;ti<gfiUg^%#vt8A;7Yl6+SNl<+_zgh*xJXGDrE
z%Sz30^2_0MwIs>EXc~^=d@KV|xUP%qy0qKv+<(42<YgeW3ceN!JgnE5`W@;(Sa7r1
zEcW$be-<9rYrYl=sa2qKI-NiW!OhJL2L}hJsw$N*It6)32<%nDFPg?-v54b1_`Z+t
z`%;Xg6f4U1n;plYln|q&)8TNKS?zhql3|E!Mp>trT?kjld&qa;Q`_-p$suPql%3kn
z?tfo`oeb-YUGXDG*3-@aeBY<6>+%r!U!3KQS$ZC2U1u3Nj)#cVz;dyWzk?u%Jpk2e
z71-Wtk~Zv5j*YIcC`T-S^=d_{)nd6=u=Ko?6W{mwdotni=?Ngy{$tztzMmQ!1OZFW
zW4TzQE+#U7@M2QZbtx9f=ljVC_xJa?wky$W=8pA!KgJOvwi)fi|8Y50e)skKUr6y>
UQ2<)w+5i9m07*qoM6N<$f*;z|)c^nh

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
index bf9dad0013f7c80f7cd856b24f31a2ff7e92741b..515b40760d8e7146dccd850215a3937cfaa29631 100644
GIT binary patch
delta 249
zcmV<V00#fV2Z;iZ7=Hu<0001iRA<Kk000tDOjJcMFfcecI7352CnqOOO-)o(R9vI6
zc>n+avPnciR49>ckzEdiAPj_S@c<6-0Htx?NxXm>Phhh5zseSrje^q$nlI_lAEH{F
z*PFsXofwTSg(W-?GXRzpmWU8{0q`M(y+Z;X7}pd)$N&N3(sD2T3Xc=`Y0uh10o(cK
zRKQreSTl%s;0*AztEQe+_f0M!vy1a_fr#FK>Ch#YWI!%b0Zqxf$Gzk<{T%btgXQ6&
zUz7els@9v~UdC@0RIjjEa(#ySP|YcuW7qltZ6P+1f5Ab700000NkvXXu0mjf277AT

delta 953
zcmV;q14jIb0>cN87=H)`0001UdV2H#00W9iL_t(|oW+;VZsJG~#(%b$v1S7XgdA}|
z(+5}|2vWo$Z-8>*&NFi7Xyp}9B$5M*4@`Wp(n8^1cI0ei?_tsgW1D1>8O<kI1#VY;
z)zwwi-P*;)MZ_OOLH!Uyy!!EcK1T@gs(cIP^ZCvJAq1Z1v42^wDVb)jk`RLFbc$`;
zxzh8zqr{3sIjrvwbUGb2>ovNrXFj(#H&m<DT<Okcxw^WpCpZ-1B`BFDlgWf~r9#;>
zS#LH8&oxcsZ`<Z62mtu&%a@d_R4ObM3!*5UR%WRLz+^H>M7gm4QMpq25smE@vsB{H
zOz=YfRS2RC8Gi%;#bPl<uD#e)9AOw{I{={TKUO6Io}Zsn#@>TMp%B~NCkJ*pa0u;}
zP`_>~*MYadah#8+f6M{Lap?E^A9f;@0|51UoyV7?QMkUoMoJm~9}EVu91e%^d&{yo
zKR?g3>HB`R1FD0$vl(B7NRb0bDY?A7L`sS0d0bsxC4Wezlv=mjjmG0~=1d>ATWYl$
z-{y0gtybI#b=Y+{vs~sW2sp_oCFO)=Su`3A48x$=Y|?BtF${xlw;NfOm8l1CQY`Wm
z1eoPA)9EyB*>MDH+vfJ>1^~k_sMqT$BdX25%s4S-Sr&P-2XJSzxR12Y&axw5ot`3u
zpxJ6Alz$z^iPv08$?ffJia@;^3<jBr*=)5CLSUVq{#*o9wktFmjg)cq&UIY?`u#qm
z(THBJ_x=c|Hr(s=7>!0L(qlLzKNbN^9Y}-_sR;bH*NPp-!Llq2!${3s<wg($NGVg~
zp9%$h-+x~O_93OzEX$(ZZl}iD?RMt!ycPi+c7Hh_@9+6+7(8ybnf+Up+IT!B2m)N!
z#dY0y=EutLal7TSVIc4Cv28njBD%Y~qf)K1SS&I-;bEDnssI=chjCfvIdM`f;`=_8
zY8B7(;uBHaiZyLFXW#cJ9W<lE_BtF6GqXJpS#22hHlwUl%rU6ycnkS4d}urVC^_Wp
zhJW#3;pp%$!BK{7#;*7t9Olze2f{F<Y?|>Q@@I_Y>8#dk%BIO`?>MfI$br>z8UK!=
zDDeQ)YBgYYt2vZv{7`ql!uB~54s16YI-L%y<&xEUoiY-JA^%LL{QLboK&JdQpA&{*
zN;irkR_isZ<uY|Ki5*ZElagr?hGFK@J~BJw;o%`yHe0P+-7pLj914le=r#O~%c=IK
bujl^*jU-=L@hEqo00000NkvXXu0mjf#C**4

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
index be5832d69d35ac0c3660ec69bd4e9d2cf3f15dcf..bbff6b658403c39270cdfb3c43bbc20a2e67602e 100644
GIT binary patch
delta 242
zcmV<O01f~62Z92S7=Hu<0001iRA<Kk000tDOjJcMFfcecI7352CnqOOO-)o(R9vI6
zc>n+at4TybR49>ck?ReGAPj{oIDm&Z05lFj;sQXNz{LGmxdr9MP|x{6^Cc~P5RIA~
zzZ4dlywGT?B`^ya1Hkxd3A`sW1;B-Bd6x<tu;ywYG=P9L&1-4SaJYfnj;0biDEFUR
z2W#&lHxS>z3NYKjTzh6dihqFLZQRcXM9cz2C#ROu0NF?#sFd#-?-W(^vj$%x{?`~<
sSHpdbuNE|}P%U{p!+0olN_Ff}KWq;+kt06!Pyhe`07*qoM6N<$f+Ip+rvLx|

delta 1006
zcmV<K0}=d!0{91z7=H)`0001UdV2H#00X~CL_t(|oW)l`Z`w={eYV_MX|TaUjyRz1
z!F)bAND&AAK!kGQ&TsUcqs3o9kq8Gq=itT%D;5HbY2-ArdkDK=yoR*2>XWQ7tY_Zr
z?9A-0(Cv0J{6k3eg%EP`W6$$I2stS~0?+ey4iG}%`##oD1b;<UOO*&An9XJ|O|w+`
zzJHXMa!`lG{egD7jdc`36h-bceRzPTX{GYfbxU<cQOt2ruq9Ab6_d#X)mjZzRYkO3
z=R6k#0somMUXug>@a5v7AZxW6=JPqSte94+q5uFUlSwYh(*8%)TJ1d=aST;aaA+pk
zl7A%x8Am2bf`3Y-QXm($HYrD%rhEqgKos9sB?IvG_Es?VJCG!a+1@7yu*-o%2!Dk7
zw5?JHJ_5&a&QU+l0mpIB@AuDkqL2ds&}cNU*(MFe{rx?{Fl4_6g8`GaZL|M%UB}JM
z4cBH61bhc*2YYl~d?lnn4gg^o;_mJaVHm>qeT+t<9DivThC-*)$;RU`ccz;-M!jCg
zH_wC7YOziz0=o{UR;zeT5?pdhi8`U{I-1QUWLbt~S+Fb%vMi(1>14XDbM*k=vQoio
zl0dCiF`La;%VrTUO%v0H2LOO9%V;zj1tYZ0ZfBeu({&wXvj>1j*JXXgy1r%+5W3xN
zMkAnU8h^fAT;Q@&!6uIJW7`KD$H8DQz-TmrEX$=NNs{39_7=8nqu1-P|366*v-$ny
z1&hT3rfKf>0vdtv`5B();n8)OGR<}h!!TeN2KSwUR~?V83(xZqK0h;Z;2;O|t1A#f
zV6<AS4flFI42Q$gS@SR)4s#Iz0Hf6cAq4u>RevrA1bQGLgcNe%$6hOT90$6tpIm}4
z3=8C+Bnd$faC6{f1ojbzp`hzJEX#VI)!q_VmW5`sS?XL_1PVFuS(dShV{ZSZr8XXq
zkt7MG(<!FYDVzDRGTg*5KFe|;2iS?|>FEhIO~ZUX=XS!wGNYXk0BqZ4Wm)FLWu<~3
z2!Bx1H2A*HPDHE~3&L*BK@dPWXhw(a)wXT)`+aW0@xW`tz}{xWJH;FWt&We7AH!MO
z@wwzc$!^F7rK7`t1V<TS&aU`7ILxP`4y0*{s;aU><gXYj(}~t=sEUHs-f^5FmjkQi
zlD%hHmU{r8Uate#-D(ac9p~xtIC2ie>t{9E?KW1+C00>XFp{Pz{-4e8{pAG!xbmCl
zAx+bQZkA<OMG;oZW#MAN9H18yMOBfeDfh9iud!GxN~O_imFlKxn&Y6zZAPc?H!i2b
czrLRT1e36DL7;>uEdT%j07*qoM6N<$f~?Qn#sB~S

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
index 8141637bd69025bf356c13441bf9d5b704d9f3b7..f6b33bcb1896a6421fb770b714c9f611c4ea85ea 100644
GIT binary patch
delta 466
zcmaFC@sN3fWIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G}f0G|+7
z0|NsK3kzpwXLWUTUteD%BO{>9flrG5K#IL2$S?Rm7%)hAGrIwWI14-?iy0XB4uLSE
zsD@Vq&=Mz47srqY_p8&p`I;4Y>Rl_({{R1E>lZJP<d$gRM<=JL-mMCA>1uh~c%iZ2
zail=9RZ~H-!-Nm_BjaYSP-qp=R_yFrq2S4z=JDwyXM%?7Jr46@ENL35EMW>y#hD)-
z+pyrm<%}lV`GP5?6)Z;ojmn<r3%(FI6m;;3zz6Ho6LVVfcZz2`tXz4(mSwxcyZHM1
z0wtW5S{hqh4VWZ%FZ%1xY7bPwwIuiIr>hQ}Ybs|o3VO_%x}METVRn0|p`iiO-F+qE
ztCx6$6sQO>{rTP(UGQ_?^GuG<P4AS1MCUA@C@?2~Nu^`Cws6zuBqf&TPi^!MuzccW
zWh(csUbu4Ieer#}&A)Xpn*kl#@Sym-hpo4MEc5-v>-4m@ANac?etk30vjG9OyC0tj
z{w&+BclvpM?TPEW?Uoh0`u9csVr-E<-^AB)aNA!-&f|WuI_X?_z))uJboFyt=akR{
E0L$CGF#rGn

delta 1118
zcmV-k1fl!k1Lz2l8Gi-<0063Kaozv`1TRTMK~#90?OWSUB0&%>$RfDFFvKkJMTuFL
z#Kl+RPx!h1gyB{8!MHJq4+cU|F3X^aY)&slniddK&CmmTl1||;0##GfbvZRLS~Jeh
z&PI}7P^nZzI(%8T0T{(%@xya!wVFClmr^)k04VeD@Ic*8hkvr3xA451n;R;XN)uVB
zR7Bq$7yY+IK>5?tQzhf^_{{aITBUqGKP9Db#sIkT*VosS^L@&B9>rp@sRaZ4D3$2z
z?yfqYr4-KW0RWT-y1gEG+3eJN=}d<Dy`GZEWO5><aK-}|xYCSZIGijRZ-T&Z{5MO{
z_lZ9tB<v&-6n~4y-$^MVV}Mm5G6qPEH$78I;nXI`*x%n*uMp~p>?u17&ZNRfa(>_5
z(qXYkFT)|-*X!@jJvus~ySuxoW7TRk`l&Eyc(~$F9wF}J<V0<Bq<O&A)fJ^uDe|;z
zu_{c4oG<{w8`4_N>=54(;%4pgP(Gbbt7QXDdBC?qL4Rd<@BkWzJ~BK2fb#u*-^zDK
z&I4>iya`@hT#Rr<8jXfp=jZ2>_kzJd$(PqxC6UVh84Rf1ZYzbMxU`;^LhJ#iJF=Ua
zfID;Q`m<cNQp?+b*Z{cdK&R7Dav2ZcTHXaCSTg{P<MccaI6OF@on%rey-^;3D-NY~
z$uK?O@qh7={Cr+@e{8k1q*zH5FtfE(GO22O7xBLulzsraxhbOp@hyP+8zBx78y#fI
zLaQn)hz)?yhWHMNT^<|VXf(}rnEkztGC=$3N#*d6i_XdWK0S|f1(y)|CiuL-Q0su$
z04Q9VjmEzMCJ5$|8o2sUp2?4mF#rl1WOk6>kAIKp?d@&uV)A1V{S`LEdjRM3ESDiU
zN$c@P-T<tKDWig|&jiIDVDj}_cMF(&Ju1CL;28i{szLEBp!4<U>(2{=So#crD-e5t
z&e!|CPpww#T`EjkI=pdVQ0MDW4}jL{&#3*mAAlJE<OHt3N)+H`C(~IvuODa}emsOW
z_kU+0{zW=pPa2sK6>NPTAU43Nc>A!hlBOuy<79M&u}Pv?;u^%XRJmN9#JpMjJ%f3H
z`&vy^jhqBUo*F9@3QB?*g7P0RLtZYoS<Da&z}#RE1lz|ALV2Aa-8yd2MASUMi6JR{
zM(Cpn5!`b6ZFhNj8T}!t&rXQ&ZD#|Kn|~4FIfRX!5yD73HcK2cJ%IBJL>pUh#slj0
zx|$t8KLI5*Hp*EZV9p~*;moKk9*STfWzJ?Y)Y3|6POojlnQCxW7by%xrW{_?9D<Y6
z;tYMxK%YP0c?28H7pD!->2@ct(No;p+nbt4*vLm_6p5P2C^i}U0xukIHk;}=@>d0x
zQaELRb<7SpV}M?_t4I?VVcsOkQ@c%xL_*CYu$02N2PYxt%@^<-f-a?SCKX=x;c0Uo
kK?-N0z_Q9%okJj^zuW-DBb&$^4*&oF07*qoM6N<$g7GUA2mk;8

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
index 6f2bcb665a352d0023c9ef17c2fc5fb6c7cb60d9..a7800d9dcc3075ae1afa8be8f379d8627587d222 100644
GIT binary patch
delta 379
zcmaFF-pxEgvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04
zk&%&sfq|2gle4q4y1KfBg@v!LFHrL2()T_<ilZdRFZe$MFx+e28wnKSEbxddW?<ku
z48n}Z^H-z*1z&i&IEF;Hznylmp6jpzk8AJ6FaQ5nOpDE%tF&v^!xvQw`r98TD9zZp
zwwakpVDh>H%&Z+J4{$blSa2D><Vq3=wd69C6mYq^MqsjFV`NyzNe}L{B9Wv^q7jTh
z;=wnLq$2Khng`x<JW|{KU>4IJX_mstQ4?(A)eM#Lg1F=4FMenJDLn60i$b(gN!7B}
znqJR>tKTR6Vqvhps+<=zpCMuOeEWlS%ol%7Z7N|FN@GcTDK(vIS@e&Ik{MsuuUT^W
zP|(2=?s}W%NlzNyawZuma8w(6vtHJ{V_Z-dWpMKlJB#>?#@pB5Y-hRsjp57wgsm2j
Su4n>%&EV<k=d#Wzp$P!Y$Cb7K

delta 983
zcmV;|11S891L6me8Gi-<0063Kaozv`1F1<wK~#90?ORQ6+CUH;Pza<@J`P2wAw;Mt
z66K!!34Sg&egSZ%2QCOms)!1OQa+O?RBz=)8$*iGtnnInlJy`s_U`lS%<j%OKuj!`
zOV$N$Z*N%_XfztEKAds>SqHAKuN_~d)9HxwRp!ET0q*bb9e<yTPPbYuDijJUZZsOK
z`+F`xFc@@v?$2hEzNFLdm<!JZ_y~c(`=O2R-wOqLUM$4-PZt+j?&G-tiFn-6dC^#m
zCgZW-a5%hTE}Yw+OL%#Gb###B1c8NR1(G@NTmYvy4}~ZY46ZR3z7fDJ_(p(;<@D^#
zg^^JpnM?|XnST@M>+B{NCqOhB72dwv>#hBk&*!ODtBKE&xiC%u#Ce3cVzIbp0qArj
z5}~*fI-AVNkZ}Sa)FHkj#BK8O=sc_hhYlDg0OtF!0NUUKq}hvMGMQ+(pYJR{H`x0D
z<#Kt6C(`ft#c_9cxB6{9n+bk?c@YffCTDdL)oPX127mjSVOOv%z;2Eod1sh2p6b`j
zOYSYTf-L}^IxrfI1n+7AUPGGzWQ)^w<gTvhJRCke0r14pX_Y1H7BCzRxwq2}SE4|-
z+x50rJK(e$<X%9Uxt;w2_7K4MMu-E$(Sbu}#%?vPf!$JsHpF)@y!_+i<65$Wn>=w7
zYytj^Mt_t{r3CvCTAX0WTC^Oc0O<VheqZoxI@QyvJ%TO3)6*0ED3t_%ySbsax3`@R
zufg^K$j@O3D|we>rwL#SAd?k#J{kcMiNw}(FfaH!9*fU%cx1C#Bg8sQg$-zfr#K0~
zy#U7duZIW0y0)tK3AO-gz8*;pnbtZQ0Z7TyZ+}W>nGUu9YQCP7WX915;CHYEa4T=W
zFSxRGlgs4<tGmK*lGrRU4eZodsZ?5R_aHCOZnrm!V&w(8osL*F%4u-DUiWuuES*jZ
zMrH_|-<BDQClaeFPZQPxS_F`}!TEf?H8%)g|G<=0BY#tLGI^IE-DUyP+3c_^zz)Az
zfPWG13&<+)R4OHEfd5w^f+434yGo_v@An1B+D*cckk#MYDn#V4(*Yv{kQRUv_-z&-
z>ktmAMo6^)l*GeX;%{~fkn;>g8(lEQ0(!lk$S@5C1IlDF!clIr0DC<G7sg~U)fpY8
z%%5X18Y<N!a(b;B#;gXtN}&2?IqX&)!cb{Hz<@S5f}Bp<nG0W80G8CG%nx*IzxhT0
zl-OZEL9IwRs+Xq7n*E{B66Lm%xi~pN1KQvzj#~gC`Ui&C7pPadj$!}+002ovPDHLk
FV1lw`%>4iW

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
index 8141637bd69025bf356c13441bf9d5b704d9f3b7..f6b33bcb1896a6421fb770b714c9f611c4ea85ea 100644
GIT binary patch
delta 466
zcmaFC@sN3fWIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G}f0G|+7
z0|NsK3kzpwXLWUTUteD%BO{>9flrG5K#IL2$S?Rm7%)hAGrIwWI14-?iy0XB4uLSE
zsD@Vq&=Mz47srqY_p8&p`I;4Y>Rl_({{R1E>lZJP<d$gRM<=JL-mMCA>1uh~c%iZ2
zail=9RZ~H-!-Nm_BjaYSP-qp=R_yFrq2S4z=JDwyXM%?7Jr46@ENL35EMW>y#hD)-
z+pyrm<%}lV`GP5?6)Z;ojmn<r3%(FI6m;;3zz6Ho6LVVfcZz2`tXz4(mSwxcyZHM1
z0wtW5S{hqh4VWZ%FZ%1xY7bPwwIuiIr>hQ}Ybs|o3VO_%x}METVRn0|p`iiO-F+qE
ztCx6$6sQO>{rTP(UGQ_?^GuG<P4AS1MCUA@C@?2~Nu^`Cws6zuBqf&TPi^!MuzccW
zWh(csUbu4Ieer#}&A)Xpn*kl#@Sym-hpo4MEc5-v>-4m@ANac?etk30vjG9OyC0tj
z{w&+BclvpM?TPEW?Uoh0`u9csVr-E<-^AB)aNA!-&f|WuI_X?_z))uJboFyt=akR{
E0L$CGF#rGn

delta 1118
zcmV-k1fl!k1Lz2l8Gi-<0063Kaozv`1TRTMK~#90?OWSUB0&%>$RfDFFvKkJMTuFL
z#Kl+RPx!h1gyB{8!MHJq4+cU|F3X^aY)&slniddK&CmmTl1||;0##GfbvZRLS~Jeh
z&PI}7P^nZzI(%8T0T{(%@xya!wVFClmr^)k04VeD@Ic*8hkvr3xA451n;R;XN)uVB
zR7Bq$7yY+IK>5?tQzhf^_{{aITBUqGKP9Db#sIkT*VosS^L@&B9>rp@sRaZ4D3$2z
z?yfqYr4-KW0RWT-y1gEG+3eJN=}d<Dy`GZEWO5><aK-}|xYCSZIGijRZ-T&Z{5MO{
z_lZ9tB<v&-6n~4y-$^MVV}Mm5G6qPEH$78I;nXI`*x%n*uMp~p>?u17&ZNRfa(>_5
z(qXYkFT)|-*X!@jJvus~ySuxoW7TRk`l&Eyc(~$F9wF}J<V0<Bq<O&A)fJ^uDe|;z
zu_{c4oG<{w8`4_N>=54(;%4pgP(Gbbt7QXDdBC?qL4Rd<@BkWzJ~BK2fb#u*-^zDK
z&I4>iya`@hT#Rr<8jXfp=jZ2>_kzJd$(PqxC6UVh84Rf1ZYzbMxU`;^LhJ#iJF=Ua
zfID;Q`m<cNQp?+b*Z{cdK&R7Dav2ZcTHXaCSTg{P<MccaI6OF@on%rey-^;3D-NY~
z$uK?O@qh7={Cr+@e{8k1q*zH5FtfE(GO22O7xBLulzsraxhbOp@hyP+8zBx78y#fI
zLaQn)hz)?yhWHMNT^<|VXf(}rnEkztGC=$3N#*d6i_XdWK0S|f1(y)|CiuL-Q0su$
z04Q9VjmEzMCJ5$|8o2sUp2?4mF#rl1WOk6>kAIKp?d@&uV)A1V{S`LEdjRM3ESDiU
zN$c@P-T<tKDWig|&jiIDVDj}_cMF(&Ju1CL;28i{szLEBp!4<U>(2{=So#crD-e5t
z&e!|CPpww#T`EjkI=pdVQ0MDW4}jL{&#3*mAAlJE<OHt3N)+H`C(~IvuODa}emsOW
z_kU+0{zW=pPa2sK6>NPTAU43Nc>A!hlBOuy<79M&u}Pv?;u^%XRJmN9#JpMjJ%f3H
z`&vy^jhqBUo*F9@3QB?*g7P0RLtZYoS<Da&z}#RE1lz|ALV2Aa-8yd2MASUMi6JR{
zM(Cpn5!`b6ZFhNj8T}!t&rXQ&ZD#|Kn|~4FIfRX!5yD73HcK2cJ%IBJL>pUh#slj0
zx|$t8KLI5*Hp*EZV9p~*;moKk9*STfWzJ?Y)Y3|6POojlnQCxW7by%xrW{_?9D<Y6
z;tYMxK%YP0c?28H7pD!->2@ct(No;p+nbt4*vLm_6p5P2C^i}U0xukIHk;}=@>d0x
zQaELRb<7SpV}M?_t4I?VVcsOkQ@c%xL_*CYu$02N2PYxt%@^<-f-a?SCKX=x;c0Uo
kK?-N0z_Q9%okJj^zuW-DBb&$^4*&oF07*qoM6N<$g7GUA2mk;8

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
index 6f2bcb665a352d0023c9ef17c2fc5fb6c7cb60d9..a7800d9dcc3075ae1afa8be8f379d8627587d222 100644
GIT binary patch
delta 379
zcmaFF-pxEgvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04
zk&%&sfq|2gle4q4y1KfBg@v!LFHrL2()T_<ilZdRFZe$MFx+e28wnKSEbxddW?<ku
z48n}Z^H-z*1z&i&IEF;Hznylmp6jpzk8AJ6FaQ5nOpDE%tF&v^!xvQw`r98TD9zZp
zwwakpVDh>H%&Z+J4{$blSa2D><Vq3=wd69C6mYq^MqsjFV`NyzNe}L{B9Wv^q7jTh
z;=wnLq$2Khng`x<JW|{KU>4IJX_mstQ4?(A)eM#Lg1F=4FMenJDLn60i$b(gN!7B}
znqJR>tKTR6Vqvhps+<=zpCMuOeEWlS%ol%7Z7N|FN@GcTDK(vIS@e&Ik{MsuuUT^W
zP|(2=?s}W%NlzNyawZuma8w(6vtHJ{V_Z-dWpMKlJB#>?#@pB5Y-hRsjp57wgsm2j
Su4n>%&EV<k=d#Wzp$P!Y$Cb7K

delta 983
zcmV;|11S891L6me8Gi-<0063Kaozv`1F1<wK~#90?ORQ6+CUH;Pza<@J`P2wAw;Mt
z66K!!34Sg&egSZ%2QCOms)!1OQa+O?RBz=)8$*iGtnnInlJy`s_U`lS%<j%OKuj!`
zOV$N$Z*N%_XfztEKAds>SqHAKuN_~d)9HxwRp!ET0q*bb9e<yTPPbYuDijJUZZsOK
z`+F`xFc@@v?$2hEzNFLdm<!JZ_y~c(`=O2R-wOqLUM$4-PZt+j?&G-tiFn-6dC^#m
zCgZW-a5%hTE}Yw+OL%#Gb###B1c8NR1(G@NTmYvy4}~ZY46ZR3z7fDJ_(p(;<@D^#
zg^^JpnM?|XnST@M>+B{NCqOhB72dwv>#hBk&*!ODtBKE&xiC%u#Ce3cVzIbp0qArj
z5}~*fI-AVNkZ}Sa)FHkj#BK8O=sc_hhYlDg0OtF!0NUUKq}hvMGMQ+(pYJR{H`x0D
z<#Kt6C(`ft#c_9cxB6{9n+bk?c@YffCTDdL)oPX127mjSVOOv%z;2Eod1sh2p6b`j
zOYSYTf-L}^IxrfI1n+7AUPGGzWQ)^w<gTvhJRCke0r14pX_Y1H7BCzRxwq2}SE4|-
z+x50rJK(e$<X%9Uxt;w2_7K4MMu-E$(Sbu}#%?vPf!$JsHpF)@y!_+i<65$Wn>=w7
zYytj^Mt_t{r3CvCTAX0WTC^Oc0O<VheqZoxI@QyvJ%TO3)6*0ED3t_%ySbsax3`@R
zufg^K$j@O3D|we>rwL#SAd?k#J{kcMiNw}(FfaH!9*fU%cx1C#Bg8sQg$-zfr#K0~
zy#U7duZIW0y0)tK3AO-gz8*;pnbtZQ0Z7TyZ+}W>nGUu9YQCP7WX915;CHYEa4T=W
zFSxRGlgs4<tGmK*lGrRU4eZodsZ?5R_aHCOZnrm!V&w(8osL*F%4u-DUiWuuES*jZ
zMrH_|-<BDQClaeFPZQPxS_F`}!TEf?H8%)g|G<=0BY#tLGI^IE-DUyP+3c_^zz)Az
zfPWG13&<+)R4OHEfd5w^f+434yGo_v@An1B+D*cckk#MYDn#V4(*Yv{kQRUv_-z&-
z>ktmAMo6^)l*GeX;%{~fkn;>g8(lEQ0(!lk$S@5C1IlDF!clIr0DC<G7sg~U)fpY8
z%%5X18Y<N!a(b;B#;gXtN}&2?IqX&)!cb{Hz<@S5f}Bp<nG0W80G8CG%nx*IzxhT0
zl-OZEL9IwRs+Xq7n*E{B66Lm%xi~pN1KQvzj#~gC`Ui&C7pPadj$!}+002ovPDHLk
FV1lw`%>4iW

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
index 3fe7b22905750d1d114672b453d087f53cd4a22c..9e8e9dd40ad31ec3840a47e52400f19a1171c665 100644
GIT binary patch
delta 377
zcmcc5-pM>cvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04
zk&%&;laqyog|Dx#v$M0hy1IdZ0Z@|nAH!cD#ZeOE7yKUr816OijRcBu7I;J!GcfQS
z24TkI`72U@g3ml%977`9-%h(&&vjUV$JI3J*Z=xGQ{r+~u>_uOIm=vm@|N=?$DneP
zf_oDMlpL%+^ExIe%@Zu>QPdIj*}kEQO=dakWZgXqH;iB8F`kcof8w^s>>Ev+KWqsx
zxO-?GBg?*DdzV~16m+nJ`*nK3ypWx1JZA6FPk6v^NiB_4P9Zlae1gz@!yv}fd}oRr
zTef)WDs*Z6Vm11^Aj#o?%sUA|5ulRu3m7sd>;CX{<g}4oVjTTJp6Sh0o=Y>AIp{5k
zDzs6m(7CDD829<F@dU9e3m?`s7XP}k^wsLMng@En{t$Q9+Hv5jzLrHFf7RKfy8=aW
RLO?$=c)I$ztaD0e0sySJmQ?@%

delta 980
zcmV;_11tQA1K$Ub8Gi-<0063Kaozv`1ExttK~#90?ORPxB0&%>h{)#>2w7rQg?KSx
zxx+8u#?SSpe*o_6!MHJ^ZVbc#E(nN$&Fj#UVVsrOt;Xpd=OvSu;Cyt|yy>p4DkH?i
zYPDkBpjNA`%H=ZM-Q7_%8WjidC6l4W>+9C*FD@=vHbglW2Y&&f12h<euQ191>2#W6
zdwcZj{@!9PjB!9Nm!p^YoYI*L#p7{{xiCrrH#awe=kxgnb6|`E_G2-MM5Aw*i*ORu
zU<{s+NG8Q;PUd1yM`I5T4g^EyMCy!ngBGDM7~$~Gt1Bv%%VM_g-rl}B_vGY+uCK2*
ze(Q8PEE}{?0Dp|Xyu74*K5s2`l}hD}0$QyWB@zkBX0z6{olb}KY%Lss<?ZzJlzyy@
z!TOFR&TW>5@d$`;sDM@q_*yJdDwz}tAeT7+3ZQjFIGIe8Jli-0s0MoyY&M%Kypdk7
zCysi(ZvAaGoeF+gECf%+V|t!WX)qWFgJF2P-DZs;5`W>Dz*c}$j#8#hK+ZCB{a&qF
zVXfa_I{<GTczSvg>_q|i-lYNp;{aN((|=Py>G+uT<8fhhpcH^N4x{ZX;Z(rG!vp2=
zd6ECa%pV8^xS`waZv2Ym#qaTW7ms2i+zoPXAZ6}kQxGbEdjmPaIoT8_QGkruvDBFc
zwgV8{Ab-LGW1Sxkheo-8y$qs$_wDddu$Nk%ZU`qq4aVRrKD`6jbHHdc`mgH(vl)_`
z8atZ=wgcqeUNUxipUMG9Wh0k|geLO($y7?s$UX>c2c*^+TQEx4kB^V8#S(4-Wmn+m
z1a0+tM1v@6O*Gy6yFp1pL?$~?&O$}Uq==9m2Y=Y>^<>)^nSxIr2(cZotGfM1VJAt^
zQmG`^nHAP?tIRHqRjXBNeRHedOUSx_v#5D~er|SYtXM1xMr8=bZ>tRH1|<%VZ*?}C
zZLJL=d7=~84uJ9Y0_ipd=oTX=p9D=)fbUIGjYebR1}LMw*CB#W&i>h*ot>HABxMJ3
z3V+)=MC50u0@^tM36=L0Ao~yk)gxqwh!w_Tp#-M_WSoK3MisPk0NyO}3TUEmQ-HG{
zfeS5LW!*w%8D6VKxEs`944$y7J_O%C0j&F8fM^mMDlp~-$z1sEfYEwcbAx@ShaRIs
zp|DYn4*b8&Aj*`-a=D~_zb_ny6ue|E!c9p~gE4r<a4?`)EJpoa&tfiocL1dA^+0fh
zMr%8B;rk?bbadqTT-jD{XD)nqz`q(H&sS1jC!#+hqY+g!T?Q5a0000<MNUMnLSTYx
C!N&Cf

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
index 0bd4de7c1700d34d9a29a9e3239e7982cd2f4ea8..3c0b42ddbf73d53c54c8da7192a85975e452677a 100644
GIT binary patch
delta 336
zcmeys_JC=EWIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G~10G|+7
z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$
zlb$Y)ArbCxr$_TO8}P8aRrzjT{5GXNb!&*4R(H#kG&}J!mkO51TP%T^ZlMhpGq^&!
zC9bnRs(r?_=Dcnq#}vVuFY7t){o2pHs(Dj0Q2GM50DJU?Wem?*JA$_*R65@G7Fa%q
zW0lzL^8(ACFugZ!x|q&#EuHnB|8J{074aYXTLt<HbsRgj7qFV^H16rF<@Dd@@nyBA
z4bPN@e{<MDX80ZytYA8FQ0!0pg7;b))*a0&8{{fu9Qb0t+<4BE^kIp6eBBQ_+5gei
Zj62Ot8Y?^u`hnhJ@O1TaS?83{1OVXge(eAN

delta 868
zcmV-q1DpKd0`LZq8Gi-<0063Kaozv`12;)TK~#90?OVZaA~6gNBPdi<ET<k?3gXCe
zhcDp9=W>G|-~%`#DBS}m7J&+-g4K%%3L&(x&fui*q>(G2ld<F2PW&bzh}dj4q#M*~
zwN0s15~I;bL{YT+{8ug~R-d2W{(q;_A?XmE@S9ix<vEe$Hh%zS{;Cb2yFJVJtfQZa
zY&I)W$)x!6_O_E$uzLW4oegFH%;)oBKAVZ`!-Ght(>qB8y9Yo~+hxOGFp!@vm&-j#
zK`=|;E|n6AC_0c-1Qi3~KrjZ#+}~Rz73@LK1_V5@b$cP)DQkmw20*Gqv>(2{9(-3W
zmqoYRm47Qqg@1Pj_*gDwimOyA2Oa>WGntIYX{oc<>ygIu&HzYt$nQvTwkQwf;U&0S
zz&itAa|90%mKdPiUM`dQ+{t*sd4Ow>&jXsx<_0q|9*^Z!uh)0qE#BXy{8+7|L~t{!
zymq@ydWJ-TrUKamOm{pMo#D=y)u-oY>X1%BHUMTFn14>EQl9Gp+;C<9VdQBO#g`Xx
zmrnmY17OCXv@R7)5133Q)Zv^XmMkzF4tcdY1Gn8E^#;n#O&JO<RtVt?&qt7-N(DGm
zn#%v(rb*x6BnGIO9jPufkPU$11{EG8^1P3!?kkX&016wFx9Vg!G_XXb^?L1%nb<;e
zp-|u&dVdeBg^+4=aN<@8at_YT4FK3;05>l{fyDsaoB$o<C(--$u8yiN3Hq6!)~`o3
zh_;ql4Wd9g#slDn6JJz)dRse7H^QkrfJ=gG0KH!?w2e_HxYYsF8^qPOzZ7CggT-P|
z$`DS4$*r+!wYuZVqA$?z_pQHEeF3wn8GLK(@qh7AN_2*x{CAxp-{8amYE~DE#r5?D
zp}gK8y}I6@iO@WN{e6K(qp^1bxu^JoA%Z2RFS}N&MbaTihKO2rE)X0?NbwMUEJsMz
z3bUE?1k(dloq=rQ3f>t2Gm9<t?`qZR0VW@T3NJgBwvt(u*RFBf4SMhlCm}8#0{ap;
z#$6k@RK>_{fMdJ?^To+icnJT4pkjdHAGkbz3&sG*45~&@e1xldX-aHs1f7rIVq?V~
u19YwcN5_cW1HcpD<O;AGfR!U4g!l);inkoDWrckJ0000<MNUMnLSTZ>Ig-i%

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
index 3fe7b22905750d1d114672b453d087f53cd4a22c..9e8e9dd40ad31ec3840a47e52400f19a1171c665 100644
GIT binary patch
delta 377
zcmcc5-pM>cvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04
zk&%&;laqyog|Dx#v$M0hy1IdZ0Z@|nAH!cD#ZeOE7yKUr816OijRcBu7I;J!GcfQS
z24TkI`72U@g3ml%977`9-%h(&&vjUV$JI3J*Z=xGQ{r+~u>_uOIm=vm@|N=?$DneP
zf_oDMlpL%+^ExIe%@Zu>QPdIj*}kEQO=dakWZgXqH;iB8F`kcof8w^s>>Ev+KWqsx
zxO-?GBg?*DdzV~16m+nJ`*nK3ypWx1JZA6FPk6v^NiB_4P9Zlae1gz@!yv}fd}oRr
zTef)WDs*Z6Vm11^Aj#o?%sUA|5ulRu3m7sd>;CX{<g}4oVjTTJp6Sh0o=Y>AIp{5k
zDzs6m(7CDD829<F@dU9e3m?`s7XP}k^wsLMng@En{t$Q9+Hv5jzLrHFf7RKfy8=aW
RLO?$=c)I$ztaD0e0sySJmQ?@%

delta 980
zcmV;_11tQA1K$Ub8Gi-<0063Kaozv`1ExttK~#90?ORPxB0&%>h{)#>2w7rQg?KSx
zxx+8u#?SSpe*o_6!MHJ^ZVbc#E(nN$&Fj#UVVsrOt;Xpd=OvSu;Cyt|yy>p4DkH?i
zYPDkBpjNA`%H=ZM-Q7_%8WjidC6l4W>+9C*FD@=vHbglW2Y&&f12h<euQ191>2#W6
zdwcZj{@!9PjB!9Nm!p^YoYI*L#p7{{xiCrrH#awe=kxgnb6|`E_G2-MM5Aw*i*ORu
zU<{s+NG8Q;PUd1yM`I5T4g^EyMCy!ngBGDM7~$~Gt1Bv%%VM_g-rl}B_vGY+uCK2*
ze(Q8PEE}{?0Dp|Xyu74*K5s2`l}hD}0$QyWB@zkBX0z6{olb}KY%Lss<?ZzJlzyy@
z!TOFR&TW>5@d$`;sDM@q_*yJdDwz}tAeT7+3ZQjFIGIe8Jli-0s0MoyY&M%Kypdk7
zCysi(ZvAaGoeF+gECf%+V|t!WX)qWFgJF2P-DZs;5`W>Dz*c}$j#8#hK+ZCB{a&qF
zVXfa_I{<GTczSvg>_q|i-lYNp;{aN((|=Py>G+uT<8fhhpcH^N4x{ZX;Z(rG!vp2=
zd6ECa%pV8^xS`waZv2Ym#qaTW7ms2i+zoPXAZ6}kQxGbEdjmPaIoT8_QGkruvDBFc
zwgV8{Ab-LGW1Sxkheo-8y$qs$_wDddu$Nk%ZU`qq4aVRrKD`6jbHHdc`mgH(vl)_`
z8atZ=wgcqeUNUxipUMG9Wh0k|geLO($y7?s$UX>c2c*^+TQEx4kB^V8#S(4-Wmn+m
z1a0+tM1v@6O*Gy6yFp1pL?$~?&O$}Uq==9m2Y=Y>^<>)^nSxIr2(cZotGfM1VJAt^
zQmG`^nHAP?tIRHqRjXBNeRHedOUSx_v#5D~er|SYtXM1xMr8=bZ>tRH1|<%VZ*?}C
zZLJL=d7=~84uJ9Y0_ipd=oTX=p9D=)fbUIGjYebR1}LMw*CB#W&i>h*ot>HABxMJ3
z3V+)=MC50u0@^tM36=L0Ao~yk)gxqwh!w_Tp#-M_WSoK3MisPk0NyO}3TUEmQ-HG{
zfeS5LW!*w%8D6VKxEs`944$y7J_O%C0j&F8fM^mMDlp~-$z1sEfYEwcbAx@ShaRIs
zp|DYn4*b8&Aj*`-a=D~_zb_ny6ue|E!c9p~gE4r<a4?`)EJpoa&tfiocL1dA^+0fh
zMr%8B;rk?bbadqTT-jD{XD)nqz`q(H&sS1jC!#+hqY+g!T?Q5a0000<MNUMnLSTYx
C!N&Cf

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png
index c8bc3191d34ad17980c5364496982943817931d9..b4bc95f4f0d177ba63d815287f9152514b148456 100644
GIT binary patch
delta 187
zcmey(dWLa=WIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G}E0G|+7
zXJ=<1b62E@JCI^33Gxg6&+v4+ffta+S>O>_%)r2R7=#&*=dVZs3OahaIEF;Hzdd8f
z#o)lhbnwal`F1QDIa*#H&eJryIzQ`)r3oX0M#Joe`jelf7#f%u0vH&$9;g{?o@}Ge
fz`$C-@S<+&dmcuqW!?5b(-=Hm{an^LB{Ts5HSak)

delta 750
zcmV<K0ulYp0s94z8Gi-<0063Kaozv`0>Vi|K~#90?OVZa;xG^$5HwU&h!cmc3gXD-
z1NZ`Nd@eWm0X~2;f~tGqgb=8tRATk4I&w|6OEpe2CVo;hNQA`m{NfpBh6*upKA%|^
z7>!1(3(RISmJe0Vk8c5i00Cnt6kZX~Y&NN0tI?mAm(+6M4SxaccAMUkgqjZz6h%>L
zx$sH>tJO-`BuPG54!j}Yu3o1~wR&N>2#cVAF<gbl{k=NPwp`RCI*SF5K4eei&e<%8
zBLJc9u;0`A`T63ze!oxi`CNV0mJ4wN=ukHp3@#J^ryGq1wOXz8{KaCyx}P`#5b6-$
z5#q8|c{mT1;D2xdaRl^wJ*5E3SOc`|)njrvIJuv93UCef`+)Iye8!AyHXC&ehr{%{
z<Lj%kZ>N*8SlmwU@1K4@olaR}s8o0^uoYm-@n5Sm<cwMU_4vrWrBkp8z^nti-A>u>
zDxhdMBY><pZKM12M0Zhidjw#{;k0QrYz1t$Tkh?gBY&4DuwJi=_39f4yFu;+w9IYm
z3xWc;7tjlwZGC|g1?Zd|q0Tq32|#j#3=bA@USg>G3hXe5#0Kdtth6NO8iYkqz!(Ze
zAV9zv3Pm75z!(ZeAb@)TvtIA&RrODTO@LXiM^QtUwMs((8TI<Ca+Y+k2{7yRWNeH|
zLxAsK6Mv9b-TtSL%S+L2x2voVZ-v>Vu{e&?R#(&omdj=4dAcrO7d5>vjdeO5Wl<S|
z^Z%<1NrMvt^sF9_$MV$%;k;QOEnRKUhHnZG_kRJkr}&~n1dp8g*i9xAmJeQbi0H@8
z1-$DK(tQXw+asiMh5cSB!B&9IGZ1ZDK^y^?S!Zmif5&mA0_=VSE=0D<W~IzJy>^YT
z8x$~xtB_Y8LQsH!F<gbb`VhQQfbKtV`TETp0uUK=j-dMyO7*8H`p6N?egqdAtFQ<P
g7(<~bHvvTS7bgT}bYU@*QUCw|07*qoM6N<$g8cqjD*ylh

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
index 665f36c54ef14702a9b79f040faa3732bb015eb6..1e2da3352b75d4ada2d78b93cfa36e15d6fefaf6 100644
GIT binary patch
delta 209
zcmV;?051RF2H^pa7=Hu<0001iRA<Kk000kAOjJcMFfcecI7352CnqOOO-+Cm5o-Vd
z0F6mRK~yM_y^+BQ1tAPXHERKmSb+IhfF-Ede@&|{!jkOy&m0U7)Ffk!lnuX^*c+QB
zE!Xla$QvR6l$K|ak|E1L;N^Mx1p*M;GQb;v5v!}NA>aWak4ml12lVI9d_X*1v<=D|
zToX_p2aKM+K!H1;?kfuX>kZMm8t!9!wII1dwPYEC3`#|*!j`%L;+izORVftD00000
LNkvXXu0mjfy?s#@

delta 853
zcmV-b1FHPt0pJFZ7=H)`0001UdV2H#00SpUL_t(|oW+;TZ{j)>#ebxQ&`Ai1sv;I`
zqiXuHXxSqE|7G`d7QBus4=f_8DiD%a0#Z7Q)&}wcnR(OBk*t&4*uGaM*VlHf-|xTj
z7jY~fT-QC=SqOpax(B%mgb<qmT-RkXnXm{$T9#Eh$aP&tqkj>e=auqgGTG}``j7!@
z+aG$p9*ZzU)3n0&?fxFeaZ367!$av<P1AOKNT^@XvMh$fA#K~HZCQki#ZKh4T8)1^
zk5!TY@a5zr$F^<r{QS)8Yd)>4RttdPaJZxL@ph-SZNI4zMQVVAVVcBIgkhTKx?ad}
z6w&Q=iK8el{eQcyZQG=2s_a^}qo!?4%Op_^Hi?tGzi0W!c$^z2$7bg)4WJB-dYzi4
z?Pb~TS5P^Ck3!`Dn(xV0m8;^o$k^?60dO4Ww<f*1x&mPN@&dqWy~Z$2eBaOYt;tgC
zx-Q=z9=LQ}R!O1~Dm(Gx<Kte(W#2C^E@<dFKZM}x^?$WW=vu$uf0Y%^aU8y!oM4zH
zut_MXz}?*)&1Ms;pjw7u$a1-4Fc>J?wgLcg6!G873qcUzc^*QDT?M|~-vglQI!TgH
zD_Az2P6xv<FbqT4;y5ObW2Vz-sXC2%T`kv}+uQtJFdB_G>vRq(0ALsfaU843x8JKM
zAomR+#D7}=LI^z1tE9jo$RIydfqnQC1>!i)<-n&Y5Wa7v+fD&x|5XKYt3YnKLWrCK
zf1(cjI~wgMpz6SQJm%==2u;&eB`i{4Fc=)<G6j6!Crwk*H0AvKe3Jw4cHofkeV>+T
z^1QW`%JNzTSrwYPuFeBlD2<CwF`t3T3th@tm4B<Ea5t1_>biPft=C*$T(DZNY1He5
zEWdA$`(FWUA50ff#OdiNaTJjxNg+3M9pCqJzcYKj+#5iernD`K`PR`H-g4yW=?Q?d
zPKS9Ia@Oe(%w~$q5X@#cww;?3GC45cGs&Mq)`topS}f@Gddz3D!bkyTK|sA;=V>}s
ztWN8?;$*ojy_C$ukojzuyO^i|<i(_AS*loM+s*AQK@gPk*X!%jv1yv__>kBs#fR__
fm($wczMlUCaU6w_?t%9p00000NkvXXu0mjf@qezW

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png
index fe570c054fac195b1de49c70d9a0856eb79ebc8f..3849504b6ff74b96092fbd1ca668480707dba2e7 100644
GIT binary patch
delta 375
zcmeBUYiFJyS<lSCz%X}v;~OBwSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@20z$e7j
zz`(%5!ou0v+1J+>C^ma`xE7FNEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$
z51uZLArbCxr@!TEHsEmm{q^5@8;$b%9uvdV4Jos}{Mj=xd1_bGv9?VO5jVNBa>b5x
zIbSHqW8An&e9NU(j2j;bhGaXe*}-zHA>t!v50EbspuVdiqL904N3T-Fb$Q0dh@A@=
zj&D7e8nV~=u;87@3(q+^ISkCBA`X-an=N6<Il*~ig2)AHO@#x}J_}51bRDEwcX975
z5H&cl{>NU1Zt+Xg1$K76c%X8{?TXRO-YIuaU2NC<Yq7ZTV<XeSnWv64vuZy{xH{Rc
zFs#pk_2v26TaipjM>S_WPHh6Z$L{O@pKmvRWpw;?eY$mm!<sj&+#Lrc^lMs8W`+n#
Ra|3<P;OXk;vd$@?2>{H{nil{7

delta 769
zcmV+c1OEJn1C9oe8Gi-<0063Kaozv`0@X=GK~#90?VDe2qc9N0KN|vgfe4=R$^p{X
zoFK=}33%Ne04WCu0umy^pMA)ZW>?!luxoo8eiBk!*_q+%I36<tfnqkBO~*4oj$^_z
z-{hGrk|>HM&5Prh%dQpzL{WtOevdrM;4hb>=lQ<RZJTm`f`1_LEW_J+jXcX>7{;he
z1lkDTFPHfF{*E9F;d>qkA%m9)v{(W?K^Ou6PGt$tbuskqSXC9bO|1j~07|bx*#W5Q
zdem4hd)%M!MTiOTVYC%M7PA1V9Z=0IfNBR+GYg>Ffu6rJJgy_+6KInNd7gLsnNo_&
z<svNIeFV3K?SFPV_|LK|3#ZcwUH37xEK30V=XqYFEP?a+499U`+xG36dj1!UlqFy-
z7AVUSUDu&)TQp6BAP8ib9z;q6$XLr$(PkG=#Vmko2UIf)pxOb|ND)9*S~~^qJis(f
zR8<AbvOXQtZ-Q;x@|qJ4w*X~X!nSQ3kH?4OJl92D6n{t$ho_1kUyZOO&~@FztH1fa
z_@N8JQsJg)2FLWp51k@F$P!qsR!`^lNs{oI7J`rn(B)>P@bY<pkO-J^w$~+UxCLO0
zAx%@{c|K}<-vbaukrpBdTLNS1`S(2lx*%*D9D3;Cxh?>Fzip5)hN`OI{=UI~L2#}4
z1J@paF@HIOEVu=z>l&2OhqZjuyqckuYIh!x^Gr~Nk%_!~9xw}_+5y$f0;qOCHM0OR
zjPzCEzW%>hEM%A+g_PoGb-92srd<*QXpp1y?+Y--Zhs?$z;T?xPEi2Z?RNkF`vOrE
zAx+cU?=m|?v=9IQvMhsXnxK?|5CX>7s0iRi+j?DK?iH5AEP!eUR5J^p+5y#QE5OUO
z%J#Hv3&Su#@bN71GrrwRQ|aM=APn(?F%$#+2Ed=`^Hj810!5zVZM{Z%I3O>I!G44L
zzGEJ=iGcgw0hx6JEd)rCL|OB+76Jh3s>Qzm*(C^1fyPf~00000NkvXXu0mjfg`Q$I

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png
index 4374ed1e1011027c4388033aad7d9985000188ba..9ac2271692b8f0116025dbc2b68c5e44b53d8e06 100644
GIT binary patch
delta 257
zcmbQwJc((7WIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G~10G|+7
z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$
zYEKu(kO=p;R}HxiC<wR&_TKw{rt?G9%%s$fUYpNpw||((;xn6FH(^@x0`@bX{&UW2
zh|J^YX^8A&+&9mlo7t4vM*WN?dluUc^A^jktUGqLScV!NkoTDpe4Dw(Hqq~IdDF%?
yhu3@-4-On{e38B8%7Wc@1Nba9SOh2-Jm)@HWXgEBVtpIX9SokXelF{r5}E+)DqZaW

delta 400
zcmbQlG@p5bWIY=L1H-D!!g~x1jA@=Ojv*Cu-p=ywYB3ODSiH<!x1!m>Z=!HT&UYt2
z#VWSt;<;yZ(yZ+(CUO19%Jm4;nl<6rffj*HDK$MCC-!WgbTItEUh&?3!>(hG8Moy+
zKR?b~65D>RpFKnBqP7kj|Ap_iR`zlaEci<PiOt>1WWu29u(+NvgHejtf%`%RLsWy?
zA7#6~#TmBtzQVgCcKj7yfFj9!fyv~Ntz-7bTvx%Q-?jJGe>fn(ej;*<$N@oi56#$z
zjf#8^<_P!Be;&C?!AT||avHaZ#SzA~#2=q$wQqg)_^Xj+dhxvFo|=-+V?;mZ{g(%u
zUJtTcgfrmt{-lWvZxm<TzZl*iw%{Ve7KUE71*{oeYzzEb>yE#j&+um&(4*h)t$Cfb
zX6v%t{qH>g*Ub8E?>Euwy!f4eoELx^e5W#c)#<L{2@rz%=YhIc?&47C1y{-!++tV?
fQUW&9j#2)VRp77ATrFVGb250k`njxgN@xNAiNU3F

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid.rsi/solid2.png
index fe570c054fac195b1de49c70d9a0856eb79ebc8f..3849504b6ff74b96092fbd1ca668480707dba2e7 100644
GIT binary patch
delta 375
zcmeBUYiFJyS<lSCz%X}v;~OBwSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@20z$e7j
zz`(%5!ou0v+1J+>C^ma`xE7FNEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$
z51uZLArbCxr@!TEHsEmm{q^5@8;$b%9uvdV4Jos}{Mj=xd1_bGv9?VO5jVNBa>b5x
zIbSHqW8An&e9NU(j2j;bhGaXe*}-zHA>t!v50EbspuVdiqL904N3T-Fb$Q0dh@A@=
zj&D7e8nV~=u;87@3(q+^ISkCBA`X-an=N6<Il*~ig2)AHO@#x}J_}51bRDEwcX975
z5H&cl{>NU1Zt+Xg1$K76c%X8{?TXRO-YIuaU2NC<Yq7ZTV<XeSnWv64vuZy{xH{Rc
zFs#pk_2v26TaipjM>S_WPHh6Z$L{O@pKmvRWpw;?eY$mm!<sj&+#Lrc^lMs8W`+n#
Ra|3<P;OXk;vd$@?2>{H{nil{7

delta 769
zcmV+c1OEJn1C9oe8Gi-<0063Kaozv`0@X=GK~#90?VDe2qc9N0KN|vgfe4=R$^p{X
zoFK=}33%Ne04WCu0umy^pMA)ZW>?!luxoo8eiBk!*_q+%I36<tfnqkBO~*4oj$^_z
z-{hGrk|>HM&5Prh%dQpzL{WtOevdrM;4hb>=lQ<RZJTm`f`1_LEW_J+jXcX>7{;he
z1lkDTFPHfF{*E9F;d>qkA%m9)v{(W?K^Ou6PGt$tbuskqSXC9bO|1j~07|bx*#W5Q
zdem4hd)%M!MTiOTVYC%M7PA1V9Z=0IfNBR+GYg>Ffu6rJJgy_+6KInNd7gLsnNo_&
z<svNIeFV3K?SFPV_|LK|3#ZcwUH37xEK30V=XqYFEP?a+499U`+xG36dj1!UlqFy-
z7AVUSUDu&)TQp6BAP8ib9z;q6$XLr$(PkG=#Vmko2UIf)pxOb|ND)9*S~~^qJis(f
zR8<AbvOXQtZ-Q;x@|qJ4w*X~X!nSQ3kH?4OJl92D6n{t$ho_1kUyZOO&~@FztH1fa
z_@N8JQsJg)2FLWp51k@F$P!qsR!`^lNs{oI7J`rn(B)>P@bY<pkO-J^w$~+UxCLO0
zAx%@{c|K}<-vbaukrpBdTLNS1`S(2lx*%*D9D3;Cxh?>Fzip5)hN`OI{=UI~L2#}4
z1J@paF@HIOEVu=z>l&2OhqZjuyqckuYIh!x^Gr~Nk%_!~9xw}_+5y$f0;qOCHM0OR
zjPzCEzW%>hEM%A+g_PoGb-92srd<*QXpp1y?+Y--Zhs?$z;T?xPEi2Z?RNkF`vOrE
zAx+cU?=m|?v=9IQvMhsXnxK?|5CX>7s0iRi+j?DK?iH5AEP!eUR5J^p+5y#QE5OUO
z%J#Hv3&Su#@bN71GrrwRQ|aM=APn(?F%$#+2Ed=`^Hj810!5zVZM{Z%I3O>I!G44L
zzGEJ=iGcgw0hx6JEd)rCL|OB+76Jh3s>Qzm*(C^1fyPf~00000NkvXXu0mjfg`Q$I

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png
index 4374ed1e1011027c4388033aad7d9985000188ba..9ac2271692b8f0116025dbc2b68c5e44b53d8e06 100644
GIT binary patch
delta 257
zcmbQwJc((7WIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G~10G|+7
z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$
zYEKu(kO=p;R}HxiC<wR&_TKw{rt?G9%%s$fUYpNpw||((;xn6FH(^@x0`@bX{&UW2
zh|J^YX^8A&+&9mlo7t4vM*WN?dluUc^A^jktUGqLScV!NkoTDpe4Dw(Hqq~IdDF%?
yhu3@-4-On{e38B8%7Wc@1Nba9SOh2-Jm)@HWXgEBVtpIX9SokXelF{r5}E+)DqZaW

delta 400
zcmbQlG@p5bWIY=L1H-D!!g~x1jA@=Ojv*Cu-p=ywYB3ODSiH<!x1!m>Z=!HT&UYt2
z#VWSt;<;yZ(yZ+(CUO19%Jm4;nl<6rffj*HDK$MCC-!WgbTItEUh&?3!>(hG8Moy+
zKR?b~65D>RpFKnBqP7kj|Ap_iR`zlaEci<PiOt>1WWu29u(+NvgHejtf%`%RLsWy?
zA7#6~#TmBtzQVgCcKj7yfFj9!fyv~Ntz-7bTvx%Q-?jJGe>fn(ej;*<$N@oi56#$z
zjf#8^<_P!Be;&C?!AT||avHaZ#SzA~#2=q$wQqg)_^Xj+dhxvFo|=-+V?;mZ{g(%u
zUJtTcgfrmt{-lWvZxm<TzZl*iw%{Ve7KUE71*{oeYzzEb>yE#j&+um&(4*h)t$Cfb
zX6v%t{qH>g*Ub8E?>Euwy!f4eoELx^e5W#c)#<L{2@rz%=YhIc?&47C1y{-!++tV?
fQUW&9j#2)VRp77ATrFVGb250k`njxgN@xNAiNU3F

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid.rsi/solid4.png
index 95e408947910600e79ff7adc7072d615c27f7b37..a5a6dd285664fb8a9cf14cf963f055b368a6b75c 100644
GIT binary patch
delta 264
zcmZ3^JcDV1WIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G~10G|+7
z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao>Fr%o3R|8P6
z(bL5-B*OjeRY$G{10I))SHAsAzjmO$e1g{tr|`^sMHl>C1EjgHz1i`FEp4R(YYb}<
z+m3am``_-GZ5h(YwS(&k&y5yKk$De}$^81y^6!QJnT0)#c8Pp@nfBNw@`Wm-C%C!K
zSjtq*@?#yxW*z35n=O%L93R?+(<0d_st@VN`x_kNJXvJQ7%IJ^8R!}YPgg&ebxsM4
FO#r~nUo8Lt

delta 408
zcmbQiw48Z@WIY=L1H-D!!g~x1jCr0ejv*Cu-p=;UI&2`qFkibov4*YD|Do`Y8~4~t
zxEk{k3N~*n2wxW9WmoIA*ew6sDQPt&vCc~zXDs@D8}LjD5_&$z;<<~<lGj!@x4nJ$
zt8$+7*+1rIAN_A&UBH^5!=U?NZteZ<bF1|nGFR~~sM==hxRtTqE0HmSQHtAvTV_h#
zAK4J$hDE0sRLh;GGI}kt%lEll^8Ia9e)P{Bajq^Z&vh)*Ki>2133TFEdd|lF(<kc#
zOjBgsY+vOiS~rL-*vPPjp_f&|aLK;&|MYX%FEE*iK}CI6*EXg`)@{{0wnDa+>lMRc
zgB91>1-5W$U16*b@=C8rSivk49`#S_6@zbc-O}Z5vJ2k-HnuUi!YH@%WT>%zJ>Lef
z(GX8KB!e9MN8$g8zfI9M{<BVrV2Els#)M>D?=Ne|tq!NP9xz@jb$$Mr@x|%M6%BKY
tt>pP1><wSLKSpoW*9wMT>7V?sTyq!PdPL6pGB6GpJYD@<);T3K0RWGKt~USx

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png
index d4f50d419fb8f69add5073a70b824eeec4e1212c..3c0b42ddbf73d53c54c8da7192a85975e452677a 100644
GIT binary patch
delta 336
zcmX@W{D5hKWIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G~10G|+7
z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$
zlb$Y)ArbCxr$_TO8}P8aRrzjT{5GXNb!&*4R(H#kG&}J!mkO51TP%T^ZlMhpGq^&!
zC9bnRs(r?_=Dcnq#}vVuFY7t){o2pHs(Dj0Q2GM50DJU?Wem?*JA$_*R65@G7Fa%q
zW0lzL^8(ACFugZ!x|q&#EuHnB|8J{074aYXTLt<HbsRgj7qFV^H16rF<@Dd@@nyBA
z4bPN@e{<MDX80ZytYA8FQ0!0pg7;b))*a0&8{{fu9Qb0t+<4BE^kIp6eBBQ_+5gei
Zj62Ot8Y?^u`hnhJ@O1TaS?83{1OT1_e!2hv

literal 448
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KnvaSW-L^LDm(UbBIS>v}`k
zB_-V3B3QLgY>MQWtuUGCor0Ih)=V$g-+n6hB;B08zdG?O+1k+{_WIOqxu!hLNj<Ax
zM@{;2&7^AnGWqrIf7|7pT)!>mkNB3{?q}CCb}dPixKI=0&?9*EIBU!^n`!;ayt8Jp
z0XaU}@4o!!{3o)Ykg<eOO58yl!MOQFSJ(6S<Bd5x>t28V6IN!=6vGhPaE$c=YX+R*
zbB*QY)cfu;Or?)s)Or;@gOlUopHusFx<j96P1tC8-dM0&{Ega-pdhc#uKi7RtS@>4
zPiAnjcrKkYo%dPgH_d`ZJ86Z+>gMwXe^i|rmri-Tc!Hg9LHEz<1Dp4X&f2>0JY!9J
zXM^eTy&7fzO<yp*U^3Bb&~tbUV>G`z>;30v)7^ds6o-SoQq%eE=|QcHN28SV5^Uz~
z`y=Lb;q}9WN&VbEYT_2G%1Kw%d+;s4_{cKOI^i>x+RuBQ0!{V3#J^F=Exq`bBrh;#
O7(8A5T-G@yGywqjI>0*s

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid.rsi/solid6.png
index 95e408947910600e79ff7adc7072d615c27f7b37..a5a6dd285664fb8a9cf14cf963f055b368a6b75c 100644
GIT binary patch
delta 264
zcmZ3^JcDV1WIZzj1H;_yjc<SyV{wqX6T`Z5GB1G~mUKs7M+SzC{oH>NS%G~10G|+7
z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao>Fr%o3R|8P6
z(bL5-B*OjeRY$G{10I))SHAsAzjmO$e1g{tr|`^sMHl>C1EjgHz1i`FEp4R(YYb}<
z+m3am``_-GZ5h(YwS(&k&y5yKk$De}$^81y^6!QJnT0)#c8Pp@nfBNw@`Wm-C%C!K
zSjtq*@?#yxW*z35n=O%L93R?+(<0d_st@VN`x_kNJXvJQ7%IJ^8R!}YPgg&ebxsM4
FO#r~nUo8Lt

delta 408
zcmbQiw48Z@WIY=L1H-D!!g~x1jCr0ejv*Cu-p=;UI&2`qFkibov4*YD|Do`Y8~4~t
zxEk{k3N~*n2wxW9WmoIA*ew6sDQPt&vCc~zXDs@D8}LjD5_&$z;<<~<lGj!@x4nJ$
zt8$+7*+1rIAN_A&UBH^5!=U?NZteZ<bF1|nGFR~~sM==hxRtTqE0HmSQHtAvTV_h#
zAK4J$hDE0sRLh;GGI}kt%lEll^8Ia9e)P{Bajq^Z&vh)*Ki>2133TFEdd|lF(<kc#
zOjBgsY+vOiS~rL-*vPPjp_f&|aLK;&|MYX%FEE*iK}CI6*EXg`)@{{0wnDa+>lMRc
zgB91>1-5W$U16*b@=C8rSivk49`#S_6@zbc-O}Z5vJ2k-HnuUi!YH@%WT>%zJ>Lef
z(GX8KB!e9MN8$g8zfI9M{<BVrV2Els#)M>D?=Ne|tq!NP9xz@jb$$Mr@x|%M6%BKY
tt>pP1><wSLKSpoW*9wMT>7V?sTyq!PdPL6pGB6GpJYD@<);T3K0RWGKt~USx

diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png
index a880e87e0e001365eb01e4fbc7bcacb119635fcf..b4bc95f4f0d177ba63d815287f9152514b148456 100644
GIT binary patch
delta 187
zcmZo=I>R_YvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|nfKQ04
zv$Hdhxhqn{9Y`^i1o;L3XL!2ZzzfLZEbxddW?<ku48n}Z^H-z*1sy$I977`9-<~n#
zVsPMLI{4)Od^?tn94)U8=V=;UouBo@(u9#gqhWSK{mIW#3=K>S0SpXW57Z1cPqtBK
eU|=m^cu_a?JrASQvTl2zX$+pOelF{r5}E+rfH=Yc

literal 261
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=XFOdTLn`LHopq46*+AgHy3qF1
zCvvXy6?$yz`pa*4t(K|s?4;sz-vsZUee`-)*!vInbpEk(DHJ$pHXLAF%D}`vg^5EZ
z07c+D@9g#GJ{xcTr?&CoN8td5MrJQY7CsGD0gDA94i6fFNE5hIXrJ)AUVd-<haa38
hIPC;F!XoV%J8v#qYy9nmhd_TZc)I$ztaD0e0ssciRo4Ij

diff --git a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png
index fe95c81ed3254839a2b29b07e5556fdc599f2ab1..5976a6c5c8cddc3e0ce7cd57b773685b44112b56 100644
GIT binary patch
delta 279
zcmdnPw1;VeWF|8M1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hEfKQ04
zv9WPzXsEflxuvD0jg5_$r>BdHi-m<nWMrh7nHf-($2TCsz`$J+<QM!O4j8=r89z-_
zl&J6Zba4!^@Nd2BDb}FC<8tspOVxj7=?>-=zuCEe#l;%t)I3q2aD>@YnD<J$m`J=w
zz+9GRg$euC1s43?#@e_fM~>x{W%%*Ncl9!C?|(X8u;i$cXMXPd;4XXf?u0LP4EI=1
z+-9f}PWaz+;QoW%@#f_h?yQ&QK2`VT+ml6~ufATaoEpdU>etsD@00qP9{nz4v|KJL
T)$qsD3*=-^S3j3^P6<r_DxYwu

delta 300
zcmV+{0n`4x0=xo{8Gi-<0047(dh`GQ010qNS#tmY3ljhU3ljkVnw%H_008buL_t(o
zg~ivs4TCTchT#tr(vd1G-~~`5_8)@OGz?&*(8YyQL`Xmk@z0%o3p}ql#EHTfgIv>f
zoe?>4DJ8N5EciH%=>s;n5NQMUcv+U|0&F;dGyz9A09<n6w|~0k4>-f$S_5EQ!Gb^g
z{t#yiSmTej#iW!K2Y`b5Q@nrdlTx@hjTI*kaM}5O$W{=7lLdt0BmpsabU-W~6+nRp
z2T<Wb0hG9R05$Fvz=1mlaN$k?ocP}W*OST;;B!)A#(E8XPip8~tLis^d*^HXHP71>
yq{e~OJCFm{S|xu2a^X@+h_jyt%CX_YFyI5HZw?UUZ<m4q0000<MNUMnLSTZ--+N8~

diff --git a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png
index 1eb30cb070cb074dc825e788e6e6302612e2cc59..81e51b9ac639c8d0b590e01e1590d6cce83f0fa7 100644
GIT binary patch
delta 255
zcmZ3<w1jDbWGpiS1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04
zv9WPzXsEflxuvD0jg5_$r>BdH3sBPRm&{)v#ZeOE7yKUr816Oijhv_`QQzq4;uvD#
z-+Iwe=zszTi=)q!KmU(AZd6jr`DPUxvw*$7jzN@XMT~&Qe!&-enGCELZWS-syOrn6
zxj774q18-FPFM9GEVpOe=AQ7H@y2h?82g6zax!-tH@{bSA>FZyHPKw*9k<F~=GXi4
zglGKUrFr7rX*PyhhAY+$u?+8gZW)Uo_``Jgt+?yORTB>Yoyg$n>gTe~DWM4fZKYy6

delta 281
zcmV+!0p|Xs0;vL!8Gi-<0047(dh`GQ010qNS#tmY3ljhU3ljkVnw%H_007%bL_t(o
zg~iv+4TCTYhT)H-S9&T7WC2u({fD3%WPorlhxA0%M1khVcD%sz3QJfSy!Yre%d&XY
z6F0`7OTd9!Yvlt1Tq)Ur7}r|M1*C8QG682e0Ni@v_i^M8xPQXm`woC{1qc3G*HfG=
z;1_?+GdAavH~<XPzvB3_Z_eQ{O-Y<QAZO?CkgcEwCkv>>Ndj8%=73hbDS!g64xqxT
z0x0p~0BXD_fCJAC;KH*4IPt#$xhIt+pyZ^sO!69*o>bBR?w!XItUwwM0(#)zfL=HN
fsH;bV#C!lqTN3j#Z6XfW00000NkvXXu0mjf9&&e`

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png
index bac03f82f183c78dbe5fc02524fbfa07dea23914..31911eddb8145e95dbbf0d0654a2dc77f4e10fd6 100644
GIT binary patch
delta 2165
zcmV-*2#WXX5VR4HR)0xJL_t(YOBI&cjw8nrMKdG!TFGWlk2R7kOM+$i!JnZ2{|>(h
zur%EyYsoz`9P>heKy|Ys?umOZ|NZxWjqH+RItIAL!i9@!lXu0}Da8hTv*zZ@yXdUW
zbFWIY4UOzst1Z-<nc8u5IZKt8X(d2qzDLGpB_-4_KoP(E_<x#fV{QI!9qfQ-78A_#
zo0HstDHi5o?N;2RTp?F5(}4KGM#rJ8a#b#mN-!gnX~Ik}YFS}4Z`WJ*I4Ik55^q1g
zzS>tM)E`I6DFxUM(2xI}&3v5R@x#CSTzgB;R(0l{24P8TN8>HAvwrpOY}Wog#d@&h
z0`E~i!=Gh;8-H#sf8B)<KfHY&UzX?NuUB`qAscg1I=d;4$JH5*mPxBcP+Uue#VN%(
z^Ng>kMKc!0hP~zKrVzVe13j<?%dhNjkN97`epg!(|M~4p($>DqW60Adi@pPMz55MH
z?@f!TtCJO;RT_cQNLn(Pa^XBUUv*ywW?lOLqb1Hp^nbgM%I0)edbZ6**r4t(MiDN2
zL|wL+1*CRX;7gfx?T38Uorzh@wR3C7lXYl~{;9TjHZJPXbU%wM%{KGwVqEN&?nJ>^
z_N`=jHYmWGd~m<-2svaS3rHr!*m96VS9P505^BO_JSF{n*?o*`j^QCkH&w%=I1Otp
zZw-yXKYvPeUArtsSjHFhT8dwOn|b-nf>)Yj9VI_v;6uF-itskx+{{?C=5<no8S^@;
zkqy(d)S15sp$EmG+d7dVx0ZT$?I>!EDOu+4<3!_E@$>R(tvGZYT&Z5g8Kub!7e$%w
z&#fX?kyg=D@TtT+gut17+N~!g@)jjul?-#2=YOR0aadk8SE>u2X$`j0$CrP9FDFq-
zo5Ho?uB)uJJAFmO@(twNxa74R%&d7j=VCKPZ?he`C*nEA+M-ESn-`bSCz6vhF6jz1
zEWN!S(4tTeoR7S#f}IH^rhPHUf;=X+(}{MWdv1$UNxhq|Ue85O4HI*24=94@`^e7u
z-GAl}RcZCo+9<NrPv-blC=fsWe5F%8m8*bt;#Hg(x@jQ1^jg`LS}OW7iLa863@27M
z$(64L5oUVY*eGS3!wVX>KUh*h7CM?#Z6e?bYoJgcw-$>ZYhf&yFgVO~Ufeau{N4tV
zvg9)jPsUh1s^LQ{Mm?&+EbB>p$*4*zHGkD%Iawb0;CLH+x6BGUdnhd!f74`Mk;A@X
z%AQ@1YX@jY)pp6<_(tp@w$7Ty4Exy9C`4<$YtCT^UM49(>1Sh1Fk-qi$#zRTk_`ak
zLb><YTeu8@&QR&f?-*xR^)MAhFIE@1^hrCpa~$ks<3QlAS?J&ec4XbAf&7UbHGj}X
zqHaoK8|DwXWK2Lmtd3))SJ9iF>c=jtJ2d&tZYspJXF@BQO|%%dImk_WFn4;L57w9k
zbg0j+To>|0`kI{zjq$*Ztm@H{#3%3%Nwm2^vx_S8$O#0b$1KecbxY-Aw2h^`xEVFW
zg0k5%40y5Db1OUpHs#jDu5t#s`hN__J)aWx$}iVOu*#PvP6SL_uPvmJG~ux=o0UZn
z`m=zi5TAgva(&EJ^4<>DP`3gdVww7Gi{(}>j!({_0_~cVNqKu?qL+-Y?>ca?pXstQ
z*}x~RofgR4)*jC+9#iM;qg{%k3#tW_2PRGD$O;*F+8Q?*Vr+uh_k_U>wSVZ-XT;;Q
z8`fUM5C41x)k;H!iV&^CHs*mWxnnCMfh^lx<VO<{9O>D2@eNAb37iT_BCS80kbP7_
zA}#1S9gM;gUG-XAHUOG^A^_dcyrXf>^`T0-Ydbv_Hb`OMdFfEE2t9*hf?uUjd^!}n
z94d98KI~DWG2PU<9%6i~lz;C|T@q7Bf5pXDT7J8!F&{$Iz(*GWyMh!8EiUb<;@I;!
zU==i9NSmuPbvh=B+%Zy~s0&Pva*U|4os2`OBXCbDS5oWQnRmccdg`JWMINU5v|5q{
z7)6BZ)HtSo3P)E*mctZ`v{u<2L_xC)vgvSOin4VKQ}q{yH5Q_GeSZoBo7A~9DSrOx
zi({8o9!6R|n4*12TIObfdc~2OkwOYG$jI_km7->03lJ%XB0)Eb;;2Vl+Vsv39!P5y
zG#g-l3O3Iik%8?DosVg*Zb&IPYD9&?TgN1sotB}$h{UvTm&xJPY4y^~I(aEBj<V%5
z>h+Dq<$wp)%howSxqo#*@-G#|b1tO9_uqdugFc#Pg#yV13!kQ*NYVC)-|9*~C=8As
zLqYNN@l_luigy|OpR}BG+Me#`o+6S=Pqh*+jnv4+oFPwU%DqEEG>_~~P9u~tDGPr#
zmCp~dT~k8Wf}L6p2QYwLj%a3YcP;Wo2<luROYhnXdD~-(Mt^07dTEZl^{Iz0*VEUh
z_{aCZ4)e%7GDc}Vq;j$y3`#2sy`Mc>8&&SWp<p&A^JO86PjaV%Sh+|iPgAw5D{MP?
zsoWoJzFFk>46d4J0c3t~^^7XGw;s{+HfmPROKouJWE!j@?%XSOIy;>FI!(O+jz+H+
zw+aw2Ohg<nGJm59E%eJ0&lHXBt7WDupQu&*S~3GYY~?8LC?v%!6)rme-D;)5B|;Sf
z)sqL0lFp@hIACYbBLew0PlfM?chp~aNaPb0QoxhLXTwuIQHZ~P`l48_HLWn~H?xot
z^@5YTRI3(p33(f}l8S=)Eorli!fJgT7U^J7lNi1=&2Hg3a+NP|wVVa^dK+MA$3qPw
zHKxR`zr4teT3RcH>H9qf_cYzz&qM*a-z$f|^4|C8S!b%}@cjCq%5%@WK)#0(>+`wO
rt=(ymP%BXLBSQ+FE#Uj+5Yztw^H7xxzfgS=00000NkvXXu0mjfNzo<;

delta 2092
zcmV+{2-Ekp5$h0;R(}9VL_t(YOEp$&kK4u-JwtNH;ak#5_U<N*izH~A`b!bC@Rxij
z`mH~{Kv5J)n%Zb!r?$1S9()g9nx2t11Fn{w=e_5id+vz8y?SYY^H>8|p`XUCftuW8
z7VMZpU^YPo(en!kAbc_KWgc}3Y!TZJAOiTJfH>luYny}_4}ZwTUtYa*f!{s7$s<%n
z3ANal?P9qA<irIWJAEh+j6mo|H<|j!4?o_2{)HK4sBnGv{IvU@XdaL}g#nH5IIa8G
zxTz2HA7Aqvd%)LUzx?UVo2n=h2{=I*#ek+;RSk*#h&T?o(73|n`RZ^i?(a6o?XIw9
zvfsA8Gm+v7Q-AgR1-cq8UVQTv-v8|MgX!mK|7rh+uby{pH}$QCq02G4CH4uh^yvvL
zL5>;4jxXDy*FpwD<`B0LVuM(*8!5znFqX&Dx8J_tVGuDfbnF}9i=v-?e!W~S*6S=6
z{h2NdxFc#|7Ka&ea-ljTr3m1JcdOhU$vMEgg5lw~M}K_y$pCzL8^3w|!+ipmYq;>)
zDqZF2!?B9v#8cc$q}jq(p`J{-URNUSX9u40{RoS+@2ofT*vQ3=G*ZghQDWsIN;5Bv
z!YDg+#XUaV_&(Wz#cf&a9S=PN7&9m&LVrB=V@C!Q+Z6i4uIu&DSPw^>8<fYTf0=0}
zR6CfK1AnMm?iHfM>HT=v6R-o4qi*QXdF-pEa}bd*NX-m$=Guj5iP;9*&+#b~r-k*~
zqR8NJO=B<`GAiLy3{%(7Zt~=z?V4jpaPFV2N%kIrRyUK%(VyTa4uc<rsm%i8*hs;|
z7y{vMMP|5hw2q_HT#lh94gc9W{1Ax;Uq;TkwtpScgJ<@K!m`RFFkY$K+q=)QKrqN!
zsSw62qd>Vrd1qaf72<Ki8S8V4uC2*=Uy{2cU382QhM9*}aOc7v>qmSQ<J^w~8$|fh
zf}*$C#{)#y>CBU-VPFI^JA*3)yqs(41S4bTkA#OXFjMSs<O?2HB3L|q#-3)d&dD$|
zK7WbRcc3MLivu(9fNLApG~+A|on8rX5R!(p)&i>qk+oARw3G@vH^>PYgYq1@e)zCS
z305@t8%t)=;nKMLsv?eE3sI2ZmoVCvr4vF9(+u{|X1gf5w_<bIzp5Gtvj~=#xQJbC
z>6C;i2bnq69y?9S;;qq*gW(ah^0F5v%zx83b66OGA@NaZ3r*AQiT&k7ZH1<7w@q7I
z^v!_zUJqT<cHQp86D#6-aeNJxIgXND`M_KluhylXb4S<!`qa>J1aqdm3|Uz1PfV&X
zAPm?rc7p|@ON2<I$vtEN@<0j7F#kBgSQhz_heZ}GROG54B+)OBG-86t9D%?~`F}j_
zerY^UdZD!Gy_D=0NexjOwd)YjCACy)83a}!+1$H@f9xn-$u#QujNuI71Q+|yM1)qj
zj$4&=;yWVDF}Vh_#Oz0$KhkN5da1%rDmacC_*FMLQwwn}n&waqp69t=Z1UfK^UVNi
zhT(VMd6S@QiZfVpgbPO)ms!BjWPek89ENncn)=D%?$$oz2<c7pz^s`@KKB%1Cy88-
zqJOu!+5Y;@q1M)?PepMm`hgF0qaGF3C(|$Ok*p7A5lf-V9X~aO0Ye<dlOfR8X}0YS
zCHB9#rYcXBR4i{+u1i0AsvAvetT<)vFlz~)C=uD~GSWMZ!p-uQ9R!UJ2Y(d&uCoMf
z1zaIAfhV`0alKIMeK~-Ywf#iaIpN~=>TKH_o8~z6H3`sK(vs`!rm9!WmZq(n(~etR
zs+csE(stO!_|b!Ux7}r4kWL@2-`D2U6Ot&QNkZ5>GRZCBxH;ES@gS=t#)Q*6T|k=#
zYrSocuGwaZ$iWyQFnvGvJAd2?BPT{hYi5;W)3vne;Ye1cplS#&i>8NWA0%X_Z6xl9
zz{cUX#vMt>$2M1(=%t*@NJVl3<(zdaC{*;4CU)H2kYtv@S*oHmRjjUKgvKx4Zk7@E
zm2%_TieSx*F<mOQZPzo-@N*bFHiJ==e)fnc79Q1}eD0k{d4n14S${$pO^IcpN@V-6
z5G+Ccr?>xENEWOUF`*#Plr>me%77KZXcm4m4L<6aSEPE+A?S*eSS9(}jT8Sl=xatT
z(p$USqgqoetzuc(aZ<$T1%1v~Qjy5w-+&qv&u9)$NC!hwtVFzG$opW?Tk(i#sR|=f
z-F^9dbK~`gs?)-irhnJ7a~AHPl96ECJR4dq(<Nl?iCGV{$R{8L{IxR0<ek;3mnou~
zei(bT=qGD34I8G(bG_x0`{Su_Uu=S>aa33BVHTS_-AHWPX&BK=XgkK13NrQj%o2E^
zq}8cZ%KgW8-5d-&bkKo=nsbJc(zaquJ+#Mz=ew&kI+is#hJTMEOFsVk{r3-t^3+z8
z`NuZtD=ky=Yix8sYGyhg7KkKHcw4cF$=h682MieI(2UiH;{Ep3pT0v=U*a*j+3np;
zwleME$JcN2gxWlMyoxY3!tG!rI(P2BRQgbs!({R-SMtnjSvB&$70(z~=wh5!XgwKI
z;LcJ#kGp^U@_+v8l=-tfb-noWA7AFueD?%;L?5I~O9w71*2$1?BKJw5_A?y!Eq1(l
zEtY@(`M)pkHnpK!`eyTFe>!||_q2HT?~d?COx1AD8-fsdh=0C$V3ykhRxCL^S*WR^
zyri+lkpl=9)FpZ45PuA{c~UaCels2hp&shUb9+eEr6tWG8Jgk(i<2#uTTQ_?0R9i}
Wn)}~#Yr(bv0000<MNUMnLSTaM8zgH0

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json b/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json
index af5ebe04cf..3b1da2fdae 100644
--- a/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/67a5373b4649937dd63dd94153e05e8506f40a5d and modified.",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png
index 3af1774039346e9d93c782bdef3367d85e240bdd..81f7b75d7bbb59bfd8b7b305b061c70754bb9787 100644
GIT binary patch
delta 2186
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
MNkvXXt^-0~f*({x+5i9m

delta 2231
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
FV1hJBRPz7;

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png
index 57f9a29657b67e7984c906d83ca9b5cc3d218c42..69acb7711555a22675a17c3f695e5230598504d0 100644
GIT binary patch
delta 2210
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

delta 2241
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
P00000NkvXXu0mjft$R&e

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png
index 122fb41398207e6033b43ef850e9133e71b91922..63c1502b8a7955f594121f1659eb34bc10b71367 100644
GIT binary patch
delta 2207
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

delta 2278
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
A>Hq)$

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png
index 2e7be27dd052dec7ba25dfe40051b9af101b3176..ad5094443b9ad586d2b45c2f4f9bce0d5cc7d00e 100644
GIT binary patch
delta 2210
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

delta 2277
zcmV<B2pad`5u*~2R)4rjL_t(YOD$IEj~vAnf7SOf-P3cech@!s+jtEd5eIB+Brie`
zu&{D{NFtQ~E}xSxQ4(1Y1);2iqhJz*jctq##Ky<$Y|l*JU42aDSG|7f>FGLNz3cbh
zEB5~RZ9%lEQz9A?Z|Wi=t5JI`!$e~fwZcq@ag2yeVg{@5(SO#ZM>Hi@4u~8gd{{)T
zgFOe-Fj3E`&)zz}tr9(dXw-KoiDI&XFwTQPK%_Tdz}oUjL}pE78_vkLzPNRJ^T>0e
zYRR(48^@NjM=aZ;-XRhMB{Xa+o@T0N5b>w?AV&%~d2;*C{rgE2^>iY|v>lhIgjq>S
zI)yd4t_en=GJnzU59f<$b7QiY&LXKM<|Xk$I2JfW!to|5Qc~&k)(LuiSK*c5Z4>T?
zFP}J8<VC~tk_1e4sTfe$BN`a61e#EvT8d`)m`1#0y2<oDv2}-BL9T^q@`!Dkb-Y-<
z^wMbvBj&<~iu{869Ous6dxJqR9{YX9S1_TX4S3D=U4Pq$pH#96>cz|?#oie9rAX`{
zdKe)*Sl8em3=x3i>+bz~w>EpEf(ML8hu*O7?JW}5?P(UyVxAuumR&Z&8;=v_@>U_u
zG7N_Tj~CLKw$AimqzhfwTg75SgB;J-Y{z!|Wf5)C{>U(Z4hq)eC{#4!2%w9g00?}s
z;B^56M1NC{$|tjemkS{+tZ9`|ycihWPSH>@Bavf)k{oB*6w~r?JrCiqIrSE027^{L
zPqIQG2Y?|@v?NyG4OkAJO=x<A_HDKdq}|es2p)JcLA3y)dU&F$DR`^)*7ouuTNH54
z=Fu_0&dDsTQDgOqFUjaB2)=21G7E$vBSpfc%70|Wl=%V&J7d@JL?;H8e024Cw+92(
z)5y>rWtGYaT_a6|^GKpf^hjuNnXhjg_DzN$mzHId5Cg}wRAy<bGKmv%>xNb|UgcEe
zDKKy7?#EZJUw-%EN4x)I0+~lS!^x2pYdH91b<1lwo8aM&%!teEWADCpV&lc1gx}tY
z8Gi*T4Ouy5?k43C`J9Z;Zrz#A7Y7`_{pBT~#U}RqKmFxkW;hDoee12o^dVI^Dzp3R
zaV|JVhUhlc&!61-;oDoV;DD+z)L5~3Q4SfKGaZWLRN?g3U)#p=+R*!C_tQ^yuU*;w
zbZtDs%+A@9^KhB&J(+lLmQxuM31+~dBY&_TR1rnmNGt-tyD&=fy@qToOJouK`}42x
ze*X9t__vN9+j`+x(@L=JUYC^syt7oosb_m|88Sy!rY<ac^gxuELe(>;#hB~LR@>Aq
zmYHCk5`!SP@S{_1?*Iar;Tof#?VKAA4$=*YjC@b4BFl?nwuHolktR8vF<HK%SbusE
z?;#gz$xn%QBmrb(0F5hGZ+!5pcNCSrd9wHAjk|Ig#2l<$yLlIu|L*eZf8G5%{Ly2q
zr;ENuzDa%4VkpD-K^-AcWH=fHz7trEYMBTQu#R)C?EdT5moBObDNNfsdFuEJN48!#
zav<Wl<A+~7ae^tTWv%_@(%XOA{eL1QmI`ZDkcr}84J>P5nzBHGlq^r~KMEnHsOz#8
zNrPC(lK%diXaD%&)vnI1vNSbelZh7K2x`$4ObdHNO5zV6e*D3EJ7fp&ui^LR1#1ep
zDUY)3_Je)Y7<TdH!>6`?Jj-e-GaLpSpi;M}cA|pUKm5mMYono*LMx5L=6{jH{lVzQ
zjhpaNOSB&@F1>jk5lFgv0$Ov#tg&GRVleQ%dv|UtsI}>GKZ=$Sukb*O^{m1gXbYgd
zaE|BPE2p_&w#Ilm$MQ5>;B>4u0*>zXbu^pD6n?LYBwi-Eh4v=Pb!_;D%B%z^rK)W~
zZ3%OsBRq?Vi|1a!`@dg(V}Bav*WW+7^W7tu2YTb|neHDcO)6tPqqX(J;Ahr2j4MKC
z&G!L0#SYfH+z@%T$g)MlQve{Bpd}_~Z8W(0*_Zf!ycfQA;mqZo^FQ6Wuph$9bnW^V
z<Iw;rU|UD&Y&!Eb(`%j_j1P!ic>T=w)=M{T-q2+uD-E}AAsy<pbbpSv1rUv(aJU<P
zS9bsN^Y`BP^GDa-*}3qH8~k0aDvS<My1)U&B1UHuqG*cK>%;#|Lj|7Uu}lv|M^`eF
ztfUG}Q==?2dw`830JkRdot;;^)6aJ^vRgf)HlZdVMQ=n6oT#RytV)-~WI|Jjm#7ki
zgaeQ7S&rvf(4lrHGk>B7lYs*~==#Kv9f5wa^O{Rd*RdrX$XJolCsEc}B`lPF%rM7g
z8mhfcEms^%t3)kjF(yisSTw4hp6>+=Er{<w_$JWNu$FKI;0RU5gx(UH=n$er;}=b3
zQ0n4}l!jQMGQlQvNxX}?!Jk4rMantlRI+Qne4Daj$=0NJ<bT4U-N+drwSZz-WF%D<
zWMuO-z(D{ML*@?Ag}51TSxH@JYS|8;u5KTjj5Iz^ijt|i;AN|<m|9uAnz=MOTIHqg
z4M^{6tSu{OWWXU28DmRCjkdCeT=&Qs@v7!lz#FMD6swv>Q?<d`=3*JCrzhqi*GZFn
z-m*#Go9Hynn}4dNtf3s$gPOW*c)3CgM0EvdfN4+H!>136)~q13Douq_?5S#$wjpAw
zQNEaKhC1||MV!ip^R!0Gr?)R&+?&VCJQ;K@kkpj2B+4tn53VSAT_V%*0L4AGhucb5
zLqw9JQsIEs7Ijin^muyy?5mWeT|64qU*8z{Ly^yK-+#N`@8LdEYq*LaHcTx@=v1gJ
zKW>%tIIbGe_mL$lWO7pDzU8)552<izIiy_ET@<*LZXI)ro8Lb^=?P&EmIY_$&TRK}
z@#-3tHF48JS}LSw#FhepV|@b<$`8{b%xQ+3S1|be?swZ8lT^U0ax_^Bm-FW~4n+^Y
zF5rF#H(p3P#0`P5zD-}=-$Ry50YkJL4iuKMLOLFL955g&a9bd~J2&7#LuxGDJQyP$
zg6y(N9Zlt=$2CoYUX?|iTNFPSOiOfJK}7!t|6M1`x7PCP00000NkvXXu0mjfc)@GD

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png
index 48a07386adb8a90c544e656f02f57d18b7d1542a..50b465c63be30104ea43b38b3ae3148d5c12b239 100644
GIT binary patch
delta 2206
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

delta 2310
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png
index 0969ca3ecd71c546d306133c643d8452f1b607c3..c6d8dacab13d04c03d2d9f6b1a7c9507b9005150 100644
GIT binary patch
delta 2203
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

delta 2320
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png
index 89314482b3a3b392d3c07d3092e1ec06d182fe21..ce5adc65b5d1ef61d0c96091b9af8d7d0de684e4 100644
GIT binary patch
delta 3191
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

delta 3188
zcmV-)42$!j8J-!CNq@rt01m?e$8V@)000a#Nkl<ZcwXIGTW{Ou8Ga~<BB}Gy=h{hp
zcG46{4;!#{z>1-3bGhxd*v0<OuJ;3mVHe%iws!3<I&8~;6kUrJot?x^+Qdn0S(bI6
zB$A>e?s-2s%X(WHV7$kmMN*W^_xaw#^L`(#1wnu)apU_})PEg}{jNGL!NbsZ(1VF#
zJcE%YXNR!(dlVS3q4A0d4DSEq^Br}?cSYm`{D=g^`FdfxjC=~P+a16xpwa20P%Q8r
zo#q2+xu|u3HqG|AYb8@C=S=+SH-9|;1gxxF#_fCeXnY$PohM@ktW=siF68cPI){!1
z4NoI&BzPu3Tz?CY&zJDtM>j(e5IcR14BjAsHyWaG+`!iI5}dw+q1RWY(;;ZGgCdR3
zaKD%oUm$359wVS#pB#rk<OIlQ3d~drx9{$uNVl(4a>#2Q#ysy1fLVzRD~IW+1xO?`
znl5R{V6XW!8+>;}Pk`srN=bkk(sXH<MN(oQldm9MD1S54Wr6Y>GIPr~uzh5!3(y(=
znF|-0Ad{2t2!Y56NHC{MQcEjaINV+nP0!~DGxxV^$TAoX>JE8op>}*CXAz7^n%!bz
z44=QE_kfgSdLSDxrh_qrhl18ukx@kr3pj?QwNOg%eIg!DD8fbwp)NckC%~kkhLwd<
z0ReAE<$v^m$!`FIE?(1eJmN)G38rCj@0r>3gV2cH189b6Qs%H67gGkzxCS#ZhHG~y
zdeZQj_{XR~^WqqI42+lsJ#Hcv8#8>u<2fKegX6f!C3Lg~10{N9vw6h1<%$*Ls~1r$
zSCkj{>Rn<aMN)z#JOz;pp|@UH31(NXp>h99B!4M@%v=uL;|FLt65~VuOq8F&?b7B3
z_I7S_PtHi7Som!F_W4$VZ@o+c)~@6J*SDGUfF8{$GcjbQ7wH*3T;5(X78BW{bb?qr
z`@%BNKS978@xkBDxe~-c3f=_l0?;^VWB=g+w(sm=d-nnE@7<%}JNV}Q9voK5g>nH}
z+<!xPs)|ZAKlxw?L{31=)ZuiFz|s$&V>wgGV{YqZ%r9KP`q~QCSJ$z*zKEse6(kt;
z9bRKuDSC&)jpZ^VA`gMLUtJ4k=H~FE<EobTpnj}Un<{oef;D2u#+Z3ej$<aKs#PXO
zN@HbwfcM`2Yp4(iO~B7?{3NifIGViyU4Qox);HF8!#!k;92#S)c{aNvHal*=kAdA_
zsZXNa?IDpcA&uR~|NJzR0bvoEfM5RN-Jn&kQO<YqP)XGQ3AU;-YLdX7BG1Iu9wxCg
zRT069VlIol+dH_meeZk|@b(X1QD1P-Xn~zAUVG_fxNc9mvooH^*U^ym+v}j)IDbUC
zR7R~0tT4WJSki8N{^j{5;Of@Of4|_$){FRRdxv{;eVQe68&bcM1<F{zfoyRB^^>}i
zGb{5`*m>}n1l);~fY4Q7bA5xq<Jef=r19H4Ud7h>8n)Kfn88=DwK{`Jv4pu|723(2
z$%mdJoLL$C-(hSt8fZ3-(QKYz$bZf69J9XHQO68jPRCFLzU!(PpQv$W1V|iwYkFd2
zvvubdqrrjCx<EfM*u=1xPivGsh6G6T2u*-7X4}eF^EBb<r?1l4=Shp}_m~`66WGcM
zv{V{eLRwrBFglBlJ{&?5P^MJT(Wkj$%z$c5LogihxXWg?2Bv;Cvy{6oy?=ptI*s8l
z45Byx3<z+f#1W&RLn3^P81GY}>KPM#l%S<c+}Ge41sW{6KaDmmHz{Y4l&SA%5t@Jw
z4eDwZEHk0{_JLJF+nNP(OMEYdj#*Vrj)F^vVDdAP42fhG8r$Ef5t@J_y8|m8$K5--
zG$@6Gg9os?O$whbx@>T4yMG6pPC`FWqM+Yl8yipy4kjTHH9`~M$-I3vhfF#H-EB_{
zrT^RgE(}c);s_S2fK4*mPipwyE7#fdcTaP|Bz&SoXae#~?nB0Vo9^C5mgP=Em9bt`
zRlkl3lYQUmsX3grY7DnN`xHyrF-EfL@f;wu6n^#k<>2yc6<vN!Hh*wYu1=xRI>F-X
zG}`-j;7F=ZG3J>k8f=l0nx;tm^4^jBb=>^qi}T$J{P_AZzaWrA&)*i@K^Lh+oEcw7
zhr?biWH9Kl`%x|*L#|Lnjma=6WrDaFa(O!}LWh8O@|bQv9C%0#T6A>-^<e@X#zl%F
z+-%z{kujLLJo0RTwSVytGf8@i-i4;iN?)`H?E!Dn1LhVM5e%5{ObeCSCA8{~q4ntE
znQ5g5Bno7f$8rwQi)WQ&_73;t<M{0-`{z3Z-hA~+FvlFwtkszW1<&T{J%?T(OFvQ-
zywktqumW)4H`bSdCwC(!Aan>w8(5>Xb2Xi1PpAIZFhh}-rhmO@$$h+pj*mIRN2l4s
z=BBjId{Yyl{C}VXWvR-ix)Wq`IkjH5-<IciB)%ugU(Tt8jhQs=?QLT&Ba57j7@mt7
zp$W*)=w7db>e59fLTZ4i5;FNX${gHsDTiXIj7)hNGFv!}W32MLJOLmOZ4fm=6Of|N
z38V$?9^;V7Pk+Jgt2seSx`5Ub_$Lj@q%=v$py~FMSB!lRcJJAuNK^<-KoCz+?3xG?
zdGv=P3`ZK`nJFCg9rT)xa{aj%Dr))L<B@BYF*Nf$Xi*HvlRweoOp>4im5|A})^!W9
zF>Ab>(^(M`fm-fTwIQIv0X2f#$IR?Jaz>;DKp`{%34cw#!a*z^;|Obr#d<W7r;;g9
z^+NMU@cc=%KXZ6P%?Zf*K-38D0fdaBm81vowM&_EapNjV<qGsn2|ANtacYW*P}Y8B
zN<?H3KS7d=Ao^}Fv=F+!wGkjO;ql7a9KPAUi$1AHGYfV&<TCc@WCH0-8c9Qk-H|mt
zAImH2IDfjojX&QCx4s`1p$T~BjUNQ|z-8CxAjPkG@zNB%AWIYb7>^7jP1e1U813Tz
zLskWil<>NZY66cQ*YM#N=UfWE`_p#<S*GrFx_H!RAxUS@Sn`I9aE&CeP;wi>^)=ev
zN2NFmkFI}pX$Ft>_wnJae@99{=p5j<8ZuT2J%92j^FOQ03s_mdNUgt!Ypa)VZIj!|
z5?)+gq!O%>lp!pdEYUxZ9y(%#_JE(?xDmi&+grC$KR$+jYSW0^Y5^-kjN!l#$)q&+
zfq_z<$uQ_+ak|Kmc!ZBX`RaU!Kv=wSd6ooLU}cNUjWVI8A)C!XOC+I7!$4orVln2F
z0Drr?57o1R%NJ(hj`^ND#Cz}mDHMUv0Raoa+U1u}?=d-2CLh!rY@;-WM}V>18uNva
zBAG>+tLaLa6-7tYGEk?M`28O~INt=ketA8ZpD*CBudG$)7Bj4&%qt#MqaYU>Gkt2<
zk*Rl@J5?^w1IDV~_~7s1o-jERAruZBB!6?$9DG+vq(!=aw^hU4-Cf+<{f2J8hkxDK
zQ^sG}+Te)s6Lt?wE2y#Rghk{8ScRF>wwOh-*F^2`0pmP@tILa6TAjt(>Iyd3R=I6p
zd;4>2ZLY%eTwGe1rcZ>w{m2REvL0qqY?A26nl_n2vd1Qxb_cP>L-ZV1J!_zDG=E64
z+vEpSqzp;iWF<NbA}2sikaonCIiBnurDe7m4$8+R2lN^+GFf%4AfVwxwG4YUh@1d8
zVmybGrB0eDGna*#$|B1H5!94eNVXrMm`y69<MASE0mq(6&=hwGiO2~^nF*FWUmll`
z7(n2*=>;O1Gtm1-D9HL^;Nj%)*MCUUAxyND*^|d>CRHO0qW1u=t0qfQZf$a$$W302
zr%w>E*i%golZLWaJ#uHHk>IQJ8(|SS0fuQI>mI7HbbR*DgEpn}0Ij}{qx>bb;!{BN
z0^c_=zjTo<P(?DX!69uUO_V@5MDGEEzFHkf(?rMfSP?8-;NaW6KALPLYJcS9=;#DT
zoi@fp4UhK^(ds&=cRKP<CZQ2M0mPvnsDk$9>#yVJq{Gp-!Oq|rhO7wme4C{)8$7~N
z$%5y*$mhOw)ptVV1UzA`hn}Zf2e|q1N60bzn~ZH!9<WmL2_l1K36}2Qw=th&E$Hz*
z$41_oNaZkyycc-w+La)$2W_~{P<LsYXJnP!jj<(?-mn!&oNLHaFj%Bw9!)gJOC1Gd
z3q}0;cjx?{r-gu$?x4eDpOHm0i3REa`A-s=Ii^<TIe7x@^giW<Wm6_rOx?g=J`3}-
aIq)CvKk&_<eNMjs0000<MNUMnLSTY=fgG^_

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png
index 79fb38bd6ac42893ee9a5f6b8f474289f81b2dbb..dd8b232de2603ce230615aed76d020399506ca91 100644
GIT binary patch
delta 3164
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
CbL$iU

delta 2946
zcmV-|3w`v48Lk(QNq@rt01m?e$8V@)000X^Nkl<ZcwXIGS#Km)75=Jg@6C2EUS^4x
zc!pV(O+-W@2?B*xVoBZ*<N=AF#S0JQg(%_$2@N160)l{uB$FA>7RQs>Jht0*Z&h7O
zck!KD-A>43%2L_+Jh!U5y4<e&-E+Qk&b@cEBuS7bzWI&k4u2jX3Vl?Oz<`HD)6}&P
zCB*U>n|#89{8O-#F5da?dV1rRMD7Iq`t_eDgW(9tpaUBkNeJMu+k?Od%pwr<pjjo}
znLejgKf$|zK`fML`0X2S9&ZA^^}_Q>5Dic)mDPLS@4>{7uh@CbLn!?uOxr@@lN4g|
z#FnMwum8H1iGP5?_?$aDuLqBv57j$Y9fbs&qi<VN>Os|K#RO9&X@~RZxf5VufD&E1
zI37o_15Ft@;Q%GuK#AuHx>%g6tIyl59_F<eJ9~TSeHoBD0Wm#a9zra=rmhI~Fy|(i
zldE(C3IV37)0hdjFkh*nqEQ+vrV`Ao$ejS&vY^=&xPNYimT#e0w9qV0BcT_Vu0bO(
zVDUb=XKgz|xmrWps$t7n;yp9zmt;Wh1Wc?w^>9W39ur>kJ2dq!(BlO!3ZNSXM}ElY
z(5JcdQPvMfymKc&x*;8=rb9DLgo%Z%0AT+W84P&p=<^=(f$0jPgNQ@erekDB{uZE2
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png
index 89314482b3a3b392d3c07d3092e1ec06d182fe21..ce5adc65b5d1ef61d0c96091b9af8d7d0de684e4 100644
GIT binary patch
delta 3191
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

delta 3188
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
aIq)CvKk&_<eNMjs0000<MNUMnLSTY=fgG^_

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png
index 79fb38bd6ac42893ee9a5f6b8f474289f81b2dbb..dd8b232de2603ce230615aed76d020399506ca91 100644
GIT binary patch
delta 3164
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
CbL$iU

delta 2946
zcmV-|3w`v48Lk(QNq@rt01m?e$8V@)000X^Nkl<ZcwXIGS#Km)75=Jg@6C2EUS^4x
zc!pV(O+-W@2?B*xVoBZ*<N=AF#S0JQg(%_$2@N160)l{uB$FA>7RQs>Jht0*Z&h7O
zck!KD-A>43%2L_+Jh!U5y4<e&-E+Qk&b@cEBuS7bzWI&k4u2jX3Vl?Oz<`HD)6}&P
zCB*U>n|#89{8O-#F5da?dV1rRMD7Iq`t_eDgW(9tpaUBkNeJMu+k?Od%pwr<pjjo}
znLejgKf$|zK`fML`0X2S9&ZA^^}_Q>5Dic)mDPLS@4>{7uh@CbLn!?uOxr@@lN4g|
z#FnMwum8H1iGP5?_?$aDuLqBv57j$Y9fbs&qi<VN>Os|K#RO9&X@~RZxf5VufD&E1
zI37o_15Ft@;Q%GuK#AuHx>%g6tIyl59_F<eJ9~TSeHoBD0Wm#a9zra=rmhI~Fy|(i
zldE(C3IV37)0hdjFkh*nqEQ+vrV`Ao$ejS&vY^=&xPNYimT#e0w9qV0BcT_Vu0bO(
zVDUb=XKgz|xmrWps$t7n;yp9zmt;Wh1Wc?w^>9W39ur>kJ2dq!(BlO!3ZNSXM}ElY
z(5JcdQPvMfymKc&x*;8=rb9DLgo%Z%0AT+W84P&p=<^=(f$0jPgNQ@erekDB{uZE2
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png
index 3fd3d1f3a2608362673dbbf1a875b989502fcbdc..e6c25bf9542e09ddf61db4f4d36e5c284f327fba 100644
GIT binary patch
delta 3149
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

delta 2859
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
JPDHLkV1k@(WV!$V

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png
index a9d7e7173785fed126e8dd104c6b89171fb666d5..d0384e6f2b4af36283ac4b470bbd10fee64c74ee 100644
GIT binary patch
delta 3086
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

delta 2864
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
O0000<MNUMnLSTY`nP_+b

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png
index 3fd3d1f3a2608362673dbbf1a875b989502fcbdc..e6c25bf9542e09ddf61db4f4d36e5c284f327fba 100644
GIT binary patch
delta 3149
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

delta 2859
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
JPDHLkV1k@(WV!$V

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png
index 970ef1f1f5d37be02883f75dac02757445580d97..45a43655f63538bf0c87c3d80f63f39cc7b8f211 100644
GIT binary patch
delta 3040
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

delta 2795
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png
index 02a1c5c63bb30d07f843d03913d8932c20cb4bbc..81f7b75d7bbb59bfd8b7b305b061c70754bb9787 100644
GIT binary patch
delta 2186
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
MNkvXXt^-0~f-km3f&c&j

delta 2270
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png
index b6720ad5a32d08322db2a247b5d749d2fd88d04b..a82cf0533717421d96cddf6f73b23e8e8b90e690 100644
GIT binary patch
delta 3240
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
a2JjD$Cgg?o1&2of0000<MNUMnLSTaQjPLRQ

delta 2899
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png
index 9d1da43e6f0a0c4aa7f797d23d7f3f72bcfba1ce..88c852b396365e743a5427d4cecbb210bccfcd09 100644
GIT binary patch
delta 3105
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

delta 2592
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
Cy6jW{

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png
index b6720ad5a32d08322db2a247b5d749d2fd88d04b..a82cf0533717421d96cddf6f73b23e8e8b90e690 100644
GIT binary patch
delta 3240
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
a2JjD$Cgg?o1&2of0000<MNUMnLSTaQjPLRQ

delta 2899
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png
index 9d1da43e6f0a0c4aa7f797d23d7f3f72bcfba1ce..88c852b396365e743a5427d4cecbb210bccfcd09 100644
GIT binary patch
delta 3105
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

delta 2592
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
Cy6jW{

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png
index f31f3a6bc985a32e1d956f1cb578bd55fb0843a2..ba6ac0281f9fb64913d60d50c23036cabc209da0 100644
GIT binary patch
delta 3114
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
Ef_zHf+W-In

delta 2507
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
VZdMag0LuUX002ovPDHLkV1jagyWRi*

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png
index 7c18f9c11a717a893b219d4495d07f6801e43ee2..d0384e6f2b4af36283ac4b470bbd10fee64c74ee 100644
GIT binary patch
delta 3086
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

delta 2518
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png
index 8737894cbf0f7b8e5edaff7ed5d4fe981dbaf434..ba6ac0281f9fb64913d60d50c23036cabc209da0 100644
GIT binary patch
delta 3114
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
Ef@F2y!~g&Q

delta 2484
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

diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png
index 15f74bcaeed2dbd44a6a4e062af82cdbbdcdda33..45a43655f63538bf0c87c3d80f63f39cc7b8f211 100644
GIT binary patch
delta 3040
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

delta 2448
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
O00{s|MNUMnLSTX|>ZyJJ

diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png
index 60d1c0421b3fecf74c453715810e8e5ffcf32774..84f71e4833af719f7573047e0912d80edf61c378 100644
GIT binary patch
delta 687
zcmV;g0#N;gd)Wn$BYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI
z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW
zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx
z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o+gecsz&)j)@6nB7H73mW37Ag7Y6d$N}B65M-ayn5=cUX
zj2g<Qz(SN(jeisqDcX;D_=g>Tl3X&m%3$PJKou$^#}EDozq>UHQ<H8|AO>{5*!IUL
z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT<rWBOtg9TwJ#`c@MbU0m4tZWJr$WrzsQ)
z!220}Qw|uq1^U+9-dg)OeE>4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t
z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GV2?-&#4KDxy0M<!FK~z}7#nwFv
z0x=MV;Rz_%g=G}0wekSDjpwlS0JfgPJ6XAvXjsw-D`+P!?rMJKCl`2L20jRY;&aYD
zjV6wWU^H>>y?nqYewZA0Mici<D|dk*8~|hj#&E2wmC?kP>pAZQ{^9p)f5#UPgNG2#
zMiXaQK?+X3f>fL|AO|N4$i+zlO7P-<QoJaD0?!Vh!m|P>@#Fw%JSl(!j}G9%qXIZ_
ztgGJv+_<%N{6{2#&lc0+3rOLY)9pJz68BBp{}D;!y%lKS?-gj_+s9^aG;u_P7i^Cp
V9h$cs<NyEw07*qoM6N<$0fKCFH4y*+

literal 15748
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
Kr*Cods{aE2tbMlt

diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png
index 1ae08dba8877a734110a8725e09d327a12edf277..3655b4b9d1598142be19b4db57ba0aaeb3fed4ff 100644
GIT binary patch
delta 661
zcmV;G0&4xSdcXycBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI
z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW
zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx
z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o+gecsz&)j)@6nB7H73mW37Ag7Y6d$N}B65M-ayn5=cUX
zj2g<Qz(SN(jeisqDcX;D_=g>Tl3X&m%3$PJKou$^#}EDozq>UHQ<H8|AO>{5*!IUL
z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT<rWBOtg9TwJ#`c@MbU0m4tZWJr$WrzsQ)
z!220}Qw|uq1^U+9-dg)OeE>4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t
z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GV3IPN_*4_XB0KG{>K~z}7#na0P
z0znXj;c75}Wdu)pGJuKCB#gtf+@lOKw*?P+6UAM39^GA?!1q(o0P$jsPhsLA1PBvP
zDftI{;^)ofBuqSwcfSSZZ~#65OL*812Vvs7<JNY8HGH}~>;g*goby$fXSm51)Zpr0
zP>ZVuwBTw1t++}+58fTni+2TR;LQPAcvFBTULBx~R|Qz$#Q|1$QGg}B8eon84e-Dh
v1HACr08jiUz#IPxVBqfn77hTy!~x(14wUkwK{{2*00000NkvXXu0mjfpVcXg

literal 15665
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
UTMj#+^-^<db6e=C<+pzSf1@u^g8%>k

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png
index b20d5ebd5efacbed1185a649c410e9eee61d80c5..41d24e9d2c47761eb99532452d5d92a59c25810a 100644
GIT binary patch
delta 405
zcmV;G0c!re46Xx^BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0YgbdK~z{r?U%ud!Y~kqtGH0;p-9-HK0_bFH}JkEuU>tCy?XWJ
z-8b-gy2m9*4~4=Cnt!%aZNxUQE%A^ahS+v8^JOArGD?!<5`Q=p0fb>l4^b4+IJELS
zr?DuC8vv3^De1$|5<(C}1%MYwz8A+`mSyls$+LgW<2Vk!<YL7+YXIBHVFw35$e&ZM
z5Mnl^<cPgKFDrm?`JI)*0gjkZzU!>}<Vv-L=@r<hmFp8a>%OWgHY)J_YzqhgVhAYw
z{GicR#qS@DoPQj@bpU+}9)#ow^op5)Hv({SwF3M%tjz?XwE`?`jg6Vg7+@%Q01w~+
zJb(u<2EZ|DW2R~Z;L}X?1?UZ|jZf1iwN`*3Ua_|1(EGJy%D+mE3I8FwNn23b)ROg{
z96~I_L~Ny6w_U4%vx|xItC{o5DLpw+5L^KS;%bH*st!1P00000NkvXXu0mjf?ijG!

delta 1581
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

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
index 4a03341090..888b3527fb 100644
--- a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/plasma_window.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/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png
index fe379e2fef50ab07c64a4f9ff75b663ada0ee10f..a4adc74bb5e0771858117099462f9ab51715dd47 100644
GIT binary patch
delta 739
zcmV<90v!F15c&m>BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0*^^VK~#8N?VB-612GiGPf;jzC~}IEodnko4zAM04<NWZxjO0x
z(9zY&UGM|A6juj_u7XpYiXPITP*BkPj~7WbXRmp-_wJG({C|1jY?1fBT#}bu7ovh`
zwOXIlbfVksvT_h%K&@6w+x2=qjnmNSbgE$hl24L^uI8r_Js^(bH2JIe_Hr;7;Bqhh
zV-9v7w$7>P#3DrzAo)h4fo3y#ev9&mizovWJ#9j~vC^b#Gew#KxT|9(OcH&~8F2;x
z(*$UJb2U?3M1LA!Qd?V&MlbJ~;v(7roxJJ|=n+=YN1YMh12pEyZ;DH4444(c0E*rc
z44~*O>|*F<{r-fSW2jXc7BNjsW&NjDjM(Xvh3m&32WPqf;#PB9!XrS@TY>=;y(Jhx
z(HV^DHkAdo0hsEtq^mi}unj<xS(2VSU>kr%PL@=?{(rsEsUC~D?D0(t+W@TaCP}gh
zYy<LOnxGJ60^0y{<o`<w(*!ZF3lW#YO%y`I;V>GFMuitc?0?>Fx2HA$$%9H5Q1tOO
zm$?jrk_nFhMQ6Mp1n;&Vty^Llphk!elf9$LY>BBwPA)0Z<gpfz#9RhJwGc9sXP@W&
zC;zb$w11x4o6^avo**iDz&5~kX0L_BB_|Kq2IzBoo3JM!9kv1L?tY)u|5O=FU>jhL
z^rp%J+kmnY44~*O!2pWhQfMIp%$KDvmab3r41yIT7E_o?F{NhBEc^YP>bxvn1i=7`
z-VzL;=q;r&K+OtPaS?5Rt|l9ncMr7aqt1x$0bJUIEO8NOfa=<~yXj66WPA5Oi;Fk|
z%;eST@7KEqKSf`2Mw$U*$<wu&BFX@ryrO50^nZzqh+@e5pU!&!<7sL-!RrB0^aag+
V9*_keI>!J2002ovPDHLkV1mglQS$%*

delta 2050
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

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png
index d75684f5d060b5e3ccb613eb3af2ddd2aaffc192..b0289b7d65a15e6f4a8c5b4862772304fac0d388 100644
GIT binary patch
delta 712
zcmV;(0yq832;T*eBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0(414K~#8N?V3Sr6G0e;XOk2>RF|@r6k~f*>qSVj#T4|g#aw!A
z1O5g<K@T2Uya-wq1TX#xq3uyGMORSJ8rO)Y7Edjq#JH54s();{<HWqV2p)Dm;X`H~
z7~b#OLr9*??Cfsh2xffWkEE1Ew3&&bsDx4rb^$>Uv{alLblC~Rkn|bY1=Re7Z50!P
zE<2kaU$`i>U>C49^Jdu*&T+JvS^9Ko1*I130yaupH&l!cy6h~rE<Ql1MGnb^<A}Wa
z8uSMd_8AaXcYp4y&|b&E`*YV(YQZkx%Tni|3T*)w*2k}*)Pj8pB;DQ-W#DDBVV?o7
zX18yu&^`&yH>U5Q)WYrpNH)@5N*Ywy1#n{pAdSU%0pwj^t@v&kr4C8GJ@*(j3w8-0
zjl~K;8VgxKu8`9nPM-ZroW2XFo0&T(Gn1w=xe}d!gnyO=vVf?z{}g3r(lkAseObDV
zmId+>7;y`E?Qx<&exyZ(JOje&j`j?YsXUzjFwHsx$O1M_Z)u+cgp|o*tIB!~pl^dx
z9O(|(PiDw7V14H8D$2~LCGfNU`SM+~ERY4%{Dm&c>`3R^X7v0lIu^(Rf*_D6vm?cR
z_&U`7VSn^rKo(G`RQkW}YN4(NJB_GOM#}<Oz~7z+c#~tob=|3B<0GQ|^}C4o4t9sf
zZ}qOOdY&iZI2O%jll&ei*qb4wu~-2}W3d8|#$p8^jl~K;8jBTxG!`oWX)MMIV7(Xb
zQ!ba~@Y%qV!n2il@8I`wZ*pv^c;=+|(Md$N+d<tO9{-bid+z`Kml!uz0Mb~j0Hm>4
u0Z3!90+7aH1t5*Z3P2i*6@WApA$|csT^o2*)CZ#g0000<MNUMnLSTZ6!9-dB

delta 1079
zcmV-71jzf}1<MGKBYy-ENkl<Zc%1E9-HzKt6#mYPouo-ffo`@Sgesw`MQY!m5;xrU
zq7Ts*=yUJ_RiB}i5Vu^egv2!x0#va`l_+6pck9j1+Gh?Ij#Jxfd$%2%F-|^dHDez~
zGxO~?=bZRV2#)dO#&^$hx5U6~E)*11*&iO>e_%7dXY=7YaDVgq?Ii%&tVtvSLB)L-
zX!0xVhj!yTC!lvtBm9Q}y}qFo02qi-0F?hxwcU1n=LGD1H9B6tj8+_&2mn@pMPYy6
z^8sM_XM}6_hNCLGEu0f@ba1+VHsj^yhJsnmB0wMz=%a(vL6zNheCGu4T$CQEApi&<
zX&V8=b3v8ec7J^51Q21h>0k701LIpek^ehdLIADezoPzS?C*~j5RhI(QU4;l9a=zu
zTR3-u0A{KF6u<(&m315Bp1sKa&S--Irm1#@cyUR48M_tQK)}qhwL%*RaEh%bz&g1)
z`1<)bHlM%u{TGjH=U{`aSHO+{*AsA!ItUo2`qP5z<bRoTJfG(5&QJ#d>4YVpz|7Wd
zkh_=koujTTkpGXCwfVkt)I@;vvu*x<($Cx7qlPa-`Nda}P;~7UTOS3i6<`Ft^mWmT
z%H(Bc9WOEKhBW~km?dc_QbfEokO&YqLZk=^&{v2^la$%&ScDC%2_Q|s0e~1l^%VM_
zX+N<g1%Hf_pH}lS8-B2zfgP*~kTY{jkF*B>(HrK)3l@op0Fn7&NC4np)w;~)8ukPL
zXVDvGF|k9HP?CiaARtW~9<wR4*^X}uYXW}#`{$v8qJU4-P>-eH5kKG)n&=PHwxsX;
zouu^y?%cfld+t^)(~IN22>LuX;pFb%k5@k~K7R+m&tL!IJSS)(4=8<C#|zo0Kv=8`
zn{}WG0?KoJ6PLFEDcUMd&{QT^r~(nQUO1(kp<6Vy1=cFa=KZAO^FHK>v_%E~*%lB$
z$OBe04q=E$tIiUzz-9|%3z&Kk59fWLH2|FO>rQTg00k-_fP{r6clyKdm>GbK^~AXf
znt$2?YXxL|z_x_JloQO=@ONSGTo`nYCUWsHN=n!1Feuy(5j3HIq<)XI57?$KSn31v
zVQ|iY^R3XZ56DIVF>jq8DVVXI7&t}~1f<GfSp^8kXTJHABPg(ealQ?lOYrfHZ=c@U
z`!XOOs<-FAJex(I>X910Jwciw@mzGVJ%3-&j=I45{Quw+4<K;%OmJo!rHib!pdADN
z0IAp?P+pZ81*9TOJ#bEdg4+BZB+e2mu|NkEKp^s9#Ov>SK1_a2nJv&g1r#A$LObUK
zJEwrnEc94iCN=M*0?7YZ)8M+-?@jd}YdTj>@0J1#jDRH!UqyU$Fh9-wJ_ta;u`u`!
xDqxofV3!8~yF6f*2PD|#0oCZF0-WUm{{oTD)vp-+rab@v002ovPDHLkV1l+I0S*8F

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png
index fe379e2fef50ab07c64a4f9ff75b663ada0ee10f..a4adc74bb5e0771858117099462f9ab51715dd47 100644
GIT binary patch
delta 739
zcmV<90v!F15c&m>BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0*^^VK~#8N?VB-612GiGPf;jzC~}IEodnko4zAM04<NWZxjO0x
z(9zY&UGM|A6juj_u7XpYiXPITP*BkPj~7WbXRmp-_wJG({C|1jY?1fBT#}bu7ovh`
zwOXIlbfVksvT_h%K&@6w+x2=qjnmNSbgE$hl24L^uI8r_Js^(bH2JIe_Hr;7;Bqhh
zV-9v7w$7>P#3DrzAo)h4fo3y#ev9&mizovWJ#9j~vC^b#Gew#KxT|9(OcH&~8F2;x
z(*$UJb2U?3M1LA!Qd?V&MlbJ~;v(7roxJJ|=n+=YN1YMh12pEyZ;DH4444(c0E*rc
z44~*O>|*F<{r-fSW2jXc7BNjsW&NjDjM(Xvh3m&32WPqf;#PB9!XrS@TY>=;y(Jhx
z(HV^DHkAdo0hsEtq^mi}unj<xS(2VSU>kr%PL@=?{(rsEsUC~D?D0(t+W@TaCP}gh
zYy<LOnxGJ60^0y{<o`<w(*!ZF3lW#YO%y`I;V>GFMuitc?0?>Fx2HA$$%9H5Q1tOO
zm$?jrk_nFhMQ6Mp1n;&Vty^Llphk!elf9$LY>BBwPA)0Z<gpfz#9RhJwGc9sXP@W&
zC;zb$w11x4o6^avo**iDz&5~kX0L_BB_|Kq2IzBoo3JM!9kv1L?tY)u|5O=FU>jhL
z^rp%J+kmnY44~*O!2pWhQfMIp%$KDvmab3r41yIT7E_o?F{NhBEc^YP>bxvn1i=7`
z-VzL;=q;r&K+OtPaS?5Rt|l9ncMr7aqt1x$0bJUIEO8NOfa=<~yXj66WPA5Oi;Fk|
z%;eST@7KEqKSf`2Mw$U*$<wu&BFX@ryrO50^nZzqh+@e5pU!&!<7sL-!RrB0^aag+
V9*_keI>!J2002ovPDHLkV1mglQS$%*

delta 2050
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

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png
index d75684f5d060b5e3ccb613eb3af2ddd2aaffc192..b0289b7d65a15e6f4a8c5b4862772304fac0d388 100644
GIT binary patch
delta 712
zcmV;(0yq832;T*eBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0(414K~#8N?V3Sr6G0e;XOk2>RF|@r6k~f*>qSVj#T4|g#aw!A
z1O5g<K@T2Uya-wq1TX#xq3uyGMORSJ8rO)Y7Edjq#JH54s();{<HWqV2p)Dm;X`H~
z7~b#OLr9*??Cfsh2xffWkEE1Ew3&&bsDx4rb^$>Uv{alLblC~Rkn|bY1=Re7Z50!P
zE<2kaU$`i>U>C49^Jdu*&T+JvS^9Ko1*I130yaupH&l!cy6h~rE<Ql1MGnb^<A}Wa
z8uSMd_8AaXcYp4y&|b&E`*YV(YQZkx%Tni|3T*)w*2k}*)Pj8pB;DQ-W#DDBVV?o7
zX18yu&^`&yH>U5Q)WYrpNH)@5N*Ywy1#n{pAdSU%0pwj^t@v&kr4C8GJ@*(j3w8-0
zjl~K;8VgxKu8`9nPM-ZroW2XFo0&T(Gn1w=xe}d!gnyO=vVf?z{}g3r(lkAseObDV
zmId+>7;y`E?Qx<&exyZ(JOje&j`j?YsXUzjFwHsx$O1M_Z)u+cgp|o*tIB!~pl^dx
z9O(|(PiDw7V14H8D$2~LCGfNU`SM+~ERY4%{Dm&c>`3R^X7v0lIu^(Rf*_D6vm?cR
z_&U`7VSn^rKo(G`RQkW}YN4(NJB_GOM#}<Oz~7z+c#~tob=|3B<0GQ|^}C4o4t9sf
zZ}qOOdY&iZI2O%jll&ei*qb4wu~-2}W3d8|#$p8^jl~K;8jBTxG!`oWX)MMIV7(Xb
zQ!ba~@Y%qV!n2il@8I`wZ*pv^c;=+|(Md$N+d<tO9{-bid+z`Kml!uz0Mb~j0Hm>4
u0Z3!90+7aH1t5*Z3P2i*6@WApA$|csT^o2*)CZ#g0000<MNUMnLSTZ6!9-dB

delta 1079
zcmV-71jzf}1<MGKBYy-ENkl<Zc%1E9-HzKt6#mYPouo-ffo`@Sgesw`MQY!m5;xrU
zq7Ts*=yUJ_RiB}i5Vu^egv2!x0#va`l_+6pck9j1+Gh?Ij#Jxfd$%2%F-|^dHDez~
zGxO~?=bZRV2#)dO#&^$hx5U6~E)*11*&iO>e_%7dXY=7YaDVgq?Ii%&tVtvSLB)L-
zX!0xVhj!yTC!lvtBm9Q}y}qFo02qi-0F?hxwcU1n=LGD1H9B6tj8+_&2mn@pMPYy6
z^8sM_XM}6_hNCLGEu0f@ba1+VHsj^yhJsnmB0wMz=%a(vL6zNheCGu4T$CQEApi&<
zX&V8=b3v8ec7J^51Q21h>0k701LIpek^ehdLIADezoPzS?C*~j5RhI(QU4;l9a=zu
zTR3-u0A{KF6u<(&m315Bp1sKa&S--Irm1#@cyUR48M_tQK)}qhwL%*RaEh%bz&g1)
z`1<)bHlM%u{TGjH=U{`aSHO+{*AsA!ItUo2`qP5z<bRoTJfG(5&QJ#d>4YVpz|7Wd
zkh_=koujTTkpGXCwfVkt)I@;vvu*x<($Cx7qlPa-`Nda}P;~7UTOS3i6<`Ft^mWmT
z%H(Bc9WOEKhBW~km?dc_QbfEokO&YqLZk=^&{v2^la$%&ScDC%2_Q|s0e~1l^%VM_
zX+N<g1%Hf_pH}lS8-B2zfgP*~kTY{jkF*B>(HrK)3l@op0Fn7&NC4np)w;~)8ukPL
zXVDvGF|k9HP?CiaARtW~9<wR4*^X}uYXW}#`{$v8qJU4-P>-eH5kKG)n&=PHwxsX;
zouu^y?%cfld+t^)(~IN22>LuX;pFb%k5@k~K7R+m&tL!IJSS)(4=8<C#|zo0Kv=8`
zn{}WG0?KoJ6PLFEDcUMd&{QT^r~(nQUO1(kp<6Vy1=cFa=KZAO^FHK>v_%E~*%lB$
z$OBe04q=E$tIiUzz-9|%3z&Kk59fWLH2|FO>rQTg00k-_fP{r6clyKdm>GbK^~AXf
znt$2?YXxL|z_x_JloQO=@ONSGTo`nYCUWsHN=n!1Feuy(5j3HIq<)XI57?$KSn31v
zVQ|iY^R3XZ56DIVF>jq8DVVXI7&t}~1f<GfSp^8kXTJHABPg(ealQ?lOYrfHZ=c@U
z`!XOOs<-FAJex(I>X910Jwciw@mzGVJ%3-&j=I45{Quw+4<K;%OmJo!rHib!pdADN
z0IAp?P+pZ81*9TOJ#bEdg4+BZB+e2mu|NkEKp^s9#Ov>SK1_a2nJv&g1r#A$LObUK
zJEwrnEc94iCN=M*0?7YZ)8M+-?@jd}YdTj>@0J1#jDRH!UqyU$Fh9-wJ_ta;u`u`!
xDqxofV3!8~yF6f*2PD|#0oCZF0-WUm{{oTD)vp-+rab@v002ovPDHLkV1l+I0S*8F

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png
index 051ddb5681d8fd7b09d02ae046234981b17298eb..06f42755835f65ce3e62fe4024c3599f4a5ad172 100644
GIT binary patch
delta 711
zcmeC=yvI60xt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSL74G)
z{)!X^2Bu<97srr_xVN*<XA3)u98bS2Vx!UR;<@$K<f!~*of3}x(Px&12Y;9!u%fA5
zOus3N<zV-N`wClLdFnHU2dpq%C+M#`?^S<L@`SHJs`WQz&7aL~esplA`kupk_<8QX
zzkT>n-OQUOXRFRjS{9=9(rMuWtGRu<=I-Bqq4NLN>t7EYyeoXvx%$fYvhbsYdkpvd
zQ{Nn|o_`=}VzX5@3qz?GC&McpA%-iFDhw+&doTo~Ph?ndPKnWBZflL)hLD(<?SFgM
z%n#r9-v7-F>s8zC)z$|_+V3~qQ@61^udsscLe|!Z^C~Hv4s%_Z8nByJXva{bAE!6n
z{*ct<;GJd0S<?bGIq)fPF!5&hh0T6=xxija>;&T#En~wqmbZT2>5!9kJIZ9)@O0(#
z?hVIYg#4dTTl`DQ3#jCdeEi?nGwUDhU$FJvHT%%~g(;2uxGS=blvUKGw%ITrdi6^-
zB6*YQ2HU?ypNv2n_N?9h9%!lB%WoUok9uoFD(E-n-SJ*?e0yBe?G29e82$U!$2OX(
z`Idh7Dfy!2C6*%I5H<N*(CdZ5zvU<X=YGky5E2l3xC0`!*2SDidA`8Nz5buRgA2s3
zsmjyOPh=DQ7ORlG?3vNVd#uZ5Prjb8Hi2JZRc_q*Bl027rbz!jcR1?cJ{GsXe>hSf
zm|fd&zG1^Izgdh2yOozn9*{fG%)GidGC1cipT+NoEH7mb>|@yy*13pB>CfH+S2kDr
zSMCmw3a+osV!X!njUj95%&k7h9N4B>_J;Sby)R#TgPEgg!T-{mznC*6+Lojz@Gl5j
n=@Ru?$t!u0hE)4jhn4e>om6P>`JQD8OqdLwu6{1-oD!M<h2cS5

delta 1141
zcmV-*1d99K1&IleBYy-?Nkl<Zc%1E<&5j#I5XXPjGh?s47LX{;vM5p{N8-!@i9?Ru
z;lMla0z3zAz$>6!xN<~_!~=u~VJS$!X05Q<$oOMEx;WUzGwZM2?V0r8_<wPCSI<=U
zzpJ`xrpJP3eE0B&?|UD7{72A|=INL3>7P$7qp%aa7U99Hhks0S-3M2%fBa+b8yEe?
z<>C^dn!@B|Iu#>Eq4%~F*Mk6yQMI$N2vJd}&0M8hw(5Ei0HLN5W<#5rP!N!%XvGCe
zC7~_^G$hnudY&dWQB}~Ts9*uGW*=}tJqR!u5hKm}VT2MCg#`=fQnCevW!~(zFp*q$
zAxd3+sDTAoY=34Gy_AsA@uSAEs*VNv%N{E(uy=caur&;>xWEADl%?D|0V6vMw}-(3
z7ExeWmVWO9v`xpdH4GM9pu@gJfsq{=wuZri3$)n7Jzz%|T)}=>0PG5b1s5oF1B5yd
zpa@_kRGFNmYdREM07~2dp$-H9sO~cR1xn8ZWp|hD_<!m1{<mwIbAz0juvHq_8#_Mw
zDExhLmY!&;=GRxhbiRJ^#aFIla6uIout-)|&EnKf2U!AYE6{r@ROJHmjcVz?0)mm`
zzq*leMY?Z<DhL=bi`NA#Vtcb2L=r5C@Qt_b0u|_ULRA(p-vo;;AV$)5uhBx)s_KM7
z#^(oBS%1I^6x1|~0Wggqtw{HcQN;_9MXK7(yMUl^mM{efT9VpWysth~w+bsRph!a#
zy*uj1<M<-GV`IHX33-Ss4tYRD_dVnRR~rv`z^q;y(_i3_2UKv+Lmn{y{a@q(&IJ7Y
z{OKbAWNFTA)3GBvG;PyK0X3M#3y)KtEUz^+Fn<DP0zNtU^bH~zU~Hlmiv?mJ#b5z3
zk-Wc2#tYXGxWSnKi7=o>Q&AI%QMIb67zs5MF;+s*6thX@8_q*$+>2fU9DO*u)$}|~
zn)kyf=$H`T=p=0Z^ILqrNybyx5xBvbfOwFe&VOeOLY7=)Vp9brQL9!&PB+P1^}E8E
z0Dp6AR<b^s`Mu7|eTBQ5WUl&M;ZA@MuWQde<~<OKeeyC_{jTsIhdiSM0%W>Od9Pc(
z+U5@>T0nj>yUPA2zQ8;00%fHlx%?l1F|$L=?iJa(vR9O80r{^t@{_;%bXc3oLpcQG
zC!Mb^&hiIq+G~TV_kdE*@~gl*zX^JOFMq$``+{p@U;Z!P4F>{z55PC-LO^%TZ}$fB
zTca)nKrwL|vzkQhlHUq7cq_MdrCThI*LKOBPy-9dAD^u&?~=Qr4i<n<5^7)pe&O8$
zR24-U0<t(lFP1glCU=E*0<tj!6Vc3KYt?E9^DoD(Mj%Ea`Foq(Rlj!v?tIqDfNl}M
zs2`63rh_aY5SrZ}YWEtgZE{!r-U%2!n`YTqLmOuyB256zGy<5Msj*YN*d}+?@120;
zGE<u<KrF)1tW^@V+5+7vcZGKXp8xgiVXnIF@%(s)+zI~zrmYe$g<tZ300000NkvXX
Hu0mjf{$v*=

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png
index af6c01d90690ecd156d8d0cbc111f5e7c5f1a291..b6847b92373bef3eb2d0d28afbc586af9e53b4b9 100644
GIT binary patch
delta 657
zcmV;C0&e}N2&e^+BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0zFAYK~#8N?VB-9!$1&44FZWSLI$NuDh`m6gCKDQT1q$ol(bv{
ziGy$mDySl`P&y=#z~9Uy&a$Q;n)xg3K4~;-yPD_qTFz{?Dt|Jw+3c&X>#Av*>SpKe
zR!(<}j}EH$myc?(SUfe)Z*q2>llk$r4FAQpWEv>G2MX;%j?JM9z@3-7e>rrQEujm*
zv=57~C;L+wnnM==V#VY6_aF%YN?1G=Kx>i^fWn80#~Yv<7(o|+g8Ko&;w=|Px&Ra#
z2Jk2z&;_8-SbyM}$7_);07VXk2T3e~Oo{->*-`{Z&X$dT54aycT*&ZWZ2CRFDdiE6
zoGnFw<ZLMdB%9KH>kkGSa{*f9Xf&F}qPs}MR6xIY<h{e)U%|#qK&*H$e|%jFHl{Nm
zRy=6G^<A4Ee__4`#ES0*iC``O#EMVh4FFsOfUx-U&wtaaHqPV}4L1Rb7LTTA&={rQ
zCZH``n;*+}KboR!+-E>)xUK=R4y@LKoE`zCmGH9{K=uW&aa{vsxRijs0dk6livVqU
zh7wZ1T!1z^V-ixpRDd=)V-ivkVJ1MQcuYb+*qF|Mn1nFcn6CkS39;xd5-}G5AYmxj
zxCls@B7Z<~wiE%9vxWYD0rvia@(4)ImLfoMwiE%9Y1EVWz5#>>bOE|gAPijdkU$rp
z`vm#{yd=;C=sp1r;3*-AMX*^lO$H@ck%RzcNP;Cv2<T7oP=Ymd0oWtZwaX(CJfI8E
reFC8bFX#e-25HwYLCCQ&RrL*UH*Sr*_JiF3015yANkvXXu0mjf^d=OK

delta 1044
zcmV+v1nc{#1*iy+BYy+$Nkl<Zc%1E<KW^JF6vjW&k`k**(c18k03G53WNDY6=+pz`
zFg-_so}z0`&?zX20-f63*|NA!id2zf$tF9<v?y6}8ko-{9RGkIR49ddA0PieF<9o)
ztIy{rFWy`OKzQuO$z>L`p0R+3JmL%~z$V)5!|L;Izw|$>Q-8j<&ch}+>Ae08NI(Dp
zrkgIGZ@R!Ltu`0j=Yj=5*bh7wNMGd%i2#s$+U-5l<y#lv@a*7z|HzBG@1jvMNWp#1
zR9-_9Fe-xeCUA9r8!^uKWH|M?#{fX8_Aev?&Lke{2iC#50IjIi(XYAB<~3jI0jl<m
ziC|rTqNa1Bfq%U1>(?4aYaei+4*;;J@x0S3u5(JAAYix;a6kYyQEtu|`&<26O%oUb
zh)k94fB=d*gG<H(#V8P)D%BwYnpm0#Y}Y7&!k}J#ni=o;bzJg*x=BuNMV=8{@Bp1*
z!|!U^7%q8$6`s5R?BQEh^Y#7U<2ui;yPjW{C+`6}0e@`2fNeG<K!jo(?^V)Pp%g$j
zGS<?=O1@R71W<<7)wC0aE2spR8?P^9<X+9%-a1rM;dw2yiEgyo<6E)gvvDXqKx^ma
z8duw2KrV(#+l0yk<~ugI2dEks5`jpBvCRw<PzbQJbgddMG9hKkGJ>)n4TS*O2vF2M
z0C1l%|9@p`6!rrogLDeO!!Lq2cm%{Az$W>@Mvj<Dg#BPVx`?|n1psD!CQ8)_mRNLl
z5?L}xea5(OWfD&D8bee@0o4SgkfL+i_SoF-e*XE<sr?TdgsKmiQ;Y&45wREp*WbpN
z-AT{DR)i6#JYW@5Knidv^4I{okoN)lWQPUP&wpb80Pb_qYI8wQ{-dB=3*-f8Q(o?K
zmJCvK-$kSSBQHKYJGdt*|Gyy~2DN!W$Rm-6IJ=p3Z@wphM0Rz4Yuy8gJ3*As`a>Q8
zc?^InP&9!ties(C;imEg^#fFo!R<gHK#ZEn(CQcfdu(Vq{7?*lJ;>Jr<*eGE2dhvH
zgMTE4nWmxK6jkVAG^MRUyeZmv=5O6_1?8f&>8#%w<AL4L*iHcJb5h&!1y9}sb^_Rb
z0o%ABKvUd6RCAAUTo3@L4~SH&%BBgG5nK^K(G*8OHhXkU04&E5EYc)lH4cQz<_78~
z$oXc8zL!wKs3%zW06k8iK5(KGW1t6H8GpgL2Q0-4l)e~S`e>?+ZS#QHolIwUG8LJS
zKrYCN5SlTz%>%+?KL#)j`+=7XQe-!?uF9+VZgBfNAi2z<<T8Cex`@NDAB@Gch$q;@
zm!sAN003}+F)orp>O&#}%4dodw#x%li~#e1&S~3|LJB}XH=zA)@E=!Yg2FInTMc3W
O0000<MNUMnLSTZ^Ip}Ht

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png
index 051ddb5681d8fd7b09d02ae046234981b17298eb..06f42755835f65ce3e62fe4024c3599f4a5ad172 100644
GIT binary patch
delta 711
zcmeC=yvI60xt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSL74G)
z{)!X^2Bu<97srr_xVN*<XA3)u98bS2Vx!UR;<@$K<f!~*of3}x(Px&12Y;9!u%fA5
zOus3N<zV-N`wClLdFnHU2dpq%C+M#`?^S<L@`SHJs`WQz&7aL~esplA`kupk_<8QX
zzkT>n-OQUOXRFRjS{9=9(rMuWtGRu<=I-Bqq4NLN>t7EYyeoXvx%$fYvhbsYdkpvd
zQ{Nn|o_`=}VzX5@3qz?GC&McpA%-iFDhw+&doTo~Ph?ndPKnWBZflL)hLD(<?SFgM
z%n#r9-v7-F>s8zC)z$|_+V3~qQ@61^udsscLe|!Z^C~Hv4s%_Z8nByJXva{bAE!6n
z{*ct<;GJd0S<?bGIq)fPF!5&hh0T6=xxija>;&T#En~wqmbZT2>5!9kJIZ9)@O0(#
z?hVIYg#4dTTl`DQ3#jCdeEi?nGwUDhU$FJvHT%%~g(;2uxGS=blvUKGw%ITrdi6^-
zB6*YQ2HU?ypNv2n_N?9h9%!lB%WoUok9uoFD(E-n-SJ*?e0yBe?G29e82$U!$2OX(
z`Idh7Dfy!2C6*%I5H<N*(CdZ5zvU<X=YGky5E2l3xC0`!*2SDidA`8Nz5buRgA2s3
zsmjyOPh=DQ7ORlG?3vNVd#uZ5Prjb8Hi2JZRc_q*Bl027rbz!jcR1?cJ{GsXe>hSf
zm|fd&zG1^Izgdh2yOozn9*{fG%)GidGC1cipT+NoEH7mb>|@yy*13pB>CfH+S2kDr
zSMCmw3a+osV!X!njUj95%&k7h9N4B>_J;Sby)R#TgPEgg!T-{mznC*6+Lojz@Gl5j
n=@Ru?$t!u0hE)4jhn4e>om6P>`JQD8OqdLwu6{1-oD!M<h2cS5

delta 1141
zcmV-*1d99K1&IleBYy-?Nkl<Zc%1E<&5j#I5XXPjGh?s47LX{;vM5p{N8-!@i9?Ru
z;lMla0z3zAz$>6!xN<~_!~=u~VJS$!X05Q<$oOMEx;WUzGwZM2?V0r8_<wPCSI<=U
zzpJ`xrpJP3eE0B&?|UD7{72A|=INL3>7P$7qp%aa7U99Hhks0S-3M2%fBa+b8yEe?
z<>C^dn!@B|Iu#>Eq4%~F*Mk6yQMI$N2vJd}&0M8hw(5Ei0HLN5W<#5rP!N!%XvGCe
zC7~_^G$hnudY&dWQB}~Ts9*uGW*=}tJqR!u5hKm}VT2MCg#`=fQnCevW!~(zFp*q$
zAxd3+sDTAoY=34Gy_AsA@uSAEs*VNv%N{E(uy=caur&;>xWEADl%?D|0V6vMw}-(3
z7ExeWmVWO9v`xpdH4GM9pu@gJfsq{=wuZri3$)n7Jzz%|T)}=>0PG5b1s5oF1B5yd
zpa@_kRGFNmYdREM07~2dp$-H9sO~cR1xn8ZWp|hD_<!m1{<mwIbAz0juvHq_8#_Mw
zDExhLmY!&;=GRxhbiRJ^#aFIla6uIout-)|&EnKf2U!AYE6{r@ROJHmjcVz?0)mm`
zzq*leMY?Z<DhL=bi`NA#Vtcb2L=r5C@Qt_b0u|_ULRA(p-vo;;AV$)5uhBx)s_KM7
z#^(oBS%1I^6x1|~0Wggqtw{HcQN;_9MXK7(yMUl^mM{efT9VpWysth~w+bsRph!a#
zy*uj1<M<-GV`IHX33-Ss4tYRD_dVnRR~rv`z^q;y(_i3_2UKv+Lmn{y{a@q(&IJ7Y
z{OKbAWNFTA)3GBvG;PyK0X3M#3y)KtEUz^+Fn<DP0zNtU^bH~zU~Hlmiv?mJ#b5z3
zk-Wc2#tYXGxWSnKi7=o>Q&AI%QMIb67zs5MF;+s*6thX@8_q*$+>2fU9DO*u)$}|~
zn)kyf=$H`T=p=0Z^ILqrNybyx5xBvbfOwFe&VOeOLY7=)Vp9brQL9!&PB+P1^}E8E
z0Dp6AR<b^s`Mu7|eTBQ5WUl&M;ZA@MuWQde<~<OKeeyC_{jTsIhdiSM0%W>Od9Pc(
z+U5@>T0nj>yUPA2zQ8;00%fHlx%?l1F|$L=?iJa(vR9O80r{^t@{_;%bXc3oLpcQG
zC!Mb^&hiIq+G~TV_kdE*@~gl*zX^JOFMq$``+{p@U;Z!P4F>{z55PC-LO^%TZ}$fB
zTca)nKrwL|vzkQhlHUq7cq_MdrCThI*LKOBPy-9dAD^u&?~=Qr4i<n<5^7)pe&O8$
zR24-U0<t(lFP1glCU=E*0<tj!6Vc3KYt?E9^DoD(Mj%Ea`Foq(Rlj!v?tIqDfNl}M
zs2`63rh_aY5SrZ}YWEtgZE{!r-U%2!n`YTqLmOuyB256zGy<5Msj*YN*d}+?@120;
zGE<u<KrF)1tW^@V+5+7vcZGKXp8xgiVXnIF@%(s)+zI~zrmYe$g<tZ300000NkvXX
Hu0mjf{$v*=

diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png
index dba4e93a8aa3680156ff4af0e3309e4a6bf365a3..897abc2b8e4e75fdd1647290fe3cf0706530b969 100644
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Nr~~jv*CsZ)Y3wHaG|zkn>4kRh;3-m?qF9
z8nYpUk%uRD`n@|(+IK%${?Yh((c7N&H{N|ss5#oRRfHj1li^wr!<wZG5#Ed&rZFYx
zvL1-CyU+aZ-t+yJgbze<HQ-Q#DIr$d@Q)j;A5(6Mq1@!9Jau!GA3X*-m%-E3&t;uc
GLK6VO1X_mx

literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=`#fD7Ln`LHy|t0IIe>@Z;)KA6
z=1CK0C@U{b;Y~~A5chA|eJ_6b<k|X_KNHUV{pI^?`~NDRXZt5VR1aX#U7*<@c0t5}
zJA-Qhs|o7`rddoGjJ}Lp8q#LkE%^UAIBq{9lHf9iD2HI&deEhheP;~*QhV^V`2yVf
a&hkEc%2PMjRO%GaCk&phelF{r5}E+k@>Q(>

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png
index 8ad1f325b352c75d7f7b998f9cb704bbdf06410a..3e5ebf50361addbf92ffd0ae571791fd467800b6 100644
GIT binary patch
delta 722
zcmV;@0xkWgeEbEFBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI
z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW
zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx
z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o+gecsz&)j)@6nB7H73mW37Ag7Y6d$N}B65M-ayn5=cUX
zj2g<Qz(SN(jeisqDcX;D_=g>Tl3X&m%3$PJKou$^#}EDozq>UHQ<H8|AO>{5*!IUL
z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT<rWBOtg9TwJ#`c@MbU0m4tZWJr$WrzsQ)
z!220}Qw|uq1^U+9-dg)OeE>4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t
z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GV6*!h3P)Gm(0QpHoK~z}7#n&+k
z!Y~+y;V%WDG?RpkdWKFtj;o8i(9xmj5nLQRPLJUlic`8c)IpSrEjCU5{22q`c?k(5
z0OQE>yc3+bQVN0-x7H%z!keanlrnBWA5YU10OAGo@$Is#-}4Cv-rW`ee-P&kjNt&F
zwWhrVWB65{3avHTwxtW0f*+boDL8SG9dN+`gbi@Tg9gmOg9XgRg9P~C-T}V2S3n4S
zc0ee6RzOJHIUqFd6hMJb4xqv(1yJID1E}%iYF7zPJj=4-9f*Y+V}1i-;v2KC1t<P>
z2wCv;;}tOUW9dJgsqpi?Bq~JzqbQ~PEV9;;<4P$!0TpTkfuT94W&i*H07*qoM6N<$
Eg5tSH8UO$Q

literal 15911
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
Sxvf3QT{LY*!MjuEzw|%x_1DV)

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png
index e724d3b9f78d115d79ca3ded3230db216cfe4056..7bd92db59f70ce83df278ad44857a3797ff47877 100644
GIT binary patch
delta 695
zcmV;o0!aOheBlL<BYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI
z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW
zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx
z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o+gecsz&)j)@6nB7H73mW37Ag7Y6d$N}B65M-ayn5=cUX
zj2g<Qz(SN(jeisqDcX;D_=g>Tl3X&m%3$PJKou$^#}EDozq>UHQ<H8|AO>{5*!IUL
z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT<rWBOtg9TwJ#`c@MbU0m4tZWJr$WrzsQ)
z!220}Qw|uq1^U+9-dg)OeE>4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t
z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GV6gZCrVF>^L0NzPNK~z}7#n&+o
z!XOlY;h!cZO_)r>Jvw<M@6gfBOE`EOkKxWp*E-o?Y_*j4fDwl84}k=r;^_N+GBxq8
z>o7I(5CTmt+<T9;wroI*w`~hhE+EFw$KmmwZ))Jv^8irh46NY*&N<y%f3Sw%-Sy<0
zV;o1lfGzmN-v(0?SJ{CS9FPr2#YF@5;9>!Lagl%=JUbv4&kB&hcLzw}y8<Nf<N#?r
zDL@0?9H5173ed#=2593y14`hl0j2Q8fRgxEKxzCVpawn%Ed5yGr?VCgVB(LWwRT<z
dA*ka3FPRL`p~u8|wEzGB2>?k&PDHLkV1m#LJ~99R

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

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png
index 4cfc4c45da5178cb9fb00132bd47b9570301ad6b..a1c5c2115fc19c9b01bc5e8eb039ffff5e143553 100644
GIT binary patch
delta 418
zcmV;T0bTyT6T1VDBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0Z>UqK~z{r?U%o5!!QuWmC}N1PsMocGkD75B#@<hmOzFM83J9p
zcPTWFlgH?4OeQ;q3<=*=m!4BKmR%cl&<_rwKX>=(Joq$9(|`1+96|zuAfQPUMKlgg
zQ4};*RrM_Z$@4s?jiHI-m_(cfU;)W_V|qW|>a)G_v40)&MLB0p09OJcCfTA_5u4<N
zlJm_u=Z)ScaC02MK{)8;KO>W0R<~Axr-$YC_<2`z=mS~R(c?kA?bc&s1sELUO2CpN
z>16EB$#wV|Mt=d4Fbq{$mYoc~P2B3y2q$0V?@PVZif1)jBgVB)*;oPQ@^(#Ti?x8E
z@B+L5FTe}%0;~n#r_#o3F*YQCn-T<T^K+4~uj~h`8WITt$eXn>8{tL)vL%CMS=Pze
zAF+PxF@H29GI?K}@kV{c#5h$~no<{S`TuyBIDeWse;b_A%n3@J09E5*n6`{(^8f$<
M07*qoM6N<$g2jQit^fc4

delta 2486
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
AIsgCw

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
index f66453a57d..e716cdf4ed 100644
--- a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_plasma_window.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/9c7d509354ee030300f63c701da63c17928c3b3b",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png
index faeb000b4af4ee778ba66b9e19d9156b78305548..89446260094332a599021485bc68cfd23e52cf75 100644
GIT binary patch
delta 753
zcmV<N0uKH17KjFrBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0-Z@jK~#8N?VGVm13?gmPeF)DB_XXAf?$^_2CO9b05+BiHln4C
zXklTY*jOqyf|fQufCMWcTBQ>N3vENNN(@*i|1m4$kxMQ&CV!dS?gzsxD-!14+1uUO
zyD@Lb<n#G&YQ~~kt%_n$AwVjX^4pnA#`nEYE|-%b0D`aA>(m>aL}WlVoArZ-Z!{X-
z`sB_N{kbb!_p1xkjKw&46(D$I!qw+#;ro5Ui(*n#34oC|B3$QA3e??KR84`+sr@I6
zDuRay5ThHFN`FNZgQ^TLtkrgZGXa*%<w8x0N&z_OblPh+o1rE}<rDyz1{h%kd04;P
z_dDCLSe-ehW-QcafFU^Y#-xml0R6%VK;BxM0OYMjybRvWJ?~NT4_LnsvKvS6wOY;J
z+@ODK`pdicI4YQ>PkNe@;-&z3YjFaQw-zS=`Pkqo-+#_V1@RJ8DwRUZ+7JQ<7M$%9
zy9@?Lp4)$%*7}WD0Bmx?3?o128egx7)9-Bd_K}*Q@ERWqpVsXJd5sSxZ|YWoSO7fK
zq8KlEYeJlUsOeENGDv@j(Q37ZJ_W=--f0;O1Hpqt2oNU&IPN$+WZV=W9~<i*g6B&&
zT{l7o?0*5U3}OS6n2iv>tM6ncc$5BG7|25~xD}>u6^PTXSS)sZ2AJTnCC08WQD=eR
zeLXh>&V#3aQH59lep4GX)C9C6PQQozTic5fV8z8qyOD>D3IkaMG~)yyZ!Jy$^42oc
zB?v@)O)hL@S$>(f<2AW{;RGOWElvRP)-o~z@M>FUZc<b)gQz7S$WDhV=~rXwGXTK{
zN1dA#l>+b@A}sjc0XHe?rU0)VM=7Iizpf<bv$<Y_{|{6NV1h^KoWEPp$)u>50@i;z
jYyHR5)Qp8J13d2sVbc(ZBc!^q00000NkvXXu0mjfGmS}d

delta 2924
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
WI1)>oZmF#R0000<MNUMnLSTZLG=N|L

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png
index 46547d6b996bc58da7c10e55cafb0fd78fcd9801..b4ba2ac0075caab209b751b8869d58c40248069f 100644
GIT binary patch
delta 855
zcmV-d1E~C<4ebVyBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0|H4zK~#8N?V3MmQ$ZZZ@4e)im(be87?n8N+ASm{L#JRZh2WxK
zM+Fxr2PbI<L5E5~++7?T1O;`lR6#2d2Wx4bb<%beLZNB?*ngHL=}U9IGrvLyh29<Q
zFX8SJetdtI!13<;?%n0?o<WdFrBV*1^fVN?aUAC?q(Yz@kjZ2Uo&j;g5WAFIE+^Fn
z6BLb&jSW&QSBbG{x#m`YJD?h2(0f2Soi2o$$75r`tIM`&b2sSr=j%yGg+T8CrfCw(
zA0UBBj~iI)<$n&SMi_Jh7}WbTXx*v{1XLjm`XewrJY3jqw&H!hsA~$`k9S|*9D`H{
z^d1lnhe`D03F41X%Z%)D2UH^rdJniVGQLa+IRiy*UeCSggH#A~17?Qu6W$Qe3q@`&
z<x`W83W09Ghk>8BJn3nd__?@z{sE*yppOCGzd)&wrGF!)K}@s(pvt1W0n)R;`~Dvj
zkc!}rt_(he90mOdfGUeN0909|4PbkDqR|ORU&Tx+KLx1>4R0}X4{{Ww4Y)iq{u@$m
z3~H>s`uO}D6j6{iAe+sKuSh6aoqanShY||XV?e9ob9tj#G2GI6nN+J)s09z{9`LCD
znFHy8X@B@?)?Dw)fi0uFKL2&TyL*6b*e-7byzu4$r~wyg0~)6`E$)bHS#GmITCEn;
zf`{~NxG*%f1L=XGv_;B0YnIRNTXnuUsE>fO0hvrjXcl1GS>9u?n){UNZUd6ZWC2oc
zOkx%noy7zcQIIy^fBONUP>9@(-k4%qEEeJ0Hh=YcokXKiQd%#OrSD6qqv4S(hFF95
zV0o=pYZp+P-sVUQux*=ME8baPaWgWx5DW(47krMyfKEmm0IDq708nMo27oGyHULyv
zv;m;Xq74957W4&aB9Wkf_XbKO!d8m(SNq+^r?KgDEEXf%+uP)R>B%J1e=)i;*xhf5
zVNjzD096)k0I0HP13;BU8vv>-+5k{x(FTAjOUD?%4on|crqXN`$YTG2>S59`2CxHD
hc8I#i{`~MD<PSUCsjYnS?C}5q002ovPDHLkV1gB7eYyYu

delta 1681
zcmV;C25$N72A~a)BYy^GNkl<Zc%1E9&2Lmy96k5V`{=Y&JDq7uDJ@W%cA$npi$x$V
z)IeCc6L&5ot~6@mLX4n^s1Xuyq5c6zF(fQ>=|&paK@lwoNnxlIq@{%polfa=ruTi^
z>!R<K*N>S7?wj65dy>iYy)!evch9}|chCJOfn*%2KYpSwe}7r=-`i5Qo!vHX5&+m_
zBzQ6Y=kf0kiNq%&Uk(DNn$Mot+|_1thjZ`V^*@u^mW~7kfaH~aqY$qcMCm%S;bW2b
z%F-VxE!tm5I1hT$TBuARBt-D&T3&D8x!EEbQHVyC;)N?vdJD+@o&Rcj#K9kL-oX^h
z;-%ADdFFB+b$|OJU=Fwv;z}W2i>btjsUL{Mmo7lxCnH}z_+?UwBn-wG`2F68dR==g
z4*-#bp(qAX3h}l3D)pB4Y7UFUm)-?_{o$MvUawOp&n-qduX{F5doEwl8Rh)Z)oG^~
zpX$!qqVc7-faI|UN6j&3=7K?C7JpnRoI7RfG+u}|AAj0**O?7RMdGU>Uk(C;r!thN
zpxlN50K@cdV}r4NC}WMSjcV}`04T%<5ns9h01WOnWUp`l5Y^%%t_bNud=SB<=YWhg
zRtwB6oQJ3uPZ#5ZfOG+(T0E7p#u^)p^{J=fMIl{)j5Sv47P9tfcu`0fAgaYv-uwK-
z<`upWAAba-3*d*B_yE97fT?195Q40PQGog{+{Cx0P?mT3#`)qrEml+u0A`#0gF?0I
z&j~@~1z{)nQ_J~p{k7#YFa`kXH#Cd!dv7F;i#~%0gj>KO{np=fjUqgq|64K;NDlD1
zHm`8TlkhSTNDlA{SESz-<z+%x0DsLcR>-Az*?$Nm2h6|rva_49i}IrJMNyJr&>N--
zjnzx>%ZZW*;1+IZnBJA*@1F$10u0l;js9!5&kq4WgRy?781KEygzzx<;^#XitZ}E}
z@txQs02PX^C;+fws(M_}NFiRwTcS@O24Mlx=X0Uq?zG<Ua?CczY{$EQyLV7)?rbuh
z9Diry{gdT|c+vQx5Ej5p*}0l+&)`<~kXpZ~&IW*qJ6W}<bzRn)U;u!cZO=>=<7Gm4
zE--!HJdy1;t^A<HZyp=f0if+jof&C0c(_S50H7FOR<D03`V1lvZUI-{9i9S!$v&!9
z?<&vb2Q7Z>(?Js56tMwN&Jfb7l!Clye1B00j{?lX^o5H(M6XkGQv)Vt7B?%`RnVTk
z^QuF+!z^wV<AW%K2!y-9f$D=Nm)gQE#*1!mi$b^yyuIdd8UXf3U!9%d`HfCgix0KD
zUsIXtp5)d9Gk5&hSke2&&?AR(=j*?|h>6A*MG#JK!PIu1)inU%cJH806d*rnQ-1)s
zbnAlAthe#`-(7A5A;5w}HqYu(W-`{?*<@x0vTC-UlFUF>?P}RguTNi*z9bjOblClq
zVrB^}=2~1D)#7vZ@TxXO?3>3%^{R~#={4`6)JtNE?%{=-H0it29s+5Ci!6C9fF4&v
z_XkGRwj*`scuy`AMBE^-EK6blFn|18T5am6x5G^uscbjw-dmT9_Hc)EFI@5^v0-|*
zky#wot(7@zf+5nXYt{rqXG<3yph@XnA*dxW!+Uu<HvkN8OIxi7DWP&Q+w6$~=?>6C
zNqvBSKmWh(1Lk-EpATpRfK?yhV$}z@SoHy`KHz`m1GMUp(y%w?06?Tw*M9)u`OaPW
zmEZ%UKfr<NgC{@Q|CvcNLbiU>pbwqSSgG!;9SRfYpG)^*i*+mS{9wi!t9|X(o_9pz
zOCN>+fKkpE<=jf!Jau-`WYf&iYt&^qz9U_LX1$GHznnAxVDxMj0PuTXj{y`u4eD*M
z2C=s&U4ZM;SClO~64u0(oPQqe2xGJ_9p2Ts#|9Q|yLs?VkOi@~C|v*#RolzWbFW_`
z^_?{)04N$^MfMg);2JH_xGP2gMI)p_iGU~|030Y_z?=<M!#y6CMu10bR)hc~M99d+
zG3~kUHX@s(v(H4-nK_1gJia9738V|q9`0Z_F5Ohu?vC4KYeQJ`N`EEm={;}g@ethq
z5%6lhB<BgF3ot;FB(c4fGRke{5XLBHJKJ~B>3bFd0C#fbKQA1p2+{@cK~X{=*(9B@
z$ApCZ3D0}EGt3w;XD0geK}CN+6aqe=;CbRFfph@`d_cxqa1nuY0X(ewfK?x`>I0<s
bfPVqSIJvrXFH-OT015yANkvXXu0mjf3gR*N

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png
index faeb000b4af4ee778ba66b9e19d9156b78305548..89446260094332a599021485bc68cfd23e52cf75 100644
GIT binary patch
delta 753
zcmV<N0uKH17KjFrBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0-Z@jK~#8N?VGVm13?gmPeF)DB_XXAf?$^_2CO9b05+BiHln4C
zXklTY*jOqyf|fQufCMWcTBQ>N3vENNN(@*i|1m4$kxMQ&CV!dS?gzsxD-!14+1uUO
zyD@Lb<n#G&YQ~~kt%_n$AwVjX^4pnA#`nEYE|-%b0D`aA>(m>aL}WlVoArZ-Z!{X-
z`sB_N{kbb!_p1xkjKw&46(D$I!qw+#;ro5Ui(*n#34oC|B3$QA3e??KR84`+sr@I6
zDuRay5ThHFN`FNZgQ^TLtkrgZGXa*%<w8x0N&z_OblPh+o1rE}<rDyz1{h%kd04;P
z_dDCLSe-ehW-QcafFU^Y#-xml0R6%VK;BxM0OYMjybRvWJ?~NT4_LnsvKvS6wOY;J
z+@ODK`pdicI4YQ>PkNe@;-&z3YjFaQw-zS=`Pkqo-+#_V1@RJ8DwRUZ+7JQ<7M$%9
zy9@?Lp4)$%*7}WD0Bmx?3?o128egx7)9-Bd_K}*Q@ERWqpVsXJd5sSxZ|YWoSO7fK
zq8KlEYeJlUsOeENGDv@j(Q37ZJ_W=--f0;O1Hpqt2oNU&IPN$+WZV=W9~<i*g6B&&
zT{l7o?0*5U3}OS6n2iv>tM6ncc$5BG7|25~xD}>u6^PTXSS)sZ2AJTnCC08WQD=eR
zeLXh>&V#3aQH59lep4GX)C9C6PQQozTic5fV8z8qyOD>D3IkaMG~)yyZ!Jy$^42oc
zB?v@)O)hL@S$>(f<2AW{;RGOWElvRP)-o~z@M>FUZc<b)gQz7S$WDhV=~rXwGXTK{
zN1dA#l>+b@A}sjc0XHe?rU0)VM=7Iizpf<bv$<Y_{|{6NV1h^KoWEPp$)u>50@i;z
jYyHR5)Qp8J13d2sVbc(ZBc!^q00000NkvXXu0mjfGmS}d

delta 2924
zcmV-y3zPJS2J#k=BYz7yNkl<Zc%0Q+YiwLc75--CK6lslde`q)>^%I~G=8N?Y=_dS
zs#Kv?1yLlB08x-CXpo9PMS>z|k*Z42{wWfm{2(enXoX6Jgep);X++gFY2Cz*9ow-T
zzt`T_&f2^7uJ_)(_s;OcUT5PvAbK}l_mi$xcXemZoNvyVnSXoExdeH}m;K**X205m
z5u<<mzb35}W5yNe)FS|(UOi-wrUt#)?OOCUKAWDTudbZ_nH%}UP2*hPsq*KaY1UeC
z^ucz=ia7}YSh%zltUOXOP8iXJ1M|I)-mN))s5=D!f`b9TrHNkO@wOAZ`;CTY-N>h|
zHE@X$qaST2kAI{i=T;bzkes_1DXs{WEI1}8w*V{dlpa6SZN_I4n&6NLg<`EbzT<5t
zax#9&y$Y^T03cm{vKXu9lLwCdqH(pbT`ScpB_ClFL;{2jEdOiWy!!J+353vw?+5MR
z=XF`Dlz}pL!uJ9JAdFB?oy->BON+(7uk-LLG3uBi%71i1!NHuAfVpUCz9uyd09Rj{
zXMr~hja<miy9)q-6?NFPS0d>7%RwXFpYk&gmE=OIF%R`JAN4GR7j$2fDzG_T8VnVR
z+2JrF)cqQkcLJKUR=hv(F7`cKMtDldaxue&k1h}Z-awCs6du-C=!*x4S|LjyM70xK
zb&^7@u79tRos>}B%FnwC%%rc0ul9VyFcxe`#Y_#}<F$_s9C!3u*`7Wf^%F{0v!74d
z8>L>|yOJyUdAEQpP|83Oqb3Ic5W;pU4*<I4Szg(=5#W|^RyJ+~TnlyEfm<{vjbfy4
zR0V*gvk3sehr<_kGi@_-`Q>0ZW<>*jIT&^;KY#B8j2Qj2<!F-?@83}T9XghVSM;vV
z9vc8+Ry2T{if<!kMJxSsFcPz(m2Tzdoq!CA+CAxWUmqkDoh4}ipfcgRDVb3o05ZRB
zuxALMG9g~-!`9a3fPw>?O2({c4FEM}MQi+Wa0P&xb-9!4wu4-NFhU|9MCH5B)FUx!
z?tdJU>X(DdF)Lc?mxIf>mYsJ3LV5?k+B+syb_Z>(lA-*e0)FAr`>GOT+s|Z_k6F>u
zT+7cp0h8t^X*tno0e~Ek0RUZ{J@)#L=>VGxVP@v<1PQK>l4t7w@uQvpX+*CxL~2$e
zdR>`Xxw!A~V&BG;#mwtgs`Yo(o`F;INq-^0fBp8eMX#^E{A0IcaDzKy0olp}fLg-j
z*u@kBATrNHE-!1%TB~{6PCg~v5dt#GXSOgW1;>9>x0n0lEIDr4$*HurvaQq@NnOr+
zK*luz8qw=^-e+b$vyWS=HUOaFWHBFjazXYUP-9djY?tmnb+{%VWA4DM%4bll1b^q!
zF)qv{n>$G^2q9wkp7Mj7xWG=I&wvovTfagsq;$DI&g#DxFt7DaDY=lF3*>}=ojwoT
zR2~3?03CaKS}JWXaw;Avln<V0u$MlJ$t`+Y-mM`gYrsyQ&sKgl9jyj{{m1Ll-bPiW
z8exP&Dm(7CCe6{${vx=W&u5fgO@BwLi&(M!u|^zupZN@2M}!JnwSt0XRRZ8-{;NV!
ziYmlk1AmgpL<mbrDM0nq%P_(gj0Ic0F&{;ZQlEA!-z{7dzzuGUzA~p(gi6v>A=~{e
z_s3ajr{CJTO%Vy|!fR`!pi`69BS}%+QHJ5Oea>yV{nX$-CP;`=akw;@ntx3*y;e>F
zz|57fyzfY@!%YDQ!2t+v38)nk8Tj@BD?U^}n3qZbG}rQ7!ZiWyr>hIN5Mup`VO{w_
z#A{g=x$ktFL1n_cO{zi(p^0%bE%~T3_``@!BtR*X62cKa0C_(QxhA0hyYmSEh!1bj
zK&LnD7%KWtg=ta9!vUC727iPA=cZ6r!!fJ&{_<qx+zKn}^1BtC6SzMI2tg(Xrsbj*
zT{tODs7h$ry#-`)U|ORpksuL5B_fRvT~n$~l&(7|?yGtr;O+nSfZC$9yVt-aT<^n=
z7C-jFezi#qr}}OoGo*L$tbLyBQx0O(7ytm&C=Do}MVLyD;q}#*pMP>Y1~+hR0SZxV
zg{YQFbW0_=^}kyH;q(*$z~nhe@413&3poGq)UyjCi*i*<xkVVE06-|58-sDRw7n>^
z%{hY~4f&3Kp-otEM*u*ycb&eq_BXt^`1EJn0szpemU1UCW+)IsKnO8?c}@<73Qe9C
zHn(8%v`B|SA!G5awSS}$wyovfxLwj!D6*?U@&(tsK*yPC4FHzjOjt92Se3zn&;9C%
zkP4|%-0e{Sz**-!)|ay8{~TA>hYhKuqsSDF5ZD71Dy|9W`_8-p01G3Fa_!Md+u7ja
z;!h`}(&m6oej80>p5vxq%tIaDA(dHihfsxD$U$7+EnK?*p?@G#Lo;&q;c}ZB98@N(
z>O?7@8k&)@Il}}1p&F&JD;sj-Gv&_Gc$B19?7T;$fm{$E6ZJr6JtHzviA+>b$V4Xc
z;fD@U?*UZ}-s_d+Vy3-w@tmwzD1vWrQRpq=6LaHe(pqz&gDbdpfu+l<-t2sRGL;Nu
z?zts4Vpg=W?SIt4wR@KD<J=OCUM+dmGAVhmxH0+0<v+VlZ@YzS3(zIcGPi`2xw7;3
znM9`KWt4et20;l$-roW<$b}!8J1%79@*=awqzM31m*x~gfz+IB0zmJ?d9^`l%zI$u
zPAo)b%!-z-Iq``lGg1x!Jk5DSXKgw*nUE6WCW%cZq<>=vy3G-zKko~n>jCVRzfU;p
z1Hfjq*yP4`iEB~4&mMbzNhzxL<$dNea7{pV5kt(1mM5I`Ar8K+v`V$)&Nh0joc9Az
z2Dvanb&G`ZgtI=9t$a3=pv10EE=i3~m!(%PY~(!<l0i;<aLepR6r#4=?wN(RSESmG
z3R|z0Nq<2|wJ%Ndsv*6D=R&?4<YEm7tU2*%4(`oPlVzY0y-qG>wCaI?0|355iVOfJ
zI=fPPAuo{k0X$m#*b6^-@Rw;K6LRFGDkc1<n6>;?!e%;gW_srXyA?uZSBZUPqUT9B
z^7Fn8?N^(`$OmIG0657_kC?x5T{5oQ%I&Ja{C{#VvSdce*PQsYTlsk>U^vxBTTV1u
zk@HbGF=~kM-&~if@2aqwO0Zzg*6h}1$&8fm=5C(^c_$!)x(7?`z9+(@=1T#SZk7t6
zO05g;Bq5_buzAjKD|gQjV6AZh+>$dCz^x=?E1xUu2?C@-Mk42<a@SuQu=4)RGXjw|
z-+wKt)Vgrkn6ApT^1vP-Af$Kj!LuV$Wp~gbj3ChC;miGTM%ZR036WqfnUQi1K9vif
z--)~vuw5s}A=L8C@I+QL8H>qCby}Dsz^&ytxkBCv$Ohm1R3J0+d`tN;0HB~rV3Pz2
z+5mjKK<kqr?_Z4UQx1}$3s=?V)<%E>YkvcV79NkF`H_12?vo({Kpg;ZQ)DKK2qBV$
zkdn14MiNu*<ma7$QDXpKyZ4(|z7)gSa1g5#>qgyORrc~f6Sh(&IlyM{<k*336Im8J
zHhonO-4*(H^~wK<J>ddWCZfE%7=5Q^QF5fn=B6N8wd^pJFs2gL73#6q=aVW^34b9J
zd@Y>t9&Qa8MeUmFm#Ms4000Of1Z5Q73Z1ME8{W=8)*7CA#gEPPK*TSn%#EocF?~Af
zA&k(wf8StHnJ5L#nu6!t$=(wL5JoWe&Llbdc(b^6W)Y*$EirD27@;={C}NWd1X>C<
z0N{fs#<jA;K@))M8l$|sK#SIn*JaMWN)L9`^Z1}4s_qYnp}`?p@==xfsK$I$8yg)j
z473z5Y$aLBLIHDTaLxlET))lkh1cO18<fWF&*y8D26$-!X42Pytu67t)gQPmxBm}Y
WI1)>oZmF#R0000<MNUMnLSTZLG=N|L

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png
index 46547d6b996bc58da7c10e55cafb0fd78fcd9801..7f987f7a8ef60a676a08ed91fc81eebb21aa23fd 100644
GIT binary patch
delta 855
zcmV-d1E~C<4ebVyBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!T<mc!T}X1N`L?W0|H4zK~#8N?V3MmQ$ZZZ@4e)im(be87?n8N+ASm{L#JRZh2WxK
zM+Fxr2PbI<L5E5~++7?T1O;`lR6#2d2Wx4bb<%beLZNB?*ngHL=}U9IGrvLyh29<Q
zFX8SJetdtI!13<;?%n0?o<WdFrBV*1^fVN?aUAC?q(Yz@kjZ2Uo&j;g5WAFIE+^Fn
z6BLb&jSW&QSBbG{x#m`YJD?h2(0f2Soi2o$$75r`tIM`&b2sSr=j%yGg+T8CrfCw(
zA0UBBj~iI)<$n&SMi_Jh7}WbTXx*v{1XLjm`XewrJY3jqw&H!hsA~$`k9S|*9D`H{
z^d1lnhe`D03F41X%Z%)D2UH^rdJniVGQLa+IRiy*UeCSggH#A~17?Qu6W$Qe3q@`&
z<x`W83W09Ghk>8BJn3nd__?@z{sE*yppOCGzd)&wrGF!)K}@s(pvt1W0n)R;`~Dvj
zkc!}rt_(he90mOdfGUeN0909|4PbkDqR|ORU&Tx+KLx1>4R0}X4{{Ww4Y)iq{u@$m
z3~H>s`uO}D6j6{iAe+sKuSh6aoqanShY||XV?e9ob9tj#G2GI6nN+J)s09z{9`LCD
znFHy8X@B@?)?Dw)fi0uFKL2&TyL*6b*e-7byzu4$r~wyg0~)6`E$)bHS#GmITCEn;
zf`{~NxG*%f1L=XGv_;B0YnIRNTXnuUsE>fO0hvrjXcl1GS>9u?n){UNZUd6ZWC2oc
zOkx%noy7zcQIIy^fBONUP>9@(-k4%qEEeJ0Hh=YcokXKiQd%#OrSD6qqv4S(hFF95
zV0o=pYZp+P-sVUQux*=ME8baPaWgWx5DW(47krMyfKEmm0IDq708nMo27oGyHULyv
zv;m;Xq74957W4&aB9Wkf_XbKO!d8m(SNq+^r?KgDEEXf%+uP)R>B%J1e=)i;*xhf5
zVNjzD096)k0I0HP13;BU8vv>-+5k{x(FTAjOUD?%4on|crqXN`$YTG2>S59`2CxHD
hc8I#i{`~MD<PSUCsjYnS?C}5q002ovPDHLkV1hC`e0=}_

delta 1681
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
bfPVqSIJvrXFH-OT015yANkvXXu0mjf3gR*N

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png
index 66dddef140ffd3fc8b6ecaa428f7de87b7bfe741..c9bd9b86994bdd5fdc01b63b07248e514245f84b 100644
GIT binary patch
delta 852
zcmV-a1FQVe4eADvBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!T<mc!T}X1N`L?W0{=-wK~#8N?VCSnQ$ZZZ?_T<vq@>t1rb-1jTe^irN*shhDM-;l
zg$@o5E>12k(hPzQ5kYWv5p+{Qmr^Lz5|;|K4c%(HmqODtX@63Z7hm(vcg;_*(xG=p
z{iWW0!jJFo-f+qLzWej;j!=S3B9UORSd5fPB@zmS;A)$AJWlHMI(b@po#lEI<Le{O
zAeF)bMW@kd5XW(#L=NRANyiuv4u{G8Xm;^#@zFv2-5O4cjxhiWV*seO7z04H#TWpp
zEye&)Z7~LbYJZC{090F)_XFmJR;M66L{Co-c^tc!<60~h318vy>-3^aUX^pBzxM!E
zR#s5=Bup0o)fQs_sJ0jbK()mf0IDs<08ni)27qddF#z;L;Rl^><IhKV@RcAx2<;U9
zi2;8ebn=`ZgdV`!f{F54Jef>xKq`zytm0B(DFH<klz$D#WHM6Ekum0fIo-^E%@4vQ
z6qLJwwHI_ngVt=fvQr_|Y87h1L%9XKy!xg9>9KJ<$DVC`7_JAZ+l${9Pj?FlZuPpt
zQI5EFSCCj1{w%Eg3moRyqS5q&b;1<jqud3qUAgfS(qrTKpWRl;4g{>tg>MU|d=QMb
zY|-e7GJiXEwx9I%^+7FoD7S!{W0Sj(3PTy)`Z)jY5)@HTHefonoP$(`=Jn;&6Ub3e
zHsJH{k0Vcpj)VU)<c_b8ynrGK%3}b3qmzwJ0DmGz#uxyqE!rEPJPW8YH?;b|mq@!L
z&VTcN0W6FGpxR;#07ZjRsuZfA&jQnzm!}9Ly?;;?#$QZjA(aB%fLmjeYyPU>JQRib
z^yU2-NTonGU}9o|pDRf33eC*SDBT147*MHHNNIbA?3bzQl>@>7)kuTh0@CU9M#Srn
zkJWCk1zTa^8+y2YCkd$(9Wf31<2eb^kQ<T+s6rZa13b?o?tYUrqkDF9pe7tpjWp<8
zfK4B+w%pcWfA@e(srd7lUz+WPR0?zhGMUT<V{B0Nr6!-xE8PRS0jX4~;2Urbioz5M
eg$s~MK*%qckg2hB<(>Qh0000<MNUMnLSTZh`GZXW

delta 1730
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
Yzrx(A<|rn?4FCWD07*qoM6N<$g7_;%tN;K2

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png
index 8ebeed21a9fceba5d6cd550f7ab6d33888cecb9d..f16d149ec46e25f3824cdb7562a002cdee1321cc 100644
GIT binary patch
delta 698
zcmV;r0!96w4bcUVBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0%l1>K~#8N?VG<#LqQD3Uj?Cdlk!&G1h-D5;8^@O6kOb0#10M)
z6&H6GLH`ZuD3nfaf}5_7hg&T;RPs#9^}JV#ZIWy6J`i%fEq~wpkzSKl5@i~V#<*Uu
zCwZPH)oK-Ie@W9c84icZRes+A@8a-n{~Cw?VgtPz5Ik|bbv8K4&I`jScGLxcl?OZB
z?hM8sn>Z_nx&W~4?cg8Nn<fs~Q5OJk1rO(60xtw0?BL5TzGb4G1zN4v7>5OR@Q?w_
z&o(Qc1t4J4fPZ;|Uk2&|KybDJ62SxNN8q{feu2Y3%oF^|9|3daZIi&OETBOY0DZ7T
z0ni7_!fEhn@3l0I&BLN;Y*FG7Kp!ko0QA8U1whYAtyU{FZP?Qw1$kLN=@tWvUazP6
zB4ynHcJSuPlWD^y00n0T4`f+3W!kXr09WvUbn#;r?0=V_EBIpI2_jj*6?|pq8%Mf`
z2msi@-+gwQqtOUw^biw(px~h>Y8FPd5EB5ZK41@Dx0AXb6h*ZW-vPcMdIx|(4**Vu
zbp!~g1VcHT`U12Oy#sJK5y5VW(Lh81Dtg)?_yD^ARN``p-~(*W;aQI%lYYOyp3h-g
zdArPQ_J0D<uF!<_2)IPBO&gKI2yK5C2QRzpUl?(%Jef8k0{Bc60DZ7T0ni7F>bEdJ
zyT2eF0rbHV1wbDxQ2_L6z(c9bBv4O-?RI<W4->?^?eZ(12Fq67{w0YEbphZfGSdJ_
z5xlqrsb~V@G7-4&Dhrf}z=;<En7snF2;8U(05d%TP%d|gAc497)F)tzAceXBW`PuX
g2dIw#r<h5SA5IKcU&dDOvj6}907*qoM6N<$f(d3PGynhq

delta 1680
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
a`~xcTWAD^5B)R|q00{s|MNUMnLSTYbbs-Y~

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png
index 66dddef140ffd3fc8b6ecaa428f7de87b7bfe741..c9bd9b86994bdd5fdc01b63b07248e514245f84b 100644
GIT binary patch
delta 852
zcmV-a1FQVe4eADvBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!T<mc!T}X1N`L?W0{=-wK~#8N?VCSnQ$ZZZ?_T<vq@>t1rb-1jTe^irN*shhDM-;l
zg$@o5E>12k(hPzQ5kYWv5p+{Qmr^Lz5|;|K4c%(HmqODtX@63Z7hm(vcg;_*(xG=p
z{iWW0!jJFo-f+qLzWej;j!=S3B9UORSd5fPB@zmS;A)$AJWlHMI(b@po#lEI<Le{O
zAeF)bMW@kd5XW(#L=NRANyiuv4u{G8Xm;^#@zFv2-5O4cjxhiWV*seO7z04H#TWpp
zEye&)Z7~LbYJZC{090F)_XFmJR;M66L{Co-c^tc!<60~h318vy>-3^aUX^pBzxM!E
zR#s5=Bup0o)fQs_sJ0jbK()mf0IDs<08ni)27qddF#z;L;Rl^><IhKV@RcAx2<;U9
zi2;8ebn=`ZgdV`!f{F54Jef>xKq`zytm0B(DFH<klz$D#WHM6Ekum0fIo-^E%@4vQ
z6qLJwwHI_ngVt=fvQr_|Y87h1L%9XKy!xg9>9KJ<$DVC`7_JAZ+l${9Pj?FlZuPpt
zQI5EFSCCj1{w%Eg3moRyqS5q&b;1<jqud3qUAgfS(qrTKpWRl;4g{>tg>MU|d=QMb
zY|-e7GJiXEwx9I%^+7FoD7S!{W0Sj(3PTy)`Z)jY5)@HTHefonoP$(`=Jn;&6Ub3e
zHsJH{k0Vcpj)VU)<c_b8ynrGK%3}b3qmzwJ0DmGz#uxyqE!rEPJPW8YH?;b|mq@!L
z&VTcN0W6FGpxR;#07ZjRsuZfA&jQnzm!}9Ly?;;?#$QZjA(aB%fLmjeYyPU>JQRib
z^yU2-NTonGU}9o|pDRf33eC*SDBT147*MHHNNIbA?3bzQl>@>7)kuTh0@CU9M#Srn
zkJWCk1zTa^8+y2YCkd$(9Wf31<2eb^kQ<T+s6rZa13b?o?tYUrqkDF9pe7tpjWp<8
zfK4B+w%pcWfA@e(srd7lUz+WPR0?zhGMUT<V{B0Nr6!-xE8PRS0jX4~;2Urbioz5M
eg$s~MK*%qckg2hB<(>Qh0000<MNUMnLSTZh`GZXW

delta 1730
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
Yzrx(A<|rn?4FCWD07*qoM6N<$g7_;%tN;K2

diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png
index 4d0ff4bf7318bde3f96e034058039551ad57141a..4ad14d62d1dfd47f73faee41599f42863653e457 100644
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Nr~~jv*CsZ)Y3wHaG|zkUKI#fhADGLBz=;
z;BXMDfx(v8s^ZD=?<UPZc7D$3t;YM3c3*G)C~AByh+)lAh6r!Q4bzwsbXgBXaW!le
zVaWbj!~dgt{(mojhHOm+9BQygd|~{h57v(<7j&$GVQVT+-NR#rtw858c)I$ztaD0e
F0syz(SkC|e

delta 888
zcmV-;1Bd*M0*(ieBYy)`Nkl<Zc%1E9L5|Zf6n(8G3W7~EQB`$R4GR`<2G$&bTW|sn
z!Yw!gYtAqrv8k#?sB+~cmJzV1f9KbA(xUINqohxYMvaqt{<Hu8@7MMOnepY#w~zd@
zwrXA#^-ln$w(7Pj>c)RZTeYZ)dZ(?Lz5ns{gQWkd<mK3KhJR^o)e?XS84mzeQ8(JE
zSyj|qX`j6zz!~3QZ}?hUwb+=|vg6sUwrVErw+{rA+Nxz$)H?tr-K>hbxhwD2J_$Zi
z($2FJaBeCy5`siYk)439sXV!X0rn)s@_8TG2>`+*XsZ@~f1||X$Vc&cAAKOe0Dud8
zw{(*-fJ=p2cYiNB3E2s7DGzRx8?WsU@aW=1X{#2}{<9N6qZ;z>Gdf`2*8V@pP5>Dn
zn%ZY{00|}$vJ>F>_tBIdg%03wQ+okC`uE^<fDa;}D(Yq|I>4~&FvZ8D0{}OrnSUqK
z0XNbwVD<dLFL`7S1u8zG?;c)@>Uk-$%z&=kpBga;IDd)Ao`I!z(X>92zPS*C0OQ~A
z#EtRVPW(J4!~`($VgMK#U9ewvC~!GqvK!4ICcqajzJXOyH+}MXA5nrJ7cZf9$_5*=
zik`=%h(Z7tFQIlC`H;5HjVLjI2Q{ArXRzV2mPm+E&r1;{27skGw_vdZP;Sg>c~{=A
z0l>*x0Dr*q=?m-L-AVhG;z@M?8PDM_enjYBgjhPj&-J7OI&1ksxWFYk03C}T(*C7L
zq67M>0f0n0;Hhf)7)YW6fcC|Y82w8SZ3e)lKsbMAe*yNJKK5~9?%o@A8f4}00YgoL
zM`$aDuW9g_2K$F=8jSHJ=hC40^Xuhc)8HlLaDO>{_8s2RHuh<A7%>1Bl*9aaz9&H1
zzZA*KVcy<{z?ifg4zy<vjHz_M(er$*Pujl}sdPYVdv2uC0iEqRkwgas+K=`G<U|r3
z(9#}ln~MaK-2cGmS6@H1?Imb)8$G1+0=YFob^-!>1-Pml{(*@Lmeo!`S|Wy!%1!_W
zjd3inSBs<DC<&a#gwbu3+?dtO#e~^dHcB4A%jc@7x1-o7Nr8_W??#?>jt=|41Z4p-
zURyP1BR~8D6CD1c$r&9mi~|#d(4xsG4ou*BaPoR^@_KNxZP6r!4)_Po4zi-ku!6Aw
O0000<MNUMnLSTY>%&aN^

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png
index facbfda3ade6a6c2884f9a596e976a4b6da0a329..fa6f83797c15f9e0a8fa44c37e4c6406d1f6d8be 100644
GIT binary patch
delta 723
zcmV;^0xbRZdi@2EBYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<Ps4t5Z6
z$WV2$AS&Wms#pXIrLEAagUO|T(4-+rad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(
zq|hS9JC1vJ?|WbFz5|3tg{fxOB%o@Rk&4H}Y;IKyyh1=f&3|zS5;OHgdNBjf@pTU$
z-|r$k%e(H+(Wm512KYqcDANs#c!PL$)6zNb6NgwyQi#uqCk(nE@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o*@n^sz&)j)@6nB7H73mW37Ag7Y6g%N}B7mMi9pm5=cUX
zj2g<Qz(Ry}jeisqDLRjN_=g>Tl3X&m%3$PJKou$^#}EDozk6#Irl;JbU<~MfvF(ph
zAg~KG>$d%UY}?Hf!2b+fX>EVC0nB}pUT<sRBVb?~xVUa>@*Z%x0}MUsk|8;gpO#Q4
z0Pkn?O*vrj7U*4b`_?+g=>w3VUM=4M2Zz8|k+Ro4-Xz`A*|&ddTK)S0Md5Ol8b}Lg
z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j~J04mlGnc=mDt008+(L_t(o!^PJz
z3c@fH#_=zrP@73Yz{$x2bn1b;gwO*Nyo3kp8JwJiQk+r;1sz1GXr)cw%gY!Dzds>?
z1P~lqmfe*kZj6DF#GP}PNa0P>Kx-X0po=F-0s!#>y7;<SRImAo1b&(w0e>LQ8R)|S
zz*@_D3;OWe&gRxyv~9~5Fa)3Pn?gzAEITj;2S6Jz7AFnx!N~%Aagu-#JUAc}4+@~b
zy#uIluK-GXbO1FzDu4qY9KeMS3gE=kH2ojIjbApVRFZh_4#dLiy8aG`iBGq6r6lo>
zTOffiud8RkuOCbI>CA;6$|Q5Hx*tWY^?RXnjvY6~-~k(D`iq@-gqZ*U002ovPDHLk
FV1h0lLiPXv

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

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png
index 3799df51bf9225b991de796f1ca3d2d663373420..c40b161092bf1688a7c328fd6fab6c2df6b94fdf 100644
GIT binary patch
delta 697
zcmV;q0!IDMdgBF<BYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<Ps4t5Z6
z$WV2$AS&Wms#pXIrLEAagUO|T(4-+rad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(
zq|hS9JC1vJ?|WbFz5|3tg{fxOB%o@Rk&4H}Y;IKyyh1=f&3|zS5;OHgdNBjf@pTU$
z-|r$k%e(H+(Wm512KYqcDANs#c!PL$)6zNb6NgwyQi#uqCk(nE@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o*@n^sz&)j)@6nB7H73mW37Ag7Y6g%N}B7mMi9pm5=cUX
zj2g<Qz(Ry}jeisqDLRjN_=g>Tl3X&m%3$PJKou$^#}EDozk6#Irl;JbU<~MfvF(ph
zAg~KG>$d%UY}?Hf!2b+fX>EVC0nB}pUT<sRBVb?~xVUa>@*Z%x0}MUsk|8;gpO#Q4
z0Pkn?O*vrj7U*4b`_?+g=>w3VUM=4M2Zz8|k+Ro4-Xz`A*|&ddTK)S0Md5Ol8b}Lg
z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j~J04mljW$Lr$&007@fL_t(o!^PJz
z4#FT5fZ?AeCN)f^;RYU{lZWdKyo3kx7)~yXbTZM&24kx&ya$Xhe18Ze02N2y_fJz3
z@460C6AvNK)WW^@SZm7$#CY4b0ObN={5Tx0@A;+%e&5{y%AA2E9KboJdw&a-@W<Jm
zoO6uhs28vX-(UP-YT_z8umuNX1GeI#0V%jxKq@X0kb`Fj<l<QY5_oce6rL0yiEj>&
z#y16M;Hv|)@Kpht_}>6+{AWN3d@-ODJ{wRH{|YFLe+1OPr+~R1OZ;@!!U0VDQMA@h
f3n2t`9N-1PCdA8BN8=m-015yANkvXXu0mjfL83K%

literal 15695
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
A9{>OV

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png
index 10342c5705897d15d15cec6e6e15d43900b21769..a1c44f239f04f38430c1b7d52c090dca8a4f54e1 100644
GIT binary patch
delta 426
zcmV;b0agB!5X1wJB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*miSxH1eR9HvtmrIJmKoExGFhWdL5&|w{R&#)?JkT7$jgSKb+;{{J
z<QZIv3n7GAB?e|d`HL>?j#0bwAe;W6=%gQ2e^oEKdlW^{#eW$P65zTn{rJ95ZQta1
zPHkD1cL4~VWf=|hO%Mbm;wAtc2+jlZ<zy%3cFJ*cUT~ruQxU+GfQZjk+Np^Dbx6TE
zbB_5T#tCGO37CilqPsP6@M?9H3Vg@Y-D!MK7IcAJ)!E;dvrm2(wOhaf0E+;g=TU1)
zQ54j2aC}z<D1Tc}2ZF;<6Vnm?vI1cklB3Bsi>cF)^G}dKM4G0}E5KB<duO_63+M|g
zzzVPetN<%OTL2Cf6Vv7GeE`l(4i_0-+v+|52Xba6rX##ofP5u`;XH3*ydJ*bQ@B@n
z*aE&f%VleeoDeRhPq(0t-~hh35{MzX38eyPS)~~7lq07Plfj>6gFjB`Zx9^k3h<$b
U03mOCK>z>%07*qoM6N<$f~`xgk^lez

delta 2053
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

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
index 739d63b247..84639dad70 100644
--- a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
@@ -1,46 +1,46 @@
 {
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept ",
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "states": [
-      {
-        "name": "full"
-      },
-      {
-        "name": "ruwindow0",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow1",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow2",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow3",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow4",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow5",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow6",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow7",
-        "directions": 4
-      }
-    ]
-  }
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "ruwindow0",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow1",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow2",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow3",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow4",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow5",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow6",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow7",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png
index dfe885bf85353c9892107604d33eb36f0480e742..ee388930016be622eb0a63c291c95bc0fe0446a3 100644
GIT binary patch
delta 726
zcmV;{0xA8z67B_%B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mjgGod|RCr$Po3Tm*K@f&dQHV(;Az&d|D1u!oO<|*HZ3OWFd;}ZO
z2Z-4C2tI%aHn!2mB3h*rL<_}22*D~bprHK6tgJ^ax!f3?yMNgahFMM|%)hg@yR)|=
z-ak_;7C)&Oi+a7zia~?`nM}rS=W;pU4??wCO@{yozS(Tj)99ok1M>O2A3S`k)$*oy
zCT{4@eL3B_T&89$L<wLr0V0g;HX?~|wei3bV3fQF(DMi$B77Vcmgw<N5tRY+`;#{>
z<4=C@CKLKmtAEv4F^I|l1Jd7Q0<2Idgc=u-0@!4;S+Cu0hZ+}=LjYhHpobCU#Bp=q
zf7pfd+4=!BV<A2R48fi^#w9TV3=1a!d9^qJ$g71t4X)iT>{0Uvn7`k)^A-3;qw&4A
zpL(D1?klfLX6oba=D4^aKwd3Q0P<>a0+5dl-tyfnDSxo1pmMn!TGoaT*s$0ouGCF~
z!JfD6H+E~ohAjXVIbnvL|LYpxps>?#<!tVnnxWV=J`_IHtpx2F-}BL%s7zq1zj?CS
zHv<d^9wMOUrDOp6$5GRxW@HdNGNRMzBwv7D(_k0~9;8BmI2mB0;w2~<Hw4JXM*T}r
z{WKV5C4UI))gXFa)k-k96sE@_V5?s$mHNH|Oz>C|r*1nOJg>J6f!o2;zlee@fPGRM
zG}Hv7!%n~T$70um5uoB=q+8F!l7jlBuoHm1TATpn)$*@X5QzGjT-eNVv3RHBGr3{m
z1R$>#Cjfc1Bt`)H)Y&#JqNhRB5)fps%@z07m{0f&K=8p{w~dQP0qhzgEco4lZCu0+
z0aH4UT1HFNt+7Fa{|!WC06c<McX3kv)minIr>PkWUIuvH7m2j<b%RaP9{>OV07*qo
IM6N<$f>@(TkpKVy

delta 2355
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
Z{{fGAzYr9Fk?a5f002ovPDHLkV1il+P@ez*

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png
index e1ca7ea363976b27b350b4be8191b9df97a6c9b9..cb46c4deda811693284d6b9b027bfb7742c2c4e9 100644
GIT binary patch
delta 849
zcmV-X1Frm$3FropB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mj{YgYYRCr$Pn$c@gQ5?t5y?U2QD?)5xuQl77=rAV~k`D`M1VMY~
zCFs59m~Xup!TyGzm!P7DC|rA(XhAkN?-~T<=qV6uYEgvRu7BRsJ^CB$p}>32wxgW$
zfy4KAt}xF1c=dSBnSwYI4u^G&@dR{jqwD%<D5>BsARdobECGH+p&Lprmt(pI?gB!g
zP{rsPe$UA<Lsjh$r?9*}1|=2T1w<l|3Od&DO<Z@ERhMeO<$-yA^Gyg!D!2=XMxzy{
z*Ys&Oet$6CU4PpG^4H4ep`=2E<O@c~Y-0^mH24eDaDM_~u~?;RcKk=Y4uj_Hc>SU<
z+TQ`mWU^v~zu&V@CX->h2kru9=M!aX5T~GPn^#X(jzdWWcL8&y=>?4NICO3EGF(bQ
zNd<QSiBEysRvhj3?6Y#Nd=E-0xX%LCuRx~8%5Y4B9Dk7lAcaME0nD?&rH_*fP|{#z
zr?wWM=7RhPKnjZ#04XfY0?1w-Z5sxdM{%VTPD4q<A8Rpl7iumr3%ER=_z9(Lu!6Uj
zA7{@(mkZ1SlF20Xio{yZRF^VK)SDsu0keRMb2B?o4vuL(`;D%qs*Y;mZDGU(Jet&@
z92lkL(0{tm#skK8rM~)Zm8$^uS-_<jcAIK7cJ=!M^DwSHykPqYFx#f~?P)83e>v)F
z#kJA?2+Yh*+x`wPO^lk`JDStstZwKVqb(pFk5kP8z3nUoRr9(0XbT{Rn^4+EMKyh0
z4?>R%%mV(mAK>wLQ0taAO|n+2!PP$Pb{l!UUVl_?)Y0bqP3AGMa43r*a>Kijy47m+
zYHLN%OP(Bx0GG>!oOfzP($1t#6y0t&yuu&39EKDYDF9MfqyR`^kpduvMGAlv7AXKy
zScDhAeLWfs1~J(iXfzs#tQ5a$UwYR&_k9tc&xe}LCUQS$q)7gY?9|q1|CbnVqyR`^
zkxBv}g+&U06c#A}Qdpz_NMVrzAcbXU1ds#M&*>i#vI-<^?}6$;GBg6nfhjpe-DPim
ba3J&-iPJcFc2Y^e00000NkvXXu0mjfk!^nm

delta 1148
zcmV-?1cUqN29XJnB!3BTNLh0L01FcU01FcV0GgZ_000C-Nkl<Zc%1E;PiP!f9LK+J
z-ptM}&9<9qf=RbM6h*R)QP$Wj4Wxovij?$XMM4kSOP8FKkm^CigNR^*;wi3&s(4sR
z<0Y{KjY>5TNpusmge|4ggN=!8IvaOeXXnqG=b=WE!>+=M^M4jHpX2`K@%znpe*4~+
z_a5P#LngaZd(WDW#(3h}-<6HOul4QpjfE-!fO_%U#T#ct@~a|)w*oVN$iWxCX_ete
z9OkpXzedaFrnY*fxe5T7GWEJ~0hE7#<o_k*Hz}#7?q@saDq1Uz5~@&iF3?En=~kCQ
zRVY-{i;L!$-hTl<9C%+VRV^&Fni!lIju^IuPX<2VmzOU`p4{IH#u%rRDz)OG5ZQCU
zOFzE*CICz?&ME8x-T#H&;jvjOveZp10LbdSN|eNuT5+EF>~)d+(mUWi`)gkvTT#7d
z+il=3z&OQYimi^VM7-n8cFw)T)bUcyxM+Uq9k4sK_kV4X@wbaNUKSZIy#xBsXTOn|
zU-~K_n@|AR1;{28Kz0GL2?dZ{fNZwC0K!J-g`eIyCNln`hhMuWT7wANz5_x5WEUWt
zPypEl$R-p(b^)^4_5uiRiOJs55=Gbvnjfd_e>OD%a83b09a~Y?H!aoil3p(^6JY^f
z)Spmr5`X^m;+(!|+xnUNEC3{{_bSnov6^x5R}e$^FYrgz9w}8VELBVlP7LF&Z6SZ}
z-~yWtHfqF^iG<MEo+!cs9GE}#767b#|EsEI4A<l??<gR0r5ny)kN6MrxLPajrN>?s
zdj&CsSAn8($1i^QGcEVT-CL~6na{A8W=`|uEq{%{^BFwUi*LnCh_Dr_fYjq{QG_SK
z{`1*O0DxC&KQr-M?s4<ejP*|Zl$zatOv@Apoi$S782BzCnqQRQjF4lqq4GJWRJC{!
zWe)C2Z+{>_0o3u54gg<Wp8){0OqO&r9hG}9i2w!gPPBQ+0*`gIccG(z$m&tUO-z@i
zTYvFD3$QXVXCQx?Y*-?t6Py5quzjqF?9gK{h$h_ut`len&}+6b+CKts*3_s%8$yKO
zCcz8KdS7RcpNt!5JGjSVQ#aMM!@H!f1i?*$$D8dcw|vH!f0a}`95HNT-jd!0f&K+@
z_KZ&{B|+z{N9Y5BN)-A4ggzkj0ih3QKz|?52scH~n)yS{Lp)AqQ=^gG^^5LM<wMVS
zenI~)mncQ=7f8P;3IO1)Uqo3cRV_YLKIg!70{be`mmxD9<t>w&J;J(Y2m<K>B&N&C
z>QTe(C?L|+-i2g=$Gj75UQqd^3$V_WZa4$^)5OZe0`&+DBY;6PvO|wyA8R5Ygmnd#
zw;=?e3MJmGsg3rJfL^l$tx387YlnCFZ0e@kc5siEj2r0d?D5qL%iCuXH0CXWBZhsI
zR6NF*U*(n`<f*ZA0XCpeN=eS13Dg}*7a;Tjp%1u6=mSC@5c&WqKHyKl6MbL#R4Cs7
O0000<MNUMnLSTYbi6)c)

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png
index 773a2b3fff343d7aa621a31db801276464f4a3ef..ee388930016be622eb0a63c291c95bc0fe0446a3 100644
GIT binary patch
delta 726
zcmV;{0xA8b67B_%B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mjgGod|RCr$Po3Tm*K@f&dQHV(;Az&d|D1u!oO<|*HZ3OWFd;}ZO
z2Z-4C2tI%aHn!2mB3h*rL<_}22*D~bprHK6tgJ^ax!f3?yMNgahFMM|%)hg@yR)|=
z-ak_;7C)&Oi+a7zia~?`nM}rS=W;pU4??wCO@{yozS(Tj)99ok1M>O2A3S`k)$*oy
zCT{4@eL3B_T&89$L<wLr0V0g;HX?~|wei3bV3fQF(DMi$B77Vcmgw<N5tRY+`;#{>
z<4=C@CKLKmtAEv4F^I|l1Jd7Q0<2Idgc=u-0@!4;S+Cu0hZ+}=LjYhHpobCU#Bp=q
zf7pfd+4=!BV<A2R48fi^#w9TV3=1a!d9^qJ$g71t4X)iT>{0Uvn7`k)^A-3;qw&4A
zpL(D1?klfLX6oba=D4^aKwd3Q0P<>a0+5dl-tyfnDSxo1pmMn!TGoaT*s$0ouGCF~
z!JfD6H+E~ohAjXVIbnvL|LYpxps>?#<!tVnnxWV=J`_IHtpx2F-}BL%s7zq1zj?CS
zHv<d^9wMOUrDOp6$5GRxW@HdNGNRMzBwv7D(_k0~9;8BmI2mB0;w2~<Hw4JXM*T}r
z{WKV5C4UI))gXFa)k-k96sE@_V5?s$mHNH|Oz>C|r*1nOJg>J6f!o2;zlee@fPGRM
zG}Hv7!%n~T$70um5uoB=q+8F!l7jlBuoHm1TATpn)$*@X5QzGjT-eNVv3RHBGr3{m
z1R$>#Cjfc1Bt`)H)Y&#JqNhRB5)fps%@z07m{0f&K=8p{w~dQP0qhzgEco4lZCu0+
z0aH4UT1HFNt+7Fa{|!WC06c<McX3kv)minIr>PkWUIuvH7m2j<b%RaP9{>OV07*qo
IM6N<$f)tZUc>n+a

delta 2331
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
BU^f5&

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png
index e10cff828eaca524427883090f88e0a16bbc1ae8..7977b29f0cc6fdce99b0fa912ebe23b2a3fe692a 100644
GIT binary patch
delta 849
zcmV-X1Frn?2<QfoB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ib
z000ib0l1NC?EnA*{YgYYRCr$Pn$c@gQ5?t5y?U2QD?)5xuQl77=rAV~k`D`M1VMY~
zCFs59m~Xup!TyGzm!P7DC|rA(XhAkN?-~T<=qV6uYEgvRu7BRsJ^CB$p}>32wxgW$
zfy4KAt}xF1c=dSBnSwYI4u^G&@dR{jqwD%<D5>BsARdobECGH+p&Lprmt(pI?gB!g
zP{rsPe$UA<Lsjh$r?9*}1|=2T1w<l|3Od&DO<Z@ERhMeO<$-yA^Gyg!D!2=XMxzy{
z*Ys&Oet$6CU4PpG^4H4ep`=2E<O@c~Y-0^mH24eDaDM_~u~?;RcKk=Y4uj_Hc>SU<
z+TQ`mWU^v~zu&V@CX->h2kru9=M!aX5T~GPn^#X(jzdWWcL8&y=>?4NICO3EGF(bQ
zNd<QSiBEysRvhj3?6Y#Nd=E-0xX%LCuRx~8%5Y4B9Dk7lAcaME0nD?&rH_*fP|{#z
zr?wWM=7RhPKnjZ#04XfY0?1w-Z5sxdM{%VTPD4q<A8Rpl7iumr3%ER=_z9(Lu!6Uj
zA7{@(mkZ1SlF20Xio{yZRF^VK)SDsu0keRMb2B?o4vuL(`;D%qs*Y;mZDGU(Jet&@
z92lkL(0{tm#skK8rM~)Zm8$^uS-_<jcAIK7cJ=!M^DwSHykPqYFx#f~?P)83e>v)F
z#kJA?2+Yh*+x`wPO^lk`JDStstZwKVqb(pFk5kP8z3nUoRr9(0XbT{Rn^4+EMKyh0
z4?>R%%mV(mAK>wLQ0taAO|n+2!PP$Pb{l!UUVl_?)Y0bqP3AGMa43r*a>Kijy47m+
zYHLN%OP(Bx0GG>!oOfzP($1t#6y0t&yuu&39EKDYDF9MfqyR`^kpduvMGAlv7AXKy
zScDhAeLWfs1~J(iXfzs#tQ5a$UwYR&_k9tc&xe}LCUQS$q)7gY?9|q1|CbnVqyR`^
zkxBv}g+&U06c#A}Qdpz_NMVrzAcbXU1ds#M&*>i#vI-<^?}6$;GBg6nfhjpe-DPim
ba3J&-iPJcFc2Y^e00000NkvXXu0mjf$CiNq

delta 1117
zcmV-j1fu)s2J#4yB!3BTNLh0L01FcU01FcV0GgZ_000CeNkl<Zc%1E;Pe>eB9LK-&
zW_D+1*_9}^(cP>Sy6hp5l!yv}qEt%~NG~F7P7#WQ(1PtrdnloW&<0{}ftEn_Vh*7d
z@sgG#B%xVa0;v@&HV3<bt;UTpM%Q(_f9B77Jy?r5?6&aI`F{z{=QQkZ-u`~`o%iR<
zyr&2uK*|1ie5~B|lF)u$WIKO1I}Y&RZ>tIb)QUezr$=P+Ych>r1S{8~rZH*w@?ZE(
zaQ@HRXq^oCGUv5202osty;fWX_V2g+zeIV6HT0`a>z#TZ(|igTL;H`f_%m-8EkI>}
zirR5G6zU=Hr+-=cGFRR}w)7ao-&{bkQo;DpIq~b`IrPPP;BZH%Ol8&L(Yhw7AwVv`
zN56mkIRM<hx6IaFTj%rYrbygw^v`!^O8{^t*uiubVAbN{$WNcj<R=$Ene93kNrtuT
zdxZ)BKnN88BFV6pJ)NrnK;+6ky;@v!{_>ererf^s$A9A&WZFMTr$=Slldl5DuOGWh
znV)<WpvDt`x&UfC0jLY0#uI?L0BZKU0MbTiF#W+vnfBxHufCJ5L54lw13Uq!3!ugm
zfVu!`JOQW+pk~htAZ>(hoVeK|^#^H?8X;)`Rwf%NG9NW%^UESFz=y#%7>2>`-&@w7
z`)vJgwtoZ!lrzB&rVj_I#$Uuk$RPbyn0jMF7HI(vJUDqC0DO0R+QOT8i*rY`r(*t@
z?nU$OTX+;9ty)|hy!(mVBgi4W3M{b#Uz>8&Oz*nIZA*Z2%)I`G**X#Q0S*To)Q;04
z-2<q%w`Gx@1dm@o_QTfIk*fFHIB~OQ<@-o!tbcw`d%tPOcktmm=7N$J!MEU-%`c04
zM#yxWk!M%UTzNw*h`a!&@BV;`0z|It(*fZ2;?_=B>qJ;D9%`iBn1qW0WQR8GL@Ht&
zZf-++D(24&6fFPrBXTS5Y60_otL9+xtg>T?B*#4g6vat6VI`>RU`!=<fZMp*0~%)Q
z*?+}TqiDHR=L2KALIn3F!OJ1N>u3{?7|pPHE!&tfG`llKz7n`M37*bXD!j}c?(iiP
z>{5TB5}12R-V0nE0+))@T-_S~<g@=ao)2&<k>>;8`2f!ccs^hk`heYVQgm$PTGVV2
zb;^TRzx98;oU}&P$L*H~*7W~!h*I`^0e|^PQ2+pU_yY1QSKbgK&#s!V9oOCp`7%^I
z)F@gf!q0hxZO`Ba<O2AoAF<3p!D>&%{D+&{kVr+0?9is|R(^5;wwdW(GzXJsmHEC^
zS3Sb65r8pO3F<l$PFR7WIIiV&D^X1tQ(A7-`7WLsMZ;{pt2L1eV0Xs2F=c30uU2J8
zjAnElZQ_y3p}jK+2IihBrT#)?2?g8X4zKVscXQX6T!0-gm8r_5;<T&okX!)I2Y5bU
j3(p65KEU$<BtGCTEv9plIn63E00000NkvXXu0mjfPjw$B

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png
index 2dff7e5127da870b33ddd1f786a203e300ab2265..a50fafe0ed2f6c7e70c0d0444aa84f70270f1ef0 100644
GIT binary patch
delta 851
zcmV-Z1FZb*2<irqB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ib
z000ib0l1NC?EnA*|4BqaRCr$Pn?Y+6K^TT-H%U!GRW!tw2%fZ|;2|U>qyaTFhst8{
zAok!z@a|cfo0k^B-ynDqR1ic-?ZJ>%Fs5y`xzz-(A=osC3V+$Oo9wvLeu9-AvNOa<
zoO#OdezVY$eRi`mvqKfcnMfpp1Azc)Hk-)n^}^9Zg25nawOYvcq?sXk9J$Hr5|mV^
zklZm01GU?2=%FKZKN%PSKA#U=%$!+wKWH4Zzwd^AF)#vnAq7ARixdDUEK&fZut))r
z!XgDg3X2o~DSs@??*nGGCl;VQg5U2)#=XEI$ws4r$O?}fA2%<cFN@#ezuy6r%Vn<b
zB;;2BQdpz_NMVrzAcaK=fD{%f08&__07zkx0wDVe+34&%3dTtzD?zdmIw<@T0e^0E
zlA3IU60rTl8|JlmG#afz=^Pa`^i4eiJuWZ{NTpI#mwyps`_~jyU(K(E;1Cy>1x(LQ
z?L*l!mW5GkXW!#?x$9f{)^H2B`SgkoWzSe`%k%Z65yn4UyBq5p!!6+2t8fv@o>2{#
z$9y(=*=#Di#ZN`90+>eu+{PZK&9d773;+i(-vL+WrX4>6kcH4*v+Ge+SH1ADFx+1O
zP1C5arGGsSs4r)ihg-n)`Sf=v9fK9Tv+_K53A$Wh7I32!TZEE^y|=N_L#VmHEFk?k
zeC*CpFW8eIGdEd%3|%g;j{^3Lj<yW~aybksEK&fZurQATtjugr+_z)&u;-lr=KlqF
zAq7ARixdFK4MkCy8Y|pKfw|Juf;}-l30=q7i+`yMlvHpRFgu^F*dJmXx{i7G;{9nT
zso*X^(=@WLK>boAo6Rzv19t(*WU|(^I-wH*mr3(PT6<F%fszXD0uqTt&3)Dix^Dff
zU|-jS!#%Thry7NlioqBL?aQEg6;q*T@E54zeh0+k@fteS369<NRaCF)_=H~H{lIhw
za7-6KHdoEA8S<YSF;&(1$0@9A4)-%4l}gnx#v$5CO+KGzItT6oVzHQR3mAj0V{~0V
d4<!W%{Q^-%ID3BNkl6qL002ovPDHLkV1h@qdMy9|

delta 1112
zcmV-e1gHDz2JHxtB!3BTNLh0L01FcU01FcV0GgZ_000CZNkl<Zc%1E<L1<h>7{~uJ
z@9n<6&2HHw(!O+;y}0yHnh>E40SPr#v`{apVlTx=dMHZOQ?y_~L91fC6_g$lsFZ?|
zm`ep)thFqKU<<~i^q}iy*)`kHB%5TD-S_s*jEAt&g1ae9nSY7o{jT4>{eSsqX1;G{
z<`E$Tbh1009+|(A@KRzYx%c#U;jfEhwc(|U{;pRRt(Sg$@#bdFf0O>|2N``+=HVv>
zXFP`$TB<IK;f2c{{F<`=3RNZ4h}He=A~hbh0N|(mF8~1NQmds(U%LVJ?E=jmTdQ?v
zlHo3=6X{HcU4I-Z`>OP{8&GGuFYgVGo+a7C3!X~dEn@(s28mb}_OciOAxxRBDxs!O
zN|M)Oq4USjAU+dUnv-?|yq+YtCvB7U`~Du=L2qvdcSc*b&mtI^eLyM$Ww(H`&p6{Q
zukzxFC0CWcb^{)Q8q^>c*6(noqAJDyi=Yn(`hX3BK7SzS1A;z4OCLaF_XA$fzIAl7
z&s;rn?a=&0n>*4vXujzTh4%gRnwKLhV%N)s@cnFdSSkTY)QteI#)cOzd!_2K$cYsJ
z&Xm^sMkq6&Ufb)nJ~bY-R`<8--Hw7n1BydsKb`5YyPQsRXOiLEv9+3gyP$myQkp>a
z@PaoudViKo_vMw=`evvzfDpEq#Yn`mK&e5L>28A35fGn=)APsAAbC9&0;OBR1a*tx
zXp7a`+rjtP4p_hM+mp8G^(3`d0(Fbvi6z(NRn9o$1(f~DK-rDVKF~f2lum&Q>vy=Z
zG5@u%{&j*rK$TF?2O#JJf<7SV1GZovAiW>3JAa)XS?_#Ggn!LHVrJ!Fg2(PI5CCWv
z*S#MgeLrCSO2V@z?9k#l%LC{Cx|#aEC6xO#R0RNgGHNx8>qL4ABzTmz4HztSBOan=
zh=5Xb-%5pZuU2Y+K>-8J<9d;v0&8C7%Tje2e^-il``gd4?z*^m@)I#roW%>t=fF4<
z27fhZqj+Mcqjd^M8}RO*@1FyJsi`?y>MHR+j8&2Txjmfio2vl8smK9p(H*o=Ts(8@
zL+QUl0%-%t?>!$oV^Onsa&6;4QwRe9oUy1`Kjd^SwOWnh;^1!|NhKi3lc)k;$UJ{P
zn|)6z0ZF8*z~fwH+sbHPg>@4cpgRHG1b+tTPCz$-0lE{=&9*l{x)YS;aqbs1L-u`v
zZ9f7619T^#o4^3w3Fsy;Kz9PV+4cr#e{b;Wk!y#fz95VL_luMB6K$@{rmC#Ib_3pt
z^i!M$pPHJp9@#d3W3B>3$f?KyYMtKEFfOaF{kMSbgB9%tB<~&l3;>K9rkQ_!wNb`7
z6Wy6)_@PS_Jb|d$C@%Kh{6I!udle|qGGClzMy|h9<9<zmb4)**^HSq>2w)swXdahC
e`v}l|y#5b0A$=t}Z2Hsy0000<MNUMnLSTZV2p&oR

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png
index 0a54faafb0dc4d54b4a80429d75b7b7141d40e5f..3fe3f626e793d16d9353b33ed1780ffe7b4c8400 100644
GIT binary patch
delta 680
zcmV;Z0$2UO2*3r9B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mjRY^oaRCr$Pnz2d)K@dPsQHbf}IIs|HM6kOmA7EO)!cVXf^8pbX
zKf$lCjUSN8P7oW#LO2e)B%lzPI1@JOZV1Mi*|_^)nB}^8w|{qg$;?`&Oj(xWJkPVb
zuCqp?fmgpNiXs~f2HDn4-GS`l?&$Fnm%m~ivl>u5v3s`F-#D)(ftT1(7XWu2;-ItL
zf7^V)t8%CdfNgIV|9MrkaLJCk0Kio|JpU2|A%L)p_r3W3k{|>?;lASG1eh$CP!|9N
zn*rFxbM6Fn0e?`O9e_mffcl5f$#Z#u%O5OK{K|g_nRng}34%HWG)Mw4M@tfbIa-!J
z29F;Oy~o%hEPISCOL_z_M@tfbIa-nc%&at<O>bz!ehgBP!_&MwSy=RXJ=I^NtUJIi
z-n{b^+OP?r;>_ZKs;Xu}8`d4*Djtw-e$0dYCFm-CvVRB!kyF4`{LaT7u5=L*0NBMp
zb>CZ~(Fm{TAtr#J;-M*OHb%7&6F|+6*X!Z5?*~m$ZNzs#Xo$W8AYcXnFU9o;5YP#R
zb~w!iXe0U#z~xkeJrbjVhyZGO+7d#5T>!PXToOWnRe;^$H6?^1f=vJw?UG=IHmp0q
zCBY7DM1LA1^Zxj_-M|0;jS<(Kr_e@3K*%Hkn4={Lz#J{=V{+Q_1?dsM94$!z=4eR*
zFslJSlzbt9`Z3sUx5v1gVbO8<l|Kf3ci!$SbD=JP<^(7JNeMx`1gU8PYo7!zf;t6!
z5;zG$fH^B*OW;Ob0L%zLyWAx~0(Aj2CtypELLps%*&v140okTWmVE(@sZ)s~)1xy0
O0000<MNUMnLSTYlx+YKn

delta 1067
zcmV+`1l0S$1;7Z9B!3BTNLh0L01FcU01FcV0GgZ_000B>Nkl<Zc%1E<O=uKn7{{Oa
zp6#T&iEi2?V~}7CsWx#Vo2;ZP8_-nIT!cVHlt>B|dg!Gsv=<Nc&|>u>Qm|k!w1|hr
zR@fGd3QgCqm}T80_(3$TqHzPR?(CXr=6iZ5y-2ccS$&_w&VTPXF#P}gc;0zuc4sKp
zbpey^qaPk_-zJ;G>bNs(f6_L@e1B(1iqL0zPiy^S1F3&I|HrjQf2|~+t>ola!9?`2
zJ~{T33A75dr5O1w^^M|)a?M>Ki42K+nnXxBhNK7`iL7+Ob1iJw`#tPp9c@xMze6e?
zeFApX4A3{VDSzmUZiM}(4io?=c3*UZ|18WXB=XS(e31K61I4A+q|Zs+o8JmuUzi_%
z_$Xf_m5(l<tte9Zw9N#1b>J!1m=*G-(4ZTpsu5WR=mMU7d`~o0O)VS({XS%_)&js2
z0QfIEz^edVz}DaT$1wBJcL8iX0oVnw@dRKOz{V4RU4H<Zsuxi4jnLk^pYEvS{7Rqa
zE2Ziuz!QL702@yLb^&ZW0oVnwsd@p#ei2H<;^CK%agr#(UECWXA_5Yzc)0184*C}V
zf*RyQ-P1<)R^fMD6FL};M1DDl2;d}9lILYge>-m(oW&P20%Y4?*bty_|Ca-TOJH?#
zFrXwCN`Lo2NuSvHm3yO*=GO;1NX0J;F##uUPb!f<zjLhqVEyN#hn^enmF($-8LAI@
zNL5%8VglU8674J0FcULZtdyL!7RP~3hM(9cNEKKHBHN&;YU-f8$-LmpX{^i#i+<hN
z6AQUr$yEZ0{Bn5r0VF~=Nt8zBuF+eBCdzth<bMOT0{v4eLm5$BCy`$cV%GpF=XVx6
zX{W2ThYgQjVvR`2Tq`!CParV?``+D9J9+*=X+In&e7Ey6xKT(m>uaiL8+`aEUwj_X
ztnQkI$VV5y$;>wAH84*(Zqpy6Dl7@HU0|+Z?$22vZ}Jpt1VTErO!G`zQKU%ZmxIUz
z^nZ^Hq!O`sxE27;LiXxE$Nzp9BGF)Zh%Et9FFgET(67SScml8sVB-nEE`W_E0J{J-
zRWE?T{$2q4{er5W08apR0c<=0*afih1Yj4yrs@Tte=%}ydm?74n)>qbs`+GQ<?(kk
zeaaT<dIhnaZ&^2DWUj9>-gFbOc$kC)^nWFAC!o36cEc`a1Tb8SU!w;(d0u{llSGL`
zKKcZVHhwGK<ffprb))^o&qvZLK;%|OgZ>PFLLwi10!}Z)oilLJKA1cXKkWXxj_-4=
zleZ@oQu*i;FszO{d`e(^t<S89%U3L4y~DYUB^LmQd^m|d0bR*e!k$>jE&6qbl_dG#
l1z%1ZlsB16?F_GjzW_RDWP5lu9N7Q>002ovPDHLkV1m;x@CE<?

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png
index 1f9ba05446a1f82dbfcc86e72429419f5f7f490a..a50fafe0ed2f6c7e70c0d0444aa84f70270f1ef0 100644
GIT binary patch
delta 851
zcmV-Z1FZb%2<irqB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ib
z000ib0l1NC?EnA*|4BqaRCr$Pn?Y+6K^TT-H%U!GRW!tw2%fZ|;2|U>qyaTFhst8{
zAok!z@a|cfo0k^B-ynDqR1ic-?ZJ>%Fs5y`xzz-(A=osC3V+$Oo9wvLeu9-AvNOa<
zoO#OdezVY$eRi`mvqKfcnMfpp1Azc)Hk-)n^}^9Zg25nawOYvcq?sXk9J$Hr5|mV^
zklZm01GU?2=%FKZKN%PSKA#U=%$!+wKWH4Zzwd^AF)#vnAq7ARixdDUEK&fZut))r
z!XgDg3X2o~DSs@??*nGGCl;VQg5U2)#=XEI$ws4r$O?}fA2%<cFN@#ezuy6r%Vn<b
zB;;2BQdpz_NMVrzAcaK=fD{%f08&__07zkx0wDVe+34&%3dTtzD?zdmIw<@T0e^0E
zlA3IU60rTl8|JlmG#afz=^Pa`^i4eiJuWZ{NTpI#mwyps`_~jyU(K(E;1Cy>1x(LQ
z?L*l!mW5GkXW!#?x$9f{)^H2B`SgkoWzSe`%k%Z65yn4UyBq5p!!6+2t8fv@o>2{#
z$9y(=*=#Di#ZN`90+>eu+{PZK&9d773;+i(-vL+WrX4>6kcH4*v+Ge+SH1ADFx+1O
zP1C5arGGsSs4r)ihg-n)`Sf=v9fK9Tv+_K53A$Wh7I32!TZEE^y|=N_L#VmHEFk?k
zeC*CpFW8eIGdEd%3|%g;j{^3Lj<yW~aybksEK&fZurQATtjugr+_z)&u;-lr=KlqF
zAq7ARixdFK4MkCy8Y|pKfw|Juf;}-l30=q7i+`yMlvHpRFgu^F*dJmXx{i7G;{9nT
zso*X^(=@WLK>boAo6Rzv19t(*WU|(^I-wH*mr3(PT6<F%fszXD0uqTt&3)Dix^Dff
zU|-jS!#%Thry7NlioqBL?aQEg6;q*T@E54zeh0+k@fteS369<NRaCF)_=H~H{lIhw
za7-6KHdoEA8S<YSF;&(1$0@9A4)-%4l}gnx#v$5CO+KGzItT6oVzHQR3mAj0V{~0V
d4<!W%{Q^-%ID3BNkl6qL002ovPDHLkV1hbmdMN+^

delta 1108
zcmV-a1grb%2I&ZpB!3BTNLh0L01FcU01FcV0GgZ_000CVNkl<Zc%1E<PiRy}9LK*i
z`*xo%-Oak$m~LHnTLRgGkcI}5=1@|a2!i4vA^{Jwr3LFnFQEm~LkqSQYJ0J#3Ke4y
zf^3_EC<tnCX(1}4M8U%bLc8hOX#Q+=ll1NTH`9ZpD0DZ%$bU>A?{od_<NMq1o0;E_
znR$eB4wbZZw4a&3lCsl0N*=af4t@Xkm@`uO!QF9aLEn3A|Lu*Q|FPq{t0MZE$ipuU
z=CL9wbh%dLBjt-WTu0hlp|XVPQSRK%)48w?05|{o1ppAg6wzhrD>tC|&SP3UxaM@{
zQ=!g87c%*s#(!eA=E~AnZooQ|{j+xV{3t05F4!`4H;n<5YNScmk?|q~gm}_)WeGKe
zQj)$A37#E3iI%CD)SQ$Xu-cbk#<-z51D=~S66onmviJpk>nwuN`(<Jdty(2iU5~rW
zVkTQWykg1HS8l*F&;ZfMIrA=)Dk@X#|M2?&zYlnd-+u@AeSqHwDCq-;=zhSF>Eru1
z`pxxySKpn_wOZdsKh!>YEgRfDGi(=0h3_~p8+tN5^RZ9@g2)>Iw&RVIFWSqsDlhU1
z2lJ%X`+7(-V7<1l*ZOoWtd~2ttKE)*L<1JHH8+#rX>=yK(49|(iU-%6<~xs-uR&51
zC=4#x*?;q+WU_x&YOQaCJOc>vGG2r<={hLYh&0^|kU9cdregH$@JXa^M1r7nQ<xxc
z5xk)5J$*@*G!k$IJl7aEwAH?Z@=73Y5j?zNS<GY}cUcKl*Bn~4qW8<nM}gESaL&BT
z0z@OSbsORL0kVYrJ^+3n;P(N3AFv7g0O9?BwttTHGnF@EJUlV?oSD_PUuCfe%LD)#
z#Z~VI2;UEwzml?zpN!zrsjv;k{&O?^^DDvP7fm$)Fvi1rqqs_hr$CZ5)0Uy2_r|SQ
zkZK_UO40r6>!IQy(*Xh$2%vFXEy7b^&8mH~T&tpF&f&!6)A+}-F!sS${K4E526w#&
zkAJ&7Kr~t}o{Y9BodUuJoG6Tb2>|ydN_45K%nE@Op1Ii?D)c`x0pO_7OLc0{dU5{N
zZ=VVO3ju@;AXB}k;$z#i#rLhJ2b!D*03bfLO<O<Yj9-fA_2Rte_s@kA5aeZ4fv-iL
ze=<GuiBJN92v>m@xyrVgQN9YR#y3E90)MLU4N#qcYJ3A!C!m@wZ-8(oD9Vf6FKC45
z_X1mf1o#H1PCzxj0jd*Fjc<VJ1XQ!-4N%?)soqjk{^8_&uGJFRR29`%ZoqM455+OC
zdlM!7xoz_!k4&J695s5We$1#F7u8oj1ymobC^ul&!vm)QAb2aF75A(-jJdo!pG^uq
zbBTf_(X7>r^WC>U7138-1xmEamd2gH9|L8Fxi$x5n0)6?JDoFvfX4t2jpJe{9|5Y5
a*Z&1WAAozTG<R$O0000<MNUMnLSTZck{DP3

diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png
index 5fb5fb0c7f73e3833ebcf274b733b174ac12c36b..6edfddd38d6da14267666ae4f5ecb90a7f0143c0 100644
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1enaIvS0V@O5Z+u4S^4Gsba<c>^8U=G(fAZq3j
za5#w7z+g*kRq<r`ca!EHJD+oXlkvVsG4Go{iW*-FVpy}3A;Oz+!!)J@UDg9pTn$@A
z7_xuX@c*cu|KH1>AzPCHhZ-yrUl@PsgY{#|1s$tkh+4{1mvGRt5$Ie7Pgg&ebxsLQ
E06wu-kpKVy

literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP;jrO
zi(^Q|oVT|(@*XmfU`=eg(NZ|0(N6hddRxz7owSbqKU9jY+rKU;dVJ`1)N8fM`tR3M
z>TT?wr_|5y`QONt!RX7lrC}LEltVCs?gGsQu?r#&+!<U8SWWt0GXAo)fBMOM0TxNt
r3rw@{=!Ht3y;k4YjczWI)@SS@213=VXO##6J;LDW>gTe~DWM4fngUnA

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png
index 34c51d7c3d6a3b995f8df92ed1176e988a2ad8cb..73b05e9b2a0e57f6bbbf74c2203f6a234ab05f53 100644
GIT binary patch
delta 412
zcmV;N0b~A;5VZr4BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0ZK_kK~z{r?U%1l#4r@c3pufDayLr?8Zkj;@h9<kB$__}jl|=T
z=dla&^j&gxOm3Nje4BougL3Q2mLmE|UYh=Rec!$<>FZIR=YQ|QBT_&VMY5A5iEQVl
zX&TvfUH2sb!Rxw~6LXWMsTA=k00RiliSyM>sn$-)X8l<3pp4lQz)V2IS+SZ_#I{_^
z;5<2F9;<l?PL2gw2nRL%XY}CTv)jwS#no-uzU_MsQ=n%xUY>~8=ZC_W0fL3h1T4!k
zC!;@utL=Lj1%K$oaV*-lbu#!4u~4lM20y*LzEeY^*u6a6V~<0haxen~|Hc@z#ah5z
z1OY)n5D)|e0oDR=kB>21j0Fi`QNkP11^Vjs0K^RzBs#p;UCc(fQGi~O!K$iqGWuh$
z-)hVs1&JPfs>+yqqCHrY`Y6l)$HT<?)6DzhRQ9|e#1#jHer95qmM69V0000<MNUMn
GLSTYGh`YrA

delta 2050
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

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
index 456d8a2890..90c736a41c 100644
--- a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png
index 8beafa06dbb5d13694d1414440fbd8abc6a2d5dc..f339bedb11d37faf9be7bfdfcdb3aaf21d18e791 100644
GIT binary patch
delta 735
zcmV<50wDdh5%vX;BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0*gsRK~#8N?VBM?13?f)4^-32QcD6FQ9()_qOKB2LV`e`2o^*|
z1z3VYAV^4%NL&T3G>8f`B-m2frVjcqvt(&@x$8}@o!;(CCV#V8LYkSI-I<-eTL~6S
zxm^CHVIsQSF3ScH4#?$l;kZyJgnAlUtyVT10OR}pKF!7_6A@4>7DMBq2ZKSdRX^^~
zpCh?#9PZFC5v!y{0OJt}Z%;Rs;n!ynN4SV`0G_;Z!h7ebLer@tY6)!bop$h4VLY4w
zXGGC%w^=rbihlsbW~Kfc36N5$WECzV9iWrX=Y!#JXcaCZmjJ*rz!Qd%8@mVR;iQ3a
z7PzEgBE(04Lf`py;j%OiNDJ=(($3-?K-yW@X>k9fc}BxO<k!}NkLUXf<ndmw7Zx{a
z{`K*yqEa9CG{?m+0n*Om9YESyyaPxl2D`dRmIZbSs(;mL*0#1f%HnLF*)#|vZ8D4V
zdfKoZfFj2xc=Ge^@lDGtD!~^TTG4xaXnZ<X3F<vQw7h9r1gT|#Nzq&0l3<4)dU`aB
z4Z<JJ7>z~?UjpnO|1S;Nfbk#`4oDIKI{rAkVEhswofzjg!K3C~WFe$L4S+O=0w^<u
zkm<I@B!9|y75-9~%O*Hk3e&U**x^^LRwMTSWjsn^RE3#33rybE>jJ}d<LO^S!QTVu
zp57$r2}oxaS-^NP0-U%QG41$}WnnH^Kr-F|q@Be(fV8tLGzEdUugTdm%fofUjo0MT
z!aIPpvv>!Pc9x}afPTxQ3m4I85WR$`Yj*BeV_4!NK=l=D!bPM5^d2H)^1TCHxQJT<
zdiOX^8*N+(X6LiHX^o!+q8y-%N9)|Q<C}zwh$Z0sr?bv~JWazy@FE}xegMu&5QrON
R_dEaq002ovPDHLkV1lsMNOS-I

delta 2218
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

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png
index ba95fde9e59c54dacd0eda155231ef640db07f41..defff91bc0186ab4955ad1c16e520e2a4d9e1945 100644
GIT binary patch
delta 596
zcmeyv@rGrBay<iMage(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sBugD~Uq
z{1qt-3`~rkE{-7;ac^fEdN4Z*xQ6FW%1(}Q)RtE4IAW4C(a$4UlSAxU(rVW(ky~9`
zTNNU1vAk*G5cAx?aYOsYF_Fx7Ok#$M|0{5anK$3Gu1}NGslTb@ZMWTgw{dmxIpd{4
znLT>laqHE8@!#WJ5w=>1Icja#Hr@s53SCOm&p$Vu)N{t3ajI9Uja2WQWA6&ZojZ4|
zlFwOmT1k{`!n!Ht5o~wjuDP<EalSffmg<DlPYovZl<l7Tw%lQDn6PVO+UA+L%vahE
z9zOP!bC-@<-~*ZZSTXK^{59*==GV44AJ5gF+phjcg!^mY0iK3cM}gQ?hV6Tw)FK13
zo2R=E%@B!Z3fMY>F<@(iNW-R&wKFCvnH~6E7}ix$bf1$~^U=x2OVWZKnanU*s_JU<
zGe!M|qq*SvyT6TA<}>T?INfCF_Fm)Wt-#wMZ=Y9atk>@89UWAEWb$hM=6$Dc2OXLG
ze=7fi(tqD7ip5wOUw{8C@wf3>{lb8P=7R@zGa7d?UDmgGb@`V+x3OV^nN7&wrEaMO
z?_wMNANU4z56DgEc!l|a*O7A;w0O;tUNAZ7$H#xRevyxpHoiDyP;&bA@8utV<S+To
z?VH2ta5aeyE8gqOdinY8Zlk$OE6=`S^UUH|(Dd@l@yU1iH77s3BW~||asRJUtp~tV
O!r<xZ=d#Wzp$PyZnFSF5

delta 1128
zcmV-u1eg2l1pEk)BYy-#Nkl<Zc%1E<Ur1F+9LHzooO6#xRBG*-7Ntd6n`MzwNff3*
z1Y5ln1kuW}5k4#|v@UH#+d~^#5cCicL{<>gOMhtD2Tdy13hj@jttp$flx3}@yVSk+
zoO@;_ezz@r$eZx9nG>Gx%ei-cXU^|;e#|hR`<uCxASI<lJ%1o8CvR^`=1lp#^A;P}
zJ|SzK=znrQ9$zB+!;aP;G5)nD;M?l@-MxR*TH}j~Jt4&VhxJ{%Xr(MHb>Q>M>vi^E
z_UiAJ?ZEhFL%8RYDv1&{X-NqW-@Rd(rb!uNgm$!q(uzuB%pi;zge0<KW79qY!cli$
ze>h5d`d^U)2Y*iz$8pHd6`N&yS2tNaJDYIMrC}IsFnea&*w1?kR9?8b8?K#Ax0pF)
zx^M`Uk-JSHb7p=7+NY(DWwv3k!R*Jktk{Y1uYC%%Jna*;C#qR^a<=oI5V0utB>ifh
z^Q7*4$ce?|pO1QZB0JW<A69`XO#g=+treL5CZ_XnXn#}X(aV^}>{?rZibDGo(5)Z=
zK8Qi9f&};=2CWJb;DZ>nYQ!f1O@cemG_At)|7FdB-!T0t#l6Ca9|1uEd=P_H1qtv$
z3|bW=zy~pC)re038ic0Kn2joFb+xykN?KSDLYKsfw(fVH)t)ocOV`9VF{G3RT%j#(
z$;x=!i+}px?L>B+LQjFbi7BjP<2Pc|qfUDaV^)%3QhD#Tol*R?Yg-nbHF>;|$gVp9
z=m1_v9Mr}}M(P;c#s+c<pc7DDePs_^Up6<Iqw@=6uzx4--wDy&x$ghBh$P0$!R$xM
zmTpJAfbJhdQAxz(`dVYuoCPt@^P~`h$QgO=i+_e1OK>6tCnS*_>mRG(SOrkq+g<G~
zTBiVd71&gH^wP)fIrdZ8(q-EZMV9Aen(GUvSrw-n-H4E~Zclj#>mMs+AmlkNztr~F
z?GHy~gmWo8p?&y+lqCRI0IpYCJLBK`uGiS(GIG(In^-AJz?UVfJ+G}fIVUTVz$%ck
zXn%R^pRU{5QCw*N$#V+aU#kw&0ZXKIDN6vQl-op7+qMZ~OgjO-lhP63{rwmFzI+3D
z)!b<LB?-zB&{K2P&MufQ(#MS^sriLoZ$q8=MfQB{D}k~Ez%M_CbHO<mQ6aq4g~d)^
zcboQ6pmYj6==oO|hC%&QhzU4Am7{<I0)Gw&I3VBvKXQOC{x49x?Vy{?D6Lvo7&_JX
zAa=36+iTeOgFTc(l)Kgzpw1U)KPd`=+Cao03~B{XGw_Dt4De8;eHj84045*<7~vf=
zsF3yq01E&U02=@!04o49sPgX{Bn37AMgUe&>DNC@&RCogfE9oll=)TVD3Rdhfng1R
z5r7qx`c~=eLjo26CIB`7MgUd-W>Do{djg;)0JQ<A5kRc~Y6dEIjs0{$f<dhSY6eQ3
us&w`t1so7?z*_|z5O6@i0qQw`5b_2j+mFcCwQ({40000<MNUMnLSTYdQxV|+

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png
index 8beafa06dbb5d13694d1414440fbd8abc6a2d5dc..f339bedb11d37faf9be7bfdfcdb3aaf21d18e791 100644
GIT binary patch
delta 735
zcmV<50wDdh5%vX;BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0*gsRK~#8N?VBM?13?f)4^-32QcD6FQ9()_qOKB2LV`e`2o^*|
z1z3VYAV^4%NL&T3G>8f`B-m2frVjcqvt(&@x$8}@o!;(CCV#V8LYkSI-I<-eTL~6S
zxm^CHVIsQSF3ScH4#?$l;kZyJgnAlUtyVT10OR}pKF!7_6A@4>7DMBq2ZKSdRX^^~
zpCh?#9PZFC5v!y{0OJt}Z%;Rs;n!ynN4SV`0G_;Z!h7ebLer@tY6)!bop$h4VLY4w
zXGGC%w^=rbihlsbW~Kfc36N5$WECzV9iWrX=Y!#JXcaCZmjJ*rz!Qd%8@mVR;iQ3a
z7PzEgBE(04Lf`py;j%OiNDJ=(($3-?K-yW@X>k9fc}BxO<k!}NkLUXf<ndmw7Zx{a
z{`K*yqEa9CG{?m+0n*Om9YESyyaPxl2D`dRmIZbSs(;mL*0#1f%HnLF*)#|vZ8D4V
zdfKoZfFj2xc=Ge^@lDGtD!~^TTG4xaXnZ<X3F<vQw7h9r1gT|#Nzq&0l3<4)dU`aB
z4Z<JJ7>z~?UjpnO|1S;Nfbk#`4oDIKI{rAkVEhswofzjg!K3C~WFe$L4S+O=0w^<u
zkm<I@B!9|y75-9~%O*Hk3e&U**x^^LRwMTSWjsn^RE3#33rybE>jJ}d<LO^S!QTVu
zp57$r2}oxaS-^NP0-U%QG41$}WnnH^Kr-F|q@Be(fV8tLGzEdUugTdm%fofUjo0MT
z!aIPpvv>!Pc9x}afPTxQ3m4I85WR$`Yj*BeV_4!NK=l=D!bPM5^d2H)^1TCHxQJT<
zdiOX^8*N+(X6LiHX^o!+q8y-%N9)|Q<C}zwh$Z0sr?bv~JWazy@FE}xegMu&5QrON
R_dEaq002ovPDHLkV1lsMNOS-I

delta 2218
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

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png
index ba95fde9e59c54dacd0eda155231ef640db07f41..defff91bc0186ab4955ad1c16e520e2a4d9e1945 100644
GIT binary patch
delta 596
zcmeyv@rGrBay<iMage(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sBugD~Uq
z{1qt-3`~rkE{-7;ac^fEdN4Z*xQ6FW%1(}Q)RtE4IAW4C(a$4UlSAxU(rVW(ky~9`
zTNNU1vAk*G5cAx?aYOsYF_Fx7Ok#$M|0{5anK$3Gu1}NGslTb@ZMWTgw{dmxIpd{4
znLT>laqHE8@!#WJ5w=>1Icja#Hr@s53SCOm&p$Vu)N{t3ajI9Uja2WQWA6&ZojZ4|
zlFwOmT1k{`!n!Ht5o~wjuDP<EalSffmg<DlPYovZl<l7Tw%lQDn6PVO+UA+L%vahE
z9zOP!bC-@<-~*ZZSTXK^{59*==GV44AJ5gF+phjcg!^mY0iK3cM}gQ?hV6Tw)FK13
zo2R=E%@B!Z3fMY>F<@(iNW-R&wKFCvnH~6E7}ix$bf1$~^U=x2OVWZKnanU*s_JU<
zGe!M|qq*SvyT6TA<}>T?INfCF_Fm)Wt-#wMZ=Y9atk>@89UWAEWb$hM=6$Dc2OXLG
ze=7fi(tqD7ip5wOUw{8C@wf3>{lb8P=7R@zGa7d?UDmgGb@`V+x3OV^nN7&wrEaMO
z?_wMNANU4z56DgEc!l|a*O7A;w0O;tUNAZ7$H#xRevyxpHoiDyP;&bA@8utV<S+To
z?VH2ta5aeyE8gqOdinY8Zlk$OE6=`S^UUH|(Dd@l@yU1iH77s3BW~||asRJUtp~tV
O!r<xZ=d#Wzp$PyZnFSF5

delta 1128
zcmV-u1eg2l1pEk)BYy-#Nkl<Zc%1E<Ur1F+9LHzooO6#xRBG*-7Ntd6n`MzwNff3*
z1Y5ln1kuW}5k4#|v@UH#+d~^#5cCicL{<>gOMhtD2Tdy13hj@jttp$flx3}@yVSk+
zoO@;_ezz@r$eZx9nG>Gx%ei-cXU^|;e#|hR`<uCxASI<lJ%1o8CvR^`=1lp#^A;P}
zJ|SzK=znrQ9$zB+!;aP;G5)nD;M?l@-MxR*TH}j~Jt4&VhxJ{%Xr(MHb>Q>M>vi^E
z_UiAJ?ZEhFL%8RYDv1&{X-NqW-@Rd(rb!uNgm$!q(uzuB%pi;zge0<KW79qY!cli$
ze>h5d`d^U)2Y*iz$8pHd6`N&yS2tNaJDYIMrC}IsFnea&*w1?kR9?8b8?K#Ax0pF)
zx^M`Uk-JSHb7p=7+NY(DWwv3k!R*Jktk{Y1uYC%%Jna*;C#qR^a<=oI5V0utB>ifh
z^Q7*4$ce?|pO1QZB0JW<A69`XO#g=+treL5CZ_XnXn#}X(aV^}>{?rZibDGo(5)Z=
zK8Qi9f&};=2CWJb;DZ>nYQ!f1O@cemG_At)|7FdB-!T0t#l6Ca9|1uEd=P_H1qtv$
z3|bW=zy~pC)re038ic0Kn2joFb+xykN?KSDLYKsfw(fVH)t)ocOV`9VF{G3RT%j#(
z$;x=!i+}px?L>B+LQjFbi7BjP<2Pc|qfUDaV^)%3QhD#Tol*R?Yg-nbHF>;|$gVp9
z=m1_v9Mr}}M(P;c#s+c<pc7DDePs_^Up6<Iqw@=6uzx4--wDy&x$ghBh$P0$!R$xM
zmTpJAfbJhdQAxz(`dVYuoCPt@^P~`h$QgO=i+_e1OK>6tCnS*_>mRG(SOrkq+g<G~
zTBiVd71&gH^wP)fIrdZ8(q-EZMV9Aen(GUvSrw-n-H4E~Zclj#>mMs+AmlkNztr~F
z?GHy~gmWo8p?&y+lqCRI0IpYCJLBK`uGiS(GIG(In^-AJz?UVfJ+G}fIVUTVz$%ck
zXn%R^pRU{5QCw*N$#V+aU#kw&0ZXKIDN6vQl-op7+qMZ~OgjO-lhP63{rwmFzI+3D
z)!b<LB?-zB&{K2P&MufQ(#MS^sriLoZ$q8=MfQB{D}k~Ez%M_CbHO<mQ6aq4g~d)^
zcboQ6pmYj6==oO|hC%&QhzU4Am7{<I0)Gw&I3VBvKXQOC{x49x?Vy{?D6Lvo7&_JX
zAa=36+iTeOgFTc(l)Kgzpw1U)KPd`=+Cao03~B{XGw_Dt4De8;eHj84045*<7~vf=
zsF3yq01E&U02=@!04o49sPgX{Bn37AMgUe&>DNC@&RCogfE9oll=)TVD3Rdhfng1R
z5r7qx`c~=eLjo26CIB`7MgUd-W>Do{djg;)0JQ<A5kRc~Y6dEIjs0{$f<dhSY6eQ3
us&w`t1so7?z*_|z5O6@i0qQw`5b_2j+mFcCwQ({40000<MNUMnLSTYdQxV|+

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png
index 754af67ca375ecbe1cce1a93a6ae6de253280ae6..0324c05f17dadf615a222aa7b7bb36d63b16224f 100644
GIT binary patch
delta 591
zcmaFG@tkFXay<iMage(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sBugD~Uq
z{1qt-42*v~T^vIy;@-|S^l%CkY4hLuBKoZ9ij}GpIEp*jwjWp;$RRar=~g!O_Nc`>
z6*;7$Tg*BaI4*U}(9bY!pSJu$z`S4bDIzcS-l(iP$6i1E{|~m-`Q`6-exLK2hja4D
zlzYJ|MM|w?y;OuMez{uBU1q?OSy=qspr-QJWk)^#)5kgH&S>qr{I+c6_16!Dd5=6+
zF=JDi>=||YUcO%HcDv)}w<pFNImV!QhG9h%HoWIG<I$j}3=bI&{$aAc8&@yG>ge#c
zZ1#^9aohd-txmd`HiWHKjhehclOeQQ5-XO~zVo6cCoaA6gXaY4g@q5}d4Ak`@ni;&
zdGNQ+xxck7ejeAE_te|WKVK~wu==XnZHDXS4c8gxaS8utdlPz2n!~+G+&PZ_)z@Ds
z(gF24p>ud1^c>L2ZTMB&u>JSWm~)xD5B44m@o98g_+TpQs;jS3q!-xne%pLteec9X
zOYQenu_a$p`Cgs*bn4Zy=pSC|9xp5`ZeK5S(62dQ>kP(#tvCDxw2sAp=Wa{Q`lqkZ
z3iCsS*aSPDPHBbOIb!AxyA~+rF-*U*=+g`j?tQ9TBP0$;-BppD`p>UGcA@YzwuOs6
zh&-@9qIX#QqvnCNTUYo#Ys$~|y~FS|Gho|Zzb}j$k5BD?a^q7pFo7_5y85}Sb4q9e
E0C52bHvj+t

delta 1110
zcmV-c1gZPy1nLNoBYy-jNkl<Zc%1E9TWk$M7@nEkJ==<?wl38YTB2^H6>VH1q?ZSg
zxV(@Mad{wdOC(hAfCsmdNIZD(fJP$W#Vz8Y)sQOEHk6_&w1iTWmT=D5%go4MsgO8Z
zOf$36{a*HD|FiqeerM-=|34Ru1i?8Mx<Pto*1`O3N9}lmaev98ywI8IXU^5e7Psoq
zCUg0L6W6=De)q!M%Od=`$i+Pc<}w!15a|d<`L%{uw(B@zs{RFt>WA;2I)=C3E;Hft
z%?C}L=RQ<kF=g>97vO#KU6MGhz~PVYg)-CAklRofKe%wdD~n&b0A0XiCfR#Sj^X%;
zxwcGR-v~em!GES{A`@|pF{aXZWf6G+9{x*RwXt#S66C&kDz#0@1sIeunYC3_=t<dm
zZc6{YC?j_=Yb`t9d;SF5TN-fE)O;(-m`f>T7NsnC<{V2Fzi<8npe>rF;b*O%m{d}k
zWWPg@2LyS*cLaGrkOu^LfRa2wcsyX|xth7%eW!Hm%70liHXpVMGSl?Mc_WSDv(<Kl
zabB@+ZK%1iev1e{#$t~k?G11(n?kJ*HGhOs4r2haxV<1vfG%(E@_O)o$N^;W$AUBg
zz}vy&!Rx{E!TTWxki{PhQX2ps4_*(RFO$~`(gXl+2agA@2iudy+a0970pRiA_2Bt_
z5kZ;&;D7Dl@!<8~`QZJK1IXf!1!)36jSsax)cjEU!x#XJ1<2x$1*u&CYJI5reN}_V
zA`0?=AP)%gfFKVD@&F&^0m8q+h|v=cCZ>($@0#xXBIdyK9M<vrap(QL;;P33gx3ea
z;)b>x<wnl3bv9${hpn~Wx@u%ET_1(dA8%KfUVm|w5bgqT7?Ghf3u*X%t)c5WCWIjT
zq&}29qsSo|B1A*TE3R4q;V$qsVjb!TM^S6X7j)$4X=GUz+FrbxH#WDR=@T*#rIc%$
zMq<TNllm#`0>T39zf`*ij!iXph(3H2vk>Ny`!ykbY<2|Bk4#A*rlyft@zOO#JB1!V
z^?#UP{hM}He(EF%56iGVGv-98%klUe>vhG&kmWf1(aSdK6&K|fMNhauiOBWMjrGMM
z*DH5{KUvD=XZUG)TnPdJe9#7^2n6s!8<Zjtzz1zmie4{(^8Et4&ewLkzQ7Bj`vrRa
z8xRQKgElBdAb=0rpcH`sK4^nd^m+l5?|&PFMU;ZK_`f$!!V1#2<rnmnq6MA1L^$Uf
z9N}Eo&JkE!5G($CgHR%=z6)dxNhF2KR<J%Vo6LTM7;&18`NO+rYW_UiGz>g$*Z|Ed
zF3PXG76?aep^25W<OH#a6`|JmfB@@CEBC?iV_mi0H#^UP`9oMi^3x&;7DtF4D^GrW
z)$AQ2{K~sPlq2@4vRvykaf;)*E@zA(K03?(P*r9yiWs8^dBsKfeX)IBWP1JilL!Ca
c1rS2t02xS*lY7{Hi~s-t07*qoM6N<$g3Qb!1^@s6

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png
index 6f16899eded8c32a19b7a837eaf03ccfda43eec9..6770b1a2357e8a4a28f4bb16a59fdcda5cff46a0 100644
GIT binary patch
delta 683
zcmV;c0#yBh2*L%BBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0#`{yK~#8N?V2G>LopDBAE;$^%#wgcOpsZ`+$55O1c5*iEQpB-
zumpubkdPpea}(GFiG~C_W?$w;{>OEB>)K^uxx0?`OD@+ucYojddfToWnKF$=V^XWt
zve9UiRVo#F`b)iD&+<Iab`FlO^6xKtI?MB2=Z2PlVw18ODBiHwJ{#;d+eOeLcGLyn
zlSk|yUJQJnGAHT+u<h;QKL))fE!j~Q09?i6{g)sJ0S3Ex9Dv*eApnK@ibn@17EGuM
zK*8kzcJZ8tqkp;p6l({NC?2SP5jyQYUea=oWr|<>FG48N7ZL>31vE$kC`U^YKsj1g
zZi7eXU2hv(hE?0xs-#zda<n7?l%pjHpv+2jYug*zu(v@|<mc<tb+NGM_xq~9NLhD)
zU3|4#oeOQ)1h|R^!{Klyv|-%=uHu38@M96|hoGzYVt)|`B3-~$d<Y!?hzJ07@oz7;
z&GC3lPxKHIU@*mFC|VwjY9S`T3_sp`_tUu_hN9Yt?|{${Jp&N913-`BdIb#lzaQgp
zb1y&}(KCRSQwjE!7!5=On4zaFAq3b3m|>?&LI|)5m`->d5<(HdCctcQmxOX?!@2`p
z670}MWPdQS=!efk=j8tnMz9lnp^b=ukVyh4M@tewIa<`O$!Xs&NUs3pXh{MnM@tew
zSq=P9@`VKIZLrm9O=vm8ve)I;z73jt0_6bH$ujd!P#0kC377zq5`s7c&CmpEp9C&~
z>H<CqoCG1Dyv1z^+^7q{9RZBXT@oZv7hvuQ*d!99P!~`hkmBxu?9e33egG-XQi<a&
RG#dZ_002ovPDHLkV1nBWCGY?M

delta 1004
zcmV<I0~7qh1%U{VBYy+PNkl<Zc%1E<OH30{6o&6iTNr39mf9czBmv5!(EyQ$5dn=W
zb)y?tqJ{-7G$uyfm{^wv7skX02|kD`bs>o%u1u&^3=eq(D9|DXksyy!sBIbSbjBPK
zH-@5S$hl)?zGai?f99Wib7$`T4?|=kNs_ETXt>gRC$HvMbbo3-AfCuI6~6uyn#fDH
zu&o#C`Nn(C`u}wOtuy7Fa`ag_7w-u6l8s^aJBIKfHsYUO-ldCj<I^(+LsGI4L!P<;
z@U%0EOGR@ips%Q^*6WQaQO55VvGny=Lh-20Ph+QMzmcM{<D~iSlK|A@D6cekzaXm^
z`qT}0<nr**P=Anhb@drD4^@=}{K1~3uXAfy`qZZY!-tslFFqY-FCaP{`y;H^M<ZrS
zB)T36W9U;K0bLKA+~&=8Jlr6JeE9YI->d*T0d)f!Za;R>)Th4;QbsdC0X0xXGe7|~
zP(?F90X0xX^#;h^54icV@06VDou|uWea|zDyjxKH2!GHFP(Te-(F{;P4OGz#P(Te-
zQN00ZJ3?)j>dSur4fg(>r$=PH2+0M-0J!;+H}10=te(kEHB~IEg*{7yJ$y<|0gs`-
z9Vk-(o^*0BkZcqLLo6mH@V-fsw9g)sIFr0{wH*L$3fM9;QoMaV!LW}EG&R;q<Fkti
zd0Bh0<bUIWW`JjOV%2u=u-I6gZ)<ITwZdlS#^%-+n3|$2tP-{aZ55ELR#phF8G7Hl
zg`mkI%nc8+a3YMQ9}g4*;NYVuCp-E*X5f>p>3axg5{s*kNW?dkh@rn7+Is+o2&@9*
z(=%+UDT#p$0O1*S*geJ=?Ijx+`rCmv0^rOa&VT+P0{~e7$OJ$(082j}Xsdu@f8lO#
zUw5$iV|Spbv5t(-F6#2K(y-*?f@T1m`5WyA1dG*N+48h=NJzEuZ>Lv8RV;(B3c#5^
zoc%)v0I~p(34m+>hW>V-?Fz^H82UUpa!roD++AU`DS#Dt_*Yc_9-tYZfEuWx8K8g~
zsDGjvpnw{vqIv_U_X{{X`eo${{{Maf%4h~Cpa!aF1}LBgs%Qo%pa!a_-T>+yBkkAE
z)o#@vq?(qQqZgd~+Vo_it+bL$OEEfTRzkgrq9DN@B8CanrvPLGAS(cw0mu$Oh5)hz
zSe>KPN5J`72e;WcnN<;MX?s2Zo5dOBm1Sl^RMI%<@-B$W!H6{2`-Z)G`K+bQ?OpPW
zj-lK<K-~by2!yA`bjHkV0kQ)^m@`OLD|}+2WC!RkgTA4}&8z@t5+OSP83M=>pmdHB
aLVg18pkNYXZ|aHw0000<MNUMnLSTZevC*6W

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png
index 754af67ca375ecbe1cce1a93a6ae6de253280ae6..0324c05f17dadf615a222aa7b7bb36d63b16224f 100644
GIT binary patch
delta 591
zcmaFG@tkFXay<iMage(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sBugD~Uq
z{1qt-42*v~T^vIy;@-|S^l%CkY4hLuBKoZ9ij}GpIEp*jwjWp;$RRar=~g!O_Nc`>
z6*;7$Tg*BaI4*U}(9bY!pSJu$z`S4bDIzcS-l(iP$6i1E{|~m-`Q`6-exLK2hja4D
zlzYJ|MM|w?y;OuMez{uBU1q?OSy=qspr-QJWk)^#)5kgH&S>qr{I+c6_16!Dd5=6+
zF=JDi>=||YUcO%HcDv)}w<pFNImV!QhG9h%HoWIG<I$j}3=bI&{$aAc8&@yG>ge#c
zZ1#^9aohd-txmd`HiWHKjhehclOeQQ5-XO~zVo6cCoaA6gXaY4g@q5}d4Ak`@ni;&
zdGNQ+xxck7ejeAE_te|WKVK~wu==XnZHDXS4c8gxaS8utdlPz2n!~+G+&PZ_)z@Ds
z(gF24p>ud1^c>L2ZTMB&u>JSWm~)xD5B44m@o98g_+TpQs;jS3q!-xne%pLteec9X
zOYQenu_a$p`Cgs*bn4Zy=pSC|9xp5`ZeK5S(62dQ>kP(#tvCDxw2sAp=Wa{Q`lqkZ
z3iCsS*aSPDPHBbOIb!AxyA~+rF-*U*=+g`j?tQ9TBP0$;-BppD`p>UGcA@YzwuOs6
zh&-@9qIX#QqvnCNTUYo#Ys$~|y~FS|Gho|Zzb}j$k5BD?a^q7pFo7_5y85}Sb4q9e
E0C52bHvj+t

delta 1110
zcmV-c1gZPy1nLNoBYy-jNkl<Zc%1E9TWk$M7@nEkJ==<?wl38YTB2^H6>VH1q?ZSg
zxV(@Mad{wdOC(hAfCsmdNIZD(fJP$W#Vz8Y)sQOEHk6_&w1iTWmT=D5%go4MsgO8Z
zOf$36{a*HD|FiqeerM-=|34Ru1i?8Mx<Pto*1`O3N9}lmaev98ywI8IXU^5e7Psoq
zCUg0L6W6=De)q!M%Od=`$i+Pc<}w!15a|d<`L%{uw(B@zs{RFt>WA;2I)=C3E;Hft
z%?C}L=RQ<kF=g>97vO#KU6MGhz~PVYg)-CAklRofKe%wdD~n&b0A0XiCfR#Sj^X%;
zxwcGR-v~em!GES{A`@|pF{aXZWf6G+9{x*RwXt#S66C&kDz#0@1sIeunYC3_=t<dm
zZc6{YC?j_=Yb`t9d;SF5TN-fE)O;(-m`f>T7NsnC<{V2Fzi<8npe>rF;b*O%m{d}k
zWWPg@2LyS*cLaGrkOu^LfRa2wcsyX|xth7%eW!Hm%70liHXpVMGSl?Mc_WSDv(<Kl
zabB@+ZK%1iev1e{#$t~k?G11(n?kJ*HGhOs4r2haxV<1vfG%(E@_O)o$N^;W$AUBg
zz}vy&!Rx{E!TTWxki{PhQX2ps4_*(RFO$~`(gXl+2agA@2iudy+a0970pRiA_2Bt_
z5kZ;&;D7Dl@!<8~`QZJK1IXf!1!)36jSsax)cjEU!x#XJ1<2x$1*u&CYJI5reN}_V
zA`0?=AP)%gfFKVD@&F&^0m8q+h|v=cCZ>($@0#xXBIdyK9M<vrap(QL;;P33gx3ea
z;)b>x<wnl3bv9${hpn~Wx@u%ET_1(dA8%KfUVm|w5bgqT7?Ghf3u*X%t)c5WCWIjT
zq&}29qsSo|B1A*TE3R4q;V$qsVjb!TM^S6X7j)$4X=GUz+FrbxH#WDR=@T*#rIc%$
zMq<TNllm#`0>T39zf`*ij!iXph(3H2vk>Ny`!ykbY<2|Bk4#A*rlyft@zOO#JB1!V
z^?#UP{hM}He(EF%56iGVGv-98%klUe>vhG&kmWf1(aSdK6&K|fMNhauiOBWMjrGMM
z*DH5{KUvD=XZUG)TnPdJe9#7^2n6s!8<Zjtzz1zmie4{(^8Et4&ewLkzQ7Bj`vrRa
z8xRQKgElBdAb=0rpcH`sK4^nd^m+l5?|&PFMU;ZK_`f$!!V1#2<rnmnq6MA1L^$Uf
z9N}Eo&JkE!5G($CgHR%=z6)dxNhF2KR<J%Vo6LTM7;&18`NO+rYW_UiGz>g$*Z|Ed
zF3PXG76?aep^25W<OH#a6`|JmfB@@CEBC?iV_mi0H#^UP`9oMi^3x&;7DtF4D^GrW
z)$AQ2{K~sPlq2@4vRvykaf;)*E@zA(K03?(P*r9yiWs8^dBsKfeX)IBWP1JilL!Ca
c1rS2t02xS*lY7{Hi~s-t07*qoM6N<$g3Qb!1^@s6

diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png
index f7fe3b636510031699b058d6ca713ee68030872c..0e02c2e8de00c8cbba348e75dd3a5b8dbce1d31b 100644
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!G)eKjv*CsZ)Y#$ZEz4cAa^W<!-lQ#pfO8v
zk`*I|OZ4T-zHxU{?R)1(UQ14{Ia>Qx{jql1nxza8-i#ZjF(v4-9*E*<*eb%1t;ulh
z(@(h%-|hZSoyTx3hyjNhED|r6zr=&}W6CY<`N)v;l&3B*C{zLHSO!m5KbLh*2~7YR
Cu2;wa

literal 272
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=*F9YvLn`LHoxPEl$xz_HznPrN
z7BqHNs5P}|CM-|y(9UVR8~-FCQ%Li*QOf=A7nyE<E}nPh{`%$DQ~nu9{$u4*C~(kh
zIKa4+fr)(z6NgLyionO}18+ad-F?3ObYaQ-`0F>t{{3SSad^-W#L&p>#mK^^!75;}
ofJA}6;xl;uGvU>Ee3MSRaj8(<bnD^}pcffDUHx3vIVCg!02H-bD*ylh

diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png
index eb9489ddb47bb11907f90822a5ba80accfef0552..cd8aca5579705880e93303708f4e5c727687e3c4 100644
GIT binary patch
delta 726
zcmV;{0xA8oet-s$BYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<;R4t5Z6
z$WWbH5EbbtRV;#q(pG5I!Q|3EXws0RxHt-~1qXi?s}3&Cx;nTDg5VE`tBaGOi<J0X
zQfLw59mhSq_q{K7-vL6i%2cyw5>PeENGIZAF25=UUJ*n;&3_1D5;OH=W-$xT@pTU$
z-|wP4%e(H+F{l(w2KYqcIi?#H@dokirloV<Cl0Z)q!6DIM+~|k@gvt|m)|&-92R(H
z$jGMWi9^I<sf*<<W@SSqo*@n^sz&)j&Si!37H73uXYG6P7X}O3N`~vS#*n}gl1M>>
zj5;c)!a|gGjeisqX*!R4_(vUoid-_eDq!STKn*G+#}EDozk6#Ir>EScU>xXuvF(p>
zAg~Lx8n*p?Y}>69!2b+fX&ry93B*20Z*;Wq5iqn3TwHfFc@MbU0Y;v5$&eh$PfI8k
zf%h}|raUlw3k<BeeQTfN^a03Hua<9sgF|4VMA_>e?<DT)?%TgL?f(4$)=_fL?6-nd
z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j>h42`(Cj+33gs008_+L_t(o!^PJz
z4uUWg#__LAgg4gN!P$Yqa0o|F;pprEoV|m)qq{5d44SY4V_9{AU<5<yYad%l$nT$q
zm$ZQ3lcwogN#a^-C`sHHgGdUm>l#E9HlUBkaSQ<A0{Zx7cgWlKkp$jU1%Cj9`3J^u
z03ag2Q!s`<^IJwlFvj=`n1Zjj`=gS?o2ua70UI0uZ-6b%8ZZZE3z&<u1i0YN0j{`H
z00%xhfD4}$z=>N2aN|}1KJdu_zVJx_KJjF+{2$;Of88%9C5b0VGQ0z!@Ukp_1481f
zY?~`d{A&s%@NNo*ZY=$yvnMb7aXn|Me^Df&?!$KN6W3bf1FKOJy7*C8<^TWy07*qo
IM6N<$f+QD8Hvj+t

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

diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png
index 65254207165b957f648e77219eb234caf994a8b2..4130608cea1b0074f870bd6a0abf28dfa6bec2fb 100644
GIT binary patch
delta 699
zcmV;s0!00oe&q#_BYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<;R4t5Z6
z$WWbH5EbbtRV;#q(pG5I!Q|3EXws0RxHt-~1qXi?s}3&Cx;nTDg5VE`tBaGOi<J0X
zQfLw59mhSq_q{K7-vL6i%2cyw5>PeENGIZAF25=UUJ*n;&3_1D5;OH=W-$xT@pTU$
z-|wP4%e(H+F{l(w2KYqcIi?#H@dokirloV<Cl0Z)q!6DIM+~|k@gvt|m)|&-92R(H
z$jGMWi9^I<sf*<<W@SSqo*@n^sz&)j&Si!37H73uXYG6P7X}O3N`~vS#*n}gl1M>>
zj5;c)!a|gGjeisqX*!R4_(vUoid-_eDq!STKn*G+#}EDozk6#Ir>EScU>xXuvF(p>
zAg~Lx8n*p?Y}>69!2b+fX&ry93B*20Z*;Wq5iqn3TwHfFc@MbU0Y;v5$&eh$PfI8k
zf%h}|raUlw3k<BeeQTfN^a03Hua<9sgF|4VMA_>e?<DT)?%TgL?f(4$)=_fL?6-nd
z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j>h42`(`zWf6z~007}hL_t(o!^PJz
z4#FT5fZ?A`P2SjRICL-`!qHPWI(sk=(L*?NZb!Q6)COa#1s>3iGJJmsBmf1!wryXg
zB;GU)rX+5yr7DGw<A{jl4RG<gt^x7|xcKpM>*oJe349uQfINF(3kML9w11~y3x9Tx
zlZargO&72SKb)_3QxczsUVjCAa6mV}7gr4k!PNpnag~4=JUSp2j|$Mhg9Ehipa4zW
zJ3t%v3P^$P4oHRX3P_3n4M>gu49J0R2IRt519IYD0lD#yfD-r;u=Zkcug<A(0OLLs
hMP!+n$0>1uH-#$QX2umL1PlNG002ovPDHLkV1nsgG$jB4

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

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png
index 6baa538dad92fff2a6c364b70fd4a5d045c04afc..371b38edb204fd13fe1521208356135a1f129acf 100644
GIT binary patch
delta 361
zcmV-v0ha#UNrMBBBYy!(Nkl<ZScUDEL2iRE5JkTcs*tB-<BPE3a6Lc{$6Z)7WGpL-
z(1mMcLr5LR&<%fs5VrsG0Ge;nG|h;AR0#l8RRI8qXctpv1^^giEPylb`+gSyrPKsb
z`sVJzrKr0tj8FHW^}T`$0Jbzl1n|%rL0KWHky|2~cJ5U8H-DF+?i@rla=V53yt?Il
zuo2XO?F4Wh2xtDNstbSx1OO>zlCjnr09MUc0end*r-fcs%-p8{Zh>#{`ISVVuV*Rc
z;=_vu2-bSB3bC)P_<P8<IsguU1K<ES0HS+AYD<0#Kx=J{_4S;x_}lF`fJjhG2Ym=I
z50KCLd5m1Vi(-mozInD}>}AZG2t#S`7r5M>)f_fsy0m?|4?)lkDzFxvbLb}O4s17Q
zj0pjl8A_??X!Ze<?M&dyz@7&eM>8K{5BVQ;iC-%Jx~F~s2(i5p#iblP00000NkvXX
Hu0mjfh8dyu

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

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
index 30517fd0ac..cdbfb466b4 100644
--- a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/tinted_window.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/           f141c349e063f7318d8c8a2417d840f0b2d06600, modified",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png
index 414ffd9f3ee92a394adcaab92ef34f74bbb1afd5..5539fa6154e17c821e8867ca5f77bccaacec935b 100644
GIT binary patch
delta 1468
zcmdlNa#v`AvN2;@rn7T^r?ay{Kv8~LW=<*tgU0!(6Ky>X2Z*%#2QLlMY7!GEJP|Ng
zr=zQ5vfDxqQLo9F@>=yP9<(0+ZSj8Y;o9$vPHT^ttWM^+P;%Snn2O=tNKxkX9~R0x
zo>>r{HqCIl$B~QM_Pu*)b~ScN`osFGYtwYuez-h}Oq*f$k?rG^Ww{0S)cH0ytr40p
z+&}Az!bj!nqW$+Rp2vz+q}}jQecpNaNYcL6sbXoY!OHVg`c};H`{{Hmd20P<vGlbe
ziM@6|xt$|xQ)j;3(k5_NY1)Ja4pvc-z@}b}w^o{BlS=fqe&pZvk7cJwk?6q_8yk#F
zPOOvv!(Vs)+9}_jYEMPZ7d3@*`V$p4a9>&7_qq0s#aH12|9N6w`quAc^QoT{mzy<F
zc|p4LjvaYfr{oHDGV|C-ZqnR6Y5uecey17Vr+@L4T<~6uV_ju&_MFFG7(Fhod1QXz
zprXN~<!`>4y?>WA_xAkqJ3k$NF*XSnt<^s=p_ze!fwRCPvY3H^TNs2H8D`CqU|?W*
zGg(N;pOJTRqL2$SFPFmPWkOCYKw4q)OCkBmJi>aD?S$<oHwx=a-YBd#`L?k3WG)fS
z$z~!RlN&`GCLaOP{Gwv23hti10alIyp0-LxdIm}mZa_|ANm_nUuC0<!W?pH9(&S)K
zB^`)VSZYymW_}(>wV{EYk%f{%NoHD_m48uYYF<fV30TTdY4R#j*%XjlK)|LVx4_re
z$|JM5B)_QA4kiqgC`w7Qa!O1`5`qfmWGWPwxR#YzB_>0REKV#-O;LghCTAq(rKhIY
zD(Ndt))RA>Tq341d6AfUy@EcHNjCcErrYRaa|lG8OKNd)QDy<iGO!sC(I6K$AP=a|
z3aB$TwImV5v#%&fOwLX%QAo`LI-y9(-Y#Bf`XdGgrutS-7srr_xVN+S<{dH+IL^%M
zbfKT|qmYlJmRF=^@%-hr4c{uQwy&A8h;L>E=aCEi0!a<8<max=c2Ri3A+xdm(o3Ci
z(Ovt`Z>;s>x;OD-ZN2N+5Ee&;F2`1er$v@I;j6D+c<;3S`ssECjyj{60r^Em6B)Ng
z>GH_cS<S7AKl-^|@o%N};(w=2O@jkf)-$p6`|OCQGxuJ-bo!AcD})%7^IbI7FY|qM
zP9!uqA#f$X;VKR}C5N6|9yaDco>fK%4D>_(8!?8hzn<*d<;7?*)$8c&vuPXET%U?C
z%wUs9Wce9sQO#j}{lmv!e_YOntT@l$T=JyX(^8Ug(;-fWdr@;3>YuE2-NR#c>uz<{
zKjzoppT2r7SZ5>GK3n>WK9}oy6KV6am(*>~dKLyZ?AdC;cp|!6xS=NN!<6{+<xLfw
zuS%>orsi@qGIO8%wlkJ(vGVy``Q=;J2y!?0`prpv!XNwiwrJt6pXPJRvyL6guF<H8
z+AjRW)Nab2mC>w8j2{BLllB1Z=lm)1p?v=xmtW33KWpl~Xe#{s=zBUrhC}X&Q-g`*
zfx_btl^-u-_<1Gbzd+8G-O=VwY;PDh@FX!$ncXX}fA#$owTj9AqAX508|)HYmM7YA
zdHvO_+*-C74>qbETW1iS-uR-{)|};B^YZ$@)(D2WU}@7UEL)WQ_OHIZd#ku|{eiCT
ziKWW?)}nlyxH67G0_Dltrz^Y#JbulJxpT_s)&3hFXT^j;J-=t`oF0Zh*JjQZxq4b5
zi<6`1@<Xp*S7-d<arkgC@VT1nQieTk9NqiM5BPTN(mb&GxaX;igVFl-^UuDO`ePTM
z+Q2EdwD@1%LAA+?lDH!Nzg#2#Ro*|?SacK5hduF2*9vs>vfkeUEISxHUHx3vIVCg!
E0BoaL-~a#s

literal 10814
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
ZYxlTu#$ZI33;lct)RncBDiy54{s+=SrBna_

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png
index 90131a48bf96cc8117ce389ac97229626c1ca243..a7a0cad53aff9f936f9dc456b55d44b57fc39e4f 100644
GIT binary patch
delta 1282
zcmbQ{uuX7+vN2;@rn7T^r?ay{Kv8~LW=<*tgU0!(6Ky>X2Z*%#2QLlMY7!GEJP|Ng
zr=zQ5vfDxqQLo7wQd;#Z9<(0+ZSj8Y;o9$vPHT^ttWM^+P;%Snn2O=tNKxkX9~R0x
zo>>r{HqCIl$B~QM_Pu*)b~ScN`osFGYtwYuez-h}Oq*f$k?rG^Ww{0S)cH0ytr40p
z+&}Az!bj!nqW$+Rp2vz+q}}jQecpNaNYcL6sbXoY!OHVg`c};H`{{Hmd20P<vGlbe
ziM@6|xt$|xQ)j;3(k5_NY1)Ja4pvc-z@}b}w^o{BlS=fqe&pZvk7cJwk?6q_8yk#F
zPOOvv!(Vs)+9}_jYEMPZ7d3@*`V$p4a9>&7_qq0s#aH12|9N6w`quAc^QoT{mzy<F
zc|p4LjvaYfr{oHDGV|C-ZqnR6Y5uecey17Vr+@L4T<~6uV_ju&_MFFG7(Fhod1QXz
zprXN~<!`>4y?>WA_xAkqJ3k$NF*XSnt<^s=p_ze!fwRCPvY3H^TNs2H8D`CqU|?W*
zGx;KqKO^sC1zs0sUM_{nsk}}sKw4q)3SRlir+M`z|K+ux?7*ipxqwe?@+>~>$tU?V
zCx7MhnC!ssFu9rEWAZtEF;xY3Pu~D5#{f@TB_llpB?vblC$S_gzbMyM$tN?fv_fgJ
zkbsgnL@F$`s5mn}52V`AK+niRX>y=|=;TZR*%Xk~AYfCGTj1+!<&jxjl3!G52NMQL
z6s4qDIVGke2|)#OG8KwTT+2$V5|c~7h8HK6rKTuB1(P!p^U_mOY?bttCchPMm~1Sl
zF*#9Cy<R~d$s`+nbklA0u{i{y&Ly=txhS&$WEt2Dh-i?D8;}RoX9d)mn_7|x;@MXe
zBqnF4mMEm=0i95!WN&wgD{mhI17rO?PZ!6KinzD44gC%~2)JI?R64E@=(3MxDz^yF
z+J!w9{4xyZnuFT5Xt;>1+|e?Xi8Du=wXHE<)0gXgN6*@s>TCa<I(sT!uD?7@)*^9|
z%1XnpNqgfqzjM6PpmREcO-HP|PTIlWA#z%tiPS?c>#F}OOEROvL!WL7+;eDY*dE*Z
z^XGv&7(`WhoXywl-@`WDPeQ>n-Kk+7ll-*Psr&CUUVb@cDr?&2$o;$l^V!a?%gZzT
z`snM+kBq_kN8+1Y12?dVe~moA)3E9&5Vy`{^VeS=nfWH&_^?-Uj1J3!EJJ26zULBn
zMC#Ip%L~4gP2;XEeA&b%{_Ro7r9)flMSUfEqAxu<6lb&ZM4UmcYec=D$5P%6It*Xa
zq<QwRwK|ADXm3a_-kjN97#$sRqkFY~^QE`BdT)+?zsmeV`~8xCJJip9mI?pA;D>zw
z@x0A9JERLH=xq3XXtCwd`f!U5#xDnhS>3gzuCRT#<^CXlqnsf`Hw_7w!8osY1@3kW
zhXiD1F>eXZIrl&4szu-9`;!yiAN+WCpK#)x&#Yoh0b6G<V#S3k60LMTalU2BlzGMC
pna;DI?d7}kllR#NZ9BX(Kk4H8e9L>4w}Cm3!PC{xWt~$(69BuH0%QOH

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

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png
index ae12f39860f52ffc274a700f9d45e285625ff1f8..5539fa6154e17c821e8867ca5f77bccaacec935b 100644
GIT binary patch
delta 1728
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
Tc{h$w|4%@dl%_qb-ca^C!}g)X

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

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png
index bbfee9bce7f894201330ba16b9a6f7b146bddf58..a7a0cad53aff9f936f9dc456b55d44b57fc39e4f 100644
GIT binary patch
delta 1523
zcmZvY2~ZPf6vq>e6omi^2~|+yq7{TCn-Dgel*kp7P>yg^OjUG~?52w(gpg6xVrVEx
z6#-en6A4qb9t3GY23m@8SSeOfglemz#_1@^AqA>dM;edLbR55#|NG|szW2U)?_U+s
zG^@<VKrJL9Bc+naNS0KWi4z$Zh2q;=u}c))DRnPMNIsIZ#K?5d>Xudo6m2gem(@5h
zV$7FM<p1)?v`G?KZn5|_GreBOYK6_nqlb5vI2c1&CGqjw1CuPdlA5SvcM8rwN5-l;
zbDvNn%w4>b3a88Z8?iqx<W$KRwx=G~cpJihHKpQ}oITN9SDM;Jhv0!VyH$4$17;kg
zJr!GI_+EINHr{_!tsPwK++eJoUF}x7zn?YkbB$4Y8@a!RnS)=CU3CBJ&MtXdK?M`H
zPxd*qu;keO_-7G+C@LnHDsu|DbLlh3NLenn?@?o+YbQ`ymgiv4a8ESu^c@iz{FvqX
zz|-R{KfJVSan~{0yT8lh^1AE1U$|`T{jDdic#CAgj0az29V|sz^^W}~OD1xMktw&c
z(@v|0;tVacSVMW5I(?UqN#)txtV!>guWhk)3Yqi0-;d?hm1P&GW2(uxIi@kDL*1tA
z^#|`wQlqcbTKH$%7eM9T4o|^jZlmc{H>x+@d=~x>)i_IMW_Ok4lc&5qZ0v@~59kS0
zI=O-_wx!Qxkq77zcGjCk4${3zs&gP2<Qz(Fa1J1kI)6l7cJ?Qyo&89E7axqH3{vuV
zC?ABmm;&S>L3|K}P&o+0a)E*aDdfr^9>B^`YvbaC5>2)q)hIBDSOi!}AVDaF5F(c&
zTo?i&fkF=Qa1;Vjn9B#{Tv!>5LtGe9@&K~M#U}>l1o0FY5)2|76a#qzISL{eR{$yn
zaxNbiKs-dD09Z<ea9O5Kjp{`Jp+;30TdPq4tmTq8sW4nB5dqvl2q4+6%(pCsP-Dq@
zRIL>O9GJ%y1i=s&f`Vaw5DbuNR}ThDPvE#PK}TR3J*p=%HP%9atahCzdS%b66Y^%c
zXd+vmsoS*lKWu%_DRE&0s`?*#3o{7vu`45qm93B3pcg7WM>Q%;DFWEQTSC0YD4b_?
zS{}>;IXG%HTA_qN0iVwW5m>3@3Q&O@h6Df^JKLAsJloR%@r4lN&*4}jz+(Szf)Mt*
zQ-!eKx4@e^F_x{+5!zRKzy9M5O%gA&X4XETwNs7h(N|e$juus{$Mh^rqZAnc9T2*-
zZ>FY=LZJ>y#NjD9X(I<X@tt9=QP=!{^Q=U1n_Y#YyOX)57;*8UT*^->Z1feoA8-Du
z!e&N>zkT7CnSOCI$BK&0`xcvD_FU{)JHK=zJ`X|57ar$K$$v^~7!ALf7jR)EEr7XW
zt7lk3n5<I6n|n9r<IU4{hY7=Hsh|GYl-SyFWJRl}x7XT1VJvcr<ky~QrR|CTkR?$?
z<Q=l{uDpPqxlO$~w7bF{Z;+j#ORH(Ubs7z4$}%-HPEBTatu;m^*3&$uWM`f7PMou<
zpo*5jJ|!cDRY9FGiq!#jrgV<&YYmDMyXN-QUo}l`sB|=J$r>`!JpQ(%^mQ~c;^q{u
z>a%pDg|u|1LF%ZLhWO|s^!fnG6z=KNN-GHSxU(%!mEAyW%UZQ+_4OSm6Y~2;)Pck2
zo($MN@E<$;vU%~v39r;?(^K!#^O}a=i#)Yu0rk&2z7d==q#{Ms$@XOX<^FT~X-`Cs
zkG-#Nq@;ib+#251L%Qp&9d0R7BHgwzIpflF(g0F&?>4z^tbP1en;Uv_!k%d(J-wIu
zUS%Cag#mxf7_lL|9@<G%PNu@4(O$AGG^wexB~yN7EK@MJ=?2AmBvJ9=I@^eK#(x3p
CoKP14

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

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png
index b79db5f7893ce7908127d271a29bd3d13c6e8fb8..ea4706b1911f1825e785f39c9bfe83f1f3defead 100644
GIT binary patch
delta 1570
zcmZuxYfuwc7~PbIA_<QgQjreE1*{57HX&>t<xNm%2}D3UpjbAW-54H8NFqiB!=%Ph
zTLoF6l^VdAR+%b@3YAAi5n2#&5Q?uV711hKl!7=)eRU&D#~<FAbMO7WIrn~N&Ufb?
zi1@|5*e8g#Llqq@i;IqC%XAt-m5l?y(%#a2p|R~UrX?}?$E4+E7Bja?W)0Z6dndW#
z&|HttNdCg*rs^R}=L_MuwY}gOEvlx2e-xu%Hr$N=&6jIU^{_ks&!I(;Jyl;2W!!IL
zJNkZZeLRX>N#C!$W4cm9K#tEP!>Pn~$b{p>z~LP2pP#s#G9UY}a(+?y0DHpcnn%%X
z;e&LRk+>f3_h46hhrHEN$|4++eJXtSR+lGCNBx17nx3$fH7V$xuxaP$)B^m#-}O7(
z+QG8o!nqC}%vI(+OCO1su}Tbq4HK@-ukD+dI*+!l6NNl}SM8#guG@OAc1yq68n@VK
zBtQ3H5z4M}9yq%9Nx_)#>HKqV=<7zMrY6UDQ_1?A%zZvpO0UL7b!NA>w#kkj;(2me
zOG#x}al%E~xN=JBSvAg@Tf14Gb@1*KEw=C2u;5(VVz}hU*i&Tuai;ZV<)&NHk^j=n
z?z$RINAXtx061x5Q}qDgJl_TyP=0U$0N9U_gY-ligA8Cu>=^UdWG*Ahhgzu-qEirJ
z39iR<Dy>1KQL}9^D%Wf@gn}S>jS)yXxrCGPE&*h|%M$Xii~l^fF(+HC7aMc5<Ovs+
zlM&T&xPdSSBx$Zbeq2S6g3m_<5W>STh%XEhKq!pLAq0_&FfNSA6+wKEjCb|&gN1Ur
zkcYq!EW+dvpFm*<MR)>8&O;Qz1k6K(3W{0e>XU(RgZLOO42FbU6o>dCISL7Jo(NKi
z<U9c(g84!W1KA2pyh5YPK`Gs;98`&Ov}z^DUKuBqi6dokp&&01o(*N$sDYrUp<uj9
zz0nAg-fjy_Fb{@<5kU|#OIm~L^pqX8b6hx(Cj{9B6+ws-bt+tKKy6Nif?SaDLMx8e
z;iy5QOVMbuLqS_Xw(SfUHe)blF-4L}#jz?q#oGLTde-|WR7s_TwqDGPw;jn=vGs<S
zJcAg;W@_otJX`_JCb12uT8S${LCW=MH!nYePuVUH=0jWprCi4p2qY2+c#sfLD0m`N
zBu8KoNQS#FC3D=pOt3%<!~R?@HG^!<yLvdb=FbS4)xvq7_K>%{cOK2#J7%&;k`+`G
z!ZF$&NDgj5ZBe*Ui(*;0fsLybp(aoVhKKdfQ?~*D?OvQDGR3(5(f5}U&db~^n$+SX
z>AK=pdw-Ur(^^GbzIOpo;N70ovYH>*Jn6TPwIppJ>ngosi5xy}9bzh5@7<>l@<mPI
zXM&=KwvXnu;4OoBr*8CE(49vrJ95V+LpE{R?l_E!E5_BeZd>{acL!CPdec`ipZ~RH
zI6cYBF0H0)tz-go|2UxY*^N5?OstSe04dP>FqR*ogvBcxqnI&|tMkwJUOL&+$0(}c
zn0I8|Pd(mE`$4t5oUHQ$R)6jJUJNcv8KGZ1?QLQ-J0&fy4}7_c_NB9xnM`f##)ngG
zuN<)$!U|ta-qCjP*l{JVkaL?HFNZ~Zj*cs-!doI5J?cICx53tg7)FN1d}(qp>*eY>
zU7G4QE*Xhux1Aktm=kc8ky&SdowKN@^H_2Q@4(n;+QXu@yT6}mu<Vm=ZazZ<i*=~R
zWFBa{;Mrdt?$85Nr`aIs%@{uN+AN(Gy!oj3JiYLzUn#`g0v>{Q>4C$YRZ|<&ZULj)
zcQ?}ZCmrp_!nDbm4RB%oL*K!&sW4IGh{gJWY}E!Qnd^z(A+XiHx_(XRh5Vtis~rrP
giQZjy&H4gxSv#WnG=1xS+Xn^2#Uw~-qcY6@0o+YhW&i*H

literal 8217
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
Dt^%_Y

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png
index 83797163f225f940ae731ded308e1418c5611567..b26c7be0b2da6c07fc5f962d1858683c3a6cd74f 100644
GIT binary patch
delta 1449
zcmZuxdsLEV82<=jaxt$^*~-t)dnMo{;~;pKutX_c&Xpx0AO%Q3MyrHTnpPV6m6h{?
z?vkgxO}nVwbn0emQ=6`xoRzjp3pL8NoVEtq+3D=;J?A~|d49L&dH#7{tkK)*oP80Q
zqOdSdWLOx;k*5koVm<(P^qk6Luv$6x88NZnY+9)$+VAe*6tB)Ynguh<EC}o22;xe0
z#lwsrXQ-3Ktq1=^gjTirUEtw+m4i_~xOf*Q5Rf%5${a(w_3?rN@6)WdzRNcz#{35o
zPYQ?C162Yq^qcUJ1i=}9Bih*itweU;eNnx((zev@L}5Q@biPYC@qqd?k*E^<8s+*l
zyR~h{jf_)7!NOSQ5|`YH!szMHd%RQXS43e|95*L$8W)yukbn01#Z2o~s6eN&SV*wn
zsLk;hr+E_dm845XtERtEjrMXvOUHK_AHR-j$62fNo?klI$M;7%VMY(^E;_*lYjOP-
za$g-ZP+!|Mzr$}GW2+m{QR@6{lAU?Zdf~E$2I<bu6|zPop1!os^J;!+fiAiWF)5s4
zFV#;HEvok^b`?FELa_QON7gpCI8pM?8D9HOPV6imEZzItbjV)_t&O~j+@?DO002hD
zN>Bg*&dz)hKw;4m06-bw35ytnCCtEtBQ3EYti^<)OfLwxV;td83<-9?2EmEg)o>2h
z4Zeb11wX-h!nQaToQMmC^*B}ln9QRwQ{@t_k^zY%Tp^z<lL{elT_l@B3*kgEARiLt
zeaR7Xl>(EL0Y!<VdsGli#zX3P<z~KIAxf2+)!r164;2EHB7uMwBNy?dO0IH_@`gZ_
zL`Dmf^SR1Yd0c9$m;ssFfMyRAXr9`9=q3@HO=F1^Ce^-wVG|)w7SKYu!Ve%2B+a2>
z5vWi`q$z1!-h3|wH;tbRy$5+IT&a+s%z(%cjI|7gIhG!9x~01sB!3V^C;vB|PX511
z=5^tG1y3%LnVZdJ%%hvanWoC*qnVr%zLIOMf>bgtZx>$)@};H`<WNu`-knqe01MQt
z$ncOj)wc1%fM{e0K69^U`M}GS<=0W4U{7lOIf@ljpy-IholW8WTcPzWyDqKIi`ZsJ
z@##LCm9+o+Zuf*0Y~;J38ke*ZPv0f@d+9ezZwu-xJ+MV@%g>*$tbT5A4Qj|Vj7%H<
zCLX!D!>Zl^EKv;w6!}f3FQ&HVHX&-&FRfqI6;9n-_)}+@6cF#<a-c6Azq`XkX*SS{
z)EF&AQ`<g6x^dIR0vX&8L%#+LX)t?`!L>^@UL^|mie<ov0dQ$UK65-A-9xUCy~$y>
zP0oJgq<B2811sW#4<!RnQX<hwxdm0FEpR<<()TiEFpxKxpF5AMa|@CI!RF4osZ4)E
z5137tK1gl)qFqJb{Fd3-gcKW}bjGH%3V>|icI3}vO4p0rAq2^&Q5t#64X5=R4y?66
z<;6F<rk5O>9dopqA&ZUIKc|Tc(ZVU~?Py!8h>i7>^BHFlakJFVu6aFA=hzRp9Y0i&
zHM$%?FaRpyuG$9F+u|R~p5c0#Q;V91@1U-_GLbgOic!&*)(Z@1PIebR)S}iQDPG04
z3-#9C25iTDTJVxj_iDOO0T*pNk5|qNKN=gJc(<6jbyZARP8Pxm#y5ZLbqnb3E5Gk{
zZfLvi{i<`Du6cMYpX|a>qt|`4@mMRtpDQ{2U|QIF<z*WGEN&07B1W@7=jW8QL3h-R
z^2gcc2u_Wr2NkWQG#d!D?1#)DVAMt<Z|p*0`YrW=h(VNRza<6tb#DN;#qU;KOn+r;
V_V1<Z?wCFbATlC4ygD>V`w#QDM|l7M

literal 6896
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
AX8-^I

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png
index 2cae7c43a4c77e1c531fe25b58c365624492faf0..ea4706b1911f1825e785f39c9bfe83f1f3defead 100644
GIT binary patch
delta 1608
zcmZuxYfuws6y21EB1r%Zv8bbQ0gJ*Wn-DgSLJ$Z_DuEc#4k*fIvm1ku#3U*z7$%CN
zw#p+yD<y(6ZDmvt6)KO4B2*A@5R0!W6{A&9l%hClMeRnJPJg&FXTQC7&fR<F+&f=k
z^shdJ{uas(ZA^?p78Ao#81;lU69<5xo|2-7xHbhNKQZYi<pL{{v942L581hUr)|-}
z$-ZAzUp~C;!jkuuvY29rBdCEnYdqzsxIy^%(ZGVq)=1XggoNE}r6X5%Ft%zSzvGQ?
z#NL+sk`i6r&Od@tFPm@0pAX>LQ+!>H{e5tbC91pfYoe6<U0i$bFD*}pkgI9?G<Pjm
zs|m>cmDG_!e2<K}kM{kXW%%<8`bq22sTI=-%KBKN{?~mA?g$^IF|&yq@qrI_wY95S
z@=KV6Tay2QfW1{^39qC7z)GGoHPy-J9?5IZn3P<6|KqwH-fduMVcujnU&d1Fo}edU
z%Y0_BnO#5X)%4D_kzw?0?L3~x<9F7~8TZ=SbFEAM?H1WwkHMUE<pn6K*0b-(-sic)
z!WYxdzNfAnl3N<x<1NLjvNDSND>XA48gv<5vki?d)NsEO^P7t+N((PiMl@q`zseEj
z<eE*UwdME5C~>_<9fGs1bK&Ac!!MALkf#~;TNN8`zmEEcV)ZdrbJ`2H0RZ4(h)Xd6
zfaf$PC_q{H=K$b3Y<o*hq|j{fG^q=13d>eRi}oi^@(DMp39%G6VMeXNtkvsS&KOnc
z*PA0i(DstXw#}zU+A`@OwsQJB+j)BM6jpXtrp_eJ&NA3~=}eDo)WG4gVGd}U>*XKF
zRfnqid{h7-JRF1g!cYN(!l(*D5S0ky!k9`O$_H(kUb6y(DwU9jzz{6LR1lv)VF*Qd
z0!YO})L{h7LxgIQc+AT`9pQ%ZF<cl13Arc^@kJ^W65>1&q!y`o0zw4yg%}31)R=gY
z-k61wvb9;L2Im-b8j!VECRd1~6tW1A$A%|DMJ8${NNNNauhp&325l1W=@ta$!EhKN
z2t_7X%W<QLw8L4*h1onI$TDjQLY!#S;yN?xbSeVmf}|G)af}g1&3a?9UY{8OIy<tQ
zHK639!KB3`NiG-1X-y<+(|_p+@1s$TgeLkh3+Fs0vYA?z$sD`EEJm@9y-er^Tn$bn
zu{EepgR3Jz()DqlnSlhKv|Sa(hqwevx{j$4NF)&OAR(ew^F*jfg}@@vw%RAiW|%tD
z0t>`29L(jCZ;-|LzaEZr_#XsK=n3b1N_+SR-v5^7!#_S|mC{9IMAkVMBnvmA&L}e5
zfMRQLGYi+LBP^g1jFeoNqH6&F%6*wMDmi=AlOHZ6oKtw`>r)Dq@|A@xuE9)qj}>ZJ
z&g@(ucXpeyc^RMG^ek`&b6)BU<~8bpc`EpveSo29x&MIL&lfdDo(_!}*gmwO8E@|2
zaPnq%KDzTzMf<wpXW<(;t#{pq#0N%nHQt+h^LB?;SbEZyGG6_)+>xf7>5^Jqx<WdN
z`OFIGczLrnI0MUL5I{2YDGcW<)WG7!4bhC)r&T$p11_ED?xhtR;8=I8eUNgji}Is(
zL7A;K5Lot&-zU*OKY5UP@ziV!t;s_<w~jr&i?Z6&&PXCZYeyW(cNP!kn<aT~pWQWd
z@>sIsx5(Lz?w2JCm!KmWvhn7H4Zd}LSGL0Tgjia--g@a-|Jw0olREWP@9F7@XSSXh
zsh<>bhL%z5dV@2kpyOy#I&c5*DaxaQ)_cF7tj{l!Z)!SCgo%x)-eT=*z2JAHD$=bR
zs7iH0+LP`$^v)`OEqFh@@EkSo@NXnyZv&6OdsMcgqjGG0>TO_X`|bwHKIM@sn8c8j
zQ4i<UJqqYA9g~Qn2J`KoDVDDBP<S2h830>ctLm1QT*w(Hz1B`sSg2j4*X?fr`iepQ
UmuXw}IWH(c7MmcgiB7lv3lLLlQUCw|

literal 8464
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
K>J(`?NB$R18wZsD

diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png
index 17304ce1044032ee392be2dcc63be90d6580eef0..a422e8c1526371137e017ed0c42b0ec483f2f93f 100644
GIT binary patch
delta 966
zcmbQF_M2~lvN2;@rn7T^r?ay{Kv8~LW=<*tgU0!(6Ky>X2Z*%#2QLlMY7!GEJP|Ng
zr=zQ5vfDxqQLo8&1+?l{JZL@s+v5G)!?oWToz@;PS)I&tq2#vDF%`qPk)q7&KP;4Y
zJhLD?ZJOb9k0Tei?R)pq>}u?k^oR9V*QV*R{cw2{nKr}hBiqL-%W@0usq<}aS|c=H
zxPR6ag^$YDMf>ktJdYKtNW0;q`n>b-k)(aCQ^nF)gO%s0^sSiX_tWWC^3?jzV(Du`
z5_|1_ayv)Xrp|o5rA^?l(zFQ;9IT=ufla*{Z>==NCY9)I{m8%TAInaWBGH2<HZ~ZU
zoLDFShrjOpwNt)5)t-u+FKP<s^d~B8;J&iD?{n=Ni?6~5{`17V^sV2?=2Jf@E;nnU
z@`7~f9Xs-}PRSMQWahDv+@!gC()?)?{7y5zPyga8x!}DR$GXbm>^YCWFnU~E^T_<b
zK}CZ}%inx8d;czL?(O;IcYZqlVr&vDTC0C#LNfyc180FpWHAE+w=f7ZGR&GI!N9=s
zW^x;|KO^tttIRIUyj%*CrC6L;fV9HoSQh!o4J>+-H?i1H{>q{=S(R07vOlZ#<T_T(
z$*WjBCVyphm~6r3p{kIQY~_|;l$%&$tCX3Wn4YR%ke9Bc;O^-gVC5L#X{%(UXP`8B
z9h=zX<7`Sg5b?0oqT<Z_Jdm8Bfu50tl0r#lTAG!AQD$mhNn#0D%1~*t9J{P7$SojX
zQ;}QX>ucqaSzMA|RA~nj21*pAq**y7rXvYK1#>bd=d+6nDHNBumX%l~XC&sOr>58{
z=_^fM#O^Tp1-r&%F%I>51$`u)Hu~tM+2~`l7^2Q4wK%ybvjF5?uo)21AQv|v52()y
zs53XUBoV~3uP8`N&Q2{+NX-K}p-9Qz?%iYEaA2g=FZOhC45^5FJKK=A!9n1F+!KXH
z*+2~k5o@6fhl5xR47S8p6;GCbH);N{^E$7$8Si_v?_BdoQR8bt3~QD$M0hi9n8uW#
z%X%P+t6{4ML-x-a{vXxz|9kl}WNR|uP=g|23DNz9@s~c>02E2ET+p!!hF4-dbuSO~
R*8v^O;OXk;vd$@?2>>aBXYBw0

literal 4882
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
F_6HOSG7bO$

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png
index f7b6e10f869a9ba3ee1d2f09f066f153b5e21e5e..5695bc0c26c731ad7753c4817a372db5d7479cbb 100644
GIT binary patch
delta 406
zcmV;H0crlJ3a|r^B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*miMM*?KR9HvtmtTs)Fc8M;qEP5V(Xvmny@AkUcmuEC89abz@Cx2w
z@8J!)?9<X+`cNn+Xui>@CSsfP57~!&FvPZ#nO`PCCZi-t&VQao5rFUe^biCAjYF#_
z3L49@yaOP4mSyx|Xhl&(5ETGkAo=1m+U0o;pOifNR~&|+cUWd?&M5)J`|%DAfcXCV
z>J?%>{h;KCovuz5z}xLRD}@6bG2!;EvmTQRNefdeun{X)Cv?_hRYh!6VEbwd2moRT
zXf}DL(Nw?3AAcG-Iex1E>J~f+$q}fH>44V)aB{H%{5OnE2coe8ENqR5=}H@5C^-NJ
z-~b$e1JDM*F=}GEss-TFO!Nil4UCOX(>gU)fFasgQ*!A4wPeD-N{$KF5Z$CKD6MPB
zdQT1^7Gff{kkoBU6|i<Ov3@nPemSKlEAqSxWbtZ-;tvbJ5dZ)H07*qoM6N<$g709e
Ac>n+a

delta 1302
zcmV+x1?l>*1E~s-B!3BTNLh0L01FcU01FcV0GgZ_000ErNkl<ZScS!xU1%It6vuz}
z&dh#icav<|)LPSMtv0c(ErK6JTR&b3S}O<&dGx_YeUMrx_)t(m6!cLad=NyXpaCld
z(Nb+ngB4A!rnU`eYLh0}eC%eE-TBx%*N2&8v+05$S^9sOJAdcS%=yhd_uPA~0O;xO
z8{!sd<kP{2%%1+fp^+n@rCO}@Rt=CoXdi?GJG4tbxQa-FPsUfZD`3Qerq+-!gSILK
zSEGd<`i9IEV=M!-gXKdx0)`9HByNlF1#q+u8Yo(2J%A|$mR10G!T{0$#PCUK7^yfA
zSFn_Wv;)cmOn(9Z8N7()^LhGJlBpy)a{~y005mXK`jgY6=g>m1cWW=*sk>-1S_6Ke
zxx6sKg~{ImcyRMxB1E|()eV579Io5fm?)0(TKYI?-(rChkO~2?c*g1Cp6M;TnEL=6
z1-?KE3tt0DkTro!@bs5+7h!H~2wd8&B(vJ%ld1DSgn#&yzZ?t-+5=1Qp8EoC@f8?B
zUjX14V8Y|~KEb;)XCdW-4;!P2;188(5O2Na-lBwyB{g@efOJ%p0Vq@yL|n3qQFd?H
z$!y^Zm=~)6A~EnmDFsCjauHs>d>>~9h8sBkZxvVqAQ#?0cj$gT?7c$4bMRCZW_@T+
z13Cn7ZGXPDCV0h6av*yrC%Mj<fnj2AcE0hy2-fJ#(cxqCCcu=m#4?bGK`{@ck*gn+
zLUPibSP!2!%c_O3g<3lRhy?jMx^T5Q&O@16FmKNVH<`>T0NbIH7@Jyd0|PotqbUF>
zDad<yN^u8@#Z>^nBsSk(`mQOCmsQX{zy9?bRDWtIyaEsrL0mTaQC!g|?bcCocMX6L
zwCN~MZr?{$ug&lE(JmuFR!H`A@2ay005Wizwz52GbyD=I>kc4=z%VS*kqq5#%Nl@C
z2_snfnl%XlI-{F{hH2FUgc~PqR$EgXOCjqG;Xl?{ZS4S%ud1d%G*TVFtUb+Db)#t^
zP=Cr}#-3^nkdbk|`QsD-DG{d`>NZ;V{>l$53dM5uWG;6W{R*Oq`JZ<eDZ@=ZB!G}9
z0G{7{uxS9TG6}%WEjw-o&?4BsO(ZF8(hOY+YlPm+PExuy$AUSaG!w!hZL~CedA+nJ
z-ij$CrB!phE(=@~i(>s(!L?eX<|7zyLw}$h@bOnVp6=hziKC~Ft%t*BUwVp<=7!jo
z?4sb6u$QV3Sq<O|JflS3zQKqy&#dx!Cvggn)K|U{YGdc3NE#;X2(B5y!qrWpA;4#q
zv&=@T94`%XAiIw)BhHxef$H+PK(keJFnIMmv)L-xJ{!yg)1}&o<YbH)-v-|xXMb8$
zwPt^$lR<Ba92QGdnWVPOCc{rJQ6;J+lns(m!MQ6xK>~=|)D9-N{B0@T-*AG%GY9G0
z{s=iMsA&~2UcSbHTj1h9mjQTe+rt<bbjCMv7*J>?E93k)daka&Bi@NXlD8)@O_N{7
ze&OSeK`PP%e-X$cdiwi@MqXb6t$#U`cz}WV3t+~{xltUWRvVObk=v<lR9e=j>$pG7
z4r4P5+FP-ix=PuEj4v6*f#@_{bTP&l06lMK!x0FJkb&~g!5PsmGh^7S96rL!b>?aw
zYtdQJB{dF0fK0MkCm3TMv?i}5#Fjvrj2UB~b0B5_g8KMY9?$;;gjcr_8V_4L!T<mO
M07*qoM6N<$f@ZZ-LI3~&

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
index 099201b418..e4e4f5004e 100644
--- a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
@@ -1,46 +1,46 @@
 {
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "states": [
-      {
-        "name": "full"
-      },
-      {
-        "name": "uwindow0",
-        "directions": 4
-      },
-      {
-        "name": "uwindow1",
-        "directions": 4
-      },
-      {
-        "name": "uwindow2",
-        "directions": 4
-      },
-      {
-        "name": "uwindow3",
-        "directions": 4
-      },
-      {
-        "name": "uwindow4",
-        "directions": 4
-      },
-      {
-        "name": "uwindow5",
-        "directions": 4
-      },
-      {
-        "name": "uwindow6",
-        "directions": 4
-      },
-      {
-        "name": "uwindow7",
-        "directions": 4
-      }
-    ]
-  }
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "uwindow0",
+      "directions": 4
+    },
+    {
+      "name": "uwindow1",
+      "directions": 4
+    },
+    {
+      "name": "uwindow2",
+      "directions": 4
+    },
+    {
+      "name": "uwindow3",
+      "directions": 4
+    },
+    {
+      "name": "uwindow4",
+      "directions": 4
+    },
+    {
+      "name": "uwindow5",
+      "directions": 4
+    },
+    {
+      "name": "uwindow6",
+      "directions": 4
+    },
+    {
+      "name": "uwindow7",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png
index 7be507678d49517ac92392e78b96843349952311..31bfc29cf0acfbe6522db842e91025891a0ce052 100644
GIT binary patch
delta 749
zcmV<J0uue04TT1fB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mjnn^@KRCr$Pn?Xw(K@`W=Vj+-2(6o3c1_Z&A5NHp*=h9QJeuerG
z^aJQe(68Xtlb75*C<HtSLSah}rA<o?fj|X)|KUxT$gU>y+<)xbo%zAz4P%15|Gt@d
zGqYJqN~YWGK5)~E!C)YYL4^Q~M#Hq5&8G2-(C_!_Apn9O4u{-3Kefn!cDrqY-@Ry`
zjz%MNr{<4yaK3YO%uO%euvY<sZ?#%zc7Fc*k<4RKR0%+&R)i00n;q^e6jei@bGCYj
zr;6Yq0uP60p?@K;&rL71Wq^T1m}UZO>)m#)Nl__)%lg~*$>0CKb4`kB0c`M;4akU0
z<BxiyJ_9W7%<r0%$_P*tQ2_SA5(Qu%EaFP=<K@NyH)o(~4n<4{OWF57cbKuwl7;?s
z@BYYEf70EYlsE*~2TK%yeXv9U*n5LnJ<F<sSO6?_d4FbibD9wgfFScsd+<Ok0E(PE
zqy75ypp%BhQqK4mrLaoS1;IlEh(V;mRe~skZ6*+^GNG_l;HeR=2x<_gpU>qc(tkW2
zCzHvf^dTVr=e=HUVF3_4sD%JN8Q>DP!zB}k0DEtOp9H_&etNMGaxewa&6nY~+7v?W
zEzNUAxPR548kRB%QXw=`3Y$(Pyv7hX;bty2c*=wnRbj360$F$V))2TGJby(MVgc+u
zeU{-&Ks#aq=;_Yf*Sl5)5ei!cs=`uM0nJ1K*au4#fPJu(T7`kEH$?%;XB1OdO0lHo
ztt{7{f7Rz@=`x4{un(3f0Q+F6i~#nA>8VLkEoOk-O|~-LJ+Q_f^+tULSP}9}ib??}
zwefV#NfIpU-2-b<)K!AiH4UDszZZ|u>Q)IZ6#Q$TN&p)?VNQ?dF)1pBK=41E4gSZ|
f-1I`00ZH-*6;1wq5j@1C00000NkvXXu0mjfL?cvp

delta 1672
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
SNQM9a002ovPDHLkU;%<4c>$>a

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png
index 9979f28e945787ba4ffab8d70010c70209c7f274..e395832e8e39f6a7f69e6c36c189a1f45bfbbdef 100644
GIT binary patch
delta 715
zcmX@f`IvQrN<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3
zR|5kBQ-!CCV@O5Z+gS&*g&jqXsh_Oc9Gj&hdYz4BtK8)^GaBT+Jx~>2Sn=VByn<H6
z#|w{KFRXeH_@9Me&Lw0+#Y7R2OE=bhyrIOQx$ug_>8g6oNhQZu{wxx-Ib-us)7V~O
z-+SGZn>A-{CzhEj&)__4FfGV$;T5&M#|+mvzA-G)c%@-!v*ydnt659_ACPlcDz#42
z(geuYH?56OzQMd=-`u(3;f8HNvzHpnizW0X@GrQ-u}<@*{hBY4mUnk@XS;}<@=%+u
z$TR1N#5YNU?Q#3+7a!TtKYwn-POfa0YKHJ#;_oyK`5s(+a{2TIw+-75e0SXBEosqf
z_{R9bpIa+md-dcu>8FL|AC`I;#;76PT;d=V@~<&<g19)tm8doR4STp+zOJl{5dL-c
z)HUV`u^4WLwMSVQwu%)o#9cF%v;0*ykEc>JVD`+}8*X{b{1!j2=Y9R+lt!5YOV1Yb
zCvNq;T=Kl|!!tH7u@kxm?|xcdHhk8*`8z`;+nKe~&!#u{l+QcACw(sC69%nb<zwF)
zLQd5!zLU6@eL}PY*UoIKE9+18Z&@)R-QnxqH%e>FR<YLYvHSf|%uDQrZUC=vM6J;$
z@4ulnGNRm1fWbIv!>tu&H)7W5)=Te~_$xhuS!1eKb$<ET6J2?Gq{IU^I`BR4KhNCM
znfdT{-NOU>JU{+?t$y+5y^Q|8?fQITpMUOo@wIBv)vSr@8=G$PI6^!L3WFGifb2p>
zsIQ@cQmVhtePhIw#p%qg>i3+|s~=zgn2@xq;L8KUk8AI{h<Z-i;(ok-dF0Js_xFoF
j0|ysYlYmBh3qDd8an>%6PtjZlOq~p#u6{1-oD!M<QvE^o

delta 1205
zcmV;m1WNnk1<47JB!3BTNLh0L01FcU01FcV0GgZ_000DgNkl<Zc%1E<+iM(E9LGOr
zW;2<+Wlh^$h>&HWrgUS7B7#0x#fMTMv@iNrAN&)<7a>@oC4wOMN0_(xpirp@Emn{O
zf?%jkXdW6i*f#g1+1q4xX2*xwT)b_hXE|pi`+1o&yXWlpw}0Q6Gkf^`&Wa!i(8=)C
z3o|m~?@#{pn#}l^%-~iq|B(|m>H>~l47(HD#(S0>wk;2E!8gIofd5olU%LVQvEGCB
zme|7$0{XF82^{F?1Yj%}fDRylo7Pg;t^syNT3@>X-}FsT@hj}scDViEE&vzvZ}X(|
zgtO@vs0VebUVjC{G`X|zBj?ESR{jl=BGnRoq5BzdW$uF+fS=tJVnVQL?1gXm;o%)?
zfLl8cA=7a<DDFdb2Y}$Ed;jlez_h*0x>qL?H}Qa;#`ReD>Hys0cQ|7KE|d&N)uECA
z0R;Wh`q~ZXxlyABIJo5dum7#5dE~eUbce@DIeqO0*nbnf*L3O|I>n<v+W_4G=%#Ie
z?f`VtHb8d(x;gO%NH2t5DZG18X8bSNuYZt@L53552eb{)9e{4y2IvkzH*EuS2cVl1
zZ-Ded$QfU|F7*MEXk7?N8!-QI5Edv*6L6t80Np;Pi=FJAI_!6zINS9qJyudyvZb^p
zCunCFbANN(w3Zm`?4VqX@m_M2MQ0g+xym+=r~(k+v*Z^s%|@C#+mZ;L8EFIVocjEr
zeRlqP>{yJ~hh8Nfq<F5Q3ji;ubN}f*ep_Ck9t3=P?oH0veX`OmLAo#^ejRBPH%|kQ
zb;F8H!LMQ`W2A_Y_Ms#W)847TJZL|B`8%n?hJP%rnF2w7SiDTtDVUp3wZZamYAz12
z@t5xFjp+~tqz%Y_(I`+L2#XdbVUa^L8I?F}N)|R`kv1UlS>Lt#G1JHyU%PHk^io(W
z^KEv5_aA-2Qhk;Dmx-q1R3N<&I_}Fy9i=Nl-><RZtg4he7NrK{%yeT9fCt1?O8+a$
zihrZ)ZkY;T2ti3SdqAp1*&Wbrgjf8<!Skvl{}aj#SZMtA4`)XHv=Gvb(r3VEqMMj7
zC`RY|>&XX{@N~%jBgzcu+JYf5$WCn+r+fkp*i7#+Ri2|NN@UGA_}X{p04k@zwn@?y
zOfSxc=W$1wbTiZ$kbcZ^vWVk(6s!^$(SJxsDvZKn%*}B*e<?gIoiqb{KiuaFz-G7s
zIs&LOz|4djoc9qc%A}j2eXsEF)eAH8A6Cd2eSG!&4XzZ%$@V63#@CMBL}>`Y?BJAC
zT0I&Q@fm4FE+SF}Y&fg<e(m^<EhHia!~u`n5AKpP(@K@2u^a<RLSP8NG7bqBRDanJ
zkvkw{KUc7yJ5WJn3`hkg!<iA_Fn6GW$QV#GAtnq)6WvO6BV&NB96@9ZaLOJ#wOxk9
zAYEJPbfaN_A0unVsfrR)<vBLfd&;DvVL&4{FugcS(iE_*E@>DI0}O+LRl@N+mXk$D
zKUOELOsN@-+`#4hCC1zwU@4Q1hAsh?4Qv99{|5Vh^ZqR)8U`HA4b%v82a5Ou_vlqc
T5^UWA00000NkvXXu0mjf8ooA=

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png
index 7be507678d49517ac92392e78b96843349952311..31bfc29cf0acfbe6522db842e91025891a0ce052 100644
GIT binary patch
delta 749
zcmV<J0uue04TT1fB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mjnn^@KRCr$Pn?Xw(K@`W=Vj+-2(6o3c1_Z&A5NHp*=h9QJeuerG
z^aJQe(68Xtlb75*C<HtSLSah}rA<o?fj|X)|KUxT$gU>y+<)xbo%zAz4P%15|Gt@d
zGqYJqN~YWGK5)~E!C)YYL4^Q~M#Hq5&8G2-(C_!_Apn9O4u{-3Kefn!cDrqY-@Ry`
zjz%MNr{<4yaK3YO%uO%euvY<sZ?#%zc7Fc*k<4RKR0%+&R)i00n;q^e6jei@bGCYj
zr;6Yq0uP60p?@K;&rL71Wq^T1m}UZO>)m#)Nl__)%lg~*$>0CKb4`kB0c`M;4akU0
z<BxiyJ_9W7%<r0%$_P*tQ2_SA5(Qu%EaFP=<K@NyH)o(~4n<4{OWF57cbKuwl7;?s
z@BYYEf70EYlsE*~2TK%yeXv9U*n5LnJ<F<sSO6?_d4FbibD9wgfFScsd+<Ok0E(PE
zqy75ypp%BhQqK4mrLaoS1;IlEh(V;mRe~skZ6*+^GNG_l;HeR=2x<_gpU>qc(tkW2
zCzHvf^dTVr=e=HUVF3_4sD%JN8Q>DP!zB}k0DEtOp9H_&etNMGaxewa&6nY~+7v?W
zEzNUAxPR548kRB%QXw=`3Y$(Pyv7hX;bty2c*=wnRbj360$F$V))2TGJby(MVgc+u
zeU{-&Ks#aq=;_Yf*Sl5)5ei!cs=`uM0nJ1K*au4#fPJu(T7`kEH$?%;XB1OdO0lHo
ztt{7{f7Rz@=`x4{un(3f0Q+F6i~#nA>8VLkEoOk-O|~-LJ+Q_f^+tULSP}9}ib??}
zwefV#NfIpU-2-b<)K!AiH4UDszZZ|u>Q)IZ6#Q$TN&p)?VNQ?dF)1pBK=41E4gSZ|
f-1I`00ZH-*6;1wq5j@1C00000NkvXXu0mjfL?cvp

delta 1672
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
SNQM9a002ovPDHLkU;%<4c>$>a

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png
index 9979f28e945787ba4ffab8d70010c70209c7f274..e395832e8e39f6a7f69e6c36c189a1f45bfbbdef 100644
GIT binary patch
delta 715
zcmX@f`IvQrN<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3
zR|5kBQ-!CCV@O5Z+gS&*g&jqXsh_Oc9Gj&hdYz4BtK8)^GaBT+Jx~>2Sn=VByn<H6
z#|w{KFRXeH_@9Me&Lw0+#Y7R2OE=bhyrIOQx$ug_>8g6oNhQZu{wxx-Ib-us)7V~O
z-+SGZn>A-{CzhEj&)__4FfGV$;T5&M#|+mvzA-G)c%@-!v*ydnt659_ACPlcDz#42
z(geuYH?56OzQMd=-`u(3;f8HNvzHpnizW0X@GrQ-u}<@*{hBY4mUnk@XS;}<@=%+u
z$TR1N#5YNU?Q#3+7a!TtKYwn-POfa0YKHJ#;_oyK`5s(+a{2TIw+-75e0SXBEosqf
z_{R9bpIa+md-dcu>8FL|AC`I;#;76PT;d=V@~<&<g19)tm8doR4STp+zOJl{5dL-c
z)HUV`u^4WLwMSVQwu%)o#9cF%v;0*ykEc>JVD`+}8*X{b{1!j2=Y9R+lt!5YOV1Yb
zCvNq;T=Kl|!!tH7u@kxm?|xcdHhk8*`8z`;+nKe~&!#u{l+QcACw(sC69%nb<zwF)
zLQd5!zLU6@eL}PY*UoIKE9+18Z&@)R-QnxqH%e>FR<YLYvHSf|%uDQrZUC=vM6J;$
z@4ulnGNRm1fWbIv!>tu&H)7W5)=Te~_$xhuS!1eKb$<ET6J2?Gq{IU^I`BR4KhNCM
znfdT{-NOU>JU{+?t$y+5y^Q|8?fQITpMUOo@wIBv)vSr@8=G$PI6^!L3WFGifb2p>
zsIQ@cQmVhtePhIw#p%qg>i3+|s~=zgn2@xq;L8KUk8AI{h<Z-i;(ok-dF0Js_xFoF
j0|ysYlYmBh3qDd8an>%6PtjZlOq~p#u6{1-oD!M<QvE^o

delta 1205
zcmV;m1WNnk1<47JB!3BTNLh0L01FcU01FcV0GgZ_000DgNkl<Zc%1E<+iM(E9LGOr
zW;2<+Wlh^$h>&HWrgUS7B7#0x#fMTMv@iNrAN&)<7a>@oC4wOMN0_(xpirp@Emn{O
zf?%jkXdW6i*f#g1+1q4xX2*xwT)b_hXE|pi`+1o&yXWlpw}0Q6Gkf^`&Wa!i(8=)C
z3o|m~?@#{pn#}l^%-~iq|B(|m>H>~l47(HD#(S0>wk;2E!8gIofd5olU%LVQvEGCB
zme|7$0{XF82^{F?1Yj%}fDRylo7Pg;t^syNT3@>X-}FsT@hj}scDViEE&vzvZ}X(|
zgtO@vs0VebUVjC{G`X|zBj?ESR{jl=BGnRoq5BzdW$uF+fS=tJVnVQL?1gXm;o%)?
zfLl8cA=7a<DDFdb2Y}$Ed;jlez_h*0x>qL?H}Qa;#`ReD>Hys0cQ|7KE|d&N)uECA
z0R;Wh`q~ZXxlyABIJo5dum7#5dE~eUbce@DIeqO0*nbnf*L3O|I>n<v+W_4G=%#Ie
z?f`VtHb8d(x;gO%NH2t5DZG18X8bSNuYZt@L53552eb{)9e{4y2IvkzH*EuS2cVl1
zZ-Ded$QfU|F7*MEXk7?N8!-QI5Edv*6L6t80Np;Pi=FJAI_!6zINS9qJyudyvZb^p
zCunCFbANN(w3Zm`?4VqX@m_M2MQ0g+xym+=r~(k+v*Z^s%|@C#+mZ;L8EFIVocjEr
zeRlqP>{yJ~hh8Nfq<F5Q3ji;ubN}f*ep_Ck9t3=P?oH0veX`OmLAo#^ejRBPH%|kQ
zb;F8H!LMQ`W2A_Y_Ms#W)847TJZL|B`8%n?hJP%rnF2w7SiDTtDVUp3wZZamYAz12
z@t5xFjp+~tqz%Y_(I`+L2#XdbVUa^L8I?F}N)|R`kv1UlS>Lt#G1JHyU%PHk^io(W
z^KEv5_aA-2Qhk;Dmx-q1R3N<&I_}Fy9i=Nl-><RZtg4he7NrK{%yeT9fCt1?O8+a$
zihrZ)ZkY;T2ti3SdqAp1*&Wbrgjf8<!Skvl{}aj#SZMtA4`)XHv=Gvb(r3VEqMMj7
zC`RY|>&XX{@N~%jBgzcu+JYf5$WCn+r+fkp*i7#+Ri2|NN@UGA_}X{p04k@zwn@?y
zOfSxc=W$1wbTiZ$kbcZ^vWVk(6s!^$(SJxsDvZKn%*}B*e<?gIoiqb{KiuaFz-G7s
zIs&LOz|4djoc9qc%A}j2eXsEF)eAH8A6Cd2eSG!&4XzZ%$@V63#@CMBL}>`Y?BJAC
zT0I&Q@fm4FE+SF}Y&fg<e(m^<EhHia!~u`n5AKpP(@K@2u^a<RLSP8NG7bqBRDanJ
zkvkw{KUc7yJ5WJn3`hkg!<iA_Fn6GW$QV#GAtnq)6WvO6BV&NB96@9ZaLOJ#wOxk9
zAYEJPbfaN_A0unVsfrR)<vBLfd&;DvVL&4{FugcS(iE_*E@>DI0}O+LRl@N+mXk$D
zKUOELOsN@-+`#4hCC1zwU@4Q1hAsh?4Qv99{|5Vh^ZqR)8U`HA4b%v82a5Ou_vlqc
T5^UWA00000NkvXXu0mjf8ooA=

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png
index 9fa452a61bf19f4082c9fbc34586322836957de0..4097d024fc29b07a3490bafc6219ed5d0ca86404 100644
GIT binary patch
delta 715
zcmX@W`IvQrN<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3
zR|5kBQ-!CCV@O5Z+u8fOg&jqXtM9zAvfHgwikIV6<g-mlOi?+Blie(I*8JfPv0&-8
z&S9|?)ZyQ<ebXoL3Jx*LfQZL;rA}M3C|1cyEq)UzQ$Ojh?DI3`tw|5hXwNhF+<5%^
zZ?R1(@o8l<A}0x-30WN)sUzmP|GxOt>eiW8^WWFU>c6)Lu-x%_!Vjw#ofdt&7r(CG
zbmd10^R*6}D^W2F0ojF&4r`CHGHewSXFwD9RM{XuZCPTy^V{dG&nu_SjV|jhkFUSS
zwRQgczIEm2)iy6SZtz=vxJvEeGIXsdX8mF~QT;J$?KZB}{&8Ox9bM7Y$6CbTDBuy1
zyJSK(_uAIlj7SCc3mLx**VtM9w5$=5bvw>v+3>8pGcqFAXy)IFs!wM_x9Ch@Ua|dj
zy=}elAMqtqn#=w^)&+`%H_kcHJ9FBvEn0CWloN`U+Oe<hoy8>0e>^_c?KIGk&wGux
zCvNrJT=LlO<v~@ThUEvUgqAP+Y8&ZaC~bB^`N5Y@8?`sw@|ejhC*Pa5DD~i4rhw#0
zI)>{)Hl1hKE?EQ$8=&)7Gl<&j#D;7tz45aC@jrcsBarZ#((AO(K}+k+>V{iBzM6({
zta82jam}VpwhhJE%hzdtY@2IW{@rdjLpIBAksEOzj%l>smN;z3q!#{aiD1G16W*6N
z68IO~yJx?2U&}{h1)G13UwD4-Pjj5<<@8YP*oOXwXP-MWzv^yVcs1?ck=K$D$~TxZ
zOkDn^s#XIHe)wn7$Ir>a-x!({Zq)3~`O~!JYSzR$=4yt0@7;q=2}R{D($G3ArEtW*
YeX?HTk(G*Wz|_g$>FVdQ&MBb@0K&LFeE<Le

delta 1196
zcmV;d1XKIt1;7cAB!3BTNLh0L01FcU01FcV0GgZ_000DXNkl<Zc%1E<OKTff7>1vt
zk;bE2R44HT7c2y+L*yE_lt8;^TDmYPm}JxJ(nWtl>84=XLV_2CLVrZPa~Cb7q!bdG
zLb1UVYSP%mix`O}@!gJf8;@o*UCj7GFZSYybEa7DMn}>dy?>t`ow<D9Hxj<@qf^5-
zugordT&EE0<C~XnbG<Y{zBi3Mv4%C-`}uKmV?r=DIQ^51e@tewZnfI*<3$R<hP{gC
zHI;fs1V9pSx%c=11tY7}Ij+?07*&NJCIn?{QVyuX5RnxS=+(hX0CdNa$~+?jAmbYh
z=SBcnq@m0=GJgOn2E;{-(Nwom-^c){;%f1Y3;?_4veVpUNDOjjOPy~t0C;ioMv{i8
zGF_WzGrOnEIvN0yHUKkAbEFLc+lDghXaI=CD4A7k*QK1UK=zqBYh_NysTzcFt$3Aj
zrvRABtfK+Iw17<j?wHHqdCIJ#0YI!Aj+=myQ)ew(4}Z8^zA<)ET53<M-LfWoDXrD`
zK0nEaPd{V1wMy~p6pyBUc~dF?NlCAOcI4zbrF0kYye1p=s!Gcfr4&HH$a3%T1HdJy
z0qB>qdce9<qfSuAs|umY_CzUL0sA@re$F2iDFd*d;}7RX$oT3mbx)GgW58&to4ANk
ziO%=ebAKVEEBF65DFbk33x>oXJI!6}+9?FEncZW$HcvxT$s0-VqEV1mw+n0=qz%E$
z(p>O7tO4kjIsn;cl+zV#*QI1uAr_51Okorz<4%EV#jC;7>S+Vuc|ooZz-Cwj&@XiW
zj9ifG@9Ss{K%=DV0mC=1%*xEyT@R2x7cG1e9)HbS0*=D8y1)tFGp%53x_|?o5v&OB
zg{-}_qyhBDdk@B2Vh_jn>BnNlw;|C5z_>pE3BV6)ehGrz!BSWH`Y%ZX_^xk~x>skn
zxfAC4Fjjnz=hf$2$i70$Z_#k;#0-P`i$8ObJnt6YCM`13!M8)w$AIheAI$>%>Z}kK
zf`8Rm*wqOOyYHI=+}(Ksxy0e5qz8>10Q}b;{=bg_Ggg^(w?!^#-~v4%&vmy2z+L`?
z^CsW~=l)C!>M0O_-!E$~EolHfx100;2S54#>;Kr&IP$m$bO(=9vJuEh8o)`nvPE6d
zxE|H04glQ&=vD`S?f`VF13-5Gx^?OSNPp)7vU;QR!I;ea-}2v{-v0}<LmdFR1JJDw
z0NnxTRtJFY0Celr1JK^1wkOtZNqxW+QWrwn0W5s#2MrR#034_cK)1)aN*B9l54XES
zlI>Q59y8rmf9(JOuyTw$1@4&340a``RpQ)8kFsQ!0hq6E^EAB4%Ex2bt6&&mnSVVm
zXRRH;{j*;lj4v$wh!v0X*3e~=eukG4X8>^h7LQ&$<d5<qE#K#hi|=sW>T8R?_GC!>
zJ`y%p&jFBkf{sziYhb10WQddXpehc_?niI4d-D1ZQjHbuD*y-@B#sT47A0d78Wxx?
zcGJNIHvYExdK>>&s2xD@tFS?WASGy;7z9n0<8G%-9S$WMD}Mn_dR{s7?CW~~0000<
KMNUMnLSTZLmN?S@

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png
index bd46092739e6b3d5f5e7e3eb3806b5feaa456145..5245aa4de55bbd9220be129782e2d81efda2353d 100644
GIT binary patch
delta 639
zcmV-_0)YLS2ABnqB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic
z000ic0Tn1pfB*mjElET{RCr$Pnn6kfK@dep(RGMXTm%Dx2MD<FCSJiS=mGQ!UcsBV
z@dknr$wD+r)(V>6RK-c#<04Y^Te=?<)iblIH$B}6)f)|&@qc*yIT#F@*=*K~Znm!F
zcHnULsCj*VZszm(Wcv0fcUQSPdAgF}T5L+Df#O@B&=7KM4qX7=yuAI3uD5InT>z$i
zT>P+qFp{A;bO9h$JidPqvJjxe#bW`qCJO;5ysLQZ0AXMRT>uJh2Z)QeTpZ~FP;4B)
zqj*3UfI?G&XMY~sBK?=(@$LS(4A<h{{}N<V1xPNIDnN3v{CO8(ui}5Degcw<r3#Q-
zELDJHQx^aAJA;k604=iD>y1(o9uhGX&@LW%XM68QurU*mDjqz%+^+;1(;1K|9!#B^
zAHQL~2BeA)gG?|N08+*0umb=W0U$1Za{6((h%>oG!+%YHqQ#>r8Z|~KxCvMkuFa3-
z-jAjz8}}KI8?I}BtOLunpr}tkSx5+H0rXq|8`m{JhD!-J8z8r6xCqduXDlHH%mrw(
zGbJGhOa*9@GbJGx5oQ8(il-#BgN^A7NJ)r;jrkhTmXM0@kVx$eNiLQuKytBE0g{WQ
zo)VK>EO=Fb<YK7;Bo_-^z_6b_H-PYfE<n!-#DQlX66gZ-oIpE(mjt>1Jtv?6JSAkY
z2u{D7CY=(j$U=b9CBc#`1hl7kEWsMO0Gts(yF4Yq1G)e`ClE{Uf-WFxkcNf{LavQz
ZnlFM&P>D2+`?3H4002ovPDHLkV1ld#2S)$^

delta 771
zcmV+e1N{7$1)BztB!3BTNLh0L01FcU01FcV0GgZ_0008bNkl<Zc%1E<J!n%=7>1vl
z`_r@qQ%WM8EOjXcIypJ1i!OC?=_0tblPE5QK!-rVMXGL{?ciW1Gr5R3=+a4O=~TK%
zF-4lvmh}EQoJd7;tB~@2ft+W$+;Dlny!kli<ev99S(c&6!hhRGUsk6#;K=3k)tB7(
z_85`_sxL|umn%#EdVXVa{e3U`UM~+{1gqD+nu|ile*7H>z)QvS3t~!n?1vEfFywMv
zIEIn7sJwayyqj9Waa}%aeq?TV1tQs!)D2i|y*3vUog01(jEU*18_;leA#6hsLli>d
zf?E>PS2v*g%zpuf|GNJ_Gr&clZh+Jm%|m|{P{tadU4S;$0PO;_=_>;~g>w4JfEc+y
zLBHrL12pJ)A#{EB{+(W)@AdzDuMB(#h#R0W(4B{PH5vomdGy!Mp@20&y8vyh0ony<
zBlbq9U2E36ez1n>LP*4bcCA_8T+AS8ftvsUgdPM%34i%>k$opvG;e!n!%6S~-Ca3A
z(t!8?D1#p}y*I_}>P@mF5tGkDwgdc_H<z9;S9!(r<|k-HWLNHrmhdOCv%pD_(R36}
z6YwJ_2cq)bkTW1I03l`XGNcZqFuye;CZET^uLI-^@KPW!8Gu3th2OFPipUOvBW;rb
z7;+(Up??*M%6CK7fXHL+aD}JMTV@&@AEar}8|&=-!}i1u+dp;ym_>IQl<k1FSqe9t
zqrqAV7ndtb)mpROHTkh7Q9(Xp9iW{9$iuD!v<uM28lYW(Hr4=XLAy0(x5oMlNBg{h
zcD`WXJD{%&upucMl9I<7pk07A)&T7Sv{64Xl6;pN7?>k7n~T}mp()M|O;u~nx`YYp
z2Fzw>S%F5dYpx?Xef2S5zVv{F@rO+BO_>{!*U1vdpxy!ZcIr^_p@PW{9Iiktr?1`t
zlmn9$I897;;6!$_MBRY-tr<vx)G^rs!cLYzhM!k!y{jKOTz>!n002ovPDHLkV1iYX
BW&i*H

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png
index eabc47c84b865b76a0c4cadd8a6c043917b318bf..4097d024fc29b07a3490bafc6219ed5d0ca86404 100644
GIT binary patch
delta 715
zcmX@h`IvQrN<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3
zR|5kBQ-!CCV@O5Z+u8fOg&jqXtM9zAvfHgwikIV6<g-mlOi?+Blie(I*8JfPv0&-8
z&S9|?)ZyQ<ebXoL3Jx*LfQZL;rA}M3C|1cyEq)UzQ$Ojh?DI3`tw|5hXwNhF+<5%^
zZ?R1(@o8l<A}0x-30WN)sUzmP|GxOt>eiW8^WWFU>c6)Lu-x%_!Vjw#ofdt&7r(CG
zbmd10^R*6}D^W2F0ojF&4r`CHGHewSXFwD9RM{XuZCPTy^V{dG&nu_SjV|jhkFUSS
zwRQgczIEm2)iy6SZtz=vxJvEeGIXsdX8mF~QT;J$?KZB}{&8Ox9bM7Y$6CbTDBuy1
zyJSK(_uAIlj7SCc3mLx**VtM9w5$=5bvw>v+3>8pGcqFAXy)IFs!wM_x9Ch@Ua|dj
zy=}elAMqtqn#=w^)&+`%H_kcHJ9FBvEn0CWloN`U+Oe<hoy8>0e>^_c?KIGk&wGux
zCvNrJT=LlO<v~@ThUEvUgqAP+Y8&ZaC~bB^`N5Y@8?`sw@|ejhC*Pa5DD~i4rhw#0
zI)>{)Hl1hKE?EQ$8=&)7Gl<&j#D;7tz45aC@jrcsBarZ#((AO(K}+k+>V{iBzM6({
zta82jam}VpwhhJE%hzdtY@2IW{@rdjLpIBAksEOzj%l>smN;z3q!#{aiD1G16W*6N
z68IO~yJx?2U&}{h1)G13UwD4-Pjj5<<@8YP*oOXwXP-MWzv^yVcs1?ck=K$D$~TxZ
zOkDn^s#XIHe)wn7$Ir>a-x!({Zq)3~`O~!JYSzR$=4yt0@7;q=2}R{D($G3ArEtW*
YeX?HTk(G*Wz|_g$>FVdQ&MBb@0OtojiU0rr

delta 1209
zcmV;q1V;Pg1<eVNB!3BTNLh0L01FcU01FcV0GgZ_000DkNkl<Zc%1E<%}-oa7>A#8
zKZf~YhDbj~QfUZQ8ipFHn<knVHpCdxgmhVV{s+blo3^s4iHU!OEE{5Mx@cp%uqJG*
zjT8bVh$8AB3>k)*VYr_z?m(w%hnPdoxdwilIWxKU{@!`!%zwS_`<{D67>4N7$o0|L
z`HyxOFka@1b2quRa*IO2#+|HS-|o55X<tJaeD}(o`!fE9%+9(Mgn{%iVg+EcxlS{1
zlzPSlKniepu=t2UBdgTeQtH-0H6ai}@EZ>Ho<~lRZ%k%Dq}Tf|0+2IP$~<EOARF2Y
z_Y?v6G2B(=8-E)BJ7$O_42CnRCV!;Z0I1<=@r@0DW<6lrtun-Udduq0&G7)>Cm1x+
zG(?S=`W&TPLz#6v0HmTXJiGLmgcV|K*~+Zr0l+X=?%HP0^;peR@p5bGtd%)+QY{MO
z>c|-5&H#{5W*rXzi6l@4;BI0Cd|#P$JOGH&v#|@9d4F}*vi*R!e!Vt!SXt^$R;KLR
zJ(Nl=cLr|p!P+OR1b<Ncyql-f53fiCASvk?a1=GUPAUBhGy{jt=DJGDL!}hJppoUl
z;v>Kz>H+ANvYfNLw~LE~5Q3Tzs%#IHvKg>n<L}q}agj0r`!)V>Pmye>F4a9uO3wkq
znH-id*nctgw&L5RB@xn9`~RDi0q8AT3~`=qw@R}fpWHzifKsl(Onr`qs4-}y!B<!C
zbdoXv)|O4e3YlGc9DR^d*YxNlWdOX~8mpNqd#=ZF*ESgOsKXRSkzm{z;OfX&^tN`~
z0Qi1X>jO}3^#Jrs9RM@Wb63Ci9)Lzk_X9?*kAKd}?612YAYBa2e_W3Sfq-_H$u4l3
z(KwNe#t9E_z&E2A;cv^@OG_F+!8&^|-V#lmFr+|=Qn(9t7Xag7AJ{<H>iOA3e}|;H
z*4K+94dBbd6b-*Y)vdH@eR!|<F27gTxsZRAAoOW?bxhOb>xFL^;yk0px5<cZ>EMq-
z(tqcGi6<Y<0?az=SVFL7wi29HWA}Z#k9(CB=xJk}@?p0EK={Vo|N9*9ZR%$>ynuY#
z1mJXw=Y|*M`}bIb(>CBl*Zyn(jWh@#EXdkROB%qLsem)U!B4*b`9HR7&;32%RP;J6
z8-bjp0UUNKTig|od{m=O0O$@tw@v`)4u3$mP5|f*K(~%P0O?vlR+m>N#$@*YzJKQU
zJ}+<-Isu?N0NpwPpgREFIsu?N0NpzF0JJ|e<xW<nqz*8RR3fAu!2F~aEs&Td;9ynH
z;l1QisHQ3RdI#IRCQ?-WU3$BY_VzmM002nl8FvP_n^>VQY2j3DCNh^;YW@PiLVvwV
z85giH5iAEal18h^+An9V9l*ohPY=cyp5CX+wzx9%Ch0Is-i{ui^1^_H$~-@;E)s?z
zH!i-zspQ!g9r8a(dod)QTxu<@_5v`t7cG}92Mv-LgDf`PzMv+aEiJd-X7|(OucQ`M
zw9fz_S|D+nkPTQi|AgH%BpjM9G%|tBziqz3(LGnF9YFE3)&j|Mp#*det!-UVa$)5!
Xp#Wu4&1DdR00000NkvXXu0mjfVJ$+&

diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png
index f75790a41878a5b5e9df599eb3004fc19dc29d2f..f2aec98846cb982515e94d2f3e994d085109e69b 100644
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1enaIvS0V@O5Z+u4S^4Gsba<a`ubShF<_NO3zA
z91LPLFxV1XRXkb#-K6=)&aZjC$#~zRTko1biW*-FVpy}3A;Oz+!!)J@UDg9pTn$@A
z7_xuX@c*cu|KH1>AzPCHhZ-yrUl@PsgY{#|1s$tkuz1Q-Cn$6W<R=DCS3j3^P6<r_
DF^N~b

literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkQ1G^=
zi(^Q|oVT+#@-`cYuo@=um7Ng!;xlWW>L%vq2R#lSzZQk<c)h>YDkJCQ+V6G~_nfO;
zeWw1}_rRI+wGaPqV9a2YV!ps+!nT0*-Hhn4!XFIb`xm|DmsjXTlF69%is?(`zEh9?
zGeFg5@Ce*jsF}B3XuJ3P=c{}ER@Nb#l)>Y`eL<o@Y=I$zu0wLe54L;k74ilkJK!>z
y`@}0OkOX!d{?4>d{6rE%RKqcbEes&rXX%$%%2g+2GNk~$$>8bg=d#Wzp$PyK^Ji!P

diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png
index 45b3c99189ff93d8928aae08e938c39e47de6c8c..dc5081de2ed0b1a9aa0e4cb968f41085f3ab7ab3 100644
GIT binary patch
delta 686
zcmV;f0#W^qdf5e#BYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<Ps4t5Z6
z$WV2$AS&Wms#pXIrLEAagUO|T(4-+rad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(
zq|hS9JC1vJ?|WbFz5|3tg{fxOB%o@Rk&4H}Y;IKyyh1=f&3|zS5;OHgdNBjf@pTU$
z-|r$k%e(H+(Wm512KYqcDANs#c!PL$)6zNb6NgwyQi#uqCk(nE@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o*@n^sz&)j)@6nB7H73mW37Ag7Y6g%N}B7mMi9pm5=cUX
zj2g<Qz(Ry}jeisqDLRjN_=g>Tl3X&m%3$PJKou$^#}EDozk6#Irl;JbU<~MfvF(ph
zAg~KG>$d%UY}?Hf!2b+fX>EVC0nB}pUT<sRBVb?~xVUa>@*Z%x0}MUsk|8;gpO#Q4
z0Pkn?O*vrj7U*4b`_?+g=>w3VUM=4M2Zz8|k+Ro4-Xz`A*|&ddTK)S0Md5Ol8b}Lg
z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j~J04+ag7Yl|8H007lVL_t(o!^PH3
z3c@fDhT#e5I@HlsX+iJ+y^VMA0N%wr2|`O(8cWs+x)Y_XZIb!P1)i6I4+5b0s;YV!
zO&k%yXyVQ}`G9Y{JS`4J6K}gl?gB$N0LTQ4;dxe+Mibwzcf1#v!takOUw^<H+<RXe
zO`K%~AvpO8LUGc77@RC17AFZv!IJ}0@uUC>JUW01j|!l~g9E7Xpa2ehb^sTiXT@{?
zCvL6%{~_VVSIf=#1tjpx?K~VHg|}VP|By)Hy%k8~KLHx}XNFpMy?-8!CXR^k2EB0_
UzWfgt^#A|>07*qoM6N<$f<`MZ(f|Me

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

diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png
index 5286b1e17e622aec224cf58ea6b78db7afea79bd..772c39f64193e84526e379b91b594ec019c24264 100644
GIT binary patch
delta 660
zcmV;F0&D&BdA|jaBYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<Ps4t5Z6
z$WV2$AS&Wms#pXIrLEAagUO|T(4-+rad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(
zq|hS9JC1vJ?|WbFz5|3tg{fxOB%o@Rk&4H}Y;IKyyh1=f&3|zS5;OHgdNBjf@pTU$
z-|r$k%e(H+(Wm512KYqcDANs#c!PL$)6zNb6NgwyQi#uqCk(nE@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o*@n^sz&)j)@6nB7H73mW37Ag7Y6g%N}B7mMi9pm5=cUX
zj2g<Qz(Ry}jeisqDLRjN_=g>Tl3X&m%3$PJKou$^#}EDozk6#Irl;JbU<~MfvF(ph
zAg~KG>$d%UY}?Hf!2b+fX>EVC0nB}pUT<sRBVb?~xVUa>@*Z%x0}MUsk|8;gpO#Q4
z0Pkn?O*vrj7U*4b`_?+g=>w3VUM=4M2Zz8|k+Ro4-Xz`A*|&ddTK)S0Md5Ol8b}Lg
z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j~J04-N;XXXp$7006s5L_t(o!^P9f
z2|_^(h2ayh0U3AV1;GNQK0C54#g&XQYZtl`#rv2?l9L9$p92Ai7h`-06AvLkn0QLb
zKj0f5POGCZ@$2K_x4;+<z$ah|->!FqF!BB7V7tH)et+KV0!r|l^I4d<$z>PR;Obvc
zi>n5-;A#P_xJp0|-W|}3cLiwR%>i0?Q-CI39iWX@1z6z40akcXfF-^dV2#fPc;J%(
uUifH$C;k`UjsFBN@J|2>2LNH>0PqH@&E+BUD&+_O0000<MNUMnLSTZJf+lJJ

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

diff --git a/Resources/Textures/Structures/Windows/window.rsi/full.png b/Resources/Textures/Structures/Windows/window.rsi/full.png
index 5ed08bac4204e8a98d150333a24925dca8310739..897534dd8f6ad77a7169b021cb316555639cc403 100644
GIT binary patch
delta 402
zcmV;D0d4-s39AE;BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0YFJaK~z{r?Uy|gf-n$9qZK2KiZutYqOkT5oWj!D16W&f3Jzgy
z?E$DoZE)x`-%f%76~f<OkvFr%gt+^RnIVik&wH`~Apy&>sDESIHnn||Bnh=?n!W{4
zJdR_!(Kn9ckVGbc0Tf^P+u(7D*ks{GVs5AK+%C_}PT^rAYvu%&Yd^pQNN~EApyJ4V
zK8BgVSllG=%f$+yOP7wwilc@YBXR<QqD1SE#W^3VTHFIWF%i%g!E`pKwl4SEm0Gnp
za`HW}|N0kv1AoPls7dIEmkP+@9N5<m9f`^nkYE|>gf7|wePINQfDtePMnGEtkI_1z
zOR0eJG|L?@bVGTX{-kmRq(qabDh_^~h}2_LYm{6OK3AQHif6difm~u=&_yLDz$ca-
wAX|`0poSPD{^P}D@K>|JUrwnv2#mb|4AL%YCpANW01E&B07*qoM6N<$f?46LSpWb4

delta 1205
zcmV;m1WNm>1IP)GBYy;sNkl<Zc$~$TyKfv-6vlt&-a9ipyWZH2W1b0$f{hXovO)xe
zCIv-=P!NisAwr@7iJqP!eg23v^dO2TB?Vp{0TPS6<ZM84<h&fO?e*?F@1>a8U9U|P
zB)rPk%+*}Y`Mx=?d#(VSICZAMQ@{`3e{<ZNICZ9R=)=ze=zpZ?VAtj#3Y-HGToMD|
z5CDu;I}Cav{dMXbp4R0z4lfJ==%zUUp{D^F2B4c|)T$wMB{*YHQADN%Eee+=fCJyd
zIfnu)^o{o*BIGy#Gy@@404!M?Ll96+B3!LTRthlys8Xphd@#44s)DInfFK|RfAiiW
zE-&0b5N2LE#D9y^6HJ6&LE?nw-4zyZF9C35_9Z;6IIwRVfH=)qZf){lWtI75P|nfw
zwE<89d$naETjRT*BJw1`SzEZ-Ib5EjJOcy(+_}1hc1uGZ$OQtW$Z|{bQWNdK^&H_K
zcMdUzclOt4EVXe~1_C5a0mIwJUgy@2i%3{SoF%AKN`LG5j(Bf}E_l#N5vn2-Nme|w
zD8gxjBwc1-KEV8g+vKaQfdJq43s>ejaeISsaxYWuJ2bw%@I>POg5xLOW37IWZaXE<
za+0+c^~nkD_XH$KLQ8x?-{bk|Nm>~+E?(f+XJ3828v+{V&z(K;(U&M=s8>URAY@~0
z9e|-)Qh!Q#)Q)z8a|gtj!Fo_6g@9fN{=WNYB;<W!9BZ3h0LI4m3<M-ej3>hM-f@)D
zD5D>5<^Kp!iq&?64FcNRLy$Vh{4ZBVLfnJ3j_cPKktpuJ>kAO+)uk&M&<Now!LR@k
z!2oZ)@fyy#k&p(yhf>1f!!twg3lEfkUk?K&>wgvUEZcPfB7#wxv1)~2OJf@<!_Y5}
zh7lzpz;wMh6^&=M2`Ixp7Wg9}7TK0pqP7VDlFR~NvnTid-NKN7m3D{KPBO9(WHx7I
zqx0_qe65*p{86lB=d`mM2tC8kzx`PZG-XKoOi7;ajMFY6ieu8;?ch)VLFw{$PrNxY
z0e^lu!p+Pa+$kU_b502;8BHTf@*=@!U)VR4cnZL|oXo*k#TyBE4`cNzN=v^4`vQ8%
zbBA@KJqMtes(UDALebbX8QM5``eQDhKX-OF2;cwYQ=02*JoD@X?M_14?SM7|0a#0n
z@L;1uyA$Cg<?1HPp8jIU&{p3#Kx+*OY=7y<;4xKnD~fP|NAq5bx!LFNjV3O0qHM^D
zy02Nde4X5R*eoXS4Ysq{H{vNpYAs?d#u%J)Oza71ZAAUcO1y=%7h4P99M*NwLBN$O
z*8s@<U?3n9aAH_ULgvO|j?TTxWUV~2ov_?mXQLC-T>J}wqjNJTf$8xYrG4(NZGZCn
z<!j~s5tP8bJv9`<!;MX}F<iUZ<Yv1Hp^(JcK!AwQN@5O8?O|d0Avfk1(KZ{()^290
zd4;H@Uz_M{-Euw2n5<OEtz-F8AvDJ!N+UQj>u6(`3ZNAaj(b!5K~ek7m369Ng{T`L
zN(RG;EuNd{)->I^F0dM<h!O&$@h*W*W+`rWj#T@I%UOwG%n0rB(jxG5ujl^&ij&Wm
TAhAVV00000NkvXXu0mjft!p^a

diff --git a/Resources/Textures/Structures/Windows/window.rsi/meta.json b/Resources/Textures/Structures/Windows/window.rsi/meta.json
index 41b8be18b4..9f6536937a 100644
--- a/Resources/Textures/Structures/Windows/window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window0.png b/Resources/Textures/Structures/Windows/window.rsi/window0.png
index 37bade4a4a71e531e2b23af81c6e620a18dc4185..95094714d3b20738d39d4ac64f7507ff94577854 100644
GIT binary patch
delta 691
zcmV;k0!;nj49W$NBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0$)i)K~#8N?VGPs!$1(m1FAy}P!ysLAHf^+4Ui}V0>xlKR8)Xv
zPzVGH**EALRK(*dP!up_>LB0EUgjDuG|i^XCU?J?uX~e<&VPQne|t%{f{F>l@Q0d(
zh@yy<g9rm!t(I!H+iewBVKf>w!vG{dolfa$ej3pOI-QP6{`lnT@%w!e>>P9_^z~An
z`e%34EW|cN5m54oU9|Ivizowd=aCdlh*2NwMw9_W+Jt3dA<+Pkm;fCfg_+_a)qsTE
zz5U?p^CMGSM1LEglaIk{mn9bBdw@pI`e|{gjREVz8$i)nya5!Qg<TAtUJkCQxq#lu
zVJUlijnGz8Hm;9{_qVzL;#PB9{1Bk%EZzW$&f*QASQuThrd1cp=mF;8#Da`!PAqH#
zkYtvmClA;LV3U(2U9!@UP#@ALV+fds6IMw!p$r4^kbjsEM^PrQ4bZcG4w*ec4D3Rr
z$iqz(LbKT{n9t{x7enkH@AY~s8-V0NBMhke@iv!DO@d<aLx5sooSy{G2hY|cF&o$e
zU>O__?=Kp2B!;y;r&RK2OJY-#V3IsGM08CAWf*|1-M=#KysX<F!#2S7%w7wLOHLlJ
z4bac&ZGXa<fON_j0=TnQ)xiX|0qEW~)rB&8K&|lxP;?e=07Yl1v=9NQm!)rv6{L&J
z6qeE$b)IPB<)Po4m!+$~8$i)nya5!Qr8WlW(mE|Jq75*r$v=lIhFFO20osHtagl03
za*PJq-aXLbBGG{K8R9ar5M@A|^u`ZRMH!%zk1XQ^?L6Wlq8M`iud~kod77Gq;PrqY
Z_yv}nwSkvp8gBpq002ovPDHLkV1jx!H?9Bx

delta 1616
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
O0000<MNUMnLSTZw0rnCA

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window1.png b/Resources/Textures/Structures/Windows/window.rsi/window1.png
index 4495aca459d59e327e8c391234a03bfcec9cc4da..98f6b07bcb179e8ee2886c05241e663ffcacf7f0 100644
GIT binary patch
delta 493
zcmbQw*~T(Kxt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSL74G)
z{)!X^2FBT*E{-7;ac^ho`y6(VILd7y5+JgukHz_tfX*tpMi)f`4i2WnM~<*aurM|{
zE||bk(|mA(!YqYCVU1Jr#?1`7_6T~k-Kh25r~Cfzr25mlLvmi~m+#%ZUbcIV=jAWL
zcNMx88Qg8&-Jo;Yhv}1zd@kb`<%G?p8~gJFo}cY?E@__OuxsOn9a}zKtn7EXefaKK
z-8!v~LKWS^3JQj1!tc&E?7jTjxTM+QR@_}DbB^zVAHMxc$_i^s<l54Ewk3>FMOUa{
zi7V5DEi=rWUR&$dUrv1XX-THlnTU%b4wsY|J)*X7DKvl7%Zyx^%<@G$i04v_VL!wB
zrnae8W=?91_oWrX8B2W{>s-4WXK6>VPB_@}ODjR_!QZUYT|dw7jn9j^$l<{DIo>v*
zXxr}Np39b{FIs+l(W~<LKdyfLz4~#pMc?90I(J!L7_@-h;K7hKNsJR>uL^@_H;Y2%
zLh%PxV(V9MY3;pr;M1+V#h?EKYxq5TcKP1+hPUz8|0n$2=MW50IgtVG7Y_!oF;034
bUHcdgY5i|w&E6aUj6McWS3j3^P6<r_!Y|V_

delta 1164
zcmV;71atd_1fL0zBYy;DNkl<Zc%1E<O^6&t7>3`f?&+ECncZyG_=6%!Siv7$Au+)m
zGz3u;6))n!AS*H_ZxYWrc#p^AB7q?05RV2$JxFqhKd_1`MnXamQ4`&`$!2!CXS%zp
z<g4ykRu9Q)wbixkyqB(Fy5_5Xr@N}=`MzN=lv2v*1NOeK|9?x9{-;kKf6S!6Z_>F6
z-TmBL@hM9E&CDQZB2Ck>9q6`dG$82|DG>TTk~{}a9yc0A?FLK+!D>4%@2Cc2$drQL
zEZ&=Hc|aKI_LAWGDANq>C^U{=y8+#O_ajMj^pYXI{^kdO0eg1MVsU91_uMfJDHW15
z1NS_9HUB-P0DtV>@i3ym)BTSc#;@Ig6KBrp<JH~(jJ1%1;pa2wA*BG$Ucz*zg-eT9
z(d<kBD8BKF-~NJ?eq2fX+6`Ee9%L@ywL754o1>fua-k2`av<C~ja(|IBnAs3GzJ6x
z-lWHk<JWG$xf4hJbKlDq#IN0eopT2cn)E+yxC)rxLw_4wV*?x*L#-Mc;J_Ga)z|<B
z#!#y^y#dBN;LQ)_pEl|L&PzK!HR;co*(GfHJ78>p17oOFV*?x*L#-Mc;J_Ga)uuPV
zcq8=0^RE~sHcox`zENVsbR%Sp#J0cK)d>p1)|9kprwMp_5_}lLo7l2?Uf^-0LZH=b
znue@Ym47fnN>EIDQYS4MOhOG~Y`=X9f5b&*XQdY-DbGz~h9t}3bI*nAH#eaB_{?hi
z)ED2uZ~K^?eE<<>=tM<kM+$}Wzg@wF3qR@1&+c6h;g*TWG;}30o&#P!{E40e+9jh8
zWUh~CF3<?0VwP1Ba!sGLGw+e^lN);uK$)PR<bNe4En>#ur9(*1hbWVq|5Rp}QLa+P
z23-E=m|242jc5Lk>sq&r4S4jmw+`N{MqvKfp|^L=9YFueBDzn_;^^mRv7Bc3_2c)d
zzMg+A<BgDMfkfT1x)aQ$z@NQpvbt5tssUlc*EIkFMG=GxvSz?wI7B9tUbdL|>RXwt
z8GjIX#m;YL=3ZMN*ClHPq@vgg-FN3Ur+$K39ZP2-0{0le+_9jRk;rwNV@uWy5WQvG
z76n*|Q)G!dOQAIbWHZ9W->)H-3W4u|OE>NVdj|BcgLxhn7Jk&PMc@V)v1UL&2$3~g
z$kQAt_rbXv6QQ+Ha0X3{_U?H^zgCXS1Aq1&0U=iFeEUM`0%#Xx%>b(IrUK`Yt_wFN
zK_~t%aM!c1VoT7#>-!$WyPqwfz3o<F2sbUFq~8^$^#vO`F;WGKaLNE;1;h+&$_WFA
z4G<$BRzS?arfM&i9!XOI`lpCcki((1xK2F+BUUhC2R7u40lZ`dSi=r%#dSlBYkyYI
zv79n<#(=uEMa~#NjDT1HF#}=;w&a8X#0H2F5Gx>NK<vO;Y-^Ejpb;A&RzS>v*nurM
zu@4|NkSZT}IzZO!ps(zGFHYP6BQ`*+fS3Wdm^X340Ad6Ea_uK(K<vPloG@T58z5#t
e?7)fu`~@0ZclH7qB!B<_002ovP6b4+LSTaAQ7J$G

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window2.png b/Resources/Textures/Structures/Windows/window.rsi/window2.png
index 37bade4a4a71e531e2b23af81c6e620a18dc4185..95094714d3b20738d39d4ac64f7507ff94577854 100644
GIT binary patch
delta 691
zcmV;k0!;nj49W$NBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0$)i)K~#8N?VGPs!$1(m1FAy}P!ysLAHf^+4Ui}V0>xlKR8)Xv
zPzVGH**EALRK(*dP!up_>LB0EUgjDuG|i^XCU?J?uX~e<&VPQne|t%{f{F>l@Q0d(
zh@yy<g9rm!t(I!H+iewBVKf>w!vG{dolfa$ej3pOI-QP6{`lnT@%w!e>>P9_^z~An
z`e%34EW|cN5m54oU9|Ivizowd=aCdlh*2NwMw9_W+Jt3dA<+Pkm;fCfg_+_a)qsTE
zz5U?p^CMGSM1LEglaIk{mn9bBdw@pI`e|{gjREVz8$i)nya5!Qg<TAtUJkCQxq#lu
zVJUlijnGz8Hm;9{_qVzL;#PB9{1Bk%EZzW$&f*QASQuThrd1cp=mF;8#Da`!PAqH#
zkYtvmClA;LV3U(2U9!@UP#@ALV+fds6IMw!p$r4^kbjsEM^PrQ4bZcG4w*ec4D3Rr
z$iqz(LbKT{n9t{x7enkH@AY~s8-V0NBMhke@iv!DO@d<aLx5sooSy{G2hY|cF&o$e
zU>O__?=Kp2B!;y;r&RK2OJY-#V3IsGM08CAWf*|1-M=#KysX<F!#2S7%w7wLOHLlJ
z4bac&ZGXa<fON_j0=TnQ)xiX|0qEW~)rB&8K&|lxP;?e=07Yl1v=9NQm!)rv6{L&J
z6qeE$b)IPB<)Po4m!+$~8$i)nya5!Qr8WlW(mE|Jq75*r$v=lIhFFO20osHtagl03
za*PJq-aXLbBGG{K8R9ar5M@A|^u`ZRMH!%zk1XQ^?L6Wlq8M`iud~kod77Gq;PrqY
Z_yv}nwSkvp8gBpq002ovPDHLkV1jx!H?9Bx

delta 1616
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
O0000<MNUMnLSTZw0rnCA

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window3.png b/Resources/Textures/Structures/Windows/window.rsi/window3.png
index 4495aca459d59e327e8c391234a03bfcec9cc4da..98f6b07bcb179e8ee2886c05241e663ffcacf7f0 100644
GIT binary patch
delta 493
zcmbQw*~T(Kxt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSL74G)
z{)!X^2FBT*E{-7;ac^ho`y6(VILd7y5+JgukHz_tfX*tpMi)f`4i2WnM~<*aurM|{
zE||bk(|mA(!YqYCVU1Jr#?1`7_6T~k-Kh25r~Cfzr25mlLvmi~m+#%ZUbcIV=jAWL
zcNMx88Qg8&-Jo;Yhv}1zd@kb`<%G?p8~gJFo}cY?E@__OuxsOn9a}zKtn7EXefaKK
z-8!v~LKWS^3JQj1!tc&E?7jTjxTM+QR@_}DbB^zVAHMxc$_i^s<l54Ewk3>FMOUa{
zi7V5DEi=rWUR&$dUrv1XX-THlnTU%b4wsY|J)*X7DKvl7%Zyx^%<@G$i04v_VL!wB
zrnae8W=?91_oWrX8B2W{>s-4WXK6>VPB_@}ODjR_!QZUYT|dw7jn9j^$l<{DIo>v*
zXxr}Np39b{FIs+l(W~<LKdyfLz4~#pMc?90I(J!L7_@-h;K7hKNsJR>uL^@_H;Y2%
zLh%PxV(V9MY3;pr;M1+V#h?EKYxq5TcKP1+hPUz8|0n$2=MW50IgtVG7Y_!oF;034
bUHcdgY5i|w&E6aUj6McWS3j3^P6<r_!Y|V_

delta 1164
zcmV;71atd_1fL0zBYy;DNkl<Zc%1E<O^6&t7>3`f?&+ECncZyG_=6%!Siv7$Au+)m
zGz3u;6))n!AS*H_ZxYWrc#p^AB7q?05RV2$JxFqhKd_1`MnXamQ4`&`$!2!CXS%zp
z<g4ykRu9Q)wbixkyqB(Fy5_5Xr@N}=`MzN=lv2v*1NOeK|9?x9{-;kKf6S!6Z_>F6
z-TmBL@hM9E&CDQZB2Ck>9q6`dG$82|DG>TTk~{}a9yc0A?FLK+!D>4%@2Cc2$drQL
zEZ&=Hc|aKI_LAWGDANq>C^U{=y8+#O_ajMj^pYXI{^kdO0eg1MVsU91_uMfJDHW15
z1NS_9HUB-P0DtV>@i3ym)BTSc#;@Ig6KBrp<JH~(jJ1%1;pa2wA*BG$Ucz*zg-eT9
z(d<kBD8BKF-~NJ?eq2fX+6`Ee9%L@ywL754o1>fua-k2`av<C~ja(|IBnAs3GzJ6x
z-lWHk<JWG$xf4hJbKlDq#IN0eopT2cn)E+yxC)rxLw_4wV*?x*L#-Mc;J_Ga)z|<B
z#!#y^y#dBN;LQ)_pEl|L&PzK!HR;co*(GfHJ78>p17oOFV*?x*L#-Mc;J_Ga)uuPV
zcq8=0^RE~sHcox`zENVsbR%Sp#J0cK)d>p1)|9kprwMp_5_}lLo7l2?Uf^-0LZH=b
znue@Ym47fnN>EIDQYS4MOhOG~Y`=X9f5b&*XQdY-DbGz~h9t}3bI*nAH#eaB_{?hi
z)ED2uZ~K^?eE<<>=tM<kM+$}Wzg@wF3qR@1&+c6h;g*TWG;}30o&#P!{E40e+9jh8
zWUh~CF3<?0VwP1Ba!sGLGw+e^lN);uK$)PR<bNe4En>#ur9(*1hbWVq|5Rp}QLa+P
z23-E=m|242jc5Lk>sq&r4S4jmw+`N{MqvKfp|^L=9YFueBDzn_;^^mRv7Bc3_2c)d
zzMg+A<BgDMfkfT1x)aQ$z@NQpvbt5tssUlc*EIkFMG=GxvSz?wI7B9tUbdL|>RXwt
z8GjIX#m;YL=3ZMN*ClHPq@vgg-FN3Ur+$K39ZP2-0{0le+_9jRk;rwNV@uWy5WQvG
z76n*|Q)G!dOQAIbWHZ9W->)H-3W4u|OE>NVdj|BcgLxhn7Jk&PMc@V)v1UL&2$3~g
z$kQAt_rbXv6QQ+Ha0X3{_U?H^zgCXS1Aq1&0U=iFeEUM`0%#Xx%>b(IrUK`Yt_wFN
zK_~t%aM!c1VoT7#>-!$WyPqwfz3o<F2sbUFq~8^$^#vO`F;WGKaLNE;1;h+&$_WFA
z4G<$BRzS?arfM&i9!XOI`lpCcki((1xK2F+BUUhC2R7u40lZ`dSi=r%#dSlBYkyYI
zv79n<#(=uEMa~#NjDT1HF#}=;w&a8X#0H2F5Gx>NK<vO;Y-^Ejpb;A&RzS>v*nurM
zu@4|NkSZT}IzZO!ps(zGFHYP6BQ`*+fS3Wdm^X340Ad6Ea_uK(K<vPloG@T58z5#t
e?7)fu`~@0ZclH7qB!B<_002ovP6b4+LSTaAQ7J$G

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window4.png b/Resources/Textures/Structures/Windows/window.rsi/window4.png
index 13aaa2107eb3d7196a96e5530e1996c6cbe0b650..30629fcac2aec115a9940cbd378b6039b439491d 100644
GIT binary patch
delta 498
zcmZ3?+08ORxt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSK$uZf
z!>fUTfpLMSi(^Pd+}qi@9xQ<(t@CgByqdvtnWfvH<LZ{X2_}*{Y)2Cc54Z6~@hm!+
zWFX1=?O>8153}2Cw#kqEZzcuImpRxfTK1f){K*`Cx%&I5Vr36Lq}@MLyIJ|*Or6vB
zCaZ9!Mz$TD`Zn$R#%6yfE92R%)1NPoD6f-w|M1U>t^J#X78~etF)VXsJg`NBVTKqh
z!{tQ`2~i>pKHW?WnTFq)!?xertx+v8-*54y&XX%Y6vQ9-^}5kcZvS43JHOvCinu<!
zHTi-nOjA8rS0Dr2$P4TVbz=R$e`{zzyvuJef6v8?8B8ZW|EXtpuxGw@JH0kKsk!J@
zl=0q2NvS;R&fNKP=u-4|(-7Hm^YH6Gw8XdY91=_VecdR=@ITudnfQ4N)*Lzb>=T=p
z_!(n`eaF)!@BKNdDqwD-b69jO6WGdZkT-VNb-LD7?@tK$QqQOi_1cd0O!suRTAgXA
z^PQB~#`#_H!QFtBhkGYzHk_AM3}z_Z!Sc)0vrSTM3)g|XiuFwI7%TGE?qq+kcc+&f
cv(pcT<d*+!>pp*;28=@nPgg&ebxsLQ08%5>{r~^~

delta 1168
zcmV;B1aJF`1fvO%BYy;HNkl<Zc%1E9-)me&6#nM^+P%A*G>!EKN>NIr{=f(gEf&#I
zP(f6D(HDyZB=irk?>_im3%(RYgdqA*d=W)KL8(ZsVk$;#DJ`Lh+G=XrWV83~&b@a=
z&fMLyDUudvof+Bv0=WZwXV1Cc&Y79-oVg5|kWy-W!M^7XoPWIQ>6fu33h~PR2k`di
zi>PnA6$|r+F*AGUwaxl6#_+}qyFSyg@9A{54PEk`BjB%Qf?O0vZ8||f$QTMpe0S<+
z#9?66wpnYNfYBdg$O;M3=@_%?R0vE>-J`CN?;Eq}3<2cGy?1U?ZC(hYcHIE;;Q0)V
zv6@kLoFTy6Z-2fK&Jd8L3Dy&i+iDSt=BhEfP7vS;fhh2i2#KXXu0mAIg@F?U6j4Q8
z7Z=Zf`94Hz&6sT`_5q&ffy)3nZzHQT(30kU7bix5OcQn8xA$R8`U0M|M7w!7K|mBm
zXm!{AmBNE4%;^Cq2w3ae_z0dM4$MWS_F#MUgHuo4NPm_t%pZPzX7&(TmzOd3<TT#-
z@-$X?hTlGY7so$(?-3pQq#tykJpu-y$!)@D2$0q%%|EmRkk%*7Puf4!9J+&oF#_71
zj?(%RvrK>L85oQa(9`%m&F>0~5zy24r1@RS!Wi|1v_5Hm(*CZ%iYK<T|3ASP0i^Ls
z>yzfsQh#@rLSqDw#wV>$nxC{k<p5lOIRaX1O6!y6M_&%WHjEL_iehAyDsrBKdx6RU
z3>5*S@k#5G=0{%+z&6Z<Kv5{IPay42Ie?)efHXd7{T|i~7C$zF_NM&tXJ0z0)8BSJ
zKs)ua{h8UaA?1eLKonKLIq$Y3)s|rhAyqu65r2{9xvqI_XcI8r7t47!K|)eDlM+Ft
z{A{A?197a{y?KDbp<avaJar$m37Fe|A5xy9nRb-cr=Z%qdm76ttGN4)NeCg4@(iBu
z<J*OwFacoCu7^;I%vFFlgEj%jPMlTOE6p|-t0D)(FDK4H&`FQe7ctqW;^OiZR2pM6
z6@RLGmwxya>#cGbe01mb|LD<f4%!5)2p=LZ;MW_FYFX*d19_R+zM2E^)=A_-s<ofR
zHH7W9`fS{{zZudd;Ow!Z|GMub`giaNT^F>VO~8$gvbm1`^)b0YU_^ieK3K(w00(@q
ziV*=0_+S-7Pk{CJ1?YT%PX8k>&J6GS0)K<RhyVwCu!<1@4)|adBLW=o!77HH0PBaP
z=@6ynS7>d7tP`-~`8ib}p|m*_P3k;_S09JhN#KudxprUVd*DTZYGq?t{i~1P*Rt=#
zad|3`Q0174CLt4$odi2>pTM6<Sy@_dCP=&Y@`NGHas=LB>I&8gn0svMTKo7nKYt>q
z2bi9|A2pAmQ7bD;qL4WE`(>Oze?e)FJ-Z*oE!~%^-qN&hoq#vLC{K*kRgIvEsGVc!
z>oeeafiSL>v$Pc5gH`22fB5}{f!TK=1gJnl#ZxMpB+P@)I}m<=qFY?O9@zj7Xj>=X
i(kJs}fy4#?{0&-Fd}<yBC<y=n00{s|MNUMnLSTZp(>{Oz

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window5.png b/Resources/Textures/Structures/Windows/window.rsi/window5.png
index df8dd36cf54e1eeb9e03f2c59d16196a74347996..df4ef650886770bca3ae09bcd7cc067227552802 100644
GIT binary patch
delta 642
zcmV-|0)73U2ATzsBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0xwBKK~#8N?VF)e12GVW4`db4D#SSq>I9mHsN@My3>E|e0hU4W
z1js%F8iB&#PM}&q)k62!y~(ACX=nG(O!Cd_?9I9VyCe)rx_?uFX`1GDJRVnz#iBYs
zoj&pFj>Ds-`uYB%$96eyyLUd%k2m-HxDmVDVNiHsG^r`2lnHPF^yR5erkB^TudE4N
z01f*<_?o*qZ~;UpJk5U#k`Ul92+s?kDyayd;IZ(k3j<sL1$K+@!)q>%Z~+w7FGf8)
zk-`+9grQOoPk+D#P{>$Wkjf$mqX^)hEkywLY}tB0;Oye|iXS&(+yCdcrAz_t*-`{>
z&z2&9yDFne9W6BK0-TVt>ERa?RRLc3YH$Bwt<b0m2!$s;Ki&p~MtcgZg=hLr4>am)
zKqP!Js0$!M;ZyhvK$r+%2H{_44|ne`vvYn0!%{$pgny?)QTJdJg{1%*^YwDx_G6z8
zMbVg#fYh*F1KQOT=+}bWra%Yn_tSB>+zUWsy#{oM1pi750uupp=(%DbAqCV0$YEzl
zLJDXL=st5qLJ}g>1UN%{O@do!R7XHaf?sIV*8opKsGz6|AV@;2(3l8FnIeFDwiE%}
zvjzTp0ekfQf-(iTXG;;lJzI(Z?l9<_AXXNnFal(A#4i&GZ~<~pz%9l^0$hOH6ObY-
zC8V+l_M0Oy30kBgK!{0DBMAZC5Fbd;1}=c^2+(nPNP-1$0dh|uAi)H<0QZ1&`G0pn
c%7Ci+18Fi5jjyEM0ssI207*qoM6N<$f@qr%%K!iX

delta 778
zcmV+l1NHox1)v6yBYy(tNkl<Zc%1E<J4_T&6o&t~GrP+y5ESen6xymJZb5B~+W2U&
zrlB`#VP|2l7Fya69}PCf#%F7^SQC^|Er=$X2uhS0b{==kxscGzEb1lajG6hGO?EST
z&i!*=bI*SrSdwL#)gN5GdFRzve;hgpaQ;*Wx1KK{h!cEye18|6*-KY;dj7__&QqKC
z%I4wSU}b0$a1<P+u(IBR2M16tTYPZ=!tbk4X#%&|M4$mZFu)q$V~v)>?6Jd8u8Y^*
zcX+h;2~Lu*#updh+0y5&Oh$kd$UF~iZ8xv{4dMcP3sXc<gsjnkX}3<{dwgk$3-Iyb
z?cDGGWChp_#D4|gYG@JStAI4M042yllv;oi<RD6^1h9TH`v*!T0N?&^o5~LX>t1(Z
zp?kvS`Rg-BtlsAx$F2#L?*Z%rNKAD7U>87QqU%RJ1WJ&DD7643$U&6K3&3_F)SbU}
zHTQ>^dsZ7ETUZ33#_vBnhmelEl?&wnP8_4zY;uI}3xDgG;9%P~pQElW!*Qg6EsG$I
zF{~VO?!PBl!*u5mbeeL7FNAdxq{g3~n!tyikNYp*WB$ck&hWXg3ZOPN&{jYiMbNGX
zfA1(~`23vMBIy(fGK>wjkZBEM8e_kf*}@l5`F#MN0LnGBfARp37l1qg#v33E>smy$
zfARp37k>b0f^h9;wFIErKY0KSw8H8wgY8DcEQ7=kZv;;km$$tEg0S|0^&m8JL0Gk|
zFqOayUxwz6a->iQTMv--0Tfa114@vCD7643$U&4^0PcWwX^cDI4pe>!h~F2u_~4C|
zzu>>WFCa~Ak`jnnNNti5pcbG6IfzmVP=Xvp5q~ey79EvU=E@BD2J$XVkuV%0hzqdK
zcL9IXH?W#+jz}HFZ1KhCfa3?padK+Xcm}XlJRvUu7vepDJOZtuVE{hPOi!4~5qc3@
zeDNMY9s%+SkY|9r1LPs#L|g#l5y-Uh43Kw#JOnfmvH;*Wtb^T!`Dp6<00000NkvXX
It^-0~g57m!n*aa+

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window6.png b/Resources/Textures/Structures/Windows/window.rsi/window6.png
index 13aaa2107eb3d7196a96e5530e1996c6cbe0b650..30629fcac2aec115a9940cbd378b6039b439491d 100644
GIT binary patch
delta 498
zcmZ3?+08ORxt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSK$uZf
z!>fUTfpLMSi(^Pd+}qi@9xQ<(t@CgByqdvtnWfvH<LZ{X2_}*{Y)2Cc54Z6~@hm!+
zWFX1=?O>8153}2Cw#kqEZzcuImpRxfTK1f){K*`Cx%&I5Vr36Lq}@MLyIJ|*Or6vB
zCaZ9!Mz$TD`Zn$R#%6yfE92R%)1NPoD6f-w|M1U>t^J#X78~etF)VXsJg`NBVTKqh
z!{tQ`2~i>pKHW?WnTFq)!?xertx+v8-*54y&XX%Y6vQ9-^}5kcZvS43JHOvCinu<!
zHTi-nOjA8rS0Dr2$P4TVbz=R$e`{zzyvuJef6v8?8B8ZW|EXtpuxGw@JH0kKsk!J@
zl=0q2NvS;R&fNKP=u-4|(-7Hm^YH6Gw8XdY91=_VecdR=@ITudnfQ4N)*Lzb>=T=p
z_!(n`eaF)!@BKNdDqwD-b69jO6WGdZkT-VNb-LD7?@tK$QqQOi_1cd0O!suRTAgXA
z^PQB~#`#_H!QFtBhkGYzHk_AM3}z_Z!Sc)0vrSTM3)g|XiuFwI7%TGE?qq+kcc+&f
cv(pcT<d*+!>pp*;28=@nPgg&ebxsLQ08%5>{r~^~

delta 1168
zcmV;B1aJF`1fvO%BYy;HNkl<Zc%1E9-)me&6#nM^+P%A*G>!EKN>NIr{=f(gEf&#I
zP(f6D(HDyZB=irk?>_im3%(RYgdqA*d=W)KL8(ZsVk$;#DJ`Lh+G=XrWV83~&b@a=
z&fMLyDUudvof+Bv0=WZwXV1Cc&Y79-oVg5|kWy-W!M^7XoPWIQ>6fu33h~PR2k`di
zi>PnA6$|r+F*AGUwaxl6#_+}qyFSyg@9A{54PEk`BjB%Qf?O0vZ8||f$QTMpe0S<+
z#9?66wpnYNfYBdg$O;M3=@_%?R0vE>-J`CN?;Eq}3<2cGy?1U?ZC(hYcHIE;;Q0)V
zv6@kLoFTy6Z-2fK&Jd8L3Dy&i+iDSt=BhEfP7vS;fhh2i2#KXXu0mAIg@F?U6j4Q8
z7Z=Zf`94Hz&6sT`_5q&ffy)3nZzHQT(30kU7bix5OcQn8xA$R8`U0M|M7w!7K|mBm
zXm!{AmBNE4%;^Cq2w3ae_z0dM4$MWS_F#MUgHuo4NPm_t%pZPzX7&(TmzOd3<TT#-
z@-$X?hTlGY7so$(?-3pQq#tykJpu-y$!)@D2$0q%%|EmRkk%*7Puf4!9J+&oF#_71
zj?(%RvrK>L85oQa(9`%m&F>0~5zy24r1@RS!Wi|1v_5Hm(*CZ%iYK<T|3ASP0i^Ls
z>yzfsQh#@rLSqDw#wV>$nxC{k<p5lOIRaX1O6!y6M_&%WHjEL_iehAyDsrBKdx6RU
z3>5*S@k#5G=0{%+z&6Z<Kv5{IPay42Ie?)efHXd7{T|i~7C$zF_NM&tXJ0z0)8BSJ
zKs)ua{h8UaA?1eLKonKLIq$Y3)s|rhAyqu65r2{9xvqI_XcI8r7t47!K|)eDlM+Ft
z{A{A?197a{y?KDbp<avaJar$m37Fe|A5xy9nRb-cr=Z%qdm76ttGN4)NeCg4@(iBu
z<J*OwFacoCu7^;I%vFFlgEj%jPMlTOE6p|-t0D)(FDK4H&`FQe7ctqW;^OiZR2pM6
z6@RLGmwxya>#cGbe01mb|LD<f4%!5)2p=LZ;MW_FYFX*d19_R+zM2E^)=A_-s<ofR
zHH7W9`fS{{zZudd;Ow!Z|GMub`giaNT^F>VO~8$gvbm1`^)b0YU_^ieK3K(w00(@q
ziV*=0_+S-7Pk{CJ1?YT%PX8k>&J6GS0)K<RhyVwCu!<1@4)|adBLW=o!77HH0PBaP
z=@6ynS7>d7tP`-~`8ib}p|m*_P3k;_S09JhN#KudxprUVd*DTZYGq?t{i~1P*Rt=#
zad|3`Q0174CLt4$odi2>pTM6<Sy@_dCP=&Y@`NGHas=LB>I&8gn0svMTKo7nKYt>q
z2bi9|A2pAmQ7bD;qL4WE`(>Oze?e)FJ-Z*oE!~%^-qN&hoq#vLC{K*kRgIvEsGVc!
z>oeeafiSL>v$Pc5gH`22fB5}{f!TK=1gJnl#ZxMpB+P@)I}m<=qFY?O9@zj7Xj>=X
i(kJs}fy4#?{0&-Fd}<yBC<y=n00{s|MNUMnLSTZp(>{Oz

diff --git a/Resources/Textures/Structures/Windows/window.rsi/window7.png b/Resources/Textures/Structures/Windows/window.rsi/window7.png
index 1a2e65fad78efe662cf60742e0d6afd2088f1e6b..0e02c2e8de00c8cbba348e75dd3a5b8dbce1d31b 100644
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!G)eKjv*CsZ)Y#$ZEz4cAa^W<!-lQ#pfO8v
zk`*I|OZ4T-zHxU{?R)1(UQ14{Ia>Qx{jql1nxza8-i#ZjF(v4-9*E*<*eb%1t;ulh
z(@(h%-|hZSoyTx3hyjNhED|r6zr=&}W6CY<`N)v;l&3B*C{zLHSO!m5KbLh*2~7YR
Cu2;wa

literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Up!qLLn`LHogK(~$bf;>T&0m+
zq(MM{$;p9H?!cu21G~6c<%#A0WA&$-W=}7f=QJ&~Q?8)4uJ7cJ-#<Ti9eY3N;Qt0j
z2EI@phJqDI3=N01KFidv3_r;3@m+F%0VjjZDhY-M0Y@1a+O=l$3%obd>n|^vw}0-p
zi<NeFHFE#)8ZaDK*ag;aP}Owt`Ohg28QtbT4~}61YG7lq2r-1qL(F#;Wd@r0!#?2)
z%Rl~xWQGQa0N9e>OeY`I9{^be)tM;zp1UGGK?m6&+hv)*nAU!itCLw)Z4C53gQu&X
J%Q~loCIB+RX~6&h

diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png
index df5805957d6b0d0b891e10d01cb5a46e4c36e95a..39ffd5be1fd6a117d57e55f02f9ac0cc33eb5ef5 100644
GIT binary patch
delta 693
zcmV;m0!sb#eBT9-BYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI
z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW
zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx
z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o+gecsz&)j)@6nB7H73mW37Ag7Y6d$N}B65M-ayn5=cUX
zj2g<Qz(SN(jeisqDcX;D_=g>Tl3X&m%3$PJKou$^#}EDozq>UHQ<H8|AO>{5*!IUL
z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT<rWBOtg9TwJ#`c@MbU0m4tZWJr$WrzsQ)
z!220}Qw|uq1^U+9-dg)OeE>4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t
z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GUBsDKFL2v*70NhDLK~z}7#nvqn
z!Y~v@(J#m<AXSJsd;}|D6_scf)kSm#s2W@aiUJA?stgRFB+dJYjW{<ilbHaD%X|MY
znz*$VMicM*UOwO*-)wh#qlw?oo!kUMH~^V|UpN3~H1XBi^G@I&e!E`ye*$7~0G-jq
zSzbX3PW}o~angV(I9b3{oFpIz&khLSZrF>#vjTEYo)tiaPYR&KlLM&nqyP>)I)Dq0
z3gE<x(v1gj<D)+!34Fd-h9@9}pN@y`07)DGW{P<C5uky;0yOZVbZDEpGSYWGthT8u
bYb~BdHo^L^ZdgJ90000<2SrXqu0mjf3}rH`

literal 15988
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
DaE5Ko

diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png
index 83737b8cefe39b1948b33192f9c553f14e70be24..bb5136c8b008ae84e286e5a38026adea5bc4b14e 100644
GIT binary patch
delta 659
zcmV;E0&M->e7*&cBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI
z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW
zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx
z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I
z$jGGTi9^I<v4iCfW+g)<o+gecsz&)j)@6nB7H73mW37Ag7Y6d$N}B65M-ayn5=cUX
zj2g<Qz(SN(jeisqDcX;D_=g>Tl3X&m%3$PJKou$^#}EDozq>UHQ<H8|AO>{5*!IUL
z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT<rWBOtg9TwJ#`c@MbU0m4tZWJr$WrzsQ)
z!220}Qw|uq1^U+9-dg)OeE>4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t
z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GUB{Sbi)dT<l0J}*<K~z}7#nUSi
z0x=Lp(bsE;LyW^muo6~+X1SvYgTjJ>f+E8t>CcOeIJdj10piO!KZJ>=lpsvJloB8C
zi64%qvoP`dWsciG4F?btu!aMego*F=*>?k5_-(oR1+?G*W?|wkSI~o-WnV!rZW=Ix
zn+1&GCIK2;9Z<oi*Ix^+3eZlj3b4Y50xa?F0BgJ}zyog%@WPt{Jn_u{Z~SjS1il&&
tg;xV2@t=Tb{40QgzXMn}00<KYfG2B~rKzhDTfP7Q002ovPDHLkV1ij2CqV!J

literal 15966
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
T+&>K<H>!JMPxP$~!+ZV$;QnZ1

diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png b/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png
deleted file mode 100644
index 024678fc209363462f2b44b707900f56c749dc56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 551
zcmV+?0@(eDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$;Ymb6R9J=WSHEk*Kp1_7xCN|8$yAPl!~GpuL`rsNagYuY2t}NVlS2_CgLIJM
z{~-P^5d;UPLnMkW0jV9##r(8Y(<;<AeRtoNyYKQIkGoW{SlrsSjY}Y%PD8Y98}$+c
z0F;{xU%|)goo}3Uo)ChRqA1&XiJ{is9Djr}VCW*6{R~9jnIuUVbaHM%r6nf1VXv`2
zpsLN?SO^wQrc1oM--9s*#+bku6SCRt*<)3kV=`Ta8Ven>JIv$xX^ff)P)a}fJf#!>
zKE1Wa<PBX!cbLapb>`bIr6|gFG#WvYB*?N1#uzB2yC!0EK`Di4nvuDvyrGNkT6~Z7
zdJRIzj)H(%1pxd50f69~&K(D8zs+}tdEeTh%`S<M1~_l$avqnrEbDLsQQY!h9LM`H
zd0CbL>}YTH9SQ;tbvEbU<bAka4MfC10-E@d29o4F2(E#0a{)p!@jl>*lh%X}*Q<e>
z5AYZ_AK1sh%?JLK4>)(YM0~(|$2_QkUSk7QGd*`W)4SNon&^VU(8s8?O$<6YsM-M^
z;I~%?iTOaSy@8>J-x{Hr$A=8wsxwqtGT{6|%d)t7Pab<8J+TdVUo1&O)uQL!27<rm
pFCMCdWRNNp3ft9cb)fg(#TS&@TbTH6xrYD%002ovPDHLkV1iA%_&Wdq

diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png b/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png
deleted file mode 100644
index 0d11fb19d36db7047aecdb29bc67d9cbc309e4a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 535
zcmV+y0_gpTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$(Md!>R9J=Wm$7c*KoEvMTUa{DM#2>?9JcivTyI4J9w4>5Ywj7Y;u+GUbDcIt
zULkK_+B*tw#Y$jBRw8_b*_>^1;2b82bo|w<|Iy4W|L7NMOsCT#&vQNkmSxe)^Bi?)
z03ffETEg&qP&;?c3n4JVFf7!iK^8CGeuX1oM?PQf9_i`H9LK?qe4P8IlQv#YtlDMG
zD(T!mv7T7Cu8Z-_KuT#!DNWaPky8Hid0UJ1#M-%FuQ}nxgTt?{Yx+PC1RMQ52m*jj
zHMcFVP}q^r#e>6=<^BQGm7>3mlO$=<)n=`E50C!n88uRHQ|8F)1R+EzL3LZxS!xb$
z2c)wUN{LKeP@gNkTJgGGI!kMk(@6dh>`0(>J4W+;{Bn6<2VT?lt(x!Shr=PTmHqCq
zl%U~IM{9n7ui^9Vz$-CyuoJCzpi9l0&^z!~AE0~9n|uwQcL&ZspkvNH@F#||5BwKC
z;QjD63WbNq;C9f752&lM9<V8Hiv0tmvlKh>>5raYG(2`EJUmuEdt~wAun*{euUmBH
z16jPlj{KeBj4%v~`F#HF50l!<NF$3EWG8J8#P#FL0L`E0Jszq;2#oP~T&z~B7NegA
ZzX9Q!OLX2m^49<W002ovPDHLkV1k5Q{I382

diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/meta.json b/Resources/Textures/Structures/cargo_pallets.rsi/meta.json
deleted file mode 100644
index 4751d95b9b..0000000000
--- a/Resources/Textures/Structures/cargo_pallets.rsi/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Created by TheShuEd (github) for Space Station 14)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "cargo_pallet_buy"
-        },
-        {
-            "name": "cargo_pallet_sell"
-        }
-    ]
-}
diff --git a/Resources/engineCommandPerms.yml b/Resources/engineCommandPerms.yml
index 15200531e3..51743c6e82 100644
--- a/Resources/engineCommandPerms.yml
+++ b/Resources/engineCommandPerms.yml
@@ -67,6 +67,7 @@
   - scene
   - replay_recording_stats
   - print_pvs_ack
+  - pvs_override_info
   - merge_grids
 
 
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 346156159a..24da641a07 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -184,6 +184,9 @@ binds:
 - function: OpenCharacterMenu
   type: State
   key: C
+- function: OpenLanguageMenu
+  type: State
+  key: L
 - function: TextCursorSelect
   # TextCursorSelect HAS to be above ExamineEntity
   # So that LineEdit receives it correctly.
diff --git a/Scripts/bat/buildAllDebug.bat b/Scripts/bat/buildAllDebug.bat
index 1e3cc5442e..5cf4952175 100755
--- a/Scripts/bat/buildAllDebug.bat
+++ b/Scripts/bat/buildAllDebug.bat
@@ -1,6 +1,7 @@
 @echo off
 cd ../../
 
+call python RUN_THIS.py
 call git submodule update --init --recursive
 call dotnet build -c Debug
 
diff --git a/Scripts/bat/buildAllRelease.bat b/Scripts/bat/buildAllRelease.bat
index 730b39d26e..6a8cbac664 100755
--- a/Scripts/bat/buildAllRelease.bat
+++ b/Scripts/bat/buildAllRelease.bat
@@ -1,6 +1,7 @@
 @echo off
 cd ../../
 
+call python RUN_THIS.py
 call git submodule update --init --recursive
 call dotnet build -c Release
 
diff --git a/Scripts/bat/buildAllTools.bat b/Scripts/bat/buildAllTools.bat
index 37db01f459..7c878cbabb 100755
--- a/Scripts/bat/buildAllTools.bat
+++ b/Scripts/bat/buildAllTools.bat
@@ -1,6 +1,7 @@
 @echo off
 cd ../../
 
+call python RUN_THIS.py
 call git submodule update --init --recursive
 call dotnet build -c Tools
 
diff --git a/Scripts/sh/buildAllDebug.sh b/Scripts/sh/buildAllDebug.sh
index 1e62ef7742..1ee457ff2a 100755
--- a/Scripts/sh/buildAllDebug.sh
+++ b/Scripts/sh/buildAllDebug.sh
@@ -7,5 +7,6 @@ fi
 
 cd ../../
 
+python RUN_THIS.py
 git submodule update --init --recursive
 dotnet build -c Debug
diff --git a/Scripts/sh/buildAllRelease.sh b/Scripts/sh/buildAllRelease.sh
index 3cfb84b76c..b3749ac28d 100755
--- a/Scripts/sh/buildAllRelease.sh
+++ b/Scripts/sh/buildAllRelease.sh
@@ -7,5 +7,6 @@ fi
 
 cd ../../
 
+python RUN_THIS.py
 git submodule update --init --recursive
 dotnet build -c Release
diff --git a/Scripts/sh/buildAllTools.sh b/Scripts/sh/buildAllTools.sh
index 551db74fcb..14a68487af 100755
--- a/Scripts/sh/buildAllTools.sh
+++ b/Scripts/sh/buildAllTools.sh
@@ -7,5 +7,6 @@ fi
 
 cd ../../
 
+python RUN_THIS.py
 git submodule update --init --recursive
 dotnet build -c Tools
diff --git a/Tools/changelogs/changelog.js b/Tools/changelog/changelog.js
similarity index 100%
rename from Tools/changelogs/changelog.js
rename to Tools/changelog/changelog.js
diff --git a/Tools/changelogs/package.json b/Tools/changelog/package.json
similarity index 68%
rename from Tools/changelogs/package.json
rename to Tools/changelog/package.json
index 1f0899df96..512a3624c8 100644
--- a/Tools/changelogs/package.json
+++ b/Tools/changelog/package.json
@@ -1,7 +1,5 @@
 {
     "name": "changelogs",
-    "author": "DEATHB4DEFEAT",
-    "license": "MIT",
     "dependencies": {
         "axios": "^1.3.4",
         "js-yaml": "^4.1.0"
diff --git a/Tools/prtitlecase/index.js b/Tools/prtitlecase/index.js
deleted file mode 100644
index 0d72b71131..0000000000
--- a/Tools/prtitlecase/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import axios from 'axios';
-import { titleCase } from 'title-case';
-
-if (process.env.GITHUB_TOKEN) axios.defaults.headers.common['Authorization'] = `token ${process.env.GITHUB_TOKEN}`;
-else throw new Error('BOT_TOKEN was not provided in repository secrets or GITHUB_TOKEN was not set correctly.');
-
-
-// Get PR title
-let prTitle = await axios.get(`https://api.github.com/repos/${process.env.GITHUB_REPOSITORY}/pulls/${process.env.PR_NUMBER}`)
-    .then(res => res.data.title);
-
-// Title case PR title
-console.log(`Old PR title: ${prTitle}`);
-prTitle = titleCase(prTitle);
-console.log(`New PR title: ${prTitle}`);
-
-// Update PR title
-await axios.patch(`https://api.github.com/repos/${process.env.GITHUB_REPOSITORY}/pulls/${process.env.PR_NUMBER}`,
-    { title: prTitle });
diff --git a/Tools/prtitlecase/package.json b/Tools/prtitlecase/package.json
deleted file mode 100644
index ecba01099f..0000000000
--- a/Tools/prtitlecase/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "prtitlecase",
-  "description": "Converts PR titles to Title Case using title-case package",
-  "type": "module",
-  "exports": "./index.js",
-  "author": "DEATHB4DEFEAT",
-  "license": "MIT",
-  "dependencies": {
-    "axios": "^1.7.2",
-    "title-case": "^4.3.1"
-  }
-}
diff --git a/shell.nix b/shell.nix
index 85e97a4283..e93db685da 100644
--- a/shell.nix
+++ b/shell.nix
@@ -7,7 +7,7 @@ in import (builtins.fetchTarball {
 
 let
   dependencies = with pkgs; [
-    dotnetCorePackages.sdk_8_0
+    dotnetCorePackages.sdk_8_0_1xx
     glfw
     SDL2
     libGL
@@ -41,6 +41,7 @@ let
     dbus
     at-spi2-core
     cups
+    python3
   ];
 in pkgs.mkShell {
   name = "space-station-14-devshell";

From a76045ef5d56fdebbc9eb195bf69857b2db83a2a Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 20:35:35 -0400
Subject: [PATCH 75/84] Merging with species listing

---
 Resources/Locale/en-US/loadouts/categories.ftl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index 55dbab656f..a6afe9df6c 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -1,6 +1,5 @@
 # Alphabetically ordered, except for Uncategorized since it is always first
 
-loadout-category-Uncategorized = Uncategorized
 loadout-category-Accessories = Accessories
 loadout-category-Eyes = Eyes
 loadout-category-Hands = Hands

From e467fdf4a0f3f77a9b2d4b4f535bb01e0a72dfe4 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 20:39:02 -0400
Subject: [PATCH 76/84] Character instead of Loadout now

---
 .../Prototypes/Loadouts/Jobs/medical.yml      | 38 ++++++++--------
 .../Prototypes/Loadouts/Jobs/science.yml      |  4 +-
 .../Prototypes/Loadouts/Jobs/security.yml     | 44 +++++++++----------
 .../Prototypes/Loadouts/Jobs/service.yml      |  2 +-
 Resources/Prototypes/Loadouts/hands.yml       |  2 +-
 Resources/Prototypes/Loadouts/species.yml     |  6 +--
 6 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml
index 0a010a52f8..02b71e8212 100644
--- a/Resources/Prototypes/Loadouts/Jobs/medical.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml
@@ -92,7 +92,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -107,7 +107,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -122,7 +122,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -137,7 +137,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -152,7 +152,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -166,7 +166,7 @@
   cost: 5
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -311,7 +311,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -326,7 +326,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -341,7 +341,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -356,7 +356,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -371,7 +371,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -386,7 +386,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -401,7 +401,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -416,7 +416,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -431,7 +431,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -445,7 +445,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Paramedic
@@ -461,7 +461,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Paramedic
@@ -477,14 +477,14 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Paramedic
         - ChiefMedicalOfficer
         - MedicalIntern
         - Brigmedic
-    - !type:LoadoutTraitRequirement
+    - !type:CharacterTraitRequirement
       trait: Nearsighted
   items:
     - ClothingEyesPrescriptionMedHud
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
index 406c3dd116..a9a7c463ac 100644
--- a/Resources/Prototypes/Loadouts/Jobs/science.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -91,7 +91,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
@@ -105,7 +105,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index ca6fe6499d..cf6d8c32a5 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -5,7 +5,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - SecurityCadet
@@ -33,7 +33,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - SecurityCadet
@@ -47,7 +47,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - SecurityCadet
@@ -109,7 +109,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Warden
   items:
@@ -121,7 +121,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Warden
   items:
@@ -133,7 +133,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Warden
   items:
@@ -145,7 +145,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Warden
   items:
@@ -157,7 +157,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -169,7 +169,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -181,7 +181,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Detective
         - SecurityOfficer
@@ -196,7 +196,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Detective
         - SecurityOfficer
@@ -240,7 +240,7 @@
   category: Jobs
   cost: 7
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
@@ -257,7 +257,7 @@
   category: Jobs
   cost: 6
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
@@ -276,7 +276,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
@@ -291,7 +291,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
@@ -306,7 +306,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
@@ -324,7 +324,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
@@ -338,7 +338,7 @@
   category: Jobs
   cost: 3
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
@@ -354,7 +354,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Detective
         - SecurityOfficer
@@ -370,16 +370,16 @@
   category: Jobs
   cost: 8 ## TODO: Make this replace the secoff handgun, and thus also make it cheaper
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
         - HeadOfSecurity
         - Brigmedic
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobSecurityOfficer
       min: 36000 # 10 hours
-    - !type:LoadoutSpeciesRequirement
+    - !type:CharacterSpeciesRequirement
       species:
         - Oni
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml
index 31cabcd302..ed6107db9e 100644
--- a/Resources/Prototypes/Loadouts/Jobs/service.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/service.yml
@@ -193,7 +193,7 @@
   category: Jobs
   cost: 8
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Musician
   items:
diff --git a/Resources/Prototypes/Loadouts/hands.yml b/Resources/Prototypes/Loadouts/hands.yml
index 782810f47e..3d9b8f570c 100644
--- a/Resources/Prototypes/Loadouts/hands.yml
+++ b/Resources/Prototypes/Loadouts/hands.yml
@@ -84,7 +84,7 @@
   cost: 4
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Passenger
   items:
diff --git a/Resources/Prototypes/Loadouts/species.yml b/Resources/Prototypes/Loadouts/species.yml
index e31daca194..8c7bd22858 100644
--- a/Resources/Prototypes/Loadouts/species.yml
+++ b/Resources/Prototypes/Loadouts/species.yml
@@ -3,7 +3,7 @@
   category: Species
   cost: 0
   requirements:
-    - !type:LoadoutSpeciesRequirement
+    - !type:CharacterSpeciesRequirement
       species:
         - SlimePerson
         - Vox
@@ -15,7 +15,7 @@
   category: Species
   cost: 1
   requirements:
-    - !type:LoadoutSpeciesRequirement
+    - !type:CharacterSpeciesRequirement
       species:
         - SlimePerson
         - Vox
@@ -27,7 +27,7 @@
   category: Species
   cost: 3
   requirements:
-    - !type:LoadoutSpeciesRequirement
+    - !type:CharacterSpeciesRequirement
       species:
         - SlimePerson
         - Vox

From 4bd700cc52d1ee49546df9fd68db488925013cfb Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 20:42:30 -0400
Subject: [PATCH 77/84] Update categories.yml

---
 Resources/Prototypes/Loadouts/categories.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Resources/Prototypes/Loadouts/categories.yml b/Resources/Prototypes/Loadouts/categories.yml
index 7942b4bdf9..9e0865407e 100644
--- a/Resources/Prototypes/Loadouts/categories.yml
+++ b/Resources/Prototypes/Loadouts/categories.yml
@@ -1,8 +1,5 @@
 # Alphabetically ordered, except for Uncategorized since it is always first
 
-- type: loadoutCategory
-  id: Uncategorized
-
 - type: loadoutCategory
   id: Accessories
 

From c43866b740cebf5f690ace5e736c5220e393e796 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 20:48:30 -0400
Subject: [PATCH 78/84] Traits plural and species singular

---
 Resources/Prototypes/Loadouts/Jobs/medical.yml |  3 ++-
 Resources/Prototypes/Loadouts/species.yml      | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml
index 02b71e8212..aa177056df 100644
--- a/Resources/Prototypes/Loadouts/Jobs/medical.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml
@@ -485,6 +485,7 @@
         - MedicalIntern
         - Brigmedic
     - !type:CharacterTraitRequirement
-      trait: Nearsighted
+      traits:
+        - Nearsighted
   items:
     - ClothingEyesPrescriptionMedHud
diff --git a/Resources/Prototypes/Loadouts/species.yml b/Resources/Prototypes/Loadouts/species.yml
index 8c7bd22858..1d2fb58dc0 100644
--- a/Resources/Prototypes/Loadouts/species.yml
+++ b/Resources/Prototypes/Loadouts/species.yml
@@ -4,9 +4,9 @@
   cost: 0
   requirements:
     - !type:CharacterSpeciesRequirement
-      species:
-        - SlimePerson
-        - Vox
+      species: SlimePerson
+    - !type:CharacterSpeciesRequirement
+      species: Vox
   items:
     - EmergencyNitrogenTankFilled
 
@@ -16,9 +16,9 @@
   cost: 1
   requirements:
     - !type:CharacterSpeciesRequirement
-      species:
-        - SlimePerson
-        - Vox
+      species: SlimePerson
+    - !type:CharacterSpeciesRequirement
+      species: Vox
   items:
     - ExtendedEmergencyNitrogenTankFilled
 
@@ -28,8 +28,8 @@
   cost: 3
   requirements:
     - !type:CharacterSpeciesRequirement
-      species:
-        - SlimePerson
-        - Vox
+      species: SlimePerson
+    - !type:CharacterSpeciesRequirement
+      species: Vox
   items:
     - DoubleEmergencyNitrogenTankFilled

From 8d55d8c4ce6a56757f69b0e9ab8147777756a258 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 20:53:39 -0400
Subject: [PATCH 79/84] Update security.yml

---
 Resources/Prototypes/Loadouts/Jobs/security.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index cf6d8c32a5..0489b74f9d 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -246,7 +246,7 @@
         - Warden
         - HeadOfSecurity
         - Brigmedic
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobSecurityOfficer
       min: 21600 # 6 hours
   items:
@@ -263,7 +263,7 @@
         - Warden
         - HeadOfSecurity
         - Brigmedic
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobSecurityOfficer
       min: 7200 # 2 hours
   items:
@@ -312,8 +312,9 @@
         - Warden
         - HeadOfSecurity
         - Brigmedic
-    - !type:LoadoutTraitRequirement
-      trait: Nearsighted
+    - !type:CharacterTraitRequirement
+      traits:
+        - Nearsighted
   items:
     - ClothingEyesPrescriptionHudSecurity
 
@@ -380,7 +381,6 @@
       tracker: JobSecurityOfficer
       min: 36000 # 10 hours
     - !type:CharacterSpeciesRequirement
-      species:
-        - Oni
+      species: Oni
   items:
     - Truncheon

From f4289f94b25ca1694acfea3a2595fe6a6f2fe08e Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 21:11:34 -0400
Subject: [PATCH 80/84] Mistake in death code that wasn't caught by the tests
 until an item failed it

---
 Resources/Locale/en-US/customization/character-requirements.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl
index b073bdb773..efa1b7e767 100644
--- a/Resources/Locale/en-US/customization/character-requirements.ftl
+++ b/Resources/Locale/en-US/customization/character-requirements.ftl
@@ -9,7 +9,7 @@ character-species-requirement = You must {$inverted ->
 character-trait-requirement = You must {$inverted ->
     [true] not have
     *[other] have
-} the trait [color=lightblue]{$trait}[/color]
+} one of these traits: [color=lightblue]{$traits}[/color]
 character-backpack-type-requirement = You must {$inverted ->
     [true] not use
     *[other] use

From e6e69c06de14a6ecb1f543816a797c73a7eba13f Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 21:37:52 -0400
Subject: [PATCH 81/84] Now featuring trait points

---
 Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl   | 4 ----
 Resources/Locale/en-US/traits/categories.ftl               | 1 +
 Resources/Locale/en-US/traits/traits.ftl                   | 5 +++++
 Resources/Prototypes/Traits/categories.yml                 | 3 +++
 Resources/Prototypes/{Nyanotrasen => }/Traits/psionics.yml | 4 ++--
 5 files changed, 11 insertions(+), 6 deletions(-)
 rename Resources/Prototypes/{Nyanotrasen => }/Traits/psionics.yml (54%)

diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
index d46a05e9c9..02800953b1 100644
--- a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
@@ -70,7 +70,3 @@ action-description-psychokinesis = Bend the fabric of space to instantly move ac
 
 action-name-rf-sensitivity = Toggle RF Sensitivity
 action-desc-rf-sensitivity = Toggle your ability to interpret radio waves on and off.
-
-trait-latent-psychic-desc = Your mind and soul are open to the noosphere, allowing for a limited use of Telepathy.
-                            Thus, you are eligible for potentially receiving psychic powers.
-                            It is possible that you may be hunted by otherworldly forces, so consider keeping your powers a secret.
diff --git a/Resources/Locale/en-US/traits/categories.ftl b/Resources/Locale/en-US/traits/categories.ftl
index 56f0adeb47..153f8d0170 100644
--- a/Resources/Locale/en-US/traits/categories.ftl
+++ b/Resources/Locale/en-US/traits/categories.ftl
@@ -6,3 +6,4 @@ trait-category-Mental = Mental
 trait-category-Physical = Physical
 trait-category-Speech = Speech
 trait-category-Visual = Visual
+trait-category-Psionic = Psionic
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index e9163bdb54..bfda7e48be 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -31,3 +31,8 @@ trait-description-SocialAnxiety = You are anxious when you speak and stutter.
 
 trait-name-Snoring = Snoring
 trait-description-Snoring = You will snore while sleeping.
+
+trait-name-LatentPsychic = Latent Psychic
+trait-description-LatentPsychic = Your mind and soul are open to the noosphere, allowing for a limited use of Telepathy.
+                                  Thus, you are eligible for potentially receiving psychic powers.
+                                  It is possible that you may be hunted by otherworldly forces, so consider keeping your powers a secret.
diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml
index ba3fd7b345..617aa5f2f9 100644
--- a/Resources/Prototypes/Traits/categories.yml
+++ b/Resources/Prototypes/Traits/categories.yml
@@ -17,3 +17,6 @@
 
 - type: traitCategory
   id: Visual
+
+- type: traitCategory
+  id: Psionic
diff --git a/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml b/Resources/Prototypes/Traits/psionics.yml
similarity index 54%
rename from Resources/Prototypes/Nyanotrasen/Traits/psionics.yml
rename to Resources/Prototypes/Traits/psionics.yml
index 5fef342770..01c8a5750e 100644
--- a/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml
+++ b/Resources/Prototypes/Traits/psionics.yml
@@ -1,6 +1,6 @@
 - type: trait
   id: LatentPsychic
-  name: Latent Psychic
-  description: trait-latent-psychic-desc
+  category: Psionic
+  points: -1
   components:
     - type: PotentialPsionic

From a1d2081185bb35c365aee18e4621f22c446f7ea0 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 21 Jun 2024 18:39:47 -0400
Subject: [PATCH 82/84] Update loadouts per feedback

---
 .../Prototypes/Loadouts/Jobs/engineering.yml  |  13 --
 .../Prototypes/Loadouts/Jobs/medical.yml      |  30 ----
 .../Prototypes/Loadouts/Jobs/science.yml      |  28 ++++
 .../Prototypes/Loadouts/Jobs/security.yml     |  71 +++------
 Resources/Prototypes/Loadouts/categories.yml  |   9 --
 Resources/Prototypes/Loadouts/hands.yml       |   2 +-
 Resources/Prototypes/Loadouts/head.yml        |  17 --
 Resources/Prototypes/Loadouts/items.yml       |  45 +-----
 Resources/Prototypes/Loadouts/neck.yml        |  72 ---------
 .../Prototypes/Loadouts/outerClothing.yml     |  22 ---
 Resources/Prototypes/Loadouts/shoes.yml       |   6 +-
 Resources/Prototypes/Loadouts/uniform.yml     | 145 +++++++++++++++---
 12 files changed, 173 insertions(+), 287 deletions(-)

diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
index 44ef2262bc..01b044299b 100644
--- a/Resources/Prototypes/Loadouts/Jobs/engineering.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
@@ -64,19 +64,6 @@
   items:
     - ClothingUniformJumpsuitSeniorEngineer
 
-- type: loadout
-  id: LoadoutEngineeringChickenSuit # :)
-  category: Jobs
-  cost: 3
-  exclusive: true
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - AtmosphericTechnician
-  items:
-    - ClothingOuterSuitChicken
-    - ClothingHeadHatChickenhead
-
 - type: loadout
   id: LoadoutEngineeringEyesMeson
   category: Jobs
diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml
index aa177056df..6dcce11d09 100644
--- a/Resources/Prototypes/Loadouts/Jobs/medical.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml
@@ -131,21 +131,6 @@
   items:
     - UniformScrubsColorPink
 
-- type: loadout
-  id: LoadoutMedicalUniformScrubsRainbow
-  category: Jobs
-  cost: 2
-  exclusive: true
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - MedicalDoctor
-        - Chemist
-        - Paramedic
-        - MedicalIntern
-  items:
-    - UniformScrubsColorRainbow
-
 - type: loadout
   id: LoadoutMedicalUniformScrubsCybersun
   category: Jobs
@@ -395,21 +380,6 @@
   items:
     - ClothingHeadHatSurgcapPink
 
-- type: loadout
-  id: LoadoutMedicalHeadSurgcapRainbow
-  category: Jobs
-  cost: 2
-  exclusive: true
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - MedicalDoctor
-        - Chemist
-        - Paramedic
-        - MedicalIntern
-  items:
-    - ClothingHeadHatSurgcapRainbow
-
 - type: loadout
   id: LoadoutMedicalHeadSurgcapWhite
   category: Jobs
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
index a9a7c463ac..b9c815a15b 100644
--- a/Resources/Prototypes/Loadouts/Jobs/science.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -112,3 +112,31 @@
         - ResearchDirector
   items:
     - ClothingEyesEyepatchHudDiag
+
+## Robes
+- type: loadout
+  id: LoadoutOuterRobeTechPriest
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterRobeTechPriest
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+
+- type: loadout
+  id: LoadoutHeadHoodTechPriest
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadTechPriest
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index 0489b74f9d..e6a6693ec1 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -234,41 +234,6 @@
   items:
     - ClothingShoesBootsJack
 
-## Items
-- type: loadout
-  id: LoadoutItemsSpareHandgunMagazine
-  category: Jobs
-  cost: 7
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - SecurityOfficer
-        - Warden
-        - HeadOfSecurity
-        - Brigmedic
-    - !type:CharacterPlaytimeRequirement
-      tracker: JobSecurityOfficer
-      min: 21600 # 6 hours
-  items:
-    - MagazinePistol
-
-- type: loadout
-  id: LoadoutItemsSpareHandgunMagazineRubber
-  category: Jobs
-  cost: 6
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - SecurityOfficer
-        - Warden
-        - HeadOfSecurity
-        - Brigmedic
-    - !type:CharacterPlaytimeRequirement
-      tracker: JobSecurityOfficer
-      min: 7200 # 2 hours
-  items:
-    - MagazinePistolRubber
-
 ## Eyes
 - type: loadout
   id: LoadoutSecurityEyesHudSecurity
@@ -366,21 +331,21 @@
     - ClothingBeltSecurityWebbingFilled
 
 ## Species
-- type: loadout
-  id: LoadoutSecurityEquipmentTruncheon
-  category: Jobs
-  cost: 8 ## TODO: Make this replace the secoff handgun, and thus also make it cheaper
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - SecurityOfficer
-        - Warden
-        - HeadOfSecurity
-        - Brigmedic
-    - !type:CharacterPlaytimeRequirement
-      tracker: JobSecurityOfficer
-      min: 36000 # 10 hours
-    - !type:CharacterSpeciesRequirement
-      species: Oni
-  items:
-    - Truncheon
+#- type: loadout ##Uncomment this and reassess points when we can make it replace the secoff duty pistol
+#  id: LoadoutSecurityEquipmentTruncheon
+#  category: Jobs
+#  cost: 8 ## TODO: Make this replace the secoff handgun, and thus also make it cheaper
+#  requirements:
+#    - !type:CharacterJobRequirement
+#      jobs:
+#        - SecurityOfficer
+#        - Warden
+#        - HeadOfSecurity
+#        - Brigmedic
+#    - !type:CharacterPlaytimeRequirement
+#      tracker: JobSecurityOfficer
+#      min: 36000 # 10 hours
+#    - !type:CharacterSpeciesRequirement
+#      species: Oni
+#  items:
+#    - Truncheon
diff --git a/Resources/Prototypes/Loadouts/categories.yml b/Resources/Prototypes/Loadouts/categories.yml
index 9e0865407e..4c959bfbda 100644
--- a/Resources/Prototypes/Loadouts/categories.yml
+++ b/Resources/Prototypes/Loadouts/categories.yml
@@ -1,8 +1,5 @@
 # Alphabetically ordered, except for Uncategorized since it is always first
 
-- type: loadoutCategory
-  id: Accessories
-
 - type: loadoutCategory
   id: Eyes
 
@@ -18,9 +15,6 @@
 - type: loadoutCategory
   id: Jobs
 
-- type: loadoutCategory
-  id: Mask
-
 - type: loadoutCategory
   id: Neck
 
@@ -33,8 +27,5 @@
 - type: loadoutCategory
   id: Species
 
-- type: loadoutCategory
-  id: Uncategorized
-
 - type: loadoutCategory
   id: Uniform
diff --git a/Resources/Prototypes/Loadouts/hands.yml b/Resources/Prototypes/Loadouts/hands.yml
index 3d9b8f570c..3604678d38 100644
--- a/Resources/Prototypes/Loadouts/hands.yml
+++ b/Resources/Prototypes/Loadouts/hands.yml
@@ -88,7 +88,7 @@
       jobs:
         - Passenger
   items:
-    - ClothingHandsGlovesColorYellow
+    - ClothingHandsGlovesColorYellowBudget
 
 - type: loadout
   id: LoadoutHandsGlovesLeather
diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/head.yml
index 7f63ccccf0..25cb4dadf1 100644
--- a/Resources/Prototypes/Loadouts/head.yml
+++ b/Resources/Prototypes/Loadouts/head.yml
@@ -271,20 +271,3 @@
   exclusive: true
   items:
     - ClothingHeadBandBrown
-
-## Hoods
-- type: loadout
-  id: LoadoutHeadHoodBrown
-  category: Head
-  cost: 1
-  exclusive: true
-  items:
-    - ClothingHeadHoodBrown
-
-- type: loadout
-  id: LoadoutHeadHoodTechPriest
-  category: Head
-  cost: 1
-  exclusive: true
-  items:
-    - ClothingHeadTechPriest
diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/items.yml
index 752f9adf3f..072061d2e2 100644
--- a/Resources/Prototypes/Loadouts/items.yml
+++ b/Resources/Prototypes/Loadouts/items.yml
@@ -69,49 +69,6 @@
   items:
     - Matchbox
 
-## Plushies
-- type: loadout
-  id: LoadoutItemPlushieSharkBlue
-  category: Items
-  cost: 2
-  items:
-    - PlushieSharkBlue
-
-- type: loadout
-  id: LoadoutItemPlushieSharkPink
-  category: Items
-  cost: 2
-  items:
-    - PlushieSharkPink
-
-- type: loadout
-  id: LoadoutItemPlushieSharkGrey
-  category: Items
-  cost: 2
-  items:
-    - PlushieSharkGrey
-
-- type: loadout
-  id: LoadoutItemPlushieCarp
-  category: Items
-  cost: 2
-  items:
-    - PlushieCarp
-
-- type: loadout
-  id: LoadoutItemPlushieLizard
-  category: Items
-  cost: 2
-  items:
-    - PlushieLizard
-
-- type: loadout
-  id: LoadoutItemPlushieMoth
-  category: Items
-  cost: 2
-  items:
-    - PlushieMoth
-
 ## Instruments
 - type: loadout
   id: LoadoutItemMicrophoneInstrument
@@ -222,7 +179,7 @@
 - type: loadout
   id: LoadoutItemsEmergencyCrowbar
   category: Items
-  cost: 1
+  cost: 3
   items:
     - CrowbarRed
 
diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml
index c6207dfdde..eb933de29e 100644
--- a/Resources/Prototypes/Loadouts/neck.yml
+++ b/Resources/Prototypes/Loadouts/neck.yml
@@ -102,75 +102,3 @@
   exclusive: true
   items:
     - ClothingNeckTransPin
-
-- type: loadout
-  id: LoadoutItemsPrideCloakTrans
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakTrans
-
-- type: loadout
-  id: LoadoutItemsPrideCloakAro
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakAro
-
-- type: loadout
-  id: LoadoutItemsPrideCloakAce
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakAce
-
-- type: loadout
-  id: LoadoutItemsPrideCloakBi
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakBi
-
-- type: loadout
-  id: LoadoutItemsPrideCloakIntersex
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakIntersex
-
-- type: loadout
-  id: LoadoutItemsPrideCloakEnby
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakEnby
-
-- type: loadout
-  id: LoadoutItemsPrideCloakPan
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakPan
-
-- type: loadout
-  id: LoadoutItemsPrideCloakGay
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakGay
-
-- type: loadout
-  id: LoadoutItemsPrideCloakLesbian
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakLesbian
diff --git a/Resources/Prototypes/Loadouts/outerClothing.yml b/Resources/Prototypes/Loadouts/outerClothing.yml
index 83d1fb30d4..a5932214ce 100644
--- a/Resources/Prototypes/Loadouts/outerClothing.yml
+++ b/Resources/Prototypes/Loadouts/outerClothing.yml
@@ -1,10 +1,3 @@
-- type: loadout
-  id: LoadoutOuterGhostSheet
-  category: Outer
-  cost: 2
-  items:
-    - ClothingOuterGhostSheet
-
 - type: loadout
   id: LoadoutOuterCoatBomberjacket
   category: Outer
@@ -61,21 +54,6 @@
   items:
     - ClothingOuterVestValet
 
-## Robes
-- type: loadout
-  id: LoadoutOuterRobeBrown
-  category: Outer
-  cost: 2
-  items:
-    - ClothingOuterRobeBrown
-
-- type: loadout
-  id: LoadoutOuterRobeTechPriest
-  category: Outer
-  cost: 2
-  items:
-    - ClothingOuterRobeTechPriest
-
 ## Letterman Jackets
 - type: loadout
   id: LoadoutOuterCoatLettermanBlue
diff --git a/Resources/Prototypes/Loadouts/shoes.yml b/Resources/Prototypes/Loadouts/shoes.yml
index 240568eff3..3c2e21e631 100644
--- a/Resources/Prototypes/Loadouts/shoes.yml
+++ b/Resources/Prototypes/Loadouts/shoes.yml
@@ -140,10 +140,14 @@
 - type: loadout
   id: LoadoutShoesSlippersDuck
   category: Shoes
-  cost: 1
+  cost: 2
   exclusive: true
   items:
     - ClothingShoeSlippersDuck
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Clown
 
 - type: loadout
   id: LoadoutShoesLeather
diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml
index 1b8e7ab1c3..be293a0e38 100644
--- a/Resources/Prototypes/Loadouts/uniform.yml
+++ b/Resources/Prototypes/Loadouts/uniform.yml
@@ -19,6 +19,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBlack
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBlack
@@ -27,6 +31,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBlack
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorBlue
@@ -35,6 +43,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBlue
@@ -43,6 +55,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorGreen
@@ -51,6 +67,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorGreen
@@ -59,6 +79,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorOrange
@@ -67,6 +91,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorOrange
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorOrange
@@ -75,6 +103,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorOrange
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorPink
@@ -83,6 +115,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorPink
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorPink
@@ -91,6 +127,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorPink
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorRed
@@ -99,6 +139,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorRed
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorRed
@@ -107,6 +151,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorRed
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorWhite
@@ -115,6 +163,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorWhite
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorWhite
@@ -123,6 +175,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorWhite
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorYellow
@@ -131,6 +187,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorYellow
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorYellow
@@ -139,6 +199,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorYellow
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorDarkBlue
@@ -147,6 +211,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorDarkBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorDarkBlue
@@ -155,6 +223,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorDarkBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorTeal
@@ -163,6 +235,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorTeal
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorTeal
@@ -171,6 +247,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorTeal
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorPurple
@@ -179,6 +259,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorPurple
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorPurple
@@ -187,6 +271,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorPurple
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorDarkGreen
@@ -195,6 +283,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorDarkGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorDarkGreen
@@ -203,6 +295,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorDarkGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorLightBrown
@@ -211,6 +307,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorLightBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorLightBrown
@@ -219,6 +319,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorLightBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorBrown
@@ -227,6 +331,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBrown
@@ -235,6 +343,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorMaroon
@@ -243,6 +355,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorMaroon
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorMaroon
@@ -251,14 +367,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorMaroon
-
-- type: loadout
-  id: LoadoutUniformJumpsuitColorRainbow
-  category: Uniform
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingUniformColorRainbow
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 ## Kendo
 - type: loadout
@@ -318,23 +430,6 @@
   items:
     - ClothingKimonoGreen
 
-## School Uniforms
-- type: loadout
-  id: LoadoutUniformSchoolgirlDusk
-  category: Uniform
-  cost: 2
-  exclusive: true
-  items:
-    - UniformSchoolgirlDusk
-
-- type: loadout
-  id: LoadoutUniformSchoolgirlBlazerTan
-  category: Uniform
-  cost: 2
-  exclusive: true
-  items:
-    - UniformSchoolgirlBlazerTan
-
 ## Gakuran
 - type: loadout
   id: LoadoutUniformSchoolGakuranBlack

From 586aaa4dfbe0e88736b7497c2d5e9bf0b01238d8 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sat, 22 Jun 2024 13:15:15 -0400
Subject: [PATCH 83/84] Mass Contests

---
 Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index 8a44b99787..36c539bcb9 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -141,12 +141,6 @@
     understands:
     - GalacticCommon
     - SolCommon
-  - type: Tag
-    tags:
-    - CanPilot
-    - FootstepSound
-    - DoorBumpOpener
-    - ShoesRequiredStepTriggerImmune
 
 - type: entity
   save: false

From 7255f1dd4ac4069b9cf52717bfd5f3d96e8a554b Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sat, 22 Jun 2024 13:36:04 -0400
Subject: [PATCH 84/84] Update trash_drinks.yml

---
 .../Objects/Consumable/Drinks/trash_drinks.yml      | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
index ff965c24f0..2c190c270e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
@@ -156,19 +156,6 @@
       drink:
         maxVol: 100
 
-- type: entity
-  name: base empty bottle
-  id: DrinkCartonBaseLargeEmpty
-  parent: DrinkCartonBaseEmpty
-  abstract: true
-  components:
-  - type: Item
-    size: Normal
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 100
-
 # Containers
 - type: entity
   name: Jailbreaker Verte bottle