From 7d02c4af0fd751928385cf4f1954f5658a234a2f Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Wed, 13 Sep 2023 19:26:58 -0500 Subject: [PATCH] Miscellaneous syndicate bomb tweaks & fixes (#20068) * syndicate bomb tweaks & ss13 parity * 100s * 90s timer * fuck. my furniture * timer back to 120s, no more wire mirroring --- Resources/Audio/Machines/attributions.yml | 5 +++++ Resources/Audio/Machines/timer.ogg | Bin 0 -> 4920 bytes Resources/Locale/en-US/store/uplink-catalog.ftl | 4 ++-- Resources/Prototypes/Catalog/uplink_catalog.yml | 4 ++-- .../Entities/Structures/Machines/bombs.yml | 10 ++++++---- 5 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 Resources/Audio/Machines/timer.ogg diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml index 716d9ef316..53cbc4748c 100644 --- a/Resources/Audio/Machines/attributions.yml +++ b/Resources/Audio/Machines/attributions.yml @@ -37,3 +37,8 @@ license: "CC0-1.0" copyright: "Modified from https://freesound.org/people/Pagey1969/sounds/566048/" source: "https://github.com/space-wizards/ss14-raw-assets/tree/99fcffb02d9953f031991fc8f9980f0c3abd3803/Audio" + +- files: ["timer.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from /tg/station" + source: "https://github.com/tgstation/tgstation/blob/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0/sound/items/timer.ogg" \ No newline at end of file diff --git a/Resources/Audio/Machines/timer.ogg b/Resources/Audio/Machines/timer.ogg new file mode 100644 index 0000000000000000000000000000000000000000..0f1dd353243755ad3c7190fced2b984043c85e39 GIT binary patch literal 4920 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 IckAi>8~*|Pvj6}9 literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index e9fc5cdb40..80c6acd16e 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -55,13 +55,13 @@ uplink-grenadier-rig-name = grenadier chest rig uplink-grenadier-rig-desc = All you need for a loud party: 4 explosive grenades, 2 EMP grenades and 2 minibombs in a chest rig. 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-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. uplink-exploding-syndicate-bomb-name = Syndicate Bomb -uplink-exploding-syndicate-bomb-desc = A reliable bomb that can put a big hole in the station. Useful as a distraction. +uplink-exploding-syndicate-bomb-desc = A big, anchored bomb that can create a huge explosion if not defused in time. Useful as a distraction. Has an adjustable timer with a minimum setting of 120 seconds. # Ammo uplink-pistol-magazine-name = Pistol Magazine (.35 auto) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 1e1007e860..cd4469ddee 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -241,8 +241,8 @@ - type: listing id: UplinkSyndicateBomb - name: uplink-syndicate-bomb-name - description: uplink-syndicate-bomb-desc + name: uplink-exploding-syndicate-bomb-name + description: uplink-exploding-syndicate-bomb-desc productEntity: SyndicateBomb cost: Telecrystal: 11 diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml index 67f74a1185..187b9dc40d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml @@ -22,11 +22,13 @@ intensitySlope: 5 maxIntensity: 4 - type: ExplodeOnTrigger + # If you nerf the syndicate bomb in any major way, this should probably drop down to at least 100s (not 90s to compensate for slower movement speed & less lag in SS14) + # Unless, of course, you want the 90 seconds regardless. I can't stop you. - type: OnUseTimerTrigger - delay: 90 - delayOptions: [90, 120, 150, 180, 210, 240, 270, 300] + delay: 120 + delayOptions: [120, 150, 180, 210, 240, 270, 300] initialBeepDelay: 0 - beepSound: /Audio/Machines/Nuke/general_beep.ogg + beepSound: /Audio/Machines/timer.ogg - type: Anchorable delay: 5 - type: Physics @@ -57,7 +59,7 @@ description: A bomb for dummies, manual not included. components: - type: Wires - LayoutId: TrainingDefusable + LayoutId: Defusable alwaysRandomize: true - type: Sprite sprite: Structures/Machines/bomb.rsi -- 2.51.2