Printable Special Mags and Empty Mags and Material Rebalance for Ammo (#26178)

* Printable Empty Magazines * Adjust values of ammo boxes, adjust material costs, add empty lethal/non-lethal mags, swap secfab shotgun shells with shotgun ammo boxes, add recipe for shotgun ammo boxes * Adds fully loaded pistol mags at secfab, removes printing respective cartridges at secfab * Adds fully loaded rifle mags at secfab, removes respective cartridges * Adds fully loaded light rifle mags at secfab, removes respective cartridges from secfab * Adds fully loaded speedloader to secfab, removes respective cartridges from secfab * small id mismatch fix * another wrong ID fix * capitalize Ls in speedloader * Add missing SpeedLoader recipe * Adds fully loaded shotgun drums to secfab, removes respective shells from secfab * add rifle ammo unlocks back in, forgot ammo unlocks affect other fabs as well * Moves tranquilizer shells to the non-lethal ammunition research * Account for the removal of rubbers, adds in craftable disablers * rubber rounds don't exist, remove empty non-lethal mags to just have empty mags * Add in WT550 mags * Convert latheRecipes to use LayeredTextureRect instead of TextureRect * Fix for issue, texture layering now works * Add in missing shell uranium box art * add shelluranium to meta.json * Fix yml issue * Get rid of unused single ammo printing unlocks --------- Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-04-27 03:38:59 -07:00
parent dec101465b
commit cafb41c161
18 changed files with 572 additions and 74 deletions
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -10,6 +10,8 @@ using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Client.ResourceManagement;
+using Robust.Client.Graphics;
 using Robust.Shared.Prototypes;

 namespace Content.Client.Lathe.UI;
@@ -19,6 +21,8 @@ public sealed partial class LatheMenu : DefaultWindow
 {
    [Dependency] private readonly IEntityManager _entityManager = default!;
    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IResourceCache _resources = default!;
+
    private EntityUid _owner;
    private readonly SpriteSystem _spriteSystem;
    private readonly LatheSystem _lathe;
@@ -104,12 +108,21 @@ public sealed partial class LatheMenu : DefaultWindow
        RecipeList.Children.Clear();
        foreach (var prototype in sortedRecipesToShow)
        {
-            var icon = prototype.Icon == null
-                ? _spriteSystem.GetPrototypeIcon(prototype.Result).Default
-                : _spriteSystem.Frame0(prototype.Icon);
+            List<Texture> textures;
+            if (_prototypeManager.TryIndex(prototype.Result, out EntityPrototype? entityProto) && entityProto != null)
+            {
+                textures = SpriteComponent.GetPrototypeTextures(entityProto, _resources).Select(o => o.Default).ToList();
+            }
+            else
+            {
+                textures = prototype.Icon == null
+                    ? new List<Texture> { _spriteSystem.GetPrototypeIcon(prototype.Result).Default }
+                    : new List<Texture> { _spriteSystem.Frame0(prototype.Icon) };
+            }
+
            var canProduce = _lathe.CanProduce(_owner, prototype, quantity);

-            var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, icon);
+            var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, textures);
            control.OnButtonPressed += s =>
            {
                if (!int.TryParse(AmountLineEdit.Text, out var amount) || amount <= 0)
--- a/Content.Client/Lathe/UI/RecipeControl.xaml
+++ b/Content.Client/Lathe/UI/RecipeControl.xaml
@@ -5,11 +5,15 @@
        Margin="0"
        StyleClasses="ButtonSquare">
        <BoxContainer Orientation="Horizontal">
-            <TextureRect
-                Name="RecipeTexture"
+            <LayeredTextureRect
+                Name="RecipeTextures"
                Margin="0 0 4 0"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Stretch="KeepAspectCentered"
                MinSize="32 32"
-                Stretch="KeepAspectCentered" />
+                CanShrink="true"
+                />
            <Label Name="RecipeName" HorizontalExpand="True" />
        </BoxContainer>
    </Button>
--- a/Content.Client/Lathe/UI/RecipeControl.xaml.cs
+++ b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
@@ -2,8 +2,8 @@ using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Graphics;

 namespace Content.Client.Lathe.UI;

@@ -13,12 +13,12 @@ public sealed partial class RecipeControl : Control
    public Action<string>? OnButtonPressed;
    public Func<string> TooltipTextSupplier;

-    public RecipeControl(LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, Texture? texture = null)
+    public RecipeControl(LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, List<Texture> textures)
    {
        RobustXamlLoader.Load(this);

        RecipeName.Text = recipe.Name;
-        RecipeTexture.Texture = texture;
+        RecipeTextures.Textures = textures;
        Button.Disabled = !canProduce;
        TooltipTextSupplier = tooltipTextSupplier;
        Button.TooltipSupplier = SupplyTooltip;
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -10,7 +10,7 @@
      tags:
        - CartridgeLightRifle
    proto: CartridgeLightRifle
-    capacity: 50
+    capacity: 60
  - type: Item
    size: Small
  - type: ContainerContainer
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
@@ -9,7 +9,7 @@
      tags:
        - CartridgeMagnum
    proto: CartridgeMagnum
-    capacity: 60
+    capacity: 12
  - type: Item
    size: Small
  - type: ContainerContainer
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -9,7 +9,7 @@
      tags:
        - CartridgeRifle
    proto: CartridgeRifle
-    capacity: 60
+    capacity: 50
  - type: Item
    size: Small
  - type: ContainerContainer
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -21,7 +21,7 @@
      whitelist:
        tags:
        - ShellShotgun
-      capacity: 12
+      capacity: 16

 # Shotgun Shells
 - type: entity
@@ -89,6 +89,19 @@
        - state: boxwide
        - state: shellincendiary

+- type: entity
+  name: shotgun uranium cartridges dispenser
+  parent: AmmoProviderShotgunShell
+  id: BoxShotgunUranium
+  description: A dispenser box full of uranium cartridges, designed for riot shotguns.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellShotgunUranium
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shelluranium
+
 - type: entity
  name: shotgun practice cartridges dispenser
  parent: AmmoProviderShotgunShell
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -68,6 +68,19 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]

+- type: entity
+  id: MagazineLightRifleEmpty
+  name: "magazine (.30 rifle any)"
+  suffix: empty
+  parent: MagazineLightRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+
 - type: entity
  id: MagazineLightRiflePractice
  name: "magazine (.30 rifle practice)"
@@ -96,6 +109,14 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]

+- type: entity
+  id: MagazineLightRifleIncendiary
+  name: "magazine (.30 rifle incendiary)"
+  parent: MagazineLightRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleIncendiary
+
 - type: entity
  id: MagazineLightRifleMaxim
  name: "pan magazine (.30 rifle)"
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -47,6 +47,19 @@
    zeroVisible: false
  - type: Appearance

+- type: entity
+  id: MagazineMagnumEmpty
+  name: pistol magazine (.45 magnum any)
+  suffix: empty
+  parent: BaseMagazineMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+
 - type: entity
  id: MagazineMagnum
  name: pistol magazine (.45 magnum)
@@ -103,6 +116,19 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]

+- type: entity
+  id: MagazineMagnumSubMachineGunEmpty
+  name: "Vector magazine (.45 magnum any)"
+  suffix: empty
+  parent: BaseMagazineMagnumSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+
 - type: entity
  id: MagazineMagnumSubMachineGun
  name: "Vector magazine (.45 magnum)"
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -128,6 +128,14 @@
    containers:
      ballistic-ammo: !type:Container

+- type: entity
+  id: MagazinePistolSubMachineGunTopMountedEmpty
+  name: WT550 magazine (.35 auto top-mounted any)
+  parent: MagazinePistolSubMachineGunTopMounted
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+
 - type: entity
  id: MagazinePistol
  name: pistol magazine (.35 auto)
@@ -142,6 +150,28 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]

+- type: entity
+  id: MagazinePistolEmpty
+  name: pistol magazine (.35 auto any)
+  suffix: empty
+  parent: MagazinePistol
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+
+
+- type: entity
+  id: MagazinePistolIncendiary
+  name: pistol magazine (.35 auto incendiary)
+  parent: MagazinePistol
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolIncendiary
+
 - type: entity
  id: MagazinePistolPractice
  name: pistol magazine (.35 auto practice)
@@ -156,6 +186,33 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]

+- type: entity
+  id: MagazinePistolUranium
+  name: pistol magazine (.35 auto uranium)
+  parent: BaseMagazinePistol
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolUranium
+  - type: Sprite
+    layers:
+    - state: uranium
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazinePistolHighCapacityEmpty
+  name: machine pistol magazine (.35 auto any)
+  suffix: empty
+  parent: BaseMagazinePistolHighCapacity
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+
 - type: entity
  id: MagazinePistolHighCapacity
  name: machine pistol magazine (.35 auto)
@@ -218,6 +275,19 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]

+- type: entity
+  id: MagazinePistolSubMachineGunEmpty
+  name: SMG magazine (.35 auto any)
+  suffix: empty
+  parent: BaseMagazinePistolSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: null 
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+
 - type: entity
  id: MagazinePistolSubMachineGunPractice
  name: SMG magazine (.35 auto practice)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -47,6 +47,27 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]

+- type: entity
+  id: MagazineRifleEmpty
+  name: "magazine (.20 rifle any)"
+  suffix: empty
+  parent: MagazineRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+
+- type: entity
+  id: MagazineRifleIncendiary
+  name: "magazine (.20 rifle incendiary)"
+  parent: MagazineRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleIncendiary
+
 - type: entity
  id: MagazineRiflePractice
  name: "magazine (.20 rifle practice)"
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
@@ -33,6 +33,15 @@
    zeroVisible: false
  - type: Appearance

+- type: entity
+  id: MagazineShotgunEmpty
+  name: ammo drum (.50 shells any)
+  suffix: empty
+  parent: BaseMagazineShotgun
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+
 - type: entity
  id: MagazineShotgun
  name: ammo drum (.50 pellet)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -39,6 +39,27 @@
    zeroVisible: false
  - type: Appearance

+- type: entity
+  id: SpeedLoaderMagnumEmpty
+  name: "speed loader (.45 magnum any)"
+  parent: SpeedLoaderMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+
+- type: entity
+  id: SpeedLoaderMagnumIncendiary
+  name: "speed loader (.45 magnum incendiary)"
+  parent: SpeedLoaderMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumIncendiary
+
 - type: entity
  id: SpeedLoaderMagnumPractice
  name: "speed loader (.45 magnum practice)"
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -646,21 +646,28 @@
      - Stunbaton
      - ForensicPad
      - RiotShield
-      - ShellShotgun
-      - ShellShotgunBeanbag
-      - ShellShotgunSlug
-      - ShellShotgunFlare
-      - ShellTranquilizer
+      - BoxShotgunSlug
+      - BoxLethalshot
+      - BoxShotgunFlare
      - MagazinePistol 
+      - MagazinePistolEmpty
      - MagazinePistolSubMachineGun
+      - MagazinePistolSubMachineGunEmpty
      - MagazinePistolSubMachineGunTopMounted
+      - MagazinePistolSubMachineGunTopMountedEmpty
      - MagazineRifle
+      - MagazineRifleEmpty
      - MagazineLightRifle
+      - MagazineLightRifleEmpty
+      - MagazineShotgunEmpty
+      - MagazineShotgun
+      - MagazineShotgunSlug
      - MagazineBoxPistol
      - MagazineBoxMagnum
      - MagazineBoxRifle
      - MagazineBoxLightRifle
      - SpeedLoaderMagnum
+      - SpeedLoaderMagnumEmpty
      - TargetHuman
      - TargetSyndicate
      - TargetClown
@@ -668,18 +675,21 @@
      - MagazineBoxMagnumPractice
      - MagazineBoxPistolPractice
      - MagazineBoxRiflePractice
-      - ShellShotgunPractice
      - WeaponLaserCarbinePractice
      - WeaponDisablerPractice
+      - BoxShotgunPractice 
    dynamicRecipes:
-      - CartridgeLightRifleIncendiary
-      - CartridgeMagnumIncendiary
-      - CartridgePistolIncendiary
-      - CartridgeRifleIncendiary
-      - CartridgeLightRifleUranium
-      - CartridgeMagnumUranium
-      - CartridgePistolUranium
-      - CartridgeRifleUranium
+      - MagazineLightRifleIncendiary
+      - SpeedLoaderMagnumIncendiary
+      - MagazinePistolIncendiary
+      - MagazineRifleIncendiary
+      - MagazineShotgunIncendiary
+      - MagazineLightRifleUranium
+      - SpeedLoaderMagnumUranium
+      - MagazinePistolUranium
+      - MagazineRifleUranium
+      - MagazineShotgunBeanbag
+      - ShellTranquilizer
      - ExplosivePayload
      - FlashPayload
      - HoloprojectorSecurity
@@ -687,23 +697,24 @@
      - MagazineBoxMagnumIncendiary
      - MagazineBoxPistolIncendiary
      - MagazineBoxRifleIncendiary
+      - BoxShotgunIncendiary
      - MagazineBoxLightRifleUranium
      - MagazineBoxMagnumUranium
      - MagazineBoxPistolUranium
      - MagazineBoxRifleUranium
+      - BoxShotgunUranium
+      - BoxBeanbag
      - MagazineGrenadeEmpty
      - GrenadeEMP
      - GrenadeFlash
-      - ShellShotgunIncendiary
-      - ShellShotgunUranium
      - Signaller
      - SignalTrigger
      - TelescopicShield
      - TimerTrigger
      - Truncheon
      - VoiceTrigger
-      - WeaponDisablerPractice
      - WeaponAdvancedLaser
+      - WeaponDisabler
      - WeaponDisablerSMG
      - WeaponLaserCannon
      - WeaponLaserCarbine
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -239,13 +239,56 @@
  materials:
    Steel: 500

+- type: latheRecipe
+  id: MagazinePistolEmpty
+  result: MagazinePistolEmpty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+
 - type: latheRecipe
  id: MagazinePistol
  result: MagazinePistol
  category: Ammo
  completetime: 5
  materials:
-    Steel: 100
+    Steel: 145
+
+- type: latheRecipe
+  id: MagazinePistolPractice
+  result: MagazinePistolPractice
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 85
+
+- type: latheRecipe
+  id: MagazinePistolUranium
+  result: MagazinePistolUranium
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+    Plastic: 65
+    Uranium: 120
+
+- type: latheRecipe
+  id: MagazinePistolIncendiary
+  result: MagazinePistolIncendiary
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+    Plastic: 120
+
+- type: latheRecipe
+  id: MagazinePistolSubMachineGunEmpty
+  result: MagazinePistolSubMachineGunEmpty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 30

 - type: latheRecipe
  id: MagazinePistolSubMachineGun
@@ -255,6 +298,14 @@
  materials:
    Steel: 300

+- type: latheRecipe
+  id: MagazinePistolSubMachineGunTopMountedEmpty
+  result: MagazinePistolSubMachineGunTopMountedEmpty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 30
+
 - type: latheRecipe
  id: MagazinePistolSubMachineGunTopMounted
  result: MagazinePistolSubMachineGunTopMounted
@@ -269,7 +320,7 @@
  category: Ammo
  completetime: 5
  materials:
-    Steel: 650
+    Steel: 600

 - type: latheRecipe
  id: MagazineBoxMagnum
@@ -277,7 +328,15 @@
  category: Ammo
  completetime: 5
  materials:
-    Steel: 1250
+    Steel: 240
+
+- type: latheRecipe
+  id: MagazineRifleEmpty
+  result: MagazineRifleEmpty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25

 - type: latheRecipe
  id: MagazineRifle
@@ -285,7 +344,43 @@
  category: Ammo
  completetime: 5
  materials:
-    Steel: 375
+    Steel: 475
+
+
+- type: latheRecipe
+  id: MagazineRiflePractice
+  result: MagazineRiflePractice
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 175
+
+- type: latheRecipe
+  id: MagazineRifleUranium
+  result: MagazineRifleUranium
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+    Plastic: 300
+    Uranium: 300
+
+- type: latheRecipe
+  id: MagazineRifleIncendiary
+  result: MagazineRifleIncendiary
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+    Plastic: 450
+
+- type: latheRecipe
+  id: MagazineLightRifleEmpty
+  result: MagazineLightRifleEmpty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25

 - type: latheRecipe
  id: MagazineLightRifle
@@ -293,7 +388,35 @@
  category: Ammo
  completetime: 5
  materials:
-    Steel: 375
+    Steel: 565
+
+- type: latheRecipe
+  id: MagazineLightRiflePractice
+  result: MagazineLightRiflePractice
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 205
+
+
+- type: latheRecipe
+  id: MagazineLightRifleUranium
+  result: MagazineLightRifleUranium
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+    Plastic: 360
+    Uranium: 360
+
+- type: latheRecipe
+  id: MagazineLightRifleIncendiary
+  result: MagazineLightRifleIncendiary
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+    Plastic: 540

 - type: latheRecipe
  id: MagazineBoxRifle
@@ -301,7 +424,7 @@
  category: Ammo
  completetime: 5
  materials:
-    Steel: 950
+    Steel: 750

 - type: latheRecipe
  id: MagazineBoxLightRifle
@@ -309,7 +432,41 @@
  category: Ammo
  completetime: 5
  materials:
-    Steel: 1800
+    Steel: 900
+
+- type: latheRecipe
+  id: BoxLethalshot
+  result: BoxLethalshot
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 320
+
+- type: latheRecipe
+  id: BoxBeanbag
+  result: BoxBeanbag
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 160
+    Plastic: 240
+
+- type: latheRecipe
+  id: BoxShotgunSlug
+  result: BoxShotgunSlug
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 240
+    Plastic: 160
+
+- type: latheRecipe
+  id: SpeedLoaderMagnumEmpty
+  result: SpeedLoaderMagnumEmpty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50

 - type: latheRecipe
  id: SpeedLoaderMagnum
@@ -317,7 +474,77 @@
  category: Ammo
  completetime: 5
  materials:
-    Steel: 200
+    Steel: 190
+
+- type: latheRecipe
+  id: SpeedLoaderMagnumPractice
+  result: SpeedLoaderMagnumPractice
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 90
+
+- type: latheRecipe
+  id: SpeedLoaderMagnumUranium
+  result: SpeedLoaderMagnumUranium
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50
+    Plastic: 150
+    Uranium: 110
+
+- type: latheRecipe
+  id: SpeedLoaderMagnumIncendiary
+  result: SpeedLoaderMagnumIncendiary
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50
+    Plastic: 150
+
+- type: latheRecipe
+  id: MagazineShotgunEmpty
+  result: MagazineShotgunEmpty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50
+
+- type: latheRecipe
+  id: MagazineShotgun
+  result: MagazineShotgun
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 240
+
+- type: latheRecipe
+  id: MagazineShotgunBeanbag
+  result: MagazineShotgunBeanbag
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 150
+    Plastic: 140
+
+- type: latheRecipe
+  id: MagazineShotgunSlug
+  result: MagazineShotgunSlug
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 190
+    Plastic: 100
+
+- type: latheRecipe
+  id: MagazineShotgunIncendiary
+  result: MagazineShotgunIncendiary
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 100
+    Plastic: 190

 - type: latheRecipe
  id: ShellShotgunIncendiary
@@ -349,7 +576,7 @@
  category: Ammo
  completetime: 2
  materials:
-    Plastic: 20
+    Plastic: 15

 - type: latheRecipe
  id: CartridgeRifleIncendiary
@@ -365,7 +592,7 @@
  category: Ammo
  completetime: 5
  materials:
-    Plastic: 650
+    Plastic: 600

 - type: latheRecipe
  id: MagazineBoxMagnumIncendiary
@@ -373,7 +600,7 @@
  category: Ammo
  completetime: 5
  materials:
-    Plastic: 1250
+    Plastic: 240

 - type: latheRecipe
  id: MagazineBoxLightRifleIncendiary
@@ -381,7 +608,7 @@
  category: Ammo
  completetime: 5
  materials:
-    Plastic: 1800
+    Plastic: 900

 - type: latheRecipe
  id: MagazineBoxRifleIncendiary
@@ -389,7 +616,25 @@
  category: Ammo
  completetime: 5
  materials:
-    Plastic: 950
+    Plastic: 750
+
+- type: latheRecipe
+  id: BoxShotgunFlare
+  result: BoxShotgunFlare
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 80
+    Plastic: 80
+
+- type: latheRecipe
+  id: BoxShotgunIncendiary
+  result: BoxShotgunIncendiary
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 80
+    Plastic: 320

 - type: latheRecipe
  id: ShellShotgunPractice
@@ -405,7 +650,7 @@
  category: Ammo
  completetime: 5
  materials:
-    Plastic: 600
+    Steel: 300

 - type: latheRecipe
  id: MagazineBoxMagnumPractice
@@ -413,7 +658,7 @@
  category: Ammo
  completetime: 5
  materials:
-    Plastic: 1200
+    Steel: 60

 - type: latheRecipe
  id: MagazineBoxLightRiflePractice
@@ -421,7 +666,7 @@
  category: Ammo
  completetime: 5
  materials:
-    Plastic: 1000
+    Steel: 300

 - type: latheRecipe
  id: MagazineBoxRiflePractice
@@ -429,7 +674,7 @@
  category: Ammo
  completetime: 5
  materials:
-    Plastic: 900
+    Steel: 250

 - type: latheRecipe
  id: WeaponLaserCarbinePractice
@@ -451,14 +696,22 @@
    Glass: 100
    Plastic: 200

+- type: latheRecipe
+  id: BoxShotgunPractice
+  result: BoxShotgunPractice
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 80
+
 - type: latheRecipe
  id: ShellShotgunUranium
  result: ShellShotgunUranium
  category: Ammo
  completetime: 2
  materials:
-    Plastic: 15
-    Uranium: 10
+    Plastic: 20
+    Uranium: 15

 - type: latheRecipe
  id: CartridgePistolUranium
@@ -476,7 +729,7 @@
  completetime: 2
  materials:
    Plastic: 20
-    Uranium: 10
+    Uranium: 15

 - type: latheRecipe
  id: CartridgeLightRifleUranium
@@ -484,7 +737,7 @@
  category: Ammo
  completetime: 2
  materials:
-    Plastic: 20
+    Plastic: 10
    Uranium: 10

 - type: latheRecipe
@@ -493,7 +746,7 @@
  category: Ammo
  completetime: 2
  materials:
-    Plastic: 15
+    Plastic: 10
    Uranium: 10

 - type: latheRecipe
@@ -502,8 +755,8 @@
  category: Ammo
  completetime: 5
  materials:
-    Plastic: 650
-    Uranium: 65
+    Plastic: 300
+    Uranium: 600

 - type: latheRecipe
  id: MagazineBoxMagnumUranium
@@ -511,8 +764,8 @@
  category: Ammo
  completetime: 5
  materials:
-    Plastic: 1250
-    Uranium: 125
+    Plastic: 240
+    Uranium: 180

 - type: latheRecipe
  id: MagazineBoxLightRifleUranium
@@ -520,8 +773,8 @@
  category: Ammo
  completetime: 5
  materials:
-    Plastic: 1800
-    Uranium: 180
+    Plastic: 600
+    Uranium: 600

 - type: latheRecipe
  id: MagazineBoxRifleUranium
@@ -529,8 +782,27 @@
  category: Ammo
  completetime: 5
  materials:
-    Plastic: 950
-    Uranium: 95
+    Plastic: 500
+    Uranium: 500
+
+- type: latheRecipe
+  id: BoxShotgunUranium
+  result: BoxShotgunUranium
+  category: Ammo
+  completetime: 5
+  materials:
+    Plastic: 320
+    Uranium: 240
+
+- type: latheRecipe
+  id: WeaponDisabler
+  result: WeaponDisabler
+  category: Weapons
+  completetime: 6
+  materials:
+    Steel: 300
+    Glass: 200
+    Plastic: 200

 - type: latheRecipe
  id: WeaponDisablerSMG
@@ -576,4 +848,3 @@
     Steel: 150
     Plastic: 100
     Glass: 20
-     
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -24,11 +24,12 @@
  tier: 1
  cost: 10000
  recipeUnlocks:
-  - ShellShotgunIncendiary
-  - CartridgePistolIncendiary
-  - CartridgeMagnumIncendiary
-  - CartridgeLightRifleIncendiary
-  - CartridgeRifleIncendiary
+  - BoxShotgunIncendiary
+  - MagazineRifleIncendiary
+  - MagazinePistolIncendiary
+  - MagazineLightRifleIncendiary
+  - SpeedLoaderMagnumIncendiary
+  - MagazineShotgunIncendiary
  - MagazineBoxPistolIncendiary
  - MagazineBoxMagnumIncendiary
  - MagazineBoxLightRifleIncendiary
@@ -46,6 +47,20 @@
  recipeUnlocks:
  - WeaponLaserCarbine

+- type: technology
+  id: NonlethalAmmunition
+  name: research-technology-nonlethal-ammunition
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
+    state: beanbag
+  discipline: Arsenal
+  tier: 1
+  cost: 5000
+  recipeUnlocks:
+  - ShellTranquilizer 
+  - BoxBeanbag 
+  - WeaponDisabler
+
 - type: technology
  id: UraniumMunitions
  name: research-technology-uranium-munitions
@@ -56,15 +71,15 @@
  tier: 1
  cost: 7500
  recipeUnlocks:
-  - ShellShotgunUranium
-  - CartridgePistolUranium
-  - CartridgeMagnumUranium
-  - CartridgeLightRifleUranium
-  - CartridgeRifleUranium
+  - MagazineRifleUranium
+  - MagazinePistolUranium
+  - MagazineLightRifleUranium
+  - SpeedLoaderMagnumUranium
  - MagazineBoxPistolUranium
  - MagazineBoxMagnumUranium
  - MagazineBoxLightRifleUranium
  - MagazineBoxRifleUranium
+  - BoxShotgunUranium

 - type: technology
  id: AdvancedRiotControl
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -197,6 +197,9 @@
        {
            "name": "shellslug"
        },
+        {
+            "name": "shelluranium"
+        },
        {
            "name": "shelltoy"
        },
--- a/Resources/Textures/Objects/Storage/boxes.rsi/shelluranium.png
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/shelluranium.png