diff --git a/Resources/Maps/Salvage/asteroid-base.yml b/Resources/Maps/Salvage/asteroid-base.yml
index 1d6777944e..1a83ebd312 100644
--- a/Resources/Maps/Salvage/asteroid-base.yml
+++ b/Resources/Maps/Salvage/asteroid-base.yml
@@ -1676,7 +1676,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 217
-  type: WeaponPistolMandella
+  type: WeaponPistolCobra
   components:
   - parent: 207
     type: Transform
diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml
index 7eaa0e5112..8c23c6669a 100644
--- a/Resources/Maps/atlas.yml
+++ b/Resources/Maps/atlas.yml
@@ -13512,7 +13512,7 @@ entities:
     parent: 30
     type: Transform
 - uid: 700
-  type: WeaponRifleWintermute
+  type: WeaponRifleLecter
   components:
   - pos: 8.568229,17.50768
     parent: 30
@@ -17661,7 +17661,7 @@ entities:
     parent: 30
     type: Transform
 - uid: 1181
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: 9.568229,15.507681
     parent: 30
@@ -20039,7 +20039,7 @@ entities:
     parent: 30
     type: Transform
 - uid: 1472
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: 9.396354,15.663931
     parent: 30
diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 3c1f8803b9..26e9a173ea 100644
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -189006,7 +189006,7 @@ entities:
     parent: 60
     type: Transform
 - uid: 21014
-  type: WeaponSubMachineGunDrozd
+  type: WeaponSubMachineGunVector
   components:
   - pos: -28.465193,2.6841984
     parent: 60
@@ -189014,7 +189014,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 21015
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: -28.449568,2.4185734
     parent: 60
@@ -189022,7 +189022,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 21016
-  type: WeaponRifleWintermute
+  type: WeaponRifleLecter
   components:
   - pos: -28.465193,1.9341984
     parent: 60
@@ -189082,7 +189082,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 21021
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -28.418318,1.4810735
     parent: 60
@@ -189090,7 +189090,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 21022
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -28.418318,1.2154485
     parent: 60
diff --git a/Resources/Maps/barratry.yml b/Resources/Maps/barratry.yml
index 4f4626b6d4..de118b5d30 100644
--- a/Resources/Maps/barratry.yml
+++ b/Resources/Maps/barratry.yml
@@ -147074,7 +147074,7 @@ entities:
     parent: 106
     type: Transform
 - uid: 13214
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -42.40947,29.69355
     parent: 106
@@ -147473,7 +147473,7 @@ entities:
         uid: 3449
     type: SignalTransmitter
 - uid: 13267
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -42.40947,29.422718
     parent: 106
@@ -147481,7 +147481,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 13268
-  type: WeaponRifleWintermute
+  type: WeaponRifleLecter
   components:
   - pos: -42.4225,30.506044
     parent: 106
@@ -148782,7 +148782,7 @@ entities:
       Toggle: []
     type: SignalReceiver
 - uid: 13417
-  type: WeaponSubMachineGunDrozd
+  type: WeaponSubMachineGunVector
   components:
   - pos: -44.470184,31.758118
     parent: 106
@@ -148790,7 +148790,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 13418
-  type: WeaponSubMachineGunDrozd
+  type: WeaponSubMachineGunVector
   components:
   - pos: -44.324352,31.633118
     parent: 106
diff --git a/Resources/Maps/delta.yml b/Resources/Maps/delta.yml
index 2e6aa3331b..2ca37e3549 100644
--- a/Resources/Maps/delta.yml
+++ b/Resources/Maps/delta.yml
@@ -348309,7 +348309,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 31246
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: 60.50529,7.453145
     parent: 60
@@ -348317,7 +348317,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 31247
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: 60.50529,7.546895
     parent: 60
@@ -348325,7 +348325,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 31248
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: 60.50529,7.671895
     parent: 60
diff --git a/Resources/Maps/infiltrator.yml b/Resources/Maps/infiltrator.yml
index 9b649d88b5..a969e2b0c5 100644
--- a/Resources/Maps/infiltrator.yml
+++ b/Resources/Maps/infiltrator.yml
@@ -7267,7 +7267,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 755
-  type: WeaponPistolClarissa
+  type: WeaponPistolViper
   components:
   - pos: 1.5391146,-6.426657
     parent: 73
diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index a67a407fe9..e90302c391 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -36651,7 +36651,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1980
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -37.501694,54.356064
     parent: 30
@@ -36659,7 +36659,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1981
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -37.501694,54.481064
     parent: 30
@@ -36667,7 +36667,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1982
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -37.501694,54.606064
     parent: 30
@@ -36727,7 +36727,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1989
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: -37.418808,55.43419
     parent: 30
@@ -36749,7 +36749,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1991
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: -37.418808,55.55919
     parent: 30
@@ -98236,7 +98236,7 @@ entities:
     parent: 30
     type: Transform
 - uid: 9361
-  type: WeaponRifleWintermute
+  type: WeaponRifleLecter
   components:
   - pos: -22.568516,53.59532
     parent: 30
diff --git a/Resources/Maps/moose.yml b/Resources/Maps/moose.yml
index 8daa3887f2..9f6a2a2c2c 100644
--- a/Resources/Maps/moose.yml
+++ b/Resources/Maps/moose.yml
@@ -20154,7 +20154,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1020
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: 19.553373,0.6517799
     parent: 61
@@ -20192,7 +20192,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1024
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: 19.522123,-0.2544701
     parent: 61
@@ -20200,7 +20200,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1025
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: 19.537748,-0.4732201
     parent: 61
@@ -87431,7 +87431,7 @@ entities:
   - unspawnedCount: 25
     type: BallisticAmmoProvider
 - uid: 9110
-  type: WeaponRifleWintermute
+  type: WeaponRifleLecter
   components:
   - pos: 23.52954,3.78771
     parent: 61
diff --git a/Resources/Maps/nss_pillar.yml b/Resources/Maps/nss_pillar.yml
index c289b573ec..c9097ed644 100644
--- a/Resources/Maps/nss_pillar.yml
+++ b/Resources/Maps/nss_pillar.yml
@@ -63855,7 +63855,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4756
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: -50.49019,28.484802
     parent: 130
@@ -120477,7 +120477,7 @@ entities:
     parent: 130
     type: Transform
 - uid: 9838
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: -50.36519,28.39105
     parent: 130
@@ -120497,7 +120497,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 9840
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: -50.20894,28.25043
     parent: 130
@@ -120663,7 +120663,7 @@ entities:
   - fixtures: []
     type: Fixtures
 - uid: 9860
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -50.43171,36.557983
     parent: 130
@@ -120701,7 +120701,7 @@ entities:
     parent: 130
     type: Transform
 - uid: 9865
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -50.448357,36.295975
     parent: 130
diff --git a/Resources/Maps/packedstation.yml b/Resources/Maps/packedstation.yml
index 3f77071d5f..6f2b6a67e2 100644
--- a/Resources/Maps/packedstation.yml
+++ b/Resources/Maps/packedstation.yml
@@ -78789,7 +78789,7 @@ entities:
       Toggle: []
     type: SignalReceiver
 - uid: 7531
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: 38.61274,27.452318
     parent: 2
@@ -78809,7 +78809,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 7533
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: 38.597115,27.702318
     parent: 2
@@ -95323,7 +95323,7 @@ entities:
   - color: '#0000FFFF'
     type: AtmosPipeColor
 - uid: 9191
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: 41.526512,27.667274
     parent: 2
@@ -119759,7 +119759,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 11154
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: 41.526512,27.4329
     parent: 2
diff --git a/Resources/Maps/packedstationxmas.yml b/Resources/Maps/packedstationxmas.yml
index 065ec11f5b..1c93bbd067 100644
--- a/Resources/Maps/packedstationxmas.yml
+++ b/Resources/Maps/packedstationxmas.yml
@@ -77439,7 +77439,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 7557
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: 38.61274,27.452318
     parent: 0
@@ -77458,7 +77458,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 7559
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: 38.597115,27.702318
     parent: 0
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index b004c643bd..4bfc26952e 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -1199,7 +1199,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 128
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: -14.340517,21.391796
     parent: 852
@@ -18088,7 +18088,7 @@ entities:
     parent: 852
     type: Transform
 - uid: 975
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -14.448555,19.788729
     parent: 852
@@ -46540,7 +46540,7 @@ entities:
       Toggle: []
     type: SignalReceiver
 - uid: 4233
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: -14.356142,21.563671
     parent: 852
@@ -53708,7 +53708,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 5148
-  type: WeaponRifleWintermute
+  type: WeaponRifleLecter
   components:
   - pos: -14.387392,20.923046
     parent: 852
diff --git a/Resources/Maps/splitstation.yml b/Resources/Maps/splitstation.yml
index ab08722613..8db86b052b 100644
--- a/Resources/Maps/splitstation.yml
+++ b/Resources/Maps/splitstation.yml
@@ -119802,7 +119802,7 @@ entities:
     parent: 69
     type: Transform
 - uid: 10672
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: 16.618954,-89.46517
     parent: 69
@@ -119820,7 +119820,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 10674
-  type: WeaponSubMachineGunDrozdRubber
+  type: WeaponSubMachineGunVectorRubber
   components:
   - pos: 16.634577,-89.59017
     parent: 69
@@ -127791,7 +127791,7 @@ entities:
     parent: 69
     type: Transform
 - uid: 11572
-  type: WeaponSubMachineGunDrozd
+  type: WeaponSubMachineGunVector
   components:
   - pos: 15.578145,-91.30658
     parent: 69
@@ -127809,7 +127809,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 11574
-  type: WeaponSubMachineGunDrozd
+  type: WeaponSubMachineGunVector
   components:
   - pos: 15.578145,-91.415955
     parent: 69
diff --git a/Resources/Maps/ssreach.yml b/Resources/Maps/ssreach.yml
index c12eb15d93..8b04f1fe57 100644
--- a/Resources/Maps/ssreach.yml
+++ b/Resources/Maps/ssreach.yml
@@ -4178,7 +4178,7 @@ entities:
     parent: 4
     type: Transform
 - uid: 143
-  type: WeaponShotgunGladstone
+  type: WeaponShotgunEnforcer
   components:
   - pos: 22.640556,-5.273798
     parent: 4
diff --git a/Resources/Maps/waystation.yml b/Resources/Maps/waystation.yml
index 0cc244f766..9bdec1841a 100644
--- a/Resources/Maps/waystation.yml
+++ b/Resources/Maps/waystation.yml
@@ -26093,7 +26093,7 @@ entities:
     parent: 82
     type: Transform
 - uid: 1427
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -0.4915824,21.534182
     parent: 82
@@ -26101,7 +26101,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1428
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -0.5228324,21.627932
     parent: 82
@@ -26109,7 +26109,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1429
-  type: WeaponLaserRifleCog
+  type: WeaponLaserCarbine
   components:
   - pos: -0.4915824,21.409182
     parent: 82
@@ -26261,7 +26261,7 @@ entities:
   - unspawnedCount: 25
     type: BallisticAmmoProvider
 - uid: 1444
-  type: WeaponSubMachineGunDrozd
+  type: WeaponSubMachineGunVector
   components:
   - pos: -0.46777725,20.588768
     parent: 82
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
index 1f420dfeac..caab0a21ce 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -13,9 +13,9 @@
 - type: cargoProduct
   name: "shotgun crate"
   id: ArmoryShotgun
-  description: "For when the enemy absolutely needs to be replaced with lead. Contains three Gladstone Combat Shotguns, and some standard shotgun shells. Requires Armory access to open."
+  description: "For when the enemy absolutely needs to be replaced with lead. Contains three Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open."
   icon:
-    sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi
+    sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
     state: icon
   product: CrateArmoryShotgun
   cost: 8000
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 59ea044d56..3360048845 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -138,7 +138,7 @@
     - type: StorageFill
       contents:
         - id: BoxSurvival
-        - id: WeaponPulsePistolPdw
+        - id: WeaponPulsePistol
         - id: WeaponPistolMk58
         - id: MagazinePistolHighCapacityRubber
         - id: MagazinePistol
@@ -154,8 +154,8 @@
       contents:
         - id: BoxSurvival
         - id: WeaponTaser
-        - id: WeaponPulsePistolPdw
-        - id: WeaponPulseCarbineDeac
+        - id: WeaponPulsePistol
+        - id: WeaponPulseCarbine
         - id: BoxHandcuff
         - id: Handcuffs
         
@@ -167,7 +167,7 @@
     - type: StorageFill
       contents:
         - id: BoxSurvival
-        - id: WeaponPulseCarbineDeac
+        - id: WeaponPulseCarbine
         - id: Hypospray
         - id: MedkitAdvancedFilled
 
@@ -181,7 +181,7 @@
       contents:
         - id: BoxSurvival
         - id: trayScanner
-        - id: WeaponPulseCarbineDeac
+        - id: WeaponPulseCarbine
         - id: RCD
         - id: RCDAmmo
         - id: RCDAmmo
@@ -195,7 +195,7 @@
     - type: StorageFill
       contents:
         - id: BoxSurvival
-        - id: WeaponPulsePistolPdw
+        - id: WeaponPulsePistol
         - id: MedkitFilled
         - id: BoxLightMixed
         - id: BoxLightMixed
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index f2c9d6532c..f5154c6824 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -32,11 +32,11 @@
   parent: ClothingBackpackDuffelSyndicateAmmo
   id: ClothingBackpackDuffelSyndicateFilledShotgun
   name: Bojevic bundle
-  description: "Lean and mean: Contains the popular Bojevic Shotgun, a 12g beanbag drum and 2 12g buckshot drums." #, and a pair of Thermal Imaging Goggles.
+  description: "Lean and mean: Contains the popular Bulldog Shotgun, a 12g beanbag drum and 2 12g buckshot drums." #, and a pair of Thermal Imaging Goggles.
   components:
   - type: StorageFill
     contents:
-      - id: WeaponShotgunBojevic
+      - id: WeaponShotgunBulldog
       - id: MagazineShotgun
       - id: MagazineShotgunBeanbag
 #     - id: ThermalImagingGoggles
@@ -57,12 +57,12 @@
 - type: entity
   parent: ClothingBackpackDuffelSyndicateAmmo
   id: ClothingBackpackDuffelSyndicateFilledRevolver
-  name: Predator bundle
-  description: "Go loud and proud with a fully loaded Magnum Predator, bundled with two speed loaders."
+  name: Python bundle
+  description: "Go loud and proud with a fully loaded Magnum Python, bundled with two speed loaders."
   components:
   - type: StorageFill
     contents:
-      - id: WeaponRevolverPredator
+      - id: WeaponRevolverPython
       - id: SpeedLoaderMagnum
         amount: 2
 
@@ -98,12 +98,12 @@
 - type: entity
   parent: ClothingBackpackDuffelSyndicateAmmo
   id: ClothingBackpackDuffelSyndicateFilledCarbine
-  name: Z8 Bulldog bundle
+  name: M-90gl bundle
   description: "A versatile battle rifle with an attached grenade launcher, bundled with 3 magazines and 6 grenades of various capabilities."
   components:
   - type: StorageFill
     contents:
-      - id: WeaponRifleBulldog
+      - id: WeaponRifleM90GrenadeLauncher
       - id: MagazineRifle
         amount: 2
       - id: GrenadeBlast
@@ -213,7 +213,7 @@
     contents:
       - id: BoxSurvivalSyndicate
       - id: SurvivalKnife
-      - id: WeaponPistolClarissa
+      - id: WeaponPistolViper
       - id: BaseUplinkRadio40TC
 
 
@@ -234,4 +234,4 @@
       - id: BaseUplinkRadio40TC
       - id: BoxSurvivalSyndicate
       - id: SurvivalKnife
-      - id: WeaponPistolClarissa
+      - id: WeaponPistolViper
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
index a641cfc377..654b29a264 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -15,11 +15,11 @@
   id: CrateArmoryShotgun
   name: shotgun crate
   parent: CrateWeaponSecure
-  description: "For when the enemy absolutely needs to be replaced with lead. Contains two Gladstone Combat Shotguns, and some standard shotgun shells. Requires Armory access to open."
+  description: "For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open."
   components:
   - type: StorageFill
     contents:
-      - id: WeaponShotgunKammerer
+      - id: WeaponShotgunEnforcer
         amount: 2
       - id: BoxLethalshot
         amount: 3
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
index 28d83c2878..66246f2773 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -81,7 +81,7 @@
         # TRAITOR EQUIPMENT (0.01%)
       - id: Telecrystal10
         prob: 0.0001
-      - id: WeaponRevolverPredator
+      - id: WeaponRevolverPython
         prob: 0.0001
       - id: WeaponRevolverMateba
         prob: 0.0001
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
index dd70acf58b..c4c59db884 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -59,7 +59,7 @@
         amount: 2
       - id: ClothingHeadHelmetRiot
         amount: 2
-      - id: WeaponShotgunGladstone
+      - id: WeaponShotgunEnforcer
         amount: 2
       - id: BoxBeanbag
         amount: 2
diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml
index 86c5f8216c..06e6806b68 100644
--- a/Resources/Prototypes/Catalog/Research/technologies.yml
+++ b/Resources/Prototypes/Catalog/Research/technologies.yml
@@ -185,7 +185,7 @@
   id: BallisticTechnology
   description: Just a fancy term for guns.
   icon:
-    sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
+    sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
     state: icon
   requiredPoints: 15000
   requiredTechnologies:
@@ -202,7 +202,7 @@
 #   id: BallisticTechnology
 #   description: Just a fancy term for guns.
 #   icon:
-#     sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
+#     sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
 #     state: icon
 #   requiredPoints: 15000
 #   requiredTechnologies:
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 6d3bb4dcec..9ead4afbdb 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1,27 +1,27 @@
 # Guns
 
 - type: uplinkListing
-  id: UplinkPistolClarissa
+  id: UplinkPistolViper
   category: Weapons
-  itemId: WeaponPistolClarissa
-  listingName: Clarissa
+  itemId: WeaponPistolViper
+  listingName: Viper
   description: A small, easily concealable, but somewhat underpowered gun. Use pistol magazines (.35 auto).
   price: 6
 
 - type: uplinkListing
-  id: UplinkRevolverPredator
+  id: UplinkRevolverPython
   category: Weapons
-  itemId: WeaponRevolverPredator
-  listingName: Predator
+  itemId: WeaponRevolverPython
+  listingName: Python
   description: A loud and deadly revolver. Uses .40 Magnum.
   price: 8
 
 # Inbuilt suppressor so it's sneaky + more expensive.
 - type: uplinkListing
-  id: UplinkPistolMandella
+  id: UplinkPistolCobra
   category: Weapons
-  itemId: WeaponPistolMandella
-  listingName: Mandella
+  itemId: WeaponPistolCobra
+  listingName: Cobra
   description: A rugged, robust operator handgun with inbuilt silencer. Use pistol magazines (.25 caseless).
   price: 8
 
@@ -185,11 +185,11 @@
   icon: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png
 
 - type: uplinkListing
-  id: UplinkBojevicBundle
+  id: UplinkBulldogBundle
   category: Bundles
   itemId: ClothingBackpackDuffelSyndicateFilledShotgun
   price: 25
-  icon: /Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/icon.png
+  icon: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/icon.png
 
 - type: uplinkListing
   id: UplinkGrenadeLauncherBundle
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index ecf2806a7e..1a08573510 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -788,4 +788,4 @@
   - type: Produce
     seedId: gatfruit
   - type: Food
-    trash: WeaponRevolverPredator
+    trash: WeaponRevolverPython
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 858fa5fc35..c3d6a80eb8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -76,13 +76,13 @@
     node: makeshiftLaser
 
 - type: entity
-  name: cog laser carbine
+  name: laser gun
   parent: BaseWeaponBattery
-  id: WeaponLaserRifleCog
+  id: WeaponLaserCarbine
   description: Favoured by Nanotrasen Security for being cheap and easy to use.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Battery/cog.rsi
+    sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
@@ -91,7 +91,7 @@
       shader: unshaded
   - type: Item
     size: 24
-    sprite: Objects/Weapons/Guns/Battery/cog.rsi
+    sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi
   - type: Gun
     selectedMode: SemiAuto
     availableModes:
@@ -101,9 +101,9 @@
     fireCost: 62.5
 
 - type: entity
-  name: PDW-10 pulse pistol
+  name: pulse pistol
   parent: BaseWeaponBattery
-  id: WeaponPulsePistolPdw
+  id: WeaponPulsePistol
   description: A state of the art energy pistol favoured as a sidearm by the NT-ERT operatives.
   components:
   - type: Sprite
@@ -131,9 +131,9 @@
     startingCharge: 2000
 
 - type: entity
-  name: DEAC-12 pulse carbine
+  name: pulse carbine
   parent: BaseWeaponBattery
-  id: WeaponPulseCarbineDeac
+  id: WeaponPulseCarbine
   description: A high tech energy carbine favoured by the NT-ERT operatives.
   components:
   - type: Sprite
@@ -163,10 +163,10 @@
     startingCharge: 5000
 
 - type: entity
-  name: destroyer pulse rifle
+  name: pulse rifle
   parent: BaseWeaponBattery
-  id: WeaponPulseRifleDestroyer
-  description: A weapon that fully lives up to its name.
+  id: WeaponPulseRifle
+  description: A weapon that is almost as infamous as its users.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi
@@ -312,4 +312,4 @@
     zeroVisible: true
   - type: Appearance
   - type: StaticPrice
-    price: 750
\ No newline at end of file
+    price: 750
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 2d6f0284bd..83cf84756a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -49,16 +49,16 @@
   - type: Appearance
 
 - type: entity
-  name: clarissa
+  name: viper
   parent: BaseWeaponPistol
-  id: WeaponPistolClarissa
+  id: WeaponPistolViper
   description: A small, easily concealable, but somewhat underpowered gun.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
+    sprite: Objects/Weapons/Guns/Pistols/viper.rsi
   - type: Item
     size: 10
-    sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
+    sprite: Objects/Weapons/Guns/Pistols/viper.rsi
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -101,13 +101,13 @@
       - SemiAuto
 
 - type: entity
-  name: mandella
+  name: cobra
   parent: BaseWeaponPistol
-  id: WeaponPistolMandella
+  id: WeaponPistolCobra
   description: A rugged, robust operator handgun with inbuilt silencer.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Pistols/mandella.rsi
+    sprite: Objects/Weapons/Guns/Pistols/cobra.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
@@ -115,7 +115,7 @@
       map: ["enum.GunVisualLayers.Mag"]
   - type: Item
     size: 10
-    sprite: Objects/Weapons/Guns/Pistols/mandella.rsi
+    sprite: Objects/Weapons/Guns/Pistols/cobra.rsi
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/silenced.ogg
@@ -151,6 +151,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
   - type: Item
     size: 10
     sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index 2ccaacecf0..844bc0b9e7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -82,14 +82,14 @@
 - type: entity
   name: Predator
   parent: BaseWeaponRevolver
-  id: WeaponRevolverPredator
+  id: WeaponRevolverPython
   description: A robust revolver favoured by Syndicate agents.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Revolvers/predator.rsi
+    sprite: Objects/Weapons/Guns/Revolvers/python.rsi
   - type: Item
     size: 12
-    sprite: Objects/Weapons/Guns/Revolvers/predator.rsi
+    sprite: Objects/Weapons/Guns/Revolvers/python.rsi
 
 - type: entity
   name: pirate revolver
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index 164443afd2..34e73db682 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -87,9 +87,9 @@
   - type: Appearance
 
 - type: entity
-  name: Z8 Bulldog
+  name: M-90gl
   parent: BaseWeaponRifle
-  id: WeaponRifleBulldog
+  id: WeaponRifleM90GrenadeLauncher
   description: An older bullpup carbine model, with an attached underbarrel grenade launcher.
   components:
   - type: Sprite
@@ -129,13 +129,13 @@
   - type: Appearance
 
 - type: entity
-  name: Wintermute
+  name: Lecter
   parent: BaseWeaponRifle
-  id: WeaponRifleWintermute
+  id: WeaponRifleLecter
   description: A high end military grade assault rifle.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi
+    sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
     layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
@@ -143,7 +143,7 @@
         map: ["enum.GunVisualLayers.Mag"]
   - type: Item
     size: 24
-    sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi
+    sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index c08a9f50ac..f7b18dd620 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -92,13 +92,13 @@
   - type: Appearance
 
 - type: entity
-  name: Drozd
+  name: Vector
   parent: BaseWeaponSubMachineGun
-  id: WeaponSubMachineGunDrozd
+  id: WeaponSubMachineGunVector
   description: An excellent fully automatic Heavy SMG.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
+    sprite: Objects/Weapons/Guns/SMGs/vector.rsi
     layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
@@ -106,7 +106,7 @@
         map: ["enum.GunVisualLayers.Mag"]
   - type: Item
     size: 24
-    sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
+    sprite: Objects/Weapons/Guns/SMGs/vector.rsi
   - type: Gun
     fireRate: 6
     selectedMode: FullAuto
@@ -188,9 +188,9 @@
   - type: Appearance
 
 - type: entity
-  name: Drozd
-  parent: WeaponSubMachineGunDrozd
-  id: WeaponSubMachineGunDrozdRubber
+  name: Vector
+  parent: WeaponSubMachineGunVector
+  id: WeaponSubMachineGunVectorRubber
   description: An excellent fully automatic Heavy SMG.
   suffix: Non-Lethal
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 7a26e895d3..09965dbe2f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -33,14 +33,14 @@
       path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
 
 - type: entity
-  name: Bojevic
+  name: Bulldog
   # Don't parent to BaseWeaponShotgun because it differs significantly
   parent: BaseItem
-  id: WeaponShotgunBojevic
+  id: WeaponShotgunBulldog
   description: It's a magazine-fed shotgun designed for close quarters combat.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/bojevic.rsi
+    sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
     netsync: false
     layers:
     - state: base
@@ -48,7 +48,7 @@
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
   - type: Item
-    sprite: Objects/Weapons/Guns/Shotguns/bojevic.rsi
+    sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
     size: 24
   - type: Gun
     fireRate: 2
@@ -97,15 +97,15 @@
     capacity: 2
 
 - type: entity
-  name: Gladstone
+  name: Enforcer
   parent: BaseWeaponShotgun
-  id: WeaponShotgunGladstone
+  id: WeaponShotgunEnforcer
   description: A next-generation Frozen Star shotgun.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi
+    sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
   - type: Item
-    sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi
+    sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
   - type: BallisticAmmoProvider
 
 - type: entity
diff --git a/Resources/Prototypes/LootTables/suspicion_loot_table.yml b/Resources/Prototypes/LootTables/suspicion_loot_table.yml
index 7b4a332b31..a7b9682e2b 100644
--- a/Resources/Prototypes/LootTables/suspicion_loot_table.yml
+++ b/Resources/Prototypes/LootTables/suspicion_loot_table.yml
@@ -5,19 +5,19 @@
   - id: WeaponRifleAk
     amount: 0
     maxAmount: 5
-  - id: WeaponRifleBulldog
+  - id: WeaponRifleM90GrenadeLauncher
     amount: 0
     maxAmount: 5
-  - id: WeaponRifleWintermute
+  - id: WeaponRifleLecter
     amount: 0
     maxAmount: 5
-  - id: WeaponPistolClarissa
+  - id: WeaponPistolViper
     amount: 0
     maxAmount: 5
   - id: WeaponPistolHandmade
     amount: 0
     maxAmount: 5
-  - id: WeaponPistolMandella
+  - id: WeaponPistolCobra
     amount: 0
     maxAmount: 5
   - id: WeaponPistolMk58
@@ -46,13 +46,13 @@
     amount: 0
     maxAmount: 5
 
-  - id: WeaponShotgunBojevic
+  - id: WeaponShotgunBulldog
     amount: 0
     maxAmount: 5
   - id: WeaponShotgunDoubleBarreled
     amount: 0
     maxAmount: 5
-  - id: WeaponShotgunGladstone
+  - id: WeaponShotgunEnforcer
     amount: 0
     maxAmount: 5
   - id: WeaponShotgunKammerer
@@ -68,7 +68,7 @@
   - id: WeaponSubMachineGunC20r
     amount: 0
     maxAmount: 5
-  - id: WeaponSubMachineGunDrozd
+  - id: WeaponSubMachineGunVector
     amount: 0
     maxAmount: 5
   - id: WeaponSubMachineGunWt550
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png
deleted file mode 100644
index 355b755141..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png
deleted file mode 100644
index a02929baaf..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-left.png
deleted file mode 100644
index 60e1f98b75..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-right.png
deleted file mode 100644
index 82fa1c1827..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-1.png
deleted file mode 100644
index c855740b08..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-2.png
deleted file mode 100644
index 8f25e77a92..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-3.png
deleted file mode 100644
index cea681bb5a..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-4.png
deleted file mode 100644
index c7e2b8b768..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png
new file mode 100644
index 0000000000..3d293e3392
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png
new file mode 100644
index 0000000000..73f1e11236
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-left.png
new file mode 100644
index 0000000000..d1e085e858
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-right.png
new file mode 100644
index 0000000000..61b8c10046
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png
new file mode 100644
index 0000000000..e021aae704
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png
new file mode 100644
index 0000000000..0a051aae14
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png
new file mode 100644
index 0000000000..fd7847d16f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png
new file mode 100644
index 0000000000..efa7d9ea52
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json
similarity index 71%
rename from Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/meta.json
rename to Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json
index 6f33ec7619..033d627581 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/retro.dmi",
+    "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commits/master?after=edb54f137d6ac4ca06fb76b36dc5c603f92586b8+104&branch=master&path%5B%5D=icons&path%5B%5D=obj&path%5B%5D=gun.dmi&qualified_name=refs%2Fheads%2Fmaster",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/base.png
index a4dbb68c68..53c420ed4e 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/icon.png
index 86baf48355..ab9b17fad5 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-left.png
index f68220fd41..ce0fdf6fcd 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-right.png
index 720381634b..3a479c914e 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-1.png
index 58aff7356b..8fe5bf3ad7 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-2.png
index a24f9a2e54..0dc4f13c9d 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-2.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-3.png
index 316a517200..05120b8cc4 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-4.png
index 57884d0b9f..85b35e5429 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json
index a9c1762fea..1f744f41fa 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/makeshift_carbine.dmi",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/base.png
deleted file mode 100644
index 6f678c060c..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/icon.png
deleted file mode 100644
index e6555fd815..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-left.png
deleted file mode 100644
index 53bc7fd843..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-right.png
deleted file mode 100644
index 8d54786b26..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-0.png
deleted file mode 100644
index cfc71602bc..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-1.png
deleted file mode 100644
index 70ac25da4a..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-2.png
deleted file mode 100644
index d68e5f5b7e..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-3.png
deleted file mode 100644
index d4ef41a981..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-4.png
deleted file mode 100644
index 040e713714..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/meta.json
deleted file mode 100644
index 9b419cde20..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/meta.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/sniper.dmi",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-unshaded-0"
-        },
-        {
-            "name": "mag-unshaded-1"
-        },
-        {
-            "name": "mag-unshaded-2",
-            "delays": [
-                [
-                    0.3,
-                    0.3
-                ]
-            ]
-        },
-        {
-            "name": "mag-unshaded-3"
-        },
-        {
-            "name": "mag-unshaded-4"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/base.png
index d068482092..455b737f17 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/icon.png
index b9248426ff..65097d929c 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-left.png
index 9010c4e793..440e5edff5 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-right.png
index 67152d8fdd..f23c6c207e 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-0.png
deleted file mode 100644
index 8eceb96bf8..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-1.png
index 6ed336f3c0..1ec414aa70 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-2.png
index d9e161f50c..95edd60563 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-2.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-3.png
index a8555a11fc..9ae33de446 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-4.png
index f03415058a..d7b0e74adb 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json
index 746c6f6e69..eafe3e519b 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/cassad.dmi",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2",
     "size": {
         "x": 32,
         "y": 32
@@ -13,9 +13,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "mag-unshaded-0"
-        },
         {
             "name": "mag-unshaded-1"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/base.png
index 0a87a7f70b..ab37124682 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/icon.png
index 4403dbd1a9..582d4119b0 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png
index 454b71176c..ec7a57e2aa 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png
index 18a744d873..c65dfdd7f4 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-0.png
deleted file mode 100644
index 19ddce7ce5..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-1.png
index b988bc2f9e..1ec414aa70 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-2.png
index dc44efb5ec..95edd60563 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-2.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-3.png
index 5d07366fa6..9ae33de446 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-4.png
index ac01fccee2..d7b0e74adb 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/meta.json
index 0dc0616f0b..eafe3e519b 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/pdw.dmi",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2",
     "size": {
         "x": 32,
         "y": 32
@@ -13,9 +13,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "mag-unshaded-0"
-        },
         {
             "name": "mag-unshaded-1"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/base.png
index 23a401a84e..d9cf4f3822 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/icon.png
index d3d33c0a86..ff7b210c02 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-left.png
index b8e71b850e..2b739c031b 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-right.png
index 1274540143..e747a9d6d9 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-0.png
deleted file mode 100644
index fa3d508daf..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-1.png
index 5285ba672f..14981107b3 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-2.png
index 713f79e295..eb11b76b9e 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-2.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-3.png
index efa584d5b2..4f72819e0f 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-4.png
index 78a7e8614e..ba874be4fc 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
index f882a63bfc..eafe3e519b 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/pulse.dmi",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2",
     "size": {
         "x": 32,
         "y": 32
@@ -13,9 +13,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "mag-unshaded-0"
-        },
         {
             "name": "mag-unshaded-1"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png
deleted file mode 100644
index a692f9cb0d..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png
deleted file mode 100644
index 5b78397566..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png
deleted file mode 100644
index 6402065c34..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png
deleted file mode 100644
index ab6f5a18c6..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png
deleted file mode 100644
index e3197414df..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png
deleted file mode 100644
index 3b3147a113..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png
deleted file mode 100644
index 60386d0f6f..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png
deleted file mode 100644
index e9622144c9..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json
deleted file mode 100644
index 4b0057ab2c..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/nt_svalinn.dmi",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-unshaded-1"
-        },
-        {
-            "name": "mag-unshaded-2"
-        },
-        {
-            "name": "mag-unshaded-3"
-        },
-        {
-            "name": "mag-unshaded-4"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/base.png
deleted file mode 100644
index e627393429..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/icon.png
deleted file mode 100644
index 734b440148..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-left.png
deleted file mode 100644
index 84695c1929..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png
deleted file mode 100644
index f06ab93260..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/mag-0.png
deleted file mode 100644
index 48b8aeedc7..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/meta.json
deleted file mode 100644
index 55004d70b6..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/clarissa.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/suppressor.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/suppressor.png
deleted file mode 100644
index 746f89d958..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/suppressor.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png
new file mode 100644
index 0000000000..6d29432260
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png
new file mode 100644
index 0000000000..c86548ce6f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-left.png
new file mode 100644
index 0000000000..24ef4fba47
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-right.png
new file mode 100644
index 0000000000..824bf4ceb4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/mag-0.png
new file mode 100644
index 0000000000..592fa288e9
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
similarity index 75%
rename from Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/meta.json
rename to Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
index 3aa98db5af..aded10f876 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/projectile/kovacs.dmi",
+    "copyright": "Taken from pireamaineach at https://github.com/tgstation/tgstation/pull/43407/commits/b92e11e94466be5bcb465b781decf83764401ac1",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/base.png
deleted file mode 100644
index 1ebaa2c55b..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/icon.png
deleted file mode 100644
index b897c3fa36..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-left.png
deleted file mode 100644
index 4de85760c5..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-right.png
deleted file mode 100644
index 56eaeab03e..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/meta.json
deleted file mode 100644
index a86ac5147d..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/meta.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/colt.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/base.png
deleted file mode 100644
index 674e89d9e2..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/icon.png
deleted file mode 100644
index a2013e87ba..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-left.png
deleted file mode 100644
index e3c8c9bdfc..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png
deleted file mode 100644
index ebdaddb1e1..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/mag-0.png
deleted file mode 100644
index 724f99801a..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/meta.json
deleted file mode 100644
index 04858b6ac9..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/meta.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-        "name": "suppressor"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/suppressor.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/suppressor.png
deleted file mode 100644
index b49399ca9c..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/suppressor.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/base.png
deleted file mode 100644
index 7cdb8b5134..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/icon.png
deleted file mode 100644
index 44d8881ac3..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/inhand-left.png
deleted file mode 100644
index 47cc18b070..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/inhand-right.png
deleted file mode 100644
index e356ed4da5..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/mag-0.png
deleted file mode 100644
index 21f8a4d875..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json
deleted file mode 100644
index b2895ae87f..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/gyropistol.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-    "states": [
-       {
-         "name": "icon"
-       },
-       {
-         "name": "base"
-       },
-       {
-          "name": "mag-0"
-       },
-       {
-          "name": "inhand-left",
-          "directions": 4
-       },
-       {
-          "name": "inhand-right",
-          "directions": 4
-       }
-    ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/base.png
deleted file mode 100644
index f5b6bc4745..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/icon.png
deleted file mode 100644
index 5235ae89d1..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/inhand-left.png
deleted file mode 100644
index f43f7e219e..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/inhand-right.png
deleted file mode 100644
index 3e45080bed..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-0.png
deleted file mode 100644
index cd7cfbbd08..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/base.png
deleted file mode 100644
index 3c14338eb1..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/icon.png
deleted file mode 100644
index cba29786b9..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/inhand-left.png
deleted file mode 100644
index ddabaffad2..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/inhand-right.png
deleted file mode 100644
index 4b1d8778e0..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/mag-0.png
deleted file mode 100644
index 7372c37a8d..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/meta.json
deleted file mode 100644
index 6802507510..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/mandella.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png
index cf6c09cc8a..565a3fcf44 100644
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
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png
index 08fd96aa99..521e71de8b 100644
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
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png
index 97ca5a80ec..c5742e680e 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png
index 7efc0f30fd..63a7746596 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png
index adb9b06292..324cfc2cc3 100644
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
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
index 8973f468c8..cdc084122b 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
@@ -1,28 +1,28 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from pireamaineach at https://github.com/tgstation/tgstation/pull/43407/commits/b92e11e94466be5bcb465b781decf83764401ac1",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/base.png
deleted file mode 100644
index f66d9b27cb..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/icon.png
deleted file mode 100644
index 7f0a5b2871..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-left.png
deleted file mode 100644
index 4de85760c5..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png
deleted file mode 100644
index 56eaeab03e..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/mag-0.png
deleted file mode 100644
index eeb9dc6de9..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/meta.json
deleted file mode 100644
index 8973f468c8..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/base.png
deleted file mode 100644
index 94d60ec656..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/icon.png
deleted file mode 100644
index 10d9526098..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/inhand-left.png
deleted file mode 100644
index db86efaafd..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/inhand-right.png
deleted file mode 100644
index 0b4e71bcd0..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/mag-0.png
deleted file mode 100644
index 63dc55329c..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json
deleted file mode 100644
index 3396599224..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/molly.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "suppressor"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/suppressor.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/suppressor.png
deleted file mode 100644
index ee9d3c2ed2..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/suppressor.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/icon.png
deleted file mode 100644
index 3cfba5cbea..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-left.png
deleted file mode 100644
index 75134ce7dc..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-right.png
deleted file mode 100644
index 43a099e21a..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/meta.json
deleted file mode 100644
index 914bfff61c..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/base.png
deleted file mode 100644
index 3b53726fa2..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/icon.png
deleted file mode 100644
index 30fa1fd93e..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/inhand-left.png
deleted file mode 100644
index 9d44a85633..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/inhand-right.png
deleted file mode 100644
index 0a71097c13..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/mag-0.png
deleted file mode 100644
index 90a4ad9621..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/meta.json
deleted file mode 100644
index 2cef1c3096..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/meta.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/paco.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "suppressor"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/suppressor.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/suppressor.png
deleted file mode 100644
index e7decdc7ca..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/suppressor.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/base.png
new file mode 100644
index 0000000000..14ebf9e277
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/icon.png
new file mode 100644
index 0000000000..559e716bcb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png
new file mode 100644
index 0000000000..1a9491cc70
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png
new file mode 100644
index 0000000000..7340d6c907
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/mag-0.png
new file mode 100644
index 0000000000..ae6e64af1f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json
new file mode 100644
index 0000000000..e824c6588d
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/suppressor.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/suppressor.png
new file mode 100644
index 0000000000..401301c43e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/suppressor.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png
index 1fcff2d6a1..ec4156700a 100644
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
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-left.png
index 90f2b9ad25..25f53ec7fc 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png
index 53b5b1bcfd..eb631b7356 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
index e159224221..db3b039e59 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
@@ -1,22 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/pull/26621/commits/fc4cc47e5ae4a5562077239fc2dcfe1603d2645a",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png
index 93ed9b1ca1..db369dcfa6 100644
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
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-left.png
index 16fabfe532..9d7876f6de 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-right.png
index 0984eeec2c..8ebbc14e3a 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
index e159224221..da50879e32 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
@@ -1,22 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Shiptest at https://github.com/shiptest-ss13/Shiptest/pull/308/commits/252f82abfe3e74b6fbd7928b149bdbb9476a2624",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/icon.png
deleted file mode 100644
index bec984dc16..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-left.png
deleted file mode 100644
index 08df9225d3..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-right.png
deleted file mode 100644
index b161b19dda..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png
new file mode 100644
index 0000000000..9e378aed75
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png
new file mode 100644
index 0000000000..def85defae
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png
new file mode 100644
index 0000000000..2aa960b949
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json
new file mode 100644
index 0000000000..db3b039e59
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/pull/26621/commits/fc4cc47e5ae4a5562077239fc2dcfe1603d2645a",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/base.png
deleted file mode 100644
index 970d3f6665..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/icon.png
deleted file mode 100644
index b24a7ad785..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/inhand-left.png
deleted file mode 100644
index a1283b3db4..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/inhand-right.png
deleted file mode 100644
index ba647e547f..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/mag-0.png
deleted file mode 100644
index 12835bdb80..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json
deleted file mode 100644
index 24bb58570e..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "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",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/base.png
deleted file mode 100644
index 6b5c09158c..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/icon.png
deleted file mode 100644
index f1027fbd2c..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/inhand-left.png
deleted file mode 100644
index 157e2a6d64..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/inhand-right.png
deleted file mode 100644
index 1b179d55a0..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/mag-0.png
deleted file mode 100644
index e37aa9a0e8..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/meta.json
deleted file mode 100644
index 9a0a9b174c..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Yeeye",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png
index 4615b8e355..52a889eefa 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png
index 894f9973f0..9f9817c9cb 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/inhand-left.png
index a9c3df1c46..c8712530c0 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/inhand-right.png
index e5fe120db1..4012bbe0af 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png
index b62ba13496..f035d04e93 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json
index 67630fc3b2..7b90c1abec 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json
@@ -1,28 +1,28 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/carabine.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "GNU Affero General Public License version 3",
+    "copyright": "Taken from The World Server at https://github.com/TheNick5527/The-World-Server/commit/91677c25160ccc0265f84189d2cd1ed44bc39742",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png
new file mode 100644
index 0000000000..02d1e9e24f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png
new file mode 100644
index 0000000000..da2084c375
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-left.png
new file mode 100644
index 0000000000..27972c97f5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-right.png
new file mode 100644
index 0000000000..d50518634c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png
new file mode 100644
index 0000000000..a19c870efa
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
similarity index 84%
rename from Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
rename to Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
index 27d4d1c637..9a0a79a7a5 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi",
+  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/wintermute.dmi",
   "size": {
     "x": 32,
     "y": 32
@@ -16,9 +16,6 @@
     {
       "name": "mag-0"
     },
-    {
-      "name": "suppressor"
-    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/base.png
deleted file mode 100644
index 335b9642e5..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/icon.png
deleted file mode 100644
index 503e46c0c6..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/inhand-left.png
deleted file mode 100644
index c587af43e4..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/inhand-right.png
deleted file mode 100644
index 123755e969..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/mag-0.png
deleted file mode 100644
index 5f1247ef37..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/base.png
deleted file mode 100644
index 44166332b7..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/icon.png
deleted file mode 100644
index 1a815703a2..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/inhand-left.png
deleted file mode 100644
index 73614c4c7b..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/inhand-right.png
deleted file mode 100644
index 4014cc755c..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/mag-0.png
deleted file mode 100644
index d33bf79e16..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/meta.json
deleted file mode 100644
index 99cc63819a..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/projectile/vintorez.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/base.png
deleted file mode 100644
index 23f4124ab7..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/icon.png
deleted file mode 100644
index fcd0c8e12c..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/inhand-left.png
deleted file mode 100644
index ddb5492a30..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/inhand-right.png
deleted file mode 100644
index 087765417c..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/mag-0.png
deleted file mode 100644
index 5b0254bd4c..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/meta.json
deleted file mode 100644
index 448662e02a..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/wintermute.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png
index 43d1497535..47544b0b42 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png
index 2a8f2aca63..0cfb656330 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png
index adc5f77770..19b587bfa5 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png
index 4e2c670395..0b2339a43b 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png
index 0e22e345a9..89de5fa775 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/suppressor.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/suppressor.png
index 55ccbdbbe2..b857d90a6f 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/suppressor.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/suppressor.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png
deleted file mode 100644
index b4b511cb8a..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png
deleted file mode 100644
index 11c3bef79c..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/inhand-left.png
deleted file mode 100644
index eec6989c94..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/inhand-right.png
deleted file mode 100644
index 535242e776..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png
deleted file mode 100644
index f909b598e7..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/suppressor.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/suppressor.png
deleted file mode 100644
index b3af6f6867..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/suppressor.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png
new file mode 100644
index 0000000000..efeadaf453
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png
new file mode 100644
index 0000000000..8145edfbd9
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-left.png
new file mode 100644
index 0000000000..9dfe592de8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-right.png
new file mode 100644
index 0000000000..afb543219f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png
new file mode 100644
index 0000000000..1ebdab0ebb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
new file mode 100644
index 0000000000..5b44edf0ea
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified vgtation at https://github.com/vgstation-coders/vgstation13/pull/20330/commits/1604c9cc61a48585e25b5f9eba3e179c06362372",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/base.png
deleted file mode 100644
index c89e7eb7d7..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/icon.png
deleted file mode 100644
index a4d5cfda80..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/inhand-left.png
deleted file mode 100644
index 3abfce4675..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/inhand-right.png
deleted file mode 100644
index e5492fe593..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/mag-0.png
deleted file mode 100644
index cdaa86d894..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/mag-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json
deleted file mode 100644
index 52667dbcc7..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/bojevic.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/base.png
new file mode 100644
index 0000000000..20d40336c8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/icon.png
new file mode 100644
index 0000000000..233731c5a1
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/inhand-left.png
new file mode 100644
index 0000000000..5724391214
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/inhand-right.png
new file mode 100644
index 0000000000..78a738c37f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/mag-0.png
new file mode 100644
index 0000000000..482493210a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
similarity index 75%
rename from Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
index 4dbab2cffe..ce870cea6b 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/projectile/lamia.dmi",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png
index d76287e02e..7f7c9cfbbd 100644
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
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-left.png
index 83453c8112..6df5ce6e36 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png
index 11248f1b68..a65854c1fd 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
index b07e35b147..303d040d10 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
@@ -1,22 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/dshotgun.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "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",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png
new file mode 100644
index 0000000000..fda6921f5c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-left.png
new file mode 100644
index 0000000000..3878a18861
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-right.png
new file mode 100644
index 0000000000..201a669d7b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
similarity index 69%
rename from Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/meta.json
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
index a81d2a81be..db87c274ff 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/projectile/sky_driver.dmi",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/27557/commits",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/icon.png
deleted file mode 100644
index 8f20a81352..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/inhand-left.png
deleted file mode 100644
index b20356f87d..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/inhand-right.png
deleted file mode 100644
index adf01d5a99..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/meta.json
deleted file mode 100644
index 132b506553..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/gladstone.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png
index bede110e2b..dd98c43908 100644
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
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-left.png
index 74994ddff5..5c407db39b 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-right.png
index c5864a2168..61cc8e10a3 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
index 949689be72..303d040d10 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
@@ -1,22 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/c4f3f5c97c361e66cc93219702ea11f49b9d41bb/icons/obj/guns/projectile/shotgun.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "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",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png
index 3681d06642..8bfd3150ff 100644
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
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-left.png
index f588ac6014..c9d961197c 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-right.png
index eea5242eee..caf78b661d 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json
index 5228929118..303d040d10 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json
@@ -1,22 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/sawnshotgun.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "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",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }