Merge branch 'master-github'

Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs

@@ -8,6 +8,6 @@ namespace Content.Server.Cargo.Components;
 [Access(typeof(CargoSystem))]
 public sealed partial class CargoPalletConsoleComponent : Component
 {
-    [ViewVariables(VVAccess.ReadWrite), DataField("cashType", customTypeSerializer:typeof(PrototypeIdSerializer<StackPrototype>))]
-    public string CashType = "Credit";
+    [ViewVariables(VVAccess.ReadWrite), DataField("cashType", customTypeSerializer: typeof(PrototypeIdSerializer<StackPrototype>))]
+    public string CashType = "Caps";
 }

Content.Server/Cargo/Components/StationBankAccountComponent.cs

@@ -9,11 +9,11 @@ namespace Content.Server.Cargo.Components;
 public sealed partial class StationBankAccountComponent : Component
 {
     [ViewVariables(VVAccess.ReadWrite), DataField("balance")]
-    public int Balance = 2000;
+    public int Balance = 500;
 
     /// <summary>
     /// How much the bank balance goes up per second, every Delay period. Rounded down when multiplied.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("increasePerSecond")]
-    public int IncreasePerSecond = 1;
+    public float IncreasePerSecond = 0.05f;
 }

Content.Server/Cargo/Systems/CargoSystem.Orders.cs

@@ -23,7 +23,7 @@ public sealed partial class CargoSystem
         /// <summary>
         /// How much time to wait (in seconds) before increasing bank accounts balance.
         /// </summary>
-        private const int Delay = 10;
+        private const int Delay = 200;
 
         /// <summary>
         /// Keeps track of how much time has elapsed since last balance increase.
@@ -84,7 +84,7 @@ private void UpdateConsole(float frameTime)
 
                 foreach (var account in EntityQuery<StationBankAccountComponent>())
                 {
-                    account.Balance += account.IncreasePerSecond * Delay;
+                    account.Balance += (int) (account.IncreasePerSecond * Delay);
                 }
 
                 var query = EntityQueryEnumerator<CargoOrderConsoleComponent>();

Content.Server/Chat/Systems/ChatSystem.cs

@@ -686,7 +686,8 @@ private MessageRangeCheckResult MessageRangeCheck(ICommonSession session, ICChat
                 initialResult = MessageRangeCheckResult.Full;
                 break;
             case ChatTransmitRange.GhostRangeLimit:
-                initialResult = (data.Observer && data.Range < 0 && !_adminManager.IsAdmin(session)) ? MessageRangeCheckResult.HideChat : MessageRangeCheckResult.Full;
+                // N14: Always hide this from ghosts to avoid multiple radios spamming the ghost chat.
+                initialResult = data.Observer ? MessageRangeCheckResult.HideChat : MessageRangeCheckResult.Full;
                 break;
             case ChatTransmitRange.HideChat:
                 initialResult = MessageRangeCheckResult.HideChat;

Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs

@@ -12,7 +12,7 @@ namespace Content.Server.Chemistry.ReagentEffects
     /// </summary>
     public sealed partial class SatiateHunger : ReagentEffect
     {
-        private const float DefaultNutritionFactor = 3.0f;
+        private const float DefaultNutritionFactor = 2.55f;
 
         /// <summary>
         ///     How much hunger is satiated when 1u of the reagent is metabolized

Content.Server/Radio/Components/RadioSpeakerComponent.cs

@@ -24,4 +24,8 @@ public sealed partial class RadioSpeakerComponent : Component
 
     [DataField("enabled")]
     public bool Enabled;
+
+    [DataField("IsSpeaker")] // Set to true for broadcast radio speakers so that it speaks instead of whispers the message.
+    public bool IsSpeaker;
+
 }

Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs

@@ -218,7 +218,9 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref
 
         // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios
         var message = args.OriginalChatMsg.Message; // The chat system will handle the rest and re-obfuscate if needed.
-        _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false, languageOverride: args.Language);
+        var chatType = component.IsSpeaker ? InGameICChatType.Speak : InGameICChatType.Whisper;
+        _chat.TrySendInGameICMessage(uid, message, chatType, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false, languageOverride: args.Language);
+
     }
 
     private void OnBeforeIntercomUiOpen(EntityUid uid, IntercomComponent component, BeforeActivatableUIOpenEvent args)

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

Content.Shared/Nutrition/Components/HungerComponent.cs

@@ -23,7 +23,7 @@ public sealed partial class HungerComponent : Component
     /// The base amount at which <see cref="CurrentHunger"/> decays.
     /// </summary>
     [DataField("baseDecayRate"), ViewVariables(VVAccess.ReadWrite)]
-    public float BaseDecayRate = 0.008f;
+    public float BaseDecayRate = 0.0096f;
 
     /// <summary>
     /// The actual amount at which <see cref="CurrentHunger"/> decays.

Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs

@@ -427,6 +427,13 @@ protected void SetCartridgeSpent(EntityUid uid, CartridgeAmmoComponent cartridge
 
         cartridge.Spent = spent;
         Appearance.SetData(uid, AmmoVisuals.Spent, spent);
+
+        // Reduce entity spam from cartridges for N14.
+        if (spent)
+        {
+            var despawn = EnsureComp<TimedDespawnComponent>(uid);
+            despawn.Lifetime = 15f * 60; // 15 minutes
+        }
     }
 
     /// <summary>
@@ -458,10 +465,6 @@ protected void EjectCartridge(
         {
             Audio.PlayPvs(cartridge.EjectSound, entity, AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-1f));
         }
-
-        // Reduce entity spam from cartridges for N14.
-        var despawn = EnsureComp<TimedDespawnComponent>(entity);
-        despawn.Lifetime = 15f * 60; // 15 minutes
     }
 
     protected IShootable EnsureShootable(EntityUid uid)

Resources/Credits/Patrons.yml

@@ -7,8 +7,10 @@
 - Name: "TheTrueRatKing"
   Tier: Nuclear
 - Name: "maxxorion"
-  Tier: Silver
+  Tier: Nuclear
 - Name: "Baron216"
   Tier: Silver
 - Name: "Gruinspace"
-  Tier: Gold
+  Tier: Gold
+- Name: "DeadManWalking97" # jado
+  Tier: Silver

Resources/Locale/en-US/_Nuclear14/headset-component.ftl

@@ -13,3 +13,4 @@ chat-radio-bosmidwest = Brotherhood Midwest
 chat-radio-boswashington = Brotherhood Washington
 chat-radio-enclave = Enclave
 chat-radio-ncr = NCR
+chat-radio-pbs = Public Broadcast

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.
 
@@ -145,14 +145,15 @@ undecided-loadout-category-bos-default-name = Brotherhood Basic Issue Kit
 undecided-loadout-category-bos-default-description =
     A crate containing everything a member of Brotherhood might need.
         For soldiers and laser lovers alike.
-    Includes 1 laser rifle, 1 laser pistol, 3 MF cells, 2 MFC cells, 1 stimpak, C ration MRE
+    Includes 1 AER-9 laser rifle, 1 laser pistol, 3 MF cells, 2 energy cells, 1 stimpak, C ration MRE
 
 undecided-loadout-category-bos-carbine-name = Brotherhood Carbine Issue Kit
 undecided-loadout-category-bos-carbine-description =
     A crate containing everything a member of Brotherhood might need.
         For your ballistic needs.
     Includes 1 pre-war carbine rifle, 1 laser pistol, 3 carbine 556 magazines,
-     2 MFC cells, 1 stimpak, 1 C ration MRE
+     2 energy cells, 1 stimpak, 1 C ration MRE
+
 undecided-loadout-category-bos-laser-name = Brotherhood Laser Issue Kit
 undecided-loadout-category-bos-laser-description =
     A crate containing everything a member of the Brotherhood might need
@@ -164,28 +165,28 @@ undecided-loadout-category-bos-scribe-medic-name = Brotherhood Scribe Medical Ki
 undecided-loadout-category-bos-scribe-medic-description =
     A crate containing everything a member of Brotherhood scribes.
         For keeping the fighting forces alive.
-    Includes 1 10mm revolver, 2 10mm speedloaders, 1 medical belt,
+    Includes 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
      1 bullet wound kit, 1 medical scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE
 
 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 varmint rifle, 1 5.56 ammo box, 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 =
     A crate containing everything a member of Brotherhood scribes.
         For upkeeping the base and tinkering alike.
-    Includes 1 AEP-7 laser pistol, 2 MFC cells, 1 utility belt,
+    Includes 1 AEP-7 laser pistol, 2 energy cells, 1 utility belt,
      1 engineer scribe clothing, 1 fire-axe, 1 stimpak, 1 C ration MRE
 
 undecided-loadout-category-bos-ranged-name = Brotherhood Ranged Paladin Kit
 undecided-loadout-category-bos-ranged-description =
     A crate containing everything a paladin of Brotherhood might need.
         For open range fights.
-    Includes 1 wattz 2000 rifle, 1 laser pistol, 3 Focused-MF cells, 2 MFC cells,
+    Includes 1 wattz 2000 rifle, 1 laser pistol, 3 H-MF cells, 2 energy cells,
      1 stimpak, 1 C ration MRE
 
 undecided-loadout-category-bos-plasma-name = Brotherhood Plasma Paladin Kit
@@ -202,3 +203,57 @@ undecided-loadout-category-bos-ballistics-description =
     Includes 1 assault rifle, 3 5.56 magazines, 1 12.7mm pistol,
      2 12.7mm pistol magazines, 5.56 ammo box, 1 stimpak, 1 C ration MRE
 
+undecided-loadout-category-bos-washington-default-name = Brotherhood Basic Issue Kit
+undecided-loadout-category-bos-washington-default-description =
+    A crate containing everything a member of Brotherhood might need.
+        For soldiers and laser lovers alike.
+    Includes 1 1 plasma rifle, 1 laser pistol, 3 MF cells, 2 energy cells, 1 stimpak, C ration MRE
+
+undecided-loadout-category-bos-washington-carbine-name = Brotherhood Carbine Issue Kit
+undecided-loadout-category-bos-washington-carbine-description =
+    A crate containing everything a member of Brotherhood might need.
+        For your ballistic needs.
+    Includes 1 pre-war carbine rifle, 10mm pistol, 3 carbine 556 magazines,
+     2 10mm pistol magazines, 1 stimpak, 1 C ration MRE
+
+undecided-loadout-category-bos-washington-plasma-name = Brotherhood Plasma Issue Kit
+undecided-loadout-category-bos-washington-plasma-description =
+    A crate containing everything a member of the Brotherhood might need
+        too lay down some laser and lead.
+    Includes 1 modified plasma rifle, 1 10mm pistol, 3 plasma cartridges,
+     2 10mm pistol magazines, 1 stimpak, 1 C ration MRE
+
+undecided-loadout-category-bos-washington-scribe-medic-name = Brotherhood Scribe Medical Kit
+undecided-loadout-category-bos-washington-scribe-medic-description =
+    A crate containing everything a member of Brotherhood scribes.
+        For keeping the fighting forces alive.
+    Includes 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
+     1 bullet wound kit, 1 medical scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE
+
+undecided-loadout-category-bos-washington-scribe-field-name = Brotherhood Scribe Field Kit
+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 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 =
+    A crate containing everything a member of Brotherhood scribes.
+        For upkeeping the base and tinkering alike.
+    Includes 1 AEP-7 laser pistol, 2 energy cells, 1 utility belt,
+     1 engineer scribe clothing, 1 fire-axe, 1 stimpak, 1 C ration MRE
+
+undecided-loadout-category-bos-washington-ranged-name = Brotherhood Marksman Paladin Kit
+undecided-loadout-category-bos-washington-ranged-description =
+    A crate containing everything a paladin of Brotherhood might need.
+        For open range fights.
+    Includes 1 wattz 2000 rifle, 1 laser pistol, 3 H-MF cells, 2 energy cells,
+     1 stimpak, 1 C ration MRE
+
+undecided-loadout-category-bos-washington-ballistics-name = Brotherhood Assault Paladin Kit
+undecided-loadout-category-bos-washington-ballistics-description =
+    A crate containing everything a paladin of Brotherhood might need.
+        For his insane need of bullets downrange.
+    Includes 1 assault rifle, 3 5.56 magazines, 1 10mm pistol,
+     2 10mm pistol magazines, 5.56 ammo box, 1 stimpak, 1 C ration MRE

Resources/Locale/en-US/cargo/cargo-console-component.ftl

@@ -4,7 +4,7 @@ cargo-console-menu-account-name-label = Account name:{" "}
 cargo-console-menu-account-name-none-text = None
 cargo-console-menu-shuttle-name-label = Shuttle name:{" "}
 cargo-console-menu-shuttle-name-none-text = None
-cargo-console-menu-points-label = Spesos:{" "}
+cargo-console-menu-points-label = Caps:{" "}
 cargo-console-menu-points-amount = ${$amount}
 cargo-console-menu-shuttle-status-label = Shuttle status:{" "}
 cargo-console-menu-shuttle-status-away-text = Away

Resources/Locale/en-US/cargo/price-gun-component.ftl

@@ -1,4 +1,4 @@
-price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} spesos.
+price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} caps.
 price-gun-verb-text = Appraisal
 price-gun-verb-message = Appraise {THE($object)}.
 price-gun-bounty-complete = The device confirms that the bounty contained within is completed.