Merge branch 'master' into chemprentice

Content.Shared/_NF/Containers/CondimentCupComponent.cs

@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._NF.Containers.Components;
+/// <summary>
+/// CondimentCup empty component
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CondimentCupComponent : Component
+{
+
+}

Content.Shared/_NF/Containers/CondimentKetchupComponent.cs

@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._NF.Containers.Components;
+/// <summary>
+/// CondimentKetchup empty component
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CondimentKetchupComponent : Component
+{
+
+}

Content.Shared/_NF/Containers/CondimentMustardComponent.cs

@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._NF.Containers.Components;
+/// <summary>
+/// CondimentMustard empty component
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CondimentMustardComponent : Component
+{
+
+}

Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs

@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._NF.Containers.Components;
+/// <summary>
+/// CondimentSqueezeBottle empty component
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CondimentSqueezeBottleComponent : Component
+{
+
+}

Resources/Changelog/Frontier.yml

@@ -6224,3 +6224,39 @@ Entries:
       message: Charon had a bunch of small fixes and additions made.
   id: 5628
   time: '2025-01-03T17:32:24.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Adds clear condiment bottle and lathe recipe.
+  id: 5629
+  time: '2025-01-04T16:53:52.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Condiment dispenser.
+  id: 5630
+  time: '2025-01-04T20:32:57.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Colored craftable lightbulbs and prefilled light strobes.!
+  id: 5631
+  time: '2025-01-04T23:23:37.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: mappable ice box for bars and restaurants!
+  id: 5632
+  time: '2025-01-05T01:40:13.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Black light to service lathe.
+  id: 5633
+  time: '2025-01-05T17:56:21.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Handheld crew health monitor added to medical techfab.
+  id: 5634
+  time: '2025-01-05T17:57:46.0000000+00:00'

Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl

@@ -0,0 +1,2 @@
+reagent-name-coldsauce = coldsauce
+reagent-desc-coldsauce = Coldsauce. Leaves the tongue numb in its passage.

Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml

@@ -15,12 +15,13 @@
     FoodCondimentPacketSoy: 5
     FoodCondimentPacketSugar: 5
     FoodCondimentPacketCornoil: 5
-    FoodCondimentBottleBBQ: 2 # Frontier
-    FoodCondimentBottleColdsauce: 2 # Frontier
-    FoodCondimentBottleHotsauce: 2 # Frontier
-    FoodCondimentBottleKetchup: 2 # Frontier
-    FoodCondimentSqueezeBottleKetchup: 4 # Frontier
-    FoodCondimentSqueezeBottleMustard: 4 # Frontier
+    FoodCondimentBottleBBQ: 1 # Frontier
+    FoodCondimentBottleColdsauce: 1 # Frontier
+    FoodCondimentBottleHotsauce: 1 # Frontier
+    FoodCondimentBottleKetchup: 1 # Frontier
+    FoodCondimentSqueezeBottleClear: 2 # Frontier
+    FoodCondimentSqueezeBottleKetchup: 1 # Frontier
+    FoodCondimentSqueezeBottleMustard: 1 # Frontier
     ForkPlastic: 10
     SpoonPlastic: 10
     KnifePlastic: 10

Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml

@@ -196,6 +196,8 @@
       - id: BoxInflatable # Frontier
       - id: BoxLighttube # Frontier
       - id: BoxLightbulb # Frontier
+      - id: BoxColoredLighttube # Frontier
+      - id: BoxColoredLightbulb # Frontier
 
 - type: entityTable
   id: SalvageEquipmentUncommon

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -157,6 +157,8 @@
       - ExteriorLightTube
       - LightBulb
       - LedLightBulb
+      - SodiumLightBulb # Frontier
+      - ExteriorLightBulb #Frontier
       - Bucket
       - DrinkMug
       - DrinkMugMetal
@@ -211,6 +213,7 @@
       - FreezerElectronics
       - BoxDispenserFlare # Frontier
       - Durathread # Frontier
+      - FoodCondimentSqueezeBottleClear # Frontier
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - BoxLethalshot
@@ -516,6 +519,7 @@
     - SalvageTechFabCircuitboardNF # Frontier
     - NFScrapProcessorCircuitboard # Frontier
     - BlueprintLithographMachineCircuitboard # Frontier
+    - CondimentDispenserCircuitboard # Frontier
     dynamicRecipes:
       - ThermomachineFreezerMachineCircuitBoard
       - HellfireFreezerMachineCircuitBoard
@@ -1038,6 +1042,7 @@
       - PowerCellSmall # Frontier
       - BlankMediPen # Frontier
       - MedicalAppraisalTool # Frontier
+      - HandheldCrewMonitor # Frontier
     dynamicRecipes:
       - ChemicalPayload
       - CryostasisBeaker

Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml

@@ -28,3 +28,13 @@
   cost: 1500
   category: cargoproduct-category-name-service
   group: market
+
+- type: cargoProduct
+  id: ServiceColoredLightsReplacement
+  icon:
+    sprite: Objects/Power/light_bulb.rsi
+    state: normal
+  product: CrateServiceReplacementColoredLights
+  cost: 600
+  category: Service
+  group: market