Твики всего и вся

Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml

@@ -9,6 +9,7 @@
     GrenadeStinger: 4
     Flash: 5
     Tourniquet: 5
+    Bola: 5
     FlashlightSeclite: 5
     ClothingEyesGlassesSunglasses: 2
     ClothingEyesHudSecurity: 2

Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml

@@ -155,7 +155,7 @@
       components:
       - Hands # prevent mouse buying grenade penguin since its not telepathic
   - type: Store
-    preset: StorePresetUplink
+    preset: StorePresetUplinkNoDiscounts
     balance:
       Telecrystal: 0
   - type: UserInterface

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml

@@ -15,7 +15,8 @@
   - type: CanPenetrate
     penetrationLayer: MobLayer
   - type: StaminaDamageOnCollide
-    damage: 55
+    ignoreResistances: false
+    damage: 70
   - type: TimedDespawn
     lifetime: 0.25
 

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml

@@ -31,6 +31,7 @@
       types:
         Blunt: 3
   - type: StaminaDamageOnCollide
+    ignoreResistances: false
     damage: 35 # 3 hits to stun cuz revolver
 
 - type: entity

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

@@ -26,7 +26,8 @@
       types:
         Blunt: 10
   - type: StaminaDamageOnCollide
-    damage: 40 # 3 hits to stun
+    ignoreResistances: false
+    damage: 70
 
 - type: entity
   id: PelletShotgun

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -121,6 +121,7 @@
     soundHit:
       path: /Audio/Weapons/Guns/Hits/snap.ogg
   - type: StaminaDamageOnCollide
+    ignoreResistances: false
     damage: 22 # 5 hits to stun sounds reasonable
 
 - type: entity
@@ -1350,7 +1351,8 @@
           bounds: "-0.15,-0.3,0.15,0.3"
         hard: false
         mask:
-        - Opaque
+        - Impassable
+        - BulletImpassable
       fly-by: *flybyfixture
   - type: Ammo
     muzzleFlash: null

Resources/Prototypes/Store/presets.yml

@@ -24,6 +24,24 @@
     maxItems: 10
     salesCategory: UplinkSales
 
+- type: storePreset
+  id: StorePresetUplinkNoDiscounts
+  storeName: Uplink
+  categories:
+  - UplinkWeapons
+  - UplinkAmmo
+  - UplinkExplosives
+  - UplinkMisc
+  - UplinkBundles
+  - UplinkTools
+  - UplinkUtility
+  - UplinkImplants
+  - UplinkJob
+  - UplinkArmor
+  - UplinkPointless
+  currencyWhitelist:
+  - Telecrystal
+
 - type: storePreset
   id: StorePresetChangeling
   storeName: Evolution Shop

Resources/Prototypes/White/Entities/Clothing/Head/chaplain_helmets.yml

@@ -11,8 +11,8 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.8
-        Slash: 0.8
+        Blunt: 0.85
+        Slash: 0.85
         Piercing: 0.95
   - type: Tag
     tags:

Resources/Prototypes/White/Entities/Clothing/OuterClothing/chaplain_armor.yml

@@ -11,8 +11,8 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.4
-        Slash: 0.4
+        Blunt: 0.5
+        Slash: 0.5
         Piercing: 0.9
         Heat: 0.5
   - type: ClothingSpeedModifier