attributions and file adjustments

impstation · Jan 14, 2025 · 9e0fea5 · 9e0fea5
1 parent efb7999
commit 9e0fea5
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 7 deletions.
diff --git a/Content.Server/_EinsteinEngines/Supermatter/Systems/SupermatterSystem.Processing.cs b/Content.Server/_EinsteinEngines/Supermatter/Systems/SupermatterSystem.Processing.cs
@@ -539,7 +539,7 @@ private void HandleStatus(EntityUid uid, SupermatterComponent sm)
                 speech.AudioParams = AudioParams.Default.AddVolume(10f);
 
             if (currentStatus == SupermatterStatusType.Delaminating)
-                speech.SoundCooldownTime = 6.8f; // approximate length of bloblarm.ogg
+                speech.SoundCooldownTime = 5.0f; // to prevent repeat sounds during the 5.. 4.. 3.. 2.. 1.. countdown
             else
                 speech.SoundCooldownTime = 0.0f;
 

diff --git a/Content.Shared/_EinsteinEngines/Supermatter/Components/SupermatterComponent.cs b/Content.Shared/_EinsteinEngines/Supermatter/Components/SupermatterComponent.cs
@@ -67,7 +67,7 @@ public sealed partial class SupermatterComponent : Component
     public SoundSpecifier DustSound = new SoundPathSpecifier("/Audio/_EinsteinEngines/Supermatter/supermatter.ogg");
 
     [DataField]
-    public SoundSpecifier DistortSound = new SoundPathSpecifier("/Audio/_EinsteinEngines/Supermatter/distort.ogg");
+    public SoundSpecifier DistortSound = new SoundPathSpecifier("/Audio/_EinsteinEngines/Supermatter/charge.ogg");
 
     [DataField]
     public SoundSpecifier CalmLoopSound = new SoundPathSpecifier("/Audio/_EinsteinEngines/Supermatter/calm.ogg");

diff --git a/Resources/Audio/_EinsteinEngines/Supermatter/accent/delam/attributions.yml b/Resources/Audio/_EinsteinEngines/Supermatter/accent/delam/attributions.yml
@@ -34,4 +34,4 @@
     - 33.ogg
   copyright: "Created by actioninja for tgstation13"
   license: "CC-BY-SA-3.0"
-  source: "https://github.com/tgstation/tgstation/pull/45462"
+  source: "https://github.com/tgstation/tgstation/pull/87191"
diff --git a/Resources/Audio/_EinsteinEngines/Supermatter/accent/normal/attributions.yml b/Resources/Audio/_EinsteinEngines/Supermatter/accent/normal/attributions.yml
@@ -0,0 +1,37 @@
+- files:
+    - 1.ogg
+    - 2.ogg
+    - 3.ogg
+    - 4.ogg
+    - 5.ogg
+    - 6.ogg
+    - 7.ogg
+    - 8.ogg
+    - 9.ogg
+    - 10.ogg
+    - 11.ogg
+    - 12.ogg
+    - 13.ogg
+    - 14.ogg
+    - 15.ogg
+    - 16.ogg
+    - 17.ogg
+    - 18.ogg
+    - 19.ogg
+    - 20.ogg
+    - 21.ogg
+    - 22.ogg
+    - 23.ogg
+    - 24.ogg
+    - 25.ogg
+    - 26.ogg
+    - 27.ogg
+    - 28.ogg
+    - 29.ogg
+    - 30.ogg
+    - 31.ogg
+    - 32.ogg
+    - 33.ogg
+  copyright: "Created by actioninja for tgstation13"
+  license: "CC-BY-SA-3.0"
+  source: "https://github.com/tgstation/tgstation/pull/87191"
diff --git a/Resources/Audio/_EinsteinEngines/Supermatter/attributions.yml b/Resources/Audio/_EinsteinEngines/Supermatter/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["calm.ogg", "charge.ogg", "delamming.ogg", "emitter2.ogg", "supermatter.ogg"]
+  copyright: "Taken from tgstation"
+  license: "CC-BY-SA-3.0"
+  source: "https://github.com/tgstation/tgstation/pull/87191"
diff --git a/.../_EinsteinEngines/Supermatter/distort.ogg → ...o/_EinsteinEngines/Supermatter/charge.ogg b/.../_EinsteinEngines/Supermatter/distort.ogg → ...o/_EinsteinEngines/Supermatter/charge.ogg
diff --git a/...EinsteinEngines/Supermatter/lightning.ogg → ..._EinsteinEngines/Supermatter/emitter2.ogg b/...EinsteinEngines/Supermatter/lightning.ogg → ..._EinsteinEngines/Supermatter/emitter2.ogg
diff --git a/Resources/Audio/_EinsteinEngines/Supermatter/status/attributions.yml b/Resources/Audio/_EinsteinEngines/Supermatter/status/attributions.yml
@@ -0,0 +1,9 @@
+- files: ["engine_alert1.ogg", "engine_alert2.ogg", "terminal_alert.ogg"]
+  copyright: "Taken from tgstation"
+  license: "CC-BY-SA-3.0"
+  source: "https://github.com/tgstation/tgstation/pull/87191"
+
+- files: ["ohfuck.ogg"]
+  copyright: "Created by AftrLite for Impstation"
+  license: "CC-BY-SA-3.0"
+  source: "https://github.com/impstation/imp-station-14/pull/1359"
diff --git a/Resources/Audio/_EinsteinEngines/Supermatter/status/bloblarm.ogg b/Resources/Audio/_EinsteinEngines/Supermatter/status/bloblarm.ogg
diff --git a/Resources/Audio/_EinsteinEngines/Supermatter/status/ohfuck.ogg b/Resources/Audio/_EinsteinEngines/Supermatter/status/ohfuck.ogg
diff --git a/Resources/Prototypes/_EinsteinEngines/Entities/Effects/lightning.yml b/Resources/Prototypes/_EinsteinEngines/Entities/Effects/lightning.yml
@@ -24,7 +24,7 @@
     canArc: true
     lightningPrototype: SupermatterLightning
   - type: Beam
-    sound: /Audio/_EinsteinEngines/Supermatter/lightning.ogg
+    sound: /Audio/_EinsteinEngines/Supermatter/emitter2.ogg
     allowSpriteOverwrite: false
   - type: TimedDespawn
     lifetime: 1

diff --git a/Resources/Prototypes/_EinsteinEngines/Voice/speech_sounds.yml b/Resources/Prototypes/_EinsteinEngines/Voice/speech_sounds.yml
@@ -32,8 +32,8 @@
   id: SupermatterDelaminating
   variation: 0
   saySound:
-    path: /Audio/_EinsteinEngines/Supermatter/status/bloblarm.ogg
+    path: /Audio/_EinsteinEngines/Supermatter/status/ohfuck.ogg
   askSound:
-    path: /Audio/_EinsteinEngines/Supermatter/status/bloblarm.ogg
+    path: /Audio/_EinsteinEngines/Supermatter/status/ohfuck.ogg
   exclaimSound:
-    path: /Audio/_EinsteinEngines/Supermatter/status/bloblarm.ogg
+    path: /Audio/_EinsteinEngines/Supermatter/status/ohfuck.ogg