From 5998f6e978c0c888f2e228359d00cc890c584702 Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Sat, 23 Apr 2022 22:27:02 -0400 Subject: [PATCH] Rebalanced uplink explosives (#7478) --- Resources/Audio/Effects/license.txt | 4 +++- Resources/Audio/Effects/minibombcountdown.ogg | Bin 0 -> 19601 bytes Resources/Prototypes/Catalog/uplink_catalog.yml | 4 ++-- .../Objects/Weapons/Throwable/grenades.yml | 15 +++++++-------- 4 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 Resources/Audio/Effects/minibombcountdown.ogg diff --git a/Resources/Audio/Effects/license.txt b/Resources/Audio/Effects/license.txt index b91972d6cf..5f63492667 100644 --- a/Resources/Audio/Effects/license.txt +++ b/Resources/Audio/Effects/license.txt @@ -22,4 +22,6 @@ smoke.ogg taken from https://github.com/tgstation/tgstation/blob/a5d362ce84e4f0c voteding.ogg taken from "Bike, Bell Ding, Single, 01-01.wav" by InspectorJ (www.jshaw.co.uk) of Freesound.org at https://freesound.org/people/InspectorJ/sounds/484344/ under CC BY 3.0. The volume has been reduced. -bite.ogg take from https://github.com/tgstation/tgstation/commit/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0 \ No newline at end of file +minibombcountdown.ogg taken from Thomas Evdokimoff at https://freesound.org/people/thomas_evdokimoff/sounds/202193/ + +bite.ogg take from https://github.com/tgstation/tgstation/commit/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0 diff --git a/Resources/Audio/Effects/minibombcountdown.ogg b/Resources/Audio/Effects/minibombcountdown.ogg new file mode 100644 index 0000000000000000000000000000000000000000..465d17b7e15c0d84eac885a3446866abc6118b02 GIT binary patch literal 19601 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 literal 0 HcmV?d00001 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index d81eeafdba..60b4465eb5 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -76,13 +76,13 @@ id: UplinkExplosiveGrenadeFlash category: Explosives itemId: GrenadeFlashBang - price: 4 + price: 2 - type: uplinkListing id: UplinkSyndieMiniBomb category: Explosives itemId: SyndieMiniBomb - price: 6 + price: 7 - type: uplinkListing id: UplinkGrenadePenguin diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index ae8dc93588..7d667afd0c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -22,6 +22,7 @@ maxIntensity: 10 intensitySlope: 3 totalIntensity: 120 # about a ~4 tile radius + canCreateVacuum: false - type: ExplodeOnTrigger - type: Damageable damageContainer: Inorganic @@ -80,7 +81,7 @@ - type: entity name: Syndicate minibomb - description: Creates a small but powerful explosion that is strong enough to break through walls. + description: A precision sabotage explosive for quickly destroying a machine, dead body, or whatever else needs to go. parent: BaseItem id: SyndieMiniBomb components: @@ -92,14 +93,12 @@ - type: Item size: 5 - type: OnUseTimerTrigger - delay: 5 + delay: 10 - type: Explosive explosionType: Default - # About a 2.5 tile radius. If placed next to walls, will destroy a line of 3-normal walls and turn 3 reinforced walls into girders. - totalIntensity: 492 - intensitySlope: 20.5 - maxIntensity: 41 - canCreateVacuum: false # for destroying walls, not spacing the hallway + totalIntensity: 200 + intensitySlope: 30 #Will destroy the tile under it reliably, space 1-2 more to rods. Only does any significant damage in a 5-tile cross. + maxIntensity: 60 - type: ExplodeOnTrigger - type: Damageable damageContainer: Inorganic @@ -115,7 +114,7 @@ visuals: - type: TimerTriggerVisualizer countdown_sound: - path: /Audio/Effects/countdown.ogg + path: /Audio/Effects/minibombcountdown.ogg - type: entity name: the nuclear option description: Please don't throw it, think of the children.