Uranium & AP magazine and projectile sprites (#23914)

Add missing uranium and AP magazine and box sprite layers. Add uranium and AP projectile sprites. Fix whitelist issue that made .45 pistol mags not go in secbelt.

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -455,6 +455,7 @@
         - Radio
         - Sidearm
         - MagazinePistol
+        - MagazineMagnum
       components:
         - Stunbaton
         - FlashOnTrigger

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

@@ -116,4 +116,5 @@
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: uranium

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

@@ -95,4 +95,20 @@
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: uranium
+
+- type: entity
+  id: MagazineBoxMagnumAP
+  parent: BaseMagazineBoxMagnum
+  name: ammunition box (.45 magnum armor-piercing)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumAP
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: piercing

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

@@ -97,4 +97,4 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
-
+    - state: uranium

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

@@ -137,4 +137,5 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: uranium
 

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

@@ -96,6 +96,20 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
+- type: entity
+  id: MagazineLightRifleUranium
+  name: "magazine (.30 rifle uranium)"
+  parent: BaseMagazineLightRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleUranium
+  - type: Sprite
+    layers:
+    - state: uranium
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
 - type: entity
   id: MagazineLightRifleMaxim
   name: "pan magazine (.30 rifle)"

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

@@ -67,7 +67,7 @@
   parent: BaseMagazineMagnum
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgeMagnum
+    proto: CartridgeMagnumPractice
   - type: Sprite
     layers:
     - state: practice
@@ -89,6 +89,34 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
+- type: entity
+  id: MagazineMagnumUranium
+  name: pistol magazine (.45 magnum uranium)
+  parent: BaseMagazineMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumUranium
+  - type: Sprite
+    layers:
+    - state: uranium
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineMagnumAP
+  name: pistol magazine (.45 magnum armor-piercing)
+  parent: BaseMagazineMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumAP
+  - type: Sprite
+    layers:
+    - state: piercing
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
 - type: entity
   id: MagazineMagnumSubMachineGun
   name: "Vector magazine (.45 magnum)"
@@ -130,3 +158,31 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineMagnumSubMachineGunUranium
+  name: "Vector magazine (.45 magnum uranium)"
+  parent: BaseMagazineMagnumSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumUranium
+  - type: Sprite
+    layers:
+    - state: uranium
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineMagnumSubMachineGunPiercing
+  name: "Vector magazine (.45 magnum armor-piercing)"
+  parent: BaseMagazineMagnumSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumAP
+  - type: Sprite
+    layers:
+    - state: piercing
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]

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

@@ -259,3 +259,17 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazinePistolSubMachineGunUranium
+  name: SMG magazine (.35 auto rubber)
+  parent: BaseMagazinePistolSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolUranium
+  - type: Sprite
+    layers:
+    - state: uranium
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml

@@ -74,3 +74,17 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineRifleUranium
+  name: "magazine (.20 rifle uranium)"
+  parent: BaseMagazineRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleUranium
+  - type: Sprite
+    layers:
+    - state: uranium
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]

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

@@ -45,7 +45,7 @@
 
 - type: entity
   id: BulletLightRifleUranium
-  parent: BaseBullet
+  parent: BaseBulletUranium
   name: bullet (.20 rifle uranium)
   noSpawn: true
   components:

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

@@ -60,7 +60,7 @@
 - type: entity
   id: BulletMagnumUranium
   name: bullet (.45 magnum uranium)
-  parent: BaseBullet
+  parent: BaseBulletUranium
   noSpawn: true
   components:
   - type: Projectile

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

@@ -45,7 +45,7 @@
 
 - type: entity
   id: BulletPistolUranium
-  parent: BaseBullet
+  parent: BaseBulletUranium
   name: bullet (.35 auto uranium)
   noSpawn: true
   components:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml

@@ -45,7 +45,7 @@
   
 - type: entity
   id: BulletRifleUranium
-  parent: BaseBullet
+  parent: BaseBulletUranium
   name: bullet (0.20 rifle uranium)
   noSpawn: true
   components:

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

@@ -91,10 +91,30 @@
     layers:
       - state: base
         map: [ "enum.GunVisualLayers.Base" ]
-      - state: base-6
+      - state: piercing-6
         map: [ "enum.GunVisualLayers.Mag" ]
   - type: MagazineVisuals
-    magState: base
+    magState: piercing
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderMagnumUranium
+  name: "speed loader (.45 magnum uranium)"
+  parent: BaseSpeedLoaderMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumUranium
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: uranium-6
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: uranium
     steps: 7
     zeroVisible: false
   - type: Appearance

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -147,12 +147,31 @@
   parent: BaseBullet
   noSpawn: true
   components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+    - state: piercing
   - type: Projectile
     damage:
       types:
         Piercing: 11 # 20% decrease
     ignoreResistances: true
 
+- type: entity
+  id: BaseBulletUranium
+  name: base bullet uranium
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+    - state: uranium
+  - type: Projectile
+    damage:
+      types:
+        Radiation: 11
+
 # Energy projectiles
 - type: entity
   name: taser bolt

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json

@@ -27,6 +27,9 @@
     },
     {
       "name": "rubber"
+    },
+    {
+      "name": "uranium"
     }
   ]
 }

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json

@@ -27,6 +27,12 @@
     },
     {
       "name": "rubber"
+    },
+    {
+      "name": "uranium"
+    },
+    {
+      "name": "piercing"
     }
   ]
 }

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json

@@ -24,6 +24,9 @@
     },
     {
       "name": "rubber"
+    },
+    {
+      "name": "uranium"
     }
   ]
 }

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json

@@ -30,6 +30,9 @@
     },
     {
       "name": "rubber"
+    },
+    {
+      "name": "uranium"
     }
   ]
 }

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json

@@ -22,6 +22,9 @@
         {
             "name": "rubber"
         },
+        {
+            "name": "uranium"
+        },
         {
             "name": "mag-1"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json

@@ -19,6 +19,9 @@
         {
             "name": "rubber"
         },
+        {
+            "name": "uranium"
+        },
         {
             "name": "mag-1"
         }

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json

@@ -19,6 +19,12 @@
         {
             "name": "rubber"
         },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "piercing"
+        },
         {
             "name": "mag-1"
         }

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json

@@ -19,6 +19,12 @@
         {
             "name": "rubber"
         },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "piercing"
+        },
         {
             "name": "mag-1"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json

@@ -22,6 +22,12 @@
         {
             "name": "rubber"
         },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "piercing"
+        },
         {
             "name": "mag-1"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json

@@ -22,6 +22,9 @@
         {
             "name": "rubber"
         },
+        {
+            "name": "uranium"
+        },
         {
             "name": "mag-1"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json

@@ -19,6 +19,9 @@
         {
             "name": "rubber"
         },
+        {
+            "name": "uranium"
+        },
         {
             "name": "mag-1"
         }

Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json

@@ -66,6 +66,42 @@
         },
         {
             "name": "rubber-6"
+        },
+        {
+            "name": "uranium-1"
+        },
+        {
+            "name": "uranium-2"
+        },
+        {
+            "name": "uranium-3"
+        },
+        {
+            "name": "uranium-4"
+        },
+        {
+            "name": "uranium-5"
+        },
+        {
+            "name": "uranium-6"
+        },
+        {
+            "name": "piercing-1"
+        },
+        {
+            "name": "piercing-2"
+        },
+        {
+            "name": "piercing-3"
+        },
+        {
+            "name": "piercing-4"
+        },
+        {
+            "name": "piercing-5"
+        },
+        {
+            "name": "piercing-6"
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json

@@ -46,6 +46,24 @@
         ]
       ]
     },
+    {
+      "name": "uranium",
+      "delays": [
+        [
+          0.05,
+          0.05
+        ]
+      ]
+    },
+    {
+      "name": "piercing",
+      "delays": [
+        [
+          0.05,
+          0.05
+        ]
+      ]
+    },
     {
       "name": "frag"
     },