Cleanup gun containers (probably last time) (#8575)

- snake_case instead of kebab-case
- Remove old MagazineBarrel containers
- Remove old event

Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml

@@ -21,7 +21,7 @@
   - type: ChamberMagazineAmmoProvider
   - type: ItemSlots
     slots:
-      gun-magazine:
+      gun_magazine:
         name: Magazine
         startingItem: MagazineBoxLightRifle
         insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
@@ -29,7 +29,7 @@
         whitelist:
           tags:
             - MagazineBoxLightRifle
-      gun-chamber:
+      gun_chamber:
         name: Chamber
         startingItem: CartridgeLightRifle
         whitelist:
@@ -37,8 +37,8 @@
             - CartridgeLightRifle
   - type: ContainerContainer
     containers:
-      gun-magazine: !type:ContainerSlot
-      gun-chamber: !type:ContainerSlot
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
 
 - type: entity
   name: L6 SAW

Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -24,7 +24,7 @@
   - type: ChamberMagazineAmmoProvider
   - type: ItemSlots
     slots:
-      gun-magazine:
+      gun_magazine:
         name: Magazine
         startingItem: MagazinePistol
         insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
@@ -32,7 +32,7 @@
         whitelist:
           tags:
             - MagazinePistol
-      gun-chamber:
+      gun_chamber:
         name: Chamber
         startingItem: CartridgePistol
         whitelist:
@@ -40,8 +40,8 @@
             - CartridgePistol
   - type: ContainerContainer
     containers:
-      gun-magazine: !type:ContainerSlot
-      gun-chamber: !type:ContainerSlot
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
   - type: Appearance
     visuals:
     - type: MagVisualizer
@@ -62,7 +62,7 @@
     sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
   - type: ItemSlots
     slots:
-      gun-magazine:
+      gun_magazine:
         name: Magazine
         startingItem: MagazinePistol
         insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
@@ -71,7 +71,7 @@
           tags:
             - MagazinePistol
             - MagazinePistolHighCapacity
-      gun-chamber:
+      gun_chamber:
         name: Chamber
         startingItem: CartridgePistol
         whitelist:
@@ -79,8 +79,8 @@
             - CartridgePistol
   - type: ContainerContainer
     containers:
-      gun-magazine: !type:ContainerSlot
-      gun-chamber: !type:ContainerSlot
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
 
 - type: entity
   name: handmade pistol
@@ -122,7 +122,7 @@
       path: /Audio/Weapons/Guns/Gunshots/silenced.ogg
   - type: ItemSlots
     slots:
-      gun-magazine:
+      gun_magazine:
         name: Magazine
         startingItem: MagazinePistolCaselessRifle
         insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
@@ -130,7 +130,7 @@
         whitelist:
           tags:
             - MagazinePistolCaselessRifle
-      gun-chamber:
+      gun_chamber:
         name: Chamber
         startingItem: CartridgeCaselessRifle
         whitelist:
@@ -138,8 +138,8 @@
             - CartridgeCaselessRifle
   - type: ContainerContainer
     containers:
-      gun-magazine: !type:ContainerSlot
-      gun-chamber: !type:ContainerSlot
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
 
 - type: entity
   name: mk 58

Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -20,7 +20,7 @@
   - type: ChamberMagazineAmmoProvider
   - type: ItemSlots
     slots:
-      gun-magazine:
+      gun_magazine:
         name: Magazine
         startingItem: MagazineLightRifle
         insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
@@ -28,7 +28,7 @@
         whitelist:
           tags:
             - MagazineLightRifle
-      gun-chamber:
+      gun_chamber:
         name: Chamber
         startingItem: CartridgeLightRifle
         whitelist:
@@ -36,8 +36,8 @@
             - CartridgeLightRifle
   - type: ContainerContainer
     containers:
-      gun-magazine: !type:ContainerSlot
-      gun-chamber: !type:ContainerSlot
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
 
 - type: entity
   name: AKMS
@@ -62,7 +62,7 @@
   - type: ChamberMagazineAmmoProvider
   - type: ItemSlots
     slots:
-      gun-magazine:
+      gun_magazine:
         name: Magazine
         startingItem: MagazineLightRifle
         insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
@@ -70,7 +70,7 @@
         whitelist:
           tags:
             - MagazineLightRifle
-      gun-chamber:
+      gun_chamber:
         name: Chamber
         startingItem: CartridgeLightRifle
         whitelist:
@@ -78,8 +78,8 @@
             - CartridgeLightRifle
   - type: ContainerContainer
     containers:
-      gun-magazine: !type:ContainerSlot
-      gun-chamber: !type:ContainerSlot
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
   - type: Appearance
     visuals:
     - type: MagVisualizer
@@ -105,7 +105,7 @@
     sprite: Objects/Weapons/Guns/Rifles/carbine.rsi
   - type: ItemSlots
     slots:
-      gun-magazine:
+      gun_magazine:
         name: Magazine
         startingItem: MagazineRifle
         insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
@@ -113,7 +113,7 @@
         whitelist:
           tags:
             - MagazineRifle
-      gun-chamber:
+      gun_chamber:
         name: Chamber
         startingItem: CartridgeRifle
         whitelist:
@@ -121,8 +121,8 @@
             - CartridgeRifle
   - type: ContainerContainer
     containers:
-      gun-magazine: !type:ContainerSlot
-      gun-chamber: !type:ContainerSlot
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
   - type: Appearance
     visuals:
     - type: MagVisualizer
@@ -151,7 +151,7 @@
       path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
   - type: ItemSlots
     slots:
-      gun-magazine:
+      gun_magazine:
         name: Magazine
         startingItem: MagazineRifle
         insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
@@ -159,7 +159,7 @@
         whitelist:
           tags:
             - MagazineRifle
-      gun-chamber:
+      gun_chamber:
         name: Chamber
         startingItem: CartridgeRifle
         whitelist:
@@ -167,8 +167,8 @@
             - CartridgeRifle
   - type: ContainerContainer
     containers:
-      gun-magazine: !type:ContainerSlot
-      gun-chamber: !type:ContainerSlot
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
   - type: Appearance
     visuals:
     - type: MagVisualizer

Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -21,7 +21,7 @@
   - type: ChamberMagazineAmmoProvider
   - type: ItemSlots
     slots:
-      gun-magazine:
+      gun_magazine:
         name: Magazine
         startingItem: MagazinePistolSubMachineGun
         insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
@@ -29,7 +29,7 @@
         whitelist:
           tags:
             - MagazinePistolSubMachineGun
-      gun-chamber:
+      gun_chamber:
         name: Chamber
         startingItem: CartridgePistol
         whitelist:
@@ -37,8 +37,8 @@
             - CartridgePistol
   - type: ContainerContainer
     containers:
-      gun-magazine: !type:ContainerSlot
-      gun-chamber: !type:ContainerSlot
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
 
 - type: entity
   name: Atreides
@@ -114,7 +114,7 @@
     - FullAuto
   - type: ItemSlots
     slots:
-      gun-magazine:
+      gun_magazine:
         name: Magazine
         startingItem: MagazineMagnumSubMachineGun
         insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
@@ -122,7 +122,7 @@
         whitelist:
           tags:
             - MagazineMagnumSubMachineGun
-      gun-chamber:
+      gun_chamber:
         name: Chamber
         startingItem: CartridgeMagnum
         whitelist:
@@ -130,8 +130,8 @@
             - CartridgeMagnum
   - type: ContainerContainer
     containers:
-      gun-magazine: !type:ContainerSlot
-      gun-chamber: !type:ContainerSlot
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
   - type: Appearance
     visuals:
     - type: MagVisualizer
@@ -182,7 +182,7 @@
   components:
   - type: ItemSlots
     slots:
-      gun-magazine:
+      gun_magazine:
         name: Magazine
         startingItem: MagazineMagnumSubMachineGunRubber
         insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
@@ -190,7 +190,7 @@
         whitelist:
           tags:
             - MagazineMagnumSubMachineGun
-      gun-chamber:
+      gun_chamber:
         name: Chamber
         startingItem: CartridgeMagnumRubber
         whitelist:
@@ -198,5 +198,5 @@
             - CartridgeMagnum
   - type: ContainerContainer
     containers:
-      gun-magazine: !type:ContainerSlot
-      gun-chamber: !type:ContainerSlot
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -61,7 +61,7 @@
       path: /Audio/Weapons/Guns/Empty/empty.ogg
   - type: ItemSlots
     slots:
-      gun-magazine:
+      gun_magazine:
         name: Magazine
         startingItem: MagazineShotgun
         whitelist:
@@ -71,8 +71,8 @@
         ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
   - type: ContainerContainer
     containers:
-      gun-magazine: !type:ContainerSlot
-      gun-chamber: !type:ContainerSlot
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
   - type: MagazineAmmoProvider
   - type: Appearance
     visuals: