Merge branch 'master' of https://github.com/ReginaeSpence/nuclear-14

Content.Server/Body/Systems/MetabolizerSystem.cs

@@ -43,7 +43,7 @@ public override void Initialize()
 
         private void OnMapInit(Entity<MetabolizerComponent> ent, ref MapInitEvent args)
         {
-            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
+            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval * (1+_random.NextFloat());
         }
 
         private void OnUnpaused(Entity<MetabolizerComponent> ent, ref EntityUnpausedEvent args)

Content.Server/Body/Systems/StomachSystem.cs

@@ -5,13 +5,15 @@
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Robust.Shared.Random;
 
 namespace Content.Server.Body.Systems
 {
     public sealed class StomachSystem : EntitySystem
     {
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+        [Dependency] private readonly IRobustRandom _random = default!;
 
         public const string DefaultSolutionName = "stomach";
 
@@ -24,7 +26,7 @@ public override void Initialize()
 
         private void OnMapInit(Entity<StomachComponent> ent, ref MapInitEvent args)
         {
-            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
+            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval * (1+_random.NextFloat());
         }
 
         private void OnUnpaused(Entity<StomachComponent> ent, ref EntityUnpausedEvent args)

Content.Server/Fluids/EntitySystems/DrainSystem.cs

@@ -34,16 +34,20 @@ public sealed class DrainSystem : SharedDrainSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-    private float DrainRunPeriod = 1f; // 1 second to make multiplying by DrainFrequency correct
-    private float Accumulator;
-
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<DrainComponent, GetVerbsEvent<Verb>>(AddEmptyVerb);
         SubscribeLocalEvent<DrainComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<DrainComponent, AfterInteractUsingEvent>(OnInteract);
         SubscribeLocalEvent<DrainComponent, DrainDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<DrainComponent, ComponentInit>(OnComponentInit);
+    }
+
+    private void OnComponentInit(EntityUid uid, DrainComponent component, ComponentInit args)
+    {
+        // Randomize accumulator on init to try to spread out all drain updates as much as possible.
+        component.Accumulator = _random.NextFloat() * component.DrainFrequency;
     }
 
     private void AddEmptyVerb(Entity<DrainComponent> entity, ref GetVerbsEvent<Verb> args)
@@ -111,14 +115,7 @@ private void Empty(EntityUid container, SpillableComponent spillable, EntityUid
 
     public override void Update(float frameTime)
     {
-        Accumulator += frameTime;
-        if (Accumulator < DrainRunPeriod)
-        {
-            return;
-        }
-        Accumulator -= DrainRunPeriod;
-
-        base.Update(DrainRunPeriod);
+        base.Update(frameTime);
         var managerQuery = GetEntityQuery<SolutionContainerManagerComponent>();
         var xformQuery = GetEntityQuery<TransformComponent>();
         var puddleQuery = GetEntityQuery<PuddleComponent>();
@@ -127,6 +124,13 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<DrainComponent>();
         while (query.MoveNext(out var uid, out var drain))
         {
+            drain.Accumulator += frameTime;
+            if (drain.Accumulator < drain.DrainFrequency)
+            {
+                continue;
+            }
+            drain.Accumulator -= drain.DrainFrequency;
+
             // Disable ambient sound from emptying manually
             if (!drain.AutoDrain)
             {

Resources/Audio/_Nuclear14/Effects/attributions.yml

@@ -1,4 +1,9 @@
 - files: ["UI_Pipboy_Radio_On.ogg", "UI_Quest_Update.ogg", "UI_QuestNew.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "Bethesda Softworks, from fallout 4. Converted from WAV to OGG. License unconfirmed Fair use?"
-  source: "https://www.youtube.com/watch?v=xTvducynPKQ"
+  source: "https://www.youtube.com/watch?v=xTvducynPKQ"
+
+- files: ["open_gift.ogg"]
+  license: "CC-BY-NC-SA-4.0"
+  copyright: "Taken from zvukipro.com . Converted from mp3 to OGG Mr_Lop_Lop. Custom license."
+  source: "https://zvukipro.com/predmet/1308-zvuki-podarka.html"

Resources/Audio/_Nuclear14/Lobby/attributions.yml

@@ -14,3 +14,8 @@
   license: "CC-BY-NC-SA-4.0"
   copyright: "Copyright owned by respective artists, see source link for details."
   source: "https://fallout.fandom.com/wiki/Fallout:_New_Vegas_soundtrack" 
+
+- files: ["Frank-Sinatra-Jingle-Bells.ogg"]
+  license: "Custom"
+  copyright: "Copyright owned by respective artists, see source link for details."
+  source: "https://www.youtube.com/watch?v=hLf0-lro8X8" 

Resources/Locale/en-US/_Nuclear14/Special/character-examine.ftl

@@ -2,7 +2,7 @@
 special-appearance-component-examine-charisma-very-low = { CAPITALIZE(SUBJECT($user)) } seems repulsive.
 special-appearance-component-examine-charisma-low = { CAPITALIZE(SUBJECT($user)) } seems awkward.
 special-appearance-component-examine-charisma-medium = { CAPITALIZE(SUBJECT($user)) } seems normal.
-special-appearance-component-examine-charisma-high = { CAPITALIZE(SUBJECT($user)) } seem approachable.
+special-appearance-component-examine-charisma-high = { CAPITALIZE(SUBJECT($user)) } seems approachable.
 special-appearance-component-examine-charisma-very-high = { CAPITALIZE(SUBJECT($user)) } seems suave.
 
 # Examine all special modifiers