diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml b/Content.Client/Cargo/UI/BountyEntry.xaml
index 99874cf1a5d..73ddc9f1779 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml
@@ -1,36 +1,40 @@
-<BoxContainer xmlns="https://spacestation14.io"
-              xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-              Margin="10 10 10 0"
-              HorizontalExpand="True"
-              Visible="True">
-    <PanelContainer StyleClasses="BackgroundPanel" HorizontalExpand="True">
-        <BoxContainer Orientation="Vertical"
-                      HorizontalExpand="True">
-            <BoxContainer Orientation="Horizontal">
-                <BoxContainer Orientation="Vertical" HorizontalExpand="True">
-                    <RichTextLabel Name="RewardLabel"/>
-                    <RichTextLabel Name="ManifestLabel"/>
+<BoxContainer
+    HorizontalExpand="True"
+    Margin="10,10,10,0"
+    Visible="True"
+    xmlns="https://spacestation14.io"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls">
+    <PanelContainer HorizontalExpand="True" StyleClasses="BackgroundPanel">
+        <BoxContainer HorizontalExpand="True" Orientation="Vertical">
+            <GridContainer Columns="2" HorizontalExpand="True">
+                <BoxContainer HorizontalExpand="True" Orientation="Vertical">
+                    <RichTextLabel Name="RewardLabel" />
+                    <RichTextLabel Margin="0,0,150,0" Name="ManifestLabel" />
                 </BoxContainer>
-                <Control MinWidth="10"/>
-                <BoxContainer Orientation="Vertical" MinWidth="120">
-                    <BoxContainer Orientation="Horizontal" MinWidth="120">
-                        <Button Name="PrintButton"
-                                Text="{Loc 'bounty-console-label-button-text'}"
-                                HorizontalExpand="False"
-                                HorizontalAlignment="Right"
-                                StyleClasses="OpenRight"/>
-                        <Button Name="SkipButton"
-                                Text="{Loc 'bounty-console-skip-button-text'}"
-                                HorizontalExpand="False"
-                                HorizontalAlignment="Right"
-                                StyleClasses="OpenLeft"/>
+                <BoxContainer MinWidth="120" Orientation="Vertical">
+                    <BoxContainer MinWidth="120" Orientation="Horizontal">
+                        <Button
+                            HorizontalAlignment="Right"
+                            HorizontalExpand="False"
+                            Name="PrintButton"
+                            StyleClasses="OpenRight"
+                            Text="{Loc 'bounty-console-label-button-text'}" />
+                        <Button
+                            HorizontalAlignment="Right"
+                            HorizontalExpand="False"
+                            Name="SkipButton"
+                            StyleClasses="OpenLeft"
+                            Text="{Loc 'bounty-console-skip-button-text'}" />
                     </BoxContainer>
-                    <RichTextLabel Name="IdLabel" HorizontalAlignment="Right" Margin="0 0 5 0"/>
+                    <RichTextLabel
+                        HorizontalAlignment="Right"
+                        Margin="0,0,5,0"
+                        Name="IdLabel" />
                 </BoxContainer>
-            </BoxContainer>
-            <customControls:HSeparator Margin="5 10 5 10"/>
+            </GridContainer>
+            <customControls:HSeparator Margin="5,10,5,10" />
             <BoxContainer>
-                <RichTextLabel Name="DescriptionLabel"/>
+                <RichTextLabel Name="DescriptionLabel" />
             </BoxContainer>
         </BoxContainer>
     </PanelContainer>
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml.cs b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
index 3f86f27a466..395f7e65536 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml.cs
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
@@ -1,6 +1,9 @@
 // SPDX-FileCopyrightText: 2023-2024 Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2024-2025 Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 // SPDX-FileCopyrightText: 2024 Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
+// SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+// SPDX-FileCopyrightText: 2026 taydeo <tay@funkystation.org>
+// SPDX-FileCopyrightText: 2026 taydeo <td12233a@gmail.com>
 // SPDX-License-Identifier: MIT
 
 using Content.Client.Message;
@@ -33,19 +36,26 @@ public BountyEntry(CargoBountyData bounty, TimeSpan untilNextSkip)
 
         UntilNextSkip = untilNextSkip;
 
-        if (!_prototype.Resolve<CargoBountyPrototype>(bounty.Bounty, out var bountyPrototype))
-            return;
-
         var items = new List<string>();
-        foreach (var entry in bountyPrototype.Entries)
+        foreach (var entry in bounty.Entries) // Funky Station
         {
-            items.Add(Loc.GetString("bounty-console-manifest-entry",
-                ("amount", entry.Amount),
-                ("item", Loc.GetString(entry.Name))));
+            switch (entry)
+            {
+                case CargoObjectBountyItemData objectBounty:
+                    items.Add(Loc.GetString("bounty-console-manifest-entry",
+                        ("amount", entry.Amount),
+                        ("item", Loc.GetString(entry.Name))));
+                    break;
+                case CargoReagentBountyItemData reagentBounty:
+                    items.Add(Loc.GetString("bounty-console-manifest-entry-reagent",
+                        ("amount", entry.Amount),
+                        ("item", Loc.GetString(entry.Name))));
+                    break;
+            }
         }
         ManifestLabel.SetMarkup(Loc.GetString("bounty-console-manifest-label", ("item", string.Join(", ", items))));
-        RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", bountyPrototype.Reward)));
-        DescriptionLabel.SetMarkup(Loc.GetString("bounty-console-description-label", ("description", Loc.GetString(bountyPrototype.Description))));
+        RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", bounty.Reward))); // Funky Station
+        DescriptionLabel.SetMarkup(Loc.GetString("bounty-console-description-label", ("description", Loc.GetString(bounty.Description)))); // Funky Station
         IdLabel.SetMarkup(Loc.GetString("bounty-console-id-label", ("id", bounty.Id)));
 
         PrintButton.OnPressed += _ => OnLabelButtonPressed?.Invoke();
diff --git a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs
index 72c41180564..1160340adf3 100644
--- a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs
+++ b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs
@@ -1,5 +1,8 @@
 // SPDX-FileCopyrightText: 2025 Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 // SPDX-FileCopyrightText: 2025 BarryNorfolk <barrynorfolkman@protonmail.com>
+// SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+// SPDX-FileCopyrightText: 2026 taydeo <tay@funkystation.org>
+// SPDX-FileCopyrightText: 2026 taydeo <td12233a@gmail.com>
 // SPDX-License-Identifier: MIT
 
 using Content.Client.Message;
@@ -23,11 +26,8 @@ public BountyHistoryEntry(CargoBountyHistoryData bounty)
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        if (!_prototype.Resolve(bounty.Bounty, out var bountyPrototype))
-            return;
-
         var items = new List<string>();
-        foreach (var entry in bountyPrototype.Entries)
+        foreach (var entry in bounty.Bounty.Entries) // Funky Station
         {
             items.Add(Loc.GetString("bounty-console-manifest-entry",
                 ("amount", entry.Amount),
@@ -35,7 +35,7 @@ public BountyHistoryEntry(CargoBountyHistoryData bounty)
         }
 
         ManifestLabel.SetMarkup(Loc.GetString("bounty-console-manifest-label", ("item", string.Join(", ", items))));
-        RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", bountyPrototype.Reward)));
+        RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", bounty.Bounty.Reward))); // Funky Station
         IdLabel.SetMarkup(Loc.GetString("bounty-console-id-label", ("id", bounty.Id)));
 
         TimestampLabel.SetMarkup(bounty.Timestamp.ToString(@"hh\:mm\:ss"));
diff --git a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
index 1e8deb45fd5..35462e3797c 100644
--- a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
+++ b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
@@ -3,6 +3,9 @@
 // SPDX-FileCopyrightText: 2024 Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2024 wafehling <wafehling@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2025 BarryNorfolk <barrynorfolkman@protonmail.com>
+// SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+// SPDX-FileCopyrightText: 2026 taydeo <tay@funkystation.org>
+// SPDX-FileCopyrightText: 2026 taydeo <td12233a@gmail.com>
 // SPDX-License-Identifier: MIT
 
 using Content.Shared.Cargo;
@@ -66,5 +69,5 @@ public sealed partial class StationCargoBountyDatabaseComponent : Component
     /// The time between skipping bounties.
     /// </summary>
     [DataField]
-    public TimeSpan SkipDelay = TimeSpan.FromMinutes(15);
+    public TimeSpan SkipDelay = TimeSpan.FromMinutes(3);
 }
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 923afec3256..ad3e576e540 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -11,21 +11,29 @@
 // SPDX-FileCopyrightText: 2025 Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 // SPDX-FileCopyrightText: 2025 themias <89101928+themias@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2025 BarryNorfolk <barrynorfolkman@protonmail.com>
+// SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+// SPDX-FileCopyrightText: 2026 taydeo <tay@funkystation.org>
+// SPDX-FileCopyrightText: 2026 taydeo <td12233a@gmail.com>
 // SPDX-License-Identifier: MIT
 
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Cargo.Components;
 using Content.Server.NameIdentifier;
+using Content.Shared._Funkystation.Cargo.Prototypes;
 using Content.Shared.Access.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Labels.EntitySystems;
 using Content.Shared.NameIdentifier;
 using Content.Shared.Paper;
+using Content.Shared.Research.Components;
+using Content.Shared.Research.Systems;
 using Content.Shared.Stacks;
 using Content.Shared.Whitelist;
 using JetBrains.Annotations;
@@ -43,6 +51,8 @@ public sealed partial class CargoSystem
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly NameIdentifierSystem _nameIdentifier = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSys = default!;
+    [Dependency] private readonly SharedResearchSystem _research = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
 
     private static readonly ProtoId<NameIdentifierGroupPrototype> BountyNameIdentifierGroup = "Bounty";
 
@@ -71,7 +81,9 @@ private void OnBountyConsoleOpened(EntityUid uid, CargoBountyConsoleComponent co
             return;
 
         var untilNextSkip = bountyDb.NextSkipTime - Timing.CurTime;
-        _uiSystem.SetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(bountyDb.Bounties, bountyDb.History, untilNextSkip));
+        _uiSystem.SetUiState(uid,
+            CargoConsoleUiKey.Bounty,
+            new CargoBountyConsoleState(bountyDb.Bounties, bountyDb.History, untilNextSkip));
     }
 
     private void OnPrintLabelMessage(EntityUid uid, CargoBountyConsoleComponent component, BountyPrintLabelMessage args)
@@ -87,13 +99,14 @@ private void OnPrintLabelMessage(EntityUid uid, CargoBountyConsoleComponent comp
 
         var label = Spawn(component.BountyLabelId, Transform(uid).Coordinates);
         component.NextPrintTime = Timing.CurTime + component.PrintDelay;
-        SetupBountyLabel(label, station, bounty.Value);
+        SetupBountyLabel(label, station, bounty);
         _audio.PlayPvs(component.PrintSound, uid);
     }
 
     private void OnSkipBountyMessage(EntityUid uid, CargoBountyConsoleComponent component, BountySkipMessage args)
     {
-        if (_station.GetOwningStation(uid) is not { } station || !TryComp<StationCargoBountyDatabaseComponent>(station, out var db))
+        if (_station.GetOwningStation(uid) is not { } station ||
+            !TryComp<StationCargoBountyDatabaseComponent>(station, out var db))
             return;
 
         if (Timing.CurTime < db.NextSkipTime)
@@ -116,19 +129,21 @@ private void OnSkipBountyMessage(EntityUid uid, CargoBountyConsoleComponent comp
             return;
         }
 
-        if (!TryRemoveBounty(station, bounty.Value, true, args.Actor))
+        if (!TryRemoveBounty(station, bounty, true, args.Actor))
             return;
 
         FillBountyDatabase(station);
         db.NextSkipTime = Timing.CurTime + db.SkipDelay;
         var untilNextSkip = db.NextSkipTime - Timing.CurTime;
-        _uiSystem.SetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties, db.History, untilNextSkip));
+        _uiSystem.SetUiState(uid,
+            CargoConsoleUiKey.Bounty,
+            new CargoBountyConsoleState(db.Bounties, db.History, untilNextSkip));
         _audio.PlayPvs(component.SkipSound, uid);
     }
 
     public void SetupBountyLabel(EntityUid uid, EntityUid stationId, CargoBountyData bounty, PaperComponent? paper = null, CargoBountyLabelComponent? label = null)
     {
-        if (!Resolve(uid, ref paper, ref label) || !_protoMan.Resolve<CargoBountyPrototype>(bounty.Bounty, out var prototype))
+        if (!Resolve(uid, ref paper, ref label))
             return;
 
         label.Id = bounty.Id;
@@ -138,14 +153,25 @@ public void SetupBountyLabel(EntityUid uid, EntityUid stationId, CargoBountyData
         msg.PushNewline();
         msg.AddMarkupOrThrow(Loc.GetString("bounty-manifest-list-start"));
         msg.PushNewline();
-        foreach (var entry in prototype.Entries)
+        foreach (var entry in bounty.Entries)
         {
-            msg.AddMarkupOrThrow($"- {Loc.GetString("bounty-console-manifest-entry",
-                ("amount", entry.Amount),
-                ("item", Loc.GetString(entry.Name)))}");
-            msg.PushNewline();
+            switch (entry)
+            {
+                case CargoObjectBountyItemData objectBounty:
+                    msg.AddMarkupOrThrow($"- {Loc.GetString("bounty-console-manifest-entry",
+                        ("amount", entry.Amount),
+                        ("item", Loc.GetString(entry.Name)))}");
+                    msg.PushNewline();
+                    break;
+                case CargoReagentBountyItemData reagentBounty:
+                    msg.AddMarkupOrThrow($"- {Loc.GetString("bounty-console-manifest-entry-reagent",
+                        ("amount", entry.Amount),
+                        ("item", Loc.GetString(entry.Name)))}");
+                    msg.PushNewline();
+                    break;
+            }
         }
-        msg.AddMarkupOrThrow(Loc.GetString("bounty-console-manifest-reward", ("reward", prototype.Reward)));
+        msg.AddMarkupOrThrow(Loc.GetString("bounty-console-manifest-reward", ("reward", bounty.Reward)));
         _paperSystem.SetContent((uid, paper), msg.ToMarkup());
     }
 
@@ -159,10 +185,12 @@ private void OnGetBountyPrice(EntityUid uid, CargoBountyLabelComponent component
             return;
 
         // make sure this label was actually applied to a crate.
-        if (!_container.TryGetContainingContainer((uid, null, null), out var container) || container.ID != LabelSystem.ContainerName)
+        if (!_container.TryGetContainingContainer((uid, null, null), out var container) ||
+            container.ID != LabelSystem.ContainerName)
             return;
 
-        if (component.AssociatedStationId is not { } station || !TryComp<StationCargoBountyDatabaseComponent>(station, out var database))
+        if (component.AssociatedStationId is not { } station ||
+            !TryComp<StationCargoBountyDatabaseComponent>(station, out var database))
             return;
 
         if (database.CheckedBounties.Contains(component.Id))
@@ -171,15 +199,14 @@ private void OnGetBountyPrice(EntityUid uid, CargoBountyLabelComponent component
         if (!TryGetBountyFromId(station, component.Id, out var bounty, database))
             return;
 
-        if (!_protoMan.Resolve(bounty.Value.Bounty, out var bountyPrototype) ||
-            !IsBountyComplete(container.Owner, bountyPrototype))
+        if (!IsBountyComplete(container.Owner, bounty))
             return;
 
         database.CheckedBounties.Add(component.Id);
         args.Handled = true;
 
         component.Calculating = true;
-        args.Price = bountyPrototype.Reward - _pricing.GetPrice(container.Owner);
+        args.Price = bounty.Reward - _pricing.GetPrice(container.Owner);
         component.Calculating = false;
     }
 
@@ -190,19 +217,20 @@ private void OnSold(ref EntitySoldEvent args)
             if (!TryGetBountyLabel(sold, out _, out var component))
                 continue;
 
-            if (component.AssociatedStationId is not { } station || !TryGetBountyFromId(station, component.Id, out var bounty))
+            if (component.AssociatedStationId is not { } station ||
+                !TryGetBountyFromId(station, component.Id, out var bounty))
             {
                 continue;
             }
 
-            if (!IsBountyComplete(sold, bounty.Value))
+            if (!IsBountyComplete(sold, bounty))
             {
                 continue;
             }
 
-            TryRemoveBounty(station, bounty.Value, false);
+            TryRemoveBounty(station, bounty, false);
             FillBountyDatabase(station);
-            _adminLogger.Add(LogType.Action, LogImpact.Low, $"Bounty \"{bounty.Value.Bounty}\" (id:{bounty.Value.Id}) was fulfilled");
+            _adminLogger.Add(LogType.Action, LogImpact.Low, $"Bounty (id:{bounty.Id}) was fulfilled");
         }
     }
 
@@ -280,7 +308,7 @@ public bool IsBountyComplete(EntityUid container, out HashSet<EntityUid> bountyE
             return false;
         }
 
-        return IsBountyComplete(container, bounty.Value, out bountyEntities);
+        return IsBountyComplete(container, bounty, out bountyEntities);
     }
 
     public bool IsBountyComplete(EntityUid container, CargoBountyData data)
@@ -290,13 +318,8 @@ public bool IsBountyComplete(EntityUid container, CargoBountyData data)
 
     public bool IsBountyComplete(EntityUid container, CargoBountyData data, out HashSet<EntityUid> bountyEntities)
     {
-        if (!_protoMan.Resolve(data.Bounty, out var proto))
-        {
-            bountyEntities = new();
-            return false;
-        }
 
-        return IsBountyComplete(container, proto.Entries, out bountyEntities);
+        return IsBountyComplete(container, data.Entries, out bountyEntities);
     }
 
     public bool IsBountyComplete(EntityUid container, string id)
@@ -304,27 +327,54 @@ public bool IsBountyComplete(EntityUid container, string id)
         if (!_protoMan.TryIndex<CargoBountyPrototype>(id, out var proto))
             return false;
 
-        return IsBountyComplete(container, proto.Entries);
+        var items = new HashSet<CargoBountyItemData>();
+        foreach (var entry in proto.Entries)
+        {
+            CargoBountyItemData newItem = entry switch
+            {
+                CargoObjectBountyItemEntry itemEntry => new CargoObjectBountyItemData(itemEntry),
+                CargoReagentBountyItemEntry itemEntry => new CargoReagentBountyItemData(itemEntry),
+                _ => throw new NotImplementedException($"Unknown type: {entry.GetType().Name}"),
+            };
+            items.Add(newItem);
+
+        }
+
+        return IsBountyComplete(container, items);
     }
 
     public bool IsBountyComplete(EntityUid container, ProtoId<CargoBountyPrototype> prototypeId)
     {
         var prototype = _protoMan.Index(prototypeId);
 
-        return IsBountyComplete(container, prototype.Entries);
+        return IsBountyComplete(container, prototype);
     }
 
     public bool IsBountyComplete(EntityUid container, CargoBountyPrototype prototype)
     {
-        return IsBountyComplete(container, prototype.Entries);
+        var items = new HashSet<CargoBountyItemData>();
+        foreach (var entry in prototype.Entries)
+        {
+            CargoBountyItemData newItem = entry switch
+            {
+                CargoObjectBountyItemEntry itemEntry => new CargoObjectBountyItemData(itemEntry),
+                CargoReagentBountyItemEntry itemEntry => new CargoReagentBountyItemData(itemEntry),
+                _ => throw new NotImplementedException($"Unknown type: {entry.GetType().Name}"),
+            };
+            items.Add(newItem);
+        }
+
+        return IsBountyComplete(container, items);
     }
 
-    public bool IsBountyComplete(EntityUid container, IEnumerable<CargoBountyItemEntry> entries)
+    public bool IsBountyComplete(EntityUid container, IEnumerable<CargoBountyItemData> entries)
     {
         return IsBountyComplete(container, entries, out _);
     }
 
-    public bool IsBountyComplete(EntityUid container, IEnumerable<CargoBountyItemEntry> entries, out HashSet<EntityUid> bountyEntities)
+    public bool IsBountyComplete(EntityUid container,
+        IEnumerable<CargoBountyItemData> entries,
+        out HashSet<EntityUid> bountyEntities)
     {
         return IsBountyComplete(GetBountyEntities(container), entries, out bountyEntities);
     }
@@ -333,7 +383,7 @@ public bool IsBountyComplete(EntityUid container, IEnumerable<CargoBountyItemEnt
     /// Determines whether the <paramref name="entity"/> meets the criteria for the bounty <paramref name="entry"/>.
     /// </summary>
     /// <returns>true if <paramref name="entity"/> is a valid item for the bounty entry, otherwise false</returns>
-    public bool IsValidBountyEntry(EntityUid entity, CargoBountyItemEntry entry)
+    public bool IsValidBountyEntry(EntityUid entity, CargoObjectBountyItemData entry)
     {
         if (!_whitelistSys.IsValid(entry.Whitelist, entity))
             return false;
@@ -344,36 +394,137 @@ public bool IsValidBountyEntry(EntityUid entity, CargoBountyItemEntry entry)
         return true;
     }
 
-    public bool IsBountyComplete(HashSet<EntityUid> entities, IEnumerable<CargoBountyItemEntry> entries, out HashSet<EntityUid> bountyEntities)
+    /// <summary>
+    /// Determines whether the <paramref name="entity"/> meets the criteria for the bounty <paramref name="entry"/>.
+    /// </summary>
+    /// <param name="entity">Some given entity to be checked against criteria</param>
+    /// <param name="reagentBounty">The specific bounty reagent item that is being checked against</param>
+    /// <returns>true if <paramref name="entity"/> is a valid item for the bounty entry, otherwise false</returns>
+    public bool IsValidBountyEntry(EntityUid entity, CargoReagentBountyItemData reagentBounty)
     {
-        bountyEntities = new();
+        if (!TryComp<SolutionContainerManagerComponent>(entity, out var solutions))
+            return false;
 
-        foreach (var entry in entries)
+        if (!_protoMan.TryIndex(reagentBounty.Reagent, out var bounty))
+            return false;
+
+        foreach (var (_, soln) in _solutionContainer.EnumerateSolutions((entity, solutions)))
         {
-            var count = 0;
+            var solution = soln.Comp.Solution;
 
-            // store entities that already satisfied an
-            // entry so we don't double-count them.
-            var temp = new HashSet<EntityUid>();
-            foreach (var entity in entities)
+            foreach (var sol in solution.Contents)
             {
-                if (!IsValidBountyEntry(entity, entry))
-                    continue;
+                if (sol.Reagent.Prototype.Equals(bounty.ID))
+                    return true;
+            }
+        }
 
-                count += _stackQuery.CompOrNull(entity)?.Count ?? 1;
-                temp.Add(entity);
+        return false;
+    }
 
-                if (count >= entry.Amount)
-                    break;
+    /// <summary>
+    /// Determines whether the <paramref name="entity"/> meets the criteria for the bounty <paramref name="entry"/>.
+    /// </summary>
+    /// <returns>true if <paramref name="entity"/> is a valid item for the bounty entry, otherwise false</returns>
+    public bool IsValidBountyEntry(EntityUid entity, CargoBountyItemEntry entry)
+    {
+        return entry switch
+        {
+            CargoObjectBountyItemEntry objectBounty =>
+                IsValidBountyEntry(entity, new CargoObjectBountyItemData(objectBounty)),
+            CargoReagentBountyItemEntry reagentBounty =>
+                IsValidBountyEntry(entity, new CargoReagentBountyItemData(reagentBounty)),
+            _ => throw new NotImplementedException($"Unknown type: {entry.GetType().Name}"),
+        };
+    }
+
+    /// <summary>
+    /// Checks if some bounty is complete by iterating through a given set of entities and then matching
+    /// them to potential bounty objectives
+    /// </summary>
+    /// <param name="entities">Given set of entities to match</param>
+    /// <param name="entries">Given list of bounties objectives to match to</param>
+    /// <param name="bountyEntities">Returns a list of entites that are used to fufil the bounty, is a subset of <paramref name="entities"/></param>
+    /// <returns>True if the given bounty objectives are passed, false otherwise</returns>
+    public bool IsBountyComplete(HashSet<EntityUid> entities,
+        IEnumerable<CargoBountyItemData> entries,
+        out HashSet<EntityUid> bountyEntities)
+    {
+        bountyEntities = new();
+
+        var entityReqs = new Dictionary<EntityUid, HashSet<CargoBountyItemData>>();
+
+        // Matches the given entities to potential objectives each item can fufill
+        foreach (var entity in entities)
+        {
+            entityReqs.Add(entity, new HashSet<CargoBountyItemData>());
+            foreach (var entry in entries)
+            {
+                switch (entry)
+                {
+                    case CargoObjectBountyItemData objectBounty:
+                        if (!IsValidBountyEntry(entity, objectBounty))
+                            continue;
+                        break;
+                    case CargoReagentBountyItemData reagentBounty:
+                        if (!IsValidBountyEntry(entity, reagentBounty))
+                            continue;
+                        break;
+                }
+                entityReqs[entity].Add(entry);
             }
+        }
 
-            if (count < entry.Amount)
-                return false;
+        var remaining = new Dictionary<CargoBountyItemData, int>();
+        foreach (var e in entries)
+        {
+            remaining[e] = e.Amount;
+        }
+
+        // Matches entities to bounty objectives, for object bounties each item can only be matched once, but as
+        // solutions can hold multiple different solutions we must consider how to match multiple objectives per
+        // entity for reagents
+        var sorted = entityReqs.OrderBy(kvp => kvp.Value.Count).ToList();
+        foreach (var (entity, possibleEntries) in sorted)
+        {
+            var chosenEntry = possibleEntries.FirstOrDefault(b => remaining.ContainsKey(b) && remaining[b] > 0);
 
-            foreach (var ent in temp)
+            if (chosenEntry == null)
+                continue;
+            bountyEntities.Add(entity);
+            switch (chosenEntry)
+            {
+                case CargoObjectBountyItemData bountyItem:
+                    remaining[chosenEntry]--;
+                    break;
+                case CargoReagentBountyItemData bountyItem:
+                    // TODO: This is horrible and I hate it, but I am bad and need to study to implement it better
+                    if (!TryComp<SolutionContainerManagerComponent>(entity, out var solutions))
+                        continue;
+                    foreach (var (_, soln) in _solutionContainer.EnumerateSolutions((entity, solutions)))
+                    {
+                        var solution = soln.Comp.Solution;
+
+                        foreach (var sol in solution.Contents)
+                        {
+                            foreach (var cargoBountyItemData1 in possibleEntries)
+                            {
+                                var cargoBountyItemData = (CargoReagentBountyItemData)cargoBountyItemData1;
+                                if (sol.Reagent.Prototype.Equals(cargoBountyItemData.Reagent.Id))
+                                    remaining[cargoBountyItemData] -= sol.Quantity.Value / 100;
+                            }
+
+                        }
+                    }
+                    break;
+            }
+        }
+
+        foreach (var e in remaining)
+        {
+            if (e.Value > 0)
             {
-                entities.Remove(ent);
-                bountyEntities.Add(ent);
+                return false;
             }
         }
 
@@ -407,42 +558,247 @@ private HashSet<EntityUid> GetBountyEntities(EntityUid uid)
         return entities;
     }
 
+    // Beginning of major Funky Station Edits
+    /// <summary>
+    /// This method will attempt to add a bounty to a given station bounty database
+    /// </summary>
+    /// <param name="uid">The uid of the entity trying to add the item, this is normally the bounty computer</param>
+    /// <param name="component">The bounty database for a station, each station has one though we normally don't have
+    /// any outside the main station</param>
+    /// <returns>True if the bounty is successfully added, false otherwise</returns>
+    /// <exception cref="NotImplementedException">This will be thrown if some bounty type that handling has not be
+    /// created for is attempted to be made</exception>
     [PublicAPI]
     public bool TryAddBounty(EntityUid uid, StationCargoBountyDatabaseComponent? component = null)
     {
         if (!Resolve(uid, ref component))
             return false;
 
-        // todo: consider making the cargo bounties weighted.
-        var allBounties = _protoMan.EnumeratePrototypes<CargoBountyPrototype>()
-            .Where(p => p.Group == component.Group)
-            .ToList();
-        var filteredBounties = new List<CargoBountyPrototype>();
-        foreach (var proto in allBounties)
+        if (component.Bounties.Count >= component.MaxBounties)
+            return false;
+
+        var allBounties = _protoMan.EnumeratePrototypes<CargoBountyCategoryPrototype>().ToList();
+        if (allBounties.Count < 1)
+            return false;
+        var chosenCategory = false;
+        var bountyCategory = _random.Pick(allBounties);
+        List<CargoBountyItemEntry> bountyItems = [];
+        while (!chosenCategory)
         {
-            if (component.Bounties.Any(b => b.Bounty == proto.ID))
+            // This all feels wrong, but it works so hey ho
+            var duplicheck = true;
+            while (duplicheck)
+            {
+                duplicheck = false;
+                bountyCategory = _random.Pick(allBounties);
+                foreach (var entry in component.Bounties)
+                {
+                    if (entry.Category == bountyCategory.Name)
+                    {
+                        duplicheck = true;
+                    }
+                }
+            }
+
+            chosenCategory = CheckCategory(uid, bountyCategory, out var availableBounties);
+            if (chosenCategory)
+            {
+                bountyItems = availableBounties;
                 continue;
-            filteredBounties.Add(proto);
+            }
+
+            allBounties.Remove(bountyCategory);
+
+            if (allBounties.Count == 0)
+            {
+                Log.Error("Failed to add bounty because there are no categories available");
+                return false;
+            }
+
+            bountyCategory = _random.Pick(allBounties);
         }
 
-        var pool = filteredBounties.Count == 0 ? allBounties : filteredBounties;
-        var bounty = _random.Pick(pool);
-        return TryAddBounty(uid, bounty, component);
+        var totalItems = bountyItems.Count;
+
+        // Smaller number means that there will be on average less item per bounty
+        const double itemNumberWeight = 0.9;
+        var selection = Math.Min(1 - Math.Ceiling(Math.Log(Math.Pow(_random.NextDouble(), itemNumberWeight), 2)),
+            totalItems);
+        var totalReward = 0;
+        var newBounty = new CargoBountyData
+        {
+            IdPrefix = bountyCategory.IdPrefix,
+            Category = bountyCategory.Name,
+        };
+        var totalBountyItems = 0;
+
+        for (var i = 1; i <= selection;)
+        {
+            if (!SelectBountyEntry(bountyItems, out var bountyItem))
+            {
+                return false;
+            }
+
+            var skip = false;
+            foreach (var entry in newBounty.Entries)
+            {
+                if (entry.Name == bountyItem.Name)
+                {
+                    skip = true;
+                }
+            }
+            if (skip)
+                continue;
+
+            CargoBountyItemData bountyItemData = bountyItem switch
+            {
+                CargoObjectBountyItemEntry itemEntry => new CargoObjectBountyItemData(itemEntry),
+                CargoReagentBountyItemEntry itemEntry => new CargoReagentBountyItemData(itemEntry),
+                _ => throw new NotImplementedException($"Unknown type: {bountyItem.GetType().Name}"),
+            };
+
+            var steps = (bountyItem.MaxAmount - bountyItem.MinAmount) / bountyItem.AmountStep;
+            var step = _random.Next(steps + 1);
+            var bountyAmount = step * bountyItem.AmountStep + bountyItem.MinAmount;
+            totalReward += bountyAmount * bountyItem.RewardPer;
+            bountyItemData.Amount = bountyAmount;
+
+            // Counter for the total number of bounty items, used for if the number goes over 30 (basic crate limit)
+            switch (bountyItemData)
+            {
+                case CargoObjectBountyItemData objectBounty:
+                    totalBountyItems += bountyAmount;
+                    break;
+                case CargoReagentBountyItemData reagentBounty:
+                    totalBountyItems ++;
+                    break;
+            }
+
+            newBounty.Entries.Add(bountyItemData);
+            if (totalItems > 1)
+                totalItems--;
+
+            i++;
+        }
+
+        newBounty.Reward = totalReward;
+        _nameIdentifier.GenerateUniqueName(uid, BountyNameIdentifierGroup, out var randomVal);
+        newBounty.Id = $"{newBounty.IdPrefix}{randomVal:D3}";
+        newBounty.Description = Loc.GetString("bounty-console-category-description",
+            ("category", Loc.GetString(bountyCategory.Name)),
+            ("id", newBounty.Id));
+
+        if (totalBountyItems > 30)
+        {
+            newBounty.Description += " (This bounty requires more compact storage methods such as cardboard boxes or bags)";
+        }
+        if (component.Bounties.Any(b => b.Id == newBounty.Id))
+        {
+            Log.Error("Failed to add bounty {ID} because another one with the same ID already existed!", newBounty.Id);
+            return false;
+        }
+
+        component.Bounties.Add(newBounty);
+        component.TotalBounties++;
+        return true;
     }
 
-    [PublicAPI]
-    public bool TryAddBounty(EntityUid uid, string bountyId, StationCargoBountyDatabaseComponent? component = null)
+    /// <summary>
+    /// Selects a bounty item from a list of entries accounting for the entries weightings.
+    /// </summary>
+    /// <param name="entries">List of entries to select from.</param>
+    /// <param name="bountyEntry">The randomly selected entry.</param>
+    /// <returns>True of false depending on the success of the selection.</returns>
+    private bool SelectBountyEntry(List<CargoBountyItemEntry> entries, out CargoBountyItemEntry bountyEntry)
     {
-        if (!_protoMan.TryIndex<CargoBountyPrototype>(bountyId, out var bounty))
+        double totalWeight = 0;
+        foreach (var entry in entries)
+        {
+            totalWeight += entry.Weight;
+        }
+        var roll = _random.NextDouble(0, totalWeight);
+
+        foreach (var entry in entries)
+        {
+            roll -= entry.Weight;
+            if (!(roll <= 0))
+                continue;
+            bountyEntry = entry;
+            return true;
+        }
+
+        bountyEntry = new CargoObjectBountyItemEntry();
+        return false;
+    }
+
+    /// <summary>
+    /// Checks if a given bounty category is valid to be created for and returns a list of valid objectives from the
+    /// category that can have bounties created from
+    /// </summary>
+    /// <param name="uid">The entity try to create a bounty</param>
+    /// <param name="category">Some given bounty category as defined in yml</param>
+    /// <param name="availableBounties">Returns a list of currently valid objectives</param>
+    /// <returns>True if the category can have bounties created for, false otherwise</returns>
+    private bool CheckCategory(EntityUid uid, CargoBountyCategoryPrototype category, out List<CargoBountyItemEntry> availableBounties)
+    {
+        var bountyItems = new List<CargoBountyItemEntry>(category.Entries);
+        List<CargoBountyItemEntry> toRemove = new();
+        foreach (var bountyEntry in bountyItems)
+        {
+            switch (bountyEntry)
+            {
+                case CargoObjectBountyItemEntry bountyItem:
+                    if (bountyItem.RequiredResearch == null)
+                        continue;
+
+                    List<bool> techChecks = [];
+                    foreach (var research in bountyItem.RequiredResearch)
+                    {
+
+                        var query = EntityManager.EntityQueryEnumerator<TechnologyDatabaseComponent>();
+
+                        while (query.MoveNext(out var tEntityUid, out var technologyDatabaseComponent))
+                        {
+                            if (_station.GetOwningStation(uid) is { } station &&
+                                _station.GetOwningStation(tEntityUid) != station)
+                                continue;
+                            techChecks.Add(
+                                _research.IsTechnologyUnlocked(tEntityUid, (string) research, technologyDatabaseComponent));
+                            break;
+                        }
+                    }
+
+                    if (techChecks.Count == 0 || !techChecks.Any(techCheck => techCheck))
+                    {
+                        toRemove.Add(bountyItem);
+                    }
+                    break;
+                case CargoReagentBountyItemEntry bountyItem:
+                    continue;
+            }
+        }
+
+        bountyItems.RemoveAll(b => toRemove.Contains(b));
+
+        if (bountyItems.Count == 0)
         {
+            availableBounties = [];
             return false;
         }
 
-        return TryAddBounty(uid, bounty, component);
+        availableBounties = bountyItems;
+        return true;
     }
 
-    public bool TryAddBounty(EntityUid uid, CargoBountyPrototype bounty, StationCargoBountyDatabaseComponent? component = null)
+
+    [PublicAPI]
+    public bool TryAddBounty(EntityUid uid, string bountyId, StationCargoBountyDatabaseComponent? component = null)
     {
+        if (!_protoMan.TryIndex<CargoBountyPrototype>(bountyId, out var bounty))
+        {
+            return false;
+        }
+
         if (!Resolve(uid, ref component))
             return false;
 
@@ -450,14 +806,14 @@ public bool TryAddBounty(EntityUid uid, CargoBountyPrototype bounty, StationCarg
             return false;
 
         _nameIdentifier.GenerateUniqueName(uid, BountyNameIdentifierGroup, out var randomVal);
-        var newBounty = new CargoBountyData(bounty, randomVal);
+        var newBounty = new CargoBountyData(randomVal, bounty);
         // This bounty id already exists! Probably because NameIdentifierSystem ran out of ids.
         if (component.Bounties.Any(b => b.Id == newBounty.Id))
         {
             Log.Error("Failed to add bounty {ID} because another one with the same ID already existed!", newBounty.Id);
             return false;
         }
-        component.Bounties.Add(new CargoBountyData(bounty, randomVal));
+        component.Bounties.Add(new CargoBountyData(randomVal, bounty));
         _adminLogger.Add(LogType.Action, LogImpact.Low, $"Added bounty \"{bounty.ID}\" (id:{component.TotalBounties}) to station {ToPrettyString(uid)}");
         component.TotalBounties++;
         return true;
@@ -472,7 +828,7 @@ public bool TryRemoveBounty(Entity<StationCargoBountyDatabaseComponent?> ent,
         if (!TryGetBountyFromId(ent.Owner, dataId, out var data, ent.Comp))
             return false;
 
-        return TryRemoveBounty(ent, data.Value, skipped, actor);
+        return TryRemoveBounty(ent, data, skipped, actor);
     }
 
     public bool TryRemoveBounty(Entity<StationCargoBountyDatabaseComponent?> ent,
diff --git a/Content.Shared/Cargo/CargoBountyData.cs b/Content.Shared/Cargo/CargoBountyData.cs
index 131ae62fa15..9f086a02432 100644
--- a/Content.Shared/Cargo/CargoBountyData.cs
+++ b/Content.Shared/Cargo/CargoBountyData.cs
@@ -1,6 +1,9 @@
 // SPDX-FileCopyrightText: 2023-2024 Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2023 DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2023 Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
+// SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+// SPDX-FileCopyrightText: 2026 taydeo <tay@funkystation.org>
+// SPDX-FileCopyrightText: 2026 taydeo <td12233a@gmail.com>
 // SPDX-License-Identifier: MIT
 
 using Robust.Shared.Serialization;
@@ -13,24 +16,76 @@ namespace Content.Shared.Cargo;
 /// A data structure for storing currently available bounties.
 /// </summary>
 [DataDefinition, NetSerializable, Serializable]
-public readonly partial record struct CargoBountyData
+public sealed partial class CargoBountyData
 {
     /// <summary>
     /// A unique id used to identify the bounty
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public string Id { get; init; } = string.Empty;
+    public string Id { get; set; } = string.Empty;
 
     /// <summary>
-    /// The prototype containing information about the bounty.
+    /// The monetary reward for completing the bounty
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField(required: true)]
-    public ProtoId<CargoBountyPrototype> Bounty { get; init; } = string.Empty;
+    public int Reward;
 
-    public CargoBountyData(CargoBountyPrototype bounty, int uniqueIdentifier)
+    /// <summary>
+    /// A description for flavour purposes.
+    /// </summary>
+    [DataField]
+    public LocId Description = string.Empty;
+
+    /// <summary>
+    /// The entries that must be satisfied for the cargo bounty to be complete.
+    /// </summary>
+    [DataField(required: true)]
+    public List<CargoBountyItemData> Entries = new();
+
+    /// <summary>
+    /// A prefix appended to the beginning of a bounty's ID.
+    /// </summary>
+    [DataField]
+    public string IdPrefix = "NT";
+
+    public LocId Category;
+
+    public CargoBountyData(int uniqueIdentifier, int reward, LocId description, List<CargoBountyItemData> entries, string idPrefix = "NT")
+    {
+        Id = $"{IdPrefix}{uniqueIdentifier:D3}";
+        Reward = reward;
+        Description = description;
+        Entries = entries;
+        IdPrefix = idPrefix;
+    }
+
+    /// <summary>
+    /// Used for creating bounties via the old system with pre-defined bounties
+    /// </summary>
+    /// <param name="uniqueIdentifier">Some number to be used as an ID with IdPrefix</param>
+    /// <param name="prototype">The prototype of the bounty to be created</param>
+    public CargoBountyData(int uniqueIdentifier, CargoBountyPrototype prototype)
     {
-        Bounty = bounty.ID;
-        Id = $"{bounty.IdPrefix}{uniqueIdentifier:D3}";
+        Id = $"{IdPrefix}{uniqueIdentifier:D3}";
+        Description = prototype.Description;
+        IdPrefix = prototype.IdPrefix;
+        Reward = prototype.Reward;
+        var items = new List<CargoBountyItemData>();
+        foreach (var entry in prototype.Entries)
+        {
+            CargoBountyItemData newItem = entry switch
+            {
+                CargoObjectBountyItemEntry itemEntry => new CargoObjectBountyItemData(itemEntry),
+                CargoReagentBountyItemEntry itemEntry => new CargoReagentBountyItemData(itemEntry),
+                _ => throw new NotImplementedException($"Unknown type: {entry.GetType().Name}"),
+            };
+            items.Add(newItem);
+        }
+        Entries = items;
+    }
+
+    public CargoBountyData()
+    {
+
     }
 }
diff --git a/Content.Shared/Cargo/CargoBountyHistoryData.cs b/Content.Shared/Cargo/CargoBountyHistoryData.cs
index 1ad29bf302a..9cb4254de18 100644
--- a/Content.Shared/Cargo/CargoBountyHistoryData.cs
+++ b/Content.Shared/Cargo/CargoBountyHistoryData.cs
@@ -1,4 +1,7 @@
 // SPDX-FileCopyrightText: 2025 BarryNorfolk <barrynorfolkman@protonmail.com>
+// SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+// SPDX-FileCopyrightText: 2026 taydeo <tay@funkystation.org>
+// SPDX-FileCopyrightText: 2026 taydeo <td12233a@gmail.com>
 // SPDX-License-Identifier: MIT
 
 using Content.Shared.Cargo.Prototypes;
@@ -41,11 +44,11 @@ public readonly partial record struct CargoBountyHistoryData
     /// The prototype containing information about the bounty.
     /// </summary>
     [DataField(required: true)]
-    public ProtoId<CargoBountyPrototype> Bounty { get; init; } = string.Empty;
+    public CargoBountyData Bounty { get; init; }
 
     public CargoBountyHistoryData(CargoBountyData bounty, BountyResult result, TimeSpan timestamp, string? actorName)
     {
-        Bounty = bounty.Bounty;
+        Bounty = bounty;
         Result = result;
         Id = bounty.Id;
         ActorName = actorName;
diff --git a/Content.Shared/Cargo/CargoBountyItemData.cs b/Content.Shared/Cargo/CargoBountyItemData.cs
new file mode 100644
index 00000000000..7d27282f99a
--- /dev/null
+++ b/Content.Shared/Cargo/CargoBountyItemData.cs
@@ -0,0 +1,68 @@
+// SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+// SPDX-License-Identifier: MIT
+
+using Content.Shared.Cargo.Prototypes;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Cargo;
+
+[ImplicitDataDefinitionForInheritors, Serializable, NetSerializable]
+public abstract partial class CargoBountyItemData
+{
+    /// <summary>
+    /// How much of the item must be present to satisfy the entry
+    /// </summary>
+    [DataField]
+    public int Amount { get; set; } = 1;
+
+    /// <summary>
+    /// A player-facing name for the item.
+    /// </summary>
+    [DataField]
+    public LocId Name { get; set; } = string.Empty;
+}
+
+[DataDefinition, Serializable, NetSerializable]
+public sealed partial class CargoObjectBountyItemData : CargoBountyItemData
+{
+    /// <summary>
+    /// A whitelist for determining what items satisfy the entry.
+    /// </summary>
+    [DataField(required: true)]
+    public EntityWhitelist Whitelist { get; set; } = default!;
+
+    /// <summary>
+    /// A blacklist that can be used to exclude items in the whitelist.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist { get; set; }
+
+    // todo: implement some kind of simple generic condition system
+
+    public CargoObjectBountyItemData(CargoObjectBountyItemEntry entry)
+    {
+        Name = entry.Name;
+        Amount = entry.Amount;
+        Whitelist = entry.Whitelist;
+        Blacklist = entry.Blacklist;
+    }
+}
+
+[DataDefinition, Serializable, NetSerializable]
+public sealed partial class CargoReagentBountyItemData : CargoBountyItemData
+{
+    /// <summary>
+    /// What reagent will satisfy the bounty requirement
+    /// </summary>
+    public ProtoId<ReagentPrototype> Reagent;
+
+    public CargoReagentBountyItemData(CargoReagentBountyItemEntry entry)
+    {
+        Name = entry.Name;
+        Amount = entry.Amount;
+        Reagent = entry.Reagent;
+    }
+}
diff --git a/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs b/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
index 6534d123199..2c614b59905 100644
--- a/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
+++ b/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
@@ -2,8 +2,13 @@
 // SPDX-FileCopyrightText: 2023 DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2024 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2025 Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
+// SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+// SPDX-FileCopyrightText: 2026 taydeo <tay@funkystation.org>
+// SPDX-FileCopyrightText: 2026 taydeo <td12233a@gmail.com>
 // SPDX-License-Identifier: MIT
 
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Research.Prototypes;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
@@ -60,32 +65,82 @@ public sealed partial class CargoBountyPrototype : IPrototype
     public SpriteSpecifier? Sprite;
 }
 
+[ImplicitDataDefinitionForInheritors, Serializable]
+public abstract partial record CargoBountyItemEntry
+{
+    /// <summary>
+    /// How much of the item must be present to satisfy the entry
+    /// </summary>
+    [DataField]
+    public int Amount { get; set; } = 1;
+
+    // Beginning of Funky Station edits
+    /// <summary>
+    /// A minimum amount of the item that can be requested in a bounty, used to make sure a bounty isn't to underwhelming
+    /// </summary>
+    [DataField]
+    public int MinAmount { get; set; } = 1;
+
+    /// <summary>
+    /// A maximum amount of the item that can be requested for a bounty
+    /// </summary>
+    [DataField]
+    public int MaxAmount { get; set; } = 1;
+
+    /// <summary>
+    /// The step size for the bounties amount, i.e. min:1 max:3 step:2 means only amounts 1 and 3 will be generated.
+    /// </summary>
+    [DataField]
+    public int AmountStep { get; set; } = 1;
+
+    /// <summary>
+    /// The amount each item will reward for a bounty
+    /// </summary>
+    [DataField]
+    public int RewardPer { get; set; } = 1;
+
+    /// <summary>
+    /// A player-facing name for the item. Assigned here but declared in the cargo bounties.ftl file.
+    /// </summary>
+    [DataField]
+    public LocId Name { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Some weight that can be used to effect the chances an item is selected, default is 1, smaller number means less
+    /// likely, higher more likely.
+    /// </summary>
+    [DataField]
+    public double Weight { get; set; } = 1;
+}
+
 [DataDefinition, Serializable, NetSerializable]
-public readonly partial record struct CargoBountyItemEntry()
+public partial record CargoObjectBountyItemEntry : CargoBountyItemEntry
 {
     /// <summary>
     /// A whitelist for determining what items satisfy the entry.
     /// </summary>
     [DataField(required: true)]
-    public EntityWhitelist Whitelist { get; init; } = default!;
+    public EntityWhitelist Whitelist { get; set; } = default!;
 
     /// <summary>
     /// A blacklist that can be used to exclude items in the whitelist.
     /// </summary>
     [DataField]
-    public EntityWhitelist? Blacklist { get; init; } = null;
+    public EntityWhitelist? Blacklist { get; set; } = null;
 
     // todo: implement some kind of simple generic condition system
 
-    /// <summary>
-    /// How much of the item must be present to satisfy the entry
-    /// </summary>
     [DataField]
-    public int Amount { get; init; } = 1;
+    public List<ProtoId<TechnologyPrototype>>? RequiredResearch { get; set; }
+}
 
+[DataDefinition, Serializable, NetSerializable]
+public partial record CargoReagentBountyItemEntry : CargoBountyItemEntry
+{
     /// <summary>
-    /// A player-facing name for the item.
+    /// What reagent will satisfy the entry.
     /// </summary>
-    [DataField]
-    public LocId Name { get; init; } = string.Empty;
+    [DataField(required: true)]
+    public ProtoId<ReagentPrototype> Reagent { get; set; }
+    // End of Funky Station edits
 }
diff --git a/Content.Shared/Cargo/Serialization/CargoBountyItemDataTypeSerializer.cs b/Content.Shared/Cargo/Serialization/CargoBountyItemDataTypeSerializer.cs
new file mode 100644
index 00000000000..11df8e76325
--- /dev/null
+++ b/Content.Shared/Cargo/Serialization/CargoBountyItemDataTypeSerializer.cs
@@ -0,0 +1,52 @@
+// SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+// SPDX-License-Identifier: MIT
+
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Serialization.Markdown.Mapping;
+using Robust.Shared.Serialization.Markdown.Validation;
+using Robust.Shared.Serialization.TypeSerializers.Interfaces;
+
+namespace Content.Shared.Cargo.Serialization;
+
+
+[TypeSerializer]
+public sealed class CargoBountyItemDataTypeSerializer : ITypeReader<CargoBountyItemData, MappingDataNode>
+{
+    private Type? GetType(MappingDataNode node)
+    {
+        if (node.Has("whitelist"))
+        {
+            return typeof(CargoObjectBountyItemData);
+        }
+
+        if (node.Has("reagent"))
+        {
+            return typeof(CargoReagentBountyItemData);
+        }
+
+        return null;
+    }
+    public CargoBountyItemData Read(ISerializationManager serializationManager,
+        MappingDataNode node,
+        IDependencyCollection dependencies,
+        SerializationHookContext hookCtx,
+        ISerializationContext? context = null,
+        ISerializationManager.InstantiationDelegate<CargoBountyItemData>? instanceProvider = null)
+    {
+        var type = GetType(node) ??
+                   throw new ArgumentException(
+                       "Tried to convert invalid YAML node mapping to ConstructionGraphStep!");
+        return (CargoBountyItemData)serializationManager.Read(type, node, hookCtx, context)!;
+    }
+    public ValidationNode Validate(ISerializationManager serializationManager,
+        MappingDataNode node,
+        IDependencyCollection dependencies,
+        ISerializationContext? context = null)
+    {
+        var type = GetType(node);
+        if (type == null)
+            return new ErrorNode(node, "No construction graph step type found.");
+        return serializationManager.ValidateNode(type, node, context);
+    }
+}
diff --git a/Content.Shared/Cargo/Serialization/CargoBountyItemEntryTypeSerializer.cs b/Content.Shared/Cargo/Serialization/CargoBountyItemEntryTypeSerializer.cs
new file mode 100644
index 00000000000..4a484739673
--- /dev/null
+++ b/Content.Shared/Cargo/Serialization/CargoBountyItemEntryTypeSerializer.cs
@@ -0,0 +1,53 @@
+// SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+// SPDX-License-Identifier: MIT
+
+using Content.Shared.Cargo.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Serialization.Markdown.Mapping;
+using Robust.Shared.Serialization.Markdown.Validation;
+using Robust.Shared.Serialization.TypeSerializers.Interfaces;
+
+namespace Content.Shared.Cargo.Serialization;
+
+
+[TypeSerializer]
+public sealed class CargoBountyItemEntryTypeSerializer : ITypeReader<CargoBountyItemEntry, MappingDataNode>
+{
+    private Type? GetType(MappingDataNode node)
+    {
+        if (node.Has("whitelist"))
+        {
+            return typeof(CargoObjectBountyItemEntry);
+        }
+
+        if (node.Has("reagent"))
+        {
+            return typeof(CargoReagentBountyItemEntry);
+        }
+
+        return null;
+    }
+    public CargoBountyItemEntry Read(ISerializationManager serializationManager,
+        MappingDataNode node,
+        IDependencyCollection dependencies,
+        SerializationHookContext hookCtx,
+        ISerializationContext? context = null,
+        ISerializationManager.InstantiationDelegate<CargoBountyItemEntry>? instanceProvider = null)
+    {
+        var type = GetType(node) ??
+                   throw new ArgumentException(
+                       "Tried to convert invalid YAML node mapping to ConstructionGraphStep!");
+        return (CargoBountyItemEntry)serializationManager.Read(type, node, hookCtx, context)!;
+    }
+    public ValidationNode Validate(ISerializationManager serializationManager,
+        MappingDataNode node,
+        IDependencyCollection dependencies,
+        ISerializationContext? context = null)
+    {
+        var type = GetType(node);
+        if (type == null)
+            return new ErrorNode(node, "No construction graph step type found.");
+        return serializationManager.ValidateNode(type, node, context);
+    }
+}
diff --git a/Content.Shared/_Funkystation/Cargo/Prototypes/CargoBountyCategoryPrototype.cs b/Content.Shared/_Funkystation/Cargo/Prototypes/CargoBountyCategoryPrototype.cs
new file mode 100644
index 00000000000..5b723ff7295
--- /dev/null
+++ b/Content.Shared/_Funkystation/Cargo/Prototypes/CargoBountyCategoryPrototype.cs
@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+// SPDX-License-Identifier: MIT
+
+using Content.Shared.Cargo.Prototypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._Funkystation.Cargo.Prototypes;
+
+/// <summary>
+/// Bounty Category used to create the list of possible items a bounty can pull from for the defined category
+/// </summary>
+[Prototype, Serializable, NetSerializable]
+public sealed partial class CargoBountyCategoryPrototype : IPrototype
+{
+    /// <summary>
+    /// ID of the category
+    /// </summary>
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// Player facing name of the category
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Name { get; private set; }
+
+    /// <summary>
+    /// List of possible entities the bounty can be created using
+    /// </summary>
+    [DataField(required: true)]
+    public required List<CargoBountyItemEntry> Entries;
+
+    /// <summary>
+    /// A prefix appended to the beginning of a bounty's ID.
+    /// </summary>
+    [DataField]
+    public string IdPrefix = "NT";
+}
diff --git a/Resources/Locale/en-US/_Funkystation/materials/materials.ftl b/Resources/Locale/en-US/_Funkystation/materials/materials.ftl
new file mode 100644
index 00000000000..b8919e1c55a
--- /dev/null
+++ b/Resources/Locale/en-US/_Funkystation/materials/materials.ftl
@@ -0,0 +1 @@
+materials-brass = brass
diff --git a/Resources/Locale/en-US/_Funkystation/research/technologies.ftl b/Resources/Locale/en-US/_Funkystation/research/technologies.ftl
new file mode 100644
index 00000000000..5052101d227
--- /dev/null
+++ b/Resources/Locale/en-US/_Funkystation/research/technologies.ftl
@@ -0,0 +1 @@
+research-technology-instruments = Instrument Production
diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl
index 636d8865c72..0d1cd5b7200 100644
--- a/Resources/Locale/en-US/cargo/bounties.ftl
+++ b/Resources/Locale/en-US/cargo/bounties.ftl
@@ -1,149 +1,302 @@
+bounty-category-bar = Bar
+bounty-category-botany = Botany
+bounty-category-chemistry = Chemistry
+bounty-category-clothing = Clothing
+bounty-category-clown = Clown
+bounty-category-engineering = Engineering
+bounty-category-janitor = Janitorial
+bounty-category-kitchen = Kitchen
+bounty-category-library = Library
+bounty-category-medical = Medical
+bounty-category-misc = General
+bounty-category-music = Music
+bounty-category-robotics = Robotics
+bounty-category-salvage = Salvage
+bounty-category-science = Science
+bounty-category-security = Security
+bounty-category-weaponry = Weaponry
+
+bounty-description-anomaly-core = Suddenly we've run out of anomaly cores, including inert nuclei. Send us any anomaly cores so that we can continue to observe their final decay process.
+bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it.
+bounty-description-artifact-fragment = Scientists at a nearby station are requesting artifact fragments for microxenoarchaeology studies. Ordinary artifacts are too large for their micro research platforms. Send some of the artifact fragments your sector is rich in.
+bounty-description-banana = Hi station! Botany won't gimme any more. They said slipping the HoS out an open airlock wasn't funny! Can you believe it? Help me out! HONK.
+bounty-description-bandana =  Bzzzt... Transmission from prison planet OC-1001: We're... reorganizing our command structure. Send us some bandanas so we can tell gan- I mean, departments apart.
+bounty-description-baseball-bat = Baseball fever is going on at CentComm! Be a dear and ship them some baseball bats, so that management can live out their childhood dream.
+bounty-description-battery = As the Arachnid settlement prepares for a solar flare, they are requesting a large shipment of power batteries. We're sending out a request for delivery.
+bounty-description-bedsheet = Someone in Atmos keeps turning down the heater, and we're all shivering in our beds. Please send us some extra sheets to stay warm.
+bounty-description-beer = Some nefarious agent has stolen every single drink in the bar. Yes, everything. Help tide us over until we can find them.
+bounty-description-borg-module = Scientists at the neighboring station have only studied Borg production, not module production. They are stuck in the research process and need references to work from. Send any Borg modules to inspire your colleagues.
+bounty-description-box-hugs = Several chief officials have sustained serious boo-boos. A box of hugs is urgently needed to aid in their recovery.
+bounty-description-brain = Commander Caldwell was rendered brain-dead by a recent space lube accident. Unfortunately, we can't hire a replacement, so just send us a new brain to put in her instead.
+bounty-description-bread = Problems with central planning have led to bread prices skyrocketing. Ship some bread to ease tensions.
+bounty-description-cardboard-box = "The Cardborgs Cometh" is a new play premiering tomorrow, and the costuming team is woefully unprepared. Send us some boxes to work with.
+bounty-description-carp = Admiral Pavlov has gone on strike ever since Central Command confiscated her "pet." She is demanding a space carp as a replacement, dead or alive.
+bounty-description-carrot = After failing to watch instructional videos for proper welder safety, the salvage division on Station 15 has been blinded. Ship them some carrots so they can restore their eyesight.
+bounty-description-carrot-fries = Night sight can mean life or death! A shipment of carrot fries is the order.
+bounty-description-chili = Today's the CentComm Chili Cookoff, and, well, a few of us forgot to make some. Please help cover for us.
+bounty-description-clown-costume = Due to a recent issue at a space carp petting zoo, we've unfortunately lost Bonobobonobo the Clown. Send us a new costume so the kids can see him once more.
+bounty-description-corn = After the recent destruction of Space Ohio, our corn imports are down 80%. Send us some so we can make up for it.
+bounty-description-cotton-boll = A massive swarm of mothroaches ate all the paper and cloth on the station. Send us some cotton to help keep our winged crewmembers fed.
+bounty-description-crayon = Dr Jones's kid ate all our crayons again. Please send us yours.
+bounty-description-cuban-carp = To celebrate the birth of Castro XXVII, ship one cuban carp to CentComm.
+bounty-description-donk-pocket = Consumer safety recall: Warning. Donk-Pockets manufactured in the past year contain hazardous lizard biomatter. Return units to CentComm immediately.
+bounty-description-donut = CentComm's security forces are facing heavy losses against the Syndicate. Ship donuts to raise morale.
+bounty-description-figurine = The vice president's son saw an ad for action figures on the telescreen and now he won't shut up about them. Ship some to ease his complaints.
+bounty-description-flashes = GREETINGS \[Station] WE REQUIRE 6 FLASHES DUE TO A NORMAL \[TrainingExercise] WITH SECURITY. EVERYTHING IS \[Normal].
+bounty-description-flesh-monster = We've recently received reports of some kind of flesh monster infestation onboard several stations. Send us a few samples of these creatures so we can investigate new botanical opportunities.
+bounty-description-flower = Commander Zot really wants to sweep Security Officer Olivia off her feet. Send a shipment of flowers and he'll happily reward you.
+bounty-description-food = After the rat king invasion, a neighboring Unathi station was left completely without food. A large meat food shipment is needed.
+bounty-description-fruit = A heroic monkey helped the chaplain catch a troublemaker hiding in the chapel, and the crew wants to reward him for his good work.
+bounty-description-galaxythistle = After a particularly nasty foam backpressure from a scrubber, a high-ranking officer got badly poisoned. Send us some galaxythistle so we can prepare him a homeopathic remedy.
+bounty-description-handcuffs = A large influx of escaped convicts have arrived at Central Command. Now is the perfect time to ship out spare handcuffs (or restraints).
+bounty-description-hi-viz-vest  = The clown stole the AME controller and won't give it back. It's pretty dark in here. Some hi-viz vests would make seeing each other in the dark a little more bearable.
+bounty-description-instrument = The hottest new band in the galaxy, Cindy Kate and the Saboteurs, lost their gear in a cargo shuttle collision. Send them a new set of instruments so they can play their show.
+bounty-description-knife = One of our top commanders recently won a brand new set of knives on an official NanoTrasen gameshow. Unfortunately, we don't have a set on hand. Send us a bunch of sharp things so we can throw something together.
+bounty-description-labeler = Due to a bureaucratic error, our sorting center almost sent hundreds of crates of carrots to the Unathi settlement. We urgently need additional labelers to restore order in the warehouse as a matter of urgency.
+bounty-description-lasergun = The Salvage Caravan requests a large shipment of laser weapons to mop up a hive of xenomorphs.
+bounty-description-lemon = Dr Jones's kid is starting up a lemonade stand. Small issue: lemons don't get shipped to this sector. Fix that for a nice reward.
+bounty-description-lime = After a heavy drinking session, Admiral Pastich developed a strong addiction to fresh lime wedges. Send us some limes so we can prepare him his new favorite snack.
+bounty-description-lung = The pro-smoking league has been fighting to keep cigarettes on our stations for millennia. Unfortunately, their lungs aren't fighting so hard anymore. Send them some new ones.
+bounty-description-medkit-box = CentComm is putting on a play set in a hospital, and needs some props. Just send us some empty medkit boxes, and the show will go on!
+bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny to stick forks in all the kitchen microwaves. Help us replace them before the chefs start making clown burgers.
+bounty-description-monkey-cube = Due to a recent genetics accident, Central Command is in serious need of monkeys. Your mission is to ship monkey cubes.
+bounty-description-mouse = Station 13 ran out of freeze-dried mice. Ship some fresh ones so their janitor doesn't go on strike.
+bounty-description-organs = Arachnid settlement orders a large supply of organs. The official reason is "a thorough study of the similarities and differences of the humanoid races."
+bounty-description-pancake = Here at NanoTrasen we consider employees to be family. And you know what families love? Pancakes. Ship a baker's dozen.
+bounty-description-pen = We are hosting the intergalactic pen balancing competition. We need you to send us some standardized ball point pens.
+bounty-description-percussion = Due to a poorly timed barfight, the United Galaxy-wide Mixed Percussion Ensemble lost all of their instruments. Send them a new set so they can jam once more.
+bounty-description-pie = 3.14159? No! CentComm management wants edible pie! Ship a whole one.
+bounty-description-prison-uniform = Terragov has been unable to source any new prisoner uniforms, so if you have any spares, we'll take them off your hands.
+bounty-description-radio = A recent solar flare has fried all of our communication devices. Send us a new set of radios for our engineering crew so we can repair the network.
+bounty-description-research-disk = Turns out those bozos in the Research department have been spending all their time getting janitorial equipment. Send some research up to Central Command so we can actually get what we need.
+bounty-description-ring = On this EXTRAORDINARY day there will be a wedding between the Gelts, but Mr. Gelt has lost the rings. They need a new pair.
+bounty-description-rollerskates = CentComm Security is proposing a new strategy for helping officers win foot pursuits. Send them a pair so they can learn how bad an idea this is.
+bounty-description-shiv = Bzzzt... Transmission from prison planet OC-1001: we're facing an onslaught of uhm... "invaders." Yeah, invaders. Send us some shivs to fight them off with.
+bounty-description-soap = Soap has gone missing from CentComm's bathrooms and nobody knows who took it. Replace it and be the hero CentComm needs.
+bounty-description-soup = To quell the homeless uprising, NanoTrasen will be serving soup to all underpaid workers. Ship any type of soup.
+bounty-description-spear = CentComm's security forces are going through budget cuts. You will be paid if you ship a set of spears.
+bounty-description-steak = The vegetarian cook is refusing to make us anything with meat, and the lizards are getting restless. Can you smuggle us a few steaks to keep them happy?
+bounty-description-syringe = The NT anti-drug task force is in need of some syringes in order to distribute them to low-income communities. Help some keep some peoples' jobs secure.
+bounty-description-tech-disk = The new research assistant on Station 13 spilled a soda on the RND server. Send them some technology disks so they can build up their recipes.
+bounty-description-toolbox = There's an absence of robustness at Central Command. Hurry up and ship some toolboxes as a solution.
+bounty-description-torch = The chef made all the monkeys and kobolds at once, and they rebelled and took over the cargo shuttle. They're demanding supplies and free passage to a jungle planet, and we're giving in to their demands. All they need now is a few torches.
+bounty-description-trash = Recently a group of janitors have run out of trash to clean up, without any trash CentComm wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation.
+bounty-description-vegetable = The new chef is a vegetarian, and botany can't keep up with their demands. We need some additional veggies to help keep things stocked.
+bounty-description-warm-cloth = The Unathi construction crew freezes and is unable to restore power to their station. They need to be sent a set of any clothing to protect them from the cold.
+bounty-description-wine = The new librarian and the Quartermaster are falling head over heels for each other after she caught him disassembling the bookshelves for wood. Send a couple bottles of wine (or cans, if you must) to help make the date go well.
+
+bounty-item-advanced-mop = Advanced Mop
+bounty-item-advanced-syringe = Advanced Syringe
+bounty-item-ambrosia = Ambrosia
+bounty-item-ammunition-box = Ammunition Box
+bounty-item-andalusia = Andalusia
+bounty-item-anomaly-core = Anomaly core
+bounty-item-anomaly-locator = Amomaly Locator
+bounty-item-anomaly-syncronizer = Anomaly Syncronizer Circuitboard
+bounty-item-arithrazine = Arithrazine
+bounty-item-arrow = Arrow
 bounty-item-artifact = Alien artifact
+bounty-item-artifact-crusher = Artifact Crusher Circuitboard
+bounty-item-artifact-fragment = Artifact fragment
+bounty-item-atmos-fire-suit = Atmos Fire Suit
+bounty-item-autoinjector-cartrige = Autoinjector Cartrige
+bounty-item-bahama-mama = Bahama Mama
+bounty-item-balloon = Balloon
+bounty-item-banana = Banana
+bounty-item-banana-peel = Banana Peel
+bounty-item-bandana = Bandana
 bounty-item-baseball-bat = Baseball bat
+bounty-item-battery = Battery
+bounty-item-bedsheet = Bedsheet
+bounty-item-beepsky-smash = Beepsky Smash
+bounty-item-beer = Beer
+bounty-item-bike-horn = Bike Horn
+bounty-item-biosynthectic-eyes = Biosynthetic Eyes
+bounty-item-biosynthectic-heart = Biosynthetic Heart
+bounty-item-biosynthectic-liver = Biosynthetic Liver
+bounty-item-biosynthectic-lung = Biosynthetic Lungs
+bounty-item-bloodpack = Blood pack
+bounty-item-bloody-mary = BloodyMary
+bounty-item-blue-hawaiian = Blue Hawaiian
+bounty-item-board-game = Board Game
+bounty-item-bodybag = Bodybag
+bounty-item-book = Book
+bounty-item-borg-arm = Borg Arm
+bounty-item-borg-head = Borg Head
+bounty-item-borg-leg = Borg Leg
+bounty-item-borg-module = Cyborg module
+bounty-item-borg-module-cargo = Cargo Cyborg module
+bounty-item-borg-module-engineering = Engineering Cyborg module
+bounty-item-borg-module-generic = Generic Cyborg module
+bounty-item-borg-module-janitor = Janitorial Cyborg module
+bounty-item-borg-module-medical = Medical Cyborg module
+bounty-item-borg-module-service = Service Cyborg module
+bounty-item-borg-torso = Borg Torso
+bounty-item-bot = Bot
 bounty-item-box-hugs = Box of hugs
 bounty-item-brain = Brain
 bounty-item-bread = Bread
+bounty-item-brutepack = Brute topical
+bounty-item-cake = Cake
+bounty-item-cardboard-box = Cardboard box
 bounty-item-carp = Space carp
 bounty-item-carrot = Carrot
 bounty-item-carrot-fries = Carrot fries
+bounty-item-chili = Bowl of chili
+bounty-item-chimp-handcannon = C.H.I.M.P. Handcannon
+bounty-item-chow-mein = Chow Mein
+bounty-item-citrus-bikeshed = Citrus Bikeshed
+bounty-item-classic-martini = Classic Martini
+bounty-item-cleaver = Cleaver
+bounty-item-cloth-made = Cloth Food
 bounty-item-clown-mask = Clown mask
 bounty-item-clown-shoes = Clown shoes
+bounty-item-cogchamp = Cogchamp
+bounty-item-combat-knife = Combat Knife
 bounty-item-corn = Ear of corn
+bounty-item-cosmopolitan = Cosmopolitan
+bounty-item-cotton-boll = Cotton boll
 bounty-item-crayon = Crayon
+bounty-item-cryobeaker = Cryostasis beaker
 bounty-item-cuban-carp = Cuban carp
+bounty-item-cuban-nachos = Cuban Nachos
+bounty-item-cybernetic-medical-eyes = Cybernetic Medical Eyes
+bounty-item-cybernetic-security-eyes = Cybernetic Security Eyes
+bounty-item-defibrillator = Defibrilator
+bounty-item-demons-blood = Demons Blood
+bounty-item-dexalin = Dexalin
 bounty-item-diamond = Diamond
+bounty-item-dice = Die
+bounty-item-disabler-smg = Disabler SMG
+bounty-item-doctors-delight = Doctors Delight
 bounty-item-donk-pocket = Donk-pocket
 bounty-item-donut = Donut
+bounty-item-drink-bottle = Drinks Bottle
+bounty-item-dropper = Dropper
+bounty-item-enchiladas = Enchiladas
+bounty-item-erika-suprise = Erika Suprise
+bounty-item-experimental-vessel-machine-board = Experimental Anomaly Vessel Circuitboard
+bounty-item-explosive-payload = Explosive Payload
+bounty-item-eyes = Eyes
+bounty-item-fever-dream = Fever Dream
 bounty-item-figurine = Action figure
+bounty-item-fire-bomb = Fire Bomb
+bounty-item-flash = Flash
 bounty-item-flesh-monster = Flesh monster
 bounty-item-flower = Flower
+bounty-item-food = Meat food
+bounty-item-force-field-projector = Force Field Projector
+bounty-item-fruit = Fruit
+bounty-item-fruit-salad = Fruit Salad
 bounty-item-galaxythistle = Galaxythistle
+bounty-item-gargle-blaster = Gargle Blaster
+bounty-item-gauze = Rolls of Gauze
+bounty-item-gin-tonic = Gin and Tonic
+bounty-item-gorilla-gauntlet = G.O.R.I.L.L.A. Gauntlet
+bounty-item-gps = Global Positioning System
+bounty-item-grenade = Explosive Grenade
+bounty-item-grenade-flashbang = Flashbang
+bounty-item-gyros = Gyros
 bounty-item-handcuffs = Handcuffs
+bounty-item-health-analyzer = Health Analyzer
+bounty-item-hi-viz-vest = Hi-viz vest
+bounty-item-holofan-projector = Holofan Projector
+bounty-item-holosign-projector = Holosign Projector
+bounty-item-improvised-bow = Improvised Bow
+bounty-item-improvised-shotgun = Improvised Shotgun
 bounty-item-instrument = Instrument
+bounty-item-instrument-brass = Brass Instrument
+bounty-item-instrument-keyed = Keyed Instrument
+bounty-item-instrument-string = Stringed Instrument
+bounty-item-jaws-of-life = Jaws of Life
+bounty-item-kidney = Kidney
+bounty-item-kitchen-knife = Kitchen Knife
 bounty-item-knife = Knife
+bounty-item-labeler = Hand labeler
+bounty-item-laser-cannon = Laser Cannon
+bounty-item-lasergun = Laser gun
 bounty-item-lemon = Lemon
 bounty-item-lime = Lime
+bounty-item-liver = Liver
 bounty-item-lung = Lung
+bounty-item-makeshift-bola = Makeshift Bola
+bounty-item-makeshift-shield = Makeshift Shield
+bounty-item-makeshift-stunprod = Makeshift Stunprod
+bounty-item-medical-autoinjector = Autoinjector
+bounty-item-medical-hud = Medical Hud
+bounty-item-medkit-box = Medkit box
+bounty-item-medsec-hud = MedSec Hud
+bounty-item-microwave-machine-board = Microwave machine board
 bounty-item-monkey-cube = Monkey cube
 bounty-item-mouse = Dead mouse
+bounty-item-multiver = Multiver
+bounty-item-night-vision-goggles = Night Vision Goggles
+bounty-item-ointment = Burn Topical
 bounty-item-ore-bananium = Bananium ore
 bounty-item-ore-gold = Gold ore
 bounty-item-ore-plasma = Plasma ore
 bounty-item-ore-silver = Silver ore
 bounty-item-ore-uranium = Uranium ore
+bounty-item-organs = Organs
 bounty-item-pancake = Pancake
+bounty-item-particle-decelerator = Portable Particle Decelerator
 bounty-item-pen = Pen
 bounty-item-percussion = Percussion instrument
+bounty-item-pickaxe = Pickaxe
 bounty-item-pie = Pie
+bounty-item-plates = Goliath Hide Plates
+bounty-item-posca = Posca
+bounty-item-potato = Potatoes
+bounty-item-powerdrill = Powerdrill
 bounty-item-prison-uniform = Prison uniform
 bounty-item-radio = Radio or Headset
+bounty-item-remains = Hivelord Remains
+bounty-item-reptilian-food = Reptilian Food
 bounty-item-research-disk = Research disk
+bounty-item-ring = Ring
+bounty-item-rollerskates = Roller skates
+bounty-item-saline = Saline
 bounty-item-scrap = Scrap
+bounty-item-scrap-helmet = Scrap Armor Helmet
+bounty-item-scrap-plate = Scrap Armor Plate
+bounty-item-security-hud = Security Hud
 bounty-item-shiv = Shiv
+bounty-item-sidearm = Sidearm
+bounty-item-slop-bowl = Slop Bowl
+bounty-item-sloppy-joe = Sloppy Joe Burger
 bounty-item-soap = Soap
 bounty-item-soup = Soup
+bounty-item-space-cleaner = Space Cleaner
 bounty-item-spear = Spear
+bounty-item-steak = Steak
+bounty-item-stew = Stew
+bounty-item-stomach = Stomach
+bounty-item-stun-baton = Stun Baton
+bounty-item-super-bite-burger = Super Bite Burger
+bounty-item-surgery-advanced-tool = Advanced Surgery Tool
+bounty-item-surgery-tool = Surgery tool
+bounty-item-svalinn-pistol = Svalinn Pistol
 bounty-item-syringe = Syringe
-bounty-item-toolbox = Toolbox
+bounty-item-taser = Taser or Disabler
+bounty-item-tayquila = Tayquila
 bounty-item-tech-disk = Technology disk
+bounty-item-tech-disk-terminal = Tech Disk Terminal Circuitboard
+bounty-item-the-martinez = The Martinez
+bounty-item-toolbox = Toolbox
+bounty-item-tooth-sharkminnow = Sharkminnow Tooth
+bounty-item-tooth-space-carp = Space Carp Tooth
+bounty-item-torch = Torch
+bounty-item-toy-sidearm = Toy Sidearm
 bounty-item-trash = Trash
-bounty-item-anomaly-core = Anomaly core
-bounty-item-borg-module = Cyborg module
-bounty-item-artifact-fragment = Artifact fragment
-bounty-item-organs = Organ
-bounty-item-labeler = Hand labeler
-bounty-item-warm-cloth = Warm clothes
-bounty-item-battery = Battery
-bounty-item-lasergun = Laser gun
-bounty-item-food = Meat food
-bounty-item-fruit = Fruit
+bounty-item-truncheon = Truncheon
+bounty-item-valid-salad = Valid Salad
 bounty-item-vegetable = Vegetable
-bounty-item-chili = Bowl of chili
-bounty-item-rollerskates = Roller skates
-bounty-item-bedsheet = Bedsheet
-bounty-item-bandana = Bandana
-bounty-item-steak = Steak
-bounty-item-banana = Banana
-bounty-item-beer = Beer
-bounty-item-hi-viz-vest = Hi-viz vest
-bounty-item-torch = Torch
-bounty-item-medkit-box = Medkit box
-bounty-item-cardboard-box = Cardboard box
-bounty-item-wine = Wine bottle
-bounty-item-cotton-boll = Cotton boll
-bounty-item-microwave-machine-board = Microwave machine board
-bounty-item-flash = Flash
-bounty-item-tooth-space-carp = Space Carp Tooth
-bounty-item-tooth-sharkminnow = Sharkminnow Tooth
-bounty-item-ring = Ring
-bounty-item-remains = Hivelord Remains
-bounty-item-plates = Goliath Hide Plates
-
-bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it.
-bounty-description-baseball-bat = Baseball fever is going on at CentComm! Be a dear and ship them some baseball bats, so that management can live out their childhood dream.
-bounty-description-box-hugs = Several chief officials have sustained serious boo-boos. A box of hugs is urgently needed to aid in their recovery.
-bounty-description-brain = Commander Caldwell was rendered brain-dead by a recent space lube accident. Unfortunately, we can't hire a replacement, so just send us a new brain to put in her instead.
-bounty-description-bread = Problems with central planning have led to bread prices skyrocketing. Ship some bread to ease tensions.
-bounty-description-carrot = After failing to watch instructional videos for proper welder safety, the salvage division on Station 15 has been blinded. Ship them some carrots so they can restore their eyesight.
-bounty-description-carrot-fries = Night sight can mean life or death! A shipment of carrot fries is the order.
-bounty-description-carp = Admiral Pavlov has gone on strike ever since Central Command confiscated her "pet." She is demanding a space carp as a replacement, dead or alive.
-bounty-description-clown-costume = Due to a recent issue at a space carp petting zoo, we've unfortunately lost Bonobobonobo the Clown. Send us a new costume so the kids can see him once more.
-bounty-description-corn = After the recent destruction of Space Ohio, our corn imports are down 80%. Send us some so we can make up for it.
-bounty-description-crayon = Dr Jones's kid ate all our crayons again. Please send us yours.
-bounty-description-cuban-carp = To celebrate the birth of Castro XXVII, ship one cuban carp to CentComm.
-bounty-description-donk-pocket = Consumer safety recall: Warning. Donk-Pockets manufactured in the past year contain hazardous lizard biomatter. Return units to CentComm immediately.
-bounty-description-donut = CentComm's security forces are facing heavy losses against the Syndicate. Ship donuts to raise morale.
-bounty-description-figurine = The vice president's son saw an ad for action figures on the telescreen and now he won't shut up about them. Ship some to ease his complaints.
-bounty-description-flesh-monster = We've recently received reports of some kind of flesh monster infestation onboard several stations. Send us a few samples of these creatures so we can investigate new botanical opportunities.
-bounty-description-flower = Commander Zot really wants to sweep Security Officer Olivia off her feet. Send a shipment of flowers and he'll happily reward you.
-bounty-description-galaxythistle = After a particularly nasty foam backpressure from a scrubber, a high-ranking officer got badly poisoned. Send us some galaxythistle so we can prepare him a homeopathic remedy.
-bounty-description-handcuffs = A large influx of escaped convicts have arrived at Central Command. Now is the perfect time to ship out spare handcuffs (or restraints).
-bounty-description-instrument = The hottest new band in the galaxy, Cindy Kate and the Saboteurs, lost their gear in a cargo shuttle collision. Send them a new set of instruments so they can play their show.
-bounty-description-knife = One of our top commanders recently won a brand new set of knives on an official NanoTrasen gameshow. Unfortunately, we don't have a set on hand. Send us a bunch of sharp things so we can throw something together.
-bounty-description-lemon = Dr Jones's kid is starting up a lemonade stand. Small issue: lemons don't get shipped to this sector. Fix that for a nice reward.
-bounty-description-lime = After a heavy drinking session, Admiral Pastich developed a strong addiction to fresh lime wedges. Send us some limes so we can prepare him his new favorite snack.
-bounty-description-lung = The pro-smoking league has been fighting to keep cigarettes on our stations for millennia. Unfortunately, their lungs aren't fighting so hard anymore. Send them some new ones.
-bounty-description-monkey-cube = Due to a recent genetics accident, Central Command is in serious need of monkeys. Your mission is to ship monkey cubes.
-bounty-description-mouse = Station 13 ran out of freeze-dried mice. Ship some fresh ones so their janitor doesn't go on strike.
-bounty-description-pancake = Here at NanoTrasen we consider employees to be family. And you know what families love? Pancakes. Ship a baker's dozen.
-bounty-description-pen = We are hosting the intergalactic pen balancing competition. We need you to send us some standardized ball point pens.
-bounty-description-percussion = Due to a poorly timed barfight, the United Galaxy-wide Mixed Percussion Ensemble lost all of their instruments. Send them a new set so they can jam once more.
-bounty-description-pie = 3.14159? No! CentComm management wants edible pie! Ship a whole one.
-bounty-description-prison-uniform = Terragov has been unable to source any new prisoner uniforms, so if you have any spares, we'll take them off your hands.
-bounty-description-radio = A recent solar flare has fried all of our communication devices. Send us a new set of radios for our engineering crew so we can repair the network.
-bounty-description-research-disk = Turns out those bozos in the Research department have been spending all their time getting janitorial equipment. Send some research up to Central Command so we can actually get what we need.
-bounty-description-shiv = Bzzzt... Transmission from prison planet OC-1001: we're facing an onslaught of uhm... "invaders." Yeah, invaders. Send us some shivs to fight them off with.
-bounty-description-soap = Soap has gone missing from CentComm's bathrooms and nobody knows who took it. Replace it and be the hero CentComm needs.
-bounty-description-soup = To quell the homeless uprising, NanoTrasen will be serving soup to all underpaid workers. Ship any type of soup.
-bounty-description-spear = CentComm's security forces are going through budget cuts. You will be paid if you ship a set of spears.
-bounty-description-syringe = The NT anti-drug task force is in need of some syringes in order to distribute them to low-income communities. Help some keep some peoples' jobs secure.
-bounty-description-toolbox = There's an absence of robustness at Central Command. Hurry up and ship some toolboxes as a solution.
-bounty-description-tech-disk = The new research assistant on Station 13 spilled a soda on the RND server. Send them some technology disks so they can build up their recipes.
-bounty-description-trash = Recently a group of janitors have run out of trash to clean up, without any trash CentComm wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation.
-bounty-description-anomaly-core = Suddenly we've run out of anomaly cores, including inert nuclei. Send us any anomaly cores so that we can continue to observe their final decay process.
-bounty-description-borg-module = Scientists at the neighboring station have only studied Borg production, not module production. They are stuck in the research process and need references to work from. Send any Borg modules to inspire your colleagues.
-bounty-description-artifact-fragment = Scientists at a nearby station are requesting artifact fragments for microxenoarchaeology studies. Ordinary artifacts are too large for their micro research platforms. Send some of the artifact fragments your sector is rich in.
-bounty-description-organs = Arachnid settlement orders a large supply of organs. The official reason is "a thorough study of the similarities and differences of the humanoid races."
-bounty-description-labeler = Due to a bureaucratic error, our sorting center almost sent hundreds of crates of carrots to the Unathi settlement. We urgently need additional labelers to restore order in the warehouse as a matter of urgency.
-bounty-description-warm-cloth = The Unathi construction crew freezes and is unable to restore power to their station. They need to be sent a set of any clothing to protect them from the cold.
-bounty-description-battery = As the Arachnid settlement prepares for a solar flare, they are requesting a large shipment of power batteries. We're sending out a request for delivery.
-bounty-description-lasergun = The Salvage Caravan requests a large shipment of laser weapons to mop up a hive of xenomorphs.
-bounty-description-food = After the rat king invasion, a neighboring Unathi station was left completely without food. A large meat food shipment is needed.
-bounty-description-fruit = A heroic monkey helped the chaplain catch a troublemaker hiding in the chapel, and the crew wants to reward him for his good work.
-bounty-description-vegetable = The new chef is a vegetarian, and botany can't keep up with their demands. We need some additional veggies to help keep things stocked.
-bounty-description-chili = Today's the CentComm Chili Cookoff, and, well, a few of us forgot to make some. Please help cover for us.
-bounty-description-rollerskates = CentComm Security is proposing a new strategy for helping officers win foot pursuits. Send them a pair so they can learn how bad an idea this is.
-bounty-description-bedsheet = Someone in Atmos keeps turning down the heater, and we're all shivering in our beds. Please send us some extra sheets to stay warm.
-bounty-description-bandana =  Bzzzt... Transmission from prison planet OC-1001: We're... reorganizing our command structure. Send us some bandanas so we can tell gan- I mean, departments apart.
-bounty-description-steak = The vegetarian cook is refusing to make us anything with meat, and the lizards are getting restless. Can you smuggle us a few steaks to keep them happy?
-bounty-description-banana = Hi station! Botany won't gimme any more. They said slipping the HoS out an open airlock wasn't funny! Can you believe it? Help me out! HONK.
-bounty-description-beer = Some nefarious agent has stolen every single drink in the bar. Yes, everything. Help tide us over until we can find them.
-bounty-description-hi-viz-vest  = The clown stole the AME controller and won't give it back. It's pretty dark in here. Some hi-viz vests would make seeing each other in the dark a little more bearable.
-bounty-description-torch = The chef made all the monkeys and kobolds at once, and they rebelled and took over the cargo shuttle. They're demanding supplies and free passage to a jungle planet, and we're giving in to their demands. All they need now is a few torches.
-bounty-description-medkit-box = CentComm is putting on a play set in a hospital, and needs some props. Just send us some empty medkit boxes, and the show will go on!
-bounty-description-cardboard-box = "The Cardborgs Cometh" is a new play premiering tomorrow, and the costuming team is woefully unprepared. Send us some boxes to work with.
-bounty-description-wine = The new librarian and the Quartermaster are falling head over heels for each other after she caught him disassembling the bookshelves for wood. Send a couple bottles of wine (or cans, if you must) to help make the date go well.
-bounty-description-cotton-boll = A massive swarm of mothroaches ate all the paper and cloth on the station. Send us some cotton to help keep our winged crewmembers fed.
-bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny to stick forks in all the kitchen microwaves. Help us replace them before the chefs start making clown burgers.
-bounty-description-flashes = GREETINGS \[Station] WE REQUIRE 6 FLASHES DUE TO A NORMAL \[TrainingExercise] WITH SECURITY. EVERYTHING IS \[Normal].
-bounty-description-ring = On this EXTRAORDINARY day there will be a wedding between the Gelts, but Mr. Gelt has lost the rings. They need a new pair.
+bounty-item-waffles = Waffles
+bounty-item-warm-cloth = Warm clothes
+bounty-item-watermelon-wakeup = Watermelon Wakeup
+bounty-item-wheat = Wheat
+bounty-item-wine = Wine
+bounty-item-wine-bottle = Wine bottle
+bounty-item-wooden-buckler = Wooden Buckler
+bounty-item-xeno-basher = Xeno Basher
+bounty-item-xray-cannon = Xray Cannon
diff --git a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
index d7a7025927f..12cc23e63f5 100644
--- a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
@@ -6,9 +6,14 @@ bounty-console-reward-label = Reward: [color=limegreen]${$reward}[/color]
 bounty-console-manifest-label = Manifest: [color=orange]{$item}[/color]
 bounty-console-manifest-entry =
     { $amount ->
-        [1] {$item}
-        *[other] {$item} x{$amount}
-    }
+    [1] {$item}
+    *[other] {$item} x{$amount}
+        }
+bounty-console-manifest-entry-reagent =
+    { $amount ->
+    [1] {$item}
+    *[other] {$item} {$amount}u
+        }
 bounty-console-manifest-reward = Reward: ${$reward}
 bounty-console-description-label = [color=gray]{$description}[/color]
 bounty-console-id-label = ID#{$id}
@@ -24,3 +29,5 @@ bounty-console-tab-history-label = History
 bounty-console-history-empty-label = No bounty history found
 bounty-console-history-notice-completed-label = [color=limegreen]Completed[/color]
 bounty-console-history-notice-skipped-label = [color=red]Skipped[/color] by {$id}
+
+bounty-console-category-description = {$category} Bounty: {$id}
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
index d77c75108cc..d34878a6a29 100644
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -733,7 +733,7 @@
   reward: 1500
   description: bounty-description-wine
   entries:
-  - name: bounty-item-wine
+  - name: bounty-item-wine-bottle
     amount: 2
     whitelist:
       tags:
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index 4f5ccd0f8c5..d31b5f3b1ce 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -206,6 +206,9 @@
   - type: Construction
     graph: HudMedSec
     node: medsecHud
+  - type: Tag
+    tags:
+    - MedSecHud
 
 - type: entity
   parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons]
diff --git a/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml b/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml
index 1fff006766c..5b3095c550c 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml
@@ -83,3 +83,6 @@
   - type: Construction
     graph: scraphelmet
     node: scraphelmet
+  - type: Tag
+    tags:
+    - ScrapHelmet
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml
index 455474c54e1..7e689dcae1e 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml
@@ -85,3 +85,6 @@
   - type: Construction
     graph: scraparmor
     node: scraparmorfinished
+  - type: Tag
+    tags:
+    - ScrapArmor
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index 9a81ec69046..8261d12e9e2 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -498,6 +498,9 @@
           Quantity: 8
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Waffle
 
 - type: entity
   name: soy waffles
@@ -518,6 +521,9 @@
           Quantity: 10
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Waffle
 
 - type: entity
   name: soylent waffles
@@ -538,6 +544,9 @@
           Quantity: 10
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Waffle
 
 - type: entity
   name: roffle waffles
@@ -558,6 +567,9 @@
           Quantity: 8
         - ReagentId: Vitamin
           Quantity: 2
+  - type: Tag
+    tags:
+    - Waffle
 
 # Misc
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
index 7465d526513..6959588c9d3 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -1241,6 +1241,7 @@
   - type: Tag
     tags:
     - Meat
+    - SuperBiteBurger
 # Tastes like bun, diabetes.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
index 4d42d4929c2..5c78d06f865 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
@@ -208,6 +208,9 @@
           Quantity: 7
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Tag
+    tags:
+    - CubanNachos
 # Tastes like nachos, hot pepper.
 
 - type: entity
@@ -655,6 +658,7 @@
     - type: Tag
       tags:
       - Meat
+      - Enchiladas
 # What do Europeans eat instead of enchiladas? 25.4 millimeter-iladas.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
index f5bd75bc7a4..47b491f481d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
@@ -185,6 +185,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 20
+  - type: Tag
+    tags:
+    - ChowMein
 # Tastes like pasta, tomato.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 677b5ffddbb..15b2642ae86 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -412,6 +412,9 @@
   - type: Edible
     trash:
     - FoodPacketChowMeinTrash
+  - type: Tag
+    tags:
+    - ChowMein
 
 - type: entity
   parent: FoodSnackBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index e820383c70f..91930047256 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -217,6 +217,7 @@
     - Meat
     - Fruit
     - Soup
+    - ValidSalad
 
 - type: entity
   name: coleslaw
@@ -324,6 +325,7 @@
     tags:
     - Fruit
     - Soup
+    - FruitSalad
 
 - type: entity
   name: jungle salad
@@ -1139,6 +1141,7 @@
     - Meat
     - Fruit
     - Soup
+    - Stew
 
 - type: entity
   name: sweet potato soup
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index bb99bad030b..5cb01858922 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -375,6 +375,9 @@
       Cable: 5
       PlasmaGlass: 15
       MetalRod: 4
+  - type: Tag
+    tags:
+    - ExperimentalVesselMachineBoard
 
 - type: entity
   parent: BaseMachineCircuitboard
@@ -390,6 +393,9 @@
         Manipulator: 7
         PlasmaGlass: 5
         Cable: 5
+    - type: Tag
+      tags:
+      - AnomalySyncronizerCircuitBoard
 
 - type: entity
   parent: BaseMachineCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index 786fbf57595..d28915bfdb5 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -357,6 +357,9 @@
     state: cpu_science
   - type: ComputerBoard
     prototype: ComputerTechnologyDiskTerminal
+  - type: Tag
+    tags:
+    - TechDiskTerminalCircuitBoard
 
 - type: entity
   parent: BaseComputerCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
index 11ffb69e4e9..0339f1c4408 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -155,6 +155,7 @@
     - type: Tag
       tags:
         - HolofanProjector
+        - ForceFieldProjector
     - type: StaticPrice
       price: 130
 
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
index 92f78fb360d..611b82601c0 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -9,6 +9,9 @@
 # SPDX-FileCopyrightText: 2024 Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Alexandre Courtin <acourtin@student.42.fr>
 # SPDX-FileCopyrightText: 2025 Coolsurf6 <coolsurf24@yahoo.com.au>
+# SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+# SPDX-FileCopyrightText: 2026 taydeo <tay@funkystation.org>
+# SPDX-FileCopyrightText: 2026 taydeo <td12233a@gmail.com>
 # SPDX-License-Identifier: MIT
 
 - type: entity
@@ -122,7 +125,7 @@
         spawn:
           MaterialWoodPlank:
             min: 2
-            max: 4
+            max: 2 # funky station
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: DamageOnHit # This makes it destroy after one hit.
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index 523c0696d8d..c9ccbef4c71 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -231,6 +231,9 @@
                   max: 5
     - type: StaticPrice
       price: 150
+    - type: Tag
+      tags:
+      - WoodenBuckler
 
 - type: entity
   name: cardboard shield
@@ -337,6 +340,9 @@
                 SheetSteel:
                   min: 1
                   max: 2
+    - type: Tag
+      tags:
+      - MakeshiftShield
 
 - type: entity
   name: web shield
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml
index 84fd6b36d0d..2a5852478f1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml
@@ -1,12 +1,13 @@
 # SPDX-FileCopyrightText: 2019-2020 moneyl <8206401+Moneyl@users.noreply.github.com>
-# SPDX-FileCopyrightText: 2020-2021 Ygg01 <daniel.fath7@gmail.com>
-# SPDX-FileCopyrightText: 2020-2021 Swept <jamesurquhartwebb@gmail.com>
+# SPDX-FileCopyrightText: 2020-2021 Swept <sweptwastaken@protonmail.com>
 # SPDX-FileCopyrightText: 2020-2021 Paul Ritter <ritter.paul1@googlemail.com>
 # SPDX-FileCopyrightText: 2020 Vera Aguilera Puerto <zddm@outlook.es>
+# SPDX-FileCopyrightText: 2020 Ygg01 <daniel.fath7@gmail.com>
 # SPDX-FileCopyrightText: 2020 nuke <47336974+nuke-makes-games@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2020 AJCM-git <60196617+AJCM-git@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2020 ike709 <ike709@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2020 DrSmugleaf <DrSmugleaf@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2020 Swept <jamesurquhartwebb@gmail.com>
 # SPDX-FileCopyrightText: 2020 Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2020 Injazz <injazza@gmail.com>
 # SPDX-FileCopyrightText: 2020 PrPleGoo <PrPleGoo@users.noreply.github.com>
@@ -19,6 +20,8 @@
 # SPDX-FileCopyrightText: 2021 ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2021 20kdc <asdd2808@gmail.com>
 # SPDX-FileCopyrightText: 2021 mirrorcult <lunarautomaton6@gmail.com>
+# SPDX-FileCopyrightText: 2021 Ygg01 <y.laughing.man.y@gmail.com>
+# SPDX-FileCopyrightText: 2021 Galactic Chimp <GalacticChimpanzee@gmail.com>
 # SPDX-FileCopyrightText: 2021 Galactic Chimp <63882831+GalacticChimp@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2021 TaralGit <76408146+TaralGit@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2021 Alex Evgrashin <aevgrashin@yandex.ru>
@@ -78,6 +81,9 @@
 # SPDX-FileCopyrightText: 2025 āda <ss.adasts@gmail.com>
 # SPDX-FileCopyrightText: 2025 JrInventor05 <125007252+JrInventor05@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 RedBookcase <crazykid1590@gmail.com>
+# SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+# SPDX-FileCopyrightText: 2026 taydeo <tay@funkystation.org>
+# SPDX-FileCopyrightText: 2026 taydeo <td12233a@gmail.com>
 # SPDX-FileCopyrightText: 2026 rumaks <me@rumaks.xyz>
 # SPDX-License-Identifier: MIT
 
@@ -424,6 +430,9 @@
       beaker:
         maxVol: 60
         canReact: false
+  - type: Tag # Funky Station
+    tags:
+    - Cryobeaker
 
 - type: entity
   name: bluespace beaker
@@ -705,6 +714,7 @@
     tags:
     - Syringe
     - Trash
+    - Cryosyringe
 
 - type: entity
   name: pill
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
index d98a070c976..73c22443eed 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
@@ -59,6 +59,9 @@
     - type: GuideHelp
       guides:
       - MedicalDoctor
+    - type: Tag
+      tags:
+      - Defibrillator
 
 - type: entity
   id: Defibrillator
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
index f8922e52efb..7caa1adc2a0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
@@ -140,6 +140,9 @@
       params:
         maxDistance: 1
         volume: -8
+  - type: Tag
+    tags:
+    - AnomalyLocator
 
 - type: entity
   id: AnomalyLocator
@@ -242,3 +245,6 @@
         Cold: 100
         Radiation: 100
     slots: NONE
+  - type: Tag
+    tags:
+    - GorillaGauntlet
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
index f384ab6c7d7..8ee8bc3ebf4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
@@ -63,6 +63,10 @@
   - type: Construction
     graph: FireBomb
     node: firebomb
+  - type: Tag
+    tags:
+    - FireBomb
+
 
 # has igniter but no fuel or wires
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 61dc4babba5..d9cb23ff77a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -236,6 +236,7 @@
     tags:
     - Sidearm
     - LaserWeapon
+    - SvalinnPistol
 
 - type: entity
   name: retro laser blaster
@@ -501,6 +502,7 @@
   - type: Tag
     tags:
     - TurretCompatibleWeapon
+    - LaserCannon
 
 - type: entity
   name: portable particle decelerator
@@ -532,6 +534,9 @@
     - type: Battery
       maxCharge: 10000
       startingCharge: 10000
+    - type: Tag
+      tags:
+      - ParticleDecelerator
 
 - type: entity
   name: x-ray cannon
@@ -564,6 +569,9 @@
     steps: 5
     zeroVisible: true
   - type: Appearance
+  - type: Tag
+    tags:
+    - XrayCannon
 
 - type: entity
   name: practice disabler
@@ -649,6 +657,7 @@
   - type: Tag
     tags:
       - Taser
+      - DisablerSMG
   - type: Sprite
     sprite: Objects/Weapons/Guns/Battery/disabler_smg.rsi
     layers:
@@ -864,6 +873,9 @@
     node: start
   - type: StaticPrice
     price: 100
+  - type: Tag
+    tags:
+    - ChimpHandcannon
 
 - type: entity
   name: experimental C.H.I.M.P. handcannon
@@ -883,6 +895,9 @@
       fireCost: 100
     - proto: AnomalousParticleSigmaStrong
       fireCost: 100
+  - type: Tag
+    tags:
+    - ChimpHandcannon
 
 - type: entity
   name: eye of a behonker
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml
index 77fb5425074..4504fee7b72 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml
@@ -54,6 +54,9 @@
       projectiles: !type:ContainerSlot
   - type: ContainerAmmoProvider
     container: projectiles
+  - type: Tag
+    tags:
+    - ImprovisedBow
 
 - type: entity
   id: BowImprovised
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index db31b1373d3..77cc8cf02a6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -330,6 +330,9 @@
     node: shotgun
   - type: StaticPrice
     price: 20
+  - type: Tag
+    tags:
+    - ImprovisedShotgun
 
 - type: entity
   name: improvised shotgun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
index 8e1846e6007..401764c666b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
@@ -81,3 +81,6 @@
   - type: Construction
     graph: makeshiftstunprod
     node: msstunprod
+  - type: Tag
+    tags:
+    - MakeshiftStunprod
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
index c7540a50380..7f19e35efb2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
@@ -74,3 +74,6 @@
         - ItemMask
         restitution: 0.3
         friction: 0.2
+  - type: Tag
+    tags:
+    - MakeshiftBola
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index 98298ef4e12..e3deee143c7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -139,6 +139,9 @@
     guides:
     - Security
     - Antagonists
+  - type: Tag
+    tags:
+    - Stunbaton
 
 - type: entity
   name: truncheon
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
index 489c631b0aa..ff16f5afd4b 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
@@ -5,6 +5,9 @@
 # SPDX-FileCopyrightText: 2025 Hanz <41141796+Hanzdegloker@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 saga3152 <133799418+saga3152@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 deltanedas <39013340+deltanedas@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+# SPDX-FileCopyrightText: 2026 taydeo <tay@funkystation.org>
+# SPDX-FileCopyrightText: 2026 taydeo <td12233a@gmail.com>
 # SPDX-License-Identifier: MIT
 
 - type: latheRecipePack
@@ -73,3 +76,4 @@
   - ReagentGrinderIndustrialMachineCircuitboard
   - JukeboxCircuitBoard
   - DawInstrumentMachineCircuitboard
+  - MusicTechFabCircuitboard # Funky Station
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Bounties/bountyCategories.yml b/Resources/Prototypes/_Funkystation/Catalog/Bounties/bountyCategories.yml
new file mode 100644
index 00000000000..54bb0dd7384
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Bounties/bountyCategories.yml
@@ -0,0 +1,1334 @@
+# SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+# SPDX-License-Identifier: MIT
+
+#- type: cargoBountyCategory
+#  id: exampleCategory
+#  name: Example Category
+#  entries:
+#  - name: Sunglasses
+#    minAmount: 1
+#    maxAmount: 5
+#    rewardPer: 750
+#    whitelist:
+#      tags:
+#      - sunglasses
+#  - name: Omnizine
+#    minAmount: 50
+#    maxAmount: 50
+#    rewardPer: 500
+#    reagent: Omnizine
+
+# Generally, each category should be considered from the perspective of the orderer, what is a medical department likely to order? What will totally not the syndicate order?
+# Items inside a category should be things that can be resonably produced by the station/department, items that you can just get from a vending machine or cargo crates should be avoided as bounty targets.
+# NOTE: Bounties seem to work weird with stackable items currently, if you have a bounty for 6 artifact fragments, you need to split them into 6 diffrent stacks for it to count properly,
+#       So for the time being stackable items should be avoided as bounty targets.
+
+# Botany
+- type: cargoBountyCategory
+  id: botanyCategory
+  name: bounty-category-botany
+  entries:
+  - name: bounty-item-carrot
+    minAmount: 5
+    maxAmount: 15
+    rewardPer: 750
+    whitelist:
+      tags:
+      - Carrot
+  - name: bounty-item-corn
+    minAmount: 5
+    maxAmount: 15
+    rewardPer: 1000
+    whitelist:
+      tags:
+      - Corn
+  - name: bounty-item-flower
+    minAmount: 3
+    maxAmount: 5
+    rewardPer: 1000
+    whitelist:
+      tags:
+      - Flower
+  - name: bounty-item-galaxythistle
+    minAmount: 4
+    maxAmount: 12
+    rewardPer: 1200
+    whitelist:
+      tags:
+      - Galaxythistle
+  - name: bounty-item-lemon
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 1000
+    whitelist:
+      tags:
+      - Lemon
+  - name: bounty-item-lime
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 1000
+    whitelist:
+      tags:
+      - Lime
+  - name: bounty-item-fruit
+    minAmount: 5
+    maxAmount: 15
+    rewardPer: 400
+    whitelist:
+      tags:
+      - Fruit
+    blacklist:
+      tags:
+      - Slice
+      - Cake
+      - Pie
+      - Bread
+  - name: bounty-item-vegetable
+    minAmount: 5
+    maxAmount: 15
+    rewardPer: 500
+    whitelist:
+      tags:
+      - Vegetable
+    blacklist:
+      tags:
+      - Slice
+      - Cake
+      - Pie
+      - Bread
+  - name: bounty-item-banana
+    minAmount: 3
+    maxAmount: 9
+    rewardPer: 660
+    whitelist:
+      tags:
+      - Banana
+  - name: bounty-item-cotton-boll
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 900
+    whitelist:
+      tags:
+      - CottonBoll
+  - name: bounty-item-ambrosia
+    minAmount: 4
+    maxAmount: 12
+    rewardPer: 1200
+    whitelist:
+      tags:
+      - Ambrosia
+  - name: bounty-item-potato
+    minAmount: 5
+    maxAmount: 15
+    rewardPer: 900
+    whitelist:
+      tags:
+      - Potato
+  - name: bounty-item-wheat
+    minAmount: 5
+    maxAmount: 15
+    rewardPer: 750
+    whitelist:
+      tags:
+      - Wheat
+  - name: bounty-item-monkey-cube
+    minAmount: 3
+    maxAmount: 6
+    rewardPer: 1000
+    whitelist:
+      tags:
+      - MonkeyCube
+
+# Science
+- type: cargoBountyCategory
+  id: scienceCategory
+  name: bounty-category-science
+  entries:
+  - name: bounty-item-tech-disk-terminal
+    minAmount: 1
+    maxAmount: 3
+    rewardPer: 1250
+    whitelist:
+      tags:
+      - TechDiskTerminalCircuitBoard
+    requiredResearch:
+    - AlternativeResearch
+  - name: bounty-item-artifact-crusher
+    minAmount: 1
+    maxAmount: 3
+    rewardPer: 1250
+    whitelist:
+      components:
+      - TechnologyDisk
+    requiredResearch:
+    - AlternativeResearch
+  - name: bounty-item-anomaly-syncronizer
+    minAmount: 1
+    maxAmount: 3
+    rewardPer: 1250
+    whitelist:
+      tags:
+      - AnomalySyncronizerCircuitBoard
+    requiredResearch:
+    - AdvancedAnomalyResearch
+  - name: bounty-item-tech-disk
+    minAmount: 3
+    maxAmount: 8
+    rewardPer: 5000
+    whitelist:
+      components:
+      - TechnologyDisk
+    requiredResearch:
+    - AlternativeResearch
+  - name: bounty-item-anomaly-core
+    minAmount: 1
+    maxAmount: 1
+    rewardPer: 10000
+    whitelist:
+      components:
+      - AnomalyCore
+  - name: bounty-item-anomaly-locator
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 1000
+    whitelist:
+      tags:
+      - AnomalyLocator
+    requiredResearch:
+    - BasicAnomalousResearch
+  - name: bounty-item-gorilla-gauntlet
+    minAmount: 1
+    maxAmount: 3
+    rewardPer: 4000
+    whitelist:
+      tags:
+      - GorillaGauntlet
+    requiredResearch:
+    - AnomalyCoreHarnessing
+  - name: bounty-item-experimental-vessel-machine-board
+    minAmount: 1
+    maxAmount: 3
+    rewardPer: 1250
+    whitelist:
+      tags:
+      - ExperimentalVesselMachineBoard
+    requiredResearch:
+    - AdvancedAnomalyResearch
+  - name: bounty-item-cryobeaker
+    minAmount: 1
+    maxAmount: 8
+    rewardPer: 750
+    whitelist:
+      tags:
+      - Cryobeaker
+    requiredResearch:
+    - BiochemicalStasis
+  - name: bounty-item-advanced-syringe
+    minAmount: 1
+    maxAmount: 8
+    rewardPer: 750
+    whitelist:
+      tags:
+      - Cryosyringe
+    requiredResearch:
+    - BiochemicalStasis
+  - name: bounty-item-chimp-handcannon
+    minAmount: 1
+    maxAmount: 4
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - ChimpHandcannon
+    requiredResearch:
+    - AdvancedAnomalyResearch
+  - name: bounty-item-force-field-projector
+    minAmount: 1
+    maxAmount: 4
+    rewardPer: 2250
+    whitelist:
+      tags:
+      - ForceFieldProjector
+    requiredResearch:
+    - DeterrenceTechnologies
+  - name: bounty-item-particle-decelerator
+    minAmount: 1
+    maxAmount: 4
+    rewardPer: 3500
+    whitelist:
+      tags:
+      - ParticleDecelerator
+    requiredResearch:
+    - DeterrenceTechnologies
+    # Reliant on DV
+#  - name: bounty-item-night-vision-goggles
+#    minAmount: 1
+#    maxAmount: 4
+#    rewardPer: 2750
+#    whitelist:
+#      tags:
+#      - NightVisionGoggles
+#    requiredResearch:
+#    - NightVisionTech
+  - name: bounty-item-advanced-mop
+    minAmount: 1
+    maxAmount: 4
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - MopAdv
+    requiredResearch:
+    - AdvancedCleaning
+  - name: bounty-item-holosign-projector
+    minAmount: 2
+    maxAmount: 4
+    rewardPer: 2000
+    whitelist:
+      tags:
+      - HolosignProjector
+
+# Misc.
+- type: cargoBountyCategory
+  id: miscCategory
+  name: bounty-category-misc
+  entries:
+  - name: bounty-item-baseball-bat
+    minAmount: 3
+    maxAmount: 6
+    rewardPer: 800
+    whitelist:
+      tags:
+      - BaseballBat
+  - name: bounty-item-figurine
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 800
+    whitelist:
+      tags:
+      - Figurine
+  - name: bounty-item-pen
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 400
+    whitelist:
+      tags:
+      - Pen
+  - name: bounty-item-radio
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 900
+    whitelist:
+      components:
+      - Headset
+      - RadioMicrophone
+      tags:
+      - Radio
+  - name: bounty-item-labeler
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 550
+    whitelist:
+      components:
+      - HandLabeler
+  - name: bounty-item-bedsheet
+    minAmount: 5
+    maxAmount: 8
+    rewardPer: 400
+    whitelist:
+      tags:
+      - Bedsheet
+  - name: bounty-item-torch
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 500
+    whitelist:
+      tags:
+      - Torch
+#  - name: bounty-item-cardboard-box
+#    minAmount: 10
+#    maxAmount: 20
+#    rewardPer: 150
+#    whitelist:
+#      tags:
+#      - BoxCardboard
+
+# Medical
+- type: cargoBountyCategory
+  id: medicalCategory
+  name: bounty-category-medical
+  entries:
+    # Reliant on Shitmed -----------------------------
+#  - name: bounty-item-biosynthectic-eyes
+#    minAmount: 2
+#    maxAmount: 5
+#    rewardPer: 1250
+#    whitelist:
+#      tags:
+#      - BiosynthecticEyes
+#  - name: bounty-item-biosynthectic-lung
+#    minAmount: 2
+#    maxAmount: 5
+#    rewardPer: 1250
+#    whitelist:
+#      components:
+#      - BiosynthecticLung
+#  - name: bounty-item-biosynthectic-liver
+#    minAmount: 2
+#    maxAmount: 5
+#    rewardPer: 1250
+#    whitelist:
+#      tags:
+#      - BiosynthecticLiver
+#  - name: bounty-item-biosynthectic-heart
+#    minAmount: 2
+#    maxAmount: 5
+#    rewardPer: 1750
+#    whitelist:
+#      tags:
+#      - BiosynthecticHeart
+    #--------------------------------------------
+
+  # Reliant on Goob station autoinjector --------
+#  - name: bounty-item-autoinjector-cartrige
+#    minAmount: 4
+#    maxAmount: 8
+#    rewardPer: 550
+#    whitelist:
+#      tags:
+#      - AutoinjectorCartridge
+#  - name: bounty-item-medical-autoinjector
+#    minAmount: 1
+#    maxAmount: 3
+#    rewardPer: 1500
+#    whitelist:
+#      tags:
+#      - MedicalAutoinjector
+  #----------------------------------------------
+  - name: bounty-item-health-analyzer
+    minAmount: 3
+    maxAmount: 8
+    rewardPer: 450
+    whitelist:
+      tags:
+      - DiscreteHealthAnalyzer
+    # Reliant on shitmed
+#  - name: bounty-item-cybernetic-medical-eyes
+#    minAmount: 1
+#    maxAmount: 3
+#    rewardPer: 6500
+#    whitelist:
+#      tags:
+#      - CyberneticMedicalEyes
+#    requiredResearch:
+#    - CyberneticEnhancements
+  - name: bounty-item-defibrillator
+    minAmount: 2
+    maxAmount: 8
+    rewardPer: 850
+    whitelist:
+      tags:
+      - Defibrillator
+  - name: bounty-item-medical-hud
+    minAmount: 2
+    maxAmount: 8
+    rewardPer: 950
+    whitelist:
+      tags:
+      - HudMedical
+  - name: bounty-item-medsec-hud
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 2500
+    whitelist:
+      tags:
+      - MedSecHud
+    # Reliant on shitmed
+#  - name: bounty-item-surgery-advanced-tool
+#    minAmount: 2
+#    maxAmount: 5
+#    rewardPer: 8000
+#    whitelist:
+#      tags:
+#      - AdvancedSurgeryTool
+#    requiredResearch:
+#    - AdvancedTreatment
+
+# Kitchen
+- type: cargoBountyCategory
+  id: kitchenCategory
+  name: bounty-category-kitchen
+  entries:
+  - name: bounty-item-super-bite-burger
+    minAmount: 1
+    maxAmount: 1
+    rewardPer: 16000
+    whitelist:
+      tags:
+      - SuperBiteBurger
+      # Reliant on Funky Cooking ---------------------
+#  - name: bounty-item-sloppy-joe
+#    minAmount: 2
+#    maxAmount: 6
+#    rewardPer: 2000
+#    whitelist:
+#      tags:
+#      - SloppyJoe
+#  - name: bounty-item-slop-bowl
+#    minAmount: 2
+#    maxAmount: 6
+#    rewardPer: 2000
+#    whitelist:
+#      tags:
+#      - SlopBowl
+  - name: bounty-item-waffles
+    minAmount: 2
+    maxAmount: 6
+    rewardPer: 2000
+    whitelist:
+      tags:
+      - Waffle
+  - name: bounty-item-cuban-nachos
+    minAmount: 2
+    maxAmount: 6
+    rewardPer: 2000
+    whitelist:
+      tags:
+      - CubanNachos
+  - name: bounty-item-valid-salad
+    minAmount: 2
+    maxAmount: 4
+    rewardPer: 3000
+    whitelist:
+      tags:
+      - ValidSalad
+  - name: bounty-item-bread
+    minAmount: 1
+    maxAmount: 6
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - Bread
+    blacklist:
+      tags:
+      - Slice
+  - name: bounty-item-carrot-fries
+    minAmount: 1
+    maxAmount: 6
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - CarrotFries
+  - name: bounty-item-enchiladas
+    minAmount: 2
+    maxAmount: 6
+    rewardPer: 2500
+    whitelist:
+      tags:
+      - Enchiladas
+  - name: bounty-item-fruit-salad
+    minAmount: 2
+    maxAmount: 4
+    rewardPer: 2750
+    whitelist:
+      tags:
+      - FruitSalad
+  - name: bounty-item-pie
+    minAmount: 1
+    maxAmount: 3
+    rewardPer: 3141
+    whitelist:
+      tags:
+      - Pie
+    blacklist:
+      tags:
+      - Slice
+  - name: bounty-item-food
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 1000
+    whitelist:
+      tags:
+      - Meat
+    blacklist:
+      components:
+      - SliceableFood
+  - name: bounty-item-chili
+    minAmount: 3
+    maxAmount: 5
+    rewardPer: 2800
+    whitelist:
+      tags:
+      - ChiliBowl
+  - name: bounty-item-steak
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 1200
+    whitelist:
+      tags:
+      - Steak
+  - name: bounty-item-cake
+    minAmount: 1
+    maxAmount: 2
+    rewardPer: 2200
+    whitelist:
+      tags:
+      - Cake
+  - name: bounty-item-chow-mein
+    minAmount: 1
+    maxAmount: 2
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - ChowMein
+  - name: bounty-item-cloth-made
+    minAmount: 2
+    maxAmount: 3
+    rewardPer: 1600
+    whitelist:
+      tags:
+      - ClothMade
+    blacklist:
+      tags:
+      - Slice
+      # Reliant on Funky Cooking
+#  - name: bounty-item-gyros
+#    minAmount: 1
+#    maxAmount: 3
+#    rewardPer: 3500
+#    whitelist:
+#      tags:
+#      - Gyro
+  - name: bounty-item-stew
+    minAmount: 1
+    maxAmount: 3
+    rewardPer: 3500
+    whitelist:
+      tags:
+      - Stew
+  - name: bounty-item-reptilian-food
+    minAmount: 1
+    maxAmount: 2
+    rewardPer: 1400
+    whitelist:
+      tags:
+      - Fruit
+      - ReptilianFood
+      - Meat
+    blacklist:
+      tags:
+      - Slice
+
+#- type: cargoBountyCategory
+#  id: clownCategory
+#  name: bounty-category-clown
+#  entries:
+#  - name: bounty-item-clown-mask
+#    minAmount: 1
+#    maxAmount: 3
+#    rewardPer: 1200
+#   whitelist:
+#      tags:
+#      - ClownMask
+#  - name: bounty-item-clown-shoes
+#    minAmount: 1
+#    maxAmount: 3
+#    rewardPer: 3000
+#    whitelist:
+#      tags:
+#      - ClownShoes
+#  - name: bounty-item-crayon
+#    minAmount: 15
+#    maxAmount: 30
+#    rewardPer: 150
+#    whitelist:
+#      tags:
+#      - Crayon
+#  - name: bounty-item-pie
+#    minAmount: 1
+#    maxAmount: 3
+#    rewardPer: 1413
+#    whitelist:
+#      tags:
+#      - Pie
+#   blacklist:
+#      tags:
+#      - Slice
+#  - name: bounty-item-rollerskates
+#    minAmount: 1
+#    maxAmount: 3
+#    rewardPer: 900
+#    whitelist:
+#      components:
+#      - Skates
+#  - name: bounty-item-banana
+#    minAmount: 1
+#    maxAmount: 5
+#    rewardPer: 660
+#    whitelist:
+#      tags:
+#      - Banana
+#  - name: bounty-item-balloon
+#    minAmount: 1
+#    maxAmount: 3
+#    rewardPer: 1400
+#    whitelist:
+#      tags:
+#      - Balloon
+#  - name: bounty-item-banana-peel
+#    minAmount: 1
+#    maxAmount: 5
+#   rewardPer: 550
+#    whitelist:
+#      tags:
+#      - BananaPeel
+#  - name: bounty-item-bike-horn
+#    minAmount: 1
+#    maxAmount: 3
+#    rewardPer: 1250
+#    whitelist:
+#      tags:
+#      - BikeHorn
+#  - name: bounty-item-toy-sidearm
+#    minAmount: 2
+#    maxAmount: 4
+#    rewardPer: 450
+#    whitelist:
+#      tags:
+#      - ToySidearm
+
+# Security
+- type: cargoBountyCategory
+  id: securityCategory
+  name: bounty-category-security
+  entries:
+  - name: bounty-item-disabler-smg
+    minAmount: 2
+    maxAmount: 6
+    rewardPer: 3500
+    whitelist:
+      tags:
+      - DisablerSMG
+    requiredResearch:
+    - AdvancedRiotControl
+  - name: bounty-item-truncheon
+    minAmount: 4
+    maxAmount: 8
+    rewardPer: 1250
+    whitelist:
+      tags:
+      - Truncheon
+    requiredResearch:
+    - AdvancedRiotControl
+  - name: bounty-item-xray-cannon
+    minAmount: 2
+    maxAmount: 6
+    rewardPer: 4500
+    whitelist:
+      tags:
+      - XrayCannon
+    requiredResearch:
+    - WaveParticleHarnessing
+  - name: bounty-item-laser-cannon
+    minAmount: 2
+    maxAmount: 6
+    rewardPer: 4500
+    whitelist:
+      tags:
+      - LaserCannon
+    requiredResearch:
+    - ConcentratedLaserWeaponry
+  - name: bounty-item-svalinn-pistol
+    minAmount: 2
+    maxAmount: 10
+    rewardPer: 2500
+    whitelist:
+      tags:
+      - SvalinnPistol
+    # Requires ExperimentalBatteryAmmo to be reimplemented
+#    requiredResearch:
+#    - ExperimentalBatteryAmmo
+  - name: bounty-item-security-hud
+    minAmount: 2
+    maxAmount: 8
+    rewardPer: 900
+    whitelist:
+      tags:
+      - HudSecurity
+  - name: bounty-item-medsec-hud
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 2500
+    whitelist:
+      tags:
+      - MedSecHud
+    # Reliant on Funky Research
+#  - name: bounty-item-cybernetic-security-eyes
+#    minAmount: 1
+#    maxAmount: 3
+#    rewardPer: 6500
+#    whitelist:
+#      tags:
+#      - CyberneticSecurityEyes
+#    requiredResearch:
+#    - CyberneticEnhancements
+  - name: bounty-item-combat-knife
+    minAmount: 2
+    maxAmount: 8
+    rewardPer: 900
+    whitelist:
+      tags:
+      - CombatKnife
+  - name: bounty-item-grenade-flashbang
+    minAmount: 5
+    maxAmount: 12
+    rewardPer: 700
+    whitelist:
+      tags:
+      - GrenadeFlashBang
+  - name: bounty-item-stun-baton
+    minAmount: 3
+    maxAmount: 5
+    rewardPer: 1250
+    whitelist:
+      tags:
+      - Stunbaton
+
+# Makeshift Weapons
+- type: cargoBountyCategory
+  id: weaponCategory
+  name: bounty-category-weaponry
+  idPrefix: SYN
+  entries:
+  - name: bounty-item-shiv
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 800
+    whitelist:
+      tags:
+      - Shiv
+  - name: bounty-item-spear
+    minAmount: 3
+    maxAmount: 8
+    rewardPer: 1200
+    whitelist:
+      tags:
+      - Spear
+  - name: bounty-item-flash
+    minAmount: 3
+    maxAmount: 8
+    rewardPer: 900
+    whitelist:
+      components:
+      - Flash
+  - name: bounty-item-knife
+    minAmount: 3
+    maxAmount: 8
+    rewardPer: 900
+    whitelist:
+      components:
+      - Sharp
+    blacklist:
+      tags:
+      - Shiv
+  - name: bounty-item-arrow
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 800
+    whitelist:
+      tags:
+      - Arrow
+  - name: bounty-item-scrap-plate
+    minAmount: 1
+    maxAmount: 3
+    rewardPer: 4500
+    whitelist:
+      tags:
+      - ScrapArmor
+  - name: bounty-item-scrap-helmet
+    minAmount: 1
+    maxAmount: 3
+    rewardPer: 2500
+    whitelist:
+      tags:
+      - ScrapHelmet
+  - name: bounty-item-fire-bomb
+    minAmount: 1
+    maxAmount: 10
+    rewardPer: 1250
+    whitelist:
+      tags:
+      - FireBomb
+  - name: bounty-item-improvised-bow
+    minAmount: 1
+    maxAmount: 5
+    rewardPer: 1800
+    whitelist:
+      tags:
+      - ImprovisedBow
+  - name: bounty-item-baseball-bat
+    minAmount: 3
+    maxAmount: 8
+    rewardPer: 800
+    whitelist:
+      tags:
+      - BaseballBat
+  - name: bounty-item-improvised-shotgun
+    minAmount: 1
+    maxAmount: 5
+    rewardPer: 2000
+    whitelist:
+      tags:
+      - ImprovisedShotgun
+  - name: bounty-item-makeshift-shield
+    minAmount: 1
+    maxAmount: 8
+    rewardPer: 850
+    whitelist:
+      tags:
+      - MakeshiftShield
+  - name: bounty-item-wooden-buckler
+    minAmount: 1
+    maxAmount: 8
+    rewardPer: 1000
+    whitelist:
+      tags:
+      - WoodenBuckler
+  - name: bounty-item-makeshift-stunprod
+    minAmount: 1
+    maxAmount: 4
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - MakeshiftStunprod
+  - name: bounty-item-makeshift-bola
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 800
+    whitelist:
+      tags:
+      - MakeshiftBola
+  - name: bounty-item-svalinn-pistol
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 2500
+    whitelist:
+      tags:
+      - SvalinnPistol
+    # Requires ExperimentalBatteryAmmo to be reimplemented
+#    requiredResearch:
+#    - ExperimentalBatteryAmmo
+
+# Clothing (TODO: replace with something else)
+- type: cargoBountyCategory
+  id: clothingCategory
+  name: bounty-category-clothing
+  entries:
+  - name: bounty-item-bandana
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 400
+    whitelist:
+      tags:
+      - Bandana
+  - name: bounty-item-hi-viz-vest
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - HiViz
+  - name: bounty-item-warm-cloth
+    minAmount: 5
+    maxAmount: 10
+    rewardPer: 400
+    whitelist:
+      components:
+      - TemperatureProtection
+      tags:
+      - Scarf
+    blacklist:
+      components:
+      - ToggleableClothing
+
+#- type: cargoBountyCategory
+#  id: libraryCategory
+#  name: bounty-category-library
+#  entries:
+#  - name: bounty-item-book
+#    minAmount: 3
+#    maxAmount: 10
+#    rewardPer: 400
+#    whitelist:
+#      tags:
+#      - Book
+#  - name: bounty-item-dice
+#    minAmount: 3
+#    maxAmount: 6
+#    rewardPer: 400
+#    whitelist:
+#      tags:
+#      - Dice
+#  - name: bounty-item-board-game
+#    minAmount: 2
+#    maxAmount: 5
+#    rewardPer: 550
+#    whitelist:
+#      tags:
+#      - TabletopBoard
+#  - name: bounty-item-pen
+#    minAmount: 5
+#    maxAmount: 10
+#    rewardPer: 400
+#    whitelist:
+#      tags:
+#      - Pen
+
+# Robotics
+- type: cargoBountyCategory
+  id: roboticsCategory
+  name: bounty-category-robotics
+  entries:
+  - name: bounty-item-flash
+    minAmount: 2
+    maxAmount: 6
+    rewardPer: 900
+    whitelist:
+      components:
+      - Flash
+  - name: bounty-item-borg-arm
+    minAmount: 2
+    maxAmount: 4
+    rewardPer: 750
+    whitelist:
+      tags:
+      - BorgArm
+  - name: bounty-item-borg-head
+    minAmount: 2
+    maxAmount: 4
+    rewardPer: 750
+    whitelist:
+      tags:
+      - BorgHead
+  - name: bounty-item-borg-leg
+    minAmount: 2
+    maxAmount: 4
+    rewardPer: 750
+    whitelist:
+      tags:
+      - BorgLeg
+  - name: bounty-item-borg-torso
+    minAmount: 2
+    maxAmount: 4
+    rewardPer: 750
+    whitelist:
+      tags:
+      - BorgTorso
+  - name: bounty-item-borg-module
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 1200
+    whitelist:
+      components:
+      - BorgModule
+  # Currently impossible due to the lack of creatable cargo borg modules
+  #  - name: bounty-item-borg-module-cargo
+  #    minAmount: 2
+  #    maxAmount: 5
+  #    rewardPer: 1500
+  #    whitelist:
+  #      tags:
+  #      - BorgModuleCargo
+  - name: bounty-item-borg-module-engineering
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - BorgModuleEngineering
+    requiredResearch:
+    - AdvancedToolsTechnology
+  - name: bounty-item-borg-module-generic
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - BorgModuleGeneric
+  - name: bounty-item-borg-module-janitor
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - BorgModuleJanitor
+    requiredResearch:
+    - AdvancedCleaning
+  - name: bounty-item-borg-module-medical
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - BorgModuleMedical
+  - name: bounty-item-borg-module-service
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - BorgModuleService
+    requiredResearch:
+    - Hydroponics
+  - name: bounty-item-bot
+    minAmount: 1
+    maxAmount: 3
+    rewardPer: 2200
+    whitelist:
+      tags:
+      - Bot
+  - name: bounty-item-brain
+    minAmount: 1
+    maxAmount: 1
+    rewardPer: 10000
+    whitelist:
+      components:
+      - Brain
+
+#- type: cargoBountyCategory
+#  id: musicCategory
+#  name: bounty-category-music
+#  entries:
+#  - name: bounty-item-instrument
+#    minAmount: 3
+#    maxAmount: 8
+#    rewardPer: 500
+#    whitelist:
+#     components:
+#      - Instrument
+#    requiredResearch:
+#      - Instruments
+#  - name: bounty-item-percussion
+#    minAmount: 2
+#    maxAmount: 6
+#    rewardPer: 1000
+#    whitelist:
+#      tags:
+#      - PercussionInstrument
+#    requiredResearch:
+#      - Instruments
+#  - name: bounty-item-instrument-brass
+#    minAmount: 2
+#    maxAmount: 6
+#    rewardPer: 600
+#    whitelist:
+#      tags:
+#      - BrassInstrument
+#    requiredResearch:
+#      - Instruments
+#  - name: bounty-item-instrument-keyed
+#    minAmount: 2
+#    maxAmount: 6
+#    rewardPer: 800
+#    whitelist:
+#      tags:
+#      - KeyedInstrument
+#    requiredResearch:
+#      - Instruments
+#  - name: bounty-item-instrument-string
+#    minAmount: 4
+#    maxAmount: 6
+#    rewardPer: 300
+#    whitelist:
+#      tags:
+#      - StringInstrument
+#    requiredResearch:
+#      - Instruments
+
+# Bar
+- type: cargoBountyCategory
+  id: barCategory
+  name: bounty-category-bar
+  entries:
+  - name: bounty-item-bahama-mama
+    minAmount: 90
+    maxAmount: 90
+    rewardPer: 65
+    reagent: BahamaMama
+  - name: bounty-item-erika-suprise
+    minAmount: 90
+    maxAmount: 90
+    rewardPer: 65
+    reagent: ErikaSurprise
+  - name: bounty-item-bloody-mary
+    minAmount: 90
+    maxAmount: 90
+    rewardPer: 65
+    reagent: BloodyMary
+  - name: bounty-item-blue-hawaiian
+    minAmount: 60
+    maxAmount: 60
+    rewardPer: 65
+    reagent: BlueHawaiian
+  - name: bounty-item-andalusia
+    minAmount: 60
+    maxAmount: 60
+    rewardPer: 65
+    reagent: Andalusia
+  - name: bounty-item-watermelon-wakeup
+    minAmount: 60
+    maxAmount: 60
+    rewardPer: 75
+    reagent: WatermelonWakeup
+  - name: bounty-item-xeno-basher
+    minAmount: 120
+    maxAmount: 120
+    rewardPer: 65
+    reagent: XenoBasher
+  - name: bounty-item-cogchamp
+    minAmount: 60
+    maxAmount: 60
+    rewardPer: 75
+    reagent: CogChamp
+  - name: bounty-item-demons-blood
+    minAmount: 60
+    maxAmount: 60
+    rewardPer: 75
+    reagent: DemonsBlood
+  - name: bounty-item-cosmopolitan
+    minAmount: 60
+    maxAmount: 60
+    rewardPer: 75
+    reagent: Cosmopolitan
+  - name: bounty-item-beepsky-smash
+    minAmount: 60
+    maxAmount: 60
+    rewardPer: 75
+    reagent: BeepskySmash
+  - name: bounty-item-classic-martini
+    minAmount: 60
+    maxAmount: 60
+    rewardPer: 65
+    reagent: Martini
+  - name: bounty-item-posca
+    minAmount: 60
+    maxAmount: 60
+    rewardPer: 65
+    reagent: Posca
+  - name: bounty-item-the-martinez
+    minAmount: 90
+    maxAmount: 90
+    rewardPer: 70
+    reagent: TheMartinez
+  - name: bounty-item-doctors-delight
+    minAmount: 60
+    maxAmount: 60
+    rewardPer: 100
+    reagent: DoctorsDelight
+  # Reliant on Funky Drinks
+#  - name: bounty-item-tayquila
+#    minAmount: 60
+#    maxAmount: 60
+#    rewardPer: 100
+#    reagent: Tayquila
+  # Reliant on Imp Station
+#  - name: bounty-item-fever-dream
+#    minAmount: 60
+#    maxAmount: 60
+#    rewardPer: 100
+#    reagent: FeverDream
+  - name: bounty-item-gargle-blaster
+    minAmount: 60
+    maxAmount: 60
+    rewardPer: 100
+    reagent: GargleBlaster
+
+# Engineering
+- type: cargoBountyCategory
+  id: EngineeringCategory
+  name: bounty-category-engineering
+  entries:
+  - name: bounty-item-holofan-projector
+    minAmount: 1
+    maxAmount: 4
+    rewardPer: 1000
+    whitelist:
+      tags:
+      - HolofanProjector
+    requiredResearch:
+    - AdvancedAtmospherics
+  - name: bounty-item-jaws-of-life
+    minAmount: 1
+    maxAmount: 4
+    rewardPer: 2750
+    whitelist:
+      tags:
+      - JawsOfLife
+    requiredResearch:
+    - AdvancedToolsTechnology
+  - name: bounty-item-powerdrill
+    minAmount: 1
+    maxAmount: 4
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - Powerdrill
+    requiredResearch:
+    - AdvancedToolsTechnology
+  - name: bounty-item-toolbox
+    minAmount: 4
+    maxAmount: 8
+    rewardPer: 750
+    whitelist:
+      tags:
+      - Toolbox
+  - name: bounty-item-battery
+    minAmount: 5
+    maxAmount: 20
+    rewardPer: 300
+    whitelist:
+      components:
+      - Battery
+  - name: bounty-item-hi-viz-vest
+    minAmount: 2
+    maxAmount: 5
+    rewardPer: 1500
+    whitelist:
+      tags:
+      - HiViz
+
+- type: cargoBountyCategory
+  id: chemistryCategory
+  name: bounty-category-chemistry
+  entries:
+  - name: bounty-item-saline
+    minAmount: 50
+    maxAmount: 50
+    rewardPer: 60
+    reagent: Saline
+  - name: bounty-item-arithrazine
+    minAmount: 50
+    maxAmount: 50
+    rewardPer: 100
+    reagent: Arithrazine
+  # Reliant on Funky Chem
+#  - name: bounty-item-multiver
+#    minAmount: 50
+#    maxAmount: 50
+#    rewardPer: 90
+#    reagent: Multiver
+  - name: bounty-item-dexalin
+    minAmount: 50
+    maxAmount: 50
+    rewardPer: 70
+    reagent: Dexalin
+  - name: bounty-item-space-cleaner
+    minAmount: 50
+    maxAmount: 50
+    rewardPer: 60
+    reagent: SpaceCleaner
+  - name: bounty-item-soap
+    minAmount: 2
+    maxAmount: 4
+    rewardPer: 2000
+    whitelist:
+      tags:
+      - Soap
diff --git a/Resources/Prototypes/_Funkystation/Entities/Objects/Devices/Circuitboards/production.yml b/Resources/Prototypes/_Funkystation/Entities/Objects/Devices/Circuitboards/production.yml
new file mode 100644
index 00000000000..b7416cb1366
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Entities/Objects/Devices/Circuitboards/production.yml
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+# SPDX-License-Identifier: MIT
+
+- type: entity
+  id: MusicTechFabCircuitboard
+  parent: BaseMachineCircuitboard
+  name: music techfab machine board
+  description: A machine printed circuit board for a music techfab.
+  components:
+  - type: Sprite
+    state: service
+  - type: MachineBoard
+    prototype: MusicTechFab
+    stackRequirements:
+      Manipulator: 2
+    tagRequirements:
+      GlassBeaker:
+        amount: 2
+        defaultPrototype: Beaker
diff --git a/Resources/Prototypes/_Funkystation/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_Funkystation/Entities/Structures/Machines/lathe.yml
new file mode 100644
index 00000000000..7b4d8e3f56b
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Entities/Structures/Machines/lathe.yml
@@ -0,0 +1,29 @@
+# SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+# SPDX-License-Identifier: MIT
+
+- type: entity
+  id: MusicTechFab
+  parent: BaseLatheLube # Goob edit
+  name: music techfab
+  description: Prints equipment for use by the musician.
+  components:
+  - type: Sprite
+    sprite: Structures/Machines/techfab.rsi
+    layers:
+    - state: icon
+      map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: music
+    - state: unlit
+      shader: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: inserting
+      map: ["enum.MaterialStorageVisualLayers.Inserting"]
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Lathe
+    idleState: icon
+    runningState: icon
+    staticPacks:
+    - InstrumentsStatic
+  - type: Machine
+    board: MusicTechFabCircuitboard
diff --git a/Resources/Prototypes/_Funkystation/Recipes/Instruments/instruments.yml b/Resources/Prototypes/_Funkystation/Recipes/Instruments/instruments.yml
new file mode 100644
index 00000000000..23763a0a67e
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Recipes/Instruments/instruments.yml
@@ -0,0 +1,194 @@
+# SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+# SPDX-License-Identifier: MIT
+
+- type: latheRecipe
+  id: TrumpetInstrument
+  result: TrumpetInstrument
+  completetime: 4
+  materials:
+    Brass: 500
+
+- type: latheRecipe
+  id: TromboneInstrument
+  result: TromboneInstrument
+  completetime: 4
+  materials:
+    Brass: 500
+
+- type: latheRecipe
+  id: FrenchHornInstrument
+  result: FrenchHornInstrument
+  completetime: 4
+  materials:
+    Brass: 500
+
+- type: latheRecipe
+  id: EuphoniumInstrument
+  result: EuphoniumInstrument
+  completetime: 4
+  materials:
+    Brass: 500
+
+- type: latheRecipe
+  id: GunpetInstrument
+  result: GunpetInstrument
+  completetime: 4
+  materials:
+    Brass: 200
+    Plastic: 300
+
+- type: latheRecipe
+  id: GlockenspielInstrument
+  result: GlockenspielInstrument
+  completetime: 4
+  materials:
+    Steel: 500
+
+- type: latheRecipe
+  id: MusicBoxInstrument
+  result: MusicBoxInstrument
+  completetime: 4
+  materials:
+    Steel: 300
+    Wood: 200
+
+- type: latheRecipe
+  id: XylophoneInstrument
+  result: XylophoneInstrument
+  completetime: 4
+  materials:
+    Steel: 400
+
+- type: latheRecipe
+  id: MicrophoneInstrument
+  result: MicrophoneInstrument
+  completetime: 4
+  materials:
+    Steel: 500
+
+- type: latheRecipe
+  id: WoodblockInstrument
+  result: WoodblockInstrument
+  completetime: 4
+  materials:
+    Wood: 300
+
+- type: latheRecipe
+  id: KalimbaInstrument
+  result: KalimbaInstrument
+  completetime: 4
+  materials:
+    Wood: 500
+
+- type: latheRecipe
+  id: ElectricGuitarInstrument
+  result: ElectricGuitarInstrument
+  completetime: 4
+  materials:
+    Wood: 100
+    Steel: 100
+    Plastic: 300
+
+- type: latheRecipe
+  id: BassGuitarInstrument
+  result: BassGuitarInstrument
+  completetime: 4
+  materials:
+    Wood: 100
+    Steel: 100
+    Plastic: 300
+
+- type: latheRecipe
+  id: RockGuitarInstrument
+  result: RockGuitarInstrument
+  completetime: 4
+  materials:
+    Wood: 100
+    Steel: 100
+    Plastic: 300
+
+- type: latheRecipe
+  id: AcousticGuitarInstrument
+  result: AcousticGuitarInstrument
+  completetime: 4
+  materials:
+    Wood: 400
+    Steel: 100
+
+- type: latheRecipe
+  id: BanjoInstrument
+  result: BanjoInstrument
+  completetime: 4
+  materials:
+    Wood: 400
+    Steel: 100
+
+- type: latheRecipe
+  id: ViolinInstrument
+  result: ViolinInstrument
+  completetime: 4
+  materials:
+    Wood: 400
+    Steel: 100
+
+- type: latheRecipe
+  id: ViolaInstrument
+  result: ViolaInstrument
+  completetime: 4
+  materials:
+    Wood: 400
+    Steel: 100
+
+- type: latheRecipe
+  id: CelloInstrument
+  result: CelloInstrument
+  completetime: 4
+  materials:
+    Wood: 400
+    Steel: 100
+
+- type: latheRecipe
+  id: SaxophoneInstrument
+  result: SaxophoneInstrument
+  completetime: 4
+  materials:
+    Brass: 400
+    Wood: 100
+
+- type: latheRecipe
+  id: HarmonicaInstrument
+  result: HarmonicaInstrument
+  completetime: 4
+  materials:
+    Steel: 500
+
+- type: latheRecipe
+  id: ClarinetInstrument
+  result: ClarinetInstrument
+  completetime: 4
+  materials:
+    Wood: 400
+    Steel: 100
+
+- type: latheRecipe
+  id: FluteInstrument
+  result: FluteInstrument
+  completetime: 4
+  materials:
+    Steel: 500
+
+- type: latheRecipe
+  id: RecorderInstrument
+  result: RecorderInstrument
+  completetime: 4
+  materials:
+    Plastic: 500
+
+- type: latheRecipe
+  id: BagpipeInstrument
+  result: BagpipeInstrument
+  completetime: 4
+  materials:
+    Wood: 100
+    Plastic: 100
+    Cloth: 300
diff --git a/Resources/Prototypes/_Funkystation/Recipes/Lathes/Packs/service.yml b/Resources/Prototypes/_Funkystation/Recipes/Lathes/Packs/service.yml
new file mode 100644
index 00000000000..bc83248b0fd
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Recipes/Lathes/Packs/service.yml
@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+# SPDX-License-Identifier: MIT
+
+- type: latheRecipePack
+  id: InstrumentsStatic
+  recipes:
+  - TrumpetInstrument
+  - TromboneInstrument
+  - FrenchHornInstrument
+  - EuphoniumInstrument
+  - GunpetInstrument
+  - GlockenspielInstrument
+  - MusicBoxInstrument
+  - XylophoneInstrument
+  - MicrophoneInstrument
+  - WoodblockInstrument
+  - KalimbaInstrument
+  - ElectricGuitarInstrument
+  - BassGuitarInstrument
+  - RockGuitarInstrument
+  - AcousticGuitarInstrument
+  - BanjoInstrument
+  - ViolinInstrument
+  - ViolaInstrument
+  - CelloInstrument
+  - SaxophoneInstrument
+  - HarmonicaInstrument
+  - ClarinetInstrument
+  - FluteInstrument
+  - RecorderInstrument
+  - BagpipeInstrument
diff --git a/Resources/Prototypes/_Funkystation/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_Funkystation/Recipes/Lathes/electronics.yml
new file mode 100644
index 00000000000..c26096a8f7b
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Recipes/Lathes/electronics.yml
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+# SPDX-License-Identifier: MIT
+
+- type: latheRecipe
+  parent: BaseCircuitboardRecipe
+  id: MusicTechFabCircuitboard
+  result: MusicTechFabCircuitboard
diff --git a/Resources/Prototypes/_Funkystation/Research/civilianservices.yml b/Resources/Prototypes/_Funkystation/Research/civilianservices.yml
new file mode 100644
index 00000000000..901fd2f5d20
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Research/civilianservices.yml
@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: 2026 Gansu <peat.allan13@gmail.com>
+# SPDX-License-Identifier: MIT
+
+# Tier 1
+
+- type: technology
+  id: Instruments
+  name: research-technology-instruments
+  icon:
+    sprite: Objects/Fun/Instruments/trumpet.rsi
+    state: icon
+  discipline: CivilianServices
+  tier: 1
+  cost: 5000
+  recipeUnlocks:
+  - MusicTechFabCircuitboard
+
+# Tier 2
+
+# Tier 3
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index fdc714ce702..0c2a1c30673 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -153,6 +153,9 @@
 - type: Tag
   id: AccessBreakerImmune # Default value in EmagProviderComponent. Marks tagged entity as immune to AccessBreakerUnlimited.
 
+- type: Tag
+  id: AdvancedSurgeryTool # Cargo Bounty Target
+
 - type: Tag
   id: AirAlarm # Used by AtmosAlarmableComponent for syncing devices.
 
@@ -177,6 +180,12 @@
 - type: Tag
   id: AnomalyHost # Targeting whitelist: BaseAnomalyInjector
 
+- type: Tag
+  id: AnomalyLocator # Cargo Bounty Target
+
+- type: Tag
+  id: AnomalySyncronizerCircuitBoard # Cargo Bounty Target
+
 - type: Tag
   id: AppraisalTool # Storage whitelist: BaseClothingBeltEngineering
 
@@ -189,6 +198,9 @@
 - type: Tag
   id: ArtifactFragment # Storage whitelist: OreBag. CargoBounty: BountyArtifactFragment. ConstructionGraph: Artifact
 
+- type: Tag
+  id: AutoinjectorCartridge # Cargo Bounty Target
+
 ## B ##
 
 - type: Tag
@@ -224,6 +236,15 @@
 - type: Tag
   id: BikeHorn # ConstructionGraph: HonkBot, BananiumHorn
 
+- type: Tag
+  id: BiosyntheticEyes # Cargo Bounty Target
+
+- type: Tag
+  id: BiosyntheticLiver # Cargo Bounty Target
+
+- type: Tag
+  id: BiosyntheticHeart # Cargo Bounty Target
+
 - type: Tag
   id: Bloodpack # Storage whitelist: ClothingBeltMedical
 
@@ -450,6 +471,12 @@
 - type: Tag
   id: ChiliBowl # CargoBounty: BountyChili
 
+- type: Tag
+  id: ChimpHandcannon # Cargo Bounty Target
+
+- type: Tag
+  id: ChowMein # Cargo Bounty Target
+
 - type: Tag
   id: Cigar # ItemCounter: CigarCase
 
@@ -564,6 +591,12 @@
 - type: Tag
   id: CrowbarRed # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltChiefEngineer. ItemMapper: BaseClothingBeltEngineering, ClothingBeltChiefEngineer
 
+- type: Tag
+  id: Cryobeaker # Cargo Bounty Target
+
+- type: Tag
+  id: Cryosyringe # Cargo Bounty Target
+
 - type: Tag
   id: CrystalBlack # ConstructionGraph: BlackLight, BlackLightBulb
 
@@ -591,11 +624,23 @@
 - type: Tag
   id: CubanCarp # CargoBounty: BountyCubanCarp
 
+- type: Tag
+  id: CubanNachos # Cargo Bounty Target
+
 - type: Tag
   id: Cutlet # MetamorphRecipe: FoodBurgerCheese, FoodBurgerChicken, FoodBurgerDuck
 
+- type: Tag
+  id: CyberneticMedicalEyes # Cargo Bounty Target
+
+- type: Tag
+  id: CyberneticSecurityEyes # Cargo Bounty Target
+
 ## D ##
 
+- type: Tag
+  id: Defibrillator # Cargo Bounty Target
+
 - type: Tag # Exists on diagonal walls and windows
   id: Diagonal # Used by TileWallsCommand and FixRotationsCommand
 
@@ -605,6 +650,9 @@
 - type: Tag
   id: Dice # Storage whitelist: BorgModuleService, DiceBag, BooksBag
 
+- type: Tag
+  id: DisablerSMG # Cargo Bounty Target
+
 - type: Tag
   id: DiscreteHealthAnalyzer # Storage whitelist: ClothingBeltMedical. ConstructionGraph: MediBot
 
@@ -662,6 +710,9 @@
 - type: Tag
   id: EmitterBolt # Default value in ContainmentFieldGeneratorComponent for tagged collisions that power the generator.
 
+- type: Tag
+  id: Enchiladas # Cargo Bounty Target
+
 - type: Tag
   id: EncryptionCargo # ItemMapper: TelecomServer
 
@@ -692,6 +743,9 @@
 - type: Tag
   id: ExCable # Placement blacklist on CableDetStack. Placement whitelist on WiredDetonator
 
+- type: Tag
+  id: ExperimentalVesselMachineBoard # Cargo Bounty Target
+
 ## F ##
 
 - type: Tag
@@ -712,6 +766,9 @@
 - type: Tag
   id: FireAxe # Storage whitelist: FireAxeCabinet
 
+- type: Tag
+  id: FireBomb # Cargo Bounty Target
+
 - type: Tag
   id: FireExtinguisher # ConstructionGraph: FireBot
 
@@ -748,6 +805,9 @@
 - type: Tag
   id: ForceFixRotations # fixrotations command WILL target this
 
+- type: Tag
+  id: ForceFieldProjector # Cargo Bounty Target
+
 - type: Tag
   id: ForceNoFixRotations # fixrotations command WON'T target this
 
@@ -757,6 +817,9 @@
 - type: Tag
   id: Fruit # SpecialDigestible: OrganReptilianStomach. CargoBounty: BountyFruit
 
+- type: Tag
+  id: FruitSalad # Cargo Bounty Target
+
 ## G ##
 
 - type: Tag
@@ -802,6 +865,9 @@
 - type: Tag
   id: GoliathPlate # CargoBounty: BountyGoliathPlates
 
+- type: Tag
+  id: GorillaGauntlet # Cargo Bounty Target
+
 - type: Tag
   id: GPS # Storage whitelist: BaseClothingBeltEngineering
 
@@ -823,6 +889,9 @@
 - type: Tag
   id: GunUpgradeReloadSpeed # Used by PKAUpgradeFireRate:GunUpgrade to ensure mutually exclusive upgrades.
 
+- type: Tag
+  id: Gyro # Cargo Bounty Target
+
 ## H ##
 
 - type: Tag
@@ -945,6 +1014,12 @@
 - type: Tag
   id: Igniter # ConstructionGraph: makeshiftstunprod, FireBomb. Common ingredient in machines (HyperConvection)
 
+- type: Tag
+  id: ImprovisedBow # Cargo Bounty Target
+
+- type: Tag
+  id: ImprovisedShotgun # Cargo Bounty Target
+
 - type: Tag
   id: Inflatable # Storage whitelist: BorgModuleInflatable
 
@@ -994,6 +1069,8 @@
                       # Blacklist on MobStandStatusEffectBase.
 
 ## L ##
+- type: Tag
+  id: LaserCannon # Cargo Bounty Target
 
 - type: Tag
   id: LaserWeapon # Used for a cargo bounty. Added to all hitscan weapons that shoot lasers.
@@ -1061,6 +1138,15 @@
 - type: Tag # Used on DungeonRoom prototypes.
   id: Maints # RoomFill spawner whitelist for MaintsRoomMarker.
 
+- type: Tag
+  id: MakeshiftBola # Cargo Bounty Target
+
+- type: Tag
+  id: MakeshiftShield # Cargo Bounty Target
+
+- type: Tag
+  id: MakeshiftStunprod # Cargo Bounty Target
+
 - type: Tag
   id: Matchstick # Storage whitelist: Ashtray. ConstructionGraph: ImprovisedShotgunShellGraph
 
@@ -1076,6 +1162,9 @@
 - type: Tag
   id: Medkit # CargoBounty: BountyMedkitBox. ConstructionGraph: MediBot
 
+- type: Tag
+  id: MedSecHud # Cargo Bounty Target
+
 - type: Tag
   id: MessyDrinkerImmune # Default value in MessyDrinkerComponent. Tagged entity is immune to spills.
 
@@ -1140,6 +1229,9 @@
 - type: Tag
   id: NinjaBombingTargetBlocker # Ninjas will not target this warp point
 
+- type: Tag
+  id: NightVisionGoggles # Cargo Bounty Target
+
 - type: Tag
   id: NoConsoleSound # Blacklist on BaseComputer, StationMap. Tagged entity will not make sound when opening the UI.
 
@@ -1198,6 +1290,9 @@
 - type: Tag
   id: ParcelWrapBlacklist # Tagged entities can't be wrapped in ParcelWrap.
 
+- type: Tag
+  id: ParticleDecelerator # Cargo Bounty Target
+
 - type: Tag
   id: Payload # Used by PayloadSystem to find entities to send TriggerEvent. ConstructionGraph: ModularGrenadeGraph, ModularMineGraph
 
@@ -1394,6 +1489,12 @@
 - type: Tag
   id: Scarf # CargoBounty: BountyWarmCloth
 
+- type: Tag
+  id: ScrapArmor # Cargo Bounty Target
+
+- type: Tag
+  id: ScrapHelmet # Cargo Bounty Target
+
 - type: Tag
   id: Screwdriver # Storage whitelist: BaseClothingBeltEngineering. ItemMapper: BaseClothingBeltEngineering
 
@@ -1445,6 +1546,12 @@
 - type: Tag # sliced fruit, vegetables, pizza etc.
   id: Slice # CargoBounty blacklist: BountyFruit, BountyVegetable, BountyBread, BountyPie
 
+- type: Tag
+  id: SlopBowl # Cargo Bounty Target
+
+- type: Tag
+  id: SloppyJoe # Cargo Bounty Target
+
 - type: Tag
   id: SlowImmune # Tagged mob entity cannot gain the slowed status effect. Blacklist on StatusEffectSlowdown.
 
@@ -1506,12 +1613,18 @@
 - type: Tag
   id: Steak # CargoBounty: BountySteak
 
+- type: Tag
+  id: Stew # Cargo Bounty Target
+
 - type: Tag
   id: StringInstrument # MachineBoard construction: DawInstrumentMachineCircuitboard
 
 - type: Tag
   id: Structure # # Targeting whitelist: HandLabeler
 
+- type: Tag
+  id: Stunbaton # Cargo Bounty Target
+
 - type: Tag
   id: StunImmune # Tagged mob entity cannot gain the stunned status effect. Blacklist on StatusEffectStunned.
 
@@ -1524,6 +1637,9 @@
 - type: Tag
   id: Sunglasses # ConstructionGraph: GlassesSecHUD
 
+- type: Tag
+  id: SuperBiteBurger # Cargo Bounty Target
+
 - type: Tag
   id: SurgeryTool # Storage whitelist: ClothingBeltMedical
 
@@ -1542,6 +1658,9 @@
 - type: Tag
   id: Spellbook # Storage whitelist: Bookshelf
 
+- type: Tag
+  id: SvalinnPistol # Cargo Bounty Target
+
 ## T ##
 
 - type: Tag
@@ -1553,6 +1672,9 @@
 - type: Tag
   id: Taser # Storage whitelist: ClothingBeltSecurity
 
+- type: Tag
+  id: TechDiskTerminalCircuitBoard # Cargo Bounty Target
+
 - type: Tag
   id: TheaterBagel # used for Bagel Station's randomized theater
 
@@ -1620,6 +1742,8 @@
   id: UtilityKnife # Storage whitelist: BaseClothingBeltEngineering, BountyKnife
 
 ## V ##
+- type: Tag
+  id: ValidSalad # Cargo Bounty Target
 
 - type: Tag
   id: Vegetable # CargoBounty: BountyVegetable
@@ -1635,6 +1759,8 @@
   id: VoiceTrigger # ConstructionGraph: Vim
 
 ## W ##
+- type: Tag
+  id: Waffle # Cargo Bounty Target
 
 - type: Tag
   id: Wall # Tagged entity is a wall. Several systems and several targeting whitelists (BaseMobDragon) care about this.
@@ -1697,6 +1823,9 @@
   id: Wooden # just like our atmos
              # MaterialStorage whitelist: Sheetifier
 
+- type: Tag
+  id: WoodenBuckler # Cargo Bounty Target
+
 - type: Tag
   id: WoodwindInstrument # even more like our atmos
                          # MachineBoard construction: DawInstrumentMachineCircuitboard
@@ -1731,6 +1860,9 @@
 - type: Tag
   id: XenoborgModuleStealth # Cyborg module category for evil stealth xenoborg
 
+- type: Tag
+  id: XrayCannon # Cargo Bounty Target
+
 ## Y ##
 ## Z ##
 # ALPHABETICAL
diff --git a/Resources/Textures/Structures/Machines/techfab.rsi/meta.json b/Resources/Textures/Structures/Machines/techfab.rsi/meta.json
index 7530b9322a2..a123e82251e 100644
--- a/Resources/Textures/Structures/Machines/techfab.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/techfab.rsi/meta.json
@@ -31,6 +31,9 @@
     {
       "name": "ammo"
     },
+    {
+      "name": "music"
+    },
     {
       "name": "panel"
     },
diff --git a/Resources/Textures/Structures/Machines/techfab.rsi/music.png b/Resources/Textures/Structures/Machines/techfab.rsi/music.png
new file mode 100644
index 00000000000..8688d31f6bf
Binary files /dev/null and b/Resources/Textures/Structures/Machines/techfab.rsi/music.png differ