Merge branch 'master' into january-vanilla-upstream-merge

.github/mapchecker/whitelist.yml

@@ -1,5 +1,6 @@
 # POI's
 Frontier: true
+nfsd: true
 
 anomalouslab:
   - WallPlastitaniumIndestructible
@@ -72,5 +73,3 @@ Schooner:
   - IntercomCommand
 Marauder:
   - IntercomCommand
-Empress:
-  - IntercomAll

Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs

@@ -122,6 +122,7 @@ private void OnStartup(RoundStartingEvent ev)
         var lab = "/Maps/_NF/POI/anomalouslab.yml";
         var church = "Maps/_NF/POI/beacon.yml";
         var grifty = "Maps/_NF/POI/grifty.yml";
+        var nfsdStation = "/Maps/_NF/POI/nfsd.yml";
         var depotColor = new Color(55, 200, 55);
         var civilianColor = new Color(55, 55, 200);
         var lpbravoColor = new Color(200, 55, 55);
@@ -150,6 +151,23 @@ private void OnStartup(RoundStartingEvent ev)
             _shuttle.SetIFFColor(depotUid3s[0], depotColor);
         }
 
+        if (_map.TryLoad(mapId, nfsdStation, out var nfsdUids, new MapLoadOptions
+            {
+                Offset = _random.NextVector2(500f, 700f)
+            }))
+        {
+            // We should figure out if it is possible to add this grid to the latejoin listing.
+            // Hey turns out we can! (This is kinda copypasted from the lodge with some values filled in.)
+            if (_prototypeManager.TryIndex<GameMapPrototype>("nfsd", out var stationProto))
+            {
+                _station.InitializeNewStation(stationProto.Stations["nfsd"], nfsdUids);
+            }
+
+            var meta = EnsureComp<MetaDataComponent>(nfsdUids[0]);
+            _meta.SetEntityName(nfsdUids[0], "NFSD Outpost", meta);
+            _shuttle.SetIFFColor(nfsdUids[0], new Color(1f, 0.2f, 0.2f));
+        }
+
         if (_map.TryLoad(mapId, tinnia, out var depotUid2s, new MapLoadOptions
             {
                 Offset = tinniaOffset

Resources/Changelog/Changelog.yml

@@ -2932,3 +2932,107 @@ Entries:
       message: Added ashtray to the shadycig vender.
   id: 4762
   time: '2024-01-24T22:34:48.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added NC Harbormaster, a tugboat.
+  id: 4763
+  time: '2024-01-25T00:52:47.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated NC Legman to current mapping standards.
+  id: 4764
+  time: '2024-01-25T01:11:35.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Updated NT Rigger to current mapping standards, renamed NT Rigger to NT
+        Gasbender, added mothership console.
+  id: 4765
+  time: '2024-01-25T02:27:26.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated NM Searchlight to current mapping standards.
+  id: 4766
+  time: '2024-01-25T02:31:54.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated NC Lantern to current mapping standards, updated atmos.
+  id: 4767
+  time: '2024-01-25T02:35:54.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated NC Pioneer to current mapping standards.
+  id: 4768
+  time: '2024-01-25T02:43:22.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated ICR Chisel to current mapping standards.
+  id: 4769
+  time: '2024-01-25T03:22:37.0000000+00:00'
+- author: TsjipTsjip
+  changes:
+    - type: Add
+      message: >-
+        Added the NFSD outpost, a new base of operations for the Sheriff and
+        their subordinates!
+  id: 4770
+  time: '2024-01-27T16:31:09.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated NC Mail to current mapping standards.
+  id: 4771
+  time: '2024-01-28T13:33:42.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated NC Mission to current mapping standards.
+  id: 4772
+  time: '2024-01-28T13:59:17.0000000+00:00'
+- author: TsjipTsjip
+  changes:
+    - type: Remove
+      message: Biomass from frontier outpost. (Experimental change, may get reverted.)
+  id: 4773
+  time: '2024-01-28T14:18:46.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Updated NC Bocadillo to current mapping standards plus made some QoL
+        changes.
+  id: 4774
+  time: '2024-01-28T15:21:02.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Updated NC Liquidator to current mapping standards, simplified atmos
+        setup.
+  id: 4775
+  time: '2024-01-28T15:49:40.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated NC Barge to current mapping standards.
+  id: 4776
+  time: '2024-01-28T16:12:33.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated NC Prospector to current mapping standards.
+  id: 4777
+  time: '2024-01-28T17:35:40.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated HS Garden to current mapping standards.
+  id: 4778
+  time: '2024-01-28T18:20:52.0000000+00:00'

Resources/Maps/Shuttles/hospitaller.yml

@@ -735,13 +735,6 @@ entities:
     - pos: -0.46226525,-3.616715
       parent: 1
       type: Transform
-- proto: PaperMedicalInsurance
-  entities:
-  - uid: 91
-    components:
-    - pos: -0.19204617,4.593687
-      parent: 1
-      type: Transform
 - proto: PlastitaniumWindow
   entities:
   - uid: 92

Resources/Maps/_NF/Bluespace/cargoniaship.yml

@@ -5942,13 +5942,6 @@ entities:
     - pos: 5.0369654,-5.063199
       parent: 1
       type: Transform
-- proto: PaperMedicalInsurance
-  entities:
-  - uid: 801
-    components:
-    - pos: 5.194973,-3.9033341
-      parent: 1
-      type: Transform
 - proto: PartRodMetalLingering0
   entities:
   - uid: 802