From 516816eace22c78aa426bf464fa5215d2e452f30 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Fri, 7 Feb 2025 02:07:26 +0300 Subject: [PATCH] Buff the Combat Bakery Kit uplink item (#34927) * Buff the Combat Bakery Kit uplink item * whitespace (cherry picked from commit ed01ad772d59cf748b981c047df5ee7e2c7145fe) --- Resources/Prototypes/Catalog/uplink_catalog.yml | 6 +++--- .../Prototypes/Entities/Objects/Weapons/Melee/baguette.yml | 1 + .../Entities/Objects/Weapons/Throwable/croissant.yml | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index f1b7e677b3..b063f5a2ac 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -2376,11 +2376,11 @@ description: uplink-combat-bakery-desc icon: { sprite: Objects/Consumable/Food/Baked/bread.rsi, state: baguette} productEntity: CombatBakeryKit - discountCategory: rareDiscounts + discountCategory: usualDiscounts discountDownTo: - Telecrystal: 1 # WD EDIT + Telecrystal: 1 # WD EDIT: 2 -> 1 cost: - Telecrystal: 3 # WD EDIT + Telecrystal: 3 # WD EDIT: 4 -> 3 categories: - UplinkJob conditions: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml index 376f6642e9..6b31cb1cdc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml @@ -4,6 +4,7 @@ suffix: Weapon components: - type: MeleeWeapon + attackRate: 1.4 wideAnimationRotation: -120 damage: types: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml index f5cfd35b1d..fa0d4b7672 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml @@ -17,7 +17,10 @@ sound: /Audio/Weapons/star_hit.ogg - type: LandAtCursor - type: DamageOtherOnHit + ignoreResistances: true damage: types: Slash: 5 Piercing: 10 + - type: ThrowingAngle + angularVelocity: true # spins