new-frontiers-14 · dustylens · Nov 24, 2024 · Nov 24, 2024 · Nov 24, 2024 · Nov 26, 2024
diff --git a/.github/mapchecker/config.py b/.github/mapchecker/config.py
@@ -52,5 +52,8 @@
     ],
     "Sr": [
         "ButtonFrameCautionSecurity",  # Decal.
+    ],
+    "Medical": [
+        "ButtonFrameCautionSecurity",  # Decal.
     ]
 }
diff --git a/Content.Server/_NF/Bank/BankSystem.Ledger.cs b/Content.Server/_NF/Bank/BankSystem.Ledger.cs
@@ -40,19 +40,6 @@ sealed class AccountInfo
         public List<(LedgerEntryType Type, int Value)> Expenses = new();
     }
 
-    static string GetAccountName(SectorBankAccount account)
-    {
-        switch (account)
-        {
-            case SectorBankAccount.Frontier:
-                return "Frontier Outpost";
-            case SectorBankAccount.Nfsd:
-                return "NFSD";
-            default:
-                return account.ToString();
-        }
-    }
-
     public string GetLedgerPrintout()
     {
         if (!TryComp(_sectorService.GetServiceEntity(), out SectorBankComponent? ledger))
@@ -87,7 +74,7 @@ public string GetLedgerPrintout()
         // Build our printouts
         foreach (var (account, accountInfo) in accountDict)
         {
-            builder.AppendLine(Loc.GetString("ledger-printout-account", ("account", GetAccountName(account))));
+            builder.AppendLine(Loc.GetString("ledger-printout-account", ("account", Loc.GetString($"ledger-tab-{account}"))));
             builder.AppendLine(Loc.GetString("ledger-printout-income-header"));
             foreach (var income in accountInfo.Income)
             {

diff --git a/Content.Server/_NF/Medical/MedicalBountyRedemptionComponent.cs b/Content.Server/_NF/Medical/MedicalBountyRedemptionComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Bank.Components;
 using Robust.Shared.Audio;
 
 namespace Content.Server._NF.Medical;
@@ -25,4 +26,7 @@ public sealed partial class MedicalBountyRedemptionComponent : Component
     /// </summary>
     [DataField]
     public SoundSpecifier DenySound = new SoundPathSpecifier("/Audio/Effects/Cargo/buzz_sigh.ogg");
+
+    [DataField]
+    public Dictionary<SectorBankAccount, float> TaxAccounts = new();
 }
diff --git a/Content.Server/_NF/Medical/MedicalBountySystem.cs b/Content.Server/_NF/Medical/MedicalBountySystem.cs
@@ -1,12 +1,14 @@
 
 using System.Linq;
+using Content.Server._NF.Bank;
 using Content.Server._NF.Medical.Components;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Server.Traits.Assorted;
+using Content.Shared._NF.Bank.BUI;
 using Content.Shared._NF.Medical;
 using Content.Shared._NF.Medical.Prototypes;
 using Content.Shared.Chemistry.Components;
@@ -39,6 +41,7 @@ public sealed partial class MedicalBountySystem : EntitySystem
     [Dependency] UserInterfaceSystem _ui = default!;
     [Dependency] PowerReceiverSystem _power = default!;
     [Dependency] SharedAppearanceSystem _appearance = default!;
+    [Dependency] BankSystem _bank = default!;
 
     private List<MedicalBountyPrototype> _cachedPrototypes = new();
 
@@ -175,6 +178,12 @@ private void RedeemMedicalBounty(EntityUid uid, MedicalBountyRedemptionComponent
         {
             // Use SpawnMultiple in case spesos ever have a limit.
             _stack.SpawnMultiple("SpaceCash", bountyPayout, Transform(uid).Coordinates);
+
+            // Pay tax accounts
+            foreach (var (account, taxCoeff) in component.TaxAccounts)
+            {
+                _bank.TrySectorDeposit(account, (int)(bountyPayout * taxCoeff), LedgerEntryType.MedicalBountyTax);
+            }
         }
 
         QueueDel(bountyUid);

diff --git a/Content.Shared/Shipyard/SharedShipyardSystem.cs b/Content.Shared/Shipyard/SharedShipyardSystem.cs
@@ -18,6 +18,7 @@ public enum ShipyardConsoleUiKey : byte
     Expedition,
     Scrap,
     Sr,
+    Medical,
     // Add ships to this key if they are only available from mothership consoles. Shipyards using it are inherently empty and are populated using the ShipyardListingComponent.
     Custom
 }

diff --git a/Content.Shared/_NF/Bank/BUI/NFLedgerState.cs b/Content.Shared/_NF/Bank/BUI/NFLedgerState.cs
@@ -32,6 +32,7 @@ public enum LedgerEntryType : byte
     BlackMarketShipyardTax,
     BluespaceReward,
     AntiSmugglingBonus,
+    MedicalBountyTax,
     StationDepositFines,
     StationDepositDonation,
     StationDepositAssetsSold,

diff --git a/Content.Shared/_NF/Bank/Components/StationBankATMComponent.cs b/Content.Shared/_NF/Bank/Components/StationBankATMComponent.cs
@@ -34,5 +34,6 @@ public enum SectorBankAccount : byte
 {
     Invalid, // No assigned account.
     Frontier,
-    Nfsd
-}
+    Nfsd,
+    Medical,
+}
diff --git a/Resources/Locale/en-US/_NF/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/_NF/cartridge-loader/cartridges.ftl
@@ -12,8 +12,10 @@ ledger-total-expenses = Total Expenses
 ledger-no-expenses = None
 ledger-balance = Balance:
 ledger-no-balance = N/A
-ledger-tab-Frontier = Frontier
+
+ledger-tab-Frontier = Frontier Outpost
 ledger-tab-Nfsd = NFSD
+ledger-tab-Medical = Medical Dispatch
 # Fallback, if this displays, something's wrong.
 ledger-tab-Unknown = Unknown
 
@@ -24,6 +26,7 @@ ledger-entry-type-MailDelivered = Mail Payments
 ledger-entry-type-BlackMarketAtmTax = Anon. Benefactors
 ledger-entry-type-BlackMarketShipyardTax = Anon. Scrap Resale
 ledger-entry-type-BluespaceReward = Guard Duty Rewards
+ledger-entry-type-MedicalBountyTax = Medical Bounties
 ledger-entry-type-AntiSmugglingBonus = Anti-Smuggling
 ledger-entry-type-StationDepositFines = Fines Deposited
 ledger-entry-type-StationDepositDonation = Donations

diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
@@ -13,6 +13,7 @@ guide-entry-nfsd-smuggling = Smuggling
 
 # Medical entries
 guide-entry-medical-bounties = Medical Bounties
+guide-entry-medical-doc = Director of Care
 
 # Reference entries
 guide-entry-medicalrecipes = Medical Recipes

diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl
@@ -5,6 +5,7 @@ job-description-contractor = Fulfill any profitable contracts out on the frontie
 job-description-deputy = Catch criminals and enemies of the corporation, enforce the law, and ensure that the sector does not fall into disarray.
 job-description-nf-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes.
 job-description-ertmailcarrier = Nothing stops the mail.
+job-description-medical-operations-manager = Provide guidance and direction for shift medics and work to safeguard the health of Nanotrasen personnel. 
 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.
@@ -15,4 +16,4 @@ job-description-security-guard = Patrol the empty halls, whistle simple tunes yo
 job-description-senior-officer = Teach new deputies the basics of searches, preforming arrests, prison times and how to properly shoot a firearm.
 job-description-sheriff = Manage your department and keep them efficient, quell dissent, and keep the sector safe.
 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.
+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
@@ -16,6 +16,7 @@ job-name-sheriff = Sheriff
 job-name-stc = Station Traffic Controller
 job-name-sr = Station Representative
 job-name-pal = Public Affairs Liaison
+job-name-doc = Director of Care
 
 # Job titles
 job-title-ert-mail-carrier = ERT Mail Carrier

diff --git a/Resources/Locale/en-US/_NF/lobby/lobby.ftl b/Resources/Locale/en-US/_NF/lobby/lobby.ftl
@@ -1,10 +1,11 @@
-frontier-lobby-station-title = Station
+frontier-lobby-station-title = Station
 frontier-lobby-available-jobs = Available Jobs
 frontier-lobby-no-stations-available = There are no stations available at this time.
 frontier-lobby-no-crews-available = Currently there are no captains looking for crews.
 frontier-lobby-station-subtext = Wake up from cryosleep to become captain, find adventure, or employed as staff onboard a station such as janitor, mail carrier, or security staff.
 frontier-lobby-crew-title = Crew
 frontier-lobby-crew-subtext = Start your round aboard a ship amongst a crew that is looking for new crewmembers to give them a helping hand, whether you are a new or seasoned pilot!
+
 frontier-lobby-frontier-subtext = Main hub for many space pioneers.
 frontier-lobby-frontier-description = Awaken from cryosleep here to:
    - Start your own crew and become captain
@@ -13,22 +14,31 @@ frontier-lobby-frontier-description = Awaken from cryosleep here to:
    - Socialize with other pioneers
  Some of the roles on this station are whitelist-only and require an application in the discord to be accepted.
 
-frontier-lobby-nfsd-subtext = The center of operations for the Sheriffs department.
 frontier-lobby-exped-subtext = Where seasoned mercenaries gather.
 frontier-lobby-exped-description = This is base camp for mercenaries and alike. Here you can:
    - Start a mercenary crew
    - Find a crew to join
    - Purchase weapons and gear
    - Purchase expedition-ready ships
    - Socialize with other mercenaries - or not.
+
+frontier-lobby-medical-subtext = The medical dispatch hub and search and rescue center.
+frontier-lobby-medical-description = Frontier's medical dispatch hub. Here you can:
+   - Start or find a medical response crew
+   - Socialize with other medics
+   - Purchase medical specialist ships
+   - Drop off medical bounties  
+ Some of the roles on this station are whitelist-only and require an application in the discord to be accepted.
+
+frontier-lobby-nfsd-subtext = The center of operations for the Sheriffs department.
 frontier-lobby-nfsd-description = The New Frontier Sheriff's Department is the center of operations for the Sheriffs department. Here you can:
    - Join the Sheriffs department
    - Apply for a bounty hunting license
    - Report crimes
+
 frontier-lobby-pirate-subtext = Where "X" marks the spot and rum never runs dry.
 frontier-lobby-pirate-description = This is the ultimate hideout where scallywags and pirates gather. Here you can:
    - Start a pirate crew
    - Find a crew to join
    - Socialize with other pirates
  The roles on this station are whitelist-only and require an application in the discord to be accepted.
-
diff --git a/Resources/Locale/en-US/_NF/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/_NF/navmap-beacons/station-beacons.ftl
@@ -23,6 +23,8 @@ station-beacon-head = Head
 station-beacon-atmos-nf = Atmospherics
 station-beacon-atmos-burn = Burn Chamber
 station-beacon-atmos-collector = Gas Collector Array
+station-beacon-lobby = Lobby
+station-beacon-doc-office = DoC's Office
 
 station-beacon-eva-access = EVA Access
 station-beacon-dock-one = Dock 1
@@ -33,4 +35,4 @@ station-beacon-dock-five = Dock 5
 station-beacon-dock-six = Dock 6
 station-beacon-dock-six-a = Dock 6a
 station-beacon-dock-six-b = Dock 6b
-station-beacon-dock-six-c = Dock 6c
+station-beacon-dock-six-c = Dock 6c
diff --git a/Resources/Locale/en-US/_NF/paper/stamp-component.ftl b/Resources/Locale/en-US/_NF/paper/stamp-component.ftl
@@ -4,6 +4,7 @@ stamp-component-signee-name = {$user}
 
 stamp-component-stamped-name-doctor = Doctor
 stamp-component-stamped-name-engineer = Engineer
+stamp-component-stamped-name-doc = Director of Care
 stamp-component-stamped-name-pal = Public Affairs Liaison
 stamp-component-stamped-name-stc = Station Traffic Controller
-stamp-component-stamped-name-sr = Station Representative
+stamp-component-stamped-name-sr = Station Representative
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ public enum ShipyardConsoleUiKey : byte @@
         Expedition,
         Scrap,
         Sr,
+        Medical,
         // Add ships to this key if they are only available from mothership consoles. Shipyards using it are inherently empty and are populated using the ShipyardListingComponent.
         Custom
     }
@@ Expand Down @@