Revamp guns: Revival (#8675)

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-12 05:39:52 +03:00
parent 89e48c676e
commit 43dc0be57c
291 changed files with 372 additions and 801 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
+    price: 750
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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