From a988edc0ea754952727bef74920e8fa35435b35c Mon Sep 17 00:00:00 2001
From: Checkraze <71046427+Cheackraze@users.noreply.github.com>
Date: Wed, 5 Mar 2025 13:48:49 -0500
Subject: [PATCH 1/4] PDA bounty contracts rework (#2967)

* proof of concept

* WIP

* Access utility, bounty contract progress

* tabbed controls

* minor cleanup and nullability fixes

* change notifications style

* allow removals

* NetEntity/EntityUid conversion

* More NetEntity conversion

* bool bugfix

* delete comments

* max vessel/name/desc length, UI fiddling

* consistent collection order, speso string

* timeout, minor bugfix

* mute notifications

* different bounty notification types per collection

* Hide unpopulated fields, category-specific message

* No extra colon in PDA announcement

* Admin logging, add/remove cleanup

* admin logging, set author via Actor

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
---
 .../BountyContracts/UI/BountyContractUi.cs    |  87 ++++--
 .../UI/BountyContractUiFragmentCreate.xaml    |  10 +-
 .../UI/BountyContractUiFragmentCreate.xaml.cs |  91 ++++--
 .../UI/BountyContractUiFragmentList.xaml      |   6 +
 .../UI/BountyContractUiFragmentList.xaml.cs   |  12 +-
 .../UI/BountyContractUiFragmentListEntry.xaml |  18 +-
 .../BountyContractUiFragmentListEntry.xaml.cs |  31 +-
 ...untyContractUiFragmentListPlaceholder.xaml |   4 +
 ...yContractUiFragmentListPlaceholder.xaml.cs |   9 +
 .../UI/BountyContractUiFragmentTabSet.xaml    |   3 +
 .../UI/BountyContractUiFragmentTabSet.xaml.cs |  38 +++
 .../_NF/Access/NFAccessUtilities.cs           |  52 ++++
 .../BountyContractDataComponent.cs            |  16 +-
 .../BountyContractSystem.Ui.cs                | 160 +++++-----
 .../BountyContracts/BountyContractSystem.cs   | 277 ++++++++++++++----
 Content.Shared.Database/LogType.cs            |   8 +
 .../BountyContractCollectionPrototype.cs      |  85 ++++++
 .../BountyContractsCartridgeComponent.cs      |  20 +-
 .../SharedBountyContractSystem.cs             |  94 +++---
 .../_NF/bounty-contracts/bounty-contracts.ftl |  26 +-
 .../Entities/Objects/Devices/cartridges.yml   |   2 -
 .../_NF/SectorServices/services.yml           |   5 +
 .../_NF/bounty_contract_collections.yml       |  31 ++
 23 files changed, 832 insertions(+), 253 deletions(-)
 create mode 100644 Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListPlaceholder.xaml
 create mode 100644 Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListPlaceholder.xaml.cs
 create mode 100644 Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentTabSet.xaml
 create mode 100644 Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentTabSet.xaml.cs
 create mode 100644 Content.Server/_NF/Access/NFAccessUtilities.cs
 create mode 100644 Content.Shared/_NF/BountyContracts/BountyContractCollectionPrototype.cs
 create mode 100644 Resources/Prototypes/_NF/bounty_contract_collections.yml

diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUi.cs b/Content.Client/_NF/BountyContracts/UI/BountyContractUi.cs
index 5f2c2d0fc1..5109ab8b45 100644
--- a/Content.Client/_NF/BountyContracts/UI/BountyContractUi.cs
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUi.cs
@@ -1,8 +1,10 @@
+using System.Linq;
 using Content.Client.UserInterface.Fragments;
 using Content.Shared._NF.BountyContracts;
+using Content.Shared.CartridgeLoader;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client._NF.BountyContracts.UI;
 
@@ -11,6 +13,8 @@ public sealed partial class BountyContractUi : UIFragment
 {
     private BountyContractUiFragment? _fragment;
     private BoundUserInterface? _userInterface;
+    private ProtoId<BountyContractCollectionPrototype> _lastCollection = "Command"; //FIXME: nasty.
+    private BoundUserInterfaceState? _lastState = null;
 
     public override Control GetUIFragmentRoot()
     {
@@ -21,6 +25,7 @@ public sealed partial class BountyContractUi : UIFragment
     {
         _fragment = new BountyContractUiFragment();
         _userInterface = userInterface;
+        _lastState = null;
     }
 
 
@@ -30,13 +35,10 @@ public sealed partial class BountyContractUi : UIFragment
             return;
 
         if (state is BountyContractListUiState listState)
-        {
             ShowListState(listState);
-        }
         else if (state is BountyContractCreateUiState createState)
-        {
             ShowCreateState(createState);
-        }
+        _lastState = state;
     }
 
     private void UnloadPreviousState()
@@ -46,9 +48,13 @@ public sealed partial class BountyContractUi : UIFragment
 
     private void ShowCreateState(BountyContractCreateUiState state)
     {
+        // If the previous state is already a create state, do not destroy our old state.
+        if (_lastState is BountyContractCreateUiState)
+            return;
+
         UnloadPreviousState();
 
-        var create = new BountyContractUiFragmentCreate();
+        var create = new BountyContractUiFragmentCreate(state.Collection);
         create.OnCancelPressed += OnCancelCreatePressed;
         create.OnCreatePressed += OnTryCreatePressed;
 
@@ -61,40 +67,83 @@ public sealed partial class BountyContractUi : UIFragment
     private void ShowListState(BountyContractListUiState state)
     {
         UnloadPreviousState();
+        var tabs = new BountyContractUiFragmentTabSet();
+        tabs.OnSelectCollection += OnSelectCollection;
+        state.Collections.Reverse(); // invert order, show latest first
+        foreach (var collection in state.Collections)
+        {
+            int newTabIndex = tabs.Children.Count();
+            if (collection == state.Collection)
+            {
+                var list = new BountyContractUiFragmentList();
+                list.OnCreateButtonPressed += OnOpenCreateUiPressed;
+                list.OnRefreshButtonPressed += OnRefreshListPressed;
+                list.OnRemoveButtonPressed += OnRemovePressed;
+                list.OnToggleNotificationPressed += OnToggleNotificationPressed;
+                list.SetContracts(state.Contracts, state.IsAllowedRemoveBounties, state.AuthorUid);
+                list.SetCanCreate(state.IsAllowedCreateBounties);
+                list.SetNotificationsEnabled(state.NotificationsEnabled);
+                tabs.Children.Add(list);
 
-        var list = new BountyContractUiFragmentList();
-        list.OnCreateButtonPressed += OnOpenCreateUiPressed;
-        list.OnRefreshButtonPressed += OnRefreshListPressed;
-        list.OnRemoveButtonPressed += OnRemovePressed;
+                tabs.CurrentTab = newTabIndex;
+                tabs.SetTabCollection(newTabIndex, collection);
+            }
+            else
+            {
+                var placeholder = new BountyContractUiFragmentListPlaceholder();
+                tabs.Children.Add(placeholder);
+                tabs.SetTabCollection(newTabIndex, collection);
+            }
+        }
 
-        list.SetContracts(state.Contracts, state.IsAllowedRemoveBounties);
-        list.SetCanCreate(state.IsAllowedCreateBounties);
-
-        _fragment?.AddChild(list);
+        _fragment?.AddChild(tabs);
+        _lastCollection = state.Collection;
     }
 
+    // UI event handlers
     private void OnRemovePressed(BountyContract obj)
     {
-        _userInterface?.SendMessage(new BountyContractTryRemoveUiMsg(obj.ContractId));
+        SendMessage(new BountyContractTryRemoveMessageEvent(obj.ContractId));
+    }
+
+    private void OnSelectCollection(ProtoId<BountyContractCollectionPrototype> collection)
+    {
+        SendMessage(MakeCommand(BountyContractCommand.RefreshList, collection));
     }
 
     private void OnRefreshListPressed()
     {
-        _userInterface?.SendMessage(new BountyContractRefreshListUiMsg());
+        SendMessage(MakeCommand(BountyContractCommand.RefreshList, _lastCollection));
     }
 
     private void OnOpenCreateUiPressed()
     {
-        _userInterface?.SendMessage(new BountyContractOpenCreateUiMsg());
+        SendMessage(MakeCommand(BountyContractCommand.OpenCreateUi, _lastCollection));
     }
 
     private void OnCancelCreatePressed()
     {
-        _userInterface?.SendMessage(new BountyContractCloseCreateUiMsg());
+        SendMessage(MakeCommand(BountyContractCommand.CloseCreateUi, _lastCollection));
+    }
+
+    private void OnToggleNotificationPressed()
+    {
+        SendMessage(MakeCommand(BountyContractCommand.ToggleNotifications, _lastCollection));
     }
 
     private void OnTryCreatePressed(BountyContractRequest contract)
     {
-        _userInterface?.SendMessage(new BountyContractTryCreateMsg(contract));
+        SendMessage(new BountyContractTryCreateMessageEvent(contract));
+    }
+
+    // Convenience functions for message creation
+    private BountyContractCommandMessageEvent MakeCommand(BountyContractCommand command, ProtoId<BountyContractCollectionPrototype> collection)
+    {
+        return new BountyContractCommandMessageEvent(command, collection);
+    }
+
+    private void SendMessage(CartridgeMessageEvent msg)
+    {
+        _userInterface?.SendMessage(new CartridgeUiMessage(msg));
     }
 }
diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml
index 9427dd4199..000fb7af40 100644
--- a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml
@@ -24,18 +24,18 @@
             </BoxContainer>
             <BoxContainer Orientation="Horizontal" Margin="4,4,4,4">
                 <Label Text="{Loc 'bounty-contracts-ui-create-vessel'}" MinWidth="80"/>
-                <OptionButton Name="VeselSelector" HorizontalExpand="True"/>
-                <LineEdit Name="VeselEdit" PlaceHolder="{Loc 'bounty-contracts-ui-create-vessel-placeholder'}"
+                <OptionButton Name="VesselSelector" HorizontalExpand="True"/>
+                <LineEdit Name="VesselEdit" PlaceHolder="{Loc 'bounty-contracts-ui-create-vessel-placeholder'}"
                           HorizontalExpand="True" Visible="False"/>
                 <Control MinSize="8 0" />
-                <Button Name="CustomVeselButton" Text="{Loc 'bounty-contracts-ui-create-custom'}"
+                <Button Name="CustomVesselButton" Text="{Loc 'bounty-contracts-ui-create-custom'}"
                         ToggleMode="True"/>
             </BoxContainer>
             <BoxContainer Orientation="Horizontal" Margin="4,4,4,4">
                 <Label Text="{Loc 'bounty-contracts-ui-create-reward'}" MinWidth="80"/>
-                <LineEdit Name="RewardEdit" MinWidth="80"/>
-                <Control MinSize="8 0" />
                 <Label Text="{Loc 'bounty-contracts-ui-create-reward-currency'}"/>
+                <Control MinSize="8 0" />
+                <LineEdit Name="RewardEdit" MinWidth="80"/>
             </BoxContainer>
             <BoxContainer Orientation="Vertical" Margin="4,4,4,4"
                           VerticalExpand="True" >
diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml.cs b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml.cs
index 45db5341c6..6121db674d 100644
--- a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml.cs
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml.cs
@@ -2,8 +2,8 @@ using System.Linq;
 using Content.Shared._NF.BountyContracts;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Client._NF.BountyContracts.UI;
@@ -11,45 +11,42 @@ namespace Content.Client._NF.BountyContracts.UI;
 [GenerateTypedNameReferences]
 public sealed partial class BountyContractUiFragmentCreate : Control
 {
+    [Dependency] IPrototypeManager _proto = default!;
     public event Action<BountyContractRequest>? OnCreatePressed;
     public event Action? OnCancelPressed;
 
     private List<BountyContractTargetInfo> _targets = new();
     private List<string> _vessels = new();
+    private ProtoId<BountyContractCollectionPrototype> _collection;
 
-    public BountyContractUiFragmentCreate()
+    public BountyContractUiFragmentCreate(ProtoId<BountyContractCollectionPrototype> collection)
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
         CategorySelector.OnItemSelected += opt => OnCategorySelected(opt.Id);
         NameSelector.OnItemSelected += opt => OnNameSelected(opt.Id);
-        VeselSelector.OnItemSelected += opt => OnVesselSelected(opt.Id);
+        VesselSelector.OnItemSelected += opt => OnVesselSelected(opt.Id);
 
         CustomNameButton.OnToggled += args => OnCustomNameToggle(args.Pressed);
-        CustomVeselButton.OnToggled += args =>  OnCustomVeselToggle(args.Pressed);
-        NameEdit.OnTextChanged += NameEditOnTextChanged;
-        RewardEdit.OnTextChanged += OnPriceChanged;
+        CustomVesselButton.OnToggled += args => OnCustomVesselToggle(args.Pressed);
+        NameEdit.OnTextChanged += _ => UpdateDisclaimer();
+        RewardEdit.OnTextChanged += _ => UpdateDisclaimer();
+        VesselEdit.OnTextChanged += _ => UpdateDisclaimer();
 
         var descPlaceholder = Loc.GetString("bounty-contracts-ui-create-description-placeholder");
         DescriptionEdit.Placeholder = new Rope.Leaf(descPlaceholder);
+        DescriptionEdit.OnTextChanged += _ => UpdateDisclaimer();
         RewardEdit.Text = SharedBountyContractSystem.DefaultReward.ToString();
 
         CreateButton.OnPressed += _ => OnCreatePressed?.Invoke(GetBountyContract());
         CancelButton.OnPressed += _ => OnCancelPressed?.Invoke();
 
+        _collection = collection;
+
         FillCategories();
         UpdateDisclaimer();
     }
 
-    private void OnPriceChanged(LineEdit.LineEditEventArgs obj)
-    {
-        UpdateDisclaimer();
-    }
-
-    private void NameEditOnTextChanged(LineEdit.LineEditEventArgs obj)
-    {
-        UpdateDisclaimer();
-    }
-
     public void SetPossibleTargets(List<BountyContractTargetInfo> targets)
     {
         // make sure that all targets sorted by names alphabetically
@@ -76,10 +73,15 @@ public sealed partial class BountyContractUiFragmentCreate : Control
         _vessels = vessels;
 
         // update ships dropdown
-        VeselSelector.Clear();
+        VesselSelector.Clear();
+        int listIndex = 0;
         for (var i = 0; i < _vessels.Count; i++)
         {
-            VeselSelector.AddItem(_vessels[i], i);
+            if (string.IsNullOrWhiteSpace(_vessels[i]))
+                continue;
+
+            VesselSelector.AddItem(_vessels[i], listIndex);
+            listIndex++;
         }
 
         // set vessel to unknown
@@ -88,10 +90,16 @@ public sealed partial class BountyContractUiFragmentCreate : Control
 
     private void FillCategories()
     {
-        foreach (var (id, meta) in SharedBountyContractSystem.CategoriesMeta)
+        if (!_proto.TryIndex(_collection, out var collectionProto))
+            return;
+
+        foreach (var id in collectionProto.Categories)
         {
+            if (!SharedBountyContractSystem.CategoriesMeta.ContainsKey(id))
+                continue;
+            var meta = SharedBountyContractSystem.CategoriesMeta[id];
             var name = Loc.GetString(meta.Name);
-            CategorySelector.AddItem(name, (byte) id);
+            CategorySelector.AddItem(name, (int)id);
         }
     }
 
@@ -127,12 +135,12 @@ public sealed partial class BountyContractUiFragmentCreate : Control
         if (itemIndex >= _vessels.Count)
             return;
 
-        VeselSelector.SelectId(itemIndex);
+        VesselSelector.SelectId(itemIndex);
     }
 
     private void OnCategorySelected(int objId)
     {
-        var cat = (BountyContractCategory) objId;
+        var cat = (BountyContractCategory)objId;
         CustomNameButton.Pressed = cat != BountyContractCategory.Criminal;
         OnCustomNameToggle(CustomNameButton.Pressed);
 
@@ -148,10 +156,10 @@ public sealed partial class BountyContractUiFragmentCreate : Control
         UpdateDisclaimer();
     }
 
-    private void OnCustomVeselToggle(bool isPressed)
+    private void OnCustomVesselToggle(bool isPressed)
     {
-        VeselSelector.Visible = !isPressed;
-        VeselEdit.Visible = isPressed;
+        VesselSelector.Visible = !isPressed;
+        VesselEdit.Visible = isPressed;
 
         OnVesselSelected(0);
     }
@@ -178,6 +186,30 @@ public sealed partial class BountyContractUiFragmentCreate : Control
             return;
         }
 
+        if (name.Length > SharedBountyContractSystem.MaxNameLength)
+        {
+            var err = Loc.GetString("bounty-contracts-ui-create-error-name-too-long");
+            DisclaimerLabel.SetMessage(err);
+            CreateButton.Disabled = true;
+            return;
+        }
+
+        if (VesselEdit.Text.Length > SharedBountyContractSystem.MaxVesselLength)
+        {
+            var err = Loc.GetString("bounty-contracts-ui-create-error-vessel-name-too-long");
+            DisclaimerLabel.SetMessage(err);
+            CreateButton.Disabled = true;
+            return;
+        }
+
+        if (DescriptionEdit.TextLength > SharedBountyContractSystem.MaxDescriptionLength)
+        {
+            var err = Loc.GetString("bounty-contracts-ui-create-error-description-too-long");
+            DisclaimerLabel.SetMessage(err);
+            CreateButton.Disabled = true;
+            return;
+        }
+
         // all looks good
         DisclaimerLabel.SetMessage(Loc.GetString("bounty-contracts-ui-create-ready"));
         CreateButton.Disabled = false;
@@ -226,15 +258,15 @@ public sealed partial class BountyContractUiFragmentCreate : Control
     {
         var vessel = "";
 
-        if (!CustomVeselButton.Pressed)
+        if (!CustomVesselButton.Pressed)
         {
-            var id = VeselSelector.SelectedId;
+            var id = VesselSelector.SelectedId;
             if (id < _vessels.Count)
                 vessel = _vessels[id];
         }
         else
         {
-            vessel = VeselEdit.Text;
+            vessel = VesselEdit.Text;
         }
 
         return vessel;
@@ -242,13 +274,14 @@ public sealed partial class BountyContractUiFragmentCreate : Control
 
     public BountyContractCategory GetCategory()
     {
-        return (BountyContractCategory) CategorySelector.SelectedId;
+        return (BountyContractCategory)CategorySelector.SelectedId;
     }
 
     public BountyContractRequest GetBountyContract()
     {
         var info = new BountyContractRequest
         {
+            Collection = _collection,
             Category = GetCategory(),
             Name = GetTargetName(),
             DNA = GetTargetDna(),
diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentList.xaml b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentList.xaml
index 1827c359fa..6f34da3a66 100644
--- a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentList.xaml
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentList.xaml
@@ -21,6 +21,12 @@
                 <BoxContainer Orientation="Horizontal"
                               Margin="8,8,8,8"
                               HorizontalExpand="True">
+                    <Button
+                        Name="NotificationSwitch"
+                        ToolTip="{Loc news-reader-ui-mute-tooltip}"
+                        Text="{Loc news-read-ui-notification-on}"
+                        MinWidth="20"
+                        Margin="0,0,5,0"/>
                     <Button Name="RefreshButton" Text="{Loc 'bounty-contracts-ui-list-refresh'}"/>
                     <Control HorizontalExpand="True"/>
                     <Button Name="CreateButton" Text="{Loc 'bounty-contracts-ui-list-create'}"/>
diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentList.xaml.cs b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentList.xaml.cs
index f655330c21..ab279eee75 100644
--- a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentList.xaml.cs
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentList.xaml.cs
@@ -10,15 +10,17 @@ public sealed partial class BountyContractUiFragmentList : Control
 {
     public event Action? OnCreateButtonPressed;
     public event Action? OnRefreshButtonPressed;
+    public event Action? OnToggleNotificationPressed;
     public event Action<BountyContract>? OnRemoveButtonPressed;
     public BountyContractUiFragmentList()
     {
         RobustXamlLoader.Load(this);
         CreateButton.OnPressed += _ => OnCreateButtonPressed?.Invoke();
         RefreshButton.OnPressed += _ => OnRefreshButtonPressed?.Invoke();
+        NotificationSwitch.OnPressed += _ => OnToggleNotificationPressed?.Invoke();
     }
 
-    public void SetContracts(List<BountyContract> listStateContracts, bool canRemove)
+    public void SetContracts(List<BountyContract> listStateContracts, bool canRemove, NetEntity authorUid)
     {
         BountiesContainer.RemoveAllChildren();
 
@@ -29,9 +31,10 @@ public sealed partial class BountyContractUiFragmentList : Control
         }
 
         NoContractsLabel.Visible = false;
+        listStateContracts.Reverse();
         foreach (var contract in listStateContracts)
         {
-            var entry = new BountyContractUiFragmentListEntry(contract, canRemove);
+            var entry = new BountyContractUiFragmentListEntry(contract, canRemove || contract.AuthorUid == authorUid);
             entry.OnRemoveButtonPressed += c => OnRemoveButtonPressed?.Invoke(c);
             BountiesContainer.AddChild(entry);
         }
@@ -41,4 +44,9 @@ public sealed partial class BountyContractUiFragmentList : Control
     {
         CreateButton.Disabled = !canCreate;
     }
+
+    public void SetNotificationsEnabled(bool notificationsEnabled)
+    {
+        NotificationSwitch.Text = Loc.GetString(notificationsEnabled ? "news-read-ui-notification-on" : "news-read-ui-notification-off");
+    }
 }
diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml
index d74b04de03..af05903f61 100644
--- a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml
@@ -1,20 +1,24 @@
 <Control xmlns="https://spacestation14.io">
-    <PanelContainer Name="BountyPanel" Margin="8" StyleClasses="AngleRect" >
-        <BoxContainer Orientation="Vertical" Margin="4" >
+    <PanelContainer Name="BountyPanel" Margin="5" StyleClasses="AngleRect" HorizontalExpand="True">
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True">
             <BoxContainer Orientation="Horizontal">
                 <Label Name="BountyName" HorizontalExpand="True" />
                 <Label Name="BountyReward" HorizontalExpand="True"
                        HorizontalAlignment="Right"/>
             </BoxContainer>
             <PanelContainer StyleClasses="HighDivider" />
-            <Label Name="BountyCategory" StyleClasses="WindowFooterText"/>
+            <GridContainer Columns="2" HorizontalExpand="True">
+                <BoxContainer Orientation="Vertical" HorizontalExpand="True">
+                    <Label Name="BountyCategory" StyleClasses="LabelSubText" FontColorOverride="#A9A9A9"/>
+                    <Label Name="BountyAuthor" StyleClasses="LabelSubText" FontColorOverride="#A9A9A9"/>
+                    <Label Name="BountyVessel" StyleClasses="LabelSubText" FontColorOverride="#A9A9A9"/>
+                </BoxContainer>
+                <Button Name="RemoveButton" Text="{Loc 'bounty-contracts-ui-list-remove'}"
+                        HorizontalAlignment="Right" VerticalAlignment="Top"/>
+            </GridContainer>
             <BoxContainer HorizontalExpand="True">
                 <RichTextLabel Name="BountyDescription" StyleClasses="LabelSubText"/>
             </BoxContainer>
-            <Label Name="BountyVessel" StyleClasses="WindowFooterText"/>
-            <Label Name="BountyAuthor" StyleClasses="WindowFooterText"/>
-            <Button Name="RemoveButton" Text="{Loc 'bounty-contracts-ui-list-remove'}"
-                    HorizontalAlignment="Right"/>
         </BoxContainer>
     </PanelContainer>
 </Control>
diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs
index f988c05091..7942fcbf99 100644
--- a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs
@@ -18,20 +18,23 @@ public sealed partial class BountyContractUiFragmentListEntry : Control
         BountyName.Text = contract.Name;
 
         // vessel
-        var vessel = !string.IsNullOrEmpty(contract.Vessel) ? contract.Vessel : Loc.GetString("bounty-contracts-ui-create-vessel-unknown");
-        var vesselMsg = Loc.GetString("bounty-contracts-ui-list-vessel", ("vessel", vessel));
-        BountyVessel.Text = vesselMsg;
+        if (string.IsNullOrEmpty(contract.Vessel) || contract.Vessel == Loc.GetString("bounty-contracts-ui-create-vessel-unknown"))
+            BountyVessel.Visible = false;
+        else
+            BountyVessel.Text = Loc.GetString("bounty-contracts-ui-list-vessel", ("vessel", contract.Vessel));
 
         // bounty description
-        var desc = !string.IsNullOrEmpty(contract.Description) ? contract.Description : Loc.GetString("bounty-contracts-ui-list-no-description");
-        BountyDescription.SetMessage(desc);
+        if (string.IsNullOrWhiteSpace(contract.Description))
+            BountyDescription.Visible = false;
+        else
+            BountyDescription.SetMessage(contract.Description);
 
         // author
-        if (!string.IsNullOrEmpty(contract.Author))
-        {
-            var author = Loc.GetString("bounty-contracts-ui-list-author", ("author", contract.Author));
-            BountyAuthor.Text = author;
-        }
+        string author = contract.Author ?? "";
+        if (string.IsNullOrWhiteSpace(contract.Author))
+            author = Loc.GetString("bounty-contracts-ui-list-unknown-author");
+
+        BountyAuthor.Text = Loc.GetString("bounty-contracts-ui-list-author", ("author", author));
 
         // bounty reward
         BountyReward.Text = BankSystemExtensions.ToSpesoString(contract.Reward);
@@ -40,13 +43,11 @@ public sealed partial class BountyContractUiFragmentListEntry : Control
         RemoveButton.OnPressed += _ => OnRemoveButtonPressed?.Invoke(contract);
         RemoveButton.Disabled = !canRemoveContracts;
 
-        // color
+        // Get category
         var meta = SharedBountyContractSystem.CategoriesMeta[contract.Category];
         BountyPanel.ModulateSelfOverride = meta.UiColor;
 
-        // category
-        var category = Loc.GetString(meta.Name);
-        BountyCategory.Text = Loc.GetString("bounty-contracts-ui-list-category",
-            ("category", category));
+        var category = Loc.GetString("bounty-contracts-ui-list-category", ("category", Loc.GetString(meta.Name))); 
+        BountyCategory.Text = category;
     }
 }
diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListPlaceholder.xaml b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListPlaceholder.xaml
new file mode 100644
index 0000000000..7e96270e9b
--- /dev/null
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListPlaceholder.xaml
@@ -0,0 +1,4 @@
+<PanelContainer xmlns="https://spacestation14.io" HorizontalExpand="True" VerticalExpand="True">
+        <Label Name="LoadingLabel" Text="{Loc 'bounty-contracts-ui-list-loading'}"
+               HorizontalAlignment="Center" VerticalAlignment="Center"/>
+</PanelContainer>
diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListPlaceholder.xaml.cs b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListPlaceholder.xaml.cs
new file mode 100644
index 0000000000..40e2625e6c
--- /dev/null
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListPlaceholder.xaml.cs
@@ -0,0 +1,9 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client._NF.BountyContracts.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class BountyContractUiFragmentListPlaceholder : PanelContainer
+{
+}
diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentTabSet.xaml b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentTabSet.xaml
new file mode 100644
index 0000000000..650e9943b2
--- /dev/null
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentTabSet.xaml
@@ -0,0 +1,3 @@
+<TabContainer xmlns="https://spacestation14.io" HorizontalExpand="True" VerticalExpand="True">
+    <!-- Contents filled ad hoc-->
+</TabContainer>
diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentTabSet.xaml.cs b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentTabSet.xaml.cs
new file mode 100644
index 0000000000..589f85b7e0
--- /dev/null
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentTabSet.xaml.cs
@@ -0,0 +1,38 @@
+using Content.Shared._NF.BountyContracts;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._NF.BountyContracts.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class BountyContractUiFragmentTabSet : TabContainer
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    public event Action<ProtoId<BountyContractCollectionPrototype>>? OnSelectCollection;
+    private Dictionary<int, ProtoId<BountyContractCollectionPrototype>> _tabsToCollections;
+
+    public BountyContractUiFragmentTabSet()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        _tabsToCollections = new();
+        OnTabChanged += TabChanged;
+    }
+
+    // Note: no safety checks on tabIndex range.
+    public bool SetTabCollection(int tabIndex, ProtoId<BountyContractCollectionPrototype> collection)
+    {
+        if (_proto.TryIndex(collection, out var collectionProto))
+            SetTabTitle(tabIndex, Loc.GetString(collectionProto.Name));
+
+        return _tabsToCollections.TryAdd(tabIndex, collection);
+    }
+
+    public void TabChanged(int tabIndex)
+    {
+        if (_tabsToCollections.ContainsKey(tabIndex))
+            OnSelectCollection?.Invoke(_tabsToCollections[tabIndex]);
+    }
+}
diff --git a/Content.Server/_NF/Access/NFAccessUtilities.cs b/Content.Server/_NF/Access/NFAccessUtilities.cs
new file mode 100644
index 0000000000..694591c2a6
--- /dev/null
+++ b/Content.Server/_NF/Access/NFAccessUtilities.cs
@@ -0,0 +1,52 @@
+using System.Linq;
+using Content.Shared.Access;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._NF.Access;
+
+/// <summary>
+/// Utilities to check the access of a particular entity against an arbitrary set of AccessLevels and AccessTags
+/// Useful to avoid using the AccessReader component (e.g. for supporting multiple access sets)
+/// </summary>
+/// <remarks>
+/// Does this have to be an EntitySystem?
+/// </remarks>
+public sealed partial class NFAccessSystemUtilities : EntitySystem
+{
+    [Dependency] IPrototypeManager _proto = default!;
+
+    public bool IsAllowed(ICollection<ProtoId<AccessLevelPrototype>>? targetTags, ICollection<ProtoId<AccessLevelPrototype>>? accessTags, ICollection<ProtoId<AccessGroupPrototype>>? accessGroups)
+    {
+        // Empty/null sets: no access requested.
+        if ((accessTags == null || accessTags.Count <= 0)
+            && (accessGroups == null || accessGroups.Count <= 0))
+            return true;
+
+        // Non-empty access set, empty target set, can't fulfill membership
+        if (targetTags == null || targetTags.Count <= 0)
+            return false;
+
+        // Check lists
+        if (accessTags != null)
+        {
+            foreach (var accessTag in accessTags)
+            {
+                if (targetTags.Contains(accessTag))
+                    return true;
+            }
+        }
+
+        if (accessGroups != null)
+        {
+            foreach (var groupId in accessGroups)
+            {
+                if (!_proto.TryIndex(groupId, out var groupProto))
+                    continue;
+
+                if (groupProto.Tags.All(targetTags.Contains))
+                    return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/Content.Server/_NF/BountyContracts/BountyContractDataComponent.cs b/Content.Server/_NF/BountyContracts/BountyContractDataComponent.cs
index 493d2aff42..08fc08dd7d 100644
--- a/Content.Server/_NF/BountyContracts/BountyContractDataComponent.cs
+++ b/Content.Server/_NF/BountyContracts/BountyContractDataComponent.cs
@@ -1,4 +1,6 @@
+using System.Collections.Frozen;
 using Content.Shared._NF.BountyContracts;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server._NF.BountyContracts;
 
@@ -12,12 +14,18 @@ public sealed partial class BountyContractDataComponent : Component
     /// <summary>
     ///     Last registered contract id. Used to track contracts.
     /// </summary>
-    [DataField("lastId")]
+    [DataField]
     public uint LastId;
 
     /// <summary>
-    ///     All open bounty contracts by their contract id.
+    ///     All open bounty contracts, grouped by collection, listed by their contract id.
     /// </summary>
-    [DataField("contracts")]
-    public Dictionary<uint, BountyContract> Contracts = new();
+    [DataField]
+    public FrozenDictionary<ProtoId<BountyContractCollectionPrototype>, Dictionary<uint, BountyContract>>? Contracts = null;
+
+    /// <summary>
+    ///     A cached list of prototype IDs by their order
+    /// </summary>
+    [DataField]
+    public List<ProtoId<BountyContractCollectionPrototype>> OrderedCollections = new();
 }
diff --git a/Content.Server/_NF/BountyContracts/BountyContractSystem.Ui.cs b/Content.Server/_NF/BountyContracts/BountyContractSystem.Ui.cs
index 9a81876c71..5d00b77aa8 100644
--- a/Content.Server/_NF/BountyContracts/BountyContractSystem.Ui.cs
+++ b/Content.Server/_NF/BountyContracts/BountyContractSystem.Ui.cs
@@ -1,76 +1,91 @@
 using System.Linq;
+using Content.Server._NF.SectorServices;
 using Content.Server.StationRecords;
 using Content.Shared._NF.BountyContracts;
 using Content.Shared.Access.Components;
 using Content.Shared.CartridgeLoader;
+using Content.Shared.IdentityManagement;
 using Content.Shared.PDA;
 using Content.Shared.StationRecords;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
 
 namespace Content.Server._NF.BountyContracts;
 
 public sealed partial class BountyContractSystem
 {
-    [Dependency] private readonly EntityManager _entManager = default!;
+    [Dependency] SectorServiceSystem _sectorService = default!;
+    [Dependency] IGameTiming _timing = default!;
     private void InitializeUi()
     {
         SubscribeLocalEvent<BountyContractsCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
-        SubscribeLocalEvent<CartridgeLoaderComponent, BountyContractOpenCreateUiMsg>(OnOpenCreateUi);
-        SubscribeLocalEvent<CartridgeLoaderComponent, BountyContractCloseCreateUiMsg>(OnCloseCreateUi);
-        SubscribeLocalEvent<CartridgeLoaderComponent, BountyContractTryCreateMsg>(OnTryCreateContract);
-        SubscribeLocalEvent<CartridgeLoaderComponent, BountyContractRefreshListUiMsg>(OnRefreshContracts);
-        SubscribeLocalEvent<CartridgeLoaderComponent, BountyContractTryRemoveUiMsg>(OnRemoveContract);
+        SubscribeLocalEvent<BountyContractsCartridgeComponent, CartridgeMessageEvent>(OnUiMessage);
     }
 
     /// <summary>
     ///     Show create contract menu on ui cartridge.
     /// </summary>
-    private void CartridgeOpenCreateUi(EntityUid loaderUid)
+    private void CartridgeOpenCreateUi(Entity<BountyContractsCartridgeComponent> cartridge, EntityUid loaderUid, ProtoId<BountyContractCollectionPrototype> collection)
     {
-        var state = GetCreateState();
-        _cartridgeLoaderSystem.UpdateCartridgeUiState(loaderUid, state);
+        var state = GetCreateState(cartridge, collection);
+        _cartridgeLoader.UpdateCartridgeUiState(loaderUid, state);
     }
 
     /// <summary>
     ///     Show list all contracts menu on ui cartridge.
     /// </summary>
-    private void CartridgeOpenListUi(EntityUid loaderUid)
+    private void CartridgeOpenListUi(Entity<BountyContractsCartridgeComponent> cartridge, EntityUid loaderUid, ProtoId<BountyContractCollectionPrototype>? collection = null)
     {
-        var state = GetListState(loaderUid);
-        _cartridgeLoaderSystem.UpdateCartridgeUiState(loaderUid, state);
+        var state = GetListState(cartridge, loaderUid, collection);
+
+        if (state == null)
+            return;
+
+        _cartridgeLoader.UpdateCartridgeUiState(loaderUid, state);
     }
 
-    private void CartridgeRefreshListUi(EntityUid loaderUid)
+    private void CartridgeRefreshListUi(Entity<BountyContractsCartridgeComponent> cartridge, EntityUid loaderUid, ProtoId<BountyContractCollectionPrototype>? collection = null)
     {
         // this will technically refresh it
         // by sending list state again
-        CartridgeOpenListUi(loaderUid);
+        CartridgeOpenListUi(cartridge, loaderUid, collection);
     }
 
-    private BountyContractListUiState GetListState(EntityUid loaderUid)
+    private BountyContractListUiState? GetListState(Entity<BountyContractsCartridgeComponent> cartridge, EntityUid loaderUid, ProtoId<BountyContractCollectionPrototype>? collection = null)
     {
-        var contracts = GetAllContracts().ToList();
-        var isAllowedCreate = IsAllowedCreateBounties(loaderUid);
-        var isAllowedRemove = IsAllowedDeleteBounties(loaderUid);
+        // Set the cartridge's collection if requested.
+        if (collection != null)
+            cartridge.Comp.Collection = collection;
 
-        return new BountyContractListUiState(contracts, isAllowedCreate, isAllowedRemove);
+        var contracts = GetPermittedContracts(cartridge, loaderUid, out var newCollection).ToList();
+        if (newCollection == null)
+            return null;
+
+        var isAllowedCreate = HasWriteAccess(loaderUid, newCollection.Value);
+        var isAllowedRemove = HasDeleteAccess(loaderUid, newCollection.Value);
+
+        if (cartridge.Comp.Collection != newCollection)
+            cartridge.Comp.Collection = newCollection;
+
+        return new BountyContractListUiState(newCollection.Value, GetReadableCollections(loaderUid), contracts, isAllowedCreate, isAllowedRemove, GetNetEntity(loaderUid), cartridge.Comp.NotificationsEnabled);
     }
 
-    private BountyContractCreateUiState GetCreateState()
+    private BountyContractCreateUiState GetCreateState(Entity<BountyContractsCartridgeComponent> cartridge, ProtoId<BountyContractCollectionPrototype> collection)
     {
         var bountyTargets = new HashSet<BountyContractTargetInfo>();
         var vessels = new HashSet<string>();
 
         // TODO: This will show all Stations, not only NT stations
         // TODO: Register all NT characters in some cache component on main station?
-        var allStations = EntityQuery<StationRecordsComponent, MetaDataComponent>();
-        foreach (var (records, meta) in allStations)
+        var allStations = EntityQueryEnumerator<StationRecordsComponent, MetaDataComponent>();
+        while (allStations.MoveNext(out var uid, out _, out var meta))
         {
-            // get station IC name - it's vessel name
+            // get station IC name - its vessel name
             var name = meta.EntityName;
             vessels.Add(name);
 
             // get all characters registered on this station
-            var icRecords = _records.GetRecordsOfType<GeneralStationRecord>(records.Owner);
+            var icRecords = _records.GetRecordsOfType<GeneralStationRecord>(uid);
             foreach (var (_, icRecord) in icRecords)
             {
                 var target = new BountyContractTargetInfo
@@ -84,71 +99,72 @@ public sealed partial class BountyContractSystem
             }
         }
 
-        return new BountyContractCreateUiState(bountyTargets.ToList(), vessels.ToList());
-    }
-
-    private bool IsAllowedCreateBounties(EntityUid loaderUid, CartridgeLoaderComponent? component = null)
-    {
-        if (!Resolve(loaderUid, ref component) || component.ActiveProgram == null)
-            return false;
-
-        return _accessReader.IsAllowed(loaderUid, component.ActiveProgram.Value);
-    }
-
-    private bool IsAllowedDeleteBounties(EntityUid loaderUid, CartridgeLoaderComponent? component = null)
-    {
-        return IsAllowedCreateBounties(loaderUid, component);
-    }
-
-    private string? GetContractAuthor(EntityUid loaderUid, PdaComponent? component = null)
-    {
-        if (!Resolve(loaderUid, ref component))
-            return null;
-
-        TryComp<IdCardComponent>(component.ContainedId, out var id);
-        var name = id?.FullName ?? Loc.GetString("bounty-contracts-unknown-author-name");
-        var job = id?.JobTitle ?? Loc.GetString("bounty-contracts-unknown-author-job");
-        return Loc.GetString("bounty-contracts-author", ("name", name), ("job", job));
+        return new BountyContractCreateUiState(collection, bountyTargets.ToList(), vessels.ToList());
     }
 
     private void OnUiReady(EntityUid uid, BountyContractsCartridgeComponent component, CartridgeUiReadyEvent args)
     {
-        CartridgeOpenListUi(args.Loader);
+        CartridgeOpenListUi((uid, component), args.Loader);
     }
 
-    private void OnOpenCreateUi(EntityUid uid, CartridgeLoaderComponent component, BountyContractOpenCreateUiMsg args)
+    private void OnUiMessage(EntityUid uid, BountyContractsCartridgeComponent component, CartridgeMessageEvent args)
     {
-        CartridgeOpenCreateUi(_entManager.GetEntity(args.Entity));
+        if (args is BountyContractCommandMessageEvent command)
+            OnCommandMessage((uid, component), ref command);
+        else if (args is BountyContractTryRemoveMessageEvent remove)
+            OnTryRemoveMessage((uid, component), ref remove);
+        else if (args is BountyContractTryCreateMessageEvent create)
+            OnTryCreateMessage((uid, component), ref create);
     }
 
-    private void OnCloseCreateUi(EntityUid uid, CartridgeLoaderComponent component, BountyContractCloseCreateUiMsg args)
+    private void OnCommandMessage(Entity<BountyContractsCartridgeComponent> cartridge, ref BountyContractCommandMessageEvent args)
     {
-        CartridgeOpenListUi(_entManager.GetEntity(args.Entity));
+        switch (args.Command)
+        {
+            case BountyContractCommand.OpenCreateUi:
+                CartridgeOpenCreateUi(cartridge, GetEntity(args.LoaderUid), args.Collection);
+                break;
+            case BountyContractCommand.CloseCreateUi:
+                CartridgeOpenListUi(cartridge, GetEntity(args.LoaderUid), args.Collection);
+                break;
+            case BountyContractCommand.RefreshList:
+                CartridgeRefreshListUi(cartridge, GetEntity(args.LoaderUid), args.Collection);
+                break;
+            case BountyContractCommand.ToggleNotifications:
+                cartridge.Comp.NotificationsEnabled = !cartridge.Comp.NotificationsEnabled;
+                CartridgeRefreshListUi(cartridge, GetEntity(args.LoaderUid), args.Collection); // Force UI udpate
+                break;
+            default:
+                return; //TODO: print to log?
+        }
     }
 
-    private void OnTryCreateContract(EntityUid uid, CartridgeLoaderComponent component, BountyContractTryCreateMsg args)
+    private void OnTryRemoveMessage(Entity<BountyContractsCartridgeComponent> cartridge, ref BountyContractTryRemoveMessageEvent args)
     {
-        if (!IsAllowedCreateBounties(_entManager.GetEntity(args.Entity)))
+        var loader = GetEntity(args.LoaderUid);
+
+        // Check the delete access for the user on this collection.
+        if (TryRemoveBountyContract(loader, args.Actor, args.ContractId))
+            CartridgeRefreshListUi(cartridge, loader);
+    }
+
+    private void OnTryCreateMessage(Entity<BountyContractsCartridgeComponent> cartridge, ref BountyContractTryCreateMessageEvent args)
+    {
+        var loader = GetEntity(args.LoaderUid);
+
+        if (!cartridge.Comp.CreateEnabled)
             return;
 
         var c = args.Contract;
-        var author = GetContractAuthor(_entManager.GetEntity(args.Entity));
-        CreateBountyContract(c.Category, c.Name, c.Reward, c.Description, c.Vessel, c.DNA, author);
+        var author = Identity.Name(args.Actor, EntityManager);
 
-        CartridgeOpenListUi(_entManager.GetEntity(args.Entity));
-    }
+        // Try to post a bounty. If it works, update the requester's UI.
+        if (TryCreateBountyContract(c.Collection, c.Category, c.Name, c.Reward, loader, args.Actor, c.Description, c.Vessel, c.DNA, author) != null)
+        {
+            cartridge.Comp.CreateEnabled = false;
+            cartridge.Comp.NextCreate = _timing.CurTime + TimeSpan.FromSeconds(cartridge.Comp.CreateCooldown);
 
-    private void OnRefreshContracts(EntityUid uid, CartridgeLoaderComponent component, BountyContractRefreshListUiMsg args)
-    {
-        CartridgeRefreshListUi(_entManager.GetEntity(args.Entity));
-    }
-
-    private void OnRemoveContract(EntityUid uid, CartridgeLoaderComponent component, BountyContractTryRemoveUiMsg args)
-    {
-        if (!IsAllowedDeleteBounties(_entManager.GetEntity(args.Entity)))
-            return;
-
-        RemoveBountyContract(args.ContractId);
-        CartridgeRefreshListUi(_entManager.GetEntity(args.Entity));
+            CartridgeOpenListUi(cartridge, loader);
+        }
     }
 }
diff --git a/Content.Server/_NF/BountyContracts/BountyContractSystem.cs b/Content.Server/_NF/BountyContracts/BountyContractSystem.cs
index e88d342188..856cf3d4b2 100644
--- a/Content.Server/_NF/BountyContracts/BountyContractSystem.cs
+++ b/Content.Server/_NF/BountyContracts/BountyContractSystem.cs
@@ -1,12 +1,17 @@
+using System.Collections.Frozen;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Server._NF.Access;
+using Content.Server.Administration.Logs;
 using Content.Server.CartridgeLoader;
 using Content.Server.Chat.Systems;
-using Content.Server.GameTicking.Events;
 using Content.Server.StationRecords.Systems;
+using Content.Shared._NF.Bank;
 using Content.Shared._NF.BountyContracts;
 using Content.Shared.Access.Systems;
-using Robust.Shared.Map;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.Database;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server._NF.BountyContracts;
 
@@ -17,48 +22,121 @@ public sealed partial class BountyContractSystem : SharedBountyContractSystem
 {
     private ISawmill _sawmill = default!;
 
-    [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!;
+    [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!;
     [Dependency] private readonly StationRecordsSystem _records = default!;
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+    [Dependency] private readonly NFAccessSystemUtilities _accessUtils = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IAdminLogManager _adminLog = default!;
 
     public override void Initialize()
     {
         base.Initialize();
         _sawmill = Logger.GetSawmill("bounty.contracts");
 
-        SubscribeLocalEvent<RoundStartingEvent>(OnRoundStarting);
+        SubscribeLocalEvent<BountyContractDataComponent, ComponentInit>(ContractInit);
         InitializeUi();
     }
 
-    private void OnRoundStarting(RoundStartingEvent ev)
+    private void ContractInit(Entity<BountyContractDataComponent> ent, ref ComponentInit ev)
     {
-        // TODO: move to in-game server like RD?
-
-        // delete all existing data component
-        // just in case someone added it on map or previous round ended weird
-        var query = EntityQuery<BountyContractDataComponent>();
-        foreach (var bnt in query)
+        SortedList<int, ProtoId<BountyContractCollectionPrototype>> orderedCollections = new();
+        Dictionary<ProtoId<BountyContractCollectionPrototype>, Dictionary<uint, BountyContract>> contracts = new();
+        foreach (var proto in _proto.EnumeratePrototypes<BountyContractCollectionPrototype>())
         {
-            RemCompDeferred(bnt.Owner, bnt);
+            contracts[proto.ID] = new();
+            orderedCollections[proto.Order] = proto.ID;
         }
-
-        // use nullspace entity to store all information about contracts
-        var uid = Spawn(null, MapCoordinates.Nullspace);
-        EnsureComp<BountyContractDataComponent>(uid);
+        ent.Comp.Contracts = contracts.ToFrozenDictionary();
+        ent.Comp.OrderedCollections = orderedCollections.Values.ToList();
     }
 
     private BountyContractDataComponent? GetContracts()
     {
-        // we assume that there is only one bounty database for round
-        // if it doesn't exist - game should work fine
-        // but players wouldn't able to create/get contracts
-        return EntityQuery<BountyContractDataComponent>().FirstOrDefault();
+        TryComp(_sectorService.GetServiceEntity(), out BountyContractDataComponent? bountyContracts);
+        return bountyContracts;
+    }
+
+    // Returns a list of all readable collections that a user can see.
+    private List<ProtoId<BountyContractCollectionPrototype>> GetReadableCollections(EntityUid user, BountyContractDataComponent? bounties = null)
+    {
+        var returnList = new List<ProtoId<BountyContractCollectionPrototype>>();
+        if (bounties == null)
+        {
+            bounties = GetContracts();
+            // Nothing to read from, no read access
+            if (bounties == null)
+                return returnList;
+        }
+
+        if (bounties.Contracts == null)
+            return returnList;
+
+        var accessTags = _accessReader.FindAccessTags(user);
+        foreach (var collection in bounties.OrderedCollections)
+        {
+            if (!_proto.TryIndex(collection, out var collectionProto))
+                continue;
+
+            if (_accessUtils.IsAllowed(accessTags, collectionProto.ReadAccess, collectionProto.ReadGroups))
+                returnList.Add(collection);
+        }
+        return returnList;
+    }
+
+    private bool HasReadAccess(EntityUid user, ProtoId<BountyContractCollectionPrototype> collection, BountyContractDataComponent? bounties = null)
+    {
+        if (bounties == null)
+        {
+            bounties = GetContracts();
+            // Nothing to read from, no read access
+            if (bounties == null)
+                return false;
+        }
+
+        if (!_proto.TryIndex(collection, out var collectionProto))
+            return false;
+
+        return _accessUtils.IsAllowed(_accessReader.FindAccessTags(user), collectionProto.ReadAccess, collectionProto.ReadGroups);
+    }
+
+    private bool HasWriteAccess(EntityUid user, ProtoId<BountyContractCollectionPrototype> collection, BountyContractDataComponent? bounties = null)
+    {
+        if (bounties == null)
+        {
+            bounties = GetContracts();
+            // Nothing to write to, no write access
+            if (bounties == null)
+                return false;
+        }
+
+        if (!_proto.TryIndex(collection, out var collectionProto))
+            return false;
+
+        return _accessUtils.IsAllowed(_accessReader.FindAccessTags(user), collectionProto.WriteAccess, collectionProto.WriteGroups);
+    }
+
+    private bool HasDeleteAccess(EntityUid user, ProtoId<BountyContractCollectionPrototype> collection, BountyContractDataComponent? bounties = null)
+    {
+        if (bounties == null)
+        {
+            bounties = GetContracts();
+            // Nothing to delete from, no write access
+            if (bounties == null)
+                return false;
+        }
+
+        if (!_proto.TryIndex(collection, out var collectionProto))
+            return false;
+
+        return _accessUtils.IsAllowed(_accessReader.FindAccessTags(user), collectionProto.DeleteAccess, collectionProto.DeleteGroups);
     }
 
     /// <summary>
     ///     Try to create a new bounty contract and put it in bounties list.
     /// </summary>
+    /// <param name="collection">Bounty contract collection (command, public, etc.)</param>
     /// <param name="category">Bounty contract category (bounty head, construction, etc.)</param>
     /// <param name="name">IC name for the contract bounty head. Can be players IC name or custom string.</param>
     /// <param name="reward">Cash reward for completing bounty. Can be zero.</param>
@@ -66,42 +144,90 @@ public sealed partial class BountyContractSystem : SharedBountyContractSystem
     /// <param name="vessel">IC name of last known bounty vessel. Can be station/ship name or custom string.</param>
     /// <param name="dna">Optional DNA of the bounty head.</param>
     /// <param name="author">Optional bounty poster IC name.</param>
-    /// <param name="postToRadio">Should radio message about contract be posted in general radio channel?</param>
+    /// <param name="authorUid">Uid of the cartridge loader that created the bounty</param>
+    /// <param name="pdaAlert">Should PDAs send a localized alert?</param>
+    /// <param name="actor">The entity posting the bounty.</param>
     /// <returns>New bounty contract. Null if contract creation failed.</returns>
-    public BountyContract? CreateBountyContract(BountyContractCategory category,
-        string name, int reward,
-        string? description = null, string? vessel = null,
-        string? dna = null, string? author = null,
-        bool postToRadio = true)
+    public BountyContract? TryCreateBountyContract(ProtoId<BountyContractCollectionPrototype> collection,
+        BountyContractCategory category,
+        string name,
+        int reward,
+        EntityUid authorUid,
+        EntityUid actor,
+        string? description = null,
+        string? vessel = null,
+        string? dna = null,
+        string? author = null)
     {
         var data = GetContracts();
-        if (data == null)
+        if (data == null
+            || data.Contracts == null
+            || !data.Contracts.TryGetValue(collection, out var contracts)
+            || !HasWriteAccess(authorUid, collection))
+        {
             return null;
+        }
+
+        if (name.Length > MaxNameLength)
+            name = name.Substring(0, MaxNameLength);
+        if (vessel != null && vessel.Length > MaxVesselLength)
+            vessel = vessel.Substring(0, MaxVesselLength);
+        if (description != null && description.Length > MaxDescriptionLength)
+            description = description.Substring(0, MaxDescriptionLength);
 
         // create a new contract
         var contractId = data.LastId++;
-        var contract = new BountyContract(contractId, category, name, reward,
+        var contract = new BountyContract(contractId, category, name, reward, GetNetEntity(authorUid),
             dna, vessel, description, author);
 
         // try to save it
-        if (!data.Contracts.TryAdd(contractId, contract))
+        if (!contracts.TryAdd(contractId, contract))
         {
             _sawmill.Error($"Failed to create bounty contract with {contractId}! LastId: {data.LastId}.");
             return null;
         }
 
-        if (postToRadio)
+        var notificationType = BountyContractNotificationType.None;
+        if (_proto.TryIndex(collection, out var bountyCollection))
+            notificationType = bountyCollection.NotificationType;
+
+        LocId announcement = "bounty-contracts-announcement-generic-create";
+        if (CategoriesMeta.TryGetValue(category, out var categoryMeta) && categoryMeta.Announcement != null)
+            announcement = categoryMeta.Announcement.Value;
+
+        // Generate a notification
+        if (notificationType == BountyContractNotificationType.PDA)
         {
-            // TODO: move this to radio in future?
-            var sender = Loc.GetString("bounty-contracts-radio-name");
-            var target = !string.IsNullOrEmpty(contract.Vessel)
+            var sender = Loc.GetString("bounty-contracts-announcement-pda-name");
+            var target = !string.IsNullOrEmpty(contract.Vessel) && contract.Vessel != Loc.GetString("bounty-contracts-ui-create-vessel-unknown")
                 ? $"{contract.Name} ({contract.Vessel})"
                 : contract.Name;
-            var msg = Loc.GetString("bounty-contracts-radio-create",
-                ("target", target), ("reward", contract.Reward));
-            var color = Color.FromHex("#D7D7BE");
-            _chat.DispatchGlobalAnnouncement(sender, msg, false, colorOverride: color);
+            var msg = Loc.GetString(announcement,
+                ("target", target), ("reward", BankSystemExtensions.ToSpesoString(contract.Reward)));
+
+            var pdaList = EntityQueryEnumerator<CartridgeLoaderComponent>();
+            while (pdaList.MoveNext(out var loaderUid, out var loaderComp))
+            {
+                if (_cartridgeLoader.TryGetProgram<BountyContractsCartridgeComponent>(loaderUid, out _, out var cartComp, true, loaderComp)
+                    && cartComp.NotificationsEnabled)
+                {
+                    _cartridgeLoader.SendNotification(loaderUid, sender, msg, loaderComp);
+                }
+            }
         }
+        else if (notificationType == BountyContractNotificationType.Radio)
+        {
+            var sender = Loc.GetString("bounty-contracts-announcement-radio-name");
+            var target = !string.IsNullOrEmpty(contract.Vessel) && contract.Vessel != Loc.GetString("bounty-contracts-ui-create-vessel-unknown")
+                ? $"{contract.Name} ({contract.Vessel})"
+                : contract.Name;
+            var msg = Loc.GetString(announcement,
+                ("target", target), ("reward", BankSystemExtensions.ToSpesoString(contract.Reward)));
+            var color = Color.FromHex("#D7D7BE");
+            _chat.DispatchGlobalAnnouncement(msg, sender, false, colorOverride: color);
+        }
+
+        _adminLog.Add(LogType.BountyContractCreated, $"{ToPrettyString(actor):actor} posted a {category} bounty with ID {contractId} in the {collection} collection for ${reward}: {description ?? ""}");
 
         return contract;
     }
@@ -113,40 +239,93 @@ public sealed partial class BountyContractSystem : SharedBountyContractSystem
     {
         contract = null;
         var data = GetContracts();
-        if (data == null)
+        if (data == null || data.Contracts == null)
             return false;
 
-        return data.Contracts.TryGetValue(contractId, out contract);
+        // Linear over # collections, should be a small set
+        foreach (var collection in data.Contracts.Values)
+        {
+            if (collection.TryGetValue(contractId, out contract))
+                return true;
+        }
+
+        return false;
     }
 
     /// <summary>
-    ///     Try to get all bounty contracts available.
+    ///     Try to get all bounty contracts available within a particular collection.
     /// </summary>
-    public IEnumerable<BountyContract> GetAllContracts()
+    public IEnumerable<BountyContract> GetPermittedContracts(Entity<BountyContractsCartridgeComponent> cartridge, EntityUid loader, out ProtoId<BountyContractCollectionPrototype>? newCollection)
     {
+        newCollection = null;
         var data = GetContracts();
-        if (data == null)
+
+        if (data == null || data.Contracts == null)
             return Enumerable.Empty<BountyContract>();
 
-        return data.Contracts.Values;
+        if (cartridge.Comp.Collection != null)
+        {
+            if (data.Contracts.TryGetValue(cartridge.Comp.Collection.Value, out var contracts)
+                && HasReadAccess(loader, cartridge.Comp.Collection.Value, data))
+            {
+                newCollection = cartridge.Comp.Collection.Value;
+                return contracts.Values;
+            }
+        }
+
+        foreach (var collection in data.Contracts.Keys)
+        {
+            if (HasReadAccess(loader, collection, data))
+            {
+                newCollection = collection;
+                return data.Contracts[collection].Values;
+            }
+        }
+
+        // No valid permitted contracts to get
+        return Enumerable.Empty<BountyContract>();
     }
 
     /// <summary>
     ///     Try to remove bounty contract by its id.
     /// </summary>
     /// <returns>True if contract was found and removed.</returns>
-    public bool RemoveBountyContract(uint contractId)
+    public bool TryRemoveBountyContract(EntityUid authorUid, EntityUid actor, uint contractId)
     {
         var data = GetContracts();
-        if (data == null)
+        if (data == null || data.Contracts == null)
             return false;
 
-        if (!data.Contracts.Remove(contractId))
+        foreach (var (collectionId, collection) in data.Contracts)
         {
-            _sawmill.Warning($"Failed to remove bounty contract with {contractId}!");
-            return false;
+            if (!collection.TryGetValue(contractId, out var contract))
+                continue;
+
+            if (!HasDeleteAccess(authorUid, collectionId, data) && authorUid != GetEntity(contract.AuthorUid))
+                return false;
+
+            collection.Remove(contractId);
+            _adminLog.Add(LogType.BountyContractRemoved, $"{ToPrettyString(actor):actor} deleted bounty with ID {contractId}");
+            return true;
         }
 
-        return true;
+        _sawmill.Warning($"Failed to remove bounty contract with {contractId}!");
+        return false;
+    }
+
+    public override void Update(float frameTime)
+    {
+        var cartList = EntityQueryEnumerator<BountyContractsCartridgeComponent>();
+        while (cartList.MoveNext(out var loaderUid, out var cartComponent))
+        {
+            if (cartComponent.CreateEnabled)
+                continue;
+
+            if (_timing.CurTime >= cartComponent.NextCreate)
+            {
+                cartComponent.CreateEnabled = true;
+                // TODO: update UI if on the create menu
+            }
+        }
     }
 }
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index 855a77b7dc..390053e889 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -460,4 +460,12 @@ public enum LogType
     /// </summary>
     AdminRefund = 203,
     AtmosDirectionChanged = 204,
+    /// <summary>
+    /// A player has posted a bounty contract.
+    /// </summary>
+    BountyContractCreated = 205,
+    /// <summary>
+    /// A player has deleted a bounty contract.
+    /// </summary>
+    BountyContractRemoved = 206,
 }
diff --git a/Content.Shared/_NF/BountyContracts/BountyContractCollectionPrototype.cs b/Content.Shared/_NF/BountyContracts/BountyContractCollectionPrototype.cs
new file mode 100644
index 0000000000..62b3df02f0
--- /dev/null
+++ b/Content.Shared/_NF/BountyContracts/BountyContractCollectionPrototype.cs
@@ -0,0 +1,85 @@
+using Content.Shared.Access;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._NF.BountyContracts;
+
+/// <summary>
+///     Describes a collection of bounty contracts, including who can read or post to it.
+/// </summary>
+[Prototype]
+public sealed partial class BountyContractCollectionPrototype : IPrototype
+{
+    /// <inheritdoc/>
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// Localized name to describe the bounty contract type.
+    /// </summary>
+    [DataField]
+    public LocId Name { get; private set; } = default!;
+
+    /// <summary>
+    /// The order to show in the tabbed bounty collections. Lower appears first.
+    /// </summary>
+    [DataField]
+    public int Order { get; private set; } = 0;
+
+    /// <summary>
+    /// The type of notification to send off when bounty contract.
+    /// </summary>
+    [DataField]
+    public BountyContractNotificationType NotificationType { get; private set; } = BountyContractNotificationType.None;
+
+    /// <summary>
+    /// Localized name to describe the bounty contract type.
+    /// </summary>
+    [DataField]
+    public List<BountyContractCategory> Categories { get; private set; } = new();
+
+    /// <summary>
+    /// Access levels required to post to this contract type.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<AccessLevelPrototype>> WriteAccess { get; private set; } = new();
+
+    /// <summary>
+    /// Access groups required to post to this contract type.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<AccessGroupPrototype>> WriteGroups { get; private set; } = new();
+
+    /// <summary>
+    /// Access levels required to read this contract type.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<AccessLevelPrototype>> ReadAccess { get; private set; } = new();
+
+    /// <summary>
+    /// Access groups required to read this contract type.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<AccessGroupPrototype>> ReadGroups { get; private set; } = new();
+
+    /// <summary>
+    /// Access levels required to delete an arbitrary bounty.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<AccessLevelPrototype>> DeleteAccess { get; private set; } = new();
+
+    /// <summary>
+    /// Access groups required to delete an arbitrary bounty.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<AccessGroupPrototype>> DeleteGroups { get; private set; } = new();
+}
+
+[Serializable, NetSerializable]
+public enum BountyContractNotificationType : byte
+{
+    None = 0,
+    PDA = 1,
+    Radio = 2,
+}
diff --git a/Content.Shared/_NF/BountyContracts/BountyContractsCartridgeComponent.cs b/Content.Shared/_NF/BountyContracts/BountyContractsCartridgeComponent.cs
index 3967eaa135..e5cde4c847 100644
--- a/Content.Shared/_NF/BountyContracts/BountyContractsCartridgeComponent.cs
+++ b/Content.Shared/_NF/BountyContracts/BountyContractsCartridgeComponent.cs
@@ -1,7 +1,25 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
 namespace Content.Shared._NF.BountyContracts;
 
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
+[AutoGenerateComponentState, Access(typeof(SharedBountyContractSystem))]
 public sealed partial class BountyContractsCartridgeComponent : Component
 {
+    [DataField, AutoNetworkedField]
+    public ProtoId<BountyContractCollectionPrototype>? Collection = null;
 
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public bool CreateEnabled;
+
+    [ViewVariables(VVAccess.ReadWrite), DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan NextCreate;
+
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public float CreateCooldown = 20f;
+
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public bool NotificationsEnabled = true;
 }
diff --git a/Content.Shared/_NF/BountyContracts/SharedBountyContractSystem.cs b/Content.Shared/_NF/BountyContracts/SharedBountyContractSystem.cs
index ee936e7d66..bac4773d1b 100644
--- a/Content.Shared/_NF/BountyContracts/SharedBountyContractSystem.cs
+++ b/Content.Shared/_NF/BountyContracts/SharedBountyContractSystem.cs
@@ -1,3 +1,5 @@
+using Content.Shared.CartridgeLoader;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared._NF.BountyContracts;
@@ -17,6 +19,7 @@ public struct BountyContractCategoryMeta
 {
     public string Name;
     public Color UiColor;
+    public LocId? Announcement;
 }
 
 [NetSerializable, Serializable]
@@ -44,6 +47,7 @@ public struct BountyContractTargetInfo
 [NetSerializable, Serializable]
 public struct BountyContractRequest
 {
+    public ProtoId<BountyContractCollectionPrototype> Collection;
     public BountyContractCategory Category;
     public string Name;
     public string? DNA;
@@ -59,18 +63,20 @@ public sealed class BountyContract
     public readonly BountyContractCategory Category;
     public readonly string Name;
     public readonly int Reward;
+    public readonly NetEntity AuthorUid;
     public readonly string? DNA;
     public readonly string? Vessel;
     public readonly string? Description;
     public readonly string? Author;
 
     public BountyContract(uint contractId, BountyContractCategory category, string name,
-        int reward, string? dna, string? vessel, string? description, string? author)
+        int reward, NetEntity authorUid, string? dna, string? vessel, string? description, string? author)
     {
         ContractId = contractId;
         Category = category;
         Name = name;
         Reward = reward;
+        AuthorUid = authorUid;
         DNA = dna;
         Vessel = vessel;
         Description = description;
@@ -81,74 +87,71 @@ public sealed class BountyContract
 [NetSerializable, Serializable]
 public sealed class BountyContractCreateUiState : BoundUserInterfaceState
 {
+    public readonly ProtoId<BountyContractCollectionPrototype> Collection;
     public readonly List<BountyContractTargetInfo> Targets;
     public readonly List<string> Vessels;
 
     public BountyContractCreateUiState(
+        ProtoId<BountyContractCollectionPrototype> collection,
         List<BountyContractTargetInfo> targets,
         List<string> vessels)
     {
+        Collection = collection;
         Targets = targets;
         Vessels = vessels;
     }
 }
 
 [NetSerializable, Serializable]
-public sealed class BountyContractListUiState : BoundUserInterfaceState
+public sealed class BountyContractListUiState(ProtoId<BountyContractCollectionPrototype> collection,
+        List<ProtoId<BountyContractCollectionPrototype>> collections,
+        List<BountyContract> contracts,
+        bool isAllowedCreateBounties,
+        bool isAllowedRemoveBounties,
+        NetEntity authorUid,
+        bool notificationsEnabled) : BoundUserInterfaceState
 {
-    public readonly List<BountyContract> Contracts;
-    public readonly bool IsAllowedCreateBounties;
-    public readonly bool IsAllowedRemoveBounties;
-
-    public BountyContractListUiState(List<BountyContract> contracts,
-        bool isAllowedCreateBounties, bool isAllowedRemoveBounties)
-    {
-        Contracts = contracts;
-        IsAllowedCreateBounties = isAllowedCreateBounties;
-        IsAllowedRemoveBounties = isAllowedRemoveBounties;
-    }
+    public readonly ProtoId<BountyContractCollectionPrototype> Collection = collection;
+    public readonly List<ProtoId<BountyContractCollectionPrototype>> Collections = collections;
+    public readonly List<BountyContract> Contracts = contracts;
+    public readonly bool IsAllowedCreateBounties = isAllowedCreateBounties;
+    public readonly bool IsAllowedRemoveBounties = isAllowedRemoveBounties;
+    public readonly NetEntity AuthorUid = authorUid;
+    public readonly bool NotificationsEnabled = notificationsEnabled;
+}
 
+public enum BountyContractCommand : byte
+{
+    OpenCreateUi = 0,
+    CloseCreateUi = 1,
+    RefreshList = 2,
+    ToggleNotifications = 3,
 }
 
 [NetSerializable, Serializable]
-public sealed class BountyContractOpenCreateUiMsg : BoundUserInterfaceMessage
+public sealed class BountyContractCommandMessageEvent(BountyContractCommand command, ProtoId<BountyContractCollectionPrototype> collection) : CartridgeMessageEvent
 {
+    public readonly ProtoId<BountyContractCollectionPrototype> Collection = collection;
+    public readonly BountyContractCommand Command = command;
 }
 
 [NetSerializable, Serializable]
-public sealed class BountyContractRefreshListUiMsg : BoundUserInterfaceMessage
+public sealed class BountyContractTryRemoveMessageEvent(uint contractId) : CartridgeMessageEvent
 {
+    public readonly uint ContractId = contractId;
 }
 
 [NetSerializable, Serializable]
-public sealed class BountyContractCloseCreateUiMsg : BoundUserInterfaceMessage
+public sealed class BountyContractTryCreateMessageEvent(BountyContractRequest contract) : CartridgeMessageEvent
 {
-}
-
-[NetSerializable, Serializable]
-public sealed class BountyContractTryRemoveUiMsg : BoundUserInterfaceMessage
-{
-    public readonly uint ContractId;
-
-    public BountyContractTryRemoveUiMsg(uint contractId)
-    {
-        ContractId = contractId;
-    }
-}
-
-[NetSerializable, Serializable]
-public sealed class BountyContractTryCreateMsg : BoundUserInterfaceMessage
-{
-    public readonly BountyContractRequest Contract;
-
-    public BountyContractTryCreateMsg(BountyContractRequest contract)
-    {
-        Contract = contract;
-    }
+    public readonly BountyContractRequest Contract = contract;
 }
 
 public abstract class SharedBountyContractSystem : EntitySystem
 {
+    public const int MaxNameLength = 32;
+    public const int MaxVesselLength = 32;
+    public const int MaxDescriptionLength = 256;
     public const int DefaultReward = 5000;
 
     // TODO: move this to prototypes?
@@ -157,27 +160,32 @@ public abstract class SharedBountyContractSystem : EntitySystem
         [BountyContractCategory.Criminal] = new BountyContractCategoryMeta
         {
             Name = "bounty-contracts-category-criminal",
-            UiColor = Color.FromHex("#520c0c")
+            UiColor = Color.FromHex("#520c0c"),
+            Announcement = "bounty-contracts-announcement-criminal-create"
         },
         [BountyContractCategory.Vacancy] = new BountyContractCategoryMeta
         {
             Name = "bounty-contracts-category-vacancy",
-            UiColor = Color.FromHex("#003866")
+            UiColor = Color.FromHex("#003866"),
+            Announcement = "bounty-contracts-announcement-vacancy-create"
         },
         [BountyContractCategory.Construction] = new BountyContractCategoryMeta
         {
             Name = "bounty-contracts-category-construction",
-            UiColor = Color.FromHex("#664a06")
+            UiColor = Color.FromHex("#664a06"),
+            Announcement = "bounty-contracts-announcement-construction-create"
         },
         [BountyContractCategory.Service] = new BountyContractCategoryMeta
         {
             Name = "bounty-contracts-category-service",
-            UiColor = Color.FromHex("#01551e")
+            UiColor = Color.FromHex("#01551e"),
+            Announcement = "bounty-contracts-announcement-service-create"
         },
         [BountyContractCategory.Other] = new BountyContractCategoryMeta
         {
             Name = "bounty-contracts-category-other",
-            UiColor = Color.FromHex("#474747")
+            UiColor = Color.FromHex("#3c3c3c"),
+            Announcement = "bounty-contracts-announcement-generic-create"
         },
     };
 }
diff --git a/Resources/Locale/en-US/_NF/bounty-contracts/bounty-contracts.ftl b/Resources/Locale/en-US/_NF/bounty-contracts/bounty-contracts.ftl
index cc9a919273..2ce886711c 100644
--- a/Resources/Locale/en-US/_NF/bounty-contracts/bounty-contracts.ftl
+++ b/Resources/Locale/en-US/_NF/bounty-contracts/bounty-contracts.ftl
@@ -1,5 +1,6 @@
 # General stuff
 bounty-contracts-author = {$name} ({$job})
+bounty-contracts-author-no-job = {$name}
 bounty-contracts-unknown-author-name = Unknown
 bounty-contracts-unknown-author-job = Unknown
 
@@ -13,19 +14,31 @@ bounty-contracts-category-other = Other
 # Cartridge
 bounty-contracts-program-name = Bounty Contracts
 
-## Radio Announcements
-bounty-contracts-radio-name = Bounty Contracts Service
-bounty-contracts-radio-create = New bounty placed for "{$target}". Reward: {$reward}$.
+## PDA/Radio Announcements
+bounty-contracts-announcement-radio-name = Bounty Contracts Service
+bounty-contracts-announcement-pda-name = Bounty placed
+
+bounty-contracts-announcement-generic-create = New contract placed for {$target}. Reward: {$reward}.
+bounty-contracts-announcement-criminal-create = New criminal bounty placed on {$target}. Reward: {$reward}.
+bounty-contracts-announcement-vacancy-create = New job vacancy posted for {$target}. Reward: {$reward}.
+bounty-contracts-announcement-construction-create = New construction contract placed for {$target}. Reward: {$reward}.
+bounty-contracts-announcement-service-create = New service contract placed for {$target}. Reward: {$reward}.
+
+## Contract collection names
+bounty-contract-collection-name-command = Command
+bounty-contract-collection-name-public = Public
 
 ## UI - List contracts
-bounty-contracts-ui-list-no-contracts = No bounties posted yet...
+bounty-contracts-ui-list-no-contracts = No contracts posted yet...
 bounty-contracts-ui-list-no-description = No additional description provided...
-bounty-contracts-ui-list-create = New Bounty
+bounty-contracts-ui-list-create = New Contract
 bounty-contracts-ui-list-refresh = Refresh
 bounty-contracts-ui-list-category = Category: {$category}
 bounty-contracts-ui-list-vessel = Vessel: {$vessel}
 bounty-contracts-ui-list-author = Posted by: {$author}
+bounty-contracts-ui-list-unknown-author = Unknown
 bounty-contracts-ui-list-remove = Remove
+bounty-contracts-ui-list-loading = Loading...
 
 ## UI - Create contract
 bounty-contracts-ui-create-category = Category:{" "}
@@ -44,6 +57,9 @@ bounty-contracts-ui-create-button-cancel = Cancel
 bounty-contracts-ui-create-button-create = Create
 bounty-contracts-ui-create-error-invalid-price = Error: Invalid price!
 bounty-contracts-ui-create-error-no-name = Error: Invalid bounty name!
+bounty-contracts-ui-create-error-name-too-long = Error: Name too long!
+bounty-contracts-ui-create-error-vessel-too-long = Error: Vessel too long!
+bounty-contracts-ui-create-error-description-too-long = Error: Description too long!
 bounty-contracts-ui-create-ready = Your contract is ready to be published!
 
 
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/cartridges.yml
index ab95a9862c..6fc446a832 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/cartridges.yml
@@ -25,8 +25,6 @@
       programName: bounty-contracts-program-name
       icon: Interface/Actions/shop.png
     - type: BountyContractsCartridge
-    - type: AccessReader
-      access: [["HeadOfSecurity"], ["HeadOfPersonnel"]]
 
 - type: entity
   parent: NFBasePDACartridge
diff --git a/Resources/Prototypes/_NF/SectorServices/services.yml b/Resources/Prototypes/_NF/SectorServices/services.yml
index 8312b5bb6f..75cd2624e7 100644
--- a/Resources/Prototypes/_NF/SectorServices/services.yml
+++ b/Resources/Prototypes/_NF/SectorServices/services.yml
@@ -43,3 +43,8 @@
   components:
   - type: AlertLevel
     alertLevelPrototype: stationAlerts
+
+- type: sectorService
+  id: BountyContracts
+  components:
+  - type: BountyContractData
diff --git a/Resources/Prototypes/_NF/bounty_contract_collections.yml b/Resources/Prototypes/_NF/bounty_contract_collections.yml
new file mode 100644
index 0000000000..7b4b595cb1
--- /dev/null
+++ b/Resources/Prototypes/_NF/bounty_contract_collections.yml
@@ -0,0 +1,31 @@
+- type: bountyContractCollection
+  id: Command
+  order: 1
+  notificationType: Radio
+  name: bounty-contract-collection-name-command
+  writeAccess:
+  - HeadOfPersonnel
+  - HeadOfSecurity
+  deleteAccess:
+  - HeadOfPersonnel
+  - HeadOfSecurity
+  categories:
+  - Criminal
+  - Vacancy
+  - Construction
+  - Service
+  - Other
+
+- type: bountyContractCollection
+  id: Public
+  order: 2
+  notificationType: PDA
+  name: bounty-contract-collection-name-public
+  deleteAccess:
+  - HeadOfPersonnel
+  - HeadOfSecurity
+  categories:
+  - Vacancy
+  - Construction
+  - Service
+  - Other

From 661c930988e8c8eda3dbf5bdb680f511030557c6 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Wed, 5 Mar 2025 18:49:21 +0000
Subject: [PATCH 2/4] Automatic Changelog (#2967)

---
 Resources/Changelog/Frontier.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 68f162abd9..436efbe2c9 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -7610,3 +7610,9 @@ Entries:
         placeholder item whenever a droppable item is removed.
   id: 5823
   time: '2025-03-04T15:45:10.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Tweak
+      message: Added a public tab to the PDA bounty app for civilian use.
+  id: 5824
+  time: '2025-03-05T18:48:50.0000000+00:00'

From ec2fa641f9594a2b60120d19f23b462ef922d4ab Mon Sep 17 00:00:00 2001
From: dustylens <54123313+dustylens@users.noreply.github.com>
Date: Wed, 5 Mar 2025 20:30:45 +0000
Subject: [PATCH 3/4] A new medical bag and medical belt crafting recipes.
 (#2981)

* Belt my bag.

* Bag touch up

* Slight size buff. Maybe too much? Not sure.

* Issues addressed

* Paperwork is for chumps
---
 .../Objects/Specific/Medical/medical_bag.yml  |  64 ++++++++++++++++++
 .../_NF/Recipes/Lathes/Packs/medical.yml      |   5 +-
 .../Prototypes/_NF/Recipes/Lathes/medical.yml |  40 +++++++++++
 .../Medical/medical_bag.rsi/equipped-BELT.png | Bin 0 -> 672 bytes
 .../Medical/medical_bag.rsi/icon-on.png       | Bin 0 -> 307 bytes
 .../Specific/Medical/medical_bag.rsi/icon.png | Bin 0 -> 717 bytes
 .../Medical/medical_bag.rsi/inhand-left.png   | Bin 0 -> 944 bytes
 .../Medical/medical_bag.rsi/inhand-right.png  | Bin 0 -> 910 bytes
 .../Medical/medical_bag.rsi/meta.json         |  40 +++++++++++
 9 files changed, 148 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/medical_bag.yml
 create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/equipped-BELT.png
 create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/icon-on.png
 create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/meta.json

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/medical_bag.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/medical_bag.yml
new file mode 100644
index 0000000000..670b9a1e59
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/medical_bag.yml
@@ -0,0 +1,64 @@
+- type: entity
+  name: medical bag
+  id: MedicalBag
+  parent: BaseStorageItem
+  description: A medical bag designed to hold topicals and small reagent containers. For the medic on the go.
+  components:  
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Medical/medical_bag.rsi
+    layers:
+    - state: icon
+    - state: icon-on
+      visible: false
+      map: [ "enum.ToggleVisuals.Layer" ]
+  - type: Clothing
+    sprite: _NF/Objects/Specific/Medical/medical_bag.rsi
+    quickEquip: false
+    slots:
+    - belt
+  - type: Item
+    size: Ginormous
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,5,3
+    quickInsert: true
+    areaInsert: true
+    whitelist:
+      components:
+        - Pill
+        - Hypospray
+      tags:
+        - PillCanister
+        - CentrifugeCompatible
+        - Syringe
+        - Ointment
+        - Brutepack
+        - Bloodpack
+        - Gauze
+        - Bottle
+  - type: Dumpable
+  - type: MagnetPickup
+    magnetEnabled: false
+    magnetCanBeEnabled: false
+  # Frontier: toggle magnet from White Dream (keeping this in case it's useful as a future note)
+  - type: ItemToggle
+    soundActivate: &soundActivate
+      collection: sparks
+      params:
+        variation: 0.25
+    soundDeactivate: *soundActivate
+    onUse: false
+    onAltUse: true
+    onActivate: false
+  - type: ItemToggleExamine
+    on: item-toggle-examine-magnet-on
+    off: item-toggle-examine-magnet-off
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: { visible: True }
+          False: { visible: False }
+  # End Frontier
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/medical.yml
index e046bacaf9..170986b73b 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/medical.yml
@@ -2,13 +2,16 @@
   id: NFMedicalStatic
   recipes:
   - VehicleWheelchairFolded
-  - PowerCellSmall
   - ClothingOuterEVASuitMedic
   - BaseChemistryEmptyVial
   - BlankMediPen
   - MedicalAppraisalTool
   - HandheldCrewMonitor
   - PowerCellSmall # For small appliances, convenience if anything
+  - CraftChemBag
+  - BeltMedicalEMT
+  - BeltMedical
+  - CraftMedicalBag
 
 - type: latheRecipePack
   id: NFMedical
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml b/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml
index cd6e76be1e..72abab7fbe 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml
@@ -7,3 +7,43 @@
     Glass: 1200
     Steel: 1000
     Plastic: 1400
+
+- type: latheRecipe
+  parent: BaseToolRecipe
+  id: CraftChemBag
+  result: ChemBag
+  category: Tools
+  completetime: 2
+  materials:
+    Cloth: 500
+    Steel: 500
+
+- type: latheRecipe
+  parent: BaseToolRecipe
+  id: CraftMedicalBag
+  result: MedicalBag
+  category: Tools
+  completetime: 2
+  materials:
+    Cloth: 500
+    Steel: 500
+
+- type: latheRecipe
+  parent: BaseToolRecipe
+  id: BeltMedicalEMT
+  result: ClothingBeltMedicalEMT
+  category: Tools
+  completetime: 2
+  materials:
+    Cloth: 100
+    Steel: 50
+
+- type: latheRecipe
+  parent: BaseToolRecipe
+  id: BeltMedical
+  result: ClothingBeltMedical
+  category: Tools
+  completetime: 2
+  materials:
+    Cloth: 100
+    Steel: 50
diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..41b1e29e3272086adb1658f1e2530df374342ee7
GIT binary patch
literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%T1iAfRCt{2+OccfKokb>?@9|Pr9&`+8j9!?XGsVF57(jI+Nrl>>XfFViRai|
zx)lwXYU80pyfkE~7diic3YG?sT|y=!0v?Q~E`<))p^<TkRqkXrR?GJT50+2wPEU7|
z;T}LlL_|bHL_|b?w!O2fw|92+s>hK=N~xuk#_jLg1b=??K^L6@0N}y>mIffAD6$&h
z-?p)Lh|zeW5k<nJy;TB=P64Cw1na{-0KoISc{4#&Dixcs#)2Tw?RFd0YW2o%$?=oH
z6_T4|!YToy@#I%<M*(pQVHnz+zObafw0^@d1n#*QjVH!2jiw0z^e%=P0Gb^i>%%_c
zIG)>1DJ2?>hVcMwNGY}Jx^w$Zjz4_%3bg};mzz(PzXX~c|F;>Slrm1>l888tk(LAi
zC^`k*?D)n3jT7+sygz*geEV_+0K)gpJGw2s_cfGCCFAzScTh?>`@ox?m$$colv0OV
zkq{rv+S@FF8_CMs#REXNW%l|@SUm$~<?-SH;OW=oPf$L`M?^$KL_|bHL_|dNFI!c?
zgp^Y6AD`+V2o{Qyd1EB;=*4RkokDI3Ciag{^_%iz;~IrKi*{Ia3iv+A&nD^SkNLaC
zX{-}4TZ7ZP80yh@g0-@;4YM>SgRAK>kWy;f9qUX>z;#{ywsQsms2wPLdUup1%)&0a
zEdW5hi{z#VAiaWQo=i(%t*np~Av8Pws%C)jJa78J%<i?#EU>QdxX!fR*gKpayX>~$
zd7h}(>$kRRoK^~F+kd7daDB0Q_Is8%i&*vBhKPv%2R{Mcoz8&G<?E;b0000<MNUMn
GLSTZGWIh=H

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/icon-on.png b/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/icon-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..d640b32a3dacd9ef842ccc7e6281a061fca40f7b
GIT binary patch
literal 307
zcmeAS@N?(olHy`uVBq!ia0vp^2Y^_CgAGW!%qVXKQjEnx?oJHr&dIz4a^8BnIEGZr
zd3*g}XR`xC+r|3tuM}A>xvny3Z7JCp;kbc&;{;#PGC>Z@Cv$8yH@UN>N8YpMv$+4j
zf>{ly8)$m{*NtBe2FLDy-=99|$%gw+f0squOy5_x^564Y6_f7BpP%#U*WQ$MrhnH-
zc75A_ZhgtwfGz(^>qK9xYu@v}_V)iGW`qAfo+U?1n*T4d6??nA)^u&+>$*u>YNu{n
zzsz|@X?@J$3J$L?lh?e`w_<4jt2h01;jYGG8`sKw+x_zB`QzK({g=DF$-aE2T=&=A
xX&$%3U4O+I`-oq>w6C6_wifI{7}2o*E&J`Fy9bZlnH&xh^K|udS?83{1ORi1ig5q{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/icon.png b/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0eb911651ffe22a2215c2cef02ac88819e04f056
GIT binary patch
literal 717
zcmV;;0y6!HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%he<?1R9J=WmN94=Q5eU6DNTzQg&+nD6j}(Ea%vz$DX&5xdnTg+r%t6y(m6v3
zA(KO=qJhw<9U?@Np=1{XBTj*+r8zQWs<d*nM5Hts>|pLijdz}AjQ{E0`~L6y|L?nZ
z-+M5^eaDzxq7b6ly|z#&*pA=HfDob?jYa_o27>@>Y-~soAw+X)YYTu<sRTeeowjA-
zfgJ+|R8=LJOq#}%$t0?(4wBNk0xK&k&F|XTKnc6?T$y2SZ_iZ6G$4d%x)x&iydF8H
z?I%!{S2?YenDqxc_{N;UF;K1P)N?5cg+fm)%TLfQ9*>1(;#q%?(@N=<IDoReN<0?s
znPXrB)tXMVrUS5^IzZb`+!E|Ir0pkIPaWJ^Z-$3fL9KFv;-8aAe*U?_Rnu`#O><f)
z;hvfX;NsU0+*8w3Yr5pL=kN_{K=IG<ExiN4qsI;$&Iu;Z^Zb4qlH!1To;=Uva87Xc
z^$VB({sN#z-%`(2hBM&vdeBtC{J75Xl?P>9r`T}u@;u*@Uu?LTe{#w3)eJAL*Z901
z>J}Q72B1|1v~0(?SUIuH?T5Ywd|nS1+D&qw*TdR}_hb(9M3zDTWDZ*uG4@J3_s#|Y
z%H=YY%K*FzMWkRavquM=+<xfWijQ_S2?PQF1Ofq$b~cGDh2+}<a@>o1X9EVFh1cv-
z2jW_`VgT1d45yZ*p)BImvbfvI+Pwz=F7g@4Z77S>b18tKTCrTPo!G^xW!X;bns&Cx
zQiy6z@8BAU$KyjCMgUFMLJWY<@80nG<0lKhH)!WxSHSdMV0j#On}AkpwL<&9Z-@h!
z8L;ykj@5H1dEK(=>n+iawrl&!H^K-b++X|$r9czZdiNk(00000NkvXXu0mjf$@Na=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..f047786cb06c5a1b71e18143ecf69c12a3293b2d
GIT binary patch
literal 944
zcmV;h15f;kP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004PX+uL$X=7sm
z04R}lk-bYoQ5eR5YGRb(P(wt6gGGZv6hvd$&>|sbkkz8sufUJXy;mYygO&!NA!_Ms
z=s&16Xe|hWB8X^f?`sLUy+;Kl@?6e+e>~?rFYkRWI3oqEXm-s&v1A#s`LKUEvEui<
z;l_!FNgPSd)Mum72p!k=0}fU1L#kKjd;hN9bjH-c(Jefs>4qgN(-7IPbj7>E16n?r
z7CsgZ8Zw~pjnY#MepQ@n@TX!U9-9NF>gmt5ajK2AyipV$6Aly$6|Fgs`Vw!Zw6rL7
zNcJ!$G3E*5Cq;#I3Rr}smL#+PedBfC0%h@N^48hJ5J!%@c!Q!=q-#cMR`iTK1vXXg
zfAci6lM{{Z-Y~ddZ2MybJbO^9+V;<hZP!l0^$b^~mcJ}HO@E1AZE1lc@NL7zbxTX_
z!{rVPKIus#S(jY0o!KnBpF>{)`tP7;wUJfxoU=!WZ^<vZg@Z#FmHWQ6U&4B4?Mx~s
zK>z>&{z*hZRCt{2+ObO;Q5*;G?@JqnMqMPuQwSyCrswr^5IQ7*fLmt4q0Qi!KSHR~
zf?NK8Ox-danbJW!M8tx|QxU|@O)1h+MVglLb%+gkHO9#AiG}ZHyBog0$L}8Z8{Pwm
zh=_=Yh=_=Yhy>V<s~=KMClM2&(u+3PgvZi>w&UuNxmSN5wO`*>4<V})BRimw&*A96
z7s)z0@KMO;M6#}9qygnh4Y9_tNLH+IjB=$Wl64&;4Tz5=Ff+d>k~K5Gi1=7SB<tST
zj;kf7fays<L_|bHL_|bHL_|bHcVRp3llwTyu^l&RJMKldcik8{8~mS$p0|g;yovMt
z%Q{g2O|;e@-farNFTcLsf150^3lc9^-?bO=VSNn%FsZfP+uf0Fax@Z&G{28J3II~+
z%$5Ah+I^E+U+nGfblu@%4QPJ!0JJ{GkB#@pX0tey3J=j*tJ#4wRI63|jGeZ(aj5pK
z8ZXv>g{8MBmONPTVOXEOVC#GcgHqukN-1of4Zup;`1b5Y`vys|<iSezR$KHZSjgw_
z`RfTLl20XLJDM7|u3Vof<a0gO7HvSeQiByA#+#KDq|zB^ZDtxOrI1Qz@OpU}#gf;4
zUo3e&*B1LhO+BCfr(zHUkM{j~Pjk5&+i{_k>O*S^bn-h0g8qHK&YLAfH~Rzr2%#}E
SIjuba0000<MNUMnLSTa7LBF;D

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb8010a7a412a428e5f3a5543835b3abb4557dec
GIT binary patch
literal 910
zcmV;919AL`P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004PX+uL$X=7sm
z04R}lk-bYoQ5eR5YGRb(P(wt6gGGZv6hvd$&>|sbkkz8sufUJXy;mYygO&!NA!_Ms
z=s&16Xe|hWB8X^f?`sLUy+;Kl@?6e+e>~?rFYkRWI3oqEXm-s&v1A#s`LKUEvEui<
z;l_!FNgPSd)Mum72p!k=0}fU1L#kKjd;hN9bjH-c(Jefs>4qgN(-7IPbj7>E16n?r
z7CsgZ8Zw~pjnY#MepQ@n@TX!U9-9NF>gmt5ajK2AyipV$6Aly$6|Fgs`Vw!Zw6rL7
zNcJ!$G3E*5Cq;#I3Rr}smL#+PedBfC0%h@N^48hJ5J!%@c!Q!=q-#cMR`iTK1vXXg
zfAci6lM{{Z-Y~ddZ2MybJbO^9+V;<hZP!l0^$b^~mcJ}HO@E1AZE1lc@NL7zbxTX_
z!{rVPKIus#S(jY0o!KnBpF>{)`tP7;wUJfxoU=!WZ^<vZg@Z#FmHWQ6U&4B4?Mx~s
zK>z>&+(|@1RCt{2+PyDBVH5`N=eCHbs6;BHh)8TywO9;oC)=GR79EV;{0W4;e?Vg+
zF*SA!5|QYwn}`rbK?Ly;A(0%5*0=js-&QNnZ|l7`=REhMxyyS1A|fIpA|fIpBBD0}
z!I1oQhTl-l?b2DSQWTQ6#;H)-*ktaf*x8IxM6R+ZG_&JB;9%EAB5rDkRz8WiiGy8R
z=~>4Ccuo(oys}YrsB&6f*?{NtQ0ZC60St{#!RPNPI#fCN{9PCtpVCt-5DZB*egvy6
zGZ7IH5fKp)5fKp)QDu2Kaq&7`D`D>j-F21r1O7AR^L~Z1wq`q<xh^t~Qg5Am3QC0n
z!I0c^ga81MXzbm+^|e(1fcMyfh-e=||G=Q!c7{LoUYMTHGK3#DL~=v~BMmpOEDH~w
z+x*l7K<$18;cysxI?{aOtKPaO4FCYP?wjE8`f=4gn%@{nrqZZ8I>Y8&Bbp5ZBBeQz
z&h@SzHgR%(fkfQI;?k0q+68?C`+8d6t;;0hCI))jwFFV=oqKtmlm;Loh(u$Uo1aHA
zmCj#JrqY<1okb)XgJG0rf9h@Tc3+G3bseSDeSx6c<#Ihaykv`rT-w=;o@B4R>)dYl
k<Hzee)^^2jtPxd#XWHJHJu|Kbod5s;07*qoM6N<$g5}+)a{vGU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/meta.json
new file mode 100644
index 0000000000..6efc531eca
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Specific/Medical/medical_bag.rsi/meta.json
@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by lzk228(discord 455630609641897984), edited by dustylens(github)",
+  "copyright": "icon_on taken from sprites by @kilath",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-on",
+      "delays": [
+        [
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

From 1fe08833b7ac5eee6748fcc5c9db8b6fd38a9a62 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Wed, 5 Mar 2025 20:31:36 +0000
Subject: [PATCH 4/4] Automatic Changelog (#2981)

---
 Resources/Changelog/Frontier.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 436efbe2c9..6e3fda64e0 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -7616,3 +7616,9 @@ Entries:
       message: Added a public tab to the PDA bounty app for civilian use.
   id: 5824
   time: '2025-03-05T18:48:50.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: New medical bag and crafting recipes for chem bag and medical belts.
+  id: 5825
+  time: '2025-03-05T20:30:46.0000000+00:00'