diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml index 3d2aabafde1..58fe464bfa3 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml @@ -342,8 +342,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.725 - Slash: 0.725 + Blunt: 0.825 + Slash: 0.825 Piercing: 0.675 Heat: 0.675 diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Specific/Kits/kits.yml b/Resources/Prototypes/Corvax/Entities/Objects/Specific/Kits/kits.yml index 5d9fb82d097..856b09d5191 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Specific/Kits/kits.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Specific/Kits/kits.yml @@ -186,7 +186,7 @@ - id: ClothingBeltRope - id: ThrowingKnife amount: 3 - - id: N14Stimpak + - id: N14SuperStimpak amount: 2 - id: N14MedkitFilled - id: N14FoodTinK diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Melee/longblades.yml index 9065e5387b4..b3f60302f61 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Melee/longblades.yml @@ -17,11 +17,11 @@ - type: DamageOtherOnHit damage: types: - Slash: 35 + Slash: 37 - type: MeleeWeapon damage: types: - Slash: 23 + Slash: 29 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item @@ -73,6 +73,7 @@ variation: 0.125 volume: -5 - type: MeleeWeapon + resistanceBypass: true soundHit: path: "/Audio/Weapons/smash.ogg" params: diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Melee/specific.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Melee/specific.yml index 47db6449eb0..2665d8e8709 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Melee/specific.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Melee/specific.yml @@ -4,6 +4,10 @@ name: whip description: "A painful weapon of oppression." components: + - type: StaminaDamageOnHit + damage: 10 + - type: StaminaDamageOnCollide + damage: 10 - type: Sprite sprite: Corvax/Objects/Weapons/Melee/whip.rsi state: icon @@ -12,4 +16,4 @@ collection: WhipSound damage: types: - Slash: 10 + Slash: 5 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml index be1ed8fb546..ec4eaad2341 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml @@ -184,8 +184,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 + Blunt: 0.85 # Forge-Change + Slash: 0.85 # Forge-Change Piercing: 0.7 Heat: 0.7 priceMultiplier: 0.3 @@ -201,8 +201,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 + Blunt: 0.85 # Forge-Change + Slash: 0.85 # Forge-Change Piercing: 0.7 Heat: 0.7 priceMultiplier: 0 @@ -220,8 +220,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 + Blunt: 0.8 # Forge-Change + Slash: 0.8 # Forge-Change Piercing: 0.65 Heat: 0.65 priceMultiplier: 0.5 @@ -237,8 +237,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 + Blunt: 0.8 # Forge-Change + Slash: 0.8 # Forge-Change Piercing: 0.65 Heat: 0.65 priceMultiplier: 0 @@ -525,8 +525,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 + Blunt: 0.85 # Forge-Change + Slash: 0.85 # Forge-Change Piercing: 0.7 Heat: 0.7 @@ -1791,8 +1791,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 + Blunt: 0.8 # Forge-Change + Slash: 0.8 # Forge-Change Piercing: 0.65 Heat: 0.65 priceMultiplier: 0.5 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index e19f011e3d9..be1c7027285 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -39,6 +39,9 @@ containers: gun_magazine: !type:ContainerSlot - type: Craftable + - type: HeldSpeedModifier # Forge-Change + walkModifier: 0.91 + sprintModifier: 0.91 - type: entity id: N14BaseWeaponPowerCellSmall @@ -75,6 +78,9 @@ quickEquip: false slots: - Belt + - type: HeldSpeedModifier # Forge-Change + walkModifier: 0.91 + sprintModifier: 0.91 # MARK: Pistols - type: entity diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/launcher.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/launcher.yml index 8d17bc2b3b5..495bb54d274 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/launcher.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/launcher.yml @@ -85,6 +85,9 @@ proto: 40mmGrenadeFrag soundInsert: path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + - type: ClothingSpeedModifier # Forge-Change + walkModifier: 0.95 + sprintModifier: 0.95 - type: FollowDistance backStrength: 6 - type: StaticPrice diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml index ac21bbdcd72..60f5fa97ede 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml @@ -50,9 +50,9 @@ whitelist: tags: - N14Cartridge308Rifle - - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 + - type: ClothingSpeedModifier # Forge-Change + walkModifier: 0.80 + sprintModifier: 0.80 - type: HeldSpeedModifier - type: MagazineVisuals magState: mag diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index e146ab3d04f..ff5fba54e8b 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -14,6 +14,9 @@ - type: GunWieldBonus minAngle: -21 maxAngle: -38 + - type: HeldSpeedModifier # Forge-Change + walkModifier: 0.91 + sprintModifier: 0.91 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -413,6 +416,9 @@ - type: GunWieldBonus minAngle: -23 maxAngle: -56 + - type: HeldSpeedModifier + walkModifier: 0.92 + sprintModifier: 0.92 - type: Gun minAngle: 24 maxAngle: 60 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 72d101cdbc0..483cd1c8893 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -14,6 +14,9 @@ - type: StaticPrice price: 100 - type: Craftable + - type: HeldSpeedModifier # Forge-Change + walkModifier: 0.92 + sprintModifier: 0.92 - type: entity name: 10mm SMG diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 006327e9a9f..f9911bf319e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -38,6 +38,9 @@ backStrength: 5 - type: Wieldable - type: Craftable + - type: HeldSpeedModifier # Forge-Change + walkModifier: 0.91 + sprintModifier: 0.91 - type: entity name: shotgun diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 3c0ac241172..953eb4deba7 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -26,6 +26,9 @@ - N14Cartridge308Rifle capacity: 8 proto: N14Cartridge308Rifle + - type: HeldSpeedModifier # Forge-Change + walkModifier: 0.90 + sprintModifier: 0.90 - type: FollowDistance backStrength: 3 - type: StaticPrice