EMP

Content.Server/_NF/M_Emp/M_EmpGeneratorComponent.cs

@@ -21,28 +21,28 @@ public sealed class M_EmpGeneratorComponent : SharedM_EmpGeneratorComponent
         public GeneratorState GeneratorState = GeneratorState.Inactive;
 
         /// <summary>
-        /// How long it takes for the generator to pull in the debris
+        /// How long it takes for the generator to EMP
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("baseActivatingTime")]
-        public TimeSpan BaseActivatingTime = TimeSpan.FromSeconds(5);
+        public TimeSpan BaseActivatingTime = TimeSpan.FromSeconds(3.5);
 
         /// <summary>
-        /// How long it actually takes for the generator to pull in the debris
+        /// How long it actually takes for the generator to EMP
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("activatingTime")]
-        public TimeSpan ActivatingTime = TimeSpan.FromSeconds(10);
+        public TimeSpan ActivatingTime = TimeSpan.FromSeconds(3.5);
 
         /// <summary>
-        /// How long the generator can hold the debris until it starts losing the lock
+        /// How long the generator EMP is working
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("engagedTime")]
         public TimeSpan EngagedTime = TimeSpan.FromSeconds(60);
 
         /// <summary>
-        /// How long the generator can hold the debris while losing the lock
+        /// How long the generator Cooling Down
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("coolingDownTime")]

Content.Server/_NF/M_Emp/M_EmpSystem.cs

@@ -211,6 +211,8 @@ private void StartGenerator(EntityUid uid, M_EmpGeneratorComponent component, En
                     }
                     gridState.ActiveGenerators.Add(uid);
 
+                    PlayActivatedSound(uid, component);
+
                     component.GeneratorState = new GeneratorState(GeneratorStateType.Activating, gridState.CurrentTime + component.ActivatingTime);
                     RaiseLocalEvent(new M_EmpGeneratorActivatedEvent(uid));
                     Report(uid, component.M_EmpChannel, "m_emp-system-report-activate-success");
@@ -271,7 +273,7 @@ private void Transition(EntityUid uid, M_EmpGeneratorComponent generator, TimeSp
                     generator.GeneratorState = new GeneratorState(GeneratorStateType.CoolingDown, currentTime + generator.CoolingDownTime);
                     break;
                 case GeneratorStateType.CoolingDown:
-                    Report(uid, generator.M_EmpChannel, "m_emp-system-announcement-recharging");
+                    //Report(uid, generator.M_EmpChannel, "m_emp-system-announcement-recharging"); //Less chat spam
                     generator.GeneratorState = new GeneratorState(GeneratorStateType.Recharging, currentTime + generator.CooldownTime);
                     break;
                 case GeneratorStateType.Recharging:
@@ -316,6 +318,10 @@ public override void Update(float frameTime)
                 }
             }
         }
+        private void PlayActivatedSound(EntityUid uid, SharedM_EmpGeneratorComponent component)
+        {
+            _audio.PlayPvs(_audio.GetSound(component.ActivatedSound), uid);
+        }
     }
 
     public sealed class M_EmpGridState

Content.Shared/_NF/M_Emp/SharedM_EmpGeneratorComponent.cs

@@ -2,6 +2,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Audio;
 
 namespace Content.Shared._NF.M_Emp;
 
@@ -18,6 +19,10 @@ public abstract class SharedM_EmpGeneratorComponent : Component
     /// </summary>
     [DataField("partRatingDelay"), ViewVariables(VVAccess.ReadWrite)]
     public float PartRatingDelay = 0.75f;
+
+    [DataField("activatedSound")]
+    public SoundSpecifier ActivatedSound =
+        new SoundPathSpecifier("/Audio/Effects/countdown.ogg");
 }
 
 [Serializable, NetSerializable]

Resources/Locale/en-US/m_emp/m_emp-system.ftl

@@ -5,7 +5,7 @@ m_emp-system-announcement-recharging = Recharging.
 
 m_emp-system-report-already-active = The M_EMP Generator is already active.
 m_emp-system-report-cooling-down = The M_EMP Generator is cooling down.
-m_emp-system-report-activate-success = The M_EMP Generator pulse on GRID at CORDS!
+m_emp-system-report-activate-success = The M_EMP Generator engaging on GRID at CORDS!
 
 m_emp-system-generator-examined-inactive = The M_EMP Generator is inactive.
 m_emp-system-generator-examined-starting = The M_EMP Generator is starting up.
@@ -15,5 +15,5 @@ m_emp-system-generator-examined-active = The M_EMP active. EMP will last { $time
 }
 m_emp-system-generator-examined-cooling-down = Cooling down.
 m_emp-system-generator-examined-recharging = Recharging. Ready in: {$timeLeft} seconds.
-m_emp-system-generator-delay-upgrade = Attaching/cooldown delay
+m_emp-system-generator-delay-upgrade = Cooling down / Recharging speed
 

Resources/Prototypes/Entities/Structures/Machines/m_emp.yml → Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml

@@ -5,7 +5,7 @@
   description: Mobile EMP generator.
   components:
   - type: Sprite
-    sprite: Structures/Machines/m_emp.rsi
+    sprite: _NF/Structures/Machines/m_emp.rsi
     layers:
     - state: m_emp
     - state: m_emp-ready