diff --git a/Resources/Audio/Effects/minibombcountdown.ogg b/Resources/Audio/Effects/minibombcountdown.ogg index 465d17b7e1..f026b7db01 100644 Binary files a/Resources/Audio/Effects/minibombcountdown.ogg and b/Resources/Audio/Effects/minibombcountdown.ogg differ diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml index fbb6d751e8..9c577b2128 100644 --- a/Resources/Audio/Items/attributions.yml +++ b/Resources/Audio/Items/attributions.yml @@ -47,3 +47,8 @@ license: "CC0-1.0" copyright: "Created by HighTechPuddle" source: "https://github.com/HighTechPuddle/space-station-14" + +- files: ["minibombcountdown.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from /tg/station, edited by Flareguy for Space Station 14" + source: "https://github.com/tgstation/tgstation/blob/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae/sound/weapons/armbomb.ogg" diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 92ae279bce..d908a116cd 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -28,16 +28,16 @@ uplink-gloves-north-star-desc = A pair of gloves that reduce your punching coold # Explosives uplink-explosive-grenade-name = Explosive Grenade -uplink-explosive-grenade-desc = Grenade that creates a small but devastating explosion. +uplink-explosive-grenade-desc = A simplistic grenade with a ten-second fuse that is geared towards injuring personnel. Causes minimal hull damage. uplink-flash-grenade-name = Flashbang -uplink-flash-grenade-desc = Eeeeeeeeeeeeeeeeeeeeee +uplink-flash-grenade-desc = A standard-issue flashbang, capable of blinding and slowing down anyone without proper protection. This, of course, includes you; make sure you're properly equipped before using it. uplink-mini-bomb-name = Minibomb -uplink-mini-bomb-desc = A precision sabotage explosive for quickly destroying a machine, dead body, or whatever else needs to go. +uplink-mini-bomb-desc = A low-yield, high-impact precision sabotage explosive with a five-second long fuse. Perfect for quickly destroying a machine, dead body, or whatever else needs to go. uplink-penguin-grenade-name = Grenade Penguin -uplink-penguin-grenade-desc = A small penguin with a grenade strapped around its neck. Harvested by the Syndicate from icy shit-hole planets. +uplink-penguin-grenade-desc = A small, highly-aggressive penguin with a grenade strapped around its neck. Harvested by the Syndicate from icy shit-hole planets. uplink-c4-name = C-4 uplink-c4-desc = Use it to breach walls, airlocks or sabotage equipment. It can be attached to almost all objects and has a modifiable timer with a minimum setting of 10 seconds. @@ -45,8 +45,8 @@ uplink-c4-desc = Use it to breach walls, airlocks or sabotage equipment. It can uplink-c4-bundle-name = C-4 bundle uplink-c4-bundle-desc = Because sometimes quantity is quality. Contains 8 C-4 plastic explosives. -uplink-emp-grenade-name = Emp Grenade -uplink-emp-grenade-desc = Releases electromagnetic pulses that disrupt or damage many electronic devices or drain power cells. +uplink-emp-grenade-name = EMP Grenade +uplink-emp-grenade-desc = A grenade designed to disrupt electronic systems. Useful for disrupting communications, security's energy weapons, and APCs when you're in a tight spot." uplink-exploding-pen-name = Exploding pen uplink-exploding-pen-desc = A class IV explosive device contained within a standard pen. Comes with a 4 second fuse. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index cf391fc60a..f255d1bb68 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -124,7 +124,7 @@ description: uplink-mini-bomb-desc productEntity: SyndieMiniBomb cost: - Telecrystal: 6 + Telecrystal: 6 categories: - UplinkExplosives diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 54bc1dbf41..3ac9074e36 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -1,4 +1,3 @@ -# TODO probably needs a base grenade - type: entity abstract: true parent: BaseItem @@ -88,16 +87,18 @@ - type: TimedDespawn lifetime: 0.5 +#The explosive values for these are pretty god damn mediocre, but SS14's explosion system is hard to understand - this is a good enough approximation of how it was in SS13. +#Ideally, there should be a weak radius around the bomb outside of its gibbing / spacing range capable of dealing fair damage to players / structures. - type: entity name: syndicate minibomb - description: A precision sabotage explosive for quickly destroying a machine, dead body, or whatever else needs to go. + description: A syndicate-manufactured explosive used to stow destruction and cause chaos. parent: GrenadeBase id: SyndieMiniBomb components: - type: Sprite sprite: Objects/Weapons/Grenades/syndgrenade.rsi - type: OnUseTimerTrigger - delay: 10 + delay: 5 - type: ExplodeOnTrigger - type: Explosive explosionType: Minibomb @@ -108,6 +109,8 @@ - type: TimerTriggerVisuals primingSound: path: /Audio/Effects/minibombcountdown.ogg + params: + volume: 8 - type: entity name: the nuclear option @@ -184,8 +187,8 @@ price: 25 - type: entity - name: emp grenade - description: Releases electromagnetic pulses that disrupt or damage many electronic devices or drain power cells. + name: EMP grenade + description: A grenade designed to wreak havoc on electronic systems. parent: GrenadeBase id: EmpGrenade components: