New munitions descriptions

Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml

@@ -12,21 +12,21 @@
       - state: magazine
 
 - type: entity
-  name: box of .25 caseless magazines
+  name: box of .20 caseless magazines
   parent: BoxMagazine
   id: BoxMagazinePistolCaselessRifle
-  description: A box full of .25 caseless magazines.
+  description: A box full of .20 caseless magazines.
   components:
   - type: StorageFill
     contents:
       - id: MagazinePistolCaselessRifle
         amount: 4
 
 - type: entity
-  name: box of .25 caseless (practice) magazines
+  name: box of .20 caseless (practice) magazines
   parent: BoxMagazine
   id: BoxMagazinePistolCaselessRiflePractice
-  description: A box full of .25 caseless practice magazines.
+  description: A box full of .20 caseless practice magazines.
   components:
   - type: StorageFill
     contents:
@@ -35,21 +35,21 @@
 
 # LightRifle
 - type: entity
-  name: box of .30 rifle magazines
+  name: box of .308 rifle magazines
   parent: BoxMagazine
   id: BoxMagazineLightRifle
-  description: A box full of .30 rifle magazines.
+  description: A box full of .308 rifle magazines.
   components:
   - type: StorageFill
     contents:
       - id: MagazineLightRifle
         amount: 4
 
 - type: entity
-  name: box of .30 rifle (practice) magazines
+  name: box of .308 rifle (practice) magazines
   parent: BoxMagazine
   id: BoxMagazineLightRiflePractice
-  description: A box full of .30 rifle (practice) magazines.
+  description: A box full of .308 rifle (practice) magazines.
   components:
   - type: StorageFill
     contents:
@@ -58,144 +58,144 @@
 
 # Magnum
 - type: entity
-  name: box of SMG .45 magnum magazines
+  name: box of SMG .44 magnum magazines
   parent: BoxMagazine
   id: BoxMagazineMagnumSubMachineGun
-  description: A box full of SMG .45 magnum magazines.
+  description: A box full of SMG .44 magnum magazines.
   components:
   - type: StorageFill
     contents:
       - id: MagazineMagnumSubMachineGun
-        amount: 3
+        amount: 4
 
 - type: entity
-  name: box of SMG .45 magnum (practice) magazines
+  name: box of SMG .44 magnum (practice) magazines
   parent: BoxMagazine
   id: BoxMagazineMagnumSubMachineGunPractice
-  description: A box full of SMG .45 magnum (practice) magazines.
+  description: A box full of SMG .44 magnum (practice) magazines.
   components:
   - type: StorageFill
     contents:
       - id: MagazineMagnumSubMachineGunPractice
-        amount: 3
+        amount: 4
 
 # Pistol
 - type: entity
-  name: box of WT550 .35 auto magazines
+  name: box of WT550 .38 auto magazines
   parent: BoxMagazine
   id: BoxMagazinePistolSubMachineGunTopMounted
-  description: A box full of WT550 .35 auto magazines.
+  description: A box full of WT550 .38 auto magazines.
   components:
   - type: StorageFill
     contents:
       - id: MagazinePistolSubMachineGunTopMounted
-        amount: 3
+        amount: 4
 
 - type: entity
-  name: box of pistol .35 auto magazines
+  name: box of pistol .38 auto magazines
   parent: BoxMagazine
   id: BoxMagazinePistol
-  description: A box full of pistol .35 auto magazines.
+  description: A box full of pistol .38 auto magazines.
   components:
   - type: StorageFill
     contents:
       - id: MagazinePistol
         amount: 4
 
 - type: entity
-  name: box of pistol .35 auto (practice) magazines
+  name: box of pistol .38 auto (practice) magazines
   parent: BoxMagazine
   id: BoxMagazinePistolPractice
-  description: A box full of  magazines.
+  description: A box full of pistol .38 auto magazines.
   components:
   - type: StorageFill
     contents:
       - id: MagazinePistolPractice
         amount: 4
 
 - type: entity
-  name: box of machine pistol .35 auto magazines
+  name: box of machine pistol .38 auto magazines
   parent: BoxMagazine
   id: BoxMagazinePistolHighCapacity
-  description: A box full of machine pistol .35 auto magazines.
+  description: A box full of extended pistol .38 auto magazines.
   components:
   - type: StorageFill
     contents:
       - id: MagazinePistolHighCapacity
         amount: 4
 
 - type: entity
-  name: box of machine pistol .35 auto (practice) magazines
+  name: box of machine pistol .38 auto (practice) magazines
   parent: BoxMagazine
   id: BoxMagazinePistolHighCapacityPractice
-  description: A box full of machine pistol .35 auto (practice) magazines.
+  description: A box full of extended pistol .38 auto (practice) magazines.
   components:
   - type: StorageFill
     contents:
       - id: MagazinePistolHighCapacityPractice
         amount: 4
 
 - type: entity
-  name: box of SMG .35 auto magazines
+  name: box of SMG .38 auto magazines
   parent: BoxMagazine
   id: BoxMagazinePistolSubMachineGun
-  description: A box full of SMG .35 auto magazines.
+  description: A box full of SMG .38 auto magazines.
   components:
   - type: StorageFill
     contents:
       - id: MagazinePistolSubMachineGun
-        amount: 3
+        amount: 4
 
 - type: entity
-  name: box of SMG .35 auto (practice) magazines
+  name: box of SMG .38 auto (practice) magazines
   parent: BoxMagazine
   id: BoxMagazinePistolSubMachineGunPractice
-  description: A box full of SMG .35 auto (practice) magazines.
+  description: A box full of SMG .38 auto (practice) magazines.
   components:
   - type: StorageFill
     contents:
       - id: MagazinePistolSubMachineGunPractice
-        amount: 3
+        amount: 4
 
 # Shotgun
 - type: entity
-  name: box of (.50 pellet) ammo drums
+  name: box of 12G pellet ammo drums
   parent: BoxMagazine
   id: BoxMagazineShotgun
-  description: A box full of (.50 pellet) ammo drums.
+  description: A box full of 12G pellet ammo drums.
   components:
   - type: StorageFill
     contents:
       - id: MagazineShotgun
         amount: 4
 
 - type: entity
-  name: box of (.50 beanbag) ammo drums
+  name: box of 12G beanbag ammo drums
   parent: BoxMagazine
   id: BoxMagazineShotgunBeanbag
-  description: A box full of (.50 beanbag) ammo drums.
+  description: A box full of 12G beanbag ammo drums.
   components:
   - type: StorageFill
     contents:
       - id: MagazineShotgunBeanbag
         amount: 4
 
 - type: entity
-  name: box of (.50 slug) ammo drums
+  name: box of 12G slug ammo drums
   parent: BoxMagazine
   id: BoxMagazineShotgunSlug
-  description: A box full of (.50 slug) ammo drums.
+  description: A box full of 12G slug ammo drums.
   components:
   - type: StorageFill
     contents:
       - id: MagazineShotgunSlug
         amount: 4
 
 - type: entity
-  name: box of (.50 incendiary) ammo drums
+  name: box of 12G incendiary ammo drums
   parent: BoxMagazine
   id: BoxMagazineShotgunIncendiary
-  description: A box full of (.50 incendiary) ammo drums.
+  description: A box full of 12G incendiary ammo drums.
   components:
   - type: StorageFill
     contents:
@@ -204,21 +204,21 @@
 
 # Rifle
 - type: entity
-  name: box of .20 rifle magazines
+  name: box of .223 rifle magazines
   parent: BoxMagazine
   id: BoxMagazineRifle
-  description: A box full of .20 rifle magazines.
+  description: A box full of .223 rifle magazines.
   components:
   - type: StorageFill
     contents:
       - id: MagazineRifle
         amount: 4
 
 - type: entity
-  name: box of .20 rifle (practice) magazines
+  name: box of .223 rifle (practice) magazines
   parent: BoxMagazine
   id: BoxMagazineRiflePractice
-  description: A box full of .20 rifle (practice) magazines.
+  description: A box full of .223 rifle (practice) magazines.
   components:
   - type: StorageFill
     contents:

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -155,6 +155,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafeDisabler
   name: disabler safe
+  description: Contains 5 disabler pistols.
   components:
   - type: StorageFill
     contents:
@@ -165,6 +166,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafePistolMk58
   name: mk58 safe
+  description: Contains 4 Mk58 pistols and 8 extra magazines.
   components:
   - type: StorageFill
     contents:
@@ -177,6 +179,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafeRifleLecter
   name: lecter safe
+  description: Contains 2 Lecter combat rifles and 4 extra magazines.
   components:
   - type: StorageFill
     contents:
@@ -189,6 +192,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafeSubMachineGunDrozd
   name: drozd safe
+  description: Contains 2 Drozd submachine guns and 4 extra magazines.
   components:
   - type: StorageFill
     contents:
@@ -201,6 +205,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafeShotgunEnforcer
   name: enforcer safe
+  description: Contains 2 Enforcer shotguns and 4 boxes of shells.
   components:
   - type: StorageFill
     contents:
@@ -213,6 +218,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafeShotgunKammerer
   name: kammerer safe
+  description: Contains 2 Kammerer shotguns and 2 boxes of shells.
   components:
   - type: StorageFill
     contents:
@@ -226,6 +232,7 @@
   suffix: Wt550
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   name: wt550 safe
+  description: Contains 2 WT550 submachine guns and 4 extra magazines.
   components:
   - type: StorageFill
     contents:
@@ -238,6 +245,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafeLaserCarbine
   name: laser safe
+  description: Contains 3 Laser Rifles.
   components:
   - type: StorageFill
     contents:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml

@@ -29,6 +29,7 @@
   parent: BaseMagazineBoxAntiMateriel
   id: MagazineBoxAntiMateriel
   name: ammunition box (.60 anti-materiel)
+  description: A metal box containing heavy .60x4.5 anti-materiel rounds.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeAntiMateriel

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml

@@ -2,7 +2,7 @@
   abstract: true
   parent: BaseItem
   id: BaseMagazineBoxCaselessRifle
-  name: ammunition box (.25 caseless)
+  name: ammunition box (.20 caseless)
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
@@ -28,7 +28,8 @@
 - type: entity
   parent: BaseMagazineBoxCaselessRifle
   id: MagazineBoxCaselessRifle
-  name: ammunition box (.25 caseless)
+  name: ammunition box (.20 caseless)
+  description: A cardboard box full of .20x0.34 caseless rounds, which omit the brass casing of standard munitions in favor of hardened propellent.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRifle
@@ -42,7 +43,8 @@
 - type: entity
   parent: BaseMagazineBoxCaselessRifle
   id: MagazineBoxCaselessRiflePractice
-  name: ammunition box (.25 caseless practice)
+  name: ammunition box (.20 caseless practice)
+  description: A cardboard box full of 0.20x0.34 caseless rounds. This version contains non-harmful training ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRiflePractice

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_rifle.yml

@@ -0,0 +1,41 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseMagazineBoxHeavyRifle
+  components:
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgeHeavyRifle
+    proto: CartridgeHeavyRifle
+    capacity: 50
+  - type: Item
+    size: Small
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi
+  - type: MagazineVisuals
+    magState: mag
+    steps: 4
+    zeroVisible: false
+  - type: Appearance
+
+# Boxes
+
+- type: entity
+  parent: BaseMagazineBoxHeavyRifle
+  id: MagazineBoxHeavyRifle
+  name: ammunition box (.325 rifle)
+  description: Cardboard box full of .325x2 full-power rifle rounds. Dated, but still widely used by marksman rifles and medium machine guns.
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeHeavyRifle
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]