Mags and guns (#14032)

Resources/Maps/Salvage/ruin-cargo-salvage.yml

@@ -3878,7 +3878,7 @@ entities:
     parent: 16
     type: Transform
 - uid: 341
-  type: WeaponPistolHandmade
+  type: WeaponShotgunHandmade
   components:
   - pos: -1.4139366,-7.5071855
     parent: 16

Resources/Maps/fland.yml

@@ -96863,7 +96863,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 5418
-  type: WeaponPistolHandmade
+  type: WeaponShotgunHandmade
   components:
   - rot: -1.5707963267948966 rad
     pos: -39.140755,78.51152

Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml

@@ -89,40 +89,6 @@
       - id: MagazineLightRifleRubber
         amount: 6
 
-# Magnum
-- type: entity
-  name: box of Lamia magazines
-  parent: BoxCardboard
-  id: BoxMagazineMagnum
-  description: A box full of Lamia magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazineMagnum
-        amount: 6
-
-- type: entity
-  name: box of Lamia (high-velocity) magazines
-  parent: BoxCardboard
-  id: BoxMagazineMagnumHighVelocity
-  description: A box full of Lamia (high-velocity) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazineMagnumHighVelocity
-        amount: 6
-
-- type: entity
-  name: box of Lamia (practice) magazines
-  parent: BoxCardboard
-  id: BoxMagazineMagnumPractice
-  description: A box full of Lamia (practice) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazineMagnumPractice
-        amount: 6
-
 - type: entity
   name: box of Vector magazines
   parent: BoxCardboard
@@ -179,17 +145,6 @@
       - id: MagazinePistolSubMachineGunTopMounted
         amount: 3
 
-- type: entity
-  name: box of Calico .35 auto magazines
-  parent: BoxCardboard
-  id: BoxMagazinePistolCalicoTopMounted
-  description: A box full of Calico .35 auto magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazinePistolCalicoTopMounted
-        amount: 3
-
 - type: entity
   name: box of pistol .35 auto magazines
   parent: BoxCardboard
@@ -278,6 +233,7 @@
       - id: MagazinePistolHighCapacityRubber
         amount: 6
 
+
 - type: entity
   name: box of SMG .35 auto magazines
   parent: BoxCardboard

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

Resources/Prototypes/LootTables/suspicion_loot_table.yml

@@ -14,9 +14,6 @@
   - id: WeaponPistolViper
     amount: 0
     maxAmount: 5
-  - id: WeaponPistolHandmade
-    amount: 0
-    maxAmount: 5
   - id: WeaponPistolCobra
     amount: 0
     maxAmount: 5
@@ -61,6 +58,9 @@
   - id: WeaponShotgunSawn
     amount: 0
     maxAmount: 5
+  - id: WeaponShotgunHandmade
+    amount: 0
+    maxAmount: 5
 
   - id: WeaponSubMachineGunAtreides
     amount: 0
@@ -137,16 +137,12 @@
     maxAmount: 15
   - id: MagazineLightRifle
     maxAmount: 15
-  - id: MagazinePistolCalicoTopMounted
-    maxAmount: 15
   - id: MagazineShotgun
     maxAmount: 15
   - id: MagazinePistol
     maxAmount: 15
   - id: MagazinePistolHighCapacity
     maxAmount: 15
-  - id: MagazineMagnum
-    maxAmount: 15
   - id: MagazineMagnumSubMachineGun
     maxAmount: 15
   - id: CartridgeRocket

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

@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334",
     "states": [
         {
             "name": "base"

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

@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+    "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi",
     "states": [
         {
             "name": "base"
@@ -26,4 +26,4 @@
             "name": "mag-1"
         }
     ]
-}
+}

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

@@ -1,38 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
-    "states": [
-        {
-            "name": "base"
-        },
-        {
-            "name": "high_velocity"
-        },
-        {
-            "name": "practice"
-        },
-        {
-            "name": "red"
-        },
-        {
-            "name": "rubber"
-        },
-        {
-            "name": "mag-1"
-        },
-        {
-            "name": "mag-2"
-        },
-        {
-            "name": "mag-3"
-        },
-        {
-            "name": "mag-4"
-        }
-    ]
-}

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

@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi",
+    "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi",
     "states": [
         {
             "name": "base"
@@ -26,4 +26,4 @@
             "name": "mag-1"
         }
     ]
-}
+}

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

@@ -1,14 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
-    "states": [
-        {
-            "name": "icon"
-        }
-    ]
-}

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

@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi",
     "states": [
         {
             "name": "base"
@@ -36,9 +36,7 @@
         },
         {
             "name": "mag-5"
-        },
-        {
-            "name": "mag-6"
+
         }
     ]
-}
+}

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

@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi",
     "states": [
         {
             "name": "base"
@@ -36,6 +36,10 @@
         },
         {
             "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+
         }
     ]
 }

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

@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi",
     "states": [
         {
             "name": "base"
@@ -24,6 +24,18 @@
         },
         {
             "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
         }
     ]
-}
+}

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

@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+    "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f, https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi",
     "states": [
         {
             "name": "base"
@@ -26,4 +26,4 @@
             "name": "mag-1"
         }
     ]
-}
+}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json

@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi",
     "states": [
         {
             "name": "base"
@@ -23,4 +23,4 @@
             "name": "mag-1"
         }
     ]
-}
+}