From 894f1c195e99cc894b1ff2e9851c778b053dbc5a Mon Sep 17 00:00:00 2001 From: FaDeOkno Date: Thu, 2 Jan 2025 20:10:35 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D1=91=D1=80=D1=84=D1=8B=20=D1=81=D0=BD?= =?UTF-8?q?=D0=B0=D1=80=D1=8F=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=88=D0=B0?= =?UTF-8?q?=D1=85=D1=82=D1=91=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Objects/Weapons/Melee/crushers.yml | 8 ++++---- .../Entities/Objects/Weapons/Guns/Basic/base_pka.yml | 1 + .../Prototypes/Entities/Objects/Weapons/Melee/mining.yml | 2 +- .../Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/crushers.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/crushers.yml index 7813b518be3..e9fdecb60ed 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/crushers.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/crushers.yml @@ -139,7 +139,7 @@ wideAnimationRotation: -135 damage: types: - Slash: 20 + Slash: 15 soundHit: collection: MetalThud angle: 0 @@ -154,7 +154,7 @@ - type: BackstabDamageMultipilier bonusDamage: types: - Slash: 40 + Slash: 20 - type: GunRequiresWield - type: Wieldable - type: Item @@ -176,7 +176,7 @@ attackRate: 1.5 damage: types: - Slash: 25 + Slash: 20 soundHit: collection: MetalThud angle: 0 @@ -188,4 +188,4 @@ - type: BackstabDamageMultipilier bonusDamage: types: - Slash: 15 + Slash: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml index 48fa3df524f..c4eba109385 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml @@ -74,4 +74,5 @@ soundHit: collection: GenericHit - type: AltFireMelee #ADT_Tweak + attackType: Heavy diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index b2a2018b6a8..672835b23e5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -123,7 +123,7 @@ fireRate: 1 useKey: false - type: RechargeBasicEntityAmmo - rechargeCooldown: 2 # ADT tweak 0.5 -> 2 + rechargeCooldown: 1 # ADT tweak 0.5 -> 1 rechargeSound: path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg - type: BasicEntityAmmoProvider diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index c4574f26d40..5fcefc9bd9a 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -3,6 +3,7 @@ name: job-name-salvagespec description: job-description-salvagespec playTimeTracker: JobSalvageSpecialist + canBeAntag: false requirements: - !type:DepartmentTimeRequirement department: Cargo