Mags and guns (#14032)

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

@@ -1,37 +1,3 @@
-- type: entity
-  id: BaseMagazineMagnum
-  name: "Lamia magazine (.45 magnum)"
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: Tag
-    tags:
-      - MagazineMagnum
-  - type: BallisticAmmoProvider
-    mayTransfer: true
-    whitelist:
-      tags:
-        - CartridgeMagnum
-    capacity: 10
-  - type: Item
-    size: 5
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-  - type: Sprite
-    netsync: false
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 5
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   id: BaseMagazineMagnumSubMachineGun
   name: "Vector magazine (.45 magnum)"
@@ -66,62 +32,6 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
-  id: MagazineMagnum
-  name: "Lamia magazine (.45 magnum)"
-  parent: BaseMagazineMagnum
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnum
-  - type: Sprite
-    layers:
-    - state: red
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
-- type: entity
-  id: MagazineMagnumHighVelocity
-  name: "Lamia magazine (.45 magnum high-velocity)"
-  parent: BaseMagazineMagnum
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumHighVelocity
-  - type: Sprite
-    layers:
-    - state: high_velocity
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
-- type: entity
-  id: MagazineMagnumPractice
-  name: "Lamia magazine (.45 magnum practice)"
-  parent: BaseMagazineMagnum
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumPractice
-  - type: Sprite
-    layers:
-    - state: practice
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
-- type: entity
-  id: MagazineMagnumRubber
-  name: "Lamia 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: MagazineMagnumSubMachineGun
   name: "Vector magazine (.45 magnum)"

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

@@ -62,7 +62,7 @@
       map: ["enum.GunVisualLayers.Mag"]
   - type: MagazineVisuals
     magState: mag
-    steps: 7
+    steps: 6
     zeroVisible: false
   - type: Appearance
 
@@ -132,27 +132,6 @@
     containers:
       ballistic-ammo: !type:Container
 
-- type: entity
-  id: MagazinePistolCalicoTopMounted
-  name: Calico magazine (.35 auto top-mounted)
-  parent: BaseMagazinePistolSubMachineGun
-  components:
-  - type: Tag
-    tags:
-      - MagazineCalico
-  - type: BallisticAmmoProvider
-    capacity: 100
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi
-    layers:
-    - state: icon
-      map: ["enum.GunVisualLayers.Base"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 1
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   id: MagazinePistol
   name: pistol magazine (.35 auto)

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

@@ -90,24 +90,6 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
 
-- type: entity
-  name: handmade pistol
-  parent: BaseWeaponPistol
-  id: WeaponPistolHandmade
-  description: Looks unreliable. Uses .35 auto ammo.
-  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi
-    layers:
-      - state: base
-        map: ["enum.GunVisualLayers.Base"]
-  - type: Clothing
-    sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi
-  - type: Gun
-    selectedMode: SemiAuto
-    availableModes:
-      - SemiAuto
-
 - type: entity
   name: cobra
   parent: BaseWeaponPistol

Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

@@ -96,7 +96,7 @@
       path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
 
 - type: entity
-  name: Predator
+  name: Python
   parent: BaseWeaponRevolver
   id: WeaponRevolverPython
   description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo.
@@ -110,7 +110,7 @@
   name: pirate revolver
   parent: BaseWeaponRevolver
   id: WeaponRevolverPirate
-  description: An odd, muzzle-loading revolver, favoured by pirate crews. Uses .45 magnum ammo.
+  description: An odd, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi

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

@@ -163,3 +163,24 @@
     graph: ShotgunSawn
     node: shotgunsawn
     deconstructionTarget: null
+
+- type: entity
+  name: handmade pistol
+  parent: BaseWeaponShotgun
+  id: WeaponShotgunHandmade
+  description: Looks unreliable. Uses .50 shotgun shells.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Shotguns/hm_pistol.rsi
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Shotguns/hm_pistol.rsi
+  - type: Item
+    size: 10
+  - type: Gun
+    fireRate: 4
+  - type: BallisticAmmoProvider
+    capacity: 1
+  - type: Construction
+    graph: ShotgunSawn
+    node: shotgunsawn
+    deconstructionTarget: null