diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 85b1585c1f..70800e498c 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -23,6 +23,9 @@ uplink-esword-double-desc = A much more expensive counter part to the normal ene uplink-hypereutactic-blade-name = Hypereutactic Blade uplink-hypereutactic-blade-desc = A gigantic energy sword with power that matches its looks. Requires two hands. Slow and unwieldy, yet pretty adept at reflecting. Previously made infamous by an operative wearing a joy mask. You wouldn't want to see this coming at you down the hall! +uplink-hypereutatic-blade-name = Hypereutatic Blade +uplink-hypereutatic-blade-desc = A gigantic off-brand energy sword. Requires two hands. Slow and unwieldy, can reflect decently. Often mistaken for the Hypereutactic Blade. + uplink-edagger-name = Energy Dagger uplink-edagger-desc = A small energy blade conveniently disguised in the form of a pen. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 2095edabff..653a17e5f8 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -66,6 +66,52 @@ categories: - UplinkWeaponry +- type: listing + id: UplinkHyperEutacticBlade + name: uplink-hypereutactic-blade-name + description: uplink-hypereutactic-blade-desc + icon: { sprite: /Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi, state: icon } + discountCategory: veryRareDiscounts + discountDownTo: + Telecrystal: 15 + productEntity: HyperEutacticBlade + cost: + Telecrystal: 18 + categories: + - UplinkWeaponry + conditions: + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkHyperEutaticBlade + name: uplink-hypereutatic-blade-name + description: uplink-hypereutatic-blade-desc + icon: { sprite: /Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi, state: icon } + discountCategory: veryRareDiscounts + discountDownTo: + Telecrystal: 13 + productEntity: HyperEutaticBlade + cost: + Telecrystal: 16 + categories: + - UplinkWeaponry + conditions: + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - type: listing id: UplinkEnergyDagger name: uplink-edagger-name diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index f879e2891e..21554eba07 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -296,11 +296,12 @@ Slash: 12 Heat: 12 Structural: 15 - - type: ItemToggleActiveSound - activeSound: - path: /Audio/Weapons/ebladehum.ogg - params: - volume: 3 + # Disabled until the wield active sfx no longer stacks + #- type: ItemToggleActiveSound + # activeSound: + # path: /Audio/Weapons/ebladehum.ogg + # params: + # volume: 3 - type: ComponentToggler components: - type: Sharp @@ -386,6 +387,17 @@ reflectProb: 1.0 spread: 75 +# Nukie variant, reduced reflection rate. +- type: entity + parent: HyperEutacticBlade + id: HyperEutaticBlade + name: hypereutatic-blade + description: Often mistaken for the Hypereutactic Blade. This mass produced, off-brand, knockoff gets the same job done but with less reflection. + components: + - type: Reflect + reflectProb: 0.75 + spread: 75 + # Borgs - type: entity suffix: One-Handed, For Borgs