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

diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml
index 716d9ef316e29aea17148d19db3ee04b0a2f3034..53cbc4748c02ccca7b78df18f5b23cd94c94e86a 100644 (file)
--- 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 (file)
index 0000000..0f1dd35
Binary files /dev/null and b/Resources/Audio/Machines/timer.ogg differ

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index e9fc5cdb402fbb7900c79725700171e572afd6bd..80c6acd16e94a58dfcd3980cb3520cdd12b80116 100644 (file)
--- 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 1e1007e86055657897b168441ff97a70cd728d94..cd4469ddeebcda6895f69b140749e8b1937bd08d 100644 (file)
--- 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 67f74a11850af315f319ff87d3741373f4410169..187b9dc40db7a91b3686a97486bb35f936be4fdf 100644 (file)
--- 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