Revamp guns: Revival (#8675)

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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:

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

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -788,4 +788,4 @@
   - type: Produce
     seedId: gatfruit
   - type: Food
-    trash: WeaponRevolverPredator
+    trash: WeaponRevolverPython

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

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

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

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

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:

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

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

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

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

Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/meta.json

@@ -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
-        }
-    ]
-}

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"
         },

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"
         },

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"
         },