Weapons Update (Rxup#350)

* first changes * Update pulse.yml * Update guns64.ftl * Update uplink_catalog.yml * Update observer.yml * саммери * textures * some staff * Update guns64.ftl * Summery * Update centFifa.yml * Update centFifa.yml * Update uplink_catalog.yml * Update pulse.yml * Revert "Update observer.yml" This reverts commit 19fd2e8. * Conflicts * Update migration.yml * Update armory.yml * Update pulse.yml * Update briefcases.yml * sr127 * sr127 * some fixs
nomad0260 · Dec 16, 2023 · 135eb00 · 135eb00
1 parent 28c4639
commit 135eb00
Show file tree

Hide file tree

Showing 116 changed files with 1,248 additions and 87 deletions.
diff --git a/Resources/Audio/Backmen/Misc/empty_alarm.ogg b/Resources/Audio/Backmen/Misc/empty_alarm.ogg
diff --git a/Resources/Audio/Backmen/Misc/error.ogg b/Resources/Audio/Backmen/Misc/error.ogg
diff --git a/Resources/Audio/Weapons/Guns64/Pistols/divet_fire.ogg b/Resources/Audio/Weapons/Guns64/Pistols/divet_fire.ogg
diff --git a/Resources/Audio/Weapons/Guns64/Pistols/divet_magin.ogg b/Resources/Audio/Weapons/Guns64/Pistols/divet_magin.ogg
diff --git a/Resources/Audio/Weapons/Guns64/Pistols/divet_magout.ogg b/Resources/Audio/Weapons/Guns64/Pistols/divet_magout.ogg
diff --git a/Resources/Audio/Weapons/Guns64/Pulse/ap12_reload.ogg b/Resources/Audio/Weapons/Guns64/Pulse/ap12_reload.ogg
diff --git a/Resources/Audio/Weapons/Guns64/Pulse/ap12j.ogg b/Resources/Audio/Weapons/Guns64/Pulse/ap12j.ogg
diff --git a/Resources/Audio/Weapons/Guns64/Pulse/hellhammer.ogg b/Resources/Audio/Weapons/Guns64/Pulse/hellhammer.ogg
diff --git a/Resources/Audio/Weapons/Guns64/Pulse/xmlg.ogg b/Resources/Audio/Weapons/Guns64/Pulse/xmlg.ogg
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/weapons/guns/guns64.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/weapons/guns/guns64.ftl
diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl
@@ -118,7 +118,7 @@ uplink-meds-bundle-desc = Все, что нужно для возвращени
 uplink-ammo-bundle-name = Набор боеприпасов
 uplink-ammo-bundle-desc = Перезаряжаю! Содержит 4 магазина для C-20r, 4 барабана для Бульдога и 2 короба патронов для L6 SAW.
 uplink-sniper-bundle-name = Набор снайпера
-uplink-sniper-bundle-desc = Неприметный чемодан, в котором находятся Христов, 10 запасных патронов и удобная маскировка.
+uplink-sniper-bundle-desc = Неприметный чемодан, в котором находятся SR-127 Bauer, 10 запасных патронов и удобная маскировка.
 # Bundles
 uplink-c20r-bundle-name = { ent-ClothingBackpackDuffelSyndicateFilledSMG }
 uplink-c20r-bundle-desc = { ent-ClothingBackpackDuffelSyndicateFilledSMG.desc }

diff --git a/Resources/Prototypes/Backmen/Adminbuse/CentCommKid.yml b/Resources/Prototypes/Backmen/Adminbuse/CentCommKid.yml
@@ -1487,6 +1487,8 @@
   components:
   - type: Sprite
     sprite: Backmen/Clothing/Belt/Gear/shotgunbelt.rsi
+  - type: Item
+    size: Huge
   - type: Clothing
     sprite: Backmen/Clothing/Belt/Gear/shotgunbelt.rsi
   - type: Storage

diff --git a/Resources/Prototypes/Backmen/Adminbuse/centFifa.yml b/Resources/Prototypes/Backmen/Adminbuse/centFifa.yml
@@ -707,6 +707,9 @@
     sprite: Markers/jobs.rsi
     state: ertengineer
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: Speech
     speechSounds: Metrocop
     soundCooldownTime: 0.1
@@ -753,6 +756,9 @@
     sprite: Markers/jobs.rsi
     state: ertsecurity
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: Speech
     speechSounds: Metrocop
     soundCooldownTime: 0.1
@@ -796,6 +802,9 @@
     sprite: Markers/jobs.rsi
     state: ertmedical
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: Speech
     speechSounds: Metrocop
     soundCooldownTime: 0.1
@@ -842,6 +851,9 @@
     sprite: Markers/jobs.rsi
     state: ertjanitor
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: Speech
     speechSounds: Metrocop
     soundCooldownTime: 0.1
@@ -1151,13 +1163,12 @@
         - id: BattleMedipen
         - id: BattleMedipen
         - id: WeaponDisabler
-        - id: WeaponPistolACP14
+        - id: WeaponPistolG23
         - id: MagazinePistol
-        - id: MagazinePistol
-        - id: WeaponRifleG36
-        - id: MagazineRifle
-        - id: MagazineRifle
-        - id: MagazineRifle
+          amount: 2
+        - id: WeaponPulseRifleAP12
+        - id: MagazinePulseRifle
+          amount: 5
         - id: BoxHandcuff
 
 
@@ -1187,26 +1198,29 @@
     - type: Storage
       maxItemSize: Huge
       grid:
-      - 0,0,8,6
+      - 0,0,16,6
     - type: StorageFill
       contents:
         - id: BattleMedipen
-        - id: BattleMedipen
+          amount: 3
         - id: trayScanner
-        - id: WeaponShotgun39
-        - id: BoxLethalshot
-          amount: 2
-        - id: C4
+        - id: WeaponPulseShotgunHellHammer
+        - id: MagazinePulseShotgun
+          amount: 4
+        - id: WeaponPistolVP78
+        - id: MagazinePistolHighCapacity
+          amount: 4
         - id: C4
+          amount: 5
         - id: RCD
         - id: RCDAmmo
-        - id: RCDAmmo
+          amount: 4
         - id: SheetSteel
-          amount: 2
+          amount: 4
         - id: SheetPlasteel
-          amount: 2
+          amount: 4
         - id: SheetRPGlass
-          amount: 2
+          amount: 4
 
 
 # Security
@@ -1239,13 +1253,12 @@
         - id: BattleMedipen
         - id: BattleMedipen
         - id: WeaponDisabler
-        - id: WeaponPistolACP14
+        - id: WeaponPistolG23
         - id: MagazinePistol
-        - id: MagazinePistol
-        - id: WeaponRifleG36
-        - id: MagazineRifle
-        - id: MagazineRifle
-        - id: MagazineRifle
+          amount: 2
+        - id: WeaponPulseRifleAP12
+        - id: MagazinePulseRifle
+          amount: 5
         - id: BoxHandcuff
 
 
@@ -1279,13 +1292,12 @@
         - id: BoxFlare
         - id: BattleMedipen
         - id: BattleMedipen
-        - id: WeaponPistolACP14
+        - id: WeaponPistolG23
         - id: MagazinePistol
-        - id: MagazinePistol
-        - id: WeaponRifleG36
-        - id: MagazineRifle
-        - id: MagazineRifle
-        - id: MagazineRifle
+          amount: 2
+        - id: WeaponPulseSMGTritonM3
+        - id: MagazinePulseSubMachinePistol
+          amount: 4
         - id: MedkitFilled
         - id: SyringeInaprovaline
           amount: 2
@@ -1323,7 +1335,7 @@
       contents:
         - id: BattleMedipen
         - id: BattleMedipen
-        - id: WeaponPistolACP14
+        - id: WeaponPistolG23
         - id: MagazinePistol
         - id: MagazinePistol
         - id: MagazinePistol
@@ -1354,6 +1366,9 @@
     sound:
       collection: SoldierDeath
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: GhostRole
     allowMovement: true
     allowSpeech: true
@@ -1392,6 +1407,9 @@
     sprite: Markers/jobs.rsi
     state: ertengineereva
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: Speech
     speechSounds: Metrocop
     soundCooldownTime: 0.1
@@ -1438,6 +1456,9 @@
     sprite: Markers/jobs.rsi
     state: ertsecurityeva
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: Speech
     speechSounds: Metrocop
     soundCooldownTime: 0.1
@@ -1481,6 +1502,9 @@
     sprite: Markers/jobs.rsi
     state: ertmedicaleva
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: Speech
     speechSounds: Metrocop
     soundCooldownTime: 0.1
@@ -1527,6 +1551,9 @@
     sprite: Markers/jobs.rsi
     state: ertjanitoreva
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: Speech
     speechSounds: Metrocop
     soundCooldownTime: 0.1
@@ -1867,6 +1894,10 @@
     sprite: Markers/jobs.rsi
     state: ai
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
+    - FreedomImplant
   - type: GhostRole
     allowMovement: true
     allowSpeech: true
@@ -1905,6 +1936,10 @@
     sprite: Markers/jobs.rsi
     state: ai
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
+    - FreedomImplant
   - type: GhostRole
     allowMovement: true
     allowSpeech: true
@@ -2151,7 +2186,7 @@
   id: RXBZZFlamer
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
-    back: PowerpackFlame
+    back: FirethrowerGun
     shoes: ClothingShoesBootsNedoSpetsnaz
     mask: ClothingMaskGasExplorer
     eyes: ClothingEyesGlassesSecurity
@@ -2163,8 +2198,6 @@
     ears: ClothingHeadsetCentComCCMTFSR6
     belt: ClothingBeltMilitaryWebbingFlamer
     pocket1: WeaponLaserGun
-  inhand:
-    - WeaponflamethrowerSG
 
 - type: startingGear
   id: RXBZZLeader
@@ -2197,8 +2230,8 @@
       contents:
         - id: MedkitAdvancedRXBZZ
         - id: WeaponDisabler
-        - id: WeaponRifleG36
-        - id: MagazineRifle
+        - id: WeaponPulseRifleXMLG
+        - id: MagazinePulseRifle
           amount: 4
         - id: WeaponShotgun39
 
@@ -2228,6 +2261,10 @@
     - type: Storage
       grid:
       - 0,0,5,4
+    - type: UserInterface
+      interfaces:
+      - key: enum.StorageUiKey.Key
+        type: StorageBoundUserInterface
     - type: StorageFill
       contents:
         - id: ShellShotgunIncendiary
@@ -2254,6 +2291,8 @@
       contents:
         - id: MedkitAdvancedRXBZZ
         - id: WeaponDisabler
+        - id: FuelTankFirethrower
+          amount: 5
 
 - type: entity
   name:  РХБЗЗ Реагент
@@ -2262,6 +2301,9 @@
   id: MobHumanRXBZZ
   components:
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: GhostRole
     allowMovement: true
     allowSpeech: true
@@ -2303,6 +2345,9 @@
   id: MobHumanRXBZZFlamer
   components:
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: GhostRole
     allowMovement: true
     allowSpeech: true
@@ -2344,6 +2389,9 @@
   id: MobHumanRXBZZLeader
   components:
   - type: GhostTakeoverAvailable
+  - type: AutoImplant
+    implants:
+    - MindShieldImplant
   - type: GhostRole
     allowMovement: true
     allowSpeech: true

diff --git a/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml b/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml
@@ -1,5 +1,4 @@
 # Empty mags
-
 - type: entity
   id: BasePowerpackRifle
   name: "powerpack (5.56)"
@@ -721,6 +720,8 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    size: NormalLarge
   - type: GunWieldBonus
     minAngle: -23
     maxAngle: -43
@@ -1824,8 +1825,9 @@
     soundEmpty:
       path: /Audio/Weapons/Guns64/Rifles/m41a_empty.ogg
   - type: MagazineAmmoProvider
-  - type: ChamberMagazineAmmoProvider
     autoEject: true
+    soundAutoEject: /Audio/Backmen/Misc/empty_alarm.ogg
+  - type: ChamberMagazineAmmoProvider
     boltClosed: null
   - type: ItemSlots
     slots:
@@ -2696,7 +2698,7 @@
 
 - type: entity
   id: MagazineHeavyMachineGunDrum
-  name: Drum magazine (.35 винтовочный)
+  name: Drum magazine (.25 caseless)
   parent: BaseItem
   components:
   - type: Tag
@@ -2708,7 +2710,7 @@
     whitelist:
       tags:
         - CartridgeCaselessRifle
-    capacity: 250
+    capacity: 200
   - type: Item
     size: Huge
   - type: ContainerContainer
@@ -2988,6 +2990,35 @@
   - type: UseDelay
     delay: 1.5
   - type: GunRequiresWield
+  - type: SolutionContainerManager
+    solutions:
+      spray:
+        maxVol: 100
+        reagents:
+        - ReagentId: Water
+          Quantity: 100
+  - type: SolutionRegeneration
+    solution: spray
+    generated:
+      reagents:
+      - ReagentId: Water
+        Quantity: 10
+  - type: RefillableSolution
+    solution: spray
+  - type: DrainableSolution
+    solution: spray
+  - type: SolutionTransfer
+  - type: ItemCooldown
+  - type: Spray
+    transferAmount: 10
+    spraySound:
+      path: /Audio/Effects/extinguish.ogg
+    sprayedPrototype: ExtinguisherSpray
+    vaporAmount: 3
+    vaporSpread: 30
+    sprayVelocity: 2.0
+  - type: FireExtinguisher
+    hasSafety: true
 
 - type: entity
   id: PowerpackFlame