Workbench-Team · MilenVolf · Jul 8, 2024 · Jul 5, 2024 · Jul 6, 2024 · Jul 6, 2024
diff --git a/Content.Shared/Starshine/Eye/NightVision/Components/NightVisionComponent.cs b/Content.Shared/Starshine/Eye/NightVision/Components/NightVisionComponent.cs
@@ -29,7 +29,7 @@ public sealed partial class NightVisionComponent : Component
 
     [DataField("playSoundOn")]
     public bool PlaySoundOn = true;
-    public SoundSpecifier OnOffSound = new SoundPathSpecifier("/Audio/Backmen/Misc/night-vision-sound-effect_E_minor.ogg");
+    public SoundSpecifier OnOffSound = new SoundPathSpecifier("/Audio/Starshine/Misc/night_vision.ogg");
 }
 
 public sealed partial class NVInstantActionEvent : InstantActionEvent { }
diff --git a/Resources/Audio/Starshine/Misc/night_vision.ogg b/Resources/Audio/Starshine/Misc/night_vision.ogg
diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl
@@ -82,8 +82,11 @@ research-technology-advanced-magazines = Продвинутые магазины
 research-technology-incendiary-ammunition = Зажигательные боеприпасы
 research-technology-spec-ammunition = Специализированные боеприпасы
 research-technology-salvage-weapons-adv = Продвинутое оружие утилизаторов
+research-technology-large-caliber = Большой калибр
 
 research-technology-clarke-aplu = КШГ Кларк
 research-technology-Odyssey = ГМС Одиссей
 research-technology-gygax = АБНТ Гайгэкс
 research-technology-durand = БМП Дюранд
+
+research-technology-nvd = Прибор ночного виденья
diff --git a/...ces/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl b/...ces/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl
@@ -18,6 +18,3 @@ ent-WeaponRevolverPythonAP = { ent-WeaponRevolverPython }
 ent-WeaponRevolverPirate = пиратский револьвер
     .desc = Странный, старый на вид револьвер, который использовали пираты. Использует патроны калибра .45 магнум.
     .suffix = Револьвер
-ent-WeaponRevolverRsh18 = РШ18
-    .desc = Редкий, изготавливаемый на заказ револьвер. Выдавался ограниченной партией офицерам синего щита. Использует патроны калибра 12.7 безгильзовые.
-    .suffix = Револьвер
diff --git a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/clothing/eyes/nvd.ftl b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/clothing/eyes/nvd.ftl
@@ -0,0 +1,2 @@
+ent-ClothingEyesVision = ПНВ
+    .desc = Прибор ночного видения. Обеспечивает изображение местности в условиях низкой освещенности.
diff --git a/.../starshine/ss14-ru/entities/objects/weapons/guns/ammunition/speedloaders/antimaterial.ftl b/.../starshine/ss14-ru/entities/objects/weapons/guns/ammunition/speedloaders/antimaterial.ftl
@@ -0,0 +1,2 @@
+ent-SpeedLoaderAntiMaterial = спидлоадер (.60 антиматериальные)
+    .desc = { ent-BaseItem.desc }
diff --git a/...rces/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/guns/revolvers/revolvers.ftl b/...rces/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/guns/revolvers/revolvers.ftl
@@ -0,0 +1,6 @@
+ent-WeaponRevolverRsh18 = РШ18
+    .desc = Редкий, изготавливаемый на заказ револьвер. Выдавался ограниченной партией офицерам синего щита. Использует патроны калибра 12.7 безгильзовые.
+    .suffix = Револьвер
+ent-WeaponRevolverSuppressor = Подавитель
+    .desc = Сверх тяжёлый револьвер для самых упитанных целей.
+    .suffix = Револьвер
diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl
@@ -321,3 +321,5 @@ uplink-gygax-syndie-name = АБМС «Гайгэкс»
 uplink-gygax-desc = Перекрашенный синдикатом АБМНТ «Гайгэкс», потрёпан и сильно изношен, но все еще функционирует в штатном режиме. Прямо как с последней корпоротивной войны. 
 uplink-mauler-name = АБМС «Маулер» 
 uplink-mauler-desc = Перекрашенный синдикатом мародёр, был изрядно изменен, но все тот же старый добрый мародёр. 
+uplink-clothing-pnv-name = ПНВ
+uplink-clothing-pnv-desc = Прибор ночного виденья
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -173,19 +173,13 @@
   parent: WeaponcaseSyndie
   id: ClothingBackpackDuffelSyndicateFilledCarbine
   name: M-90gl bundle
-  description: "A versatile battle rifle with an attached grenade launcher, bundled with 3 magazines and 6 grenades of various capabilities."
+  description: "A versatile battle rifle with an attached grenade launcher (The grenade launcher is not real, it is a dummy)."
   components:
   - type: StorageFill
     contents:
       - id: WeaponRifleM90GrenadeLauncher
       - id: MagazineRifle
         amount: 2
-      - id: GrenadeBlast
-        amount: 2
-      - id: GrenadeFlash
-        amount: 2
-      - id: GrenadeFrag
-        amount: 2
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateAmmo
@@ -201,6 +195,8 @@
         amount: 4
       - id: MagazineLightRifleBox
         amount: 2
+      - id: MagazineRifle
+        amount: 4
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateAmmo

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -11,7 +11,10 @@
       - id: ClothingBeltUtilityFilled
       - id: SurvivalKnife
       - id: HandheldGPSBasic
+      - id: ClothingBeltMinerWebbing
+      - id: ClothingBeltSalvageWebbing
       - id: RadioHandheld
+      - id: ClothingOuterArmorMiner
       - id: SeismicCharge
         amount: 2
       - id: OreBag
@@ -35,7 +38,10 @@
       - id: ClothingBeltUtilityFilled
       - id: SurvivalKnife
       - id: HandheldGPSBasic
+      - id: ClothingBeltMinerWebbing
+      - id: ClothingBeltSalvageWebbing
       - id: RadioHandheld
+      - id: ClothingOuterArmorMiner
       - id: SeismicCharge
         amount: 2
       - id: OreBag

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1388,7 +1388,7 @@
   description: uplink-clothing-outer-vest-web-desc
   productEntity: ClothingOuterVestWeb
   cost:
-    Telecrystal: 3
+    Telecrystal: 6
   categories:
   - UplinkWearables
 
@@ -1472,6 +1472,16 @@
         tags:
           - NukeOpsUplink
 
+- type: listing
+  id: UplinkClothingEyesVision
+  name: uplink-clothing-pnv-name
+  description: uplink-clothing-pnv-desc
+  productEntity: ClothingEyesVision
+  cost:
+    Telecrystal: 6
+  categories:
+    - UplinkWearables
+
 - type: listing
   id: UplinkClothingConductingGloves
   name: uplink-clothing-conducting-gloves-name
@@ -1895,7 +1905,7 @@
   icon: { sprite: /Textures/Objects/Weapons/Guns/Rifles/kr51.rsi, state: icon }
   productEntity: ClothingBackpackDuffelSyndicateFilledRifle
   cost:
-    Telecrystal: 25
+    Telecrystal: 20
   categories:
   - UplinkWeaponry
 
@@ -1940,13 +1950,26 @@
   description: uplink-syndie-miner-armor-desc
   productEntity: ClothingOuterArmorMinerSyndie
   cost:
-    Telecrystal: 6
+    Telecrystal: 3
   categories:
   - UplinkJob
   conditions:
   - !type:BuyerJobCondition
     whitelist:
-    - Miner
+    - SalvageSpecialist
+
+- type: listing
+  id: UplinkM90GLBundle
+  name: uplink-m90gl-bundle-name
+  description: uplink-m90gl-bundle-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Rifles/carbine.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledCarbine
+  cost:
+    Telecrystal: 17
+  categories:
+  - UplinkWeaponry
+
+
 
 #- type: listing
 #  id: UplinkSyndicateMauler

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -219,6 +219,7 @@
         Heat: 0.9
         Radiation: 0.85
         Caustic: 0.85
+        Stun: 0.9
   - type: PressureProtection
     highPressureMultiplier: 0.6
     lowPressureMultiplier: 1000

diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -59,6 +59,7 @@
         Heat: 0.80
         Radiation: 0.80
         Caustic: 0.95
+        Stun: 0.95
   - type: ExplosionResistance
     damageCoefficient: 0.75
 
@@ -93,6 +94,7 @@
         Blunt: 0.8
         Slash: 0.8
         Piercing: 0.95
+        Stun: 0.95
 
 #Bombsuit Helmet
 - type: entity

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -19,6 +19,7 @@
         Slash: 0.70
         Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
         Heat: 0.80
+        Stun: 0.9
   - type: ExplosionResistance
     damageCoefficient: 0.90
 
@@ -52,6 +53,7 @@
        Slash: 0.70
        Piercing: 0.60
        Heat: 0.80
+       Stun: 0.85
   - type: ExplosionResistance
     damageCoefficient: 0.80
 
@@ -73,6 +75,7 @@
         Piercing: 0.7
         Heat: 0.9
         Caustic: 0.9
+        Stun: 0.5
   - type: ExplosionResistance
     damageCoefficient: 0.9
   - type: GroupExamine
@@ -405,6 +408,7 @@
         Piercing: 0.5
         Heat: 0.9
         Radiation: 0.8
+        Stun: 0.5
   - type: ClothingSpeedModifier
     walkModifier: 0.7
     sprintModifier: 0.65

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -218,6 +218,7 @@
         Piercing: 0.6
         Heat: 0.75
         Caustic: 0.7
+        Stun: 0.8
   - type: ClothingSpeedModifier
     walkModifier: 0.75
     sprintModifier: 0.75
@@ -307,6 +308,7 @@
         Piercing: 0.6
         Heat: 0.7
         Caustic: 0.7
+        Stun: 0.8
   - type: ClothingSpeedModifier
     walkModifier: 0.7
     sprintModifier: 0.7
@@ -520,6 +522,7 @@
         Heat: 0.6
         Radiation: 0.5
         Caustic: 0.6
+        Stun: 0.7
   - type: ClothingSpeedModifier
     walkModifier: 0.8
     sprintModifier: 0.8

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2279,6 +2279,10 @@
       groups:
         Brute: -0.07
         Burn: -0.07
+  - type: NightVision
+    isToggle: true
+    color: "#991111"
+    playSoundOn: false
 
 - type: entity
   name: tarantula
@@ -2348,6 +2352,10 @@
     - type: Bloodstream
       bloodMaxVolume: 150
       bloodReagent: Laughter
+    - type: NightVision
+      isToggle: true
+      color: "#000099"
+      playSoundOn: false
 
 - type: entity
   name: wizard spider

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -120,6 +120,10 @@
   - type: Grammar
     attributes:
       gender: male
+  - type: NightVision
+    isToggle: true
+    color: "#990000"
+    playSoundOn: false
 
 - type: entity
   id: MobRatKingBuff

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
@@ -7,7 +7,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 40
+        Piercing: 60
         Structural: 30
   - type: StaminaDamageOnCollide
     damage: 35
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -217,15 +217,17 @@
   - type: StaticPrice
     price: 420
   - type: Gun
+    fireRate: 2.5
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
+    - FullAuto
   - type: Tag
     tags:
     - HeavyWeapon
   - type: HitscanBatteryAmmoProvider
     proto: RedLaser
-    fireCost: 62.5
+    fireCost: 50
 
 - type: entity
   name: practice laser rifle

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -164,23 +164,3 @@
     chambers: [ True, True, True, True, True ]
     ammoSlots: [ null, null, null, null, null ]
 
-- type: entity
-  name: RSH18
-  parent: BaseWeaponRevolver
-  id: WeaponRevolverRsh18
-  description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo.
-  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Revolvers/rsh18.rsi
-  - type: Clothing
-    sprite: Objects/Weapons/Guns/Revolvers/rsh18.rsi
-  - type: RevolverAmmoProvider
-    whitelist:
-      tags:
-        - CartridgeUniversal
-        - SpeedLoaderUniversal
-    proto: CartridgeCaselessUniversalPT1
-  - type: Gun
-    fireRate: 3
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/rsh18.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -23,6 +23,7 @@
     selectedMode: FullAuto
     availableModes:
       - FullAuto
+      - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg
   - type: ChamberMagazineAmmoProvider
@@ -160,6 +161,10 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
   - type: Gun
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+      - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
   - type: ItemSlots