Merge branch 'Vault-Overseers:master' into Slowdown_Tile1

Content.Server/Body/Systems/MetabolizerSystem.cs

@@ -80,15 +80,8 @@ public override void Update(float frameTime)
         {
             base.Update(frameTime);
 
-            var metabolizers = new ValueList<(EntityUid Uid, MetabolizerComponent Component)>(Count<MetabolizerComponent>());
             var query = EntityQueryEnumerator<MetabolizerComponent>();
-
-            while (query.MoveNext(out var uid, out var comp))
-            {
-                metabolizers.Add((uid, comp));
-            }
-
-            foreach (var (uid, metab) in metabolizers)
+            while (query.MoveNext(out var uid, out var metab))
             {
                 // Only update as frequently as it should
                 if (_gameTiming.CurTime < metab.NextUpdate)

Content.Server/Fluids/EntitySystems/DrainSystem.cs

@@ -34,6 +34,9 @@ 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();
@@ -108,7 +111,14 @@ private void Empty(EntityUid container, SpillableComponent spillable, EntityUid
 
     public override void Update(float frameTime)
     {
-        base.Update(frameTime);
+        Accumulator += frameTime;
+        if (Accumulator < DrainRunPeriod)
+        {
+            return;
+        }
+        Accumulator -= DrainRunPeriod;
+
+        base.Update(DrainRunPeriod);
         var managerQuery = GetEntityQuery<SolutionContainerManagerComponent>();
         var xformQuery = GetEntityQuery<TransformComponent>();
         var puddleQuery = GetEntityQuery<PuddleComponent>();
@@ -117,13 +127,6 @@ 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)
             {

Content.Shared/CCVar/CCVars.cs

@@ -1399,7 +1399,7 @@ public static readonly CVarDef<bool>
         ///     Config for when the restart vote should be allowed to be called based on percentage of ghosts.
         ///
         public static readonly CVarDef<int> VoteRestartGhostPercentage =
-            CVarDef.Create("vote.restart_ghost_percentage", 50, CVar.SERVERONLY);
+            CVarDef.Create("vote.restart_ghost_percentage", 20, CVar.SERVERONLY);
 
         /// <summary>
         ///     See vote.enabled, but specific to preset votes
@@ -1417,7 +1417,7 @@ public static readonly CVarDef<bool>
         ///     The required ratio of the server that must agree for a restart round vote to go through.
         /// </summary>
         public static readonly CVarDef<float> VoteRestartRequiredRatio =
-            CVarDef.Create("vote.restart_required_ratio", 0.85f, CVar.SERVERONLY);
+            CVarDef.Create("vote.restart_required_ratio", 0.75f, CVar.SERVERONLY);
 
         /// <summary>
         /// Whether or not to prevent the restart vote from having any effect when there is an online admin

Resources/Locale/en-US/_Nuclear14/job-names.ftl

@@ -1,25 +1,25 @@
 # Midwest Brotherhood
-job-name-bos-mid-paladin-comm = Midwest Brotherhood Paladin Commander
+job-name-bos-mid-paladin-comm = Midwest BoS Paladin Commander
 job-description-bos-mid-paladin-comm = Lead the Midwest Brotherhood of Steel on their mission.
-job-name-bos-mid-paladin = Midwest Brotherhood Paladin
+job-name-bos-mid-paladin = Midwest BoS Paladin
 job-description-bos-mid-paladin = Follow the Paladin Commander on their mission.
-job-name-bos-mid-knight = Midwest Brotherhood Knight
+job-name-bos-mid-knight = Midwest BoS Knight
 job-description-bos-mid-knight = Follow the Paladin Commander on their mission.
-job-name-bos-mid-scribe = Midwest Brotherhood Scribe
+job-name-bos-mid-scribe = Midwest BoS Scribe
 job-description-bos-mid-scribe = Conduct scientific missions and research for your brotherhood chapter.
-job-name-bos-mid-squire = Midwest Brotherhood Squire
+job-name-bos-mid-squire = Midwest BoS Squire
 job-description-bos-mid-squire = Follow your Knight into battle and do their bidding.
 
 # Washington Brotherhood
-job-name-bos-washington-commander = Washington Brotherhood Commander
+job-name-bos-washington-commander = Washington BoS Paladin Commander
 job-description-bos-washington-commander = Lead the Washington Brotherhood of Steel to glory in their mission.
-job-name-bos-washington-initiate = Washington Brotherhood Initiate
+job-name-bos-washington-initiate = Washington BoS Initiate
 job-description-bos-washington-initiate = Prove yourself to your chapter to progress through the ranks.
-job-name-bos-washington-knight = Washington Brotherhood Knight
+job-name-bos-washington-knight = Washington BoS Knight
 job-description-bos-washington-knight = The military arm of the Brotherhood. Defend your chapter in their objectives and manufacture equipment.
-job-name-bos-washington-paladin = Washington Brotherhood Captain
+job-name-bos-washington-paladin = Washington BoS Paladin
 job-description-bos-washington-paladin = Protect the Brotherhood at all costs. Take the Commanders will out into the wasteland.
-job-name-bos-washington-scribe = Washington Brotherhood Scribe
+job-name-bos-washington-scribe = Washington BoS Scribe
 job-description-bos-washington-scribe = Conduct scientific missions and research for your brotherhood chapter.
 
 # Caravan

Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl

@@ -44,9 +44,9 @@ undecided-loadout-category-morale-description =
     1 NCR spear flag, 1 9mm pistol, 2 9mm magazines, 1 combat knife,
     and a C ration MRE.
 
-undecided-loadout-category-medic-name = Medic Kit
+undecided-loadout-category-medic-name = Combat Lifesaver Kit
 undecided-loadout-category-medic-description =
-    A crate containing all a NCR medic needs to patrol on the wasteland.
+    A crate containing all an NCR CLS needs to patrol the wasteland.
     Includes 1 NCR leather vest, 1 medical belt, 1 9mm SMG,
     4 9mm SMG magazines, 1 combat knife, and a C ration MRE.
 
@@ -172,8 +172,8 @@ undecided-loadout-category-bos-scribe-field-name = Brotherhood Scribe Field Kit
 undecided-loadout-category-bos-scribe-field-description =
     A crate containing everything a member of Brotherhood scribes.
         For supporting your unit from the back.
-    Includes 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
-     1 field scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE
+    Includes 1 AEP-7 pistol, 2 energy cells, 1 scribe webbing,
+     1 field scribe clothing, 1 knife, 2 stimpak, 1 gauze, 1 bruise pack, 1 ointment, 1 C ration MRE
 
 undecided-loadout-category-bos-scribe-engineer-name = Brotherhood Scribe Engineer Kit
 undecided-loadout-category-bos-scribe-engineer-description =
@@ -234,8 +234,8 @@ undecided-loadout-category-bos-washington-scribe-field-name = Brotherhood Scribe
 undecided-loadout-category-bos-washington-scribe-field-description =
     A crate containing everything a member of Brotherhood scribes.
         For supporting your unit from the back.
-    Includes 1 AEP-7 pistol, 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
-     1 field scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE
+    Includes 1 AEP-7 pistol, 1 AEP-7 pistol, 2 energy cells, 1 scribe webbing,
+     1 field scribe clothing, 1 knife, 2 stimpak, 1 gauze, 1 bruise pack, 1 ointment, 1 C ration MRE
 
 undecided-loadout-category-bos-washington-scribe-engineer-name = Brotherhood Scribe Engineer Kit
 undecided-loadout-category-bos-washington-scribe-engineer-description =