Merge branch 'master' into 38mindbreakerfix

Content.Client/Credits/CreditsWindow.xaml.cs

@@ -29,9 +29,9 @@ public sealed partial class CreditsWindow : DefaultWindow
 
         private static readonly Dictionary<string, int> PatronTierPriority = new()
         {
-            ["Nuclear Operative"] = 1,
-            ["Syndicate Agent"] = 2,
-            ["Revolutionary"] = 3
+            ["Central Commander"] = 1,
+            ["Captain"] = 2,
+            ["Assistant"] = 3
         };
 
         public CreditsWindow()

Resources/Changelog/DeltaVChangelog.yml

@@ -1544,3 +1544,17 @@ Entries:
       message: Fixed martial artist access
   id: 232
   time: '2024-02-08T15:39:24.0000000+00:00'
+- author: IamVelcroboy
+  changes:
+    - type: Tweak
+      message: >-
+        More improvements all around to Submarine Station as well as the
+        addition of medical cyborgs. 
+  id: 233
+  time: '2024-02-08T19:21:16.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Fix
+      message: Fixed missing Mantis stamp sprite.
+  id: 234
+  time: '2024-02-09T10:47:35.0000000+00:00'

Resources/Credits/Patrons.yml

@@ -1,212 +1,58 @@
-- Name: "Tomeno"
-  Tier: Revolutionary
-- Name: "Daniel Thompson"
-  Tier: Revolutionary
-- Name: "Farewell Fire"
-  Tier: Syndicate Agent
-- Name: "MetalClone"
-  Tier: Nuclear Operative
-- Name: "CPM311"
-  Tier: Revolutionary
-- Name: "Bobberunio"
-  Tier: Revolutionary
-- Name: "vifs_vestige"
-  Tier: Syndicate Agent
-- Name: "Anthony Fleck"
-  Tier: Nuclear Operative
-- Name: "Nico Thate"
-  Tier: Revolutionary
-- Name: "Zandario"
-  Tier: Nuclear Operative
-- Name: "Darren Brady"
-  Tier: Revolutionary
-- Name: "DramaBuns"
-  Tier: Revolutionary
-- Name: "Ethan Keller"
-  Tier: Revolutionary
-- Name: "Eric VW"
-  Tier: Revolutionary
-- Name: "Joshington Awesomahee"
-  Tier: Revolutionary
-- Name: "Altana"
-  Tier: Revolutionary
-- Name: "clyf"
-  Tier: Nuclear Operative
-- Name: "spinnermaster"
-  Tier: Syndicate Agent
-- Name: "Will M."
-  Tier: Revolutionary
-- Name: "The Hateful Flesh"
-  Tier: Revolutionary
-- Name: "Viridian"
-  Tier: Revolutionary
-- Name: "Nicholas Hillblom"
-  Tier: Revolutionary
-- Name: "Austin Nelson"
-  Tier: Syndicate Agent
-- Name: "John Edward Hamilton Barchard"
-  Tier: Revolutionary
-- Name: "Cormos Lemming"
-  Tier: Nuclear Operative
-- Name: "Hamcha"
-  Tier: Revolutionary
-- Name: "Peter \"Azmond\" Newhouse"
-  Tier: Revolutionary
-- Name: "Zakanater 19"
-  Tier: Revolutionary
-- Name: "Kris Piper"
-  Tier: Revolutionary
-- Name: "Mikhail"
-  Tier: Revolutionary
-- Name: "Ramiro Agis"
-  Tier: Revolutionary
-- Name: "osborn"
-  Tier: Syndicate Agent
-- Name: "Uinseann"
-  Tier: Revolutionary
-- Name: "Brandon Campbell"
-  Tier: Nuclear Operative
-- Name: "KevKev"
-  Tier: Revolutionary
-- Name: "Jacob Schramm"
-  Tier: Revolutionary
-- Name: "Matouš Hrdlička"
-  Tier: Nuclear Operative
-- Name: "Pasemi"
-  Tier: Revolutionary
-- Name: "Late Fox"
-  Tier: Revolutionary
-- Name: "Dan"
-  Tier: Syndicate Agent
-- Name: "Scott MacCombie"
-  Tier: Nuclear Operative
-- Name: "Gaxeer"
-  Tier: Syndicate Agent
-- Name: "Tamora Droppa"
-  Tier: Revolutionary
-- Name: "Gavin Simmons"
-  Tier: Syndicate Agent
-- Name: "Saphire"
-  Tier: Revolutionary
-- Name: "DubzyVEVO"
-  Tier: Revolutionary
-- Name: "Never Solus"
-  Tier: Syndicate Agent
-- Name: "Gnomo"
-  Tier: Nuclear Operative
-- Name: "TheGoldElite"
-  Tier: Revolutionary
-- Name: "JhenMaster"
-  Tier: Revolutionary
-- Name: "Akira"
-  Tier: Revolutionary
-- Name: "Dave"
-  Tier: Revolutionary
-- Name: "Александр Белошапка"
-  Tier: Revolutionary
-- Name: "Gordod"
-  Tier: Syndicate Agent
-- Name: "tomhendo"
-  Tier: Syndicate Agent
-- Name: "Odin The Wanderer"
-  Tier: Revolutionary
-- Name: "tokie"
-  Tier: Nuclear Operative
-- Name: "Wallace Megas"
-  Tier: Revolutionary
-- Name: "Vandell"
-  Tier: Revolutionary
-- Name: "Enricoc3l"
-  Tier: Revolutionary
-- Name: "DadNotTheBelt"
-  Tier: Nuclear Operative
-- Name: "David"
-  Tier: Revolutionary
-- Name: "Watson Whittington"
-  Tier: Syndicate Agent
-- Name: "Tim Foley"
-  Tier: Syndicate Agent
-- Name: "Blight"
-  Tier: Syndicate Agent
-- Name: "Katarn"
-  Tier: Revolutionary
-- Name: "eric156"
-  Tier: Revolutionary
-- Name: "SHANE ALAN ZINDA"
-  Tier: Nuclear Operative
-- Name: "Glenn Olsen"
-  Tier: Syndicate Agent
-- Name: "Constellations"
-  Tier: Syndicate Agent
-- Name: "Charles Baron"
-  Tier: Syndicate Agent
-- Name: "Shaina Gibson"
-  Tier: Revolutionary
-- Name: "Wolfie"
-  Tier: Revolutionary
-- Name: "Alexandre Courtin"
-  Tier: Revolutionary
-- Name: "Geekyhobo2"
-  Tier: Revolutionary
-- Name: "Nicholas"
-  Tier: Nuclear Operative
-- Name: "GeneralMarty"
-  Tier: Revolutionary
-- Name: "HCG"
-  Tier: Revolutionary
-- Name: "ShaunTexas"
-  Tier: Syndicate Agent
-- Name: "Malachi Housewright"
-  Tier: Revolutionary
-- Name: "Petalmeat"
-  Tier: Syndicate Agent
-- Name: "Jakub Kędziora"
-  Tier: Syndicate Agent
-- Name: "Adam Smedstad"
-  Tier: Revolutionary
+- Name: "weirdrock"
+  Tier: Captain
+- Name: "Drifter Drifter"
+  Tier: Captain
+- Name: "Bikowu"
+  Tier: Assistant
+- Name: "Hasan al-Binabi"
+  Tier: Central Commander
+- Name: "lleft The Dragon"
+  Tier: Central Commander
+- Name: "Pandaconda"
+  Tier: Assistant
+- Name: "Lazhannya"
+  Tier: Captain
+- Name: "Bonktrauma"
+  Tier: Captain
+- Name: "Haltell"
+  Tier: Captain
+- Name: "Delta.Pizza"
+  Tier: Captain
+- Name: "steph kaus"
+  Tier: Captain
+- Name: "HyperionGM"
+  Tier: Central Commander
+- Name: "MikeAndIkes"
+  Tier: Assistant
+- Name: "Ashley"
+  Tier: Central Commander
+- Name: "mura"
+  Tier: Captain
+- Name: "Adeinitas"
+  Tier: Captain
+- Name: "Shock"
+  Tier: Captain
+- Name: "Dead Rabbit"
+  Tier: Captain
+- Name: "T-Dog"
+  Tier: Captain
 - Name: "oBerry"
-  Tier: Nuclear Operative
-- Name: "DireBoar"
-  Tier: Revolutionary
-- Name: "Ignoramis"
-  Tier: Revolutionary
-- Name: "Repo"
-  Tier: Nuclear Operative
-- Name: "612"
-  Tier: Revolutionary
-- Name: "Higgtastic"
-  Tier: Revolutionary
-- Name: "Sandvich enjoyer"
-  Tier: Revolutionary
-- Name: "Mihailo Trickovic"
-  Tier: Syndicate Agent
-- Name: "Vice Emargo"
-  Tier: Revolutionary
-- Name: "awndrssk"
-  Tier: Revolutionary
-- Name: "François Desautels"
-  Tier: Revolutionary
-- Name: "MasterFurret"
-  Tier: Revolutionary
-- Name: "tapohuy"
-  Tier: Revolutionary
-- Name: "Adam Clarke"
-  Tier: Nuclear Operative
-- Name: "Sam Hediger"
-  Tier: Syndicate Agent
-- Name: "Vexxtraordinary"
-  Tier: Revolutionary
-- Name: "Graded"
-  Tier: Syndicate Agent
-- Name: "Christian Hodel"
-  Tier: Revolutionary
-- Name: "IceStorm theDragon"
-  Tier: Revolutionary
-- Name: "Solidus Snake"
-  Tier: Nuclear Operative
-- Name: "Pangaron"
-  Tier: Syndicate Agent
-- Name: "Sed"
-  Tier: Nuclear Operative
-- Name: "Aiden Baker"
-  Tier: Revolutionary
+  Tier: Central Commander
+- Name: "Wakefield"
+  Tier: Captain
+- Name: "Hûvy"
+  Tier: Assistant
+- Name: "TheGungeonologist"
+  Tier: Central Commander
+- Name: "Ethan"
+  Tier: Captain
+- Name: "TeeJay Neuroth"
+  Tier: Captain
+- Name: "Neptunia_Counseling"
+  Tier: Central Commander
+- Name: "rosysyntax"
+  Tier: Assistant
+- Name: "Kurzaen"
+  Tier: Captain
+- Name: "tokie"
+  Tier: Central Commander

Resources/Locale/en-US/deltav/job/job-description.ftl

@@ -0,0 +1 @@
+job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department.

Resources/Locale/en-US/deltav/job/job-names.ftl

@@ -0,0 +1 @@
+job-name-medical-borg = Medical Cyborg