Merge branch 'master' into 2024-11-22-AjustedMerc

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

@@ -6230,3 +6230,15 @@ Entries:
       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'

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/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
@@ -517,6 +519,7 @@
     - SalvageTechFabCircuitboardNF # Frontier
     - NFScrapProcessorCircuitboard # Frontier
     - BlueprintLithographMachineCircuitboard # Frontier
+    - CondimentDispenserCircuitboard # Frontier
     dynamicRecipes:
       - ThermomachineFreezerMachineCircuitBoard
       - HellfireFreezerMachineCircuitBoard

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

Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml

@@ -142,3 +142,68 @@
     whitelist:
       components:
       - LightBulb
+
+- type: entity
+  name: colored lighttube box
+  parent: BoxCardboard
+  id: BoxColoredLighttube
+  description: This box is shaped on the inside so that only light tubes and bulbs fit.
+  components:
+  - type: StorageFill
+    contents:
+      - id: LightTubeCrystalCyan
+        amount: 2
+      - id: LightTubeCrystalBlue
+        amount: 2
+      - id: LightTubeCrystalPink
+        amount: 2
+      - id: LightTubeCrystalOrange
+        amount: 2
+      - id: LightTubeCrystalRed
+        amount: 2
+      - id: LightTubeCrystalGreen
+        amount: 2
+  - type: Sprite
+    layers:
+      - state: box
+      - state: lighttube
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,5,3
+    whitelist:
+      components:
+      - LightBulb
+
+- type: entity
+  name: colored bulbs box
+  parent: BoxLightbulb
+  id: BoxColoredLightbulb
+  description: This box is shaped on the inside so that only light tubes and bulbs fit. It's full of neat colored light bulbs!
+  components:
+  - type: StorageFill
+    contents:
+      - id: LightBulbCrystalCyan
+        amount: 2
+      - id: LightBulbCrystalBlue
+        amount: 2
+      - id: LightBulbCrystalPink
+        amount: 2
+      - id: LightBulbCrystalOrange
+        amount: 2
+      - id: LightBulbCrystalRed
+        amount: 2
+      - id: LightBulbCrystalGreen
+        amount: 2
+  - type: Sprite
+    layers:
+      - state: box
+      - state: light
+        color: "cyan"
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,5,3
+    whitelist:
+      components:
+      - LightBulb

Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml

@@ -22,3 +22,13 @@
     contents:
       - id: NFVehicleJanicart
       - id: VehicleKeyJanicart
+
+- type: entity
+  id: CrateServiceReplacementColoredLights
+  name: colored lights crate
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxColoredLighttube
+      - id: BoxColoredLightbulb

Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml

@@ -0,0 +1,11 @@
+- type: reagentDispenserInventory
+  id: CondimentDispenserInventory
+  inventory:
+  - DrinkAstrotameJug
+  - DrinkBbqSauceJug
+  - DrinkColdsauceJug
+  - DrinkHorseradishSauceJug
+  - DrinkHotsauceJug
+  - DrinkKetchupJug
+  - DrinkMustardJug
+  - DrinkSoysauceJug