Fix Gun Migration (#5003)

## Short description
#4934 forgot to
migrate the bundle, and it's used on some event maps, so this broke some
maps. I migrated it to a new bundle, containing an estoc and china lake.

It was also missing # Starlight comments, and deleted Wizden files, so I
added the comments and restored the deleted files.

## Why we need to add this
Event maps need to be able to load, and deleting wizden files is bad.

## Checks
- [X] I do not require assistance to complete the PR.
- [X] Before posting/requesting review of a PR, I have verified that the
changes work.
- [X] I have added screenshots/videos of the changes, or this PR does
not change in-game mechanics.
- [X] I affirm that my changes are licensed under the [MIT
License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT)
and grant permission for use in this repository under its conditions.

Literally nothing player facing outside of events so I don't think we
need a CL here.

---------

Co-authored-by: Red Mushie <82113471+redmushie@users.noreply.github.com>

Author: wonderfulnewworld

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -146,6 +146,26 @@
         - id: MagazineGrenadeBlast #SL
         - id: MagazineGrenadeFrag  #SL
 
+#- type: entity # Starlight start, we don't use the M90 since it doesn't actually work
+#  parent: ClothingBackpackDuffelSyndicateBundle
+#  id: ClothingBackpackDuffelSyndicateFilledCarbine
+#  name: M-90gl bundle
+#  description: "A versatile battle rifle with an attached grenade launcher, bundled with 3 magazines and 6 grenades of various capabilities."
+#  components:
+#  - type: EntityTableContainerFill
+#    containers:
+#      storagebase: !type:AllSelector
+#        children:
+#        - id: WeaponRifleM90GrenadeLauncher
+#        - id: MagazineRifleFMJ
+#          amount: 2
+#        - id: GrenadeBlast
+#          amount: 2
+#        - id: GrenadeFlash
+#          amount: 2
+#        - id: GrenadeFrag
+#          amount: 2 # Starlight end
+
 - type: entity
   parent: ClothingBackpackDuffelSyndicateAmmo
   id: ClothingBackpackDuffelSyndicateAmmoFilled

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

@@ -130,6 +130,50 @@
     zeroVisible: true
   - type: Appearance
 
+#- type: entity # Starlight start, weapon replaced with the Lawbringer
+#  name: M90 GL
+#  parent: [BaseWeaponRifle, BaseSyndicateContraband]
+#  id: WeaponRifleM90GrenadeLauncher
+#  description: "An older bullpup carbine model, with an attached underbarrel grenade launcher.\nFeeds from .20 rifle magazines."
+#  components:
+#  - type: Sprite
+#    sprite: Objects/Weapons/Guns/Rifles/carbine.rsi
+#    layers:
+#    - state: base
+#      map: [ "enum.GunVisualLayers.Base" ]
+#    - state: mag-0
+#      map: [ "enum.GunVisualLayers.Mag" ]
+#  - type: Clothing
+#    sprite: Objects/Weapons/Guns/Rifles/carbine.rsi
+#  - type: ItemSlots
+#    slots:
+#      gun_magazine:
+#        name: Magazine
+#        startingItem: MagazineRifleFMJ
+#        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+#        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+#        priority: 2
+#        whitelist:
+#          tags:
+#          - MagazineRifle
+#        whitelistFailPopup: gun-magazine-whitelist-fail
+#      gun_chamber:
+#        name: Chamber
+#        priority: 1
+#        whitelist:
+#          tags:
+#          - CartridgeRifle
+#  - type: ContainerContainer
+#    containers:
+#      gun_magazine: !type:ContainerSlot ""
+#      gun_chamber: !type:ContainerSlot ""
+#      firing_pin: !type:Container # starlight
+#  - type: MagazineVisuals
+#    magState: mag
+#    steps: 1
+#    zeroVisible: true
+#  - type: Appearance # Starlight end
+
 - type: entity
   name: Lecter
   parent: [ BaseWeaponRifle, BaseSecurityContraband ]

Resources/Prototypes/Magic/event_spells.yml

@@ -52,7 +52,7 @@
         orGroup: Guns
       - id: WeaponRifleAk
         orGroup: Guns
-      - id: WeaponRifleLawbringer
+      - id: WeaponRifleLawbringer # Starlight WeaponRifleM90GrenadeLauncher -> WeaponRifleLawbringer
         orGroup: Guns
       - id: WeaponRifleLecter
         orGroup: Guns

Resources/Prototypes/_Starlight/Catalog/Fills/Backpacks/duffelbag.yml

@@ -139,3 +139,23 @@
         - id: ClothingHeadsetChameleon
         - id: ClothingShoesChameleon
         - id: ClothingMiscChameleon
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundleDeluxe
+  id: ClothingBackpackDuffelSyndicateFilledRifleGrenade
+  name: firepower support bundle
+  suffix: Estoc, China Lake
+  description: "A marksman rifle and a grenade launcher, bundled with 4 magazines and 9 grenades of various capabilities."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: WeaponLauncherChinaLake
+        - id: GrenadeFlash
+          amount: 3
+        - id: GrenadeBlast
+          amount: 3
+        - id: WeaponRifleEstoc
+        - id: MagazineRifleFMJ
+          amount: 3

Resources/Prototypes/_Starlight/Entities/Clothing/Back/duffel.yml

@@ -96,3 +96,25 @@
     grid:
     - 0,0,19,19
   - type: ReadOnlyStorage
+
+- type: entity
+  parent: [ClothingBackpackDuffel, BaseMinorContraband]
+  id: ClothingBackpackDuffelSyndicateDeluxe
+  name: deluxe syndicate duffel bag
+  description: A huge duffel bag for holding an obscene amount of Syndicate goods.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Duffels/syndicate.rsi
+  - type: ExplosionResistance
+    damageCoefficient: 0.1
+  - type: Storage
+    grid:
+    - 0,0,9,5
+
+- type: entity
+  parent: [ ClothingBackpackDuffelSyndicateDeluxe, BaseMinorContraband ]
+  id: ClothingBackpackDuffelSyndicateBundleDeluxe
+  abstract: true
+  components:
+  - type: Tag
+    tags: [] # ignore "WhitelistChameleon" tag

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

@@ -438,7 +438,7 @@
   name: M18-Militant
   parent: [BaseWeaponRifle, BaseSalvageContraband]
   id: WeaponRifleM18
-  description: Aged yet dependable, this old-world assault rifle is chambered in .20 rifle ammunition. Renowned for its reliability and ease of maintenance even in the harshest environments, it remains a staple among your station’s merce- salvage forces.
+  description: Aged yet dependable, this old-world assault rifle is chambered in .20 rifle ammunition. Renowned for its reliability and ease of maintenance even in the harshest environments, it remains a staple among your station's merce- salvage forces.
   components:
     - type: Sprite
       sprite: _Starlight/Objects/Weapons/Guns/Rifles/m16.rsi
@@ -563,7 +563,7 @@
   name: Lawbringer
   parent: [BaseWeaponRifle, BaseSecurityContraband]
   id: WeaponRifleLawbringer
-  description: "A bullpup carbine of modern design, commissioned by CentCom for their security forces.\nFeeds from .30 rifle magazines."
+  description: "A bullpup carbine of modern design, commissioned by CentComm for their security forces.\nFeeds from .30 rifle magazines."
   components:
   - type: Sprite
     sprite: _Starlight/Objects/Weapons/Guns/Rifles/lawbringer.rsi
@@ -598,7 +598,7 @@
     containers:
       gun_magazine: !type:ContainerSlot ""
       gun_chamber: !type:ContainerSlot ""
-      firing_pin: !type:Container # starlight
+      firing_pin: !type:Container
   - type: MagazineVisuals
     magState: mag
     steps: 1

Resources/Prototypes/tags.yml

@@ -876,7 +876,7 @@
   id: MagazineGrenade # ShuttleGunDuster
 
 - type: Tag
-  id: MagazineLightRifle # WeaponRifleAk, WeaponRifleLawbringer
+  id: MagazineLightRifle # WeaponRifleAk, # Starlight - WeaponRifleLawbringer
 
 - type: Tag
   id: MagazineLightRifleBox # WeaponLightMachineGunL6
@@ -900,7 +900,7 @@
   id: MagazinePistolSubMachineGunTopMounted # WeaponSubMachineGunWt550
 
 - type: Tag
-  id: MagazineRifle # WeaponRifleLecter, WeaponRifleEstoc
+  id: MagazineRifle # WeaponRifleLecter, WeaponRifleEstoc, # Starlight - Removed WeaponRifleM90GrenadeLauncher
 
 - type: Tag
   id: MagazineShotgun # WeaponShotgunBulldog