Merge remote-tracking branch 'N14-Master/master' into Attempting-to-M…

…erge

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

@@ -221,7 +221,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)

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/Migrations/N14Migrations.yml

@@ -86,13 +86,6 @@ N14SpawnPointBoSWashingtonRecruit: N14SpawnPointBoSWashingtonInitiate
 N14SpawnPointBoSWashingtonResearcher: N14SpawnPointBoSWashingtonScribe
 N14SpawnPointBoSWashingtonSoldier: N14SpawnPointBoSWashingtonKnight
 N14SpawnPointBoSWashingtonCaptain: N14SpawnPointBoSWashingtonPaladin
-N14DoorBunkerGlassLockedBoSMidwestElder: N14DoorBunkerGlassLockedBoSWashingtonElder
-N14DoorBunkerGlassLockedBoSMidwestPaladin: N14DoorBunkerGlassLockedBoSWashingtonPaladin
-N14DoorBunkerGlassLockedBoSMidwestInitiate: N14DoorBunkerGlassLockedBoSWashingtonInitiate
-N14DoorBunkerGlassLockedBoSPaladin: N14DoorBunkerGlassLockedBoSMidwestPaladin
-N14DoorBunkerLockedBoSPaladin: N14DoorBunkerLockedBoSMidwestPaladin
-N14DoorBunkerGlassLockedBoSCommander: N14DoorBunkerGlassLockedBoSMidwestCommander
-N14DoorBunkerLockedBoSCommander: N14DoorBunkerLockedBoSMidwestCommander
 
 # NCR Renamed Spawner Fixes
 N14SpawnPointNCRMP: null
@@ -104,3 +97,151 @@ N14SpawnPointNCRNCO: N14SpawnPointNCRSGT
 
 N14WastelandFloraWildJalapenoPepper: N14WastelandFloraWildGlowpepper
 N14FloraProduceWildJalapenoPepper: N14FloraProduceWildGlowpepper
+
+# 11/11/2024 Hazel migrates every single food item because of a change in entity naming conventions. hell
+
+N14FoodBreadBun: N14CookedFoodBreadBun
+N14FoodBurgerAppendix: N14CookedFoodBurgerAppendix
+N14FoodBurgerBacon: N14CookedFoodBurgerBacon
+N14FoodBurgerBear: N14CookedFoodBurgerBear
+N14FoodBurgerBig: N14CookedFoodBurgerBig
+N14FoodBurgerBrain: N14CookedFoodBurgerBrain
+N14FoodBurgerCheese: N14CookedFoodBurgerCheese
+N14FoodBurgerChicken: N14CookedFoodBurgerChicken
+N14FoodBurgerCrab: N14CookedFoodBurgerCrab
+N14FoodBurgerFive: N14CookedFoodBurgerFive
+N14FoodBurgerMcguffin: N14CookedFoodBurgerMcguffin
+N14FoodBurgerMcrib: N14CookedFoodBurgerMcrib
+N14FoodBurgerPlain: N14CookedFoodBurgerPlain
+N14FoodBurgerRat: N14CookedFoodBurgerRat
+N14FoodBurgerSuper: N14CookedFoodBurgerSuper
+N14FoodBurgerTofu: N14CookedFoodBurgerTofu
+N14FoodBreadBanana: N14CookedFoodBreadBanana
+N14FoodBreadBananaSlice: N14CookedFoodBreadBananaSlice
+N14FoodBreadCorn: N14CookedFoodBreadCorn
+N14FoodBreadCornSlice: N14CookedFoodBreadCornSlice
+N14FoodBreadCreamcheese: N14CookedFoodBreadCreamcheese
+N14FoodBreadCreamcheeseSlice: N14CookedFoodBreadCreamcheeseSlice
+N14FoodBreadMeat: N14CookedFoodBreadMeat
+N14FoodBreadMeatSlice: N14CookedFoodBreadMeatSlice
+N14FoodBreadPlain: N14CookedFoodBreadPlain
+N14FoodBreadPlainSlice: N14CookedFoodBreadPlainSlice
+N14FoodBreadRadroll: N14CookedFoodBreadRadroll
+N14FoodBreadRadrollSlice: N14CookedFoodBreadRadrollSlice
+N14FoodBreadMeatRadscorp: N14CookedFoodBreadMeatRadscorp
+N14FoodBreadMeatRadscorpSlice: N14CookedFoodBreadMeatRadscorpSlice
+N14FoodBreadTofu: N14CookedFoodBreadTofu
+N14FoodBreadTofuSlice: N14CookedFoodBreadTofuSlice
+N14FoodBreadBaguette: N14CookedFoodBreadBaguette
+N14FoodBreadBaguetteSlice: N14CookedFoodBreadBaguetteSlice
+N14FoodBreadMoldySlice: N14CookedFoodBreadMoldySlice
+N14FoodBreadButteredToast: N14CookedFoodBreadButteredToast
+N14FoodBreadFrenchToast: N14CookedFoodBreadFrenchToast
+N14FoodBreadGarlicSlice: N14CookedFoodBreadGarlicSlice
+N14FoodBreadTwoSlice: N14CookedFoodBreadTwoSlice
+N14FoodBreadVolcanic: N14CookedFoodBreadVolcanic
+N14FoodBreadVolcanicSlice: N14CookedFoodBreadVolcanicSlice
+N14FoodOnionRings: N14CookedFoodOnionRings
+N14FoodPizzaMargherita: N14CookedFoodPizzaMargherita
+N14FoodPizzaMargheritaSlice: N14CookedFoodPizzaMargheritaSlice
+N14FoodPizzaMushroom: N14CookedFoodPizzaMushroom
+N14FoodPizzaMushroomSlice: N14CookedFoodPizzaMushroomSlice
+N14FoodPizzaMeat: N14CookedFoodPizzaMeat
+N14FoodPizzaMeatSlice: N14CookedFoodPizzaMeatSlice
+N14FoodPizzaVegetable: N14CookedFoodPizzaVegetable
+N14FoodPizzaVegetableSlice: N14CookedFoodPizzaVegetableSlice
+N14FoodPizzaPineapple: N14CookedFoodPizzaPineapple
+N14FoodPizzaPineappleSlice: N14CookedFoodPizzaPineappleSlice
+N14FoodPizzaMoldySlice: N14CookedFoodPizzaMoldySlice
+N14FoodNoodlesBoiled: N14CookedFoodNoodlesBoiled
+N14FoodNoodles: N14CookedFoodNoodles
+N14FoodNoodlesButter: N14CookedFoodNoodlesButter
+N14FoodNoodlesChowmein: N14CookedFoodNoodlesChowmein
+N14FoodOatmeal: N14CookedFoodOatmeal
+N14FoodRiceBoiled: N14CookedFoodRiceBoiled
+N14FoodRicePudding: N14CookedFoodRicePudding
+N14FoodRiceRoadkill: N14CookedFoodRiceRoadkill
+N14FoodRiceGumbo: N14CookedFoodRiceGumbo
+N14FoodRiceEgg: N14CookedFoodRiceEgg
+N14FoodSoupNettle: N14CookedFoodSoupNettle
+N14FoodSoupEyeball: N14CookedFoodSoupEyeball
+N14FoodSoupOnion: N14CookedFoodSoupOnion
+N14FoodSoupMushroom: N14CookedFoodSoupMushroom
+N14FoodSoupStew: N14CookedFoodSoupStew
+N14FoodSoupTato: N14CookedFoodSoupTato
+N14FoodSoupBloodtato: N14CookedFoodSoupBloodtato
+N14FoodSoupWingFangChu: N14CookedFoodSoupMutie
+N14FoodSoupVegetable: N14CookedFoodSoupVegetable
+N14FoodPieMutfruit: N14CookedFoodPieMutfruit
+N14FoodPieMutfruitSlice: N14CookedFoodPieMutfruitSlice
+N14FoodPieBaklava: N14CookedFoodPieBaklava
+N14FoodPieBaklavaSlice: N14CookedFoodPieBaklavaSlice
+N14FoodPieTarberry: N14CookedFoodPieBlackberry
+N14FoodPieTarberrySlice: N14CookedFoodPieBlackberrySlice
+N14FoodPieMeat: N14CookedFoodPieMeat
+N14FoodPieMeatSlice: N14CookedFoodPieMeatSlice
+N14FoodTartCoco: N14CookedFoodTartCoco
+N14FoodMealCubancarp: N14CookedFoodMealCubancarp #this will need to be re-migrated later I'm sure
+N14FoodMealSashimi: N14CookedFoodMealSashimi
+N14FoodMealPotatoLoaded: N14CookedFoodMealPotatoLoaded
+N14FoodMealFries: N14CookedFoodMealFries
+N14FoodMealFriesCheesy: N14CookedFoodMealFriesCheesy
+N14FoodMealFriesCarrot: N14CookedFoodMealFriesCarrot
+N14FoodBakedPancake: N14CookedFoodBakedPancake
+N14FoodBakedPancakeBb: N14CookedFoodBakedPancakeBb
+N14FoodBakedWaffle: N14CookedFoodBakedWaffle
+N14FoodBakedWaffleSoy: N14CookedFoodBakedWaffleSoy
+N14FoodBakedCookie: N14CookedFoodBakedCookie
+N14FoodBakedCookieSugar: N14CookedFoodBakedCookieSugar
+N14FoodBakedCookieRaisin: N14CookedFoodBakedCookieRaisin
+N14FoodBakedCookieOatmeal: N14CookedFoodBakedCookieOatmeal
+N14FoodBakedPancakeCc: N14CookedFoodBakedPancakeCc
+N14FoodCakeMutfruit: N14CookedFoodCakeMutfruit
+N14FoodCakeMutfruitSlice: N14CookedFoodCakeMutfruitSlice
+N14FoodCakeCarrot: N14CookedFoodCakeCarrot
+N14FoodCakeCarrotSlice: N14CookedFoodCakeCarrotSlice
+N14FoodCakeLemon: N14CookedFoodCakeLemon #will need remigrating someday
+N14FoodCakeLemonSlice: N14CookedFoodCakeLemonSlice
+N14FoodCakeTarberry: N14CookedFoodCakeTarberry
+N14FoodCakeTarberrySlice: N14CookedFoodCakeTarberrySlice
+N14FoodCakeCheese: N14CookedFoodCakeCheese
+N14FoodCakeCheeseSlice: N14CookedFoodCakeCheeseSlice
+N14FoodCakeOrange: N14CookedFoodCakeOrange
+N14FoodCakeOrangeSlice: N14CookedFoodCakeOrangeSlice
+N14FoodCakePumpkin: N14CookedFoodCakePumpkin
+N14FoodCakePumpkinSlice: N14CookedFoodCakePumpkinSlice
+N14FoodCakeVanilla: N14CookedFoodCakeVanilla
+N14FoodCakeVanillaSlice: N14CookedFoodCakeVanillaSlice
+N14FoodCakePlain: N14CookedFoodCakePlain
+N14FoodCakeLime: N14CookedFoodCakeLime
+N14FoodCakeLimeSlice: N14CookedFoodCakeLimeSlice
+N14FoodCakePlainSlice: N14CookedFoodCakePlainSlice
+N14FoodCakeBirthday: N14CookedFoodCakeBirthday
+N14FoodCakeBirthdaySlice: N14CookedFoodCakeBirthdaySlice
+N14FoodCakeChocolate: N14CookedFoodCakeChocolate
+N14FoodCakeChocolateSlice: N14CookedFoodCakeChocolateSlice
+N14FoodCakeBrain: N14CookedFoodCakeBrain
+N14FoodCakeBrainSlice: N14CookedFoodCakeBrainSlice
+N14FoodBakedDumplings: N14CookedFoodBakedDumplings
+N14FoodBakedBrownieBatch: N14CookedFoodBakedBrownieBatch
+N14FoodSoupChiliHot: N14CookedFoodSoupChiliHot
+N14FoodMealQueso: N14CookedFoodMealQueso
+N14FoodMealRibs: N14CookedFoodMealRibs
+N14FoodMealEnchiladas: N14CookedFoodMealEnchiladas
+N14FoodSaladHerb: N14CookedFoodSaladHerb
+N14FoodSaladColeslaw: N14CookedFoodSaladColeslaw
+N14FoodSaladCaesar: N14CookedFoodSaladCaesar
+N14FoodSaladKimchi: N14CookedFoodSaladKimchi
+N14FoodSaladFruit: N14CookedFoodSaladFruit
+N14FoodSaladJungle: N14CookedFoodSaladJungle
+N14FoodMealSoftTaco: N14CookedFoodMealSoftTaco
+N14FoodBakedChevreChaud: N14CookedFoodBakedChevreChaud
+N14FoodCannabisButter: N14FoodCannabisButter
+N14FoodBakedCannabisBrownieBatch: N14CookedFoodBakedCannabisBrownieBatch
+N14FoodMealCornInButter: N14CookedFoodMealCornInButter
+N14FoodTacoShell: N14CookedFoodTacoShell
+N14FoodTacoMeat: N14CookedFoodTacoMeat
+N14FoodTacoChicken: N14CookedFoodTacoChicken
+N14FoodTacoRat: N14CookedFoodTacoRat
+N14FoodTacoMeatSupreme: N14CookedFoodTacoMeatSupreme
+N14FoodTacoChickenSupreme: N14CookedFoodTacoChickenSupreme

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml

@@ -94,7 +94,7 @@
       - FoodMothFleetSalad # Nyanotrasen - Moth Recipes
       - FoodMothCottonSalad # Nyanotrasen - Moth Recipes
       - FoodMothKachumbariSalad # Nyanotrasen - Moth Recipes
-      - FoodMealSoftTaco #test to see if this fixes a bug
+      - FoodMealSoftTaco
       - FoodMealCornInButter
       - FoodSoupStew
     chance: 0.8

Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml

@@ -919,4 +919,3 @@
   - type: Tag
     tags:
     - Meat
-

Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml

@@ -713,7 +713,7 @@
   name: vegetable soup
   parent: FoodBowlBase
   id: FoodSoupVegetable
-  description: A true vegan meal.
+  description: A true vegan meal
   components:
   - type: FlavorProfile
     flavors:

Resources/Prototypes/Maps/N14/sunnyvale.yml

@@ -48,9 +48,9 @@
             CaravanGuard: [ 2, 2 ]
             BoSWashingtonCommander: [ 1, 1 ]
             BoSWashingtonPaladin: [ 1, 1 ]
-            BoSWashingtonScribe: [ 2, 2 ]
-            BoSWashingtonKnight: [ 2, 2 ]
-            BoSWashingtonInitiate: [ 0, 2 ]
+            BoSWashingtonScribe: [ 1, 2 ]
+            BoSWashingtonKnight: [ 2, 3 ]
+            BoSWashingtonInitiate: [ 2, 2 ]
             BoSMidPaladinCommander: [ 1, 1 ]
             BoSMidPaladin: [ 1, 1 ]
             BoSMidKnight: [ 2, 3 ]