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 0000000000..465d17b7e1 Binary files /dev/null and b/Resources/Audio/Effects/minibombcountdown.ogg differ 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.