Merge branch 'master' into 2025-01-11-SpeedBoots

new-frontiers-14 · Jan 11, 2025 · 43f6283 · 43f6283
2 parents 3939368 + e54f609
commit 43f6283
Show file tree

Hide file tree

Showing 40 changed files with 2,734 additions and 847 deletions.
diff --git a/Content.IntegrationTests/Tests/Round/JobTest.cs b/Content.IntegrationTests/Tests/Round/JobTest.cs
@@ -19,7 +19,7 @@ namespace Content.IntegrationTests.Tests.Round;
 public sealed class JobTest
 {
     private static readonly ProtoId<JobPrototype> Passenger = "Contractor"; // Frontier: use job prototypes that exist
-    private static readonly ProtoId<JobPrototype> Engineer = "Pilot"; // Frontier
+    private static readonly ProtoId<JobPrototype> Engineer = "Prisoner"; // Frontier
     private static readonly ProtoId<JobPrototype> Captain = "StationRepresentative"; // Frontier
 
     private static string _map = "JobTestMap";

diff --git a/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs b/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs
@@ -1,13 +1,14 @@
 using System.Numerics;
 using Content.Server.StationEvents.Components;
-using Content.Shared.Buckle.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Mech.Components;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Components;
+using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Vehicle.Components;
 using Robust.Shared.Map;
+using Robust.Shared.Player;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -106,6 +107,20 @@ private void OnMasterRemoved(EntityUid uid, LinkedLifecycleGridParentComponent c
             reparentEntities.Add(((targetUid, targetXform), targetXform.MapUid!.Value, _transform.GetWorldPosition(targetXform)));
         }
 
+        // Get silicon
+        var borgQuery = AllEntityQuery<BorgChassisComponent, ActorComponent, TransformComponent>();
+        while (borgQuery.MoveNext(out var borgUid, out _, out _, out var xform))
+        {
+            handledEntities.Add(borgUid);
+
+            if (xform.GridUid == null || xform.MapUid == null || xform.GridUid != grid)
+                continue;
+
+            var (targetUid, targetXform) = GetParentToReparent(borgUid, xform);
+
+            reparentEntities.Add(((targetUid, targetXform), targetXform.MapUid!.Value, _transform.GetWorldPosition(targetXform)));
+        }
+
         // Get occupied MindContainers
         var mindQuery = AllEntityQuery<MindContainerComponent, TransformComponent>();
         while (mindQuery.MoveNext(out var mobUid, out var mindContainer, out var xform))

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -6310,3 +6310,43 @@ Entries:
       message: Moved Victory and Shibamata from the lobby music to the jukebox.
   id: 5642
   time: '2025-01-10T17:58:03.0000000+00:00'
+- author: blackknight954
+  changes:
+    - type: Add
+      message: Added shotgun slugs and rubber magazines to the NFSD and Mercfabs
+  id: 5643
+  time: '2025-01-10T21:16:43.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: New ramen dishes from Umami! (Sometimes the SR)
+  id: 5644
+  time: '2025-01-10T21:48:51.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Add
+      message: Added monkey and kobold cubes to loadout under tools.
+  id: 5645
+  time: '2025-01-10T21:50:07.0000000+00:00'
+- author: Alkheemist
+  changes:
+    - type: Fix
+      message: >-
+        Trade mall has had a new solar array fitted, power should be more
+        consistent now.
+  id: 5646
+  time: '2025-01-11T08:22:27.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Fix
+      message: >-
+        Player controlled borgs no longer get deleted on event grids when they
+        end.
+  id: 5647
+  time: '2025-01-11T15:50:26.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Fix
+      message: Paladin NFSD Shuttle locker isn't locked to detective only anymore.
+  id: 5648
+  time: '2025-01-11T16:10:51.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl
@@ -10,3 +10,6 @@ flavor-complex-blast = like jungle warfare
 flavor-complex-torpedo = like convoy raiding
 flavor-complex-bees = like buzzing and honey
 flavor-complex-wassail = warm and comforting
+flavor-complex-fine-noodles = like fine noodles
+flavor-complex-rich-broth = rich broth
+flavor-complex-tangy = tangy
diff --git a/Resources/Maps/_NF/POI/trademall.yml b/Resources/Maps/_NF/POI/trademall.yml
diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml b/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml
@@ -1012,7 +1012,7 @@ entities:
         - Pressed: Toggle
         67:
         - Pressed: Toggle
-- proto: LockerNfsdSilverDetectiveFilled
+- proto: LockerNfsdSilver
   entities:
   - uid: 116
     components:

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -15,6 +15,7 @@
     FoodCondimentBottleKetchup: 2
     FoodCondimentBottleBBQ: 2
     FoodCondimentBottleVinegar: 5  # Frontier 2<5
+    FoodCondimentBottleSoysauce: 5 # Frontier    
 #    ReagentContainerOliveoil: 2 # Frontier - Replaced with OilJarOlive
     ReagentContainerMayo: 2
     OilJarOlive: 1 # Frontier

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
@@ -15,7 +15,6 @@
   canBeAntag: false
   icon: "JobIconPrisoner"
   supervisors: job-supervisors-prisoner
-  weight: 10 # Frontier
   displayWeight: 10 # Frontier
   special:
   - !type:AddImplantSpecial

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -12,7 +12,7 @@
   name: department-Civilian
   description: department-NFCivilian-description # Frontier
   color: "#9FED58"
-  weight: 0 # Frontier: -10<0 accounted for in jobs
+  weight: -10
   roles:
   # - Bartender # Frontier
   # - Botanist # Frontier
@@ -79,7 +79,7 @@
   - Sheriff  # Frontier
   - StationTrafficController # Frontier
   primary: false
-  weight: 2 # Frontier: 100<2 - accounted for in jobs
+  weight: 100
 
 - type: department
   id: Engineering

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml
@@ -19,3 +19,17 @@
     contents:
     - id: MaterialBiomass
       amount: 3
+
+# region Materials
+- type: entity
+  parent: [ CrateGenericSteel, StorageFillMaterialsBasic ]
+  id: CrateMaterialsBasicFilled
+  suffix: Filled, Basic Materials (full)
+  name: materials crate
+
+- type: entity
+  parent: [ CrateGenericSteel, StorageFillMaterialsBasic10 ]
+  id: CrateMaterialsBasic10Filled
+  suffix: Filled, Basic Materials (10)
+  name: materials crate
+# endregion Materials
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -2,7 +2,7 @@
   parent: [BaseItem, BartenderMixer]
   id: DrinkIceBucketEmpty
   name: ice bucket
-  suffix: empty
+  suffix: Empty
   description: A special bucket that was specifically designed to hold ice.
   components:
   - type: SolutionContainerManager

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -86,3 +86,39 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 6
     fillBaseName: squeeze-bottle-clear
+
+- type: entity
+  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
+  id: FoodCondimentBottleSoysauce
+  name: soy sauce bottle
+  description: Used to season dishes to umami perfection. With extra sodium!
+  components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "icon_open"}
+          False: {state: "icon_empty"}
+  - type: Item
+    size: Small
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Soysauce
+          Quantity: 30
+  - type: SolutionTransfer
+    playTransferSound: false
+    canChangeTransferAmount: true
+    minTransferAmount: 1
+    maxTransferAmount: 5
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/soysauce.rsi
+    state: icon
+  - type: Openable
+    closeable: true
+  - type: SolutionContainerVisuals
+    maxFillLevels: 5
+    fillBaseName: fill-