diff --git a/Content.Server/Explosion/Components/ExplosiveComponent.cs b/Content.Server/Explosion/Components/ExplosiveComponent.cs
index 04a08955a35..2b27a89d9db 100644
--- a/Content.Server/Explosion/Components/ExplosiveComponent.cs
+++ b/Content.Server/Explosion/Components/ExplosiveComponent.cs
@@ -81,6 +81,13 @@ public sealed partial class ExplosiveComponent : Component
     [DataField("deleteAfterExplosion")]
     public bool? DeleteAfterExplosion;
 
+    /// <summary>
+    /// Whether to not set <see cref="Exploded"/> to true, allowing it to explode multiple times.
+    /// This should never be used if it is damageable.
+    /// </summary>
+    [DataField]
+    public bool Repeatable;
+
     /// <summary>
     ///     Avoid somehow double-triggering this explosion (e.g. by damaging this entity from its own explosion.
     /// </summary>
diff --git a/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs b/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
new file mode 100644
index 00000000000..cc08de53f90
--- /dev/null
+++ b/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
@@ -0,0 +1,25 @@
+using Content.Server.Explosion.EntitySystems;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server.Explosion.Components;
+
+/// <summary>
+/// Constantly triggers after being added to an entity.
+/// </summary>
+[RegisterComponent, Access(typeof(TriggerSystem))]
+[AutoGenerateComponentPause]
+public sealed partial class RepeatingTriggerComponent : Component
+{
+    /// <summary>
+    /// How long to wait between triggers.
+    /// The first trigger starts this long after the component is added.
+    /// </summary>
+    [DataField]
+    public TimeSpan Delay = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// When the next trigger will be.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan NextTrigger;
+}
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 1f91b28ec2b..eb2cf9b6548 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -165,7 +165,7 @@ public void TriggerExplosive(EntityUid uid, ExplosiveComponent? explosive = null
         if (explosive.Exploded)
             return;
 
-        explosive.Exploded = true;
+        explosive.Exploded = !explosive.Repeatable;
 
         // Override the explosion intensity if optional arguments were provided.
         if (radius != null)
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index eb5aeec8158..37c63438152 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -98,6 +98,7 @@ public override void Initialize()
             SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredOffEvent>(OnStepTriggered);
             SubscribeLocalEvent<TriggerOnSlipComponent, SlipEvent>(OnSlipTriggered);
             SubscribeLocalEvent<TriggerWhenEmptyComponent, OnEmptyGunShotEvent>(OnEmptyTriggered);
+            SubscribeLocalEvent<RepeatingTriggerComponent, MapInitEvent>(OnRepeatInit);
 
             SubscribeLocalEvent<SpawnOnTriggerComponent, TriggerEvent>(OnSpawnTrigger);
             SubscribeLocalEvent<DeleteOnTriggerComponent, TriggerEvent>(HandleDeleteTrigger);
@@ -278,6 +279,11 @@ private void OnEmptyTriggered(EntityUid uid, TriggerWhenEmptyComponent component
             Trigger(uid, args.EmptyGun);
         }
 
+        private void OnRepeatInit(Entity<RepeatingTriggerComponent> ent, ref MapInitEvent args)
+        {
+            ent.Comp.NextTrigger = _timing.CurTime + ent.Comp.Delay;
+        }
+
         public bool Trigger(EntityUid trigger, EntityUid? user = null)
         {
             var triggerEvent = new TriggerEvent(trigger, user);
@@ -360,6 +366,7 @@ public override void Update(float frameTime)
             UpdateProximity();
             UpdateTimer(frameTime);
             UpdateTimedCollide(frameTime);
+            UpdateRepeat();
         }
 
         private void UpdateTimer(float frameTime)
@@ -394,5 +401,19 @@ private void UpdateTimer(float frameTime)
                     _appearance.SetData(uid, TriggerVisuals.VisualState, TriggerVisualState.Unprimed, appearance);
             }
         }
+
+        private void UpdateRepeat()
+        {
+            var now = _timing.CurTime;
+            var query = EntityQueryEnumerator<RepeatingTriggerComponent>();
+            while (query.MoveNext(out var uid, out var comp))
+            {
+                if (comp.NextTrigger > now)
+                    continue;
+
+                comp.NextTrigger = now + comp.Delay;
+                Trigger(uid);
+            }
+        }
     }
 }
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
index 5fe5fe1024b..16aaae9b45b 100644
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -72,7 +72,6 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "Maintenance",
         "Medical",
         "Mercenary", // Frontier
-        "Pilot", // Frontier
         //"Quartermaster",
         //"Research",
         //"ResearchDirector",
diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index 5a0fee31131..736d9e6ac6b 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -164,7 +164,7 @@ public bool IsAllowed(
             return IsAllowedInternal(access, stationKeys, reader);
 
         if (!_containerSystem.TryGetContainer(target, reader.ContainerAccessProvider, out var container))
-            return false;
+            return Paused(target); // when mapping, containers with electronics arent spawned
 
         foreach (var entity in container.ContainedEntities)
         {
diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs
index 3e1ff4284c7..4e03176f16a 100644
--- a/Content.Shared/Blocking/BlockingSystem.cs
+++ b/Content.Shared/Blocking/BlockingSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Actions;
 using Content.Shared.Damage;
 using Content.Shared.Examine;
@@ -209,7 +209,7 @@ public bool StartBlocking(EntityUid item, BlockingComponent component, EntityUid
             _fixtureSystem.TryCreateFixture(user,
                 component.Shape,
                 BlockingComponent.BlockFixtureID,
-                hard: true,
+                hard: false, // Frontier - True to false, mobs AI abuse.
                 collisionLayer: (int) CollisionGroup.WallLayer,
                 body: physicsComponent);
         }
diff --git a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
index 3ea27b9cc9f..75b67ffbf6b 100644
--- a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
+++ b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
@@ -73,7 +73,6 @@ private void OnBeforeRangedInteract(Entity<VirtualItemComponent> ent, ref Before
     }
 
     #region Hands
-	
     /// <summary>
     /// Spawns a virtual item in a empty hand
     /// </summary>
@@ -151,7 +150,7 @@ public void DeleteInHandsMatching(EntityUid user, EntityUid matching)
     /// </summary>
     /// <param name="blockingEnt">The entity we will make a virtual entity copy of</param>
     /// <param name="user">The entity that we want to insert the virtual entity</param>
-    /// <param name="slot">The slot to which we will insert the virtual entity (could be the "shoes" slot, for example)</para
+    /// <param name="slot">The slot to which we will insert the virtual entity (could be the "shoes" slot, for example)</param>
     /// <param name="force">Whether or not to force an equip</param>
     public bool TrySpawnVirtualItemInInventory(EntityUid blockingEnt, EntityUid user, string slot, bool force = false)
     {
@@ -173,6 +172,8 @@ public bool TrySpawnVirtualItemInInventory(EntityUid blockingEnt, EntityUid user
     /// that's done check if the found virtual entity is a copy of our matching entity,
     /// if it is, delete it
     /// </summary>
+    /// <param name="user">The entity that we want to delete the virtual entity from</param>
+    /// <param name="matching">The entity that made the virtual entity</param>
     /// <param name="slotName">Set this param if you have the name of the slot, it avoids unnecessary queries</param>
     /// <param name="user">The entity that we want to delete the virtual entity from</param>
     /// <param name="matching">The entity that made the virtual entity</param>
diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
index e1c6f8395d0..ff3db32fd6f 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
@@ -74,12 +74,20 @@ public void EnsureValid(ICommonSession session, IDependencyCollection collection
             {
                 var loadout = loadouts[i];
 
+                // Old prototype or otherwise invalid.
                 if (!protoManager.TryIndex(loadout.Prototype, out var loadoutProto))
                 {
                     loadouts.RemoveAt(i);
                     continue;
                 }
 
+                // Malicious client maybe, check the group even has it.
+                if (!groupProto.Loadouts.Contains(loadout.Prototype))
+                {
+                    loadouts.RemoveAt(i);
+                    continue;
+                }
+
                 // Validate the loadout can be applied (e.g. points).
                 if (!IsValid(session, loadout.Prototype, collection, out _))
                 {
diff --git a/Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs b/Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs
new file mode 100644
index 00000000000..112339efd74
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Actions;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Weapons.Ranged.Components;
+
+/// <summary>
+/// Lets you shoot a gun using an action.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(ActionGunSystem))]
+public sealed partial class ActionGunComponent : Component
+{
+    /// <summary>
+    /// Action to create, must use <see cref="ActionGunShootEvent"/>.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Action = string.Empty;
+
+    [DataField]
+    public EntityUid? ActionEntity;
+
+    /// <summary>
+    /// Prototype of gun entity to spawn.
+    /// Deleted when this component is removed.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId GunProto = string.Empty;
+
+    [DataField]
+    public EntityUid? Gun;
+}
+
+/// <summary>
+/// Action event for <see cref="ActionGunComponent"/> to shoot at a position.
+/// </summary>
+public sealed partial class ActionGunShootEvent : WorldTargetActionEvent;
diff --git a/Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs b/Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs
index 0c9802e7ae0..0d938a89065 100644
--- a/Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs
+++ b/Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs
@@ -1,4 +1,6 @@
 using Content.Shared.Weapons.Ranged.Components;
+
+
 namespace Content.Shared.Weapons.Ranged.Events;
 
 /// <summary>
diff --git a/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs
new file mode 100644
index 00000000000..f3dfe8a2a03
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs
@@ -0,0 +1,41 @@
+using Content.Shared.Actions;
+using Content.Shared.Weapons.Ranged.Components;
+
+namespace Content.Shared.Weapons.Ranged.Systems;
+
+public sealed class ActionGunSystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly SharedGunSystem _gun = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ActionGunComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ActionGunComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<ActionGunComponent, ActionGunShootEvent>(OnShoot);
+    }
+
+    private void OnMapInit(Entity<ActionGunComponent> ent, ref MapInitEvent args)
+    {
+        if (string.IsNullOrEmpty(ent.Comp.Action))
+            return;
+
+        _actions.AddAction(ent, ref ent.Comp.ActionEntity, ent.Comp.Action);
+        ent.Comp.Gun = Spawn(ent.Comp.GunProto);
+    }
+
+    private void OnShutdown(Entity<ActionGunComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Comp.Gun is {} gun)
+            QueueDel(gun);
+    }
+
+    private void OnShoot(Entity<ActionGunComponent> ent, ref ActionGunShootEvent args)
+    {
+        if (TryComp<GunComponent>(ent.Comp.Gun, out var gun))
+            _gun.AttemptShoot(ent, ent.Comp.Gun.Value, gun, args.Target);
+    }
+}
+
diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index cedfb3f4629..743405f8fc6 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/WieldableSystem.cs
@@ -210,8 +210,9 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use
 
         if (component.WieldSound != null)
             _audioSystem.PlayPredicted(component.WieldSound, used, user);
-        
-		var virtuals = new List<EntityUid>();
+
+
+        var virtuals = new List<EntityUid>();
         for (var i = 0; i < component.FreeHandsRequired; i++)
         {
             if (_virtualItemSystem.TrySpawnVirtualItemInHand(used, user, out var virtualItem, true))
diff --git a/Resources/Audio/_NF/Jukebox/attributions.yml b/Resources/Audio/_NF/Jukebox/attributions.yml
new file mode 100644
index 00000000000..92e453f3ef3
--- /dev/null
+++ b/Resources/Audio/_NF/Jukebox/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["lateraligator.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Later Alligator By Silverman Sound Studios. Converted to mono ogg"
+  source: "https://soundcloud.com/silvermansound/later-alligator"
diff --git a/Resources/Audio/_NF/Jukebox/lateraligator.ogg b/Resources/Audio/_NF/Jukebox/lateraligator.ogg
new file mode 100644
index 00000000000..e4186cccdf9
Binary files /dev/null and b/Resources/Audio/_NF/Jukebox/lateraligator.ogg differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f6548202538..8489a3c74a0 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4710,3 +4710,44 @@ Entries:
         Frontier.
   id: 4997
   time: '2024-05-31T11:11:02.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: Added more selections to loadouts options! make sure to pick new items!
+  id: 4998
+  time: '2024-06-01T12:46:43.0000000+00:00'
+- author: Katarn1933
+  changes:
+    - type: Add
+      message: New swampy tune for jukebox
+  id: 4999
+  time: '2024-06-01T13:03:59.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: >-
+        Added new messenger bags: arcadia, chaplain, chief engineer, contractor,
+        SR, security, black, blue, green, orange, red, purple, brown, light
+        brown, white. Most of new messenger bags available through loadouts.
+    - type: Tweak
+      message: >-
+        Resprited some messenger bags a bit (engineering, janitor, cultist, both
+        NFSD).
+  id: 5000
+  time: '2024-06-01T14:44:45.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Fix
+      message: >-
+        Mail RPDS, N2554 Pattern Repeater and BB gun no longer turn invisible if
+        wielded or put in suit storage slot.
+  id: 5001
+  time: '2024-06-01T15:17:54.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Tweak
+      message: >-
+        Silver Industries has released the argenti 2.0 with improved chamber and
+        shooting speed.
+  id: 5002
+  time: '2024-06-01T16:30:25.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_NF/preferences/loadout-groups.ftl
index b2e2b077145..79a9a45c33a 100644
--- a/Resources/Locale/en-US/_NF/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/_NF/preferences/loadout-groups.ftl
@@ -14,12 +14,6 @@ loadout-group-contractor-face = mask
 loadout-group-contractor-utility = tools
 loadout-group-contractor-fun = fun
 loadout-group-contractor-trinkets = trinkets
-# Security
-
-loadout-group-security-guard-jumpsuit = head
-loadout-group-security-guard-jumpsuit = jumpsuit
-loadout-group-security-guard-gloves = gloves
-loadout-group-security-guard-head = head
-loadout-group-security-guard-outerclothing = outer clothing
-loadout-group-security-guard-shoes = shoes
-loadout-group-security-guard-id = ID
+loadout-group-contractor-survival-box = survival box
+loadout-group-contractor-encryption-key = encryption keys
+loadout-group-contractor-implanter = implanters
\ No newline at end of file
diff --git a/Resources/Locale/en-US/wieldable/wieldable-component.ftl b/Resources/Locale/en-US/wieldable/wieldable-component.ftl
index c92c0dab905..84b58224a77 100644
--- a/Resources/Locale/en-US/wieldable/wieldable-component.ftl
+++ b/Resources/Locale/en-US/wieldable/wieldable-component.ftl
@@ -1,4 +1,4 @@
-### Locale for wielding items; i.e. two-handing them
+### Locale for wielding items; i.e. two-handing them
 
 wieldable-verb-text-wield = Wield
 wieldable-verb-text-unwield = Unwield
@@ -17,4 +17,4 @@ wieldable-component-not-in-hands = { CAPITALIZE(THE($item)) } isn't in your hand
 
 wieldable-component-requires = { CAPITALIZE(THE($item))} must be wielded!
 
-gunwieldbonus-component-examine = This weapon has improved accuracy when wielded.
\ No newline at end of file
+gunwieldbonus-component-examine = This weapon has improved accuracy when wielded.
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
index dd47e1f015d..db359351e79 100644
--- a/Resources/Prototypes/Access/misc.yml
+++ b/Resources/Prototypes/Access/misc.yml
@@ -20,7 +20,6 @@
   - Mail # Frontier
   - Medical
   - Mercenary # Frontier
-  - Pilot # Frontier
   - Quartermaster
   - Salvage
   - Cargo
diff --git a/Resources/Prototypes/Catalog/Jukebox/Standard.yml b/Resources/Prototypes/Catalog/Jukebox/Standard.yml
index 75a9bc8c8ae..2c8d44f19fc 100644
--- a/Resources/Prototypes/Catalog/Jukebox/Standard.yml
+++ b/Resources/Prototypes/Catalog/Jukebox/Standard.yml
@@ -57,5 +57,3 @@
   name: Toby Fox - Undertale
   path:
     path: /Audio/Jukebox/undertale.ogg
-
-
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
index 2da725939f1..d313d408024 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -12,16 +12,17 @@
     MagazineVector45Practice: 10 #FrontierCorvax
     MagazineBoxVector45: 5 #FrontierCorvax
     MagazineBoxVector45Practice: 10 #FrontierCorvax
-#    MagazineBoxLightRifleRubber: 15 # Frontier - TODO: Restore Rubber
+    MagazineBoxLightRifleRubber: 15
     WeaponShotgunDoubleBarreled: 10
+    WeaponRevolverArgenti: 10
     BoxShotgunSlug: 10
     BoxLethalshot: 10
     BoxBeanbag: 10
     BoxShotgunPractice: 10
-    WeaponRevolverArgenti: 10
     MagazineBoxRifle: 10
-#    MagazineBoxRifleRubber: 15 # Frontier - TODO: Restore Rubber
-    MagazineBoxRiflePractice: 10
+    MagazineBoxRifleRubber: 15
     MagazineBoxMagnum: 10
+    SpeedLoaderRifleHeavy: 10
+    SpeedLoaderRifleHeavyRubber: 10
   emaggedInventory:
     WeaponPistolViper: 1
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml
index 9acf9740191..cbe7fea8475 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: BB Gun
-  parent: BaseItem
+  parent: [BaseItem, BaseGunWieldable] # Frontier
   id: WeaponRifleBB
   description: The classic Red Ryder BB gun. Don't shoot your eye out.
   components:
@@ -39,4 +39,4 @@
         ents: []
   - type: Appearance
   - type: StaticPrice
-    price: 2750
+    price: 500
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index c58577722c2..76260bb9e83 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -89,6 +89,12 @@
     speedModifierThresholds:
       250: 0.7
       400: 0.5
+  # disable taking damage from fire, since its a fire breathing dragon
+  - type: Flammable
+    damage:
+      types: {}
+  - type: Temperature
+    heatDamageThreshold: 800
   - type: Metabolizer
     solutionOnBody: false
     updateInterval: 0.25
@@ -134,15 +140,37 @@
 - type: entity
   parent: BaseMobDragon
   id: MobDragon
+  suffix: No role or objectives
   components:
   - type: Dragon
     spawnRiftAction: ActionSpawnRift
-  # - type: GenericAntag
-    # rule: Dragon
+  - type: ActionGun
+    action: ActionDragonsBreath
+    gunProto: DragonsBreathGun
   - type: GuideHelp
     guides:
     - MinorAntagonists
 
+- type: entity
+  noSpawn: true
+  id: DragonsBreathGun
+  name: dragon's lung
+  description: For dragon's breathing
+  components:
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 5
+    rechargeSound:
+      path: /Audio/Animals/space_dragon_roar.ogg
+  - type: BasicEntityAmmoProvider
+    proto: ProjectileDragonsBreath
+    capacity: 1
+    count: 1
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Animals/space_dragon_roar.ogg
+    soundEmpty: null
+    projectileSpeed: 5
+
 - type: entity
   parent: BaseMobDragon
   id: MobDragonDungeon
@@ -181,6 +209,7 @@
       state: icon
     event: !type:DragonSpawnRiftActionEvent
     useDelay: 1
+    priority: 3
 
 - type: entity
   id: ActionDevour
@@ -192,3 +221,18 @@
     icon: { sprite : Interface/Actions/devour.rsi, state: icon }
     iconOn: { sprite : Interface/Actions/devour.rsi, state: icon-on }
     event: !type:DevourActionEvent
+    priority: 1
+
+- type: entity
+  noSpawn: true
+  id: ActionDragonsBreath
+  name: "[color=orange]Dragon's Breath[/color]"
+  description: Spew out flames at anyone foolish enough to attack you!
+  components:
+  - type: WorldTargetAction
+    # TODO: actual sprite
+    icon: { sprite : Objects/Weapons/Guns/Projectiles/magic.rsi, state: fireball }
+    event: !type:ActionGunShootEvent
+    priority: 2
+    checkCanAccess: false
+    range: 0
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index 65c958c16af..0c06c4d6e3d 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -44,7 +44,6 @@
       - Maintenance
       - Medical
       - Mercenary # Frontier
-      - Pilot # Frontier
       - Quartermaster
       - Research
       - ResearchDirector
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
index d5fb4360a82..3241a892262 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -102,4 +102,4 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
-    - state: uranium
+    - state: uranium
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
index a35a42d8c2a..73f29189864 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
@@ -43,3 +43,4 @@
       - state: tip
         map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#dbdbdb"
+
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
index 741f0a4e1a0..5ce0bf82fe9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
@@ -19,3 +19,14 @@
     damage:
       types:
         Blunt: 2
+
+- type: entity
+  id: BulletCaselessRifleRubber
+  name: bullet (.25 caseless rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
index 8b9fb9aa2f5..b69efdb1aa6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -21,6 +21,17 @@
       types:
         Blunt: 2
 
+- type: entity
+  id: BulletLightRifleRubber
+  name: bullet (.20 rifle rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+
 - type: entity
   id: BulletLightRifleIncendiary
   parent: BaseBulletIncendiary
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
index 1201da619a7..84a079ff765 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -21,6 +21,19 @@
       types:
         Blunt: 1
 
+- type: entity
+  id: BulletMagnumRubber
+  name: bullet (.45 magnum rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+  - type: StaminaDamageOnCollide
+    damage: 35 # 3 hits to stun cuz revolver
+
 - type: entity
   id: BulletMagnumIncendiary
   parent: BaseBulletIncendiary
@@ -32,7 +45,7 @@
       types:
         Blunt: 3
         Heat: 32
-
+        
 - type: entity
   id: BulletMagnumAP
   name: bullet (.45 magnum armor-piercing)
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
index 3cfcc0cf206..086a8dc914f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -20,6 +20,17 @@
       types:
         Blunt: 2
 
+- type: entity
+  id: BulletPistolRubber
+  name: bullet (.35 auto rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+
 - type: entity
   id: BulletPistolIncendiary
   parent: BaseBulletIncendiary
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
index 5b819d12f4f..99278c99b5a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -21,6 +21,17 @@
       types:
         Blunt: 2
 
+- type: entity
+  id: BulletRifleRubber
+  name: bullet (0.20 rifle rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+
 - type: entity
   id: BulletRifleIncendiary
   parent: BaseBulletIncendiary
@@ -32,7 +43,7 @@
       types:
         Blunt: 2
         Heat: 15
-
+  
 - type: entity
   id: BulletRifleUranium
   parent: BaseBulletUranium
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
index 38eb2bfdf2f..70cc3e6eed3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
@@ -9,4 +9,4 @@
     maxAngle: -30
   - type: Gun
     minAngle: 21
-    maxAngle: 32  
\ No newline at end of file
+    maxAngle: 32  
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 576545f8e86..642447b49e5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -204,7 +204,7 @@
 
 - type: entity
   name: laser rifle
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponLaserCarbine
   description: A simple civilian grade laser carbine, the workhorse of many private security organizations.
   components:
@@ -271,7 +271,7 @@
 
 - type: entity
   name: pulse carbine
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponPulseCarbine
   description: A high tech energy carbine favoured by the NT-ERT operatives. On the handle is a label that says 'for authorized use only.'
   components:
@@ -302,7 +302,7 @@
 
 - type: entity
   name: pulse rifle
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponPulseRifle
   description: A weapon that is almost as infamous as its users. On the handle is a label that says 'for authorized use only.'
   components:
@@ -329,7 +329,7 @@
 
 - type: entity
   name: laser cannon
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponLaserCannon
   description: A heavy duty, high powered laser weapon. On the handle is a label that says 'for authorized use only.'
   components:
@@ -388,7 +388,7 @@
 
 - type: entity
   name: x-ray cannon
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponXrayCannon
   description: An illegal and experimental weapon that uses concentrated x-ray energy against its target.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index baf16f15598..495acc5bf9e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -23,7 +23,7 @@
 
 - type: entity
   name: china lake
-  parent: BaseWeaponLauncher
+  parent: [BaseWeaponLauncher, BaseGunWieldable]
   id: WeaponLauncherChinaLake
   description: PLOOP
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index 3556d1c8f8b..d6adcd614e3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -30,6 +30,39 @@
   - type: IgniteOnCollide
     fireStacks: 0.35
 
+- type: entity
+  noSpawn: true
+  parent: BaseBulletTrigger
+  id: ProjectileDragonsBreath
+  name: dragon's breath
+  description: Try not to get toasted.
+  components:
+  - type: PointLight
+    color: "#E25822"
+    radius: 3.0
+    energy: 5.0
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
+    layers:
+    - state: fireball
+      shader: unshaded
+  - type: IgnitionSource
+    temperature: 1000
+    ignited: true
+  - type: RepeatingTrigger
+    delay: 0.5 # line of fire as well as if it hits something
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: FireBomb
+    totalIntensity: 5 # low intensity, the point is to burn attackers not to break open walls, dragons can just eat them
+    intensitySlope: 1
+    maxIntensity: 3
+    canCreateVacuum: false
+    deleteAfterExplosion: false
+    repeatable: true
+  - type: TimedDespawn
+    lifetime: 5
+
 - type: entity
   id: ProjectileAnomalyFireball
   name: fireball
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 528a8e5904d..bc8a1b7360b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -104,6 +104,25 @@
       types:
         Blunt: 1
 
+- type: entity
+  id: BaseBulletRubber
+  name: base bullet rubber
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+    - state: rubber
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+    soundHit:
+      path: /Audio/Weapons/Guns/Hits/snap.ogg
+  - type: StaminaDamageOnCollide
+    damage: 22 # 5 hits to stun sounds reasonable
+
 - type: entity
   id: BaseBulletIncendiary
   name: base bullet incendiary
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index bbb13a8ea6f..1fe12a97aa6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: BaseWeaponRifle
-  parent: BaseItem
+  parent: [BaseItem, BaseGunWieldable]
   id: BaseWeaponRifle
   description: A rooty tooty point and shooty.
   abstract: true
@@ -187,3 +187,4 @@
     steps: 1
     zeroVisible: true
   - type: Appearance
+
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index c696ff34121..40e0f586f76 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -20,7 +20,7 @@
     maxAngle: 16
     fireRate: 8
     angleIncrease: 3
-    angleDecay: 16
+    angleDecay: 16  
     selectedMode: FullAuto
     availableModes:
     - SemiAuto
@@ -81,7 +81,7 @@
 
 - type: entity
   name: C-20r sub machine gun
-  parent: BaseWeaponSubMachineGun
+  parent: [BaseWeaponSubMachineGun, BaseGunWieldable]
   id: WeaponSubMachineGunC20r
   description: An illegal firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo.
   components:
@@ -95,6 +95,8 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
   - type: Gun
+    minAngle: 21
+    maxAngle: 32  
     shotsPerBurst: 5
     availableModes:
     - SemiAuto
@@ -113,7 +115,7 @@
 
 - type: entity
   name: Drozd
-  parent: BaseWeaponSubMachineGun
+  parent: [BaseWeaponSubMachineGun, BaseGunWieldable]
   id: WeaponSubMachineGunDrozd
   description: An excellent fully automatic Heavy SMG. An illegal firearm often used by Syndicate agents.
   components:
@@ -127,6 +129,8 @@
     - type: Clothing
       sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
     - type: Gun
+      minAngle: 21
+      maxAngle: 32  
       fireRate: 6
       selectedMode: FullAuto
       soundGunshot:
@@ -232,7 +236,7 @@
     minAngle: 1
     maxAngle: 6
     angleIncrease: 1.5
-    angleDecay: 6
+    angleDecay: 6  
     selectedMode: FullAuto
     shotsPerBurst: 5
     availableModes:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 9db9456341f..13f6c2f5000 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -47,7 +47,7 @@
 - type: entity
   name: Bulldog
   # Don't parent to BaseWeaponShotgun because it differs significantly
-  parent: BaseItem
+  parent: [BaseItem, BaseGunWieldable]
   id: WeaponShotgunBulldog
   description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. An illegal firearm often used by Syndicate agents.
   components:
@@ -67,6 +67,7 @@
     - Back
     - suitStorage
   - type: AmmoCounter
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
     fireRate: 2
     selectedMode: FullAuto
@@ -104,7 +105,7 @@
 
 - type: entity
   name: double-barreled shotgun
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
   id: WeaponShotgunDoubleBarreled
   description: An immortal classic. A civilian grade shotgun. Uses .50 shotgun shells.
   components:
@@ -114,8 +115,8 @@
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: db
+    sprite: Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
     fireRate: 2
   - type: BallisticAmmoProvider
@@ -139,7 +140,7 @@
 
 - type: entity
   name: Enforcer
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
   id: WeaponShotgunEnforcer
   description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. On the receiver is a label that says 'for authorized use only.'
   components:
@@ -148,9 +149,9 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
   - type: Item
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: enforcer
+    sprite: Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi
   - type: BallisticAmmoProvider
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
 
 - type: entity
   parent: WeaponShotgunEnforcer
@@ -162,7 +163,7 @@
 
 - type: entity
   name: Kammerer
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
   id: WeaponShotgunKammerer
   description: When an old Remington design meets modern materials, this is the result. A civilian grade shotgun, favored by militia forces throughout many worlds. Uses .50 shotgun shells.
   components:
@@ -170,12 +171,12 @@
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: pump
+    sprite: Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: BallisticAmmoProvider
     capacity: 4
   - type: Tag
@@ -194,8 +195,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
   - type: Item
     size: Small
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: sawn
+    sprite: Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi
   - type: Gun
     fireRate: 4
   - type: BallisticAmmoProvider
@@ -243,7 +243,7 @@
 
 - type: entity
   name: blunderbuss
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
   id: WeaponShotgunBlunderbuss
   suffix: Pirate
   description: Deadly at close range, an illegal shotgun often found at the side of a pirate.
@@ -254,6 +254,7 @@
     - 0,0,4,0
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
     fireRate: 2
   - type: BallisticAmmoProvider
@@ -263,7 +264,7 @@
 
 - type: entity
   name: improvised shotgun
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
   id: WeaponShotgunImprovised
   description: A shitty, but legal, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber.
   components:
@@ -275,8 +276,8 @@
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: improvised
+    sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
     fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
   - type: BallisticAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 826cf9ca13a..27bdca7bdfe 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -41,7 +41,7 @@
 
 - type: entity
   name: Kardashev-Mosin
-  parent: BaseWeaponSniper
+  parent: [BaseWeaponSniper, BaseGunWieldable]
   id: WeaponSniperMosin
   description: A civilian grade weapon for hunting, or endless trench warfare. Uses .30 rifle ammo.
   components:
@@ -52,7 +52,7 @@
 
 - type: entity
   name: Hristov
-  parent: BaseWeaponSniper
+  parent: [BaseWeaponSniper, BaseGunWieldable]
   id: WeaponSniperHristov
   description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo. On the receiver is a label that says 'for authorized use only.'
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index d78f93dd358..45e60239eda 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -198,6 +198,8 @@
       - ShellTranquilizer
       - SpeedLoaderMagnum
       - SpeedLoaderMagnumEmpty
+      - SpeedLoaderRifleHeavy # Frontier
+      - SpeedLoaderRifleHeavyEmpty # Frontier
     emagDynamicRecipes:
       - BoxBeanbag
       - BoxShotgunIncendiary
@@ -236,6 +238,8 @@
       - PowerCageSmall
       - SpeedLoaderMagnumIncendiary
       - SpeedLoaderMagnumUranium
+      - SpeedLoaderRifleHeavyIncendiary # Frontier
+      - SpeedLoaderRifleHeavyUranium # Frontier
 
 - type: entity
   id: AutolatheHyperConvection
@@ -912,6 +916,8 @@
       - RiotShield
       - SpeedLoaderMagnum
       - SpeedLoaderMagnumEmpty
+      - SpeedLoaderRifleHeavy # Frontier
+      - SpeedLoaderRifleHeavyEmpty # Frontier
       - Stunbaton
       - TargetClown
       - TargetHuman
@@ -984,6 +990,8 @@
       - SignalTrigger
       - SpeedLoaderMagnumIncendiary
       - SpeedLoaderMagnumUranium
+      - SpeedLoaderRifleHeavyIncendiary # Frontier
+      - SpeedLoaderRifleHeavyUranium # Frontier
       - TelescopicShield
       - TimerTrigger
       - Truncheon
@@ -1051,6 +1059,8 @@
         - ShellTranquilizer
         - SpeedLoaderMagnum
         - SpeedLoaderMagnumEmpty
+        - SpeedLoaderRifleHeavy # Frontier
+        - SpeedLoaderRifleHeavyEmpty # Frontier
     - type: MaterialStorage
       whitelist:
         tags:
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 316082562ba..7d9aedee1fd 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -75,8 +75,12 @@
   groups:
   - LawyerNeck
   - LawyerJumpsuit
-  - LawyerBackpack
+  - ContractorBackpack
   - ContractorGlasses
+  - ContractorFace
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
@@ -87,9 +91,12 @@
   - ChaplainMask
   - ChaplainNeck
   - ChaplainJumpsuit
-  - ChaplainBackpack
+  - ContractorBackpack
   - ChaplainOuterClothing
   - ContractorGlasses
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
@@ -99,9 +106,13 @@
   - JanitorHead
   - JanitorJumpsuit
   - JanitorGloves
-  - CommonBackpack
+  - ContractorBackpack
   - JanitorOuterClothing
+  - ContractorFace
   - ContractorGlasses
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
index ac623c3584c..c1cb949e981 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
@@ -16,7 +16,5 @@
 - type: startingGear
   id: PrisonerGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPrisoner
     shoes: ClothingShoesColorBlack
-    id: PrisonerPDA
     ears: ClothingHeadsetGrey
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index e681edde32c..9bd44354868 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -37,6 +37,7 @@
   - MagazinePistolIncendiary
   - MagazineLightRifleIncendiary
   - SpeedLoaderMagnumIncendiary
+  - SpeedLoaderRifleHeavyIncendiary # Frontier
   - MagazineShotgunIncendiary
   - MagazineBoxPistolIncendiary
   - MagazineBoxMagnumIncendiary
@@ -92,6 +93,7 @@
   - MagazinePistolUranium
   - MagazineLightRifleUranium
   - SpeedLoaderMagnumUranium
+  - SpeedLoaderRifleHeavyUranium # Frontier
   - MagazineBoxPistolUranium
   - MagazineBoxMagnumUranium
   - MagazineBoxLightRifleUranium
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index 677449cfac8..5395e9ed861 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -22,3 +22,5 @@
     shoes: ClothingShoesColorBlack
     id: ChaplainPDA
     ears: ClothingHeadsetService
+    pocket1: Bible # Frontier
+    pocket2: RubberStampChaplain # Frontier
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index 347f4185df1..b2bf348ebde 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -16,10 +16,10 @@
 - type: startingGear
   id: LawyerGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitLawyerBlack  # TODO change jumpsuit to randomiser of the 4 variants
-    back: ClothingBackpackLawyerFilled # Frontier
     shoes: ClothingShoesBootsLaceup
     id: LawyerPDA
-    ears: ClothingHeadsetSecurity
+    ears: ClothingHeadsetNfsdGreen # Frontier ClothingHeadsetSecurity<ClothingHeadsetNfsdGreen
+    # TODO add copy of space law
+    pocket1: RubberStampLawyer # Frontier
   inhand:
-    - BriefcaseBrownFilled
+    - BriefcaseBrownFilled
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
index d16be5c350a..46c2f320b18 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
@@ -6,6 +6,6 @@
   canBeAntag: false
   icon: JobIconVisitor
   setPreference: false
-  overrideConsoleVisibility: true
+#  overrideConsoleVisibility: true # Frontier
   access:
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
index 3a9383dbd18..4b9ba13d4fc 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -205,7 +205,7 @@
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58
+    pocket1: WeaponPistolMk58Nonlethal
     pocket2: FlashlightSeclite
 
 - type: startingGear
@@ -222,7 +222,7 @@
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58
+    pocket1: WeaponPistolMk58Nonlethal
     pocket2: FlashlightSeclite
 
 - type: startingGear
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 977f85e644c..c697f5845c4 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -29,7 +29,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
       - id: Flash
       - id: RubberStampSr
       - id: DoorRemoteCommand
@@ -48,7 +47,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: FrontierUplinkCoin10
@@ -65,7 +63,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: ForensicPad
       - id: MagazinePistol
@@ -79,7 +76,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: BaseSecurityUplinkRadioOfficer
@@ -91,7 +87,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: RubberStampSheriff
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
index 7cd9a36399e..b82c84b9116 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -15,7 +15,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
       - id: Flash
       - id: RubberStampHop
       - id: DoorRemoteCommand
@@ -29,7 +28,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: FrontierUplinkCoin10
@@ -46,7 +44,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: ForensicPad
       - id: MagazinePistol
@@ -60,7 +57,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: BaseSecurityUplinkRadioOfficer
@@ -72,7 +68,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: RubberStampSheriff
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml
index d1f8ec0f642..91b30c6dd59 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -15,7 +15,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
       - id: Flash
       - id: RubberStampSr
       - id: DoorRemoteCommand
@@ -29,7 +28,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: FrontierUplinkCoin10
@@ -46,7 +44,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: ForensicPad
       - id: MagazinePistol
@@ -60,7 +57,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: BaseSecurityUplinkRadioOfficer
@@ -72,7 +68,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: RubberStampSheriff
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml
index e90776df4d2..efaab9c4058 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml
@@ -1,4 +1,4 @@
-# Duffel bag - gift box
+# BASE
 - type: entity
   parent: BaseItem
   id: SyndieDuffelGiftBox
@@ -23,16 +23,95 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate NPCs Loot
-# Syndicate Naval Captain Loot
 - type: entity
   parent: SyndieDuffelGiftBox
-  id: ClothingBackpackSyndicateCaptainLootA
+  id: SyndieMessengerGiftBox
+  name: syndicate naval operative bundle
+  description: Loot boxes? Here?
+  abstract: true
   noSpawn: true
+  suffix: NPC Loot
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
-    state: icon
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#424242"
+    - state: icon-sling
+      color: "#7f0101"
+    - state: icon-clasp
+      color: "#7f0101"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#424242"
+      - state: sling-equipped-BACKPACK
+        color: "#7f0101"
+      - state: clasp-equipped-BACKPACK
+        color: "#7f0101"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#424242"
+      - state: clasp-inhand-left
+        color: "#7f0101"
+      right:
+      - state: base-inhand-right
+        color: "#424242"
+      - state: clasp-inhand-right
+        color: "#7f0101"
+
+- type: entity
+  parent: SyndieMessengerGiftBox
+  id: CultistMessengerGiftBox
+  name: blood cultist bundle
+  description: Loot boxes? Here?
+  abstract: true
+  noSpawn: true
+  suffix: NPC Loot
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#562f2f"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#96907c"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#562f2f"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#96907c"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#562f2f"
+      - state: clasp-inhand-left
+        color: "#96907c"
+      right:
+      - state: base-inhand-right
+        color: "#562f2f"
+      - state: clasp-inhand-right
+        color: "#96907c"
+
+# SYNDICATE NPC LOOT
+## Captain
+- type: entity
+  parent: SyndieMessengerGiftBox
+  id: ClothingBackpackSyndicateCaptainLootA
+  noSpawn: true
+  components:
   - type: SpawnItemsOnUse
     items:
       - id: WeaponRevolverPythonAP
@@ -79,7 +158,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Second Officer Loot
+## Second Officer
 - type: entity
   parent: ClothingBackpackSyndicateCaptainLootA
   id: ClothingBackpackSyndicateSecondOfficerLootA
@@ -131,15 +210,12 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Commander Loot
+## Commander
 - type: entity
-  parent: SyndieDuffelGiftBox
+  parent: SyndieMessengerGiftBox
   id: ClothingBackpackSyndicateCommanderLootA
   noSpawn: true
   components:
-  - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
-    state: icon
   - type: SpawnItemsOnUse
     items:
       - id: WeaponRifleAk
@@ -187,7 +263,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Security Operative Loot
+## Operative
 - type: entity
   parent: SyndieDuffelGiftBox
   id: ClothingBackpackSyndicateOperativeLootA
@@ -243,7 +319,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Deckhand Loot
+## Deckhand
 - type: entity
   parent: SyndieDuffelGiftBox
   id: ClothingBackpackSyndicateDeckhandLootA
@@ -295,44 +371,28 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Saboteur Loot
+## Saboteur
 - type: entity
   parent: ClothingBackpackSyndicateDeckhandLootA
   id: ClothingBackpackSyndicateSaboteurLootA
   noSpawn: true
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
-    state: icon
 
 - type: entity
   parent: ClothingBackpackSyndicateDeckhandLootB
   id: ClothingBackpackSyndicateSaboteurLootB
   noSpawn: true
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
-    state: icon
 
 - type: entity
   parent: ClothingBackpackSyndicateDeckhandLootC
   id: ClothingBackpackSyndicateSaboteurLootC
   noSpawn: true
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
-    state: icon
 
 - type: entity
   parent: ClothingBackpackSyndicateDeckhandLootD
   id: ClothingBackpackSyndicateSaboteurLootD
   noSpawn: true
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
-    state: icon
 
-# Syndicate Naval Medic Loot
+## Medic
 - type: entity
   parent: SyndieDuffelGiftBox
   id: ClothingBackpackSyndicateMedicLootA
@@ -394,7 +454,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Engineer Loot
+## Engineer
 - type: entity
   parent: SyndieDuffelGiftBox
   id: ClothingBackpackSyndicateEngineerLootA
@@ -449,7 +509,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Chemwarrior
+## Chemwarrior
 - type: entity
   parent: SyndieDuffelGiftBox
   id: ClothingBackpackSyndicateChemwarriorLootA
@@ -504,7 +564,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Grenadier
+## Grenadier
 - type: entity
   parent: SyndieDuffelGiftBox
   id: ClothingBackpackSyndicateGrenadierLootA
@@ -557,17 +617,14 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Blood Cult NPCs Loot
-# Blood Cultist Zealot (Ranged) Loot
+# BLOOD CULT NPC LOOT
+## Zealot (Ranged) Loot
 - type: entity
-  parent: SyndieDuffelGiftBox
+  parent: CultistMessengerGiftBox
   id: ClothingBackpackBloodCultZealotLootA
   name: cultist gear bundle
   noSpawn: true
   components:
-  - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/bloodcult.rsi
-    state: icon
   - type: SpawnItemsOnUse
     items:
     - id: CrossbowImprovised
@@ -612,7 +669,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Blood Cultist: generic cash rewards
+## Generic rewards
 - type: entity
   parent: ClothingBackpackBloodCultZealotLootA
   id: ClothingBackpackBloodCultLootA
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml
new file mode 100644
index 00000000000..d047b1ab548
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml
@@ -0,0 +1,69 @@
+# CaselessRifle
+- type: entity
+  name: box of .25 caseless (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineCaselessRifleRubber
+  description: A box full of
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineCaselessRifleRubber
+        amount: 4
+
+# LightRifle
+- type: entity
+  name: box of .30 rifle (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineLightRifleRubber
+  description: A box full of .30 rifle (practice) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineLightRifleRubber
+        amount: 4
+
+- type: entity
+  name: box of Vector (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineMagnumSubMachineGunRubber
+  description: A box full of Vector (rubber) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineMagnumSubMachineGunRubber
+        amount: 3
+
+# Pistol
+- type: entity
+  name: box of pistol .35 auto (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazinePistolRubber
+  description: A box full of pistol .35 auto (rubber) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolRubber
+        amount: 4
+
+- type: entity
+  name: box of SMG .35 auto (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazinePistolSubMachineGunRubber
+  description: A box full of SMG .35 auto (rubber) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolSubMachineGunRubber
+        amount: 3
+
+# Rifle
+- type: entity
+  name: box of .20 rifle (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineRifleRubber
+  description: A box full of .20 rifle (rubber) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineRifleRubber
+        amount: 4
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/emergency.yml
index a536418880f..91d56e64c37 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/emergency.yml
@@ -1,3 +1,79 @@
+- type: entity
+  name: oxygen survival box
+  parent: BoxCardboard
+  id: BoxSurvivalNFOxygen
+  description: It's a box with basic oxygen internals inside.
+  components:
+  - type: StorageFill
+    contents:
+      - id: EmergencyOxygenTankFilled
+      - id: SpaceMedipen
+      - id: EmergencyMedipen
+      - id: FoodPSB
+      - id: DrinkWaterBottleFull
+      - id: Flare
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: emergencytank
+
+- type: entity
+  name: nitrogen survival box
+  parent: BoxCardboard
+  id: BoxSurvivalNFNitrogen
+  description: It's a box with basic nitrogen internals inside.
+  components:
+  - type: StorageFill
+    contents:
+      - id: EmergencyNitrogenTankFilled
+      - id: SpaceMedipen
+      - id: EmergencyMedipen
+      - id: FoodPSB
+      - id: DrinkWaterBottleFull
+      - id: Flare
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: emergencytank
+
+- type: entity
+  name: extended-oxygen survival box
+  parent: BoxCardboard
+  id: BoxSurvivalNFOxygenExtended
+  description: It's a box with extended internals inside.
+  components:
+  - type: StorageFill
+    contents:
+      - id: DoubleEmergencyOxygenTankFilled
+      - id: SpaceMedipen
+      - id: EmergencyMedipen
+      - id: FoodPSB
+      - id: DrinkWaterBottleFull
+      - id: CrowbarRed
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: extendedtank
+
+- type: entity
+  name: extended-nitrogen survival box
+  parent: BoxCardboard
+  id: BoxSurvivalNFNitrogenExtended
+  description: It's a box with extended nitrogen internals inside.
+  components:
+  - type: StorageFill
+    contents:
+      - id: DoubleEmergencyNitrogenTankFilled
+      - id: SpaceMedipen
+      - id: EmergencyMedipen
+      - id: FoodPSB
+      - id: DrinkWaterBottleFull
+      - id: CrowbarRed
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: extendedtank
+
 - type: entity
   name: survival box
   parent: BoxSurvivalSecurity
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml
new file mode 100644
index 00000000000..718eda96d06
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml
@@ -0,0 +1,85 @@
+- type: entity
+  parent: BaseItem
+  id: SpaceCashExpedition
+  name: syndicate naval operative bundle
+  abstract: true
+  noSpawn: true
+  suffix: Money
+  components:
+  - type: Sprite
+    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
+  - type: CargoSellBlacklist # We dont want this to be sold by mistake, and so you cannot sell this on a cargo depo
+
+- type: entity
+  parent: SpaceCashExpedition
+  id: SpaceCash5000Expedition
+  name: spesos (5000)
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: SpaceCash5000
+    sound:
+      collection: storageRustle
+  - type: StaticPrice # Require since you can still sell a ship that have it on it
+    price: 5000
+
+- type: entity
+  parent: SpaceCashExpedition
+  id: SpaceCash10000Expedition
+  name: spesos (10000)
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: SpaceCash10000
+    sound:
+      collection: storageRustle
+  - type: StaticPrice # Require since you can still sell a ship that have it on it
+    price: 10000
+
+- type: entity
+  parent: SpaceCashExpedition
+  id: SpaceCash15000Expedition
+  name: spesos (15000)
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: SpaceCash15000
+    sound:
+      collection: storageRustle
+  - type: StaticPrice # Require since you can still sell a ship that have it on it
+    price: 15000
+
+- type: entity
+  parent: SpaceCashExpedition
+  id: SpaceCash20000Expedition
+  name: spesos (20000)
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: SpaceCash20000
+    sound:
+      collection: storageRustle
+  - type: StaticPrice # Require since you can still sell a ship that have it on it
+    price: 20000
+
+- type: entity
+  parent: SpaceCashExpedition
+  id: SpaceCash25000Expedition
+  name: spesos (25000)
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: SpaceCash25000
+    sound:
+      collection: storageRustle
+  - type: StaticPrice # Require since you can still sell a ship that have it on it
+    price: 25000
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
index 5cbddced502..d7cd5b79acb 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
@@ -45,16 +45,16 @@
       - id: WeaponRevolverArgenti
       - id: MagazineBoxRifle
 
-# WeaponRevolverArgentiNonlethal # Frontier - TODO: Restore this later
-# - type: entity
-  # parent: WeaponCaseShortShuttle
-  # id: ShuttleWeaponRevolverArgentiNonlethal
-  # noSpawn: true
-  # components:
-  # - type: StorageFill
-    # contents:
-      # - id: WeaponRevolverArgentiNonlethal
-      # - id: MagazineBoxRifleRubber
+# WeaponRevolverArgentiNonlethal
+- type: entity
+  parent: WeaponCaseShortShuttle
+  id: ShuttleWeaponRevolverArgentiNonlethal
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponRevolverArgentiNonlethal
+      - id: MagazineBoxRifleRubber
 
 # WeaponSniperMosin
 - type: entity
@@ -67,16 +67,16 @@
       - id: WeaponSniperMosin
       - id: MagazineBoxLightRifle
 
-# Kardashev-MosinNonlethal # Frontier - TODO: Restore this later
-# - type: entity
-  # parent: WeaponCaseLongShuttle
-  # id: ShuttleKardashev-MosinNonlethal
-  # noSpawn: true
-  # components:
-  # - type: StorageFill
-    # contents:
-      # - id: Kardashev-MosinNonlethal
-      # - id: MagazineBoxLightRifleRubber
+# Kardashev-MosinNonlethal
+- type: entity
+  parent: WeaponCaseLongShuttle
+  id: ShuttleKardashev-MosinNonlethal
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: Kardashev-MosinNonlethal
+      - id: MagazineBoxLightRifleRubber
 
 # T2:
 # WeaponPistolMk58lethal
@@ -90,16 +90,16 @@
       - id: WeaponPistolMk58
       - id: MagazinePistol
 
-# WeaponPistolMk58Nonlethal # Frontier - TODO: Restore this later
-# - type: entity
-  # parent: WeaponCaseShortShuttle
-  # id: ShuttleWeaponPistolMk58Nonlethal
-  # noSpawn: true
-  # components:
-  # - type: StorageFill
-    # contents:
-      # - id: WeaponPistolMk58Nonlethal
-      # - id: MagazinePistolRubber
+# WeaponPistolMk58Nonlethal
+- type: entity
+  parent: WeaponCaseShortShuttle
+  id: ShuttleWeaponPistolMk58Nonlethal
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponPistolMk58Nonlethal
+      - id: MagazinePistolRubber
 
 # WeaponRevolverDeckard
 - type: entity
@@ -112,16 +112,16 @@
       - id: WeaponRevolverDeckard
       - id: SpeedLoaderMagnum
 
-# WeaponRevolverDeckardNonlethal # Frontier - TODO: Restore this later
-# - type: entity
-  # parent: WeaponCaseShortShuttle
-  # id: ShuttleWeaponRevolverDeckardNonlethal
-  # noSpawn: true
-  # components:
-  # - type: StorageFill
-    # contents:
-      # - id: WeaponRevolverDeckardNonlethal
-      # - id: SpeedLoaderMagnumRubber
+# WeaponRevolverDeckardNonlethal
+- type: entity
+  parent: WeaponCaseShortShuttle
+  id: ShuttleWeaponRevolverDeckardNonlethal
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponRevolverDeckardNonlethal
+      - id: SpeedLoaderMagnumRubber
 
 # WeaponShotgunDoubleBarreled
 - type: entity
@@ -134,16 +134,16 @@
       - id: WeaponShotgunDoubleBarreled
       - id: BoxLethalshot
 
-# WeaponShotgunDoubleBarreledRubber # Frontier - TODO: Restore this later
-# - type: entity
-  # parent: WeaponCaseLongShuttle
-  # id: ShuttleWeaponShotgunDoubleBarreledRubber
-  # noSpawn: true
-  # components:
-  # - type: StorageFill
-    # contents:
-      # - id: WeaponShotgunDoubleBarreledRubber
-      # - id: BoxBeanbag
+# WeaponShotgunDoubleBarreledRubber
+- type: entity
+  parent: WeaponCaseLongShuttle
+  id: ShuttleWeaponShotgunDoubleBarreledRubber
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponShotgunDoubleBarreledRubber
+      - id: BoxBeanbag
 
 # WeaponShotgunSawn
 - type: entity
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
index b3eb7f240a0..5ba572fe688 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
@@ -26,15 +26,15 @@
     - id: ShuttleWeaponRevolverArgenti
       orGroup: T1-1
       prob: 0.1
-#    - id: ShuttleWeaponRevolverArgentiNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-1
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverArgentiNonlethal
+      orGroup: T1-1
+      prob: 0.1
     - id: ShuttleWeaponSniperMosin
       orGroup: T1-1
       prob: 0.1
-#    - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-1
-#      prob: 0.1
+    - id: ShuttleKardashev-MosinNonlethal
+      orGroup: T1-1
+      prob: 0.1
     # T1-2
     - id: ShuttleWeaponLaserGun
       orGroup: T1-2
@@ -45,15 +45,15 @@
     - id: ShuttleWeaponRevolverArgenti
       orGroup: T1-2
       prob: 0.1
-#    - id: ShuttleWeaponRevolverArgentiNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-2
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverArgentiNonlethal
+      orGroup: T1-2
+      prob: 0.1
     - id: ShuttleWeaponSniperMosin
       orGroup: T1-2
       prob: 0.1
-#    - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-2
-#      prob: 0.1
+    - id: ShuttleKardashev-MosinNonlethal
+      orGroup: T1-2
+      prob: 0.1
     # T1 Melee
     - id: BaseBallBat
       orGroup: Melee
@@ -90,15 +90,15 @@
     - id: ShuttleWeaponRevolverArgenti
       orGroup: T1-1
       prob: 0.1
-#    - id: ShuttleWeaponRevolverArgentiNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-1
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverArgentiNonlethal
+      orGroup: T1-1
+      prob: 0.1
     - id: ShuttleWeaponSniperMosin
       orGroup: T1-1
       prob: 0.1
-#    - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-1
-#      prob: 0.1
+    - id: ShuttleKardashev-MosinNonlethal
+      orGroup: T1-1
+      prob: 0.1
     # T1-2
     - id: ShuttleWeaponLaserGun
       orGroup: T1-2
@@ -109,40 +109,40 @@
     - id: ShuttleWeaponRevolverArgenti
       orGroup: T1-2
       prob: 0.1
-#    - id: ShuttleWeaponRevolverArgentiNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-2
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverArgentiNonlethal
+      orGroup: T1-2
+      prob: 0.1
     - id: ShuttleWeaponSniperMosin
       orGroup: T1-2
       prob: 0.1
-#    - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-2
-#      prob: 0.1
+    - id: ShuttleKardashev-MosinNonlethal
+      orGroup: T1-2
+      prob: 0.1
     # T2-1
     - id: ShuttleWeaponPistolMk58
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponPistolMk58Nonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponPistolMk58Nonlethal
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponRevolverDeckard
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponRevolverDeckardNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverDeckardNonlethal
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponShotgunDoubleBarreled
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponShotgunDoubleBarreledRubber # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunDoubleBarreledRubber
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponShotgunSawn
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponShotgunSawnNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunSawnNonlethal
+      orGroup: T2-1
+      prob: 0.1
     # T2 Melee
     - id: SpearReinforced
       orGroup: Melee
@@ -167,52 +167,52 @@
     - id: ShuttleWeaponPistolMk58
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponPistolMk58Nonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponPistolMk58Nonlethal
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponRevolverDeckard
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponRevolverDeckardNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverDeckardNonlethal
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponShotgunDoubleBarreled
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponShotgunDoubleBarreledRubber # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunDoubleBarreledRubber
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponShotgunSawn
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponShotgunSawnNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunSawnNonlethal
+      orGroup: T2-1
+      prob: 0.1
     # T2-2
     - id: ShuttleWeaponPistolMk58
       orGroup: T2-2
       prob: 0.1
-#    - id: ShuttleWeaponPistolMk58Nonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-2
-#      prob: 0.1
+    - id: ShuttleWeaponPistolMk58Nonlethal
+      orGroup: T2-2
+      prob: 0.1
     - id: ShuttleWeaponRevolverDeckard
       orGroup: T2-2
       prob: 0.1
-#    - id: ShuttleWeaponRevolverDeckardNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-2
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverDeckardNonlethal
+      orGroup: T2-2
+      prob: 0.1
     - id: ShuttleWeaponShotgunDoubleBarreled
       orGroup: T2-2
       prob: 0.1
-#    - id: ShuttleWeaponShotgunDoubleBarreledRubber # Frontier - TODO: Restore rubber
-#      orGroup: T2-2
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunDoubleBarreledRubber
+      orGroup: T2-2
+      prob: 0.1
     - id: ShuttleWeaponShotgunSawn
       orGroup: T2-2
       prob: 0.1
-#    - id: ShuttleWeaponShotgunSawnNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-2
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunSawnNonlethal
+      orGroup: T2-2
+      prob: 0.1
     # T3-1
     - id: ShuttleWeaponEnergyGun
       orGroup: T3-1
@@ -220,9 +220,9 @@
     - id: ShuttleWeaponShotgunKammerer
       orGroup: T3-1
       prob: 0.1
-#    - id: ShuttleWeaponShotgunKammererNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T3-1
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunKammererNonlethal
+      orGroup: T3-1
+      prob: 0.1
     # T3 Melee
     - id: KukriKnife
       orGroup: Melee
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
index 33c87d26605..8d39c5ced1c 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -111,7 +111,6 @@
         - id: JetpackMiniFilled
         - id: HandheldGPSBasic
   - type: AccessReader
-    access: [["Captain"], ["Pilot"]]
 
 #Clown hardsuit
 - type: entity
diff --git a/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml b/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml
new file mode 100644
index 00000000000..ff70d41b379
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml
@@ -0,0 +1,5 @@
+- type: jukebox
+  id: lateraligator
+  name: Silverman Sound Studios - Later Alligator
+  path:
+    path: /Audio/_NF/Jukebox/lateraligator.ogg
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/arcadiadrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/arcadiadrobe.yml
index 6e71c4db23d..b8a4f7be09f 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/arcadiadrobe.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/arcadiadrobe.yml
@@ -4,6 +4,7 @@
     ClothingBackpackArcadia: 3
     ClothingBackpackDuffelArcadia: 3
     ClothingBackpackSatchelArcadia: 3
+    ClothingBackpackMessengerArcadia: 3
     ClothingBeltArcadia: 3
     ClothingEyesArcadiaVisor: 3
     ClothingHandsGlovesArcadiaCombat: 3
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml
index 1167ce4c3cc..25abbe278a9 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml
@@ -2,18 +2,20 @@
   id: LessLethalVendInventory
   startingInventory:
     WeaponDisabler: 10
-    # Kardashev-MosinNonlethal: 10 # Frontier - TODO: Restore Rubber
-    # WeaponRevolverArgentiNonlethal: 10 # Frontier - TODO: Restore Rubber
-    # WeaponShotgunDoubleBarreledRubber: 10 # Frontier - TODO: Restore Rubber
+    Kardashev-MosinNonlethal: 10
+    WeaponRevolverArgentiNonlethal: 10
+    WeaponShotgunDoubleBarreledRubber: 10
     WeaponFlareGun: 20
     BoxDonkSoftBox: 10
     BoxCartridgeCap: 10
-    # MagazineBoxPistolRubber: 10 # Frontier - TODO: Restore Rubber
-    # MagazineBoxMagnumRubber: 10 # Frontier - TODO: Restore Rubber
+    MagazineBoxPistolRubber: 10
+    MagazineBoxMagnumRubber: 10
     BoxBeanbag: 8
-    # MagazineBoxRifleRubber: 8 # Frontier - TODO: Restore Rubber
-    # MagazineBoxLightRifleRubber: 4 # Frontier - TODO: Restore Rubber
-    # MagazineBoxCaselessRifleRubber: 4 # Frontier - TODO: Restore Rubber
+    MagazineBoxRifleRubber: 8
+    MagazineBoxLightRifleRubber: 4
+    MagazineBoxCaselessRifleRubber: 4
+    SpeedLoaderRifleHeavy: 10
+    SpeedLoaderRifleHeavyRubber: 10
   contrabandInventory:
     WeaponRifleBB: 2
     BoxCartridgeBB: 10
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml
index ef06b89ce91..4ae47f78b8f 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml
@@ -1,3 +1,42 @@
+# BASE
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackMessengerContractor
+  name: contractor messenger bag
+  description: A trendy looking messenger bag in tasteful colors.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#777b83"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#777b83"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#777b83"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#777b83"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
 - type: entity
   parent: ClothingBackpack
   id: ClothingBackpackMessenger
@@ -7,15 +46,85 @@
   - type: Sprite
     sprite: _NF/Clothing/Back/Messenger/messenger.rsi
 
+# DEPARTMENTAL
+## Command
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerEngineering
-  name: engineering messenger bag
-  description: A tough messenger bag with extra pockets.
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerCaptain
+  name: captain's messenger bag
+  description: An exclusive messenger bag for Nanotrasen officers.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#3c6381"
+    - state: icon-sling
+      color: "#d6a033"
+    - state: icon-clasp
+      color: "#f6d56a"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#3c6381"
+      - state: sling-equipped-BACKPACK
+        color: "#d6a033"
+      - state: clasp-equipped-BACKPACK
+        color: "#f6d56a"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#3c6381"
+      - state: clasp-inhand-left
+        color: "#f6d56a"
+      right:
+      - state: base-inhand-right
+        color: "#3c6381"
+      - state: clasp-inhand-right
+        color: "#f6d56a"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerSr
+  name: station representative's messenger bag
+  description: An exclusive messenger bag for Nanotrasen officers.
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/engineering.rsi
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#2c6a30"
+    - state: icon-sling
+      color: "#fbe6b8"
+    - state: icon-clasp
+      color: "#eca615"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#2c6a30"
+      - state: sling-equipped-BACKPACK
+        color: "#fbe6b8"
+      - state: clasp-equipped-BACKPACK
+        color: "#eca615"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#2c6a30"
+      - state: clasp-inhand-left
+        color: "#eca615"
+      right:
+      - state: base-inhand-right
+        color: "#2c6a30"
+      - state: clasp-inhand-right
+        color: "#eca615"
 
+## Engineering
 - type: entity
   parent: ClothingBackpackMessenger
   id: ClothingBackpackMessengerAtmospherics
@@ -26,17 +135,183 @@
     sprite: _NF/Clothing/Back/Messenger/atmospherics.rsi
 
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerClown
-  name: clown messenger bag
-  description: For fast running from security.
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerEngineering
+  name: engineering messenger bag
+  description: A tough messenger bag with extra pockets.
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/clown.rsi
-  - type: Storage
-    storageOpenSound:
-      collection: BikeHorn
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#c9a569"
+    - state: icon-base-top
+      color: "#f4af73"
+    - state: icon-decor-accent
+      color: "#ffde15"
+    - state: icon-sling
+      color: "#67593f"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#c9a569"
+      - state: base-top-equipped-BACKPACK
+        color: "#f4af73"
+      - state: decor-accent-equipped-BACKPACK
+        color: "#f4af73"
+      - state: sling-equipped-BACKPACK
+        color: "#67593f"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#c9a569"
+      - state: base-top-inhand-left
+        color: "#f4af73"
+      - state: decor-accent-inhand-left
+        color: "#ffde15"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#c9a569"
+      - state: base-top-inhand-right
+        color: "#f4af73"
+      - state: decor-accent-inhand-right
+        color: "#ffde15"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerChiefEngineer
+  name: chief engineer's messenger bag
+  description: A tough messenger bag with extra pockets.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#a48965"
+    - state: icon-sling
+      color: "#e78c2e"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#a48965"
+      - state: sling-equipped-BACKPACK
+        color: "#e78c2e"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#a48965"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#a48965"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+## Supply
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerCargo
+  name: cargo messenger bag
+  description: A robust messenger bag for stealing cargo's loot.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#d9b744"
+    - state: icon-base-top
+      color: "#aaaaaa"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#d9b744"
+      - state: base-top-equipped-BACKPACK
+        color: "#aaaaaa"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#d9b744"
+      - state: base-top-inhand-left
+        color: "#aaaaaa"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#d9b744"
+      - state: base-top-inhand-right
+        color: "#aaaaaa"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerSalvage
+  name: salvage messenger bag
+  description: A robust messenger bag for stashing your loot.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#766245"
+    - state: icon-sling
+      color: "#5f539a"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#766245"
+      - state: sling-equipped-BACKPACK
+        color: "#5f539a"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#766245"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#766245"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
 
+## Medical
 - type: entity
   parent: ClothingBackpackMessenger
   id: ClothingBackpackMessengerMedical
@@ -73,6 +348,7 @@
   - type: Sprite
     sprite: _NF/Clothing/Back/Messenger/genetics.rsi
 
+## Science
 - type: entity
   parent: ClothingBackpackMessenger
   id: ClothingBackpackMessengerScience
@@ -82,131 +358,849 @@
   - type: Sprite
     sprite: _NF/Clothing/Back/Messenger/science.rsi
 
+## Civilian
 - type: entity
   parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerCaptain
-  name: captain's messenger bag
-  description: An exclusive messenger bag for Nanotrasen officers.
+  id: ClothingBackpackMessengerClown
+  name: clown messenger bag
+  description: For fast running from security.
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/captain.rsi
+    sprite: _NF/Clothing/Back/Messenger/clown.rsi
+  - type: Storage
+    storageOpenSound:
+      collection: BikeHorn
 
 - type: entity
   parent: ClothingBackpackMessenger
+  id: ClothingBackpackMessengerMime
+  name: mime messenger bag
+  description: A robust messenger bag for waging war against clowns.
+  components:
+    - type: Sprite
+      sprite: _NF/Clothing/Back/Messenger/mime.rsi
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
   id: ClothingBackpackMessengerHydroponics
   name: hydroponics messenger bag
   description: A messenger bag made of all natural fibers.
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/hydroponics.rsi
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#548ddc"
+    - state: icon-base-top
+      color: "#69c05b"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#548ddc"
+      - state: base-top-equipped-BACKPACK
+        color: "#69c05b"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#548ddc"
+      - state: base-top-inhand-left
+        color: "#69c05b"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#548ddc"
+      - state: base-top-inhand-right
+        color: "#69c05b"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
 
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerCargo
-  name: cargo messenger bag
-  description: A robust messenger bag for stealing cargo's loot.
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerJanitor
+  name: janitor messenger bag
+  description: A robust messenger bag for waging war against dirt.
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/cargo.rsi
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#ebdc36"
+    - state: icon-sling
+      color: "#8c347f"
+    - state: icon-clasp
+      color: "#8c347f"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#ebdc36"
+      - state: sling-equipped-BACKPACK
+        color: "#8c347f"
+      - state: clasp-equipped-BACKPACK
+        color: "#8c347f"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#ebdc36"
+      - state: clasp-inhand-left
+        color: "#8c347f"
+      right:
+      - state: base-inhand-right
+        color: "#ebdc36"
+      - state: clasp-inhand-right
+        color: "#8c347f"
 
 - type: entity
   parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerSalvage
-  name: salvage messenger bag
-  description: A robust messenger bag for stashing your loot.
+  id: ClothingBackpackMessengerMailCarrier
+  name: mail carrier messenger bag
+  description: A robust messenger bag for waging war against mail.
   components:
     - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/salvage.rsi
+      sprite: _NF/Clothing/Back/Messenger/mailman.rsi
 
 - type: entity
-  parent: ClothingBackpackMessenger
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerChaplain
+  name: chaplain messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#535353"
+    - state: icon-sling
+      color: "#535353"
+    - state: icon-clasp
+      color: "#f6d56a"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#535353"
+      - state: sling-equipped-BACKPACK
+        color: "#535353"
+      - state: clasp-equipped-BACKPACK
+        color: "#f6d56a"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#535353"
+      - state: clasp-inhand-left
+        color: "#f6d56a"
+      right:
+      - state: base-inhand-right
+        color: "#535353"
+      - state: clasp-inhand-right
+        color: "#f6d56a"
+
+## Wild cards
+- type: entity
+  parent: ClothingBackpackMessengerContractor
   id: ClothingBackpackMessengerPilot
   name: pilot messenger bag
   description: A robust messenger bag for shuttle parts.
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/pilot.rsi
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#3e2516"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#3e2516"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#3e2516"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#3e2516"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
 
 - type: entity
-  parent: ClothingBackpackMessenger
+  parent: ClothingBackpackMessengerContractor
   id: ClothingBackpackMessengerMercenary
   name: mercenary messenger bag
-  description: A robust messenger bag for war crimes.
+  description:  A robust messenger bag for war crimes.
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/mercenary.rsi
-
-- type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerSyndicate
-  name: syndicate messenger bag
-  description: A robust messenger bag for waging war against oppressors.
-  components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#6a6a36"
+    - state: icon-sling
+      color: "#6a6a36"
+    - state: icon-clasp
+      color: "#bbbb7a"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#6a6a36"
+      - state: sling-equipped-BACKPACK
+        color: "#6a6a36"
+      - state: clasp-equipped-BACKPACK
+        color: "#bbbb7a"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#6a6a36"
+      - state: clasp-inhand-left
+        color: "#bbbb7a"
+      right:
+      - state: base-inhand-right
+        color: "#6a6a36"
+      - state: clasp-inhand-right
+        color: "#bbbb7a"
 
+## Holding
 - type: entity
   parent: ClothingBackpackHolding
   id: ClothingBackpackMessengerHolding
   name: messenger bag of holding
   description: A messenger bag that opens into a localized pocket of bluespace.
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/holding.rsi
-      state: icon
-      layers:
-        - state: icon
-        - state: icon-unlit
-          shader: unshaded
-    - type: Clothing
-      equippedPrefix: holding
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/holding.rsi
+    state: icon
+    layers:
+    - state: icon
+    - state: icon-unlit
+      shader: unshaded
+  - type: Clothing
+    equippedPrefix: holding
 
+## Antagonists / Contraband
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerMailCarrier
-  name: mail carrier messenger bag
-  description: A robust messenger bag for waging war against mail.
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerSyndicate
+  name: syndicate messenger bag
+  description: A robust messenger bag for waging war against oppressors.
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/mailman.rsi
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#424242"
+    - state: icon-sling
+      color: "#7f0101"
+    - state: icon-clasp
+      color: "#7f0101"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#424242"
+      - state: sling-equipped-BACKPACK
+        color: "#7f0101"
+      - state: clasp-equipped-BACKPACK
+        color: "#7f0101"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#424242"
+      - state: clasp-inhand-left
+        color: "#7f0101"
+      right:
+      - state: base-inhand-right
+        color: "#424242"
+      - state: clasp-inhand-right
+        color: "#7f0101"
 
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerJanitor
-  name: janitor messenger bag
-  description: A robust messenger bag for waging war against dirt.
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerBloodCult
+  name: cultist messenger bag
+  description: A watertight messenger bag for loyal Nar'Sie followers.
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/janitor.rsi
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#562f2f"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#96907c"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#562f2f"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#96907c"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#562f2f"
+      - state: clasp-inhand-left
+        color: "#96907c"
+      right:
+      - state: base-inhand-right
+        color: "#562f2f"
+      - state: clasp-inhand-right
+        color: "#96907c"
 
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerMime
-  name: mime messenger bag
-  description: A robust messenger bag for waging war against clowns.
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerArcadia
+  name: arcadia messenger bag
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/mime.rsi
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#bab0b0"
+    - state: icon-base-top
+      color: "#ffffff"
+    - state: icon-decor
+      color: "#c12d30"
+    - state: icon-sling
+      color: "#7d282c"
+    - state: icon-clasp
+      color: "#1f1f1f"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#bab0b0"
+      - state: base-top-equipped-BACKPACK
+        color: "#ffffff"
+      - state: decor-equipped-BACKPACK
+        color: "#c12d30"
+      - state: sling-equipped-BACKPACK
+        color: "#7d282c"
+      - state: clasp-equipped-BACKPACK
+        color: "#1f1f1f"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#bab0b0"
+      - state: base-top-inhand-left
+        color: "#ffffff"
+      - state: decor-inhand-left
+        color: "#c12d30"
+      - state: clasp-inhand-left
+        color: "#1f1f1f"
+      right:
+      - state: base-inhand-right
+        color: "#bab0b0"
+      - state: base-top-inhand-right
+        color: "#ffffff"
+      - state: decor-inhand-right
+        color: "#c12d30"
+      - state: clasp-inhand-right
+        color: "#1f1f1f"
 
+## NFSD
 - type: entity
-  parent: ClothingBackpackMessenger
+  parent: ClothingBackpackMessengerContractor
   id: ClothingBackpackMessengerNfsdBrown
   name: nfsd messenger bag
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/nfsd_brown.rsi
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#63492a"
+    - state: icon-base-top
+      color: "#c2ae98"
+    - state: icon-sling
+      color: "#47603b"
+    - state: icon-clasp
+      color: "#e1af4e"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#63492a"
+      - state: base-top-equipped-BACKPACK
+        color: "#c2ae98"
+      - state: sling-equipped-BACKPACK
+        color: "#47603b"
+      - state: clasp-equipped-BACKPACK
+        color: "#e1af4e"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#63492a"
+      - state: base-top-inhand-left
+        color: "#c2ae98"
+      - state: clasp-inhand-left
+        color: "#e1af4e"
+      right:
+      - state: base-inhand-right
+        color: "#63492a"
+      - state: base-top-inhand-right
+        color: "#c2ae98"
+      - state: clasp-inhand-right
+        color: "#e1af4e"
 
 - type: entity
-  parent: ClothingBackpackMessenger
+  parent: ClothingBackpackMessengerContractor
   id: ClothingBackpackMessengerNfsdCream
+  name: nfsd messenger bag
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/nfsd_cream.rsi
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#c2ae98"
+    - state: icon-decor
+      color: "#47603b"
+    - state: icon-sling
+      color: "#47603b"
+    - state: icon-clasp
+      color: "#e1af4e"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#c2ae98"
+      - state: decor-equipped-BACKPACK
+        color: "#47603b"
+      - state: sling-equipped-BACKPACK
+        color: "#47603b"
+      - state: clasp-equipped-BACKPACK
+        color: "#e1af4e"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#c2ae98"
+      - state: decor-inhand-left
+        color: "#47603b"
+      - state: clasp-inhand-left
+        color: "#e1af4e"
+      right:
+      - state: base-inhand-right
+        color: "#c2ae98"
+      - state: decor-inhand-right
+        color: "#47603b"
+      - state: clasp-inhand-right
+        color: "#e1af4e"
 
+## Security
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerBloodCult
-  name: cultist messenger bag
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerSecurity
+  name: security messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#6a6a6a"
+    - state: icon-decor
+      color: "#e6000d"
+    - state: icon-sling
+      color: "#bf0000"
+    - state: icon-clasp
+      color: "#cdcdcd"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#6a6a6a"
+      - state: decor-equipped-BACKPACK
+        color: "#e6000d"
+      - state: sling-equipped-BACKPACK
+        color: "#bf0000"
+      - state: clasp-equipped-BACKPACK
+        color: "#cdcdcd"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#6a6a6a"
+      - state: decor-inhand-left
+        color: "#e6000d"
+      - state: clasp-inhand-left
+        color: "#cdcdcd"
+      right:
+      - state: base-inhand-right
+        color: "#6a6a6a"
+      - state: decor-inhand-right
+        color: "#e6000d"
+      - state: clasp-inhand-right
+        color: "#cdcdcd"
+
+## Color variants (to match colored jumpsuits)
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorBlack
+  name: black messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#535353"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#535353"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#535353"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#535353"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorBlue
+  name: blue messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#0089EF"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#0089EF"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#0089EF"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#0089EF"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorGreen
+  name: green messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#5ABF2F"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#5ABF2F"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#5ABF2F"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#5ABF2F"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorOrange
+  name: orange messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#EF8100"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#EF8100"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#EF8100"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#EF8100"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorRed
+  name: red messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#940000"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#940000"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#940000"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#940000"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorPurple
+  name: purple messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#9C0DE1"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#9C0DE1"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#9C0DE1"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#9C0DE1"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorBrownLight
+  name: light brown messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#C09F72"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#C09F72"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#C09F72"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#C09F72"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorBrown
+  name: brown messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#723A02"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#723A02"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#723A02"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#a17229"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorWhite
+  name: white messenger bag
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/bloodcult.rsi
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#ffffff"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#776756"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#ffffff"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#776756"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#ffffff"
+      - state: clasp-inhand-left
+        color: "#776756"
+      right:
+      - state: base-inhand-right
+        color: "#ffffff"
+      - state: clasp-inhand-right
+        color: "#776756"
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml
index 6811021e8be..9c04c732558 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml
@@ -27,6 +27,7 @@
 - type: entity
   parent: ClothingHeadset
   id: ClothingHeadsetNfsdBrown # Ask SR or Sheriff for keys
+  name: nfsd headset
   components:
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi
@@ -41,7 +42,6 @@
 - type: entity
   parent: ClothingHeadsetNfsdBrown
   id: ClothingHeadsetNfsdGreen # Ask SR or Sheriff for keys
-  name: nfsd headset
   components:
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml
index cb3f8623cd3..f8705987b24 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml
@@ -7,7 +7,6 @@
     containers:
       key_slots:
       - EncryptionKeyCommon
-      - EncryptionKeyMedical
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/mercenary.rsi
   - type: Clothing
@@ -22,7 +21,6 @@
     containers:
       key_slots:
       - EncryptionKeyCommon
-      - EncryptionKeyTraffic
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/pilot.rsi
   - type: Clothing
@@ -36,10 +34,9 @@
   - type: ContainerFill
     containers:
       key_slots:
-#      - EncryptionKeySecurity
-      - EncryptionKeyCommand
-      - EncryptionKeyNfsd
       - EncryptionKeyCommon
+      - EncryptionKeyNfsd
+      - EncryptionKeyCommand
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/nfsd_h_green.rsi
   - type: Clothing
@@ -53,10 +50,9 @@
   - type: ContainerFill
     containers:
       key_slots:
-#      - EncryptionKeySecurity
-      - EncryptionKeyCommand
-      - EncryptionKeyNfsd
       - EncryptionKeyCommon
+      - EncryptionKeyNfsd
+      - EncryptionKeyCommand
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/nfsd_h_brown.rsi
   - type: Clothing
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml
index 43f56a36b19..a5b7a7647b6 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml
@@ -1,18 +1,6 @@
-# Expedition rewards
-- type: entity
-  parent: SpaceCash5000
-  id: SpaceCash5000Expedition
-  name: "spesos (5000)"
-
-- type: entity
-  parent: SpaceCash10000
-  id: SpaceCash10000Expedition
-  name: "spesos (10000)"
-
 - type: entity
   parent: SpaceCash
-  id: SpaceCash15000Expedition
-  name: "spesos (15000)"
+  id: SpaceCash15000
   suffix: 15000
   components:
   - type: Icon
@@ -21,15 +9,10 @@
   - type: Stack
     count: 15000
 
-- type: entity
-  parent: SpaceCash20000
-  id: SpaceCash20000Expedition
-  name: "spesos (20000)"
-
 - type: entity
   parent: SpaceCash
-  id: SpaceCash25000Expedition
-  name: "spesos (25000)"
+  id: SpaceCash25000
+  suffix: 25000
   components:
   - type: Icon
     sprite: Objects/Economy/cash.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml
index f6764e77dad..36dd79ce38f 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml
@@ -5,3 +5,18 @@
   components:
   - type: CartridgeAmmo
     proto: BulletPistolEmp
+
+- type: entity
+  id: CartridgePistolRubber
+  name: cartridge (.35 auto rubber)
+  parent: BaseCartridgePistol
+  components:
+  - type: CartridgeAmmo
+    proto: BulletPistolRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml
index 53b0070605c..486a6ff5471 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml
@@ -11,3 +11,31 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazinePistolRubber
+  name: pistol magazine (.35 auto rubber)
+  parent: BaseMagazinePistol
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazinePistolSubMachineGunRubber
+  name: SMG magazine (.35 auto rubber)
+  parent: BaseMagazinePistolSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
new file mode 100644
index 00000000000..d5d24f82b85
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
@@ -0,0 +1,35 @@
+- type: entity
+  parent: BaseMagazineBoxCaselessRifle
+  id: MagazineBoxCaselessRifleBigRubber
+  name: ammunition box (.25 caseless rubber)
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 200
+    proto: CartridgeCaselessRifleRubber
+  - type: Sprite
+    layers:
+    - state: base-b
+      map: ["enum.GunVisualLayers.Base"]
+    - state: magb-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber-b
+  - type: MagazineVisuals
+    magState: magb
+    steps: 2
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  parent: BaseMagazineBoxCaselessRifle
+  id: MagazineBoxCaselessRifleRubber
+  name: ammunition box (.25 caseless rubber)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRifleRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
new file mode 100644
index 00000000000..2c30951bc98
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: BaseMagazineBoxLightRifle
+  id: MagazineBoxLightRifleRubber
+  name: ammunition box (.30 rifle rubber)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
new file mode 100644
index 00000000000..84625045327
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: BaseMagazineBoxMagnum
+  id: MagazineBoxMagnumRubber
+  name: ammunition box (.45 magnum rubber)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
new file mode 100644
index 00000000000..5b3aba79f09
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: BaseMagazineBoxPistol
+  id: MagazineBoxPistolRubber
+  name: ammunition box (.35 auto rubber)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
new file mode 100644
index 00000000000..67eb0fd869b
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -0,0 +1,35 @@
+- type: entity
+  parent: BaseMagazineBoxRifle
+  id: MagazineBoxRifleBigRubber
+  name: ammunition box (.20 rifle rubber)
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 200
+    proto: CartridgeRiflePractice
+  - type: Sprite
+    layers:
+    - state: base-b
+      map: ["enum.GunVisualLayers.Base"]
+    - state: magb-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: practice-b
+  - type: MagazineVisuals
+    magState: magb
+    steps: 2
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  parent: BaseMagazineBoxRifle
+  id: MagazineBoxRifleRubber
+  name: ammunition box (.20 rifle rubber)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
new file mode 100644
index 00000000000..304364fee41
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: CartridgeCaselessRifleRubber
+  name: cartridge (.25 caseless rubber)
+  parent: BaseCartridgeCaselessRifle
+  components:
+  - type: CartridgeAmmo
+    proto: BulletCaselessRifleRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
new file mode 100644
index 00000000000..d1372f9334d
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: CartridgeLightRifleRubber
+  name: cartridge (.30 rifle rubber)
+  parent: BaseCartridgeLightRifle
+  components:
+  - type: CartridgeAmmo
+    proto: BulletLightRifleRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
new file mode 100644
index 00000000000..6d522b6e6f8
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: CartridgeMagnumRubber
+  name: cartridge (.45 magnum rubber)
+  parent: BaseCartridgeMagnum
+  components:
+  - type: CartridgeAmmo
+    proto: BulletMagnumRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
new file mode 100644
index 00000000000..aee8ab56851
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: CartridgeRifleRubber
+  name: cartridge (.20 rifle rubber)
+  parent: BaseCartridgeRifle
+  components:
+  - type: CartridgeAmmo
+    proto: BulletRifleRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
new file mode 100644
index 00000000000..a0b4ab40003
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -0,0 +1,48 @@
+- type: entity
+  id: MagazinePistolCaselessRifleRubber
+  name: "pistol magazine (.25 caseless rubber)"
+  parent: BaseMagazinePistolCaselessRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRifleRubber
+    capacity: 10
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 6
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: MagazineCaselessRifleRubber
+  name: "magazine (.25 caseless rubber)"
+  parent: BaseMagazineCaselessRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRifleRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineCaselessRifleShortRubber
+  name: "short magazine (.25 caseless rubber)"
+  parent: BaseMagazineCaselessRifleShort
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRifleRubber
+    capacity: 20
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
new file mode 100644
index 00000000000..0681df2dc86
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -0,0 +1,13 @@
+- type: entity
+  id: MagazineLightRifleRubber
+  name: "magazine (.30 rifle rubber)"
+  parent: BaseMagazineLightRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
new file mode 100644
index 00000000000..7cb9620abe8
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -0,0 +1,27 @@
+- type: entity
+  id: MagazineMagnumRubber
+  name: pistol magazine (.45 magnum rubber)
+  parent: BaseMagazineMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineMagnumSubMachineGunRubber
+  name: "Vector magazine (.45 magnum rubber)"
+  parent: BaseMagazineMagnumSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
new file mode 100644
index 00000000000..32b8fe61e2a
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -0,0 +1,13 @@
+- type: entity
+  id: MagazineRifleRubber
+  name: "magazine (.20 rifle rubber)"
+  parent: BaseMagazineRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
new file mode 100644
index 00000000000..8f845f3adcb
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -0,0 +1,19 @@
+- type: entity
+  id: SpeedLoaderMagnumRubber
+  name: "speed loader (.45 magnum rubber)"
+  parent: BaseSpeedLoaderMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumRubber
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: rubber-6
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: rubber
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
new file mode 100644
index 00000000000..99435076361
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
@@ -0,0 +1,18 @@
+- type: entity
+  id: SpeedLoaderPistolRubber
+  name: "speed loader (.35 auto rubber)"
+  parent: BaseSpeedLoaderPistol
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: rubber-6
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: rubber
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Basic/sawn_pka.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml
similarity index 100%
rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Basic/sawn_pka.yml
rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml
deleted file mode 100644
index 6db0b8468c2..00000000000
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-- type: entity
-  name: Argenti
-  parent: BaseWeaponRevolver
-  id: WeaponRevolverArgenti
-  description: The civilian grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo.
-  components:
-  - type: Sprite
-    sprite: _NF/Objects/Weapons/Argenti-Revolver.rsi
-  - type: Clothing
-    sprite: _NF/Objects/Weapons/Argenti-Revolver.rsi
-  - type: Gun
-    fireRate: 2
-    resetOnHandSelected: false
-  - type: RevolverAmmoProvider
-    whitelist:
-      tags:
-        - CartridgeRifle
-    proto: CartridgeRifle
-    capacity: 6
-    chambers: [ True, True, True, True, True, True ]
-    ammoSlots: [ null, null, null, null, null, null ]
-  - type: StaticPrice
-    price: 200
-
-# - type: entity
-  # parent: WeaponRevolverArgenti
-  # id: WeaponRevolverArgentiNonlethal
-  # suffix: Non-lethal
-  # components:
-  # - type: RevolverAmmoProvider
-    # whitelist:
-      # tags:
-        # - CartridgeRifle
-    # proto: CartridgeRifleRubber
-    # capacity: 6
-    # chambers: [ True, True, True, True, True, True ]
-    # ammoSlots: [ null, null, null, null, null, null ]
-
-# - type: entity
-  # parent: WeaponRevolverDeckard
-  # id: WeaponRevolverDeckardNonlethal
-  # suffix: Non-lethal
-  # components:
-  # - type: RevolverAmmoProvider
-    # capacity: 5
-    # proto: CartridgeMagnumRubber
-    # chambers: [ True, True, True, True, True ]
-    # ammoSlots: [ null, null, null, null, null ]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
deleted file mode 100644
index 128b1c91a6a..00000000000
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# - type: entity # Frontier - TODO: Restore Rubber
-  # id: Kardashev-MosinNonlethal
-  # parent: WeaponSniperMosin
-  # suffix: Non-lethal
-  # components:
-  # - type: BallisticAmmoProvider
-    # whitelist:
-      # tags:
-      # - CartridgeLightRifle
-    # capacity: 10
-    # proto: CartridgeLightRifleRubber
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
new file mode 100644
index 00000000000..c7e61a2dc14
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -0,0 +1,48 @@
+- type: entity
+  id: WeaponPistolMk58Nonlethal
+  parent: WeaponPistolMk58
+  suffix: Non-lethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolRubber
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazinePistol
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistolRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgePistol
+
+- type: entity
+  name: N1984
+  parent: WeaponPistolN1984
+  id: WeaponPistolN1984Nonlethal
+  suffix: Non-lethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineMagnumRubber
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineMagnum
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeMagnumRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeMagnum
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
new file mode 100644
index 00000000000..5e4ba3173f9
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -0,0 +1,47 @@
+- type: entity
+  name: Argenti
+  parent: BaseWeaponRevolver
+  id: WeaponRevolverArgenti
+  description: The civilian grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo.
+  components:
+  - type: Sprite
+    scale: 0.75 , 0.75
+    sprite: _NF/Objects/Weapons/Guns/Revolvers/argenti.rsi
+  - type: Clothing
+    sprite: _NF/Objects/Weapons/Guns/Revolvers/argenti.rsi
+  - type: Gun
+    fireRate: 2.5
+    resetOnHandSelected: false
+  - type: RevolverAmmoProvider
+    whitelist:
+      tags:
+        - CartridgeRifle
+        - SpeedLoaderRifleHeavy
+    capacity: 8
+    proto: CartridgeRifle
+    chambers: [ True, True, True, True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null, null, null, null ]
+  - type: StaticPrice
+    price: 200
+
+- type: entity
+  parent: WeaponRevolverArgenti
+  id: WeaponRevolverArgentiNonlethal
+  suffix: Non-lethal
+  components:
+  - type: RevolverAmmoProvider
+    capacity: 8
+    proto: CartridgeRifleRubber
+    chambers: [ True, True, True, True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null, null, null, null ]
+
+- type: entity
+  parent: WeaponRevolverDeckard
+  id: WeaponRevolverDeckardNonlethal
+  suffix: Non-lethal
+  components:
+  - type: RevolverAmmoProvider
+    capacity: 5
+    proto: CartridgeMagnumRubber
+    chambers: [ True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null ]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
new file mode 100644
index 00000000000..24cfd29260f
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -0,0 +1,24 @@
+- type: entity
+  name: Lecter
+  parent: WeaponRifleLecter
+  id: WeaponRifleLecterRubber
+  suffix: Non-lethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineRifleRubber
+        insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeRifleRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeRifle
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
new file mode 100644
index 00000000000..a9b5c3c12bf
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -0,0 +1,25 @@
+# Rubber
+- type: entity
+  name: Drozd
+  parent: WeaponSubMachineGunDrozd
+  id: WeaponSubMachineGunDrozdRubber
+  suffix: Non-Lethal
+  components:
+    - type: ItemSlots
+      slots:
+        gun_magazine:
+          name: Magazine
+          startingItem: MagazinePistolSubMachineGunRubber
+          insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+          ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+          priority: 2
+          whitelist:
+            tags:
+              - MagazinePistolSubMachineGun
+        gun_chamber:
+          name: Chamber
+          startingItem: CartridgePistolRubber
+          priority: 1
+          whitelist:
+            tags:
+              - CartridgePistol
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Shotguns/shotguns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
similarity index 100%
rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Shotguns/shotguns.yml
rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
similarity index 63%
rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml
rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 12cbbc255f4..d988c32f37f 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -1,6 +1,20 @@
+# Upstream
+- type: entity
+  id: Kardashev-MosinNonlethal
+  parent: WeaponSniperMosin
+  suffix: Non-lethal
+  components:
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+      - CartridgeLightRifle
+    capacity: 10
+    proto: CartridgeLightRifleRubber
+
+# Frontier
 - type: entity
   name: N2524 Pattern Repeater
-  parent: BaseWeaponSniper
+  parent: [BaseWeaponSniper, BaseGunWieldable]
   id: WeaponSniperRepeater
   description: A civilian grade lever action firearm, favored by space cowboys across the Frontier for its reliability and stopping power. Uses .45 magnum ammo.
   components:
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index ca91f13b2fd..2bc1adbdb39 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -106,7 +106,6 @@
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
   - type: AccessReader
-    access: [["Captain"], ["Pilot"]]
 
 # Wooden Cabinet
 - type: entity
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/bags.yml
index 69a29b8d7f5..9052015d28a 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/bags.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/bags.yml
@@ -1,407 +1,417 @@
 - type: loadout
-  id: ContractorClothingBackpackFilled
-  equipment: ContractorClothingBackpackFilled
+  id: ContractorClothingBackpack
+  equipment: ContractorClothingBackpack
   price: 0
 
 - type: startingGear
-  id: ContractorClothingBackpackFilled
+  id: ContractorClothingBackpack
   equipment:
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelFilled
-  equipment: ContractorClothingBackpackDuffelFilled
+  id: ContractorClothingBackpackDuffel
+  equipment: ContractorClothingBackpackDuffel
   price: 0
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelFilled
+  id: ContractorClothingBackpackDuffel
   equipment:
-    back: ClothingBackpackDuffelFilled
+    back: ClothingBackpackDuffel
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelFilled
-  equipment: ContractorClothingBackpackSatchelFilled
+  id: ContractorClothingBackpackSatchel
+  equipment: ContractorClothingBackpackSatchel
   price: 0
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelFilled
+  id: ContractorClothingBackpackSatchel
   equipment:
-    back: ClothingBackpackSatchelFilled
+    back: ClothingBackpackSatchel
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerFilled
-  equipment: ContractorClothingBackpackMessengerFilled
+  id: ContractorClothingBackpackMessenger
+  equipment: ContractorClothingBackpackMessenger
   price: 0
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerFilled
+  id: ContractorClothingBackpackMessenger
   equipment:
-    back: ClothingBackpackMessengerFilled
+    back: ClothingBackpackMessenger
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerContractor
+  equipment: ContractorClothingBackpackMessengerContractor
+  price: 0
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerContractor
+  equipment:
+    back: ClothingBackpackMessengerContractor
 
 #T1
 - type: loadout
-  id: ContractorClothingBackpackCaptainFilled
-  equipment: ContractorClothingBackpackCaptainFilled
+  id: ContractorClothingBackpackCaptain
+  equipment: ContractorClothingBackpackCaptain
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackCaptainFilled
+  id: ContractorClothingBackpackCaptain
   equipment:
-    back: ClothingBackpackCaptainFilled
+    back: ClothingBackpackCaptain
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelCaptainFilled
-  equipment: ContractorClothingBackpackDuffelCaptainFilled
+  id: ContractorClothingBackpackDuffelCaptain
+  equipment: ContractorClothingBackpackDuffelCaptain
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelCaptainFilled
+  id: ContractorClothingBackpackDuffelCaptain
   equipment:
-    back: ClothingBackpackDuffelCaptainFilled
+    back: ClothingBackpackDuffelCaptain
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelCaptainFilled
-  equipment: ContractorClothingBackpackSatchelCaptainFilled
+  id: ContractorClothingBackpackSatchelCaptain
+  equipment: ContractorClothingBackpackSatchelCaptain
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelCaptainFilled
+  id: ContractorClothingBackpackSatchelCaptain
   equipment:
-    back: ClothingBackpackSatchelCaptainFilled
+    back: ClothingBackpackSatchelCaptain
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerCaptainFilled
-  equipment: ContractorClothingBackpackMessengerCaptainFilled
+  id: ContractorClothingBackpackMessengerCaptain
+  equipment: ContractorClothingBackpackMessengerCaptain
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerCaptainFilled
+  id: ContractorClothingBackpackMessengerCaptain
   equipment:
-    back: ClothingBackpackMessengerCaptainFilled
+    back: ClothingBackpackMessengerCaptain
 
 - type: loadout
-  id: ContractorClothingBackpackSalvageFilled
-  equipment: ContractorClothingBackpackSalvageFilled
+  id: ContractorClothingBackpackSalvage
+  equipment: ContractorClothingBackpackSalvage
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSalvageFilled
+  id: ContractorClothingBackpackSalvage
   equipment:
-    back: ClothingBackpackSalvageFilled
+    back: ClothingBackpackSalvage
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelSalvageFilled
-  equipment: ContractorClothingBackpackDuffelSalvageFilled
+  id: ContractorClothingBackpackDuffelSalvage
+  equipment: ContractorClothingBackpackDuffelSalvage
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelSalvageFilled
+  id: ContractorClothingBackpackDuffelSalvage
   equipment:
-    back: ClothingBackpackDuffelSalvageFilled
+    back: ClothingBackpackDuffelSalvage
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelSalvageFilled
-  equipment: ContractorClothingBackpackSatchelSalvageFilled
+  id: ContractorClothingBackpackSatchelSalvage
+  equipment: ContractorClothingBackpackSatchelSalvage
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelSalvageFilled
+  id: ContractorClothingBackpackSatchelSalvage
   equipment:
-    back: ClothingBackpackSatchelSalvageFilled
+    back: ClothingBackpackSatchelSalvage
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerSalvageFilled
-  equipment: ContractorClothingBackpackMessengerSalvageFilled
+  id: ContractorClothingBackpackMessengerSalvage
+  equipment: ContractorClothingBackpackMessengerSalvage
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerSalvageFilled
+  id: ContractorClothingBackpackMessengerSalvage
   equipment:
-    back: ClothingBackpackMessengerSalvageFilled
+    back: ClothingBackpackMessengerSalvage
 
 - type: loadout
-  id: ContractorClothingBackpackCargoFilled
-  equipment: ContractorClothingBackpackCargoFilled
+  id: ContractorClothingBackpackCargo
+  equipment: ContractorClothingBackpackCargo
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackCargoFilled
+  id: ContractorClothingBackpackCargo
   equipment:
-    back: ClothingBackpackCargoFilled
+    back: ClothingBackpackCargo
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelCargoFilled
-  equipment: ContractorClothingBackpackDuffelCargoFilled
+  id: ContractorClothingBackpackDuffelCargo
+  equipment: ContractorClothingBackpackDuffelCargo
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelCargoFilled
+  id: ContractorClothingBackpackDuffelCargo
   equipment:
-    back: ClothingBackpackDuffelCargoFilled
+    back: ClothingBackpackDuffelCargo
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelCargoFilled
-  equipment: ContractorClothingBackpackSatchelCargoFilled
+  id: ContractorClothingBackpackSatchelCargo
+  equipment: ContractorClothingBackpackSatchelCargo
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelCargoFilled
+  id: ContractorClothingBackpackSatchelCargo
   equipment:
-    back: ClothingBackpackSatchelCargoFilled
+    back: ClothingBackpackSatchelCargo
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerCargoFilled
-  equipment: ContractorClothingBackpackMessengerCargoFilled
+  id: ContractorClothingBackpackMessengerCargo
+  equipment: ContractorClothingBackpackMessengerCargo
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerCargoFilled
+  id: ContractorClothingBackpackMessengerCargo
   equipment:
-    back: ClothingBackpackMessengerCargoFilled
+    back: ClothingBackpackMessengerCargo
 
 - type: loadout
-  id: ContractorClothingBackpackHydroponicsFilled
-  equipment: ContractorClothingBackpackHydroponicsFilled
+  id: ContractorClothingBackpackHydroponics
+  equipment: ContractorClothingBackpackHydroponics
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackHydroponicsFilled
+  id: ContractorClothingBackpackHydroponics
   equipment:
-    back: ClothingBackpackHydroponicsFilled
+    back: ClothingBackpackHydroponics
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelHydroponicsFilled
-  equipment: ContractorClothingBackpackDuffelHydroponicsFilled
+  id: ContractorClothingBackpackDuffelHydroponics
+  equipment: ContractorClothingBackpackDuffelHydroponics
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelHydroponicsFilled
+  id: ContractorClothingBackpackDuffelHydroponics
   equipment:
-    back: ClothingBackpackDuffelHydroponicsFilled
+    back: ClothingBackpackDuffelHydroponics
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelHydroponicsFilled
-  equipment: ContractorClothingBackpackSatchelHydroponicsFilled
+  id: ContractorClothingBackpackSatchelHydroponics
+  equipment: ContractorClothingBackpackSatchelHydroponics
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelHydroponicsFilled
+  id: ContractorClothingBackpackSatchelHydroponics
   equipment:
-    back: ClothingBackpackSatchelHydroponicsFilled
+    back: ClothingBackpackSatchelHydroponics
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerHydroponicsFilled
-  equipment: ContractorClothingBackpackMessengerHydroponicsFilled
+  id: ContractorClothingBackpackMessengerHydroponics
+  equipment: ContractorClothingBackpackMessengerHydroponics
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerHydroponicsFilled
+  id: ContractorClothingBackpackMessengerHydroponics
   equipment:
-    back: ClothingBackpackMessengerHydroponicsFilled
+    back: ClothingBackpackMessengerHydroponics
 
 - type: loadout
-  id: ContractorClothingBackpackScienceFilled
-  equipment: ContractorClothingBackpackScienceFilled
+  id: ContractorClothingBackpackScience
+  equipment: ContractorClothingBackpackScience
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackScienceFilled
+  id: ContractorClothingBackpackScience
   equipment:
-    back: ClothingBackpackScienceFilled
+    back: ClothingBackpackScience
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelScienceFilled
-  equipment: ContractorClothingBackpackDuffelScienceFilled
+  id: ContractorClothingBackpackDuffelScience
+  equipment: ContractorClothingBackpackDuffelScience
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelScienceFilled
+  id: ContractorClothingBackpackDuffelScience
   equipment:
-    back: ClothingBackpackDuffelScienceFilled
+    back: ClothingBackpackDuffelScience
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelScienceFilled
-  equipment: ContractorClothingBackpackSatchelScienceFilled
+  id: ContractorClothingBackpackSatchelScience
+  equipment: ContractorClothingBackpackSatchelScience
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelScienceFilled
+  id: ContractorClothingBackpackSatchelScience
   equipment:
-    back: ClothingBackpackSatchelScienceFilled
+    back: ClothingBackpackSatchelScience
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerScienceFilled
-  equipment: ContractorClothingBackpackMessengerScienceFilled
+  id: ContractorClothingBackpackMessengerScience
+  equipment: ContractorClothingBackpackMessengerScience
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerScienceFilled
+  id: ContractorClothingBackpackMessengerScience
   equipment:
-    back: ClothingBackpackMessengerScienceFilled
+    back: ClothingBackpackMessengerScience
 
 - type: loadout
-  id: ContractorClothingBackpackMedicalFilled
-  equipment: ContractorClothingBackpackMedicalFilled
+  id: ContractorClothingBackpackMedical
+  equipment: ContractorClothingBackpackMedical
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMedicalFilled
+  id: ContractorClothingBackpackMedical
   equipment:
-    back: ClothingBackpackMedicalFilled
+    back: ClothingBackpackMedical
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelMedicalFilled
-  equipment: ContractorClothingBackpackDuffelMedicalFilled
+  id: ContractorClothingBackpackDuffelMedical
+  equipment: ContractorClothingBackpackDuffelMedical
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelMedicalFilled
+  id: ContractorClothingBackpackDuffelMedical
   equipment:
-    back: ClothingBackpackDuffelMedicalFilled
+    back: ClothingBackpackDuffelMedical
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelMedicalFilled
-  equipment: ContractorClothingBackpackSatchelMedicalFilled
+  id: ContractorClothingBackpackSatchelMedical
+  equipment: ContractorClothingBackpackSatchelMedical
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelMedicalFilled
+  id: ContractorClothingBackpackSatchelMedical
   equipment:
-    back: ClothingBackpackSatchelMedicalFilled
+    back: ClothingBackpackSatchelMedical
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerMedicalFilled
-  equipment: ContractorClothingBackpackMessengerMedicalFilled
+  id: ContractorClothingBackpackMessengerMedical
+  equipment: ContractorClothingBackpackMessengerMedical
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerMedicalFilled
+  id: ContractorClothingBackpackMessengerMedical
   equipment:
-    back: ClothingBackpackMessengerMedicalFilled
+    back: ClothingBackpackMessengerMedical
 
 - type: loadout
-  id: ContractorClothingBackpackChemistryFilled
-  equipment: ContractorClothingBackpackChemistryFilled
+  id: ContractorClothingBackpackChemistry
+  equipment: ContractorClothingBackpackChemistry
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackChemistryFilled
+  id: ContractorClothingBackpackChemistry
   equipment:
-    back: ClothingBackpackChemistryFilled
+    back: ClothingBackpackChemistry
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelChemistryFilled
-  equipment: ContractorClothingBackpackDuffelChemistryFilled
+  id: ContractorClothingBackpackDuffelChemistry
+  equipment: ContractorClothingBackpackDuffelChemistry
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelChemistryFilled
+  id: ContractorClothingBackpackDuffelChemistry
   equipment:
-    back: ClothingBackpackDuffelChemistryFilled
+    back: ClothingBackpackDuffelChemistry
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelChemistryFilled
-  equipment: ContractorClothingBackpackSatchelChemistryFilled
+  id: ContractorClothingBackpackSatchelChemistry
+  equipment: ContractorClothingBackpackSatchelChemistry
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelChemistryFilled
+  id: ContractorClothingBackpackSatchelChemistry
   equipment:
-    back: ClothingBackpackSatchelChemistryFilled
+    back: ClothingBackpackSatchelChemistry
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerChemistryFilled
-  equipment: ContractorClothingBackpackMessengerChemistryFilled
+  id: ContractorClothingBackpackMessengerChemistry
+  equipment: ContractorClothingBackpackMessengerChemistry
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerChemistryFilled
+  id: ContractorClothingBackpackMessengerChemistry
   equipment:
-    back: ClothingBackpackMessengerChemistryFilled
+    back: ClothingBackpackMessengerChemistry
 
 - type: loadout
   id: ContractorClothingBackpackGenetics
@@ -508,210 +518,353 @@
     back: ClothingBackpackMessengerVirology
 
 - type: loadout
-  id: ContractorClothingBackpackEngineeringFilled
-  equipment: ContractorClothingBackpackEngineeringFilled
+  id: ContractorClothingBackpackEngineering
+  equipment: ContractorClothingBackpackEngineering
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackEngineeringFilled
+  id: ContractorClothingBackpackEngineering
   equipment:
-    back: ClothingBackpackEngineeringFilled
+    back: ClothingBackpackEngineering
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelEngineeringFilled
-  equipment: ContractorClothingBackpackDuffelEngineeringFilled
+  id: ContractorClothingBackpackDuffelEngineering
+  equipment: ContractorClothingBackpackDuffelEngineering
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelEngineeringFilled
+  id: ContractorClothingBackpackDuffelEngineering
   equipment:
-    back: ClothingBackpackDuffelEngineeringFilled
+    back: ClothingBackpackDuffelEngineering
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelEngineeringFilled
-  equipment: ContractorClothingBackpackSatchelEngineeringFilled
+  id: ContractorClothingBackpackSatchelEngineering
+  equipment: ContractorClothingBackpackSatchelEngineering
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelEngineeringFilled
+  id: ContractorClothingBackpackSatchelEngineering
   equipment:
-    back: ClothingBackpackSatchelEngineeringFilled
+    back: ClothingBackpackSatchelEngineering
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerEngineeringFilled
-  equipment: ContractorClothingBackpackMessengerEngineeringFilled
+  id: ContractorClothingBackpackMessengerEngineering
+  equipment: ContractorClothingBackpackMessengerEngineering
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerEngineeringFilled
+  id: ContractorClothingBackpackMessengerEngineering
   equipment:
-    back: ClothingBackpackMessengerEngineeringFilled
+    back: ClothingBackpackMessengerEngineering
 
 - type: loadout
-  id: ContractorClothingBackpackAtmosphericsFilled
-  equipment: ContractorClothingBackpackAtmosphericsFilled
+  id: ContractorClothingBackpackMessengerChiefEngineer
+  equipment: ContractorClothingBackpackMessengerChiefEngineer
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackAtmosphericsFilled
+  id: ContractorClothingBackpackMessengerChiefEngineer
   equipment:
-    back: ClothingBackpackAtmosphericsFilled
+    back: ClothingBackpackMessengerChiefEngineer
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelAtmosphericsFilled
-  equipment: ContractorClothingBackpackDuffelAtmosphericsFilled
+  id: ContractorClothingBackpackAtmospherics
+  equipment: ContractorClothingBackpackAtmospherics
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackAtmospherics
+  equipment:
+    back: ClothingBackpackAtmospherics
+
+- type: loadout
+  id: ContractorClothingBackpackDuffelAtmospherics
+  equipment: ContractorClothingBackpackDuffelAtmospherics
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelAtmosphericsFilled
+  id: ContractorClothingBackpackDuffelAtmospherics
+  equipment:
+    back: ClothingBackpackDuffelAtmospherics
+
+- type: loadout
+  id: ContractorClothingBackpackSatchelAtmospherics
+  equipment: ContractorClothingBackpackSatchelAtmospherics
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackSatchelAtmospherics
+  equipment:
+    back: ClothingBackpackSatchelAtmospherics
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerAtmospherics
+  equipment: ContractorClothingBackpackMessengerAtmospherics
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerAtmospherics
+  equipment:
+    back: ClothingBackpackMessengerAtmospherics
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerChaplain
+  equipment: ContractorClothingBackpackMessengerChaplain
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerChaplain
+  equipment:
+    back: ClothingBackpackMessengerChaplain
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorBlack
+  equipment: ContractorClothingBackpackMessengerColorBlack
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorBlack
+  equipment:
+    back: ClothingBackpackMessengerColorBlack
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorWhite
+  equipment: ContractorClothingBackpackMessengerColorWhite
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorWhite
+  equipment:
+    back: ClothingBackpackMessengerColorWhite
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorBlue
+  equipment: ContractorClothingBackpackMessengerColorBlue
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorBlue
+  equipment:
+    back: ClothingBackpackMessengerColorBlue
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorGreen
+  equipment: ContractorClothingBackpackMessengerColorGreen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorGreen
+  equipment:
+    back: ClothingBackpackMessengerColorGreen
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorOrange
+  equipment: ContractorClothingBackpackMessengerColorOrange
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorOrange
+  equipment:
+    back: ClothingBackpackMessengerColorOrange
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorRed
+  equipment: ContractorClothingBackpackMessengerColorRed
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorRed
+  equipment:
+    back: ClothingBackpackMessengerColorRed
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorPurple
+  equipment: ContractorClothingBackpackMessengerColorPurple
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorPurple
   equipment:
-    back: ClothingBackpackDuffelAtmosphericsFilled
+    back: ClothingBackpackMessengerColorPurple
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelAtmosphericsFilled
-  equipment: ContractorClothingBackpackSatchelAtmosphericsFilled
+  id: ContractorClothingBackpackMessengerColorBrownLight
+  equipment: ContractorClothingBackpackMessengerColorBrownLight
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelAtmosphericsFilled
+  id: ContractorClothingBackpackMessengerColorBrownLight
   equipment:
-    back: ClothingBackpackSatchelAtmosphericsFilled
+    back: ClothingBackpackMessengerColorBrownLight
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerAtmosphericsFilled
-  equipment: ContractorClothingBackpackMessengerAtmosphericsFilled
+  id: ContractorClothingBackpackMessengerColorBrown
+  equipment: ContractorClothingBackpackMessengerColorBrown
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerAtmosphericsFilled
+  id: ContractorClothingBackpackMessengerColorBrown
   equipment:
-    back: ClothingBackpackMessengerAtmosphericsFilled
+    back: ClothingBackpackMessengerColorBrown
 
 #T2
 - type: loadout
-  id: ContractorClothingBackpackClownFilled
-  equipment: ContractorClothingBackpackClownFilled
+  id: ContractorClothingBackpackClown
+  equipment: ContractorClothingBackpackClown
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1250
 
 - type: startingGear
-  id: ContractorClothingBackpackClownFilled
+  id: ContractorClothingBackpackClown
   equipment:
-    back: ClothingBackpackClownFilled
+    back: ClothingBackpackClown
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelClownFilled
-  equipment: ContractorClothingBackpackDuffelClownFilled
+  id: ContractorClothingBackpackDuffelClown
+  equipment: ContractorClothingBackpackDuffelClown
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 2000
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelClownFilled
+  id: ContractorClothingBackpackDuffelClown
   equipment:
-    back: ClothingBackpackDuffelClownFilled
+    back: ClothingBackpackDuffelClown
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelClownFilled
-  equipment: ContractorClothingBackpackSatchelClownFilled
+  id: ContractorClothingBackpackSatchelClown
+  equipment: ContractorClothingBackpackSatchelClown
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1250
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelClownFilled
+  id: ContractorClothingBackpackSatchelClown
   equipment:
-    back: ClothingBackpackSatchelClownFilled
+    back: ClothingBackpackSatchelClown
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerClownFilled
-  equipment: ContractorClothingBackpackMessengerClownFilled
+  id: ContractorClothingBackpackMessengerClown
+  equipment: ContractorClothingBackpackMessengerClown
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1250
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerClownFilled
+  id: ContractorClothingBackpackMessengerClown
   equipment:
-    back: ClothingBackpackMessengerClownFilled
+    back: ClothingBackpackMessengerClown
 
 - type: loadout
-  id: ContractorClothingBackpackMimeFilled
-  equipment: ContractorClothingBackpackMimeFilled
+  id: ContractorClothingBackpackMime
+  equipment: ContractorClothingBackpackMime
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1250
 
 - type: startingGear
-  id: ContractorClothingBackpackMimeFilled
+  id: ContractorClothingBackpackMime
   equipment:
-    back: ClothingBackpackMimeFilled
+    back: ClothingBackpackMime
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelMimeFilled
-  equipment: ContractorClothingBackpackDuffelMimeFilled
+  id: ContractorClothingBackpackDuffelMime
+  equipment: ContractorClothingBackpackDuffelMime
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 2000
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelMimeFilled
+  id: ContractorClothingBackpackDuffelMime
   equipment:
-    back: ClothingBackpackDuffelMimeFilled
+    back: ClothingBackpackDuffelMime
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelMimeFilled
-  equipment: ContractorClothingBackpackSatchelMimeFilled
+  id: ContractorClothingBackpackSatchelMime
+  equipment: ContractorClothingBackpackSatchelMime
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1250
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelMimeFilled
+  id: ContractorClothingBackpackSatchelMime
   equipment:
-    back: ClothingBackpackSatchelMimeFilled
+    back: ClothingBackpackSatchelMime
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerMimeFilled
-  equipment: ContractorClothingBackpackMessengerMimeFilled
+  id: ContractorClothingBackpackMessengerMime
+  equipment: ContractorClothingBackpackMessengerMime
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1250
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerMimeFilled
+  id: ContractorClothingBackpackMessengerMime
   equipment:
-    back: ClothingBackpackMessengerMimeFilled
+    back: ClothingBackpackMessengerMime
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/encryption_keys.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/encryption_keys.yml
new file mode 100644
index 00000000000..e94dd8072fa
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/encryption_keys.yml
@@ -0,0 +1,50 @@
+#T0
+- type: loadout
+  id: ContractorEncryptionKeyTraffic
+  equipment: ContractorEncryptionKeyTraffic
+
+- type: startingGear
+  id: ContractorEncryptionKeyTraffic
+  storage:
+    back:
+    - EncryptionKeyTraffic
+
+- type: loadout
+  id: ContractorEncryptionKeyMedical
+  equipment: ContractorEncryptionKeyMedical
+
+- type: startingGear
+  id: ContractorEncryptionKeyMedical
+  storage:
+    back:
+    - EncryptionKeyMedical
+
+- type: loadout
+  id: ContractorEncryptionKeyCargo
+  equipment: ContractorEncryptionKeyCargo
+
+- type: startingGear
+  id: ContractorEncryptionKeyCargo
+  storage:
+    back:
+    - EncryptionKeyCargo
+
+- type: loadout
+  id: ContractorEncryptionKeyEngineering
+  equipment: ContractorEncryptionKeyEngineering
+
+- type: startingGear
+  id: ContractorEncryptionKeyEngineering
+  storage:
+    back:
+    - EncryptionKeyEngineering
+
+- type: loadout
+  id: ContractorEncryptionKeyScience
+  equipment: ContractorEncryptionKeyScience
+
+- type: startingGear
+  id: ContractorEncryptionKeyScience
+  storage:
+    back:
+    - EncryptionKeyScience
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/face.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/face.yml
index 84bd27a2087..7a3c8215ae0 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/face.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/face.yml
@@ -1,3 +1,23 @@
+#T0
+- type: loadout
+  id: ContractorClothingMaskBreath
+  equipment: ContractorClothingMaskBreath
+
+- type: startingGear
+  id: ContractorClothingMaskBreath
+  equipment:
+    mask: ClothingMaskBreath
+
+- type: loadout
+  id: ContractorClothingMaskBreathMedical
+  equipment: ContractorClothingMaskBreathMedical
+  price: 200
+
+- type: startingGear
+  id: ContractorClothingMaskBreathMedical
+  equipment:
+    mask: ClothingMaskBreathMedical
+
 #T1
 - type: loadout
   id: ContractorClothingMaskSterile
@@ -5,7 +25,7 @@
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
-  price: 500
+  price: 200
 
 - type: startingGear
   id: ContractorClothingMaskSterile
@@ -18,7 +38,7 @@
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
-  price: 500
+  price: 300
 
 - type: startingGear
   id: ContractorClothingMaskGas
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/implanter.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/implanter.yml
new file mode 100644
index 00000000000..f494bbf7962
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/implanter.yml
@@ -0,0 +1,53 @@
+#T0
+- type: loadout
+  id: ContractorMedicalTrackingImplanter
+  equipment: ContractorMedicalTrackingImplanter
+
+- type: startingGear
+  id: ContractorMedicalTrackingImplanter
+  storage:
+    back:
+    - MedicalTrackingImplanter
+
+#T1
+- type: loadout
+  id: ContractorLightImplanter
+  equipment: ContractorLightImplanter
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 1000
+
+- type: startingGear
+  id: ContractorLightImplanter
+  storage:
+    back:
+    - LightImplanter
+
+- type: loadout
+  id: ContractorBikeHornImplanter
+  equipment: ContractorBikeHornImplanter
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 1000
+
+- type: startingGear
+  id: ContractorBikeHornImplanter
+  storage:
+    back:
+    - BikeHornImplanter
+
+- type: loadout
+  id: ContractorSadTromboneImplanter
+  equipment: ContractorSadTromboneImplanter
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 1000
+
+- type: startingGear
+  id: ContractorSadTromboneImplanter
+  storage:
+    back:
+    - SadTromboneImplanter
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/survival.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/survival.yml
new file mode 100644
index 00000000000..44763471e00
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/survival.yml
@@ -0,0 +1,49 @@
+#T0
+- type: loadout
+  id: ContractorBoxSurvivalNFOxygen
+  equipment: ContractorBoxSurvivalNFOxygen
+
+- type: startingGear
+  id: ContractorBoxSurvivalNFOxygen
+  storage:
+    back:
+    - BoxSurvivalNFOxygen
+
+- type: loadout
+  id: ContractorBoxSurvivalNFNitrogen
+  equipment: ContractorBoxSurvivalNFNitrogen
+
+- type: startingGear
+  id: ContractorBoxSurvivalNFNitrogen
+  storage:
+    back:
+    - BoxSurvivalNFNitrogen
+
+#T1
+- type: loadout
+  id: ContractorBoxSurvivalNFOxygenExtended
+  equipment: ContractorBoxSurvivalNFOxygenExtended
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 1000
+
+- type: startingGear
+  id: ContractorBoxSurvivalNFOxygenExtended
+  storage:
+    back:
+    - BoxSurvivalNFOxygenExtended
+
+- type: loadout
+  id: ContractorBoxSurvivalNFNitrogenExtended
+  equipment: ContractorBoxSurvivalNFNitrogenExtended
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 1000
+
+- type: startingGear
+  id: ContractorBoxSurvivalNFNitrogenExtended
+  storage:
+    back:
+    - BoxSurvivalNFNitrogenExtended
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/bags.yml
index d741451f905..cbaa75a3fe7 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/bags.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/bags.yml
@@ -1,39 +1,39 @@
 - type: loadout
-  id: MercenaryClothingBackpackMercenaryFilled
-  equipment: MercenaryClothingBackpackMercenaryFilled
+  id: MercenaryClothingBackpackMercenary
+  equipment: MercenaryClothingBackpackMercenary
   price: 0
 
 - type: startingGear
-  id: MercenaryClothingBackpackMercenaryFilled
+  id: MercenaryClothingBackpackMercenary
   equipment:
-    back: ClothingBackpackMercenaryFilled
+    back: ClothingBackpackMercenary
 
 - type: loadout
-  id: MercenaryClothingBackpackDuffelMercenaryFilled
-  equipment: MercenaryClothingBackpackDuffelMercenaryFilled
+  id: MercenaryClothingBackpackDuffelMercenary
+  equipment: MercenaryClothingBackpackDuffelMercenary
   price: 0
 
 - type: startingGear
-  id: MercenaryClothingBackpackDuffelMercenaryFilled
+  id: MercenaryClothingBackpackDuffelMercenary
   equipment:
-    back: ClothingBackpackDuffelMercenaryFilled
+    back: ClothingBackpackDuffelMercenary
 
 - type: loadout
-  id: MercenaryClothingBackpackSatchelMercenaryFilled
-  equipment: MercenaryClothingBackpackSatchelMercenaryFilled
+  id: MercenaryClothingBackpackSatchelMercenary
+  equipment: MercenaryClothingBackpackSatchelMercenary
   price: 0
 
 - type: startingGear
-  id: MercenaryClothingBackpackSatchelMercenaryFilled
+  id: MercenaryClothingBackpackSatchelMercenary
   equipment:
-    back: ClothingBackpackSatchelMercenaryFilled
+    back: ClothingBackpackSatchelMercenary
 
 - type: loadout
-  id: MercenaryClothingBackpackMessengerMercenaryFilled
-  equipment: MercenaryClothingBackpackMessengerMercenaryFilled
+  id: MercenaryClothingBackpackMessengerMercenary
+  equipment: MercenaryClothingBackpackMessengerMercenary
   price: 0
 
 - type: startingGear
-  id: MercenaryClothingBackpackMessengerMercenaryFilled
+  id: MercenaryClothingBackpackMessengerMercenary
   equipment:
-    back: ClothingBackpackMessengerMercenaryFilled
+    back: ClothingBackpackMessengerMercenary
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/face.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/face.yml
index c09494cad8d..639a3127a5f 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/face.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/face.yml
@@ -15,3 +15,12 @@
   id: BrigmedicClothingMaskBrigmedic
   equipment:
     mask: ClothingMaskBreathMedicalSecurity
+
+- type: loadout
+  id: NfsdClothingMaskGasNfsd
+  equipment: NfsdClothingMaskGasNfsd
+
+- type: startingGear
+  id: NfsdClothingMaskGasNfsd
+  equipment:
+    mask: ClothingMaskGasNfsd
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/survival.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/survival.yml
new file mode 100644
index 00000000000..a5904ba5af8
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/survival.yml
@@ -0,0 +1,20 @@
+#T1
+- type: loadout
+  id: NfsdBoxSurvivalNfsdOxygen
+  equipment: NfsdBoxSurvivalNfsdOxygen
+
+- type: startingGear
+  id: NfsdBoxSurvivalNfsdOxygen
+  storage:
+    back:
+    - BoxSurvivalNFOxygenExtended
+
+- type: loadout
+  id: NfsdBoxSurvivalNfsdNitrogen
+  equipment: NfsdBoxSurvivalNfsdNitrogen
+
+- type: startingGear
+  id: NfsdBoxSurvivalNfsdNitrogen
+  storage:
+    back:
+    - BoxSurvivalNFNitrogenExtended
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pilot/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pilot/bags.yml
index 263c2023b8a..5151fa07c0b 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Pilot/bags.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Pilot/bags.yml
@@ -1,39 +1,39 @@
 - type: loadout
-  id: PilotClothingBackpackPilotFilled
-  equipment: PilotClothingBackpackPilotFilled
+  id: PilotClothingBackpackPilot
+  equipment: PilotClothingBackpackPilot
   price: 0
 
 - type: startingGear
-  id: PilotClothingBackpackPilotFilled
+  id: PilotClothingBackpackPilot
   equipment:
-    back: ClothingBackpackPilotFilled
+    back: ClothingBackpackPilot
 
 - type: loadout
-  id: PilotClothingBackpackDuffelPilotFilled
-  equipment: PilotClothingBackpackDuffelPilotFilled
+  id: PilotClothingBackpackDuffelPilot
+  equipment: PilotClothingBackpackDuffelPilot
   price: 0
 
 - type: startingGear
-  id: PilotClothingBackpackDuffelPilotFilled
+  id: PilotClothingBackpackDuffelPilot
   equipment:
-    back: ClothingBackpackDuffelPilotFilled
+    back: ClothingBackpackDuffelPilot
 
 - type: loadout
-  id: PilotClothingBackpackSatchelPilotFilled
-  equipment: PilotClothingBackpackSatchelPilotFilled
+  id: PilotClothingBackpackSatchelPilot
+  equipment: PilotClothingBackpackSatchelPilot
   price: 0
 
 - type: startingGear
-  id: PilotClothingBackpackSatchelPilotFilled
+  id: PilotClothingBackpackSatchelPilot
   equipment:
-    back: ClothingBackpackSatchelPilotFilled
+    back: ClothingBackpackSatchelPilot
 
 - type: loadout
-  id: PilotClothingBackpackMessengerPilotFilled
-  equipment: PilotClothingBackpackMessengerPilotFilled
+  id: PilotClothingBackpackMessengerPilot
+  equipment: PilotClothingBackpackMessengerPilot
   price: 0
 
 - type: startingGear
-  id: PilotClothingBackpackMessengerPilotFilled
+  id: PilotClothingBackpackMessengerPilot
   equipment:
-    back: ClothingBackpackMessengerPilotFilled
+    back: ClothingBackpackMessengerPilot
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/jumpsuit.yml
new file mode 100644
index 00000000000..3f8e6b84bb2
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/jumpsuit.yml
@@ -0,0 +1,19 @@
+- type: loadout
+  id: PirateJumpsuit
+  equipment: PirateJumpsuit
+  price: 0
+
+- type: startingGear
+  id: PirateJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitPirate
+
+- type: loadout
+  id: PirateJumpskirt
+  equipment: PirateJumpskirt
+  price: 0
+
+- type: startingGear
+  id: PirateJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtColorLightBrown
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/pda.yml
new file mode 100644
index 00000000000..4bac1cf9719
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/pda.yml
@@ -0,0 +1,9 @@
+- type: loadout
+  id: PiratePiratePDA
+  equipment: PiratePiratePDA
+  price: 0
+
+- type: startingGear
+  id: PiratePiratePDA
+  equipment:
+    id: PiratePDA
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Prisoner/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Prisoner/jumpsuit.yml
new file mode 100644
index 00000000000..51053e9cdbc
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Prisoner/jumpsuit.yml
@@ -0,0 +1,19 @@
+- type: loadout
+  id: PrisonerJumpsuit
+  equipment: PrisonerJumpsuit
+  price: 0
+
+- type: startingGear
+  id: PrisonerJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitPrisoner
+
+- type: loadout
+  id: PrisonerJumpskirt
+  equipment: PrisonerJumpskirt
+  price: 0
+
+- type: startingGear
+  id: PrisonerJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtPrisoner
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Prisoner/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Prisoner/pda.yml
new file mode 100644
index 00000000000..4dac52d1a5f
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Prisoner/pda.yml
@@ -0,0 +1,9 @@
+- type: loadout
+  id: PrisonerPrisonerPDA
+  equipment: PrisonerPrisonerPDA
+  price: 0
+
+- type: startingGear
+  id: PrisonerPrisonerPDA
+  equipment:
+    id: PrisonerPDA
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/bags.yml
new file mode 100644
index 00000000000..1aca7fe60f3
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/bags.yml
@@ -0,0 +1,26 @@
+- type: loadout
+  id: SecurityGuardBackpack
+  equipment: SecurityGuardBackpack
+
+- type: startingGear
+  id: SecurityGuardBackpack
+  equipment:
+    back: ClothingBackpackSecurityFilled
+
+- type: loadout
+  id: SecurityGuardSatchel
+  equipment: SecurityGuardSatchel
+
+- type: startingGear
+  id: SecurityGuardSatchel
+  equipment:
+    back: ClothingBackpackSatchelSecurityFilled
+
+- type: loadout
+  id: SecurityGuardDuffel
+  equipment: SecurityGuardDuffel
+
+- type: startingGear
+  id: SecurityGuardDuffel
+  equipment:
+    back: ClothingBackpackDuffelSecurityFilled
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/face.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/face.yml
new file mode 100644
index 00000000000..e96a224239b
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/face.yml
@@ -0,0 +1,8 @@
+- type: loadout
+  id: SecurityClothingMaskGasSecurity
+  equipment: SecurityClothingMaskGasSecurity
+
+- type: startingGear
+  id: SecurityClothingMaskGasSecurity
+  equipment:
+    mask: ClothingMaskGasSecurity
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml
index f6cbdb42101..f9e540f439b 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml
@@ -29,14 +29,14 @@
     back: ClothingBackpackSatchelSrFilled
 
 - type: loadout
-  id: StationRepClothingBackpackMessengerSrFilled
-  equipment: StationRepClothingBackpackMessengerSrFilled
+  id: StationRepClothingBackpackMessengerSr
+  equipment: StationRepClothingBackpackMessengerSr
   price: 0
 
 - type: startingGear
-  id: StationRepClothingBackpackMessengerSrFilled
+  id: StationRepClothingBackpackMessengerSr
   equipment:
-    back: ClothingBackpackMessengerSrFilled
+    back: ClothingBackpackMessengerSr
 
 - type: loadout
   id: StationRepClothingBackpackIanFilled
diff --git a/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml
index a4671d1e5cb..77d9553b60e 100644
--- a/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml
@@ -68,6 +68,7 @@
 
 - type: loadoutGroup
   id: BrigmedicBelt
+  minLimit: 1
   name: loadout-group-contractor-belt
   loadouts:
   - BrigmedicClothingBeltBrigmedicWebbing
diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
index eef99fcb59a..fca0980fb46 100644
--- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
@@ -128,38 +128,38 @@
   id: ContractorBackpack
   name: loadout-group-contractor-backpack
   loadouts:
-  - ContractorClothingBackpackFilled
-  - ContractorClothingBackpackDuffelFilled
-  - ContractorClothingBackpackSatchelFilled
-  - ContractorClothingBackpackMessengerFilled
-  - ContractorClothingBackpackCaptainFilled
-  - ContractorClothingBackpackDuffelCaptainFilled
-  - ContractorClothingBackpackSatchelCaptainFilled
-  - ContractorClothingBackpackMessengerCaptainFilled
-  - ContractorClothingBackpackSalvageFilled
-  - ContractorClothingBackpackDuffelSalvageFilled
-  - ContractorClothingBackpackSatchelSalvageFilled
-  - ContractorClothingBackpackMessengerSalvageFilled
-  - ContractorClothingBackpackCargoFilled
-  - ContractorClothingBackpackDuffelCargoFilled
-  - ContractorClothingBackpackSatchelCargoFilled
-  - ContractorClothingBackpackMessengerCargoFilled
-  - ContractorClothingBackpackHydroponicsFilled
-  - ContractorClothingBackpackDuffelHydroponicsFilled
-  - ContractorClothingBackpackSatchelHydroponicsFilled
-  - ContractorClothingBackpackMessengerHydroponicsFilled
-  - ContractorClothingBackpackScienceFilled
-  - ContractorClothingBackpackDuffelScienceFilled
-  - ContractorClothingBackpackSatchelScienceFilled
-  - ContractorClothingBackpackMessengerScienceFilled
-  - ContractorClothingBackpackMedicalFilled
-  - ContractorClothingBackpackDuffelMedicalFilled
-  - ContractorClothingBackpackSatchelMedicalFilled
-  - ContractorClothingBackpackMessengerMedicalFilled
-  - ContractorClothingBackpackChemistryFilled
-  - ContractorClothingBackpackDuffelChemistryFilled
-  - ContractorClothingBackpackSatchelChemistryFilled
-  - ContractorClothingBackpackMessengerChemistryFilled
+  - ContractorClothingBackpack
+  - ContractorClothingBackpackDuffel
+  - ContractorClothingBackpackSatchel
+  - ContractorClothingBackpackMessenger
+  - ContractorClothingBackpackCaptain
+  - ContractorClothingBackpackDuffelCaptain
+  - ContractorClothingBackpackSatchelCaptain
+  - ContractorClothingBackpackMessengerCaptain
+  - ContractorClothingBackpackSalvage
+  - ContractorClothingBackpackDuffelSalvage
+  - ContractorClothingBackpackSatchelSalvage
+  - ContractorClothingBackpackMessengerSalvage
+  - ContractorClothingBackpackCargo
+  - ContractorClothingBackpackDuffelCargo
+  - ContractorClothingBackpackSatchelCargo
+  - ContractorClothingBackpackMessengerCargo
+  - ContractorClothingBackpackHydroponics
+  - ContractorClothingBackpackDuffelHydroponics
+  - ContractorClothingBackpackSatchelHydroponics
+  - ContractorClothingBackpackMessengerHydroponics
+  - ContractorClothingBackpackScience
+  - ContractorClothingBackpackDuffelScience
+  - ContractorClothingBackpackSatchelScience
+  - ContractorClothingBackpackMessengerScience
+  - ContractorClothingBackpackMedical
+  - ContractorClothingBackpackDuffelMedical
+  - ContractorClothingBackpackSatchelMedical
+  - ContractorClothingBackpackMessengerMedical
+  - ContractorClothingBackpackChemistry
+  - ContractorClothingBackpackDuffelChemistry
+  - ContractorClothingBackpackSatchelChemistry
+  - ContractorClothingBackpackMessengerChemistry
   - ContractorClothingBackpackGenetics
   - ContractorClothingBackpackDuffelGenetics
   - ContractorClothingBackpackSatchelGenetics
@@ -168,22 +168,33 @@
   - ContractorClothingBackpackDuffelVirology
   - ContractorClothingBackpackSatchelVirology
   - ContractorClothingBackpackMessengerVirology
-  - ContractorClothingBackpackEngineeringFilled
-  - ContractorClothingBackpackDuffelEngineeringFilled
-  - ContractorClothingBackpackSatchelEngineeringFilled
-  - ContractorClothingBackpackMessengerEngineeringFilled
-  - ContractorClothingBackpackAtmosphericsFilled
-  - ContractorClothingBackpackDuffelAtmosphericsFilled
-  - ContractorClothingBackpackSatchelAtmosphericsFilled
-  - ContractorClothingBackpackMessengerAtmosphericsFilled
-  - ContractorClothingBackpackClownFilled
-  - ContractorClothingBackpackDuffelClownFilled
-  - ContractorClothingBackpackSatchelClownFilled
-  - ContractorClothingBackpackMessengerClownFilled
-  - ContractorClothingBackpackMimeFilled
-  - ContractorClothingBackpackDuffelMimeFilled
-  - ContractorClothingBackpackSatchelMimeFilled
-  - ContractorClothingBackpackMessengerMimeFilled
+  - ContractorClothingBackpackEngineering
+  - ContractorClothingBackpackDuffelEngineering
+  - ContractorClothingBackpackSatchelEngineering
+  - ContractorClothingBackpackMessengerEngineering
+  - ContractorClothingBackpackMessengerChiefEngineer
+  - ContractorClothingBackpackAtmospherics
+  - ContractorClothingBackpackDuffelAtmospherics
+  - ContractorClothingBackpackSatchelAtmospherics
+  - ContractorClothingBackpackMessengerAtmospherics
+  - ContractorClothingBackpackMessengerChaplain
+  - ContractorClothingBackpackMessengerColorBlack
+  - ContractorClothingBackpackMessengerColorWhite
+  - ContractorClothingBackpackMessengerColorBlue
+  - ContractorClothingBackpackMessengerColorGreen
+  - ContractorClothingBackpackMessengerColorOrange
+  - ContractorClothingBackpackMessengerColorRed
+  - ContractorClothingBackpackMessengerColorPurple
+  - ContractorClothingBackpackMessengerColorBrownLight
+  - ContractorClothingBackpackMessengerColorBrown
+  - ContractorClothingBackpackClown
+  - ContractorClothingBackpackDuffelClown
+  - ContractorClothingBackpackSatchelClown
+  - ContractorClothingBackpackMessengerClown
+  - ContractorClothingBackpackMime
+  - ContractorClothingBackpackDuffelMime
+  - ContractorClothingBackpackSatchelMime
+  - ContractorClothingBackpackMessengerMime
   
 - type: loadoutGroup
   id: ContractorOuterClothing
@@ -600,6 +611,8 @@
   name: loadout-group-contractor-face
   minLimit: 0
   loadouts:
+  - ContractorClothingMaskBreath
+  - ContractorClothingMaskBreathMedical
   - ContractorClothingMaskSterile
   - ContractorClothingMaskGas
   - ContractorClothingMaskGasExplorer
@@ -652,4 +665,37 @@
   - ClothingNeckPansexualPin
   - ClothingNeckTransPin
   - ClothingNeckAutismPin
-  - ClothingNeckGoldAutismPin
\ No newline at end of file
+  - ClothingNeckGoldAutismPin
+
+- type: loadoutGroup
+  id: ContractorBoxSurvival
+  name: loadout-group-contractor-survival-box
+  minLimit: 1
+  loadouts:
+  - ContractorBoxSurvivalNFOxygen
+  - ContractorBoxSurvivalNFNitrogen
+  - ContractorBoxSurvivalNFOxygenExtended
+  - ContractorBoxSurvivalNFNitrogenExtended
+
+- type: loadoutGroup
+  id: ContractorEncryptionKey
+  name: loadout-group-contractor-encryption-key
+  minLimit: 1
+  maxLimit: 3
+  loadouts:
+  - ContractorEncryptionKeyTraffic
+  - ContractorEncryptionKeyMedical
+  - ContractorEncryptionKeyCargo
+  - ContractorEncryptionKeyEngineering
+  - ContractorEncryptionKeyScience
+
+- type: loadoutGroup
+  id: ContractorImplanter
+  name: loadout-group-contractor-implanter
+  minLimit: 0
+  maxLimit: 2
+  loadouts:
+  - ContractorMedicalTrackingImplanter
+  - ContractorLightImplanter
+  - ContractorBikeHornImplanter
+  - ContractorSadTromboneImplanter
diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
index 00c0590f93d..5ae5dbd5334 100644
--- a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
@@ -132,46 +132,46 @@
   id: MercenaryBackpack
   name: loadout-group-contractor-backpack
   loadouts:
-  - MercenaryClothingBackpackMercenaryFilled
-  - MercenaryClothingBackpackDuffelMercenaryFilled
-  - MercenaryClothingBackpackSatchelMercenaryFilled
-  - MercenaryClothingBackpackMessengerMercenaryFilled
-  - ContractorClothingBackpackFilled
-  - ContractorClothingBackpackDuffelFilled
-  - ContractorClothingBackpackSatchelFilled
-  - ContractorClothingBackpackMessengerFilled
-  - PilotClothingBackpackPilotFilled
-  - PilotClothingBackpackDuffelPilotFilled
-  - PilotClothingBackpackSatchelPilotFilled
-  - PilotClothingBackpackMessengerPilotFilled
-  - ContractorClothingBackpackCaptainFilled
-  - ContractorClothingBackpackDuffelCaptainFilled
-  - ContractorClothingBackpackSatchelCaptainFilled
-  - ContractorClothingBackpackMessengerCaptainFilled
-  - ContractorClothingBackpackSalvageFilled
-  - ContractorClothingBackpackDuffelSalvageFilled
-  - ContractorClothingBackpackSatchelSalvageFilled
-  - ContractorClothingBackpackMessengerSalvageFilled
-  - ContractorClothingBackpackCargoFilled
-  - ContractorClothingBackpackDuffelCargoFilled
-  - ContractorClothingBackpackSatchelCargoFilled
-  - ContractorClothingBackpackMessengerCargoFilled
-  - ContractorClothingBackpackHydroponicsFilled
-  - ContractorClothingBackpackDuffelHydroponicsFilled
-  - ContractorClothingBackpackSatchelHydroponicsFilled
-  - ContractorClothingBackpackMessengerHydroponicsFilled
-  - ContractorClothingBackpackScienceFilled
-  - ContractorClothingBackpackDuffelScienceFilled
-  - ContractorClothingBackpackSatchelScienceFilled
-  - ContractorClothingBackpackMessengerScienceFilled
-  - ContractorClothingBackpackMedicalFilled
-  - ContractorClothingBackpackDuffelMedicalFilled
-  - ContractorClothingBackpackSatchelMedicalFilled
-  - ContractorClothingBackpackMessengerMedicalFilled
-  - ContractorClothingBackpackChemistryFilled
-  - ContractorClothingBackpackDuffelChemistryFilled
-  - ContractorClothingBackpackSatchelChemistryFilled
-  - ContractorClothingBackpackMessengerChemistryFilled
+  - MercenaryClothingBackpackMercenary
+  - MercenaryClothingBackpackDuffelMercenary
+  - MercenaryClothingBackpackSatchelMercenary
+  - MercenaryClothingBackpackMessengerMercenary
+  - ContractorClothingBackpack
+  - ContractorClothingBackpackDuffel
+  - ContractorClothingBackpackSatchel
+  - ContractorClothingBackpackMessenger
+  - PilotClothingBackpackPilot
+  - PilotClothingBackpackDuffelPilot
+  - PilotClothingBackpackSatchelPilot
+  - PilotClothingBackpackMessengerPilot
+  - ContractorClothingBackpackCaptain
+  - ContractorClothingBackpackDuffelCaptain
+  - ContractorClothingBackpackSatchelCaptain
+  - ContractorClothingBackpackMessengerCaptain
+  - ContractorClothingBackpackSalvage
+  - ContractorClothingBackpackDuffelSalvage
+  - ContractorClothingBackpackSatchelSalvage
+  - ContractorClothingBackpackMessengerSalvage
+  - ContractorClothingBackpackCargo
+  - ContractorClothingBackpackDuffelCargo
+  - ContractorClothingBackpackSatchelCargo
+  - ContractorClothingBackpackMessengerCargo
+  - ContractorClothingBackpackHydroponics
+  - ContractorClothingBackpackDuffelHydroponics
+  - ContractorClothingBackpackSatchelHydroponics
+  - ContractorClothingBackpackMessengerHydroponics
+  - ContractorClothingBackpackScience
+  - ContractorClothingBackpackDuffelScience
+  - ContractorClothingBackpackSatchelScience
+  - ContractorClothingBackpackMessengerScience
+  - ContractorClothingBackpackMedical
+  - ContractorClothingBackpackDuffelMedical
+  - ContractorClothingBackpackSatchelMedical
+  - ContractorClothingBackpackMessengerMedical
+  - ContractorClothingBackpackChemistry
+  - ContractorClothingBackpackDuffelChemistry
+  - ContractorClothingBackpackSatchelChemistry
+  - ContractorClothingBackpackMessengerChemistry
   - ContractorClothingBackpackGenetics
   - ContractorClothingBackpackDuffelGenetics
   - ContractorClothingBackpackSatchelGenetics
@@ -180,22 +180,33 @@
   - ContractorClothingBackpackDuffelVirology
   - ContractorClothingBackpackSatchelVirology
   - ContractorClothingBackpackMessengerVirology
-  - ContractorClothingBackpackEngineeringFilled
-  - ContractorClothingBackpackDuffelEngineeringFilled
-  - ContractorClothingBackpackSatchelEngineeringFilled
-  - ContractorClothingBackpackMessengerEngineeringFilled
-  - ContractorClothingBackpackAtmosphericsFilled
-  - ContractorClothingBackpackDuffelAtmosphericsFilled
-  - ContractorClothingBackpackSatchelAtmosphericsFilled
-  - ContractorClothingBackpackMessengerAtmosphericsFilled
-  - ContractorClothingBackpackClownFilled
-  - ContractorClothingBackpackDuffelClownFilled
-  - ContractorClothingBackpackSatchelClownFilled
-  - ContractorClothingBackpackMessengerClownFilled
-  - ContractorClothingBackpackMimeFilled
-  - ContractorClothingBackpackDuffelMimeFilled
-  - ContractorClothingBackpackSatchelMimeFilled
-  - ContractorClothingBackpackMessengerMimeFilled
+  - ContractorClothingBackpackEngineering
+  - ContractorClothingBackpackDuffelEngineering
+  - ContractorClothingBackpackSatchelEngineering
+  - ContractorClothingBackpackMessengerEngineering
+  - ContractorClothingBackpackMessengerChiefEngineer
+  - ContractorClothingBackpackAtmospherics
+  - ContractorClothingBackpackDuffelAtmospherics
+  - ContractorClothingBackpackSatchelAtmospherics
+  - ContractorClothingBackpackMessengerAtmospherics
+  - ContractorClothingBackpackMessengerChaplain
+  - ContractorClothingBackpackMessengerColorBlack
+  - ContractorClothingBackpackMessengerColorWhite
+  - ContractorClothingBackpackMessengerColorBlue
+  - ContractorClothingBackpackMessengerColorGreen
+  - ContractorClothingBackpackMessengerColorOrange
+  - ContractorClothingBackpackMessengerColorRed
+  - ContractorClothingBackpackMessengerColorPurple
+  - ContractorClothingBackpackMessengerColorBrownLight
+  - ContractorClothingBackpackMessengerColorBrown
+  - ContractorClothingBackpackClown
+  - ContractorClothingBackpackDuffelClown
+  - ContractorClothingBackpackSatchelClown
+  - ContractorClothingBackpackMessengerClown
+  - ContractorClothingBackpackMime
+  - ContractorClothingBackpackDuffelMime
+  - ContractorClothingBackpackSatchelMime
+  - ContractorClothingBackpackMessengerMime
   
 - type: loadoutGroup
   id: MercenaryOuterClothing
@@ -504,6 +515,8 @@
   minLimit: 0
   loadouts:
   - MercenaryClothingMaskGasMercenary
+  - ContractorClothingMaskBreath
+  - ContractorClothingMaskBreathMedical
   - ContractorClothingMaskSterile
   - ContractorClothingMaskGas
   - ContractorClothingMaskGasExplorer
diff --git a/Resources/Prototypes/_NF/Loadouts/nfsd_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/nfsd_loadout_groups.yml
index e18f459d755..86479a65b7d 100644
--- a/Resources/Prototypes/_NF/Loadouts/nfsd_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/nfsd_loadout_groups.yml
@@ -1,6 +1,22 @@
 - type: loadoutGroup
   id: NfsdBelt
-  name: loadout-group-security-belt
+  name: loadout-group-contractor-belt
+  minLimit: 1
   loadouts:
   - NfsdWebbing
   - NfsdBelt
+
+- type: loadoutGroup
+  id: NfsdBoxSurvival
+  name: loadout-group-contractor-survival-box
+  minLimit: 1
+  loadouts:
+  - NfsdBoxSurvivalNfsdOxygen
+  - NfsdBoxSurvivalNfsdNitrogen
+
+- type: loadoutGroup
+  id: NfsdFace
+  name: loadout-group-contractor-face
+  minLimit: 0
+  loadouts:
+  - NfsdClothingMaskGasNfsd
diff --git a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml
index b7051fbf923..e2996f77db3 100644
--- a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml
@@ -130,42 +130,42 @@
   id: PilotBackpack
   name: loadout-group-contractor-backpack
   loadouts:
-  - PilotClothingBackpackPilotFilled
-  - PilotClothingBackpackDuffelPilotFilled
-  - PilotClothingBackpackSatchelPilotFilled
-  - PilotClothingBackpackMessengerPilotFilled
-  - ContractorClothingBackpackFilled
-  - ContractorClothingBackpackDuffelFilled
-  - ContractorClothingBackpackSatchelFilled
-  - ContractorClothingBackpackMessengerFilled
-  - ContractorClothingBackpackCaptainFilled
-  - ContractorClothingBackpackDuffelCaptainFilled
-  - ContractorClothingBackpackSatchelCaptainFilled
-  - ContractorClothingBackpackMessengerCaptainFilled
-  - ContractorClothingBackpackSalvageFilled
-  - ContractorClothingBackpackDuffelSalvageFilled
-  - ContractorClothingBackpackSatchelSalvageFilled
-  - ContractorClothingBackpackMessengerSalvageFilled
-  - ContractorClothingBackpackCargoFilled
-  - ContractorClothingBackpackDuffelCargoFilled
-  - ContractorClothingBackpackSatchelCargoFilled
-  - ContractorClothingBackpackMessengerCargoFilled
-  - ContractorClothingBackpackHydroponicsFilled
-  - ContractorClothingBackpackDuffelHydroponicsFilled
-  - ContractorClothingBackpackSatchelHydroponicsFilled
-  - ContractorClothingBackpackMessengerHydroponicsFilled
-  - ContractorClothingBackpackScienceFilled
-  - ContractorClothingBackpackDuffelScienceFilled
-  - ContractorClothingBackpackSatchelScienceFilled
-  - ContractorClothingBackpackMessengerScienceFilled
-  - ContractorClothingBackpackMedicalFilled
-  - ContractorClothingBackpackDuffelMedicalFilled
-  - ContractorClothingBackpackSatchelMedicalFilled
-  - ContractorClothingBackpackMessengerMedicalFilled
-  - ContractorClothingBackpackChemistryFilled
-  - ContractorClothingBackpackDuffelChemistryFilled
-  - ContractorClothingBackpackSatchelChemistryFilled
-  - ContractorClothingBackpackMessengerChemistryFilled
+  - PilotClothingBackpackPilot
+  - PilotClothingBackpackDuffelPilot
+  - PilotClothingBackpackSatchelPilot
+  - PilotClothingBackpackMessengerPilot
+  - ContractorClothingBackpack
+  - ContractorClothingBackpackDuffel
+  - ContractorClothingBackpackSatchel
+  - ContractorClothingBackpackMessenger
+  - ContractorClothingBackpackCaptain
+  - ContractorClothingBackpackDuffelCaptain
+  - ContractorClothingBackpackSatchelCaptain
+  - ContractorClothingBackpackMessengerCaptain
+  - ContractorClothingBackpackSalvage
+  - ContractorClothingBackpackDuffelSalvage
+  - ContractorClothingBackpackSatchelSalvage
+  - ContractorClothingBackpackMessengerSalvage
+  - ContractorClothingBackpackCargo
+  - ContractorClothingBackpackDuffelCargo
+  - ContractorClothingBackpackSatchelCargo
+  - ContractorClothingBackpackMessengerCargo
+  - ContractorClothingBackpackHydroponics
+  - ContractorClothingBackpackDuffelHydroponics
+  - ContractorClothingBackpackSatchelHydroponics
+  - ContractorClothingBackpackMessengerHydroponics
+  - ContractorClothingBackpackScience
+  - ContractorClothingBackpackDuffelScience
+  - ContractorClothingBackpackSatchelScience
+  - ContractorClothingBackpackMessengerScience
+  - ContractorClothingBackpackMedical
+  - ContractorClothingBackpackDuffelMedical
+  - ContractorClothingBackpackSatchelMedical
+  - ContractorClothingBackpackMessengerMedical
+  - ContractorClothingBackpackChemistry
+  - ContractorClothingBackpackDuffelChemistry
+  - ContractorClothingBackpackSatchelChemistry
+  - ContractorClothingBackpackMessengerChemistry
   - ContractorClothingBackpackGenetics
   - ContractorClothingBackpackDuffelGenetics
   - ContractorClothingBackpackSatchelGenetics
@@ -174,22 +174,33 @@
   - ContractorClothingBackpackDuffelVirology
   - ContractorClothingBackpackSatchelVirology
   - ContractorClothingBackpackMessengerVirology
-  - ContractorClothingBackpackEngineeringFilled
-  - ContractorClothingBackpackDuffelEngineeringFilled
-  - ContractorClothingBackpackSatchelEngineeringFilled
-  - ContractorClothingBackpackMessengerEngineeringFilled
-  - ContractorClothingBackpackAtmosphericsFilled
-  - ContractorClothingBackpackDuffelAtmosphericsFilled
-  - ContractorClothingBackpackSatchelAtmosphericsFilled
-  - ContractorClothingBackpackMessengerAtmosphericsFilled
-  - ContractorClothingBackpackClownFilled
-  - ContractorClothingBackpackDuffelClownFilled
-  - ContractorClothingBackpackSatchelClownFilled
-  - ContractorClothingBackpackMessengerClownFilled
-  - ContractorClothingBackpackMimeFilled
-  - ContractorClothingBackpackDuffelMimeFilled
-  - ContractorClothingBackpackSatchelMimeFilled
-  - ContractorClothingBackpackMessengerMimeFilled
+  - ContractorClothingBackpackEngineering
+  - ContractorClothingBackpackDuffelEngineering
+  - ContractorClothingBackpackSatchelEngineering
+  - ContractorClothingBackpackMessengerEngineering
+  - ContractorClothingBackpackMessengerChiefEngineer
+  - ContractorClothingBackpackAtmospherics
+  - ContractorClothingBackpackDuffelAtmospherics
+  - ContractorClothingBackpackSatchelAtmospherics
+  - ContractorClothingBackpackMessengerAtmospherics
+  - ContractorClothingBackpackMessengerChaplain
+  - ContractorClothingBackpackMessengerColorBlack
+  - ContractorClothingBackpackMessengerColorWhite
+  - ContractorClothingBackpackMessengerColorBlue
+  - ContractorClothingBackpackMessengerColorGreen
+  - ContractorClothingBackpackMessengerColorOrange
+  - ContractorClothingBackpackMessengerColorRed
+  - ContractorClothingBackpackMessengerColorPurple
+  - ContractorClothingBackpackMessengerColorBrownLight
+  - ContractorClothingBackpackMessengerColorBrown
+  - ContractorClothingBackpackClown
+  - ContractorClothingBackpackDuffelClown
+  - ContractorClothingBackpackSatchelClown
+  - ContractorClothingBackpackMessengerClown
+  - ContractorClothingBackpackMime
+  - ContractorClothingBackpackDuffelMime
+  - ContractorClothingBackpackSatchelMime
+  - ContractorClothingBackpackMessengerMime
   
 - type: loadoutGroup
   id: PilotOuterClothing
@@ -538,6 +549,8 @@
   minLimit: 0
   loadouts:
   - PilotClothingMaskPilot
+  - ContractorClothingMaskBreath
+  - ContractorClothingMaskBreathMedical
   - ContractorClothingMaskSterile
   - ContractorClothingMaskGas
   - ContractorClothingMaskGasExplorer
diff --git a/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml
new file mode 100644
index 00000000000..bbe9e1ab2c3
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml
@@ -0,0 +1,21 @@
+- type: loadoutGroup
+  id: PirateJumpsuit
+  name: loadout-group-contractor-jumpsuit
+  loadouts:
+  - PirateJumpsuit
+  - PirateJumpskirt
+
+- type: loadoutGroup
+  id: PiratePDA
+  name: loadout-group-contractor-id
+  loadouts:
+  - PiratePiratePDA
+
+- type: loadoutGroup
+  id: PirateFace
+  name: loadout-group-contractor-face
+  minLimit: 0
+  loadouts:
+  - ContractorClothingMaskBreath
+  - ContractorClothingMaskBreathMedical
+  - ContractorClothingMaskGas
diff --git a/Resources/Prototypes/_NF/Loadouts/prisoner_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/prisoner_loadout_groups.yml
new file mode 100644
index 00000000000..865a660cca3
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/prisoner_loadout_groups.yml
@@ -0,0 +1,12 @@
+- type: loadoutGroup
+  id: PrisonerJumpsuit
+  name: loadout-group-contractor-jumpsuit
+  loadouts:
+  - PrisonerJumpsuit
+  - PrisonerJumpskirt
+
+- type: loadoutGroup
+  id: PrisonerPDA
+  name: loadout-group-contractor-id
+  loadouts:
+  - PrisonerPrisonerPDA
diff --git a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml
index f5c8fa08111..bd3dd1f8689 100644
--- a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml
@@ -3,17 +3,20 @@
 - type: roleLoadout
   id: JobContractor
   groups:
+  - ContractorHead
+  - ContractorNeck
   - ContractorJumpsuit
-  - ContractorPDA
+  - ContractorGloves
   - ContractorBackpack
-  - ContractorShoes
   - ContractorOuterClothing
-  - ContractorHead
-  - ContractorBelt
+  - ContractorShoes
   - ContractorFace
-  - ContractorNeck
-  - ContractorGloves
   - ContractorGlasses
+  - ContractorPDA
+  - ContractorBelt
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorUtility
   - ContractorFun
   - ContractorTrinkets
@@ -23,17 +26,20 @@
 - type: roleLoadout
   id: JobMercenary
   groups:
+  - MercenaryHead
+  - ContractorNeck
   - MercenaryJumpsuit
-  - MercenaryPDA
+  - MercenaryGloves
   - MercenaryBackpack
-  - MercenaryBelt
-  - MercenaryHead
-  - MercenaryFace
   - MercenaryOuterClothing
-  - MercenaryGlasses
   - MercenaryShoes
-  - ContractorNeck
-  - MercenaryGloves
+  - MercenaryFace
+  - MercenaryGlasses
+  - MercenaryPDA
+  - MercenaryBelt
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorUtility
   - ContractorFun
   - ContractorTrinkets
@@ -43,17 +49,20 @@
 - type: roleLoadout
   id: JobPilot
   groups:
+  - PilotHead
+  - PilotNeck
   - PilotJumpsuit
-  - PilotPDA
+  - PilotGloves
   - PilotBackpack
-  - PilotBelt
-  - PilotShoes
   - PilotOuterClothing
+  - PilotShoes
   - PilotFace
-  - PilotHead
-  - PilotGloves
-  - PilotNeck
   - PilotGlasses
+  - PilotPDA
+  - PilotBelt
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorUtility
   - ContractorFun
   - ContractorTrinkets
@@ -63,57 +72,67 @@
 - type: roleLoadout
   id: JobValet
   groups:
+  - ContractorNeck
   - ValetJumpsuit
   - ContractorBackpack
   - ContractorShoes
   - ContractorFace
-  - ContractorNeck
   - ContractorGlasses
   - ContractorBelt
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
 - type: roleLoadout
   id: JobMailCarrier
   groups:
+  - ContractorNeck
   - MailCarrierJumpsuit
+  - ContractorGloves
   - ContractorBackpack
   - MailCarrierOuterClothing
   - ContractorShoes
-  - ContractorGloves
   - ContractorFace
-  - ContractorNeck
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
 - type: roleLoadout
   id: JobStationTrafficController
   groups:
+  - ContractorNeck
   - StcJumpsuit
-  - ContractorBackpack
   - ContractorGloves
-  - ContractorShoes
+  - ContractorBackpack
   - ContractorOuterClothing
+  - ContractorShoes
   - ContractorFace
-  - ContractorNeck
   - ContractorGlasses
   - ContractorBelt
+  - ContractorBoxSurvival
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
 - type: roleLoadout
   id: JobStationRepresentative
   groups:
-  - StationRepJumpsuit
-  - StationRepBackpack
-  - StationRepOuterClothing
   - StationRepHead
   - StationRepNeck
+  - StationRepJumpsuit
   - StationRepGloves
+  - StationRepBackpack
+  - StationRepOuterClothing
   - ContractorShoes
-  - ContractorBelt
   - ContractorFace
   - ContractorGlasses
+  - ContractorBelt
+  - ContractorBoxSurvival
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
@@ -122,13 +141,17 @@
   id: JobSecurityGuard
   groups:
   - SecurityGuardHead
-  - SecurityGuardPDA
   - SecurityGuardJumpsuit
   - SecurityGuardGloves
-  - SecurityBackpack
+  - SecurityGuardBackpack
   - SecurityGuardOuterClothing
   - SecurityGuardShoes
+  - SecurityGuardFace
+  - SecurityGuardPDA
   - SecurityGuardBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
 
@@ -137,14 +160,18 @@
   id: JobCadet
   groups:
   - CadetHead
-  - CadetPDA
   - CadetJumpsuit
+  - CadetGloves
   - CadetBackpack
   - CadetOuterClothing
   - CadetShoes
-  - CadetGloves
+  - NfsdFace
   - CadetGlasses
+  - CadetPDA
   - NfsdBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
 
@@ -152,14 +179,18 @@
   id: JobDeputy
   groups:
   - DeputyHead
-  - DeputyPDA
   - DeputyJumpsuit
+  - DeputyGloves
   - DeputyBackpack
   - DeputyOuterClothing
   - DeputyShoes
-  - DeputyGloves
+  - NfsdFace
   - DeputyGlasses
+  - DeputyPDA
   - NfsdBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
   
@@ -168,15 +199,18 @@
   groups:
   - BrigmedicHead
   - BrigmedicNeck
-  - BrigmedicPDA
   - BrigmedicJumpsuit
+  - BrigmedicGloves
   - BrigmedicBackpack
   - BrigmedicOuterClothing
   - BrigmedicShoes
   - BrigmedicFace
-  - BrigmedicGloves
   - BrigmedicGlasses
+  - BrigmedicPDA
   - BrigmedicBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
 
@@ -184,14 +218,18 @@
   id: JobDetectiveNF
   groups:
   - DetectiveNFHead
-  - DetectiveNFPDA
   - DetectiveNFJumpsuit
+  - DetectiveNFGloves
   - DetectiveNFBackpack
   - DetectiveNFOuterClothing
   - DetectiveNFShoes
-  - DetectiveNFGloves
+  - NfsdFace
   - DetectiveNFGlasses
+  - DetectiveNFPDA
   - NfsdBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
 
@@ -213,14 +251,18 @@
   id: JobBailiff
   groups:
   - BailiffHead
-  - BailiffPDA
   - BailiffJumpsuit
+  - BailiffGloves
   - BailiffBackpack
   - BailiffOuterClothing
   - BailiffShoes
-  - BailiffGloves
+  - NfsdFace
   - BailiffGlasses
+  - BailiffPDA
   - NfsdBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
 
@@ -228,14 +270,18 @@
   id: JobSeniorOfficer
   groups:
   - SeniorOfficerHead
-  - SeniorOfficerPDA
   - SeniorOfficerJumpsuit
+  - SeniorOfficerGloves
   - SeniorOfficerBackpack
   - SeniorOfficerOuterClothing
   - SeniorOfficerShoes
-  - SeniorOfficerGloves
+  - NfsdFace
   - SeniorOfficerGlasses
+  - SeniorOfficerPDA
   - NfsdBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
 
@@ -244,14 +290,71 @@
   groups:
   - SheriffHead
   - SheriffNeck
-  - SheriffPDA
   - SheriffJumpsuit
+  - SheriffGloves
   - SheriffBackpack
   - SheriffOuterClothing
   - SheriffShoes
   - SheriffFace
-  - SheriffGloves
   - SheriffGlasses
+  - SheriffPDA
   - NfsdBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
+
+# Pirate
+
+- type: roleLoadout
+  id: JobPirate
+  groups:
+#  - PirateHead
+#  - PirateNeck
+  - PirateJumpsuit
+#  - PirateGloves
+  - ContractorBackpack
+#  - PirateOuterClothing
+#  - PirateShoes
+  - PirateFace
+  - PiratePDA
+  - ContractorBoxSurvival
+
+- type: roleLoadout
+  id: JobPirateFirstMate
+  groups:
+#  - PirateHead
+#  - PirateNeck
+  - PirateJumpsuit
+#  - PirateGloves
+  - ContractorBackpack
+#  - PirateOuterClothing
+#  - PirateShoes
+  - PirateFace
+  - PiratePDA
+  - ContractorBoxSurvival
+
+- type: roleLoadout
+  id: JobPirateCaptain
+  groups:
+#  - PirateHead
+#  - PirateNeck
+  - PirateJumpsuit
+#  - PirateGloves
+  - ContractorBackpack
+#  - PirateOuterClothing
+#  - PirateShoes
+  - PirateFace
+  - PiratePDA
+  - ContractorBoxSurvival
+
+# Prisoner
+
+- type: roleLoadout
+  id: JobPrisoner
+  groups:
+#  - PirateHead
+#  - PirateNeck
+  - PrisonerJumpsuit
+#  - PrisonerShoes
+  - PrisonerPDA
diff --git a/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml b/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml
index a4ff0d4bb15..97b7a52b7fb 100644
--- a/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml
@@ -1,6 +1,6 @@
 - type: loadoutGroup
   id: SecurityGuardGloves
-  name: loadout-group-security-guard-gloves
+  name: loadout-group-contractor-gloves
   loadouts:
   - CombatGloves
   - ColorBlackGloves
@@ -8,7 +8,7 @@
 
 - type: loadoutGroup
   id: SecurityGuardHead
-  name: loadout-group-security-guard-head
+  name: loadout-group-contractor-head
   minLimit: 0
   loadouts:
   - SecurityBeret
@@ -16,21 +16,29 @@
 
 - type: loadoutGroup
   id: SecurityGuardJumpsuit
-  name: loadout-group-security-guard-jumpsuit
+  name: loadout-group-contractor-jumpsuit
   loadouts:
   - SecurityGuardJumpsuit
   - SecurityGuardJumpskirt
 
+- type: loadoutGroup
+  id: SecurityGuardBackpack
+  name: loadout-group-contractor-backpack
+  loadouts:
+  - SecurityGuardBackpack
+  - SecurityGuardSatchel
+  - SecurityGuardDuffel
+
 - type: loadoutGroup
   id: SecurityGuardOuterClothing
-  name: loadout-group-security-guard-outerclothing
+  name: loadout-group-contractor-outerclothing
   loadouts:
   - ArmorVest
   - ArmorVestSlim
 
 - type: loadoutGroup
   id: SecurityGuardShoes
-  name: loadout-group-security-guard-shoes
+  name: loadout-group-contractor-shoes
   loadouts:
   - LeatherShoes
   - CombatBoots
@@ -38,13 +46,20 @@
 
 - type: loadoutGroup
   id: SecurityGuardBelt
-  name: loadout-group-security-belt
+  name: loadout-group-contractor-belt
   loadouts:
   - SecurityBelt
   - SecurityWebbing
 
 - type: loadoutGroup
   id: SecurityGuardPDA
-  name: loadout-group-security-belt
+  name: loadout-group-contractor-id
+  loadouts:
+  - SecurityGuardSecurityGuardPDA
+
+- type: loadoutGroup
+  id: SecurityGuardFace
+  name: loadout-group-contractor-face
+  minLimit: 0
   loadouts:
-  - SecurityGuardSecurityGuardPDA
\ No newline at end of file
+  - SecurityClothingMaskGasSecurity
diff --git a/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml
index afd8458b317..48b3f2cdc51 100644
--- a/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml
@@ -12,7 +12,7 @@
   - StationRepClothingBackpackSrFilled
   - StationRepClothingBackpackDuffelSrFilled
   - StationRepClothingBackpackSatchelSrFilled
-  - StationRepClothingBackpackMessengerSrFilled
+  - StationRepClothingBackpackMessengerSr
   - StationRepClothingBackpackIanFilled #We put the ian bag here so its not default, we also let SR pick a bag out of drip concerns.
   
 - type: loadoutGroup
diff --git a/Resources/Prototypes/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml b/Resources/Prototypes/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml
new file mode 100644
index 00000000000..d7eb0d73c88
--- /dev/null
+++ b/Resources/Prototypes/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml
@@ -0,0 +1,121 @@
+- type: entity
+  id: BaseSpeedLoaderHeavyRifle
+  name: "speed loader (.20 rifle)"
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+      - SpeedLoaderRifleHeavy
+  - type: SpeedLoader
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+        - CartridgeRifle
+    capacity: 8
+  - type: Sprite
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
+
+- type: entity
+  id: SpeedLoaderRifleHeavy
+  name: "speed loader (.20 rifle)"
+  parent: BaseSpeedLoaderHeavyRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifle
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: base-8
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: base
+    steps: 9
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderRifleHeavyEmpty
+  name: "speed loader (.20 rifle any)"
+  parent: SpeedLoaderRifleHeavy
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+
+- type: entity
+  id: SpeedLoaderRifleHeavyIncendiary
+  name: "speed loader (.20 rifle incendiary)"
+  parent: BaseSpeedLoaderHeavyRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleIncendiary
+
+- type: entity
+  id: SpeedLoaderRifleHeavyPractice
+  name: "speed loader (.20 rifle practice)"
+  parent: BaseSpeedLoaderHeavyRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRiflePractice
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: practice-8
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: practice
+    steps: 9
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderRifleHeavyUranium
+  name: "speed loader (.20 rifle uranium)"
+  parent: BaseSpeedLoaderHeavyRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleUranium
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: uranium-8
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: uranium
+    steps: 9
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderRifleHeavyRubber
+  name: "speed loader (.20 rifle rubber)"
+  parent: BaseSpeedLoaderHeavyRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleRubber
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: rubber-8
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: rubber
+    steps: 9
+    zeroVisible: false
+  - type: Appearance
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml
new file mode 100644
index 00000000000..b521e8e0c60
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml
@@ -0,0 +1,42 @@
+- type: latheRecipe
+  id: SpeedLoaderRifleHeavyEmpty
+  result: SpeedLoaderRifleHeavyEmpty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50
+
+- type: latheRecipe
+  id: SpeedLoaderRifleHeavy
+  result: SpeedLoaderRifleHeavy
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 190
+
+- type: latheRecipe
+  id: SpeedLoaderRifleHeavyPractice
+  result: SpeedLoaderRifleHeavyPractice
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 90
+
+- type: latheRecipe
+  id: SpeedLoaderRifleHeavyUranium
+  result: SpeedLoaderRifleHeavyUranium
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50
+    Plastic: 150
+    Uranium: 110
+
+- type: latheRecipe
+  id: SpeedLoaderRifleHeavyIncendiary
+  result: SpeedLoaderRifleHeavyIncendiary
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50
+    Plastic: 150
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml
index 660e3495766..0ac8ae0fa09 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml
@@ -8,9 +8,9 @@
   requirements:
     - !type:OverallPlaytimeRequirement
       time: 72000 # 20 hrs
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 10800 # 3 hrs as sec
+    - !type:RoleTimeRequirement
+      role: JobSecurityGuard
+      time: 10800 # 3 hrs as security guard
   canBeAntag: false
   icon: "JobIconStc" 
   supervisors: job-supervisors-sr
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml
index de3ad6b9154..0ebf35aed05 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:OverallPlaytimeRequirement
       time: 86400 # Frontier - 24 hours
-  startingGear: NFPirateGear
+  startingGear: PirateNFGear
   alwaysUseSpawner: true
   hideConsoleVisibility: true
   canBeAntag: true
@@ -23,17 +23,10 @@
     implants: [ FreelanceTrackingImplant ]
 
 - type: startingGear
-  id: NFPirateGear
+  id: PirateNFGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
     head: ClothingHeadBandBlack
     ears: ClothingHeadsetAltFreelancer
     shoes: ClothingShoesBootsLaceup
-    id: PiratePDA
     belt: ClothingBeltUtility
     pocket1: AppraisalTool
-  # innerClothingSkirt: ClothingUniformJumpsuitPirate
-  # satchel: ClothingBackpackPirateFilled
-  # duffelbag: ClothingBackpackPirateFilled
-  # messenger: ClothingBackpackMessengerMercenaryFilled
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml
index 283a9ca1e19..2534068ab34 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml
@@ -7,7 +7,7 @@
     - !type:WhitelistRequirement
     - !type:OverallPlaytimeRequirement
       time: 172800 # Frontier - 48 hours
-  startingGear: NFPirateCaptainGear
+  startingGear: PirateCaptainNFGear
   alwaysUseSpawner: true
   hideConsoleVisibility: true
   canBeAntag: true
@@ -24,19 +24,12 @@
     implants: [ FreelanceTrackingImplant ]
 
 - type: startingGear
-  id: NFPirateCaptainGear
+  id: PirateCaptainNFGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
     head: ClothingHeadHatPirate
     ears: ClothingHeadsetAltFreelancer
     shoes: ClothingShoesBootsLaceup
-    id: PiratePDA
     belt: ClothingBeltUtility
     pocket1: AppraisalTool
     pocket2: EnergyCutlass
     outerClothing: ClothingOuterCoatPirate
-  # innerClothingSkirt: ClothingUniformJumpskirtColorLightBrown
-  # satchel: ClothingBackpackPirateFilled
-  # duffelbag: ClothingBackpackPirateFilled
-  # messenger: ClothingBackpackMessengerMercenaryFilled
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml
index c9406e5fc07..07379d9b719 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml
@@ -7,7 +7,7 @@
     - !type:WhitelistRequirement
     - !type:OverallPlaytimeRequirement
       time: 129600 # Frontier - 36 hours
-  startingGear: NFPirateFirstMateGear
+  startingGear: PirateFirstMateNFGear
   alwaysUseSpawner: true
   hideConsoleVisibility: true
   canBeAntag: true
@@ -24,18 +24,11 @@
     implants: [ FreelanceTrackingImplant ]
 
 - type: startingGear
-  id: NFPirateFirstMateGear
+  id: PirateFirstMateNFGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
     head: ClothingHeadHatPirateTricord
     ears: ClothingHeadsetAltFreelancer
     shoes: ClothingShoesBootsLaceup
-    id: PiratePDA
     belt: ClothingBeltUtility
     pocket1: AppraisalTool
     outerClothing: ClothingOuterCoatGentle
-  # innerClothingSkirt: ClothingUniformJumpsuitPirate
-  # satchel: ClothingBackpackPirateFilled
-  # duffelbag: ClothingBackpackPirateFilled
-  # messenger: ClothingBackpackMessengerMercenaryFilled
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml
index 9afef55373f..9e5747dac9b 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml
@@ -30,3 +30,4 @@
     eyes: ClothingEyesGlassesSunglasses #ClothingEyesGlassesSecurity
     ears: ClothingHeadsetSecurity
     pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal
+    pocket2: MagazinePistol
diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml
index fcadf573061..c27282d82d8 100644
--- a/Resources/Prototypes/_NF/tags.yml
+++ b/Resources/Prototypes/_NF/tags.yml
@@ -69,6 +69,9 @@
 
 - type: Tag
   id: VirologyLab
-  
+
 - type: Tag
   id: HoverbikeKeys
+
+- type: Tag
+  id: SpeedLoaderRifleHeavy
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..ce3d78d944d
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json
index 702b7c61322..8f09ebb065a 100644
--- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Base by ∆∆Molotovthief, equipped sprites by Velcroboy",
+    "copyright": "Base by ∆∆Molotovthief, equipped sprites by Velcroboy, wielded by erhardsteinhauer",
     "size": {
         "x": 32,
         "y": 32
@@ -24,6 +24,18 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..e1be43e99ff
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..081b70371d4
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json
index 6657216b76b..acbd06c2708 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json
@@ -1,77 +1,85 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+	"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
 	"size": {
 		"x": 32,
 		"y": 32
 	},
-	"states": [
-	{
-		"name": "icon"
-	},
-	{
-		"name": "base"
-	},
-	{
-		"name": "mag-unshaded-1"
-	},
-	{
-		"name": "mag-unshaded-2"
-	},
-	{
-		"name": "mag-unshaded-3"
-	},
-	{
-		"name": "mag-unshaded-4"
-	},
-	{
-		"name": "inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "inhand-right",
-		"directions": 4
-	},
-	{
-		"name": "0-inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "0-inhand-right",
-		"directions": 4
-	},
-	{
-		"name": "25-inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "25-inhand-right",
-		"directions": 4
-	},
-	{
-		"name": "50-inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "50-inhand-right",
-		"directions": 4
-	},
-	{
-		"name": "75-inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "75-inhand-right",
-		"directions": 4
-	},
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-	]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "0-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "0-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "25-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "25-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "50-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "50-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "75-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "75-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..38327d97081
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..4e0a357b844
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json
index 7ec48da4fec..2b374ec4dd8 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json
@@ -1,45 +1,53 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/9ded73fb85b9106d6bbf1c9a34d1d2fa27ee0e2e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/9ded73fb85b9106d6bbf1c9a34d1d2fa27ee0e2e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-	{
-		"name": "icon"
-	},
-	{
-		"name": "base"
-	},
-	{
-		"name": "mag-unshaded-1"
-	},
-	{
-		"name": "mag-unshaded-2"
-	},
-	{
-		"name": "mag-unshaded-3"
-	},
-	{
-		"name": "mag-unshaded-4"
-	},
-	{
-		"name": "inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "inhand-right",
-		"directions": 4
-	},
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..126915fd270
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..93a9303c5ea
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json
index 3b48bfc87c3..434d66fcfd8 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json
@@ -1,45 +1,53 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2 backpack sprite by Peptide (copy of pulse rifle), backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2 backpack sprite by Peptide (copy of pulse rifle), backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-	{
-		"name": "icon"
-	},
-	{
-		"name": "base"
-	},
-	{
-		"name": "mag-unshaded-1"
-	},
-	{
-		"name": "mag-unshaded-2"
-	},
-	{
-		"name": "mag-unshaded-3"
-	},
-	{
-		"name": "mag-unshaded-4"
-	},
-	{
-		"name": "inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "inhand-right",
-		"directions": 4
-	},
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..b9df7a2cb2d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..644db232d2e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
index 1a906ef965d..023ad90cfae 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
@@ -1,45 +1,53 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-	{
-		"name": "icon"
-	},
-	{
-		"name": "base"
-	},
-	{
-		"name": "mag-unshaded-1"
-	},
-	{
-		"name": "mag-unshaded-2"
-	},
-	{
-		"name": "mag-unshaded-3"
-	},
-	{
-		"name": "mag-unshaded-4"
-	},
-	{
-		"name": "inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "inhand-right",
-		"directions": 4
-	},
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..b9df7a2cb2d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..644db232d2e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json
index 990ba511859..8766242121a 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json
@@ -1,54 +1,62 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/energy/xray.dmi, backpack sprite by peptide, backpack sling sprite edited by Boaz1111",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/energy/xray.dmi, backpack sprite by peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
   "size": {
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-unshaded-0",
-      "delays": [
-        [
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-unshaded-1"
-    },
-    {
-      "name": "mag-unshaded-2"
-    },
-    {
-      "name": "mag-unshaded-3"
-    },
-    {
-      "name": "mag-unshaded-4"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0",
+            "delays": [
+                [
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..9fa2fafdff6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..63615e2df1f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json
index 6721d2e34fd..532936c71ed 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-4.0",
-    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -21,13 +21,21 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
 	    {
-          "name": "equipped-SUITSTORAGE",
-          "directions": 4
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..a1d40617d2f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..146fe9b1c2a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json
index 919d0f87ac0..0257e70364f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -27,13 +27,21 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
-		},
-		{
-			"name": "equipped-SUITSTORAGE",
-			"directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..2fa1f7811dc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..c358af57c32
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
index 2f30ef18a87..c45db54aff5 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -27,11 +27,19 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..42926b00f47
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..fd58fca837b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
index 62d5a46c764..2ff87fa2917 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
@@ -45,6 +45,14 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..50b0e2a1d4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..eaf5e92574d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
index 6a8fd9f430c..bd66b2c9685 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
@@ -1,40 +1,50 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi, sprite modification by Jaсkal 298/TaralGit, backpack sling sprite edited by Boaz1111",
+	"copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi, sprite modification by Jaсkal 298/TaralGit, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
 	"size": {
 		"x": 32,
 		"y": 32
 	},
-	"states": [
-		{
-			"name": "icon"
-		},
-		{
-			"name": "base"
-		},
-		{
-			"name": "equipped-SUITSTORAGE"
-		},
-		{
-			"name": "equipped-BACKPACK"
-		},
-		{
-			"name": "bolt-open"
-		},
-		{
-			"name": "mag-0"
-		},
-		{
-			"name": "suppressor"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-	}
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "suppressor"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..ee66cf3df9b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..c5d66956051
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json
index f55fd2db207..b3ab88b772f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183(Github) inspired by an image created by rezierré#5003 (Discord)",
+  "copyright": "Made by brainfood1183(Github) inspired by an image created by rezierré#5003 (Discord), wield sprites by RiceMar1244",
   "size": {
     "x": 32,
     "y": 32
@@ -20,6 +20,14 @@
         {
             "name": "inhand-left",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..da4a7f4f922
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..ac02c47a844
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
index 5ef981dec9e..8699d00b7df 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.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/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -27,11 +27,19 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..9a45848ec52
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..7252681abaf
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
index cd94834b2ae..25613e8bcd9 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
@@ -25,7 +25,7 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/meta.json
new file mode 100644
index 00000000000..6c1d1581e8a
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..27c2e923590
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..78165792c70
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
index f3a7f48582c..42b8d94d6d0 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
@@ -17,7 +17,7 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/meta.json
new file mode 100644
index 00000000000..6c1d1581e8a
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..5f5b50d715d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..4810c9c3755
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-right.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/meta.json
new file mode 100644
index 00000000000..6c1d1581e8a
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..26a569bfc22
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..e2380308b43
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json
deleted file mode 100644
index fefe1f6eb75..00000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-NC-4.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, sawn-inhand states modified from db-inhand by Flareguy",
-    "size": {
-        "x": 64,
-        "y": 64
-    },
-    "states": [
-        {
-            "name": "pump-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "pump-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "enforcer-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "enforcer-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "db-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "db-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "sawn-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "sawn-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "improvised-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "improvised-inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
index 27d7ebd6653..3add3a471b6 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
@@ -17,7 +17,7 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-left.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json
new file mode 100644
index 00000000000..6c1d1581e8a
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..09fbaae551e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..00b475f6b45
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-left.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/meta.json
new file mode 100644
index 00000000000..852268d1874
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, sawn-inhand states modified from db-inhand by Flareguy",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
index 7eb2a4e74d1..e4f1ef8dd85 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -21,6 +21,14 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..dc8f5727641
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..7a478a39768
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json
index da8881c7c58..818c56417d4 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.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/pull/13612/commits/c1cf3c42b0cd00023937e46845a7c32d6beefa0e, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/13612/commits/c1cf3c42b0cd00023937e46845a7c32d6beefa0e, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -21,11 +21,19 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..d373352b9f5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..03625930c82
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/equipped-BACKPACK.png
deleted file mode 100644
index b645db6d31b..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/icon.png
deleted file mode 100644
index e93a93d031a..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-left.png
deleted file mode 100644
index 77dee9de3fd..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-right.png
deleted file mode 100644
index b41f121b130..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/meta.json
deleted file mode 100644
index fd414099766..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Syndicate by erhardsteinhauer (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/equipped-BACKPACK.png
deleted file mode 100644
index e96994fd24f..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/icon.png
deleted file mode 100644
index d26e490e929..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/inhand-left.png
deleted file mode 100644
index 68f6c2d40ab..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/inhand-right.png
deleted file mode 100644
index de92e600f0c..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/meta.json
deleted file mode 100644
index 54103f9fdea..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Sprites by @Zydras (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 32405971540..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/icon.png
deleted file mode 100644
index e21f7efe6bc..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/inhand-left.png
deleted file mode 100644
index bb53e45c896..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/inhand-right.png
deleted file mode 100644
index 004aeaeb368..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/meta.json
deleted file mode 100644
index 4bb9c1b1fb3..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Cargo Tech Job by erhardsteinhauer (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-equipped-BACKPACK.png
new file mode 100644
index 00000000000..f5144c42221
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-inhand-left.png
new file mode 100644
index 00000000000..ea919b24cf8
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-inhand-right.png
new file mode 100644
index 00000000000..98e7a3c92cb
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-equipped-BACKPACK.png
new file mode 100644
index 00000000000..fead91d8237
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-inhand-left.png
new file mode 100644
index 00000000000..154181958e7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-inhand-right.png
new file mode 100644
index 00000000000..b0c76c0f69d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-equipped-BACKPACK.png
new file mode 100644
index 00000000000..bee7ad0f5ab
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-inhand-left.png
new file mode 100644
index 00000000000..be6a6f5fbd3
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-inhand-right.png
new file mode 100644
index 00000000000..a902e0a16c7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-equipped-BACKPACK.png
new file mode 100644
index 00000000000..102a5a562cc
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-inhand-left.png
new file mode 100644
index 00000000000..2bd545e9e4f
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-inhand-right.png
new file mode 100644
index 00000000000..8bb814ecc26
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-equipped-BACKPACK.png
new file mode 100644
index 00000000000..165dace2e9c
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-inhand-left.png
new file mode 100644
index 00000000000..d726d2b6f82
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-inhand-right.png
new file mode 100644
index 00000000000..dbed3235fe5
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-base-top.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-base-top.png
new file mode 100644
index 00000000000..984576911d2
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-base-top.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-base.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-base.png
new file mode 100644
index 00000000000..b6c9fa4d209
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-base.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-clasp.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-clasp.png
new file mode 100644
index 00000000000..fd5a606267c
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-clasp.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-decor-accent.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-decor-accent.png
new file mode 100644
index 00000000000..db85691a3cf
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-decor-accent.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-decor.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-decor.png
new file mode 100644
index 00000000000..2efaed67476
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-decor.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-sling.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-sling.png
new file mode 100644
index 00000000000..5d75e5918dd
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-sling.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/meta.json
new file mode 100644
index 00000000000..e9791bcb3ab
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/meta.json
@@ -0,0 +1,93 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Original sprites by @Zydras (github), split into layers by erhardsteinhauer (discor/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon-base"
+    },
+    {
+      "name": "icon-base-top"
+    },
+    {
+      "name": "icon-clasp"
+    },
+    {
+      "name": "icon-sling"
+    },
+    {
+      "name": "icon-decor"
+    },
+    {
+      "name": "icon-decor-accent"
+    },
+    {
+      "name": "base-equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "base-top-equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "clasp-equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "sling-equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "decor-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "decor-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "decor-equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "decor-accent-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "decor-accent-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "decor-accent-equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "base-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "base-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "base-top-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "base-top-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "clasp-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "clasp-inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/sling-equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/sling-equipped-BACKPACK.png
new file mode 100644
index 00000000000..7cd038f570b
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/sling-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 5c93787d4d3..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/icon.png
deleted file mode 100644
index f8794fe9ace..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/inhand-left.png
deleted file mode 100644
index c571aa7b006..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/inhand-right.png
deleted file mode 100644
index 901bbaea151..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/meta.json
deleted file mode 100644
index 54103f9fdea..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Sprites by @Zydras (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 57c9796e96c..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/icon.png
deleted file mode 100644
index 9dd3c88e6b0..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/inhand-left.png
deleted file mode 100644
index d18b2575237..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/inhand-right.png
deleted file mode 100644
index d02bcd50ad2..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/meta.json
deleted file mode 100644
index 54103f9fdea..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Sprites by @Zydras (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 2334435c525..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/icon.png
deleted file mode 100644
index 2b727f2ff0d..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/inhand-left.png
deleted file mode 100644
index bc018e28e4e..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/inhand-right.png
deleted file mode 100644
index 87ba51a9541..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/meta.json
deleted file mode 100644
index c2133b8a3e0..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Janitor Job by erhardsteinhauer (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/meta.json
index 59325f6c703..549f1b23b73 100644
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/meta.json
+++ b/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.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/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Mercenary Job by erhardsteinhauer (discord)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Mailperson Job by erhardsteinhauer (discord)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/equipped-BACKPACK.png
deleted file mode 100644
index b37ae418710..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/icon.png
deleted file mode 100644
index 04fb7b49734..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-left.png
deleted file mode 100644
index 083523ccf63..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-right.png
deleted file mode 100644
index 0ae703d7b72..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/meta.json
deleted file mode 100644
index 08d2f92bc5e..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for NSFD by erhardsteinhauer (discord), color palette by GhostPrince (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/equipped-BACKPACK.png
deleted file mode 100644
index b1f091e01f9..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/icon.png
deleted file mode 100644
index 0ebe1565595..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-left.png
deleted file mode 100644
index e5696f75877..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-right.png
deleted file mode 100644
index 0bec86d1532..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/meta.json
deleted file mode 100644
index cf17a5a1470..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Brigmedic by erhardsteinhauer (discord), color palette by GhostPrince (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 51eb259ec25..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/icon.png
deleted file mode 100644
index 5fb4593365c..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/inhand-left.png
deleted file mode 100644
index 03ea84cc6bc..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/inhand-right.png
deleted file mode 100644
index 280a43ee31f..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/meta.json
deleted file mode 100644
index d5c0c04092e..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Pilot Job by erhardsteinhauer (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 7067601728b..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/icon.png
deleted file mode 100644
index 3968a4856a2..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/inhand-left.png
deleted file mode 100644
index 494c90b7ea9..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/inhand-right.png
deleted file mode 100644
index 8e186c52f8c..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/meta.json
deleted file mode 100644
index 54103f9fdea..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Sprites by @Zydras (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 10d3a3913ad..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/icon.png
deleted file mode 100644
index 686ecc9147f..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/inhand-left.png
deleted file mode 100644
index d100e35e08c..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/inhand-right.png
deleted file mode 100644
index 13f8a1bdd32..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/meta.json
deleted file mode 100644
index fd414099766..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Syndicate by erhardsteinhauer (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/equipped-NECK.png
index 2b308539f05..47394428e06 100644
Binary files a/Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/equipped-NECK.png and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/bolt-open.png
deleted file mode 100644
index 959c1436a12..00000000000
Binary files a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/bolt-open.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-BELT.png
deleted file mode 100644
index 65f3aacd308..00000000000
Binary files a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/icon.png
deleted file mode 100644
index fb8869879fc..00000000000
Binary files a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-left.png
deleted file mode 100644
index 762b7b0eeed..00000000000
Binary files a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-right.png
deleted file mode 100644
index d391ea6f0fd..00000000000
Binary files a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png
new file mode 100644
index 00000000000..2c6f3fb0726
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png
new file mode 100644
index 00000000000..9fc7ae245b2
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png
new file mode 100644
index 00000000000..223c9e3b4fb
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png
new file mode 100644
index 00000000000..e8efed267b9
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png
new file mode 100644
index 00000000000..690e4e402c5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png
new file mode 100644
index 00000000000..cc5db9400da
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png
new file mode 100644
index 00000000000..8755dd94dec
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png
new file mode 100644
index 00000000000..eada2162213
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png
new file mode 100644
index 00000000000..8af13d1cf16
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png
new file mode 100644
index 00000000000..c6df5f222b4
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json
new file mode 100644
index 00000000000..7f4c9fadf9b
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json
@@ -0,0 +1,137 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Created by @Stagnation on the frontier discord",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base-1"
+        },
+        {
+            "name": "base-2"
+        },
+        {
+            "name": "base-3"
+        },
+        {
+            "name": "base-4"
+        },
+        {
+            "name": "base-5"
+        },
+        {
+            "name": "base-6"
+        },
+        {
+            "name": "base-7"
+        },
+        {
+            "name": "base-8"
+        },
+        {
+            "name": "practice-1"
+        },
+        {
+            "name": "practice-2"
+        },
+        {
+            "name": "practice-3"
+        },
+        {
+            "name": "practice-4"
+        },
+        {
+            "name": "practice-5"
+        },
+        {
+            "name": "practice-6"
+        },
+        {
+            "name": "practice-7"
+        },
+        {
+            "name": "practice-8"
+        },
+        {
+            "name": "rubber-1"
+        },
+        {
+            "name": "rubber-2"
+        },
+        {
+            "name": "rubber-3"
+        },
+        {
+            "name": "rubber-4"
+        },
+        {
+            "name": "rubber-5"
+        },
+        {
+            "name": "rubber-6"
+        },
+        {
+            "name": "rubber-7"
+        },
+        {
+            "name": "rubber-8"
+        },
+        {
+            "name": "uranium-1"
+        },
+        {
+            "name": "uranium-2"
+        },
+        {
+            "name": "uranium-3"
+        },
+        {
+            "name": "uranium-4"
+        },
+        {
+            "name": "uranium-5"
+        },
+        {
+            "name": "uranium-6"
+        },
+        {
+            "name": "uranium-7"
+        },
+        {
+            "name": "uranium-8"
+        },
+        {
+            "name": "piercing-1"
+        },
+        {
+            "name": "piercing-2"
+        },
+        {
+            "name": "piercing-3"
+        },
+        {
+            "name": "piercing-4"
+        },
+        {
+            "name": "piercing-5"
+        },
+        {
+            "name": "piercing-6"
+        },
+        {
+            "name": "piercing-7"
+        },
+        {
+            "name": "piercing-8"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png
new file mode 100644
index 00000000000..4930f3f9989
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png
new file mode 100644
index 00000000000..28cbeba80bf
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png
new file mode 100644
index 00000000000..63b7a84f900
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png
new file mode 100644
index 00000000000..749eba847ae
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png
new file mode 100644
index 00000000000..f7608dbedba
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png
new file mode 100644
index 00000000000..3079f5324e6
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png
new file mode 100644
index 00000000000..0a1ec7887ed
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png
new file mode 100644
index 00000000000..7c46da59ce5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png
new file mode 100644
index 00000000000..e5f08f1d51f
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png
new file mode 100644
index 00000000000..ababaa84671
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png
new file mode 100644
index 00000000000..411fc78a3fd
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png
new file mode 100644
index 00000000000..515b63889f5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png
new file mode 100644
index 00000000000..cc7011a1642
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png
new file mode 100644
index 00000000000..2e7e7fbcdab
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png
new file mode 100644
index 00000000000..f8e250bd15e
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png
new file mode 100644
index 00000000000..d7dfe0371fe
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png
new file mode 100644
index 00000000000..5dca9d7803d
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png
new file mode 100644
index 00000000000..f615854e5ce
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png
new file mode 100644
index 00000000000..44dacb9f0b8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png
new file mode 100644
index 00000000000..7216d9f79fa
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png
new file mode 100644
index 00000000000..7a6d1b044dc
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png
new file mode 100644
index 00000000000..65a9e355e02
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png
new file mode 100644
index 00000000000..18a0b63c5d5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png
new file mode 100644
index 00000000000..a5517503ebc
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png
new file mode 100644
index 00000000000..084eb43a8c8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png
new file mode 100644
index 00000000000..1c6069bcbb4
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png
new file mode 100644
index 00000000000..a47505934cc
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png
new file mode 100644
index 00000000000..b5b31a8e2ba
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png
new file mode 100644
index 00000000000..4cc13396828
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png
new file mode 100644
index 00000000000..8e6e5ba62ef
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png
new file mode 100644
index 00000000000..5378e8179fd
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png
new file mode 100644
index 00000000000..13668787201
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json
index ba98ab5fafa..0564eb93ea2 100644
--- a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json
@@ -32,6 +32,14 @@
         {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..9c0b3bacdcf
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..52b461684e7
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png
new file mode 100644
index 00000000000..5da259a4230
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..d5c2e5102fb
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-SUITSTORAGE.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-SUITSTORAGE.png
rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png
new file mode 100644
index 00000000000..5da259a4230
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png
new file mode 100644
index 00000000000..57fb0c7c594
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png
new file mode 100644
index 00000000000..97f36840ffd
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json
similarity index 85%
rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json
rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json
index 5d749b0cc22..2c708b6173b 100644
--- a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by discord #vipan9104",
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Created by @Stagnation on frontier discord",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json
index 7eb2a4e74d1..f0146e82a56 100644
--- a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json
@@ -28,6 +28,14 @@
         {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..f41af6b0c46
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..fcae7fa8f04
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png differ
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 374bf3f6262..b50c5992ad0 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -299,48 +299,48 @@ BodyBag_Container: BodyBag
 BodyBag_Folded: BodyBagFolded
 
 # 2024-04-26
-BaseBulletRubber: null
-BulletPistolRubber: BulletPistol
-BulletMagnumRubber: BulletMagnum
-BulletLightRifleRubber: BulletLightRifle
-BulletRifleRubber: BulletRifle
-BulletCaselessRifleRubber: BulletCaselessRifle
-CartridgePistolRubber: CartridgePistol
-CartridgeMagnumRubber: CartridgeMagnum
-CartridgeLightRifleRubber: CartridgeLightRifle
-CartridgeRifleRubber: CartridgeRifle
-CartridgeCaselessRifleRubber: CartridgeCaselessRifle
-MagazinePistolRubber: MagazinePistol
-MagazinePistolSubMachineGunRubber: MagazinePistolSubMachineGun
-MagazinePistolCaselessRifleRubber: MagazinePistolCaselessRifle
-MagazineMagnumRubber: MagazineMagnum
-MagazineMagnumSubMachineGunRubber: MagazineMagnumSubMachineGun
-MagazineLightRifleRubber: MagazineLightRifle
-MagazineRifleRubber: MagazineRifle
-MagazineCaselessRifleRubber: MagazineCaselessRifle
-MagazineCaselessRifleShortRubber: MagazineCaselessRifleShort
-SpeedLoaderPistolRubber: SpeedLoaderPistol
-SpeedLoaderMagnumRubber: SpeedLoaderMagnum
-MagazineBoxPistolRubber: MagazineBoxPistol
-# RIP box of magnum rubbers 202X to 2024
-MagazineBoxMagnumRubber: MagazineBoxMagnum
-MagazineBoxLightRifleRubber: MagazineBoxLightRifle
-MagazineBoxRifleRubber: MagazineBoxRifle
-MagazineBoxRifleBigRubber: MagazineBoxRifleBig
-MagazineBoxCaselessRifleRubber: MagazineBoxCaselessRifle
-MagazineBoxCaselessRifleBigRubber: MagazineBoxCaselessRifle10x24
-BoxMagazinePistolRubber: BoxMagazinePistol
-BoxMagazinePistolHighCapacityRubber: BoxMagazinePistolHighCapacity
-BoxMagazinePistolSubMachineGunRubber: BoxMagazinePistolSubMachineGun
-BoxMagazineLightRifleRubber: BoxMagazineLightRifle
-BoxMagazineRifleRubber: BoxMagazineRifle
-BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle
-BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun
-WeaponPistolMk58Nonlethal: WeaponPistolMk58
-WeaponPistolN1984Nonlethal: WeaponPistolN1984
-WeaponSubMachineGunVectorRubber: WeaponSubMachineGunVector
-WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd
-WeaponRifleLecterRubber: WeaponRifleLecter
+# BaseBulletRubber: null
+# BulletPistolRubber: BulletPistol
+# BulletMagnumRubber: BulletMagnum
+# BulletLightRifleRubber: BulletLightRifle
+# BulletRifleRubber: BulletRifle
+# BulletCaselessRifleRubber: BulletCaselessRifle
+# CartridgePistolRubber: CartridgePistol
+# CartridgeMagnumRubber: CartridgeMagnum
+# CartridgeLightRifleRubber: CartridgeLightRifle
+# CartridgeRifleRubber: CartridgeRifle
+# CartridgeCaselessRifleRubber: CartridgeCaselessRifle
+# MagazinePistolRubber: MagazinePistol
+# MagazinePistolSubMachineGunRubber: MagazinePistolSubMachineGun
+# MagazinePistolCaselessRifleRubber: MagazinePistolCaselessRifle
+# MagazineMagnumRubber: MagazineMagnum
+# MagazineMagnumSubMachineGunRubber: MagazineMagnumSubMachineGun
+# MagazineLightRifleRubber: MagazineLightRifle
+# MagazineRifleRubber: MagazineRifle
+# MagazineCaselessRifleRubber: MagazineCaselessRifle
+# MagazineCaselessRifleShortRubber: MagazineCaselessRifleShort
+# SpeedLoaderPistolRubber: SpeedLoaderPistol
+# SpeedLoaderMagnumRubber: SpeedLoaderMagnum
+# MagazineBoxPistolRubber: MagazineBoxPistol
+# # RIP box of magnum rubbers 202X to 2024
+# MagazineBoxMagnumRubber: MagazineBoxMagnum
+# MagazineBoxLightRifleRubber: MagazineBoxLightRifle
+# MagazineBoxRifleRubber: MagazineBoxRifle
+# MagazineBoxRifleBigRubber: MagazineBoxRifleBig
+# MagazineBoxCaselessRifleRubber: MagazineBoxCaselessRifle
+# MagazineBoxCaselessRifleBigRubber: MagazineBoxCaselessRifle10x24
+# BoxMagazinePistolRubber: BoxMagazinePistol
+# BoxMagazinePistolHighCapacityRubber: BoxMagazinePistolHighCapacity
+# BoxMagazinePistolSubMachineGunRubber: BoxMagazinePistolSubMachineGun
+# BoxMagazineLightRifleRubber: BoxMagazineLightRifle
+# BoxMagazineRifleRubber: BoxMagazineRifle
+# BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle
+# BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun
+# WeaponPistolMk58Nonlethal: WeaponPistolMk58
+# WeaponPistolN1984Nonlethal: WeaponPistolN1984
+# WeaponSubMachineGunVectorRubber: WeaponSubMachineGunVector
+# WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd
+# WeaponRifleLecterRubber: WeaponRifleLecter
 
 # 2024-04-26
 GlassBoxLaserBroken: GlassBoxBroken
@@ -377,3 +377,9 @@ APCBasicEmpImmune: APCBasic
 
 # 2024-02-09
 Ashtray: NFAshtray
+
+# 2024-05-25
+BoxSurvival: BoxSurvivalNFOxygen
+BoxSurvivalEngineering: BoxSurvivalNFOxygenExtended
+BoxSurvivalMedical: BoxSurvivalNFOxygen
+BoxHug: BoxSurvivalNFOxygen
\ No newline at end of file