Squashed commit of the following:

commit 8dcb88a
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 18:39:31 2024 +0000

    Automatic Changelog (new-frontiers-14#1119)

commit 223e3f9
Author: ThatOneGoblin25 <[email protected]>
Date:   Tue Mar 19 05:39:07 2024 +1100

    Adds BoxShotgunSlug to ammo.yml (new-frontiers-14#1119)

commit 2457bc9
Author: Dvir <[email protected]>
Date:   Mon Mar 18 20:29:04 2024 +0200

    Update opportunity.yml (new-frontiers-14#1131)

commit 87939de
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:46:35 2024 +0000

    Automatic Changelog (new-frontiers-14#1122)

commit 41b04a5
Author: Alice "Arimah" Heurlin <[email protected]>
Date:   Mon Mar 18 17:46:12 2024 +0100

    Increase soup maxVol to prevent spillage (new-frontiers-14#1122)

commit f5fcd41
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:45:25 2024 +0000

    Automatic Changelog (new-frontiers-14#1088)

commit 719be3b
Author: ErhardSteinhauer <[email protected]>
Date:   Mon Mar 18 19:45:02 2024 +0300

    Hardsuits Fabrication, Salvage TechFab (new-frontiers-14#1088)

    * Hardsuits Fabrication

    * fixes

    * botany EVA, sundicate hard suit for EMAG enjoyers

    * moved pirate eva to arsenal

    * fix

    * i changed something earlier today but i don't remember what. i recon i can do no wrong by merging this.

    * merge conflict fix, salvtechfab flatpack

    * circuitvend.yml

    purge

    * fix

    * mailcarrier eva

    * renamed mailman eva to mailcarrier eva

    * no spawn set to true for added toggleable helmets

commit b57358c
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:35:59 2024 +0000

    Automatic Changelog (new-frontiers-14#1126)

commit 41ff359
Author: Dvir <[email protected]>
Date:   Mon Mar 18 18:35:36 2024 +0200

    Fix Pen Sign (new-frontiers-14#1126)

    * My name, not the card name

    * FTL

commit 7701f4f
Author: Dvir <[email protected]>
Date:   Mon Mar 18 18:33:45 2024 +0200

    UnEmagged (new-frontiers-14#1128)

commit ce18929
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:31:19 2024 +0000

    Automatic Changelog (new-frontiers-14#1127)

commit 065c84d
Author: AndresE55 <[email protected]>
Date:   Mon Mar 18 12:30:56 2024 -0400

    Rules formatting  (new-frontiers-14#1127)

    * rule typos

    * formatting

commit 0054ba1
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 13:42:33 2024 +0000

    Automatic Changelog (new-frontiers-14#1129)

commit e1f6ec6
Author: Maxtone <[email protected]>
Date:   Mon Mar 18 08:42:10 2024 -0500

    removes opportunity from shipyard (new-frontiers-14#1129)

commit 714d1c1
Author: FrontierATC <[email protected]>
Date:   Sun Mar 17 10:21:57 2024 +0000

    Automatic Changelog (new-frontiers-14#1121)

commit a622d9a
Author: Leth <[email protected]>
Date:   Sun Mar 17 06:21:37 2024 -0400

    Adjusts the price of the NC Hauler to cost what it should (new-frontiers-14#1121)

commit 9299828
Author: FrontierATC <[email protected]>
Date:   Sun Mar 17 08:29:54 2024 +0000

    Automatic Changelog (new-frontiers-14#1104)

commit 91b1777
Author: Cuir <[email protected]>
Date:   Sun Mar 17 04:29:25 2024 -0400

    Canister (New) - Tiny scrap vessel (new-frontiers-14#1104)

    * Added UAC Canister to the scrapyard for purchase.

    * Fixed headlights not being mounted.
    Fixed diagonally adjacent walls.
    Fixed ship price (6600 --> 8000 spesos).
    Added two small items to make the ship a bit less empty and more lived in.

    * Fixed a few minor issues.

    * Fixed another minor issue.

    * Removed Passenger spawn point.
    Replaced Passenger job with Pilot.

commit 650d525
Author: Dvir <[email protected]>
Date:   Sun Mar 17 09:38:23 2024 +0200

    Condor (new-frontiers-14#1123)

commit 34e2069
Author: Dvir <[email protected]>
Date:   Sun Mar 17 09:37:56 2024 +0200

    Update mcdelivery.yml (new-frontiers-14#1124)

commit a52ab8f
Author: nyozzl <[email protected]>
Date:   Sat Mar 16 23:14:48 2024 +0000

    Updates disciple/fixes a few things (new-frontiers-14#1093)

    Co-authored-by: Nyazz <Nyazz@DESKTOP-Q577H4Q>

commit c20376a
Author: Batuh1n <[email protected]>
Date:   Sun Mar 17 01:36:58 2024 +0300

    KnuckleVerse (New) - Bboxing ship (new-frontiers-14#891)

    * Adds the boxing ship, KnuckleVerse.

    * Make it more expensive and remove "SW" from map name knuckleverse.yml

    * Update the shuttle, shuttle's folder location to _NF and shuttle's price and also add pilot job

    * Atmos, and power change, a few other changes to design

    * removed many emergency lights, fixed power

    ---------

    Co-authored-by: aknyyn <[email protected]>
    Co-authored-by: checkraze <[email protected]>
    Co-authored-by: Maxtone <[email protected]>

commit fdff25a
Author: FrontierATC <[email protected]>
Date:   Sat Mar 16 21:54:00 2024 +0000

    Automatic Changelog (new-frontiers-14#763)

commit edd866f
Author: cite2000 <[email protected]>
Date:   Sat Mar 16 17:53:36 2024 -0400

    Whiskey (New) (new-frontiers-14#763)

    * adds the whiskey ship

    * added the NFSD whiskey.

    * Revert "added the NFSD whiskey."

    This reverts commit 2d56259.

    * fixed the NFSD whiskey ship.

    * added latejoin spawn, changed air outlet, changed files slightly.

    * replaced power monitoring with air tank dispensor, replaced engineering locker with utility belt, moved table to prevent clipping, moved brigmedic headset into locker, added table into storage closet. ((FIXED SHIP SPAWNING))

    * changed lattices back to glass, removed brig-med headset, removed holding cells.

    * changed the tile under the thrusters to be lattice, while the corners were left as glass.

    * changed price from 47k to 55k to more accurately account for markup.

    * Fixed pathing error

    * Revamped main (waiting) room, changed generator out for 2 downgraded versions, changed out cloning setup for a cryogenics setup, changed atmost from air canister to proper atmos setup.

    * Merge remote-tracking branch 'origin/master' into pr/763

    * YML fix

    * added vacuum tiles, removed cigarettes, moved late join one tile down, added trystan plushie

    * Ship Generators, moved cryo pump, moved file to sec folder

    ---------

    Co-authored-by: Dvir <[email protected]>
    Co-authored-by: Maxtone <[email protected]>

commit 1aa4f28
Author: FrontierATC <[email protected]>
Date:   Thu Mar 14 22:47:56 2024 +0000

    Automatic Changelog (new-frontiers-14#1091)

commit 7021040
Author: AndresE55 <[email protected]>
Date:   Thu Mar 14 18:47:32 2024 -0400

    Update server rules (new-frontiers-14#1091)

commit 0d978ca
Author: GreaseMonk <[email protected]>
Date:   Thu Mar 14 14:55:25 2024 +0100

    Fix tabletop computers (new-frontiers-14#1113)

    * Update computers_tabletop.yml

    * Revert "Revert "Tabletop computer deconstruct fix (new-frontiers-14#1090)" (new-frontiers-14#1092)"

    This reverts commit 54d1714.

    * Fix draw depth

    ---------

    Co-authored-by: VMSolidus <[email protected]>

commit 31e3931
Author: exincore <[email protected]>
Date:   Mon Mar 11 18:43:05 2024 -0500

    refactor(research): Improve initial research client registration (new-frontiers-14#1086)

    * refactor(research): Improve initial research client registration

    * refactor(research): Move EntityLookupSystem dependency to main class file

    * Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions. (#25743)

    * fix(research): Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions.

    Fixes a paradox where selecting a research server requires a research server to already be selected.
    This would softlock the research client until it is reconstructed.

    * style: Discards the discard operator

    Co-authored-by: Nemanja <[email protected]>

    ---------

    Co-authored-by: Nemanja <[email protected]>
    (cherry picked from commit aaf5d0d)

commit b5a9528
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:32:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1096)

commit 6d09157
Author: Wolfking6116 <[email protected]>
Date:   Mon Mar 11 19:31:50 2024 -0400

    Refinement process for Artifexium (new-frontiers-14#1096)

    * swapped artifexium with raw version

    * raw artifexium description

    * raw artifexium reagent

    * Refined artifexium recipes

    * added dashes

    Forgot the dash

    ---------

    Co-authored-by: Wolfking6116 <[email protected]>

commit 2e26e40
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:21:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1098)

commit 93b9c40
Author: Mnemotechnican <[email protected]>
Date:   Tue Mar 12 02:20:49 2024 +0300

    Fix carrying (new-frontiers-14#1098)

    * Revert "Remove contests (#25425)"

    This reverts commit 012e6e6

    * Re-add contests to carrying

    * Fix various bugs

    * Add clarifying comments

    * Remove the contest from shoving; remove unused contests

    * Un-restore contests

    * This was unintended

    * Revert another minor change

commit ad2e93f
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:04:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1053)

commit 9f27054
Author: Qulibly <[email protected]>
Date:   Tue Mar 12 00:03:50 2024 +0100

    Crew monitor general tweaks and QoL changes (new-frontiers-14#1053)

    * Crew monitor global coordinates tweak

    * Crew Monitor changes to make monitor work with coordinates

    * Crew Monitor WIP space detection tweak

    * Crew Monitor Space detection and expedition tweak

    * Crew Monitor Location and Vessel detection

    * Crew Monitor NET_LOCATION_NAME value fixup

    ---------

    Co-authored-by: Qulibly <[email protected]>

commit 50f2b55
Author: ThatOneGoblin25 <[email protected]>
Date:   Tue Mar 12 01:31:26 2024 +1100

    Added Air tank to fill (new-frontiers-14#1105)

    Removed nitrogen and oxygen tank from fill

commit 3eeebdd
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 05:47:43 2024 +0000

    Automatic Changelog (new-frontiers-14#1106)

commit 791cd86
Author: ThatOneGoblin25 <[email protected]>
Date:   Mon Mar 11 16:47:20 2024 +1100

    Remove RCD (new-frontiers-14#1106)

    Removes RCD and Ammo

commit d66236b
Author: Dvir <[email protected]>
Date:   Sun Mar 10 01:59:44 2024 +0200

    McCargo (Update) (new-frontiers-14#1102)

    * Update mccargo.yml

    * Removed one light

Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs

@@ -1,6 +1,7 @@
 using Content.Client.Pinpointer.UI;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.GameObjects; // Frontier modification
 
 namespace Content.Client.Medical.CrewMonitoring;
 
@@ -63,7 +64,9 @@ protected override void Draw(DrawingHandleScreen handle)
             if (!LocalizedNames.TryGetValue(netEntity, out var name))
                 name = "Unknown";
 
-            var message = name + "\nLocation: [x = " + MathF.Round(blip.Coordinates.X) + ", y = " + MathF.Round(blip.Coordinates.Y) + "]";
+            // Text location of the blip will display GPS coordinates for the purpose of being able to find a person via GPS
+            // Previously it displayed coordinates relative to the center of the station, which had no use.
+            var message = name + "\nLocation: [x = " + MathF.Round(blip.MapCoordinates.X) + ", y = " + MathF.Round(blip.MapCoordinates.Y) + "]"; // Frontier modification
 
             _trackedEntityLabel.Text = message;
             _trackedEntityPanel.Visible = true;

Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs

@@ -27,6 +27,7 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
     private readonly IEntityManager _entManager;
     private readonly IPrototypeManager _prototypeManager;
     private readonly SpriteSystem _spriteSystem;
+	private readonly SharedTransformSystem _transformSystem; // Frontier modification
 
     private NetEntity? _trackedEntity;
     private bool _tryToScrollToListFocus;
@@ -39,6 +40,7 @@ public CrewMonitoringWindow(string stationName, EntityUid? mapUid)
         _entManager = IoCManager.Resolve<IEntityManager>();
         _prototypeManager = IoCManager.Resolve<IPrototypeManager>();
         _spriteSystem = _entManager.System<SpriteSystem>();
+		_transformSystem = _entManager.System<SharedTransformSystem>(); // Frontier modification
 
         _blipTexture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")));
 
@@ -149,7 +151,7 @@ public void ShowSensors(List<SuitSensorStatus> sensors, EntityUid monitor, Entit
         // Show monitor on nav map
         if (monitorCoords != null && _blipTexture != null)
         {
-            NavMap.TrackedEntities[_entManager.GetNetEntity(monitor)] = new NavMapBlip(monitorCoords.Value, _blipTexture, Color.Cyan, true, false);
+             NavMap.TrackedEntities[_entManager.GetNetEntity(monitor)] = new NavMapBlip(monitorCoords.Value, monitorCoords.Value.ToMap(_entManager, _transformSystem), _blipTexture, Color.Cyan, true, false); // Frontier modification
         }
     }
 
@@ -273,10 +275,13 @@ private void PopulateDepartmentList(IEnumerable<SuitSensorStatus> departmentSens
                 jobContainer.AddChild(jobIcon);
             }
 
-            // Job name
+            // Job name area
+			// Frontier modification
+			// Made in its name appear location name as its much more convenient
+			// While job icons should do good enough job of conveying job
             var jobLabel = new Label()
             {
-                Text = sensor.Job,
+                Text = sensor.LocationName,
                 HorizontalExpand = true,
                 ClipText = true,
             };
@@ -289,6 +294,7 @@ private void PopulateDepartmentList(IEnumerable<SuitSensorStatus> departmentSens
                 NavMap.TrackedEntities.TryAdd(sensor.SuitSensorUid,
                     new NavMapBlip
                     (coordinates.Value,
+                    coordinates.Value.ToMap(_entManager, _transformSystem), // Frontier modification
                     _blipTexture,
                     (_trackedEntity == null || sensor.SuitSensorUid == _trackedEntity) ? Color.LimeGreen : Color.LimeGreen * Color.DimGray,
                     sensor.SuitSensorUid == _trackedEntity));
@@ -355,6 +361,7 @@ private void UpdateSensorsTable(NetEntity? currTrackedEntity, NetEntity? prevTra
             {
                 data = new NavMapBlip
                     (data.Coordinates,
+					data.Coordinates.ToMap(_entManager, _transformSystem), // Frontier modification
                     data.Texture,
                     (currTrackedEntity == null || castSensor.SuitSensorUid == currTrackedEntity) ? Color.LimeGreen : Color.LimeGreen * Color.DimGray,
                     castSensor.SuitSensorUid == currTrackedEntity);

Content.Client/Pinpointer/UI/NavMapControl.cs

@@ -642,14 +642,16 @@ protected Vector2 GetOffset()
 public struct NavMapBlip
 {
     public EntityCoordinates Coordinates;
+	public MapCoordinates MapCoordinates; //Frontier modification
     public Texture Texture;
     public Color Color;
     public bool Blinks;
     public bool Selectable;
 
-    public NavMapBlip(EntityCoordinates coordinates, Texture texture, Color color, bool blinks, bool selectable = true)
+    public NavMapBlip(EntityCoordinates coordinates, MapCoordinates mapCoordinates, Texture texture, Color color, bool blinks, bool selectable = true) //Frontier modification
     {
         Coordinates = coordinates;
+		MapCoordinates = mapCoordinates; // Frontier modification
         Texture = texture;
         Color = color;
         Blinks = blinks;

Content.Client/Power/PowerMonitoringWindow.xaml.cs

@@ -18,6 +18,7 @@ public sealed partial class PowerMonitoringWindow : FancyWindow
     private readonly IEntityManager _entManager;
     private readonly SpriteSystem _spriteSystem;
     private readonly IGameTiming _gameTiming;
+	private readonly SharedTransformSystem _transformSystem; // Frontier modification
 
     private const float BlinkFrequency = 1f;
 
@@ -39,6 +40,7 @@ public PowerMonitoringWindow(PowerMonitoringConsoleBoundUserInterface userInterf
         RobustXamlLoader.Load(this);
         _entManager = IoCManager.Resolve<IEntityManager>();
         _gameTiming = IoCManager.Resolve<IGameTiming>();
+		_transformSystem = _entManager.System<SharedTransformSystem>(); // Frontier modification
 
         _spriteSystem = _entManager.System<SpriteSystem>();
         _owner = owner;
@@ -166,7 +168,7 @@ public void ShowEntites
         if (monitorCoords != null && mon != null)
         {
             var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")));
-            var blip = new NavMapBlip(monitorCoords.Value, texture, Color.Cyan, true, false);
+            var blip = new NavMapBlip(monitorCoords.Value, monitorCoords.Value.ToMap(_entManager, _transformSystem), texture, Color.Cyan, true, false); // Frontier modification
             NavMap.TrackedEntities[mon.Value] = blip;
         }
 
@@ -233,7 +235,7 @@ private void AddTrackedEntityToNavMap(NetEntity netEntity, PowerMonitoringDevice
         if (_focusEntity != null && usedEntity != _focusEntity && !entitiesOfInterest.Contains(usedEntity.Value))
             modulator = Color.DimGray;
 
-        var blip = new NavMapBlip(coords, _spriteSystem.Frame0(texture), color * modulator, blink);
+        var blip = new NavMapBlip(coords, coords.ToMap(_entManager, _transformSystem), _spriteSystem.Frame0(texture), color * modulator, blink); //Frontier modification
         NavMap.TrackedEntities[netEntity] = blip;
     }
 

Content.Server/Construction/NodeEntities/BoardNodeEntity.cs

@@ -31,7 +31,7 @@ public sealed partial class BoardNodeEntity : IGraphNodeEntity
 
         // Frontier - adds tabletop variants
         if (args.EntityManager.TryGetComponent(container.Owner, out ConstructionComponent? constructionComponent)
-            && constructionComponent.Graph == "GraphComputerTabletop"
+            && constructionComponent.Graph == "ComputerTabletop"
             && args.EntityManager.TryGetComponent(board, out ComputerTabletopBoardComponent? tabletopComputer))
         {
             return tabletopComputer.Prototype;

Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs

@@ -3,7 +3,8 @@
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Medical.SuitSensors;
 using Content.Server.Power.Components;
-using Content.Server.Station.Systems;
+//using Content.Server.Station.Systems;
+using Robust.Shared.Map; // Frontier modification
 using Content.Shared.DeviceNetwork;
 using Content.Shared.Medical.SuitSensor;
 using Robust.Shared.Timing;
@@ -15,7 +16,7 @@ public sealed class CrewMonitoringServerSystem : EntitySystem
     [Dependency] private readonly SuitSensorSystem _sensors = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
-    [Dependency] private readonly StationSystem _stationSystem = default!;
+    //[Dependency] private readonly StationSystem _stationSystem = default!; // Frontier modification
 
     private const float UpdateRate = 3f;
     private float _updateDiff;
@@ -66,16 +67,18 @@ public override void Update(float frameTime)
     }
 
     /// <summary>
-    /// Returns the address of the currently active server for the given station id if there is one
+    /// Returns the address of the currently active server for the given map (instead of station id) if there is one
     /// </summary>
-    public bool TryGetActiveServerAddress(EntityUid stationId, out string? address)
+    //public bool TryGetActiveServerAddress(EntityUid stationId, out string? address) // Frontier modification
+	public bool TryGetActiveServerAddress(MapId map, out string? address) // Frontier modification
     {
-        var servers = EntityQueryEnumerator<CrewMonitoringServerComponent, DeviceNetworkComponent>();
+        var servers = EntityQueryEnumerator<CrewMonitoringServerComponent, DeviceNetworkComponent, TransformComponent>(); // Frontier modification
         (EntityUid id, CrewMonitoringServerComponent server, DeviceNetworkComponent device)? last = default;
 
-        while (servers.MoveNext(out var uid, out var server, out var device))
+        while (servers.MoveNext(out var uid, out var server, out var device, out var xform)) // Frontier modification
         {
-            if (!_stationSystem.GetOwningStation(uid)?.Equals(stationId) ?? true)
+			//if (!_stationSystem.GetOwningStation(uid)?.Equals(stationId) ?? true)
+            if (xform.MapID != map) //Frontier modification
                 continue;
 
             if (!server.Available)

Content.Server/Medical/SuitSensors/SuitSensorComponent.cs

@@ -59,13 +59,15 @@ public sealed partial class SuitSensorComponent : Component
     [DataField("nextUpdate", customTypeSerializer:typeof(TimeOffsetSerializer))]
     [AutoPausedField]
     public TimeSpan NextUpdate = TimeSpan.Zero;
-
+
+	/* -- Frontier modification
     /// <summary>
     ///     The station this suit sensor belongs to. If it's null the suit didn't spawn on a station and the sensor doesn't work.
     /// </summary>
     [DataField("station")]
     public EntityUid? StationId = null;
-
+	*/
+
     /// <summary>
     ///     The server the suit sensor sends it state to.
     ///     The suit sensor will try connecting to a new server when no server is connected.