New munitions descriptions

Resources/Maps/Salvage/stationstation.yml

@@ -2194,7 +2194,7 @@ entities:
     - type: Transform
       pos: -5.8173656,7.4934487
       parent: 179
-- proto: SpeedLoaderLightRifle
+- proto: SpeedLoaderHeavyRifle
   entities:
   - uid: 156
     components:

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

@@ -157,6 +157,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafeDisabler
   name: disabler safe
+  description: Contains 5 disabler pistols.
   components:
   - type: StorageFill
     contents:
@@ -167,6 +168,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafePistolMk58
   name: mk58 safe
+  description: Contains 4 Mk58 pistols and 8 extra magazines.
   components:
   - type: StorageFill
     contents:
@@ -179,6 +181,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafeRifleLecter
   name: lecter safe
+  description: Contains 2 Lecter combat rifles and 4 extra magazines.
   components:
   - type: StorageFill
     contents:
@@ -191,6 +194,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafeSubMachineGunDrozd
   name: drozd safe
+  description: Contains 2 Drozd submachine guns and 4 extra magazines.
   components:
   - type: StorageFill
     contents:
@@ -203,6 +207,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafeShotgunEnforcer
   name: enforcer safe
+  description: Contains 2 Enforcer shotguns and 4 boxes of shells.
   components:
   - type: StorageFill
     contents:
@@ -215,6 +220,7 @@
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   id: GunSafeShotgunKammerer
   name: kammerer safe
+  description: Contains 2 Kammerer shotguns and 2 boxes of shells.
   components:
   - type: StorageFill
     contents:
@@ -228,6 +234,7 @@
   suffix: Wt550
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
   name: wt550 safe
+  description: Contains 2 WT550 submachine guns and 4 extra magazines.
   components:
   - type: StorageFill
     contents:
@@ -240,6 +247,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

@@ -28,7 +28,8 @@
 - type: entity
   parent: BaseMagazineBoxAntiMateriel
   id: MagazineBoxAntiMaterielBig
-  name: ammunition box (.60 anti-materiel)
+  name: large ammunition box (.60 anti-materiel)
+  description: Metal box A metal box containing heavy .60x4.5 anti-materiel rounds.
   components:
   - type: BallisticAmmoProvider
     capacity: 30
@@ -49,6 +50,7 @@
   parent: BaseMagazineBoxAntiMateriel
   id: MagazineBoxAntiMateriel
   name: ammunition box (.60 anti-materiel)
+  description: A metal box containing heavy .60x4.5 anti-materiel rounds. There is no way you are fitting this in your bag comfortably.
   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
@@ -25,10 +25,10 @@
   - type: Appearance
 
 # Boxes
-- type: entity
+- type: entity # does anything use this?
   parent: BaseMagazineBoxCaselessRifle
   id: MagazineBoxCaselessRifle10x24
-  name: ammunition box (.25 caseless)
+  name: ammunition box (.20 caseless)
   components:
   - type: BallisticAmmoProvider
     capacity: 200
@@ -48,7 +48,8 @@
 - type: entity
   parent: BaseMagazineBoxCaselessRifle
   id: MagazineBoxCaselessRifleBig
-  name: ammunition box (.25 caseless)
+  name: large ammunition box (.20 caseless)
+  descripition: A large metal box full of .20x0.34 caseless rounds, which omit the brass casing of standard munitions in favor of hardened propellent.
   components:
   - type: BallisticAmmoProvider
     capacity: 200
@@ -68,7 +69,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
@@ -82,7 +84,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, which omit the brass casing of standard munitions in favor of hardened propellent. This variant contains non-harmful rubber training rounds.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRiflePractice

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

@@ -0,0 +1,42 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseMagazineBoxHeavyRifle
+  name: ammunition box (.325 rifle)
+  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 .235x2.12 full-power rifle rounds. Used to top off speedloaders or belts for 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"]

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

@@ -2,7 +2,7 @@
   abstract: true
   parent: BaseItem
   id: BaseMagazineBoxLightRifle
-  name: ammunition box (.30 rifle)
+  name: ammunition box (.308 rifle)
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
@@ -28,10 +28,11 @@
 - type: entity
   parent: BaseMagazineBoxLightRifle
   id: MagazineBoxLightRifleBig
-  name: ammunition box (.30 rifle)
+  name: large ammunition box (.308 rifle)
+  description: Metal box full of .308x1.53 rounds, commonly found in aftermarket and Syndicate weapons. This one holds standard FMJ ammuntion.
   components:
   - type: BallisticAmmoProvider
-    capacity: 200
+    capacity: 240
     proto: CartridgeLightRifle
   - type: Sprite
     layers:
@@ -48,7 +49,8 @@
 - type: entity
   parent: BaseMagazineBoxLightRifle
   id: MagazineBoxLightRifle
-  name: ammunition box (.30 rifle)
+  name: ammunition box (.308 rifle)
+  description: Cardboard box full of .308x1.53 rifle rounds, commonly found in aftermarket and Syndicate weapons. This one holds standard FMJ ammuntion.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRifle
@@ -62,7 +64,8 @@
 - type: entity
   parent: BaseMagazineBoxLightRifle
   id: MagazineBoxLightRiflePractice
-  name: ammunition box (.30 rifle practice)
+  name: ammunition box (.308 rifle practice)
+  description: Cardboard box full of .308x1.53 rifle rounds, commonly found in aftermarket and Syndicate weapons. This one holds rubber-tipped practice rounds.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRiflePractice
@@ -77,7 +80,8 @@
 - type: entity
   id: MagazineBoxLightRifleIncendiary
   parent: BaseMagazineBoxLightRifle
-  name: ammunition box (.30 rifle incendiary)
+  name: ammunition box (.308 rifle incendiary)
+  description: Cardboard box full of .308x1.53 rifle rounds, commonly found in aftermarket and Syndicate weapons. This one holds incendiary rounds which burn the target from the inside.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRifleIncendiary
@@ -92,7 +96,8 @@
 - type: entity
   parent: BaseMagazineBoxLightRifle
   id: MagazineBoxLightRifleUranium
-  name: ammunition box (.30 rifle uranium)
+  name: ammunition box (.308 rifle uranium)
+  description: Cardboard box full of .308x1.53 rifle rounds, commonly found in aftermarket and Syndicate weapons. This one holds uranium-core rounds which severely irradiate the target.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRifleUranium

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

@@ -27,7 +27,8 @@
 - type: entity
   parent: BaseMagazineBoxMagnum
   id: MagazineBoxMagnum
-  name: ammunition box (.45 magnum)
+  name: ammunition box (.44 magnum)
+  description: Cardboard box of .44x1.63 magnum rounds. This version contains standard FMJ rounds for a good mix of penetration and expansion.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnum
@@ -41,7 +42,8 @@
 - type: entity
   parent: BaseMagazineBoxMagnum
   id: MagazineBoxMagnumPractice
-  name: ammunition box (.45 magnum practice)
+  name: ammunition box (.44 magnum practice)
+  description: Cardboard box of .44x1.63 magnum rounds. This version contains practice ammunition for practicing your quick draw.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumPractice
@@ -54,46 +56,47 @@
     - state: practice
 
 - type: entity
-  id: MagazineBoxMagnumIncendiary
+  id: MagazineBoxMagnumAP
   parent: BaseMagazineBoxMagnum
-  name: ammunition box (.45 magnum incendiary)
+  name: ammunition box (.44 magnum AP)
+  description: Cardboard box of .44x1.63 magnum rounds. This version contains highly illegal armor-piercing ammunition, which goes straight through common body armor.
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgeMagnumIncendiary
+    proto: CartridgeMagnumAP
   - type: Sprite
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
-    - state: incendiary
+    - state: piercing
 
 - type: entity
-  id: MagazineBoxMagnumUranium
+  id: MagazineBoxMagnumIncendiary
   parent: BaseMagazineBoxMagnum
-  name: ammunition box (.45 magnum uranium)
+  name: ammunition box (.44 magnum incendiary)
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgeMagnumUranium
+    proto: CartridgeMagnumIncendiary
   - type: Sprite
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
-    - state: uranium
+    - state: incendiary
 
 - type: entity
-  id: MagazineBoxMagnumAP
+  id: MagazineBoxMagnumUranium
   parent: BaseMagazineBoxMagnum
-  name: ammunition box (.45 magnum armor-piercing)
+  name: ammunition box (.44 magnum uranium)
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgeMagnumAP
+    proto: CartridgeMagnumUranium
   - type: Sprite
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
-    - state: piercing
+    - state: uranium

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

@@ -2,7 +2,7 @@
   abstract: true
   parent: BaseItem
   id: BaseMagazineBoxPistol
-  name: ammunition box (.35 auto)
+  name: ammunition box (.38 auto)
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
@@ -28,7 +28,8 @@
 - type: entity
   parent: BaseMagazineBoxPistol
   id: MagazineBoxPistol
-  name: ammunition box (.35 auto)
+  name: ammunition box (.38 auto)
+  description: Cardboard box of .38x1.55 ammunition. This version contains FMJ rounds for general purpose use.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistol
@@ -42,7 +43,8 @@
 - type: entity
   parent: BaseMagazineBoxPistol
   id: MagazineBoxPistolPractice
-  name: ammunition box (.35 auto practice)
+  name: ammunition box (.38 auto practice)
+  description: Cardboard box of .38x1.55 ammunition. This version contains blue rubber-tipped rounds for training.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolPractice
@@ -57,7 +59,7 @@
 - type: entity
   id: MagazineBoxPistolIncendiary
   parent: BaseMagazineBoxPistol
-  name: ammunition box (.35 auto incendiary)
+  name: ammunition box (.38 auto incendiary)
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolIncendiary
@@ -72,7 +74,7 @@
 - type: entity
   id: MagazineBoxPistolUranium
   parent: BaseMagazineBoxPistol
-  name: ammunition box (.35 auto uranium)
+  name: ammunition box (.38 auto uranium)
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolUranium