Merge branch 'master' into Hazy-Food-Mapperfix

Vault-Overseers · Nov 15, 2024 · d67687c · d67687c
2 parents eba58e9 + c9ec2de
commit d67687c
Show file tree

Hide file tree

Showing 297 changed files with 191,055 additions and 131,408 deletions.
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/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;

diff --git a/Content.Server/Chemistry/ReagentEffects/SatiateHunger.cs b/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

diff --git a/Content.Server/Radio/Components/RadioSpeakerComponent.cs b/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;
+
 }
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/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)

diff --git a/Content.Shared/Nutrition/Components/HungerComponent.cs b/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.

diff --git a/Resources/Audio/_Nuclear14/Effects/button_press.ogg b/Resources/Audio/_Nuclear14/Effects/button_press.ogg
diff --git a/Resources/Credits/Patrons.yml b/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
diff --git a/Resources/Locale/en-US/_Nuclear14/headset-component.ftl b/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