Merge pull request #117 from Corvax-Frontier/up091124

Up091124

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.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.

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

@@ -137,8 +137,8 @@ reagent-name-extract-datura = datura extract
 reagent-desc-extract-datura = A root that is often harvested for its venom which is commonly put on melee weapons. Tastes terrible, it burns your mouth, it makes your stomach feel sick.
 reagent-name-extract-honey-mesquite-pod = honey mesquite pod extract
 reagent-desc-extract-honey-mesquite-pod = A vegetable that vaguely resembles a pea pod. Tastes of buckwheat and clover honey.
-reagent-name-extract-jalapeno-pepper = jalapeno pepper juice
-reagent-desc-extract-jalapeno-pepper = A green pepper, something tells you eating this would probably hurt your mouth. Tastes like pain, more pain, and even more pain.
+reagent-name-extract-glowpepper = glowpepper juice 
+reagent-desc-extract-glowpepper = A glowing pepper; something tells you eating this would probably hurt your mouth. Tastes like glorious nuclear fire.
 reagent-name-extract-maize = maize extract
 reagent-desc-extract-maize = Corn before there was corn, this vegetable is all sorts of different colours. Tastes slightly sweet and starchy.
 reagent-name-extract-mutfruit = mutfruit juice

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

@@ -39,9 +39,9 @@ clipping-datura-name = datura clipping
 clipping-datura-noun = datura clippings
 clipping-datura-display-name = datura
 
-clipping-jalapeno-name = jalapeno clipping
-clipping-jalapeno-noun = jalapeno clippings
-clipping-jalapeno-display-name = jalapeno
+clipping-glowpepper-name = glowpepper clipping
+clipping-glowpepper-noun = glowpepper clippings
+clipping-glowpepper-display-name = glowpepper
 
 clipping-maize-name = maize clipping
 clipping-maize-noun = maize clippings

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

@@ -145,14 +145,14 @@ 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 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 +164,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,
+    Includes 1 varmint rifle, 1 5.56 ammo box, 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
      1 field scribe clothing, 1 knife, 1 stimpak, 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

Resources/Locale/en-US/flavors/flavor-profiles.ftl

@@ -49,6 +49,9 @@ flavor-base-holy = holy
 flavor-base-horrible = horrible
 # lmao
 flavor-base-terrible = terrible
+flavor-base-bad = bad
+flavor-base-sludgy = sludgy
+# N14 changes
 flavor-base-mindful = mindful
 
 # Complex flavors. Put a flavor here when you want something that's more
@@ -123,6 +126,8 @@ flavor-complex-meatballs = like meatballs
 flavor-complex-nettles = like nettles
 flavor-complex-jungle = like jungle
 flavor-complex-vegetables = like vegetables
+flavor-complex-tato = like worse tomatoes and potatoes
+# N14 change
 # use it when there multiple types of veggies
 
 ## Complex foodstuffs (cooked foods, joke flavors, etc)