]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Mags and guns (#14032)
authorTaralGit <76408146+TaralGit@users.noreply.github.com>
Mon, 13 Mar 2023 00:52:57 +0000 (02:52 +0200)
committerGitHub <noreply@github.com>
Mon, 13 Mar 2023 00:52:57 +0000 (20:52 -0400)
155 files changed:
Resources/Maps/Salvage/ruin-cargo-salvage.yml
Resources/Maps/fland.yml
Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
Resources/Prototypes/LootTables/suspicion_loot_table.yml
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-5.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/high_velocity.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/base.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/high_velocity.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-1.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-2.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-3.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-4.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/meta.json [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/practice.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/red.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/rubber.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/high_velocity.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/icon.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/meta.json [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/high_velocity.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-4.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-5.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-6.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/high_velocity.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-4.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-5.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/high_velocity.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/high_velocity.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/beanbag.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/mag-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/pellets.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/slug.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-4.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-5.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-6.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-4.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-5.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-6.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-4.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-5.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-6.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-3.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png
Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/base.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/mag-0.png [deleted file]
Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png
Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png
Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png
Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/equipped-BELT.png [moved from Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/equipped-BELT.png with 100% similarity]
Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/inhand-left.png [moved from Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-left.png with 100% similarity]
Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/inhand-right.png [moved from Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-right.png with 100% similarity]
Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/meta.json [moved from Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/meta.json with 70% similarity]
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json

index cacfd3142c5c04ac7c218ccf1e274d1a33bfcf36..60e1b576f79b97784990aabce198fa5eb8d4721c 100644 (file)
@@ -3878,7 +3878,7 @@ entities:
     parent: 16\r
     type: Transform\r
 - uid: 341\r
-  type: WeaponPistolHandmade\r
+  type: WeaponShotgunHandmade\r
   components:\r
   - pos: -1.4139366,-7.5071855\r
     parent: 16\r
index 76946fa7423dea6ec7865b4b2ae72d4e7da00911..864da020bd41de62ca8d88f3e5e703cece9c2a5c 100644 (file)
@@ -96863,7 +96863,7 @@ entities:
     parent: 0\r
     type: Transform\r
 - uid: 5418\r
-  type: WeaponPistolHandmade\r
+  type: WeaponShotgunHandmade\r
   components:\r
   - rot: -1.5707963267948966 rad\r
     pos: -39.140755,78.51152\r
index 66c82ab979e7bd2ba054a0313e1cff9096c4b691..6b30184d17913d44739ed0246af164deaf893f86 100644 (file)
       - 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
       - 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
       - id: MagazinePistolHighCapacityRubber
         amount: 6
 
+
 - type: entity
   name: box of SMG .35 auto magazines
   parent: BoxCardboard
index e01de5879a4c84525f509450fa35b82678c4d732..8266613ab3fe131656c876961a4ae4adec43af5c 100644 (file)
@@ -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)"
     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)"
index f43c13f21b7f90c6aaaaf1fc719b82fc97983379..a453b3f52cc4929e233e93d318d34f8b808a6572 100644 (file)
@@ -62,7 +62,7 @@
       map: ["enum.GunVisualLayers.Mag"]
   - type: MagazineVisuals
     magState: mag
-    steps: 7
+    steps: 6
     zeroVisible: false
   - type: Appearance
 
     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)
index 7b7cab0bac6d93cdaf6ca54e9b6c474f3a13a793..fdb363ebb9d1d675bb5266300fbcdecce7e4c922 100644 (file)
       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
index c578a20b1f6f79f4eb3b2215af63e0f216f299bb..356935d77b8d3bbe56f64cccb983c1b925f693e2 100644 (file)
@@ -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.
   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
index 5eb703807931f4ac45457b52eba100490d7177c1..76ab88149865f4e8bd93d30f89b6266b9b4dcef6 100644 (file)
     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
index 05487827a554c63f3ade99e2c09ea1e06401716e..1c034231bebeed5c0616de8ccb966fed24948e00 100644 (file)
@@ -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
     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
index f12128a305e2765d3ffaaae44f12a97679409052..bc8f94d8c0cf915b0ba4c603268fefdf7639019a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png differ
index 12db113a6e8e5ba7fcc7acda27552876b690ff7f..5ac05763759a0a64e59b74fd989779be99cca5f5 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png differ
index 4f930fb7cadaed4fa15bd5e05b378b17b658206f..1dcade4719658c65eb2856a41eb478e176159c4e 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png differ
index 36da9b29a57cf4f674a48f5826595d17734b4f45..71fb4211b2f70ef41c332515b3eca2c2c3592367 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png differ
index 69f0ef4b5d023818b90dbb618b2e3da6212ba4b4..5e45bdbffd7f4fe4dcfe5e1781b669722ab257a1 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png differ
index 16c225e94625c9b9710c4a889bbb4af507d4bb47..bcfbb26815e3a3ad0f2439d9284ab1e6b0702096 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png differ
index cf1c48a34eac5082ebe238011e74288a6ff1ec50..e6c98a07648f5faaada28b689a2b560d14c0993f 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-5.png differ
index 21bf2b70fca2ab34db9ea9fbb4601c391480a0c4..7a9840a0b1aa4c9681ce8bf9c183ccf318f77087 100644 (file)
@@ -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"
index aa73e7a4da716d064a5ff64fba6da9844adf4ab8..e0a3cb4d131811f0fc9d5ff6c0edf8a000bef114 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png differ
index 6c8301e59ea73da5c4dde624e40462bdfd275a2c..203c265c37547d6ddc01cc5ef5ed71fe81e70ce3 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png differ
index 46513d82ea4b708cc9c3e544f191eff747cc6087..3bfa3b48b8cb3f4a32fe4794c108be3513289f55 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png differ
index 9a5730ff0a7bc8edb95b8edfc5db881b01c17be8..ef8982b1b77d53e02e48cfe183e0d42d8903355d 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png differ
index 3de8407c8cc7c94dbcb75a2bc5d2509ea72a5b1a..64943622184198fdbabb8d7874e1259ceecb9f3a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/base.png differ
index 6caeb4ef98573994151e037f016735f384bad941..1aa7b1a3a05ca3e6c9b854c92c12958755e22676 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/high_velocity.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/high_velocity.png differ
index 639ec8244c48cf31d8e23562821c6ef52ff71b53..e04d1254abc29615bd63d45d427c82baf6bdb946 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png differ
index 8675d7f4ab36d5efbf7000b59f1d72a9d716c601..40e76cad7c070f633d7339e2939d81a4aa88a015 100644 (file)
@@ -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"
         }
     ]
-}
\ No newline at end of file
+}
index a0fe559911ee0f8e9b46f01e644866dddd6b2176..0cb88b1399c348cee0e462dadb303287757aac8c 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png differ
index d138b4005d81a4d0a9877f212c0cf1c51f9ed137..3990c78a2eddde0007d8ea4366dc424ac9d89bb0 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png differ
index 6d492c7f64aa832036b90e070cbff24bf62edf0c..f0e9a5c51636b152f0204a839f9c9a14bc09a31a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/base.png
deleted file mode 100644 (file)
index 040bff4..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/high_velocity.png
deleted file mode 100644 (file)
index 89af6cd..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/high_velocity.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-1.png
deleted file mode 100644 (file)
index 4bfdd09..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-2.png
deleted file mode 100644 (file)
index 6a97e07..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-3.png
deleted file mode 100644 (file)
index 94d1a27..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-4.png
deleted file mode 100644 (file)
index 68d8fc4..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/meta.json
deleted file mode 100644 (file)
index a3bcacb..0000000
+++ /dev/null
@@ -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"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/practice.png
deleted file mode 100644 (file)
index ced08df..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/practice.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/red.png
deleted file mode 100644 (file)
index d3be1ff..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/red.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/rubber.png
deleted file mode 100644 (file)
index 5f9f10b..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/rubber.png and /dev/null differ
index 5bf9ecc11e4519eace281643f5999a56852fb607..753a06f13b2e56d4270e5efa5ab6788f3d344a4e 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/base.png differ
index c6b2761cffd8e10b964995098f60f56b7b3c0fa1..656c4fa115ef60d819c7b908b0f06f7adc637fbb 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/high_velocity.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/high_velocity.png differ
index 54966daa2371c7ec073554e0736efb99e370ff29..04bffabaab1d466f039a4258be27394d671d259f 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/mag-1.png differ
index 977631eeed6280a8ea4eb214056fd098b6f6501f..ef6749e0198fc2b4cd8cc15651f05d4c3ed4f812 100644 (file)
@@ -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"
         }
     ]
-}
\ No newline at end of file
+}
index 542529b728510d381214f931d2d2280632677f91..f3f3bc05ec8d2f06691ae437f9f679b3aa90f2f6 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/practice.png differ
index 2cda90438898d6fc7977489d540607baf8ebbfb3..64bca76850f7a1e3ef691d53dfd0495db28f2cb2 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png differ
index ee9fff67b958ea759480ba43e8f411e19b042f7a..9cde22c568cccc27d156e8685fb1abfc6f0330cd 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/icon.png
deleted file mode 100644 (file)
index c52c684..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/meta.json
deleted file mode 100644 (file)
index 515de88..0000000
+++ /dev/null
@@ -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"
-        }
-    ]
-}
\ No newline at end of file
index 0064338a50c720756c3a7c18dc32ace2c1268d8b..f67facc89b3716e980dd36a7cbaf57ad5babe5b7 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base.png differ
index 8280184573639d0ffa2338ef973f85b8414284a4..a185c2c4412a550c2c2ffc44428d18159ee7ce63 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/high_velocity.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/high_velocity.png differ
index 8832cd933bb3b9567b79e7ad47083ab7325536fb..1171c429cdb55bc81b0d3dc7354e4609cb162959 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-1.png differ
index c5b8b2b2b4bc9906d02d83196b552bb194ac1c53..6a537665b2bcfdcb2886650f7644f57108ac2472 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-2.png differ
index a563ffebf8b8132b3e85a07a11ae30ffe5bc679a..92b1fabbca33dca98f52fc900b095e9fc6941cc0 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-3.png differ
index 8a3db8895b71a0dda265632f3bbf952778509889..c78ed3dfddb348a83e7a834df4b904ef69cb1d5a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-4.png differ
index 2f60a0408e82a0c6dcbcdabe2e810f39096fcbe0..58a39a29818548f978389b7ef58ab6cf54883059 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-5.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-6.png
deleted file mode 100644 (file)
index b0ec894..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-6.png and /dev/null differ
index 7e0993e05d3e8f74d985f8c7a3c355cd93c5e71b..2d9f9471b67f4113637898d1478a5252da35d096 100644 (file)
@@ -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"
+
         }
     ]
-}
\ No newline at end of file
+}
index e5d2fdf4a869dfbe30969ef4e55c05030e333a76..49a1ba89d5473ff81b16a8c3143f23c3006ff971 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png differ
index fbe93746f123d92702a71b1f23239206b9a2a06b..6058c25acf0f06f8fac30e7507508815b6ba0aa1 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red.png differ
index 58c5644ed4e1a67b3c3459d397265de3b0df1118..ad77f0f12665dfd9ba76d36b4167477380dc5014 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png differ
index ee08a1c9ad63187407aa00f481c2fc8e6ad88096..d9dd41e903fb69550956767db2d9e0922a97f0cd 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png differ
index 5e6367194ce7e5c339e27c1379e6c16ae82d8ca0..780d9cc4eb585444278acc99640eb51d67b6995b 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/high_velocity.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/high_velocity.png differ
index ef549ebdfc5aa77cdbfe3a615a72486554625d41..751c90c6d492628ffffb30fe059827479b347ca3 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png differ
index 046845943972d4584ed1ecddedf41835239f26f5..83cde54ae750ffa0040bc730040f522c5d8cfd14 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-2.png differ
index 06f19ec207247013648af5534e55286eb6d5547d..fc56edb53318015a1669317ae7ecd20e5199c3d4 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-3.png differ
index 5b9929303c7bcef5666c7f87b6791dfc56f07649..a95df7a2bcd203a5b82da382a23f92975f230162 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-5.png
new file mode 100644 (file)
index 0000000..9d5914a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-5.png differ
index cbc5f21033cefb668ab04b193775531853b7de37..945138a8ad9fadae7fa76a5a712d549d785155fc 100644 (file)
@@ -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"
         },
         {
             "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+
         }
     ]
 }
index 02483aef06811ec7f3517e1bd6da53e4762687a2..4e6907fa1928e9dfe3f95342945154ec340a7739 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png differ
index bb8dfc508ca3f92435b399b50d8aa79ea5957172..fb3bd2209c618f70e88a75d5a6f1689839e49815 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png differ
index b546c0880a25ad4b0fa76a2d469d5068953c85d8..f5a47ffd1636db3de572bb47e06e2b11e48f15a2 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png differ
index 21a98703c3ab7afb2eb4343f311450fa6818e8ce..8be70a07eadecbebc20fda9ec3c27620f8b574f7 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png differ
index 90e20a9a55a857ce693d04d6386483adba2ce307..c24879900ca08ad67de08f3ab4cdd03505b7453e 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png differ
index 9ba2d07943e31ae9a056732e83b90f0301758605..2648265735c94b16b0e65f8c019a1440f760363f 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/high_velocity.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/high_velocity.png differ
index c7810c79a695be7856bd869a49543733bc5079a0..b024dec5e07d8e576c9ceae03468c62bc69ee738 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png
new file mode 100644 (file)
index 0000000..d610850
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png
new file mode 100644 (file)
index 0000000..d3b34d4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png
new file mode 100644 (file)
index 0000000..fa241d1
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png
new file mode 100644 (file)
index 0000000..29d519e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png differ
index 8675d7f4ab36d5efbf7000b59f1d72a9d716c601..0d4f33e77026ee0faf75b94537188c8e0ab5cd91 100644 (file)
@@ -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"
         },
         {
             "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
         }
     ]
-}
\ No newline at end of file
+}
index b62c38e252a435a8773eb2055ab4dd2d4c83328f..e48f12c57acdea96ff7ff0d04802f273149e8d46 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png differ
index 386e4284837e278bbbdfbdaada3ee52cc6152467..598770e39b83c3f097aa51c64fd61f8c99121fe5 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png differ
index b4d551edc6985436929ef410a00480480f585667..fedefaba13e52523e5a26da5e3b65eebb5bf75f7 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png differ
index ff1e671fed47bb5bb48deb7ab6f2ff03852f0431..ae29507b2ef2f1f78a4319c2f758b0eb56b20125 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png differ
index 85550ec8df822dc9c6b811675f1ec5da650a3868..e79fd8b9989ba3e5fd3d6cdbcc64f82a9b686ae0 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/high_velocity.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/high_velocity.png differ
index bbd335adc75d789cc1e5e52f9bb15b297ff1ac70..e04d1254abc29615bd63d45d427c82baf6bdb946 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png differ
index 8675d7f4ab36d5efbf7000b59f1d72a9d716c601..ce37ea6c1f2238b25ba5724e50964b8f7105c056 100644 (file)
@@ -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"
         }
     ]
-}
\ No newline at end of file
+}
index ecaaabacb70f56cff8ccfad3e81e1956941bf7b2..6ff6195ef97e940196cd7f898666239988e53735 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png differ
index 40cb526164323b1141b5361a89afe8a0920a1351..b35d28afc92f97018e4b7c303b08ebe5ccbbf427 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png differ
index af1c4acc0fc48d4d3f0b021c2a9661966ed9f109..50e11d47003d393d83e4b9d51d05459e923c13f8 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png differ
index 206b3f4209eaa103732d8452246cd1809ce4f671..e2a9b2bf569965d051db7ed88f12c067c3156e02 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/base.png differ
index 630941378e40e2ec9240749606122a1aafc37327..df890d94b6268360b34859d155680a22c7e95aa5 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/beanbag.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/beanbag.png differ
index 9db3b89cfceda840cc8e987a9d7b4c99334e2bf4..06b50bc42d18ca3a8f53fa0fb798ef9d4b877dfe 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/mag-1.png differ
index 9b309e819387509ab5e99eb73be7879cf372d616..ca09e4892ea2719afc2a9e0424adbd4a3646eb34 100644 (file)
@@ -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"
         }
     ]
-}
\ No newline at end of file
+}
index d4089970a7c96ac1cfe50ec69f02c817915f1c4c..6832620ac629a7577722910e3fb97fb59f579b2a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/pellets.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/pellets.png differ
index 84e1f0f48186ccc877d83c9bbd10fc4f0635c059..19c80df80cc977162a24bc0476c90a1212e66966 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/slug.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/slug.png differ
index 851068d020b43f8eb458ccfe1513fb71389eef1d..d59f4f4ea1ab23e0cbe089cfa95b2e94ee95289a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-1.png differ
index 8b74c304dee9992bc407ba9978aa3679721acd84..959132ae31cd254d49bc88ca618203432598fce4 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-2.png differ
index 03674aac819f33ae1a6582bb867889014ce77a44..46bc9b5f47d39e5d2e526f550e1ecabc3b16268a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-3.png differ
index 870c1eddf958c483b03362cdfc8c8bf290953c4a..25a8654aa6ca38d03e54e75e27607ac4e82be8e6 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-4.png differ
index 3f7bc4d1ea9845bba6acee848e91633c9f593a13..26d7ce55b2f8c9e0bbec1de03f74f564862da47d 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-5.png differ
index 5fce659e4a6cffa028aa9be4a8ce1ecac088765f..f11868f8c7c0eb6d708302fb7acef4a906403b68 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-6.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-6.png differ
index 4ba33eff44f80b9903a3dbae6e2c1d867945abb1..3ae7bd7d4af4cfe18cb180459190b5c987da920a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base.png differ
index ea749f13ad4d7e9cad5c208b3c98a0d3ea04fd54..e18b146d3bf6b5dcb9148771e176db38bed05730 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-1.png differ
index 882d2580d76d0ff7f85699b65d6486f1d0115af8..3381efe180c9ebae6d910271ce7a2d9ae4cda1ed 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-2.png differ
index 25f05232a50c218f3f87827408ed3c0a28f81779..b290fa2fe23e106aef810053e61f7f200727fbe2 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-3.png differ
index a94daa9433fa4d47e3ec621a7d92e775504501fc..f9b8504dc87779eefb871dc5621551adae723484 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-4.png differ
index 2f1b23f6b245b7e4bc4c74ddee843f88355a67e9..61e1f36628532ebf2ac568a1eba832582291e580 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-5.png differ
index 44f814982e52bd27a0e8b78ee5d66ebe6867d473..1a08c6a0803c88472d1fa7b2ebba48e2fe4fd9bb 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-6.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-6.png differ
index dfaca5848f093918ec6a966b0d389b578a78815f..614847a56d258e4a104c7c8d343e6ad9eb2457bd 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon.png differ
index e0f3c43a55cdf53601524f616061c77ebe9d7bfc..512c3ccb2acf3e93af5559f17c823e83dffd9ef6 100644 (file)
@@ -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_speed.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"
index 1357c294a8d481b2bd4aeaafcf777b6bcea64822..4d9af4c0cccad719a00b9489d1f0147a3cbecda3 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-1.png differ
index 773a65401a4f12e54980a3ce7daa82d1476a2115..133a5e7c1e3e24e413dac27ea929385b33c5873c 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-2.png differ
index 126ad2f4cc0eb92bb8c9237b5e2556e4a2e9747a..d662157533b72cd2526d07ef2e03a507059eb5de 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-3.png differ
index 55ea711a48855a76734b2fecad51b6170965e674..ec17f30f8de9e69a3d90021f1b8f3d0368d9a714 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-4.png differ
index 4f47f4010ff77ec981efb22783816a1294933ccb..c768027a34a90d4d3b758070d846b92bf944b21c 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-5.png differ
index 450d88adf8c4c13b3d584fff165de10c28b6dfd9..2b7253e27a449711885b9a78c0aeabe25afef8cd 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-6.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-6.png differ
index c8724e3cd09c885eb8f95a153ddac2c91c82652a..d4ee09b545203976b59dcd6dfb23d125582076aa 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png differ
index 4a14a0d94fa4b28a83d78caf6c238734c82e7693..1f3b9965b1fbb9874a90ec18cc4d49ad4d1819e3 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png differ
index d545f9b5f01ee8d12ca08f71c56e3a2085a699ae..9724498cc86d79a263d05b41ea995f9a99449131 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-3.png differ
index bf0b85ec082b084bc447f0fde50c098bf9159275..bef55e248b5161d79c5c10364aba25ba4ebbec6f 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png differ
index 77e0f83e53d1db46dfc6f078d6c3abeefe37ce6f..052192ed04b678bf6d5f2d4c6a5f24e2aa2f7543 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png differ
index f3e474c87d6bd5488370b96bff294312b5f846fd..e33105c761022fc06308ad77601946439ce895a8 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png differ
index 8f6aa0ff73e1b9ae6a51b7cdd54d283841191f73..e79b88accb1039899cac3a2f2c2d50bf14154e9f 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png differ
index dcdbc31205512efd0a3fd3f44d9033c60bb14fd6..dab75b56c6fba72d48062919ee6fc93fbf43d2fb 100644 (file)
@@ -1,26 +1,26 @@
 {
     "version": 1,
     "license": "CC-BY-SA-4.0",
-    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-       {
-               "name": "icon"
-       },
-       {
-               "name": "inhand-left",
-               "directions": 4
-       },
-       {
-               "name": "inhand-right",
-               "directions": 4
-       },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    }
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/base.png
deleted file mode 100644 (file)
index d4aff83..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/mag-0.png
deleted file mode 100644 (file)
index 98d93aa..0000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/mag-0.png and /dev/null differ
index 2c1d776fb479cfc8d188f73c08611805e4593903..e088f64bfd7796d560ad853caafa46820ac38a99 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png differ
index d5af57bddd8012ded49bb77e3bd574f4764c35b8..ca0c73780a2a33849021d2fe0cc611756b3e3a2c 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png differ
index 62660a5aa4ba9e3d76a7d2e4527eb70a532d664a..f33c3d8a89d0b54fd090f7214abf2145de77461f 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png differ
index f7a3fc4b7e7319fa190432fbf8d31e1f6fd36330..1afe5f6ad6e5fb3a057db8fab9ed0e00d7a8f31d 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/120961e254d7f83a6e00a02c76e734f9e5019345",
+    "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/120961e254d7f83a6e00a02c76e734f9e5019345, https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi",
     "size": {
         "x": 32,
         "y": 32
@@ -24,9 +24,9 @@
             "name": "inhand-right",
             "directions": 4
         },
-               {
-                       "name": "equipped-BELT",
-                       "directions": 4
-               }
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
     ]
 }
index 4d4ba7feefb65ea1d1181744dfe59374472dcb47..c24cda9b0d7ac7bfd75d031d1b0cccd7bccf9dd4 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png differ
index 6543810a8b72b4f582952725e3ae649a6f738c8b..a22d42c872217574e5de82aad5d388c7e7ca3ebe 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce",
+    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi",
     "size": {
         "x": 32,
         "y": 32
@@ -18,9 +18,9 @@
             "name": "inhand-right",
             "directions": 4
         },
-               {
-                       "name": "equipped-BELT",
-                       "directions": 4
-               }
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
     ]
 }
index de5952aa0a6bd07b6b6f80f065c961db41a9e1f1..51f5d2c3564b52562c624c28827726016ce47daf 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png differ
index 6543810a8b72b4f582952725e3ae649a6f738c8b..a22d42c872217574e5de82aad5d388c7e7ca3ebe 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce",
+    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi",
     "size": {
         "x": 32,
         "y": 32
@@ -18,9 +18,9 @@
             "name": "inhand-right",
             "directions": 4
         },
-               {
-                       "name": "equipped-BELT",
-                       "directions": 4
-               }
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
     ]
 }
index 1f71d9536fa86832dd3cf189386400e66c8cab31..96cb892f733d5fc72be9dbbc27dc097f15fe8881 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/icon.png differ
index c942e1dadf9460f2761a3ea1cccd03eb612923e5..8c8ede0f817f041bcda4a963b64ce599c3584b51 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png differ
index 359aa03a8e1cd244f22c2f504676998b16e55af7..30136fa39be52254de88794b45433794bbc8328c 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce",
+    "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi",
     "size": {
         "x": 32,
         "y": 32
@@ -18,9 +18,9 @@
             "name": "inhand-right",
             "directions": 4
         },
-               {
-                       "name": "equipped-BELT",
-                       "directions": 4
-               }
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
     ]
 }
index 32d9c372998d09b2b218b3be68bc246333b9c51b..4123df3b2e5d4514f854759d03186cb0309a9818 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png differ
index d046237d1bd9797313d68fd99ad81c155f412525..ebdf9d305e8798b1ae3d589390fdf6bd29f95eb7 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png differ
index a93415664e28eae33b99c1c1a259d85bbc67f51c..c48b441a61edb20c8bab9788ad7a05d0d55e6a19 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png differ
index abe046d46ba78c39dced746874107867b93c8330..6749a5ecca39f52cff08f80f5756529432dfc870 100644 (file)
@@ -1,32 +1,32 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
+}
index b5ed0520c0eb8d725a6c7d02072c2d715fd43a8c..c91e0b1d1fada8ddfad41d143cfa3af95cfae4c7 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png differ
index 6031840c6cd4df042850b99596fcf65484f1653d..dd4c24d90cab3eaa355e9f74599a87b342819a90 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png differ
index a692bda3d45608c07d47393b715e2b9d94df5798..1658afae5d955f553f725f876cb1c25db20a9e1c 100644 (file)
@@ -1,32 +1,32 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, backpack sprite by Peptide (copy of carbine)",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine)",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-       {
-               "name": "icon"
-       },
-       {
-               "name": "base"
-       },
-       {
-               "name": "mag-0"
-       },
-       {
-               "name": "inhand-left",
-               "directions": 4
-       },
-       {
-               "name": "inhand-right",
-               "directions": 4
-       },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    }
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
     ]
-}
\ No newline at end of file
+}
index b33ce2b9ce47d4c14257e17982511a87b699e86d..24d26792706bff608c1fda238ccb9accc2a264d1 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png differ
index d8c7b224b9deb88c75636fe3da81989f9a702855..12510c28c32db1dfd183148549bff0de0e8cb0bb 100644 (file)
@@ -1,26 +1,26 @@
 {
     "version": 1,
     "license": "CC-BY-NC-4.0",
-    "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, backpack sprite by Peptide",
+    "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi, backpack sprite by Peptide",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-       {
-               "name": "icon"
-       },
-       {
-               "name": "inhand-left",
-               "directions": 4
-       },
-       {
-               "name": "inhand-right",
-               "directions": 4
-       },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    }
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/icon.png
new file mode 100644 (file)
index 0000000..12d6391
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/icon.png differ
similarity index 70%
rename from Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/meta.json
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/meta.json
index 77898b3162bad66abd8ba82e7e4cd3fdc5ad030b..377c91d33bceffd098639c05910e5392f67c5aa5 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/2c35951649b1ec59874e9f61822376853ec4c90d",
+    "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/2c35951649b1ec59874e9f61822376853ec4c90d, https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi",
     "size": {
         "x": 32,
         "y": 32
@@ -9,10 +9,7 @@
     "states": [
 
         {
-            "name": "base"
-        },
-        {
-            "name": "mag-0"
+            "name": "icon"
         },
         {
             "name": "inhand-left",
@@ -22,9 +19,9 @@
             "name": "inhand-right",
             "directions": 4
         },
-               {
-                       "name": "equipped-BELT",
-                       "directions": 4
-               }
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
     ]
 }
index f976a57a71b41f7025713ac3e4a9b2eb7615504c..d2f0b8f80d09fd74dee6bb812620cc1a7b5a9422 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png differ
index c885742cc1ce30779ad9cd11ef403e44706c407b..b1161a5c3b71a3acbe27763e9dfd9e3cd97d2996 100644 (file)
@@ -1,26 +1,26 @@
 {
     "version": 1,
     "license": "CC-BY-NC-4.0",
-    "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8backpack, backpack sprite by Peptide (copy of db)",
+    "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8backpack, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi, backpack sprite by Peptide (copy of db)",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-       {
-               "name": "icon"
-       },
-       {
-               "name": "inhand-left",
-               "directions": 4
-       },
-       {
-               "name": "inhand-right",
-               "directions": 4
-       },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    }
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
     ]
-}
\ No newline at end of file
+}
index 7528ff10811d773d7f714be8a01c32d9645c371b..af968888cc3f9c0f77d90e0b72d4500af8608701 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png differ
index d8c7b224b9deb88c75636fe3da81989f9a702855..24150d7b1c2955a51d3e569e76237d3d18fa128c 100644 (file)
@@ -1,26 +1,26 @@
 {
     "version": 1,
     "license": "CC-BY-NC-4.0",
-    "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, backpack sprite by Peptide",
+    "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi backpack sprite by Peptide",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-       {
-               "name": "icon"
-       },
-       {
-               "name": "inhand-left",
-               "directions": 4
-       },
-       {
-               "name": "inhand-right",
-               "directions": 4
-       },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    }
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
     ]
-}
\ No newline at end of file
+}