Make some good

Rxup · Nov 5, 2023 · c2835f6 · c2835f6
1 parent c04ce6c
commit c2835f6
Show file tree

Hide file tree

Showing 30 changed files with 460 additions and 115 deletions.
diff --git a/Resources/Prototypes/Backmen/Adminbuse/DED.yml b/Resources/Prototypes/Backmen/Adminbuse/DED.yml
@@ -124,7 +124,7 @@
     head: ClothingHeadHatBeretMobileTaskForce
     id: DedSquadronLeaderGavnaIDCard
     ears: ClothingHeadsetCentComCC
-    belt: WeaponRevolverMateba
+    belt: WeaponRevolverMatebaNew
     pocket1: EnergySwordDedSad
     pocket2: WeaponPulsePistol
 
@@ -143,7 +143,7 @@
     suitstorage: OxygenTankFilled
     id: DedSquadronGavnaIDCard
     ears: ClothingHeadsetCentComCC
-    belt: WeaponRevolverMateba
+    belt: WeaponRevolverMatebaNew
     pocket1: EnergySwordDedSad
     pocket2: WeaponPulsePistol
 

diff --git a/Resources/Prototypes/Backmen/Adminbuse/centcomm_kid.yml b/Resources/Prototypes/Backmen/Adminbuse/centcomm_kid.yml
@@ -340,25 +340,14 @@
 
 
 - type: entity
-  name: автоматический Силовик
-  parent: WeaponShotgunEnforcer
+  parent: WeaponShotgun39
   id: WeaponShotgunEnforcerRXBZZ
-  description: Дробовик марки Frozen Star нового поколения. Использует патроны калибра .50 ружейный.
   components:
-  - type: BallisticAmmoProvider
-    whitelist:
-      tags:
-      - ShellShotgun
-    capacity: 10
-    proto: ShellShotgun
-    soundInsert:
-      path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
-
 
 - type: entity
   name: Лектер
   suffix: Зажигательные
-  parent: WeaponRifleLecter
+  parent: WeaponRifleAR18
   id: WeaponRifleLecterFire
   description: Первоклассная армейская штурмовая винтовка. Использует патроны калибра .20 винтовочный.
   components:

diff --git a/Resources/Prototypes/Backmen/Adminbuse/ert_corvax.yml b/Resources/Prototypes/Backmen/Adminbuse/ert_corvax.yml
@@ -108,10 +108,10 @@
         - id: BattleMedipen
         - id: BattleMedipen
         - id: WeaponDisabler
-        - id: WeaponPistolMk58
+        - id: WeaponPistolACP14
         - id: MagazinePistol
         - id: MagazinePistol
-        - id: WeaponRifleLecter
+        - id: WeaponRifleAR18
         - id: MagazineRifle
         - id: MagazineRifle
         - id: MagazineRifle
@@ -150,10 +150,10 @@
         - id: BattleMedipen
         - id: BattleMedipen
         - id: trayScanner
-        - id: WeaponPistolMk58
+        - id: WeaponPistolACP14
         - id: MagazinePistol
         - id: MagazinePistol
-        - id: WeaponRifleLecter
+        - id: WeaponRifleAR18
         - id: MagazineRifle
         - id: MagazineRifle
         - id: MagazineRifle
@@ -202,10 +202,10 @@
         - id: BattleMedipen
         - id: BattleMedipen
         - id: WeaponDisabler
-        - id: WeaponPistolMk58
+        - id: WeaponPistolACP14
         - id: MagazinePistol
         - id: MagazinePistol
-        - id: WeaponRifleLecter
+        - id: WeaponRifleAR18
         - id: MagazineRifle
         - id: MagazineRifle
         - id: MagazineRifle
@@ -255,10 +255,10 @@
         - id: BoxFlare
         - id: BattleMedipen
         - id: BattleMedipen
-        - id: WeaponPistolMk58
+        - id: WeaponPistolACP14
         - id: MagazinePistol
         - id: MagazinePistol
-        - id: WeaponRifleLecter
+        - id: WeaponRifleAR18
         - id: MagazineRifle
         - id: MagazineRifle
         - id: MagazineRifle
@@ -297,7 +297,7 @@
       contents:
         - id: BattleMedipen
         - id: BattleMedipen
-        - id: WeaponPistolMk58
+        - id: WeaponPistolACP14
         - id: MagazinePistol
         - id: MagazinePistol
         - id: MagazinePistol

diff --git a/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml b/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml
@@ -267,7 +267,7 @@
   - type: MultiHandedItem
 
 - type: entity
-  id: BaseMagazineHeavyRifle
+  id: BaseMagazineHeavyRifle50
   name: "magazine (.50 BMG)"
   parent: BaseItem
   abstract: true
@@ -301,7 +301,7 @@
 - type: entity
   id: MagazineHeavyRifleMaDeuse
   name: "magazine (.50 BMG)"
-  parent: BaseMagazineHeavyRifle
+  parent: BaseMagazineHeavyRifle50
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeAntiMateriel
@@ -1787,7 +1787,7 @@
         priority: 2
         whitelist:
           tags:
-            - MagazineHeavyRifle
+            - MagazineHeavyRifle62
   - type: ContainerContainer
     containers:
       gun_magazine: !type:ContainerSlot
@@ -1801,7 +1801,7 @@
     wieldTime: 1.3
 
 - type: Tag
-  id: MagazineHeavyRifle
+  id: MagazineHeavyRifle62
 
 - type: entity
   id: MagazineHeavyRifleBR64
@@ -1811,7 +1811,7 @@
   components:
   - type: Tag
     tags:
-      - MagazineHeavyRifle
+      - MagazineHeavyRifle62
   - type: BallisticAmmoProvider
     mayTransfer: true
     capacity: 20
@@ -1853,7 +1853,7 @@
     proto: BulletRifle
   - type: Sprite
     netsync: false
-    sprite: Backmen/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/ammo_casing.rsi
     layers:
     - state: 20combat #corvax-resprite
       map: ["enum.AmmoVisualLayers.Base"]
@@ -2073,7 +2073,7 @@
 - type: entity
   name: Mateba
   parent: BaseWeaponRevolver
-  id: WeaponRevolverMateba
+  id: WeaponRevolverMatebaNew
   suffix: Револьвер
   description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo.
   components:
@@ -2091,7 +2091,7 @@
 - type: entity
   name: Kardashev-Mosin
   parent: BaseWeaponSniper
-  id: WeaponSniperMosin
+  id: WeaponSniperMosinNew
   suffix: Винтовка
   description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo.
   components:
@@ -2277,7 +2277,7 @@
     deleteOnSpawn: true
   - type: Sprite
     netsync: false
-    sprite: Backmen/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/ammo_casing.rsi
     layers:
     - state: 45combat #corvax-resprite
       map: ["enum.AmmoVisualLayers.Base"]
@@ -2496,7 +2496,7 @@
     proto: BulletRifle
   - type: Sprite
     netsync: false
-    sprite: Backmen/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/ammo_casing.rsi
     layers:
     - state: 30combat #corvax-resprite
       map: ["enum.AmmoVisualLayers.Base"]
@@ -2799,7 +2799,7 @@
 - type: entity
   id: MagazineHeavyRifleV41
   name: "magazine (.20 rifle)"
-  parent: BaseMagazineHeavyRifle
+  parent: BaseMagazineHeavyRifle50
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeRifle

diff --git a/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/intern.yml b/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/intern.yml
@@ -54,7 +54,7 @@
   id: CentComInternGearArmed # POWER IN QUANTITY!
   equipment:
     jumpsuit: ClothingUniformJumpsuitCentcomIntern
-    back: WeaponSniperMosin
+    back: WeaponSniperMosinNew
     shoes: ClothingShoesColorBlack
     eyes: ClothingEyesGlassesSunglasses
     neck: CombatKnifeSpetsnaz

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -325,7 +325,7 @@
         - id: BoxSurvivalEngineering
         - id: WeaponPulseRifle
         - id: WeaponPulsePistol
-        - id: WeaponRevolverMateba
+        - id: WeaponRevolverMatebaNew
         - id: SpeedLoaderMagnumAP
         - id: SpeedLoaderMagnumAP
         - id: BoxFlashbang

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -293,7 +293,7 @@
   - type: StorageFill
     contents:
       - id: BoxSurvivalSyndicate
-      - id: WeaponPistolViper
+      - id: WeaponPistolHIB88M4
       - id: PinpointerNuclear
       - id: MicroBombImplanter
 
@@ -311,7 +311,7 @@
       - id: SawAdvanced
       - id: Cautery
       - id: CombatKnife
-      - id: WeaponPistolViper
+      - id: WeaponPistolHIB88M4
       - id: PinpointerNuclear
       - id: HandheldHealthAnalyzer
       - id: CombatMedipen

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -120,7 +120,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: MagazinePistolSubMachineGunTopMounted
+      - id: MagazinePistolTopSubMachineGun
         amount: 3
 
 - type: entity

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -4,9 +4,9 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponSubMachineGunWt550
+      - id: WeaponSubMachineGunP90
         amount: 2
-      - id: MagazinePistolSubMachineGunTopMounted
+      - id: MagazinePistolTopSubMachineGun
         amount: 4
 
 - type: entity
@@ -15,7 +15,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponShotgunEnforcer
+      - id: WeaponShotgun39
         amount: 2
       - id: BoxLethalshot
         amount: 3
@@ -44,7 +44,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponLaserCarbine
+      - id: WeaponEarthGovLaserRifle
         amount: 3
 
 - type: entity
@@ -53,7 +53,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponPistolMk58
+    - id: WeaponPistolACP14
       amount: 2
     - id: MagazinePistol
       amount: 4
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -84,7 +84,7 @@
         prob: 0.0001
       - id: WeaponRevolverPython
         prob: 0.0001
-      - id: WeaponRevolverMateba
+      - id: WeaponRevolverMatebaNew
         prob: 0.0001
 
 - type: entity

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -42,7 +42,7 @@
         amount: 2
       - id: ClothingHeadHelmetRiot
         amount: 2
-      - id: WeaponShotgunEnforcerRubber
+      - id: WeaponShotgun39
         amount: 2
       - id: BoxBeanbag
         amount: 2

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -171,7 +171,7 @@
         - id: BalloonSyn
           prob: 0.005
           orGroup: syndiemaintloot
-        - id: WeaponSniperMosin
+        - id: WeaponSniperMosinNew
           prob: 0.0010
           orGroup: syndiemaintloot
 
@@ -264,6 +264,6 @@
         - id: BalloonSyn
           prob: 0.005
           orGroup: syndiemaintloot
-        - id: WeaponSniperMosin
+        - id: WeaponSniperMosinNew
           prob: 0.0010
           orGroup: syndiemaintloot
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -196,7 +196,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponPistolMk58
+    - id: WeaponPistolACP14
       amount: 4
     - id: MagazinePistol
       amount: 8
@@ -208,7 +208,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponRifleLecter
+    - id: WeaponRifleAR18
       amount: 2
     - id: MagazineRifle
       amount: 4
@@ -220,7 +220,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponSubMachineGunDrozd
+    - id: WeaponSubMachineGunVectorSpecial
       amount: 2
     - id: MagazinePistolSubMachineGun
       amount: 4
@@ -232,7 +232,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponShotgunEnforcer
+    - id: WeaponShotgun39
       amount: 2
     - id: MagazineShotgun
       amount: 4
@@ -244,7 +244,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponShotgunKammerer
+    - id: WeaponShotguntrenchgun4034
       amount: 2
     - id: MagazineShotgun
       amount: 4
@@ -257,7 +257,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponSubMachineGunWt550
+    - id: WeaponSubMachineGunP90
       amount: 2
     - id: MagazinePistolSubMachineGun
       amount: 4
@@ -269,5 +269,5 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponLaserCarbine
+    - id: WeaponEarthGovLaserRifle
       amount: 3