Merge branch 'new-frontiers-14:master' into SBI-Crown

new-frontiers-14 · Apr 27, 2024 · 27cad9c · 27cad9c
2 parents e47fd51 + 27f403f
commit 27cad9c
Show file tree

Hide file tree

Showing 221 changed files with 60,277 additions and 56,603 deletions.
diff --git a/.github/mapchecker/config.py b/.github/mapchecker/config.py
@@ -29,5 +29,9 @@
     ],
     "Syndicate": [
         "Plastitanium",  # And also on blackmarket ships cause syndicate.
-    ]
+    ],
+	"BlackMarket": [
+        "Plastitanium",  # And also on blackmarket ships cause syndicate.
+        "ButtonFrameCautionSecurity",  # Decal.
+	]
 }
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Actions;
+using Content.Server.Actions;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Hands.Systems;
@@ -321,11 +321,9 @@ public void BorgActivate(EntityUid uid, BorgChassisComponent component)
             access.Add($"Captain");
             access.Add($"Maintenance");
             access.Add($"External");
-            access.Add($"Cargo");
-            access.Add($"Salvage");
             access.Add($"Medical");
-            access.Add($"Service");
-            access.Add($"Research");
+            access.Add($"Pilot");
+            access.Add($"Mercenary");
 
             _access.TrySetTags(uid, access);
         }

diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
@@ -131,6 +131,7 @@ private void OnStartup(RoundStartingEvent ev)
         var depotOffset = _random.NextVector2(3000f, 5000f);
         var tinniaOffset = _random.NextVector2(1100f, 2800f);
         var caseysOffset = _random.NextVector2(2250f, 4600f);
+
         if (_map.TryLoad(mapId, depotMap, out var depotUids, new MapLoadOptions
             {
                 Offset = depotOffset
@@ -190,7 +191,7 @@ private void OnStartup(RoundStartingEvent ev)
 
         if (_map.TryLoad(mapId, lpbravo, out var depotUid4s, new MapLoadOptions
             {
-                Offset = _random.NextVector2(2150f, 3900f)
+                Offset = _random.NextVector2(2150f, 4850f)
             }))
         {
             var meta = EnsureComp<MetaDataComponent>(depotUid4s[0]);
@@ -221,7 +222,7 @@ private void OnStartup(RoundStartingEvent ev)
 
         if (_map.TryLoad(mapId, cove, out var depotUid6s, new MapLoadOptions
             {
-                Offset = _random.NextVector2(2250f, 4600f)
+                Offset = _random.NextVector2(4650f, 6800f)
             }))
         {
             if (_prototypeManager.TryIndex<GameMapPrototype>("Cove", out var stationProto))

diff --git a/Content.Server/_NF/Smuggling/DeadDropSystem.cs b/Content.Server/_NF/Smuggling/DeadDropSystem.cs
@@ -35,6 +35,7 @@ public sealed class DeadDropSystem : EntitySystem
     [Dependency] private readonly ShipyardSystem _shipyard = default!;
     [Dependency] private readonly ShuttleSystem _shuttle = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
 
     public override void Initialize()
     {
@@ -94,16 +95,15 @@ private void SendDeadDrop(EntityUid uid, DeadDropComponent component, EntityUid
         //dont ask me im just fulfilling FTL requirements.
         var dropLocation = _random.NextVector2(component.MinimumDistance, component.MaximumDistance);
         var mapId = Transform(user).MapID;
-        var coords = new MapCoordinates(dropLocation, mapId);
-        var location = Spawn(null, coords);
+        var mapUid = _mapManager.GetMapEntityId(mapId);
 
         if (TryComp<ShuttleComponent>(gridUids[0], out var shuttle))
         {
-            _shuttle.FTLToCoordinates(gridUids[0], shuttle, location.ToCoordinates(), 5.5f, 35f);
+            _shuttle.FTLToCoordinates(gridUids[0], shuttle, new EntityCoordinates(mapUid, dropLocation), 0f, 0f, 35f);
         }
 
         //tattle on the smuggler here, but obfuscate it a bit if possible to just the grid it was summoned from.
-        var channel = _prototypeManager.Index<RadioChannelPrototype>("NFSD");
+        var channel = _prototypeManager.Index<RadioChannelPrototype>("Nfsd");
         var sender = Transform(user).GridUid ?? uid;
 
         _radio.SendRadioMessage(sender, Loc.GetString("deaddrop-security-report"), channel, uid);

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4149,3 +4149,135 @@ Entries:
       message: Added new NSFD sprites to the NSF Whiskey and tweaked decals.
   id: 4929
   time: '2024-04-23T00:39:40.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Beware! Blood Cult Janitor has awoken as was prophesized!
+    - type: Add
+      message: >-
+        Cult Forge is now a functional lathe with a modest collection of
+        crafting recipes.
+    - type: Tweak
+      message: >-
+        Due to budget cuts not every syndicate agent comes equipped with death
+        acidifier.
+  id: 4930
+  time: '2024-04-23T17:39:31.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Add
+      message: Pirates have gained a more firm foothold in the sector.
+    - type: Tweak
+      message: >-
+        Pirate Captains are now a whitelisted role. See the discord for more
+        information.
+  id: 4931
+  time: '2024-04-23T21:36:50.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: NFSD Fixed the colors and machines on the NFSD base
+  id: 4932
+  time: '2024-04-24T22:36:54.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added safary suit and hat to AutoDrobe.
+    - type: Add
+      message: Added specific procedural suits to AutoDrobe.
+    - type: Tweak
+      message: >-
+        Arcadia Mask, Hydroponics EVA and Mailcarrier EVA helmets hide
+        character's hair now.
+    - type: Tweak
+      message: Pilot's hardsuit no longer requires mask to use air tank.
+    - type: Fix
+      message: Fixed arcadia webbing not displaying on character.
+  id: 4933
+  time: '2024-04-24T22:39:53.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Add
+      message: Adds the Barnacle black market ship
+  id: 4934
+  time: '2024-04-25T00:20:16.0000000+00:00'
+- author: Tych0theSynth
+  changes:
+    - type: Tweak
+      message: Tweaked the NSF Prowler and gave her a new lick of paint.
+  id: 4935
+  time: '2024-04-25T01:01:42.0000000+00:00'
+- author: Tych0theSynth
+  changes:
+    - type: Tweak
+      message: Updated NSF Inquisitor.
+  id: 4936
+  time: '2024-04-25T02:57:06.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Add
+      message: Adds the Bocakillo, pirate ship.
+  id: 4937
+  time: '2024-04-25T05:36:54.0000000+00:00'
+- author: Kesiath
+  changes:
+    - type: Tweak
+      message: Temporarily restored Spacelaw books.
+  id: 4938
+  time: '2024-04-26T04:16:05.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Added storage compartment to Skeleton Bike.
+    - type: Tweak
+      message: It is possible to strap a duffel bag to ATV now.
+    - type: Tweak
+      message: ATV hull color is now randomized.
+    - type: Add
+      message: Added void-capable hoverbike. Buy one at cargo today!
+    - type: Add
+      message: Added void-capable hoverbikes for NFSD and Mail Carrier.
+  id: 4939
+  time: '2024-04-26T04:32:41.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: >-
+        Mail carrier hoverbike flatpack that can be bought from vendomat. and
+        NFSD 
+    - type: Add
+      message: >-
+        NFSD hoverbike flatpack that can be bought from uplink (utility
+        category).
+    - type: Remove
+      message: >-
+        Removed hoverbikes from cargo catalog. Will be added to expedition loot
+        pool at some point.
+  id: 4940
+  time: '2024-04-26T16:58:44.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Tweak
+      message: Empress got a new coat of paint along with the microships.
+  id: 4941
+  time: '2024-04-26T18:23:05.0000000+00:00'
+- author: Gotimanga
+  changes:
+    - type: Tweak
+      message: 'Tweaked the NSF Wasp and changed it to the new NSFD colours '
+  id: 4942
+  time: '2024-04-26T20:49:17.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Revamped ICR Chisel.
+    - type: Tweak
+      message: Enabled additional recipes in salvage techfab.
+  id: 4943
+  time: '2024-04-26T21:27:00.0000000+00:00'
+- author: Tych0theSynth
+  changes:
+    - type: Tweak
+      message: Reworked the NSF Interceptor and brought it up to date.
+  id: 4944
+  time: '2024-04-26T22:05:51.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/bluespace-events/events.ftl b/Resources/Locale/en-US/_NF/bluespace-events/events.ftl
@@ -10,11 +10,11 @@ station-event-bluespace-asteroid-end-announcement = In compliance with NanoTrase
 station-event-bluespace-ship-start-announcement = We have detected an unusual FTL signature - long range scans indicate an unknown ship. NanoTrasen cannot confirm safety for prospectors within its vicinity, be advised.
 station-event-bluespace-ship-end-announcement = In compliance with NanoTrasen FTL traffic patterns, the unknown ship has been dissipated to ensure non-collision.
 
-station-event-bluespace-syndicate-ftl-interception-start-announcement = Attention all available NanoTrasen personnel! NanoTrasen Naval Command disrupted the FTL-jump of Syndicate Vessel, according to our deepspace scanners the vessel either already entered the real space in your sector or is about to enter. Code: Intercept, Expunge, Exterminate, Cauterise. Expect armed opposition, use of lethal force against enemy agents is authorized. Do note: any loss of NT affiliated personnel lifes will not be compensated.
+station-event-bluespace-syndicate-ftl-interception-start-announcement = Attention all available NanoTrasen personnel! NanoTrasen Naval Command disrupted the FTL-jump of Syndicate Vessel, according to our deepspace scanners the vessel either already entered the real space in your sector or is about to enter. Code: Intercept, Expunge, Decimate, Cauterise. Expect armed opposition, use of lethal force against enemy agents is authorized. Do note: any loss of NT-affiliated personnel lives will not be compensated. Reminder: NT personnel who are granted security clearance for the engagement are required to surrender any hazardous materials to the local security department to ensure safe transportation of Syndicate technology to CentCom for study. Should there be any prisoners, security personnel is required to prepare them for transportation to CentCom for interrogation through the NT-patented Contraband Exchange System (tm).
 station-event-bluespace-syndicate-ftl-interception-end-announcement = In compliance with NanoTrasen FTL traffic patterns, the Syndicate Vessel has been dissipated to ensure non-collision.
 
-station-event-bluespace-wizardfederation-scout-start-announcement = Attention all available NanoTrasen personnel! NanoTrasen Naval Command detected a Bluespace Anomaly in your sector with the signature indicative of the imminent arrival of a Wizard Federation micro vessel. Code: Intercept, Detain, Incarcerate. Arrest the intruders and prepare them to be handed over to the NanoTrasen Special Forces Unit for enhanced interrogation.
+station-event-bluespace-wizardfederation-scout-start-announcement = Attention all available NanoTrasen personnel! NanoTrasen Naval Command detected a Bluespace Anomaly in your sector with the signature indicative of the imminent arrival of a Wizard Federation small vessel. Code: Intercept, Detain, Incarcerate. Arrest the intruders and prepare them for transportation to CentCom for interrogation through NT patented Contraband Exchange System (tm).
 station-event-bluespace-wizardfederation-scout-end-announcement = In compliance with NanoTrasen FTL traffic patterns, the Wizard Federation Vessel has been dissipated to ensure non-collision.
 
-station-event-bluespace-bloodmoon-start-announcement = A̴̗̕ť̸͓t̸͍̂ë̶͈́̇n̵̠̑t̸̗̅i̸̜̓ő̷͉̭̀n̸̠̿̉ ̷̘̿ȃ̵̲͍͑l̴̲̽͒l̵͔̺̔̉ ̶̩̥͋̋S̵̟̼̐ē̷͓c̶̯̏̒u̸̱̿͊r̶̡͉̈́i̶̙̲͒t̷̢̻͌y̷͇̾̐ ̶͗͜p̵̲͂͆͜e̶̥̣̅ṟ̴͆s̶̹̋o̶̩͓̔͗n̸̝̄̔ṋ̵̓͌͜e̷̮͓̊l̴̩̞̕!̶̬͚̋̚ ̶̻̌̐N̶̖͇͗T̴͎̝̓̋ ̸̛̯N̸͙̓á̵̩̀v̷̬̫́a̸̰̒ļ̸̱͠ ̸͔̕ͅC̶̡͊ò̷̺͊m̶̫̐̽m̶͉̉a̷͖̾n̵̨̞̍̅d̶͓̥̀ ̶̨͖̀͝d̷͎̤̆͑e̶͚͎͗t̷̹̤̉̽e̷͙̽c̴̱͗t̴͖͈̅̽e̶͓̓d̵̼̱̈́ ̵̞̀͆b̸͍̼̋̂l̵͎͆u̵̻̐̚é̵̢̲s̴̢͇̒ṗ̴͉à̶̩̥ć̴͉ê̷͎͠ ̵̧̃͛a̸͙͙̾n̵͚͋o̸̤͑m̸͉̼̆̈́å̴̫l̷̜͂y̷͎̋͛ ̵̨͋ỉ̵̬ͅn̴̨͔͂͗ ̸̙̈̑y̴͉̮̾ȍ̴̠ų̶͝r̵͔̦̍͌ ̴̬̗͑s̷̻̆̒ě̴̗̲c̸̠̦̚t̸̬̅ỏ̵̝͂r̸̮̦̆ ̵͈͝w̴͍͊ỉ̴̯̙̕t̷͖̗̍̍h̷̳̭́ ̴̮̦̃̑t̷̩̓̌ḩ̷͇͝e̵͐́͜ ̸̳̈́͠s̶̖͌į̵̙̚̕g̵̰̓ñ̸̝̽a̷͖͊t̶̲̑u̸̬̾̑r̴̲͚̊̐ē̴̮ ̸̪͛i̴̝͆n̵͈̎̄d̶̥̍̄ȉ̶̜͕̇c̵̳̻͛ǎ̶̱̠̈t̴̢̘̉̔i̵͍͂̔v̸̢̛ͅe̷̛̬͘ ̸̠̱̅͠ŏ̵̹̲f̸͖̱̃̒ ̶͎̽i̵͙̱̊͘m̴̙̞̚m̷͖͉͋ǐ̴̠̊n̸̗̗̂̿è̶͇͖n̷̺̖̚t̵͎͉̽ ̴̝̑͗a̸̖̓̆ȑ̷̢̹̾r̷̬̓͜i̸̞̅v̷̗̒̍͜a̸̱̬̋̓ḽ̵̓ ̷̻̬̃ó̷̧̋f̷̨̈̈́͜ ̷̣͛a̸̞͛ ̴̼̮̈́̀B̵̖͊l̵̻̈́ͅo̴̧̺͗ő̸̳d̶̦̲̈͊ ̷͚̪̇C̶̨̽u̵̥̇l̴̥̣̋̆ṭ̵̞͒̔i̵̐͜s̵̰̏t̴̺̍̽'̴̢͘s̸̬̗̋ ̸͓̌v̷̼̆͛é̶̲͓s̴͙̯̄s̷̯̐̀ẻ̴̮̔l̶̢̀̈́.̷̳͠ ̵͓̜̓S̶̬̫͌e̵̱̣͐͘c̵̖̘̾u̷͎͜͠r̷͚̖̀̀i̵̪͖͗t̸͉͇̎̐y̵̺̼̽͗ ̷̖̋͝C̴̹͝ò̶̤ḓ̴̮̽̈e̴̦̕:̴͕̀̚ ̸̗̂͋Ì̴̪͗n̴̛͎ẗ̵̠̺̅e̷͔̍ͅr̴̖̯̋c̸̨͆e̴̻̖̓͠p̴̤̉t̴̰̆,̴̱̿̄ ̶̫̄Ȅ̵̝̤x̴̥̂͊p̸͕̟̽̕ú̸͙̖̈́n̶͙͗̈́g̶̟̯͑e̸̲̤͂͑,̶͉̤̃ ̷̰͐̆E̶̺͝x̵̛̭̔t̷͔̅e̸̜̩̓͝r̸̻͔̿͋m̵̢̆̄i̴̧͚͌n̷̜̼͊a̴̭̭̓t̸̘̘͝e̶̙̎͐,̶̱͚̽͐ ̷̖̥̔C̸̮̽ầ̸̞u̴̮̿͑t̶͉̕e̶̥͝r̸͔̘͛̏i̵̡̝͆s̵͚͇̃e̷̯͔͊͐.̸̮͊̆ ̶̧̰͒Ȅ̴̻̭̊x̵̞̋̍p̵̱͗̕e̶̛̦ĉ̴̣̅t̶̡̞̃͠ ̴̪̙͆a̴͉̪͋͑ř̷̛͕m̸̙͂͛ḙ̴͎̈́̑d̴̠̒ ̴̢̅o̷̟̪͐͊p̷̤̄p̷̲̠̑̓o̴͔͐͠ś̸̗i̸̩̓͌t̵̜̎i̷̱̅͠o̵̻̅͆ņ̶̱̇,̴̗̊̃ ̸̥̆u̵̪͂s̸̖͊̾e̷̫̭̒̇ ̷̫̲̓̊o̵̠͂f̵̺̿ ̸̦̞̅̔ļ̷̯̄̃ē̸͕t̸͖͗h̸̨͕̆̑à̷͓̫́ḽ̸̛͚̃ ̷̼̟͘f̵̻̱̈́̌ȏ̵̦r̸̭͘ͅć̸̼̂e̴͔̠̊̚ ̶̻̍ä̷̰̩g̷̠͒ą̸̩̈͌i̶̘̘̒͊n̵͖̏s̸̩̏͜t̶͇̳̍ ̵̪̲̋̓ȩ̸̙̏n̷͖̽͑ë̴̞͚́m̴̺͑̈y̵̤̅͂ ̵̥̼͛ạ̵̩̇g̸̣̪͊͂e̷͎̔͂n̸̳̎t̵̥̀s̵̛͚̗̀ ̷̡̝́́ī̶̹͇s̷͓̠̆ ̶̤̤̔͝a̷͇̝͌̇ũ̵͎̤͊t̵̡͖̽ḧ̸̝̥́o̵͙͑ȑ̵̟̮i̷̺͗ż̵͇̍é̸̙̏͜d̷̼̊.̴̮̗̑̿ ̵̰̇P̵͎̟͛ȓ̸͚é̶̤͍̈́v̵͔͑͂e̴͍͉̿͘ṇ̷̝͛t̶̗͚̕ ̶̫͇̉͋N̵̯͛T̸͔̂̚-̷̣̋̕á̷̬͉͘f̵̳̖̀͘f̸͎̟̄i̷̖̺͊́l̶̗͆̄i̷̧͙͑́a̶͂̑͜t̸̘̿̚e̸̺̓d̵̡̪̈́͋ ̷̞͐c̴̺̻͊a̶̮̱̍͠p̶̭̹̌t̴̳̱̒̀a̴̪͉̐i̸̖̎̏n̷͎̫̾s̶̫̖̒̚ ̵̣̒w̴̨̗̒i̸̬̚t̴̝͆h̴̪̮̑̃o̶̥̲̔͘u̷̲̣̐̏t̸̩͌͝ ̵̧̧͛́s̸̬͑̾e̵̯̜̐̈́č̷̮̰u̴̗̜̕r̷͇͇̽̀i̷̛̫̿t̸̞̓͝y̷̨̔ ̶̪̒̈́a̴̻͇̅c̷͙̯̀c̸̩̃̃e̸͇͙̓s̷̭̣͊s̷͇̭̉ ̶̠͂͠f̵͙̣̉͌r̵̲̐͗ǫ̶̬͑͝m̸̖̓ ̷͖̹̌̌ĝ̸̹̍ą̴̂͘i̸͈̺͆̇n̶̜̋ḯ̵̼̮n̵̺̉͊g̸̗̱͘ ̴̪̞̃a̶̩̯͐͂c̶͕̯̓c̷̮̟̿̒ë̷͙́̀s̶̨̳̋s̸̜̆̑ ̵̯̆̎t̷̞͕͆o̶̡̞͐ ̴̱̈́͝t̶͇̋̃h̵̟̼̀e̴̦̼͐̚ ̷̟̗̓͂e̵͙̓̂n̴̻͂̃ȩ̸̻͑m̴̢͋͊ý̷̬́ ̵͔͛v̵͔̓̂͜e̸̖̋ṡ̴̹͑s̴̬̈͋ė̵̖̈l̴̗͆̓ͅ ̷̛̱̀a̷̡̫̿n̸̜̟̓̕d̷͙̜͌̅ ̴̗́͑i̵̫͌ṯ̴̢͝s̵̫̼͂ ̷̱̥͗̓c̴͖͐̚o̶͕͍͒ń̷̞ṱ̸͖̒͛e̷͋ͅn̵̖̠̉͒t̴̲̋̚ș̸͍̈́.̸͖̅̓ ̸̧͛̄A̷͖̞͒͘n̷̮̥̿ḑ̷͊͠ ̵̬͚͂̊ȑ̷̰e̶̬͗ṃ̶̓ͅê̴̬ṁ̴̖͝b̶̨͘e̷̼̫̍r̷͔̦̓̓:̷̜͠ ̸̤̎N̵̢̖͐a̶͘ͅr̶̳̚'̸͈̝̽̕S̶͔̳̎̅i̷̠̝̓è̴͙͛ ̶͖͚͆͂i̸͓͠͝s̸͎͐̀ ̸̻̀̑n̸̮͆ö̶͙̮̇t̵̛̟͝ ̴͎̐͜r̴̘̹͑͛e̴̙̱͂a̵̖͑̆l̵͓̝͑ ̸̝̀á̵͙͎n̶̞̊̉d̶̥͙́̄ ̴̥̫̽c̴̨͉̐̀a̷̲͋̕n̸̦̽ ̷̖̾̕n̸̤̥͑͑ó̵̳t̸̡͆̅ ̸͈͚̒͆h̴͉͔̕u̴̠̩͌̑r̷̡̟̄̋t̵̗̰̃ ̵̛̭y̸͖̯͐ò̸͔̜̈ū̸ͅ.̸̨̜̕
-station-event-bluespace-bloodmoon-end-announcement = I̶̼͈͊̽n̶͉͉̈ ̶̭̝̈c̷̯͔̀o̸̙̊m̸̥̕͜͝p̸͋͜l̵͖͆i̴̛̗̟̓a̴͚̼͗n̸͔͙̓c̶̹̠͌ė̶͙̮ ̸̟́w̶͓̫̎ḯ̷͕t̶͚̩̍h̵̰͘ ̷̫͕̂̊Ň̸̥̞͂a̷̻̐n̴̖̺̒̄o̸̺͚͊́T̵̨̔̃ͅr̷̢͈̾á̸͉͛s̵̞̒ę̴͠n̵̩̈́ ̴̫̐̅F̸̹̤͗̈́T̸̹̅͜L̷̙̱͠ ̷̛͍͒t̴̘̣̔͝r̵̥̈́à̴̮͝f̴͉͇͆̎f̴͙̗̿̈́ȋ̸͍c̶̯͜͠ ̴̨̧̐͒p̷̬̻͐̊a̵͚̓̏t̴͇̺͌̕t̷͈͂̾ḙ̴͎͘ṛ̶̂n̷͔̈́͌s̴̡̤̊̆,̵͍̭͑̔ ̷͎̾t̵̜̪͆ḩ̸͗ę̶͉̏̽ ̶̠̎̑W̶̙̍̚i̴̢̜͘z̵̈́͂͜a̸͓̥̿͑r̵̭͆́ͅd̷̘͉͝ ̴̧̉ͅF̴͇̌͘ë̸͍͎́̀d̶̨̲́͠e̶̪̽͜͠ȑ̶̩͘à̸̺t̴̨̻̀͝ì̷͕̣̄o̶̢͑͠n̴̟̈́ ̸̹̈ͅV̸̜͑ė̵̥̩́s̵̖̓ṡ̵̲̮ȩ̷̈́l̷̰͠ ̸̥̇̆h̵̯͂a̷̜̗͝s̷̻̯̈́̍ ̸͈͂b̸̪̓̇e̸͍̰͋͗e̶͚̜̅̽n̷̡̯̓̋ ̴̤͎̃d̸͇̽i̸͚̍͠s̴̨̍͝ṡ̸͚̩͠ǐ̴̜͘p̵̣͂͂a̸͓̔́t̷̟̱̋̌e̷͕̒͂d̶̦͂͝ ̷̳̈́ṫ̵͈̀ò̵̡̟ ̶͔͂ḙ̸͍́͆n̶̩̐ṣ̸́ǔ̸̠͖ř̸̘̱͑ē̴̜͈ ̵̻͋͌n̴̪̩̊o̶̭̙̅n̶͇̑͒-̸̘̚̚c̸͖̩͌͘ö̴̡͌ͅl̵̳̗̓l̵͖̓̆i̷͖͝ͅs̵̘̝͝i̷̧̜͑̔o̷̼̲͐́ṋ̴̘͠.̶̡͎̌
+station-event-bluespace-bloodmoon-start-announcement = Attention all available NanoTrasen personnel! NanoTrasen Naval Command detected a Bluespace Anomaly in your sector with the signature indicative of the imminent arrival of a Blood Cult's Vessel. Code: Intercept, Expunge, Exterminate, Cauterise. Expect armed opposition, use of lethal force against enemy combatants is mandatory, take no prisoners. Warning! Materials on the Blood Cult's Vessel possess Level 3 Cognitohazard! Local security force is advised to take steps to limit NT personnel's exposure to hazardous materials. Reminder: NT personnel who are granted security clearance for the engagement are required to surrender any hazardous materials to the local security department for containment and undergo a medical examination afterward.
+station-event-bluespace-bloodmoon-end-announcement = In compliance with NanoTrasen FTL traffic patterns, the Blood Cult's Vessel has been dissipated to ensure non-collision.
diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl
@@ -1,6 +1,9 @@
 job-description-ertmailcarrier = Nothing stops the mail.
 job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law.
 job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates and dodge asteroids. You are a leaf on the solar wind, let others marvel at how you soar.
+job-description-pirate = Drink grog, follow orders, swab the deck, and adhere to your Captain and your code.
+job-description-pirate-captain = Lead a crew of ne'er-do-wells across the open space and plunder, respectfully, always following the code.
+job-description-pirate-first-mate = Assist your captain in any hijinks you find yourselves in.
 job-description-security-guard = Patrol the empty halls, whistle simple tunes you heard on radio, jingle your keychain and scurry away at the sight of danger.
 job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships.
 job-description-sr = Handle access reassignment fairly using your ID console, manage Frontier outpost, and keep Clippy safe.
diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl
@@ -1,6 +1,9 @@
 job-name-ertmailcarrier = ERT Mail Carrier
 job-name-mercenary = Mercenary
 job-name-pilot = Pilot
+job-name-pirate = Pirate
+job-name-pirate-captain = Pirate Captain
+job-name-pirate-first-mate = Pirate First Mate
 job-name-security-guard = Security Guard
 job-name-stc = Station Traffic Controller
 job-name-sr = Station Representative
@@ -9,5 +12,8 @@ job-name-sr = Station Representative
 JobERTMailCarrier = ERT Mail Carrier
 JobMercenary = Mercenary
 JobPilot = Pilot
+JobPirate = Pirate
+JobPirateCaptain = Pirate Captain
+JobPirateFirstMate = Pirate First Mate
 JobSecurityGuard = Security Guard
 JobSTC = Station Traffic Controller
diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-engineering.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-engineering.ftl