diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 29517ad10e..3f3221d14b 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -2136,8 +2136,11 @@ description: uplink-combat-bakery-desc icon: { sprite: Objects/Consumable/Food/Baked/bread.rsi, state: baguette} productEntity: CombatBakeryKit + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 2 cost: - Telecrystal: 6 + Telecrystal: 4 categories: - UplinkJob conditions: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml index 25830216ff..125184d1dc 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