diff --git a/Resources/Locale/en-US/_Harmony/store/uplink-catalog.ftl b/Resources/Locale/en-US/_Harmony/store/uplink-catalog.ftl index 1c5b9aad0ea19..0bcbc232f3aee 100644 --- a/Resources/Locale/en-US/_Harmony/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_Harmony/store/uplink-catalog.ftl @@ -14,6 +14,12 @@ uplink-pizza-bomb-desc = This tech, first pioneered by terrorists, now is used b uplink-pizza-bomb-surplus-name = Surplus Pizza Bomb uplink-pizza--surplus-desc = This shouldn't be visible, report me. +uplink-X4-name = X-4 +uplink-X4-desc = The cousin of the infamous C-4, uses experimental explosives to better pierce through structures. + +uplink-X4-bundle-name = X-4 Bundle +uplink-X4-bundle-desc = A bag containing 4 X-4s, perfect for going all in on sabotage. + # Ammo uplink-blood-red-carbine-ammo-name = Jailbroken Energy Cartridge diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml index 761e6513d4b59..57d5d93d9590e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml @@ -67,9 +67,11 @@ - Timer - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating. explosionType: DemolitionCharge - totalIntensity: 60 + # Harmony Start + totalIntensity: 5 # 60 -> 5 intensitySlope: 5 - maxIntensity: 30 + maxIntensity: 15 # 30 - 15 + # Harmony End canCreateVacuum: false - type: ExplodeOnTrigger - type: HolidayVisuals diff --git a/Resources/Prototypes/_Harmony/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Harmony/Catalog/Fills/Backpacks/duffelbag.yml index 5d4fba69ecc17..170c7f522e44a 100644 --- a/Resources/Prototypes/_Harmony/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/_Harmony/Catalog/Fills/Backpacks/duffelbag.yml @@ -1,3 +1,15 @@ +- type: entity + parent: ClothingBackpackDuffelSyndicateBundle + id: ClothingBackpackDuffelSyndicateX4Bundle + name: syndicate X-4 bundle + suffix: Harmony + description: Contains a lot of X-4 charges. + components: + - type: StorageFill + contents: + - id: X4 + amount: 4 + - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateFilledBloodRedEnergyCarbineHarmony diff --git a/Resources/Prototypes/_Harmony/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Harmony/Catalog/uplink_catalog.yml index c3025c77b0fb3..9c393e5c70c2e 100644 --- a/Resources/Prototypes/_Harmony/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Harmony/Catalog/uplink_catalog.yml @@ -75,7 +75,39 @@ whitelist: components: - SurplusBundle + +- type: listing + id: UplinkX4 + name: uplink-X4-name + description: uplink-X4-desc + productEntity: X4 + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 2 + cost: + Telecrystal: 4 + categories: + - UplinkExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink +- type: listing + id: UplinkX4Bundle + name: uplink-X4-bundle-name + description: uplink-X4-bundle-desc + productEntity: ClothingBackpackDuffelSyndicateX4Bundle + cost: + Telecrystal: 14 + categories: + - UplinkExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink # Ammo diff --git a/Resources/Prototypes/_Harmony/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/_Harmony/Entities/Objects/Weapons/Bombs/plastic.yml new file mode 100644 index 0000000000000..d309b715b42b0 --- /dev/null +++ b/Resources/Prototypes/_Harmony/Entities/Objects/Weapons/Bombs/plastic.yml @@ -0,0 +1,22 @@ +- type: entity + parent: C4 + id: X4 + name: composition X-4 + suffix: Harmony + description: A new prototype of explosive, meant to rival a popular tool for saboteurs, C4. + components: + - type: Sprite + sprite: _Harmony/Objects/Weapons/Bombs/X-4.rsi + state: icon + layers: + - state: icon + map: ["base"] + quickEquip: false + - type: Explosive + explosionType: DemolitionCharge + totalIntensity: 60 + intensitySlope: 5 + maxIntensity: 30 + canCreateVacuum: false + - type: OnUseTimerTrigger + beepSound: /Audio/Machines/Nuke/angry_beep.ogg diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/icon.png b/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/icon.png new file mode 100644 index 0000000000000..e23df0c02b8ae Binary files /dev/null and b/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/icon.png differ diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/inhand-left.png b/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/inhand-left.png new file mode 100644 index 0000000000000..cd90377794f28 Binary files /dev/null and b/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/inhand-right.png b/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/inhand-right.png new file mode 100644 index 0000000000000..e4d4266a42746 Binary files /dev/null and b/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/meta.json b/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/meta.json new file mode 100644 index 0000000000000..a4ceeb8446b19 --- /dev/null +++ b/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/31549/commits/4b457ca39d21d09a1211ed9c7de44681284e3778", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/primed.png b/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/primed.png new file mode 100644 index 0000000000000..5c5d9cf1a69f4 Binary files /dev/null and b/Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi/primed.png differ