Migrate out rubber bullets/mags (#27329)

2024-04-26 00:22:49 -04:00
parent de965416bd
commit 735eeefa03
30 changed files with 60 additions and 666 deletions
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -33,17 +33,6 @@
      - id: MagazinePistolCaselessRiflePractice
        amount: 4

- 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 magazines
@@ -67,17 +56,6 @@
      - id: MagazineLightRiflePractice
        amount: 4

- 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 magazines
  parent: BoxMagazine
@@ -100,17 +78,6 @@
      - id: MagazineMagnumSubMachineGunPractice
        amount: 3

- 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 WT550 .35 auto magazines
@@ -145,17 +112,6 @@
      - id: MagazinePistolPractice
        amount: 4

- 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 machine pistol .35 auto magazines
  parent: BoxMagazine
@@ -178,18 +134,6 @@
      - id: MagazinePistolHighCapacityPractice
        amount: 4

- type: entity
-  name: box of machine pistol .35 auto (rubber) magazines
-  parent: BoxMagazine
-  id: BoxMagazinePistolHighCapacityRubber
-  description: A box full of machine pistol .35 auto (rubber) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazinePistolHighCapacityRubber
-        amount: 4
-
-
 - type: entity
  name: box of SMG .35 auto magazines
  parent: BoxMagazine
@@ -212,17 +156,6 @@
      - id: MagazinePistolSubMachineGunPractice
        amount: 3

- 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
-
 # Shotgun
 - type: entity
  name: box of (.50 pellet) ammo drums
@@ -290,14 +223,3 @@
    contents:
      - id: MagazineRiflePractice
        amount: 4
-
- 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
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -1,22 +1,17 @@
 - type: vendingMachineInventory
  id: AmmoVendInventory
  startingInventory:
-    MagazineBoxCaselessRifle: 3
+    MagazineBoxCaselessRifle: 6
    MagazineBoxCaselessRiflePractice: 3
-    MagazineBoxCaselessRifleRubber: 3

-    MagazineBoxLightRifleBig: 3
+    MagazineBoxLightRifleBig: 6
    MagazineBoxLightRiflePractice: 3
-    MagazineBoxLightRifleRubber: 3

-    MagazineBoxMagnum: 3
+    MagazineBoxMagnum: 6
    MagazineBoxMagnumPractice: 3
-    MagazineBoxMagnumRubber: 3

-    MagazineBoxPistol: 3
+    MagazineBoxPistol: 6
    MagazineBoxPistolPractice: 3
-    MagazineBoxPistolRubber: 3

-    MagazineBoxRifle: 3
+    MagazineBoxRifle: 6
    MagazineBoxRiflePractice: 3
-    MagazineBoxRifleRubber: 3
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
@@ -65,27 +65,6 @@
    zeroVisible: false
  - type: Appearance

- 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: MagazineBoxCaselessRifle
@@ -114,18 +93,3 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]
    - state: practice
-
- 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
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -74,21 +74,6 @@
      map: ["enum.GunVisualLayers.Mag"]
    - state: practice

- 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
-
 - type: entity
  id: MagazineBoxLightRifleIncendiary
  parent: BaseMagazineBoxLightRifle
@@ -117,4 +102,4 @@
      map: ["enum.GunVisualLayers.Base"]
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]
-    - state: uranium
+    - state: uranium
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
@@ -53,21 +53,6 @@
      map: ["enum.GunVisualLayers.Mag"]
    - state: practice

- 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
-
 - type: entity
  id: MagazineBoxMagnumIncendiary
  parent: BaseMagazineBoxMagnum
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
@@ -54,21 +54,6 @@
      map: ["enum.GunVisualLayers.Mag"]
    - state: practice

- 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
-
 - type: entity
  id: MagazineBoxPistolIncendiary
  parent: BaseMagazineBoxPistol
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -44,27 +44,6 @@
    zeroVisible: false
  - type: Appearance

- 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: MagazineBoxRifle
@@ -94,21 +73,6 @@
      map: ["enum.GunVisualLayers.Mag"]
    - state: practice

- 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
-
 - type: entity
  id: MagazineBoxRifleIncendiary
  parent: BaseMagazineBoxRifle
--- 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,18 +43,3 @@
      - state: tip
        map: [ "enum.AmmoVisualLayers.Tip" ]
        color: "#dbdbdb"
-
- 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"
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
@@ -41,21 +41,6 @@
        map: [ "enum.AmmoVisualLayers.Tip" ]
        color: "#dbdbdb"

- 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"
-
 - type: entity
  id: CartridgeLightRifleIncendiary
  name: cartridge (.30 rifle incendiary)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -41,21 +41,6 @@
        map: [ "enum.AmmoVisualLayers.Tip" ]
        color: "#dbdbdb"

- 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"
-
 - type: entity
  id: CartridgeMagnumIncendiary
  name: cartridge (.45 magnum incendiary)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -41,21 +41,6 @@
         map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#dbdbdb"

- 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"
-
 - type: entity
  id: CartridgePistolIncendiary
  name: cartridge (.35 auto incendiary)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
@@ -41,22 +41,6 @@
        map: [ "enum.AmmoVisualLayers.Tip" ]
        color: "#dbdbdb"

-
- 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"
-
 - type: entity
  id: CartridgeRifleIncendiary
  name: cartridge (.20 rifle incendiary)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -132,26 +132,6 @@
    zeroVisible: false
  - type: Appearance

- 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: MagazineCaselessRifle
  name: "magazine (.25 caseless)"
@@ -180,20 +160,6 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]

- 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: MagazineCaselessRifleShort
  name: "short magazine (.25 caseless)"
@@ -223,18 +189,3 @@
      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"]
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -82,20 +82,6 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]

- 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"]
-
 - type: entity
  id: MagazineLightRifleUranium
  name: "magazine (.30 rifle uranium)"
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -75,20 +75,6 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]

- 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: MagazineMagnumUranium
  name: pistol magazine (.45 magnum uranium)
@@ -145,20 +131,6 @@
    - 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"]
-
 - type: entity
  id: MagazineMagnumSubMachineGunUranium
  name: "Vector magazine (.45 magnum uranium)"
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -156,20 +156,6 @@
    - 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: MagazinePistolHighCapacity
  name: machine pistol magazine (.35 auto)
@@ -246,20 +232,6 @@
    - 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"]
-
 - type: entity
  id: MagazinePistolSubMachineGunUranium
  name: SMG magazine (.35 auto rubber)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -61,20 +61,6 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]

- 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"]
-
 - type: entity
  id: MagazineRifleUranium
  name: "magazine (.20 rifle uranium)"
--- 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,14 +19,3 @@
    damage:
      types:
        Blunt: 2
-
- type: entity
-  id: BulletCaselessRifleRubber
-  name: bullet (.25 caseless rubber)
-  parent: BaseBulletRubber
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Blunt: 3
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -20,17 +20,6 @@
      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
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -20,19 +20,6 @@
      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
@@ -44,7 +31,7 @@
      types:
        Blunt: 3
        Heat: 32
-        
+
 - type: entity
  id: BulletMagnumAP
  name: bullet (.45 magnum armor-piercing)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -20,17 +20,6 @@
      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
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -20,17 +20,6 @@
      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
@@ -42,7 +31,7 @@
      types:
        Blunt: 2
        Heat: 15
-  
+
 - type: entity
  id: BulletRifleUranium
  parent: BaseBulletUranium
@@ -54,4 +43,4 @@
      types:
        Radiation: 7
        Piercing: 8
-        
+
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -59,26 +59,6 @@
    zeroVisible: false
  - type: Appearance

- 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
-
 - type: entity
  id: SpeedLoaderMagnumAP
  name: "speed loader (.45 magnum armor-piercing)"
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
@@ -57,22 +57,3 @@
    steps: 7
    zeroVisible: false
  - type: Appearance
-
- 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
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -171,35 +171,11 @@
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/mk58.ogg

- 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: BaseWeaponPistol
  id: WeaponPistolN1984 # the spaces in description are for formatting.
-  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber. 
+  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber.
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Pistols/N1984.rsi
@@ -238,28 +214,3 @@
        whitelist:
          tags:
            - CartridgeMagnum
-
- 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
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -104,25 +104,6 @@
      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
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -186,28 +186,3 @@
    steps: 1
    zeroVisible: true
  - type: Appearance
-
- 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
--- 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
@@ -230,7 +230,7 @@
    minAngle: 1
    maxAngle: 6
    angleIncrease: 1.5
-    angleDecay: 6  
+    angleDecay: 6
    selectedMode: FullAuto
    shotsPerBurst: 5
    availableModes:
@@ -260,55 +260,3 @@
    steps: 6
    zeroVisible: true
  - type: Appearance
-
-# 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
-
- type: entity
-  name: Vector
-  parent: WeaponSubMachineGunVector
-  id: WeaponSubMachineGunVectorRubber
-  description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
-  suffix: Non-Lethal
-  components:
-  - type: ItemSlots
-    slots:
-      gun_magazine:
-        name: Magazine
-        startingItem: MagazineMagnumSubMachineGunRubber
-        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
-        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
-        priority: 2
-        whitelist:
-          tags:
-            - MagazineMagnumSubMachineGun
-      gun_chamber:
-        name: Chamber
-        startingItem: CartridgeMagnumRubber
-        priority: 1
-        whitelist:
-          tags:
-            - CartridgeMagnum
--- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -27,7 +27,7 @@
    id: ERTLeaderPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolN1984Nonlethal
+    pocket1: WeaponPistolN1984
    pocket2: FlashlightSeclite

 - type: startingGear
@@ -44,7 +44,7 @@
    id: ERTLeaderPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolN1984Nonlethal
+    pocket1: WeaponPistolN1984
    pocket2: FlashlightSeclite

 - type: startingGear
@@ -199,7 +199,7 @@
    id: ERTSecurityPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolMk58
    pocket2: FlashlightSeclite

 - type: startingGear
@@ -216,7 +216,7 @@
    id: ERTSecurityPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolMk58
    pocket2: FlashlightSeclite

 - type: startingGear
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -283,3 +283,47 @@ BriefcaseSyndieBase: null
 # 2024-04-08
 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