Merge branch 'master' into tyne11

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

@@ -6206,3 +6206,65 @@ Entries:
       message: Add toggle feature to moon boots.
   id: 5626
   time: '2025-01-03T13:22:59.0000000+00:00'
+- author: PeccNeck
+  changes:
+    - type: Tweak
+      message: Bocakillo now uses directional fans
+    - type: Tweak
+      message: Moved Bocakillo plasma into wall locker
+    - type: Fix
+      message: Fixed loose piping on Bocakillo
+  id: 5627
+  time: '2025-01-03T16:44:50.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Add
+      message: Charon gets shutters and some cameras.
+    - type: Tweak
+      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'
+- author: dvir001
+  changes:
+    - type: Tweak
+      message: >-
+        You can now directly dump ore bags into ore processors by clicking on
+        them.
+  id: 5635
+  time: '2025-01-06T21:21:18.0000000+00:00'

Resources/Locale/en-US/_NF/guidebook/guides.ftl

@@ -73,6 +73,7 @@ guide-entry-shipyard-sparrow = Sparrow
 guide-entry-shipyard-skipper = Skipper
 guide-entry-shipyard-spirit = Spirit
 guide-entry-shipyard-stasis = Stasis
+guide-entry-shipyard-tide = Tide
 guide-entry-shipyard-vagabond = Vagabond
 
 # Rules entries

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.